diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp index 9cb9465c803e..b83e611f64bd 100644 --- a/src/app/pluginmanager/qgspluginmanager.cpp +++ b/src/app/pluginmanager/qgspluginmanager.cpp @@ -636,9 +636,15 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item ) html += QString( "" ).arg( metadata->value( "icon" ) ); } - html += QString( "

%2


" ).arg( metadata->value( "description" ) ); + html += QString( "

%1

" ).arg( metadata->value( "description" ) ); - if ( ! metadata->value( "average_vote" ).isEmpty() ) + if ( ! metadata->value( "about" ).isEmpty() ) + { + html += metadata->value( "about" ); + } + + html += "
"; + if ( ! metadata->value( "average_vote" ).isEmpty() && metadata->value( "average_vote" ).toFloat() ) { // draw stars int stars = qRound( metadata->value( "average_vote" ).toFloat() ); @@ -648,11 +654,16 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item ) } html += tr( "
%1 rating vote(s)
" ).arg( metadata->value( "rating_votes" ) ); } - if ( ! metadata->value( "downloads" ).isEmpty() ) + else if ( ! metadata->value( "downloads" ).isEmpty() ) { - html += tr( "%1 downloads
" ).arg( metadata->value( "downloads" ) ); + // spacer between description and downloads html += "
"; } + if ( ! metadata->value( "downloads" ).isEmpty() ) + { + html += tr( "%1 downloads" ).arg( metadata->value( "downloads" ) ); + } + html += "

"; if ( ! metadata->value( "category" ).isEmpty() ) { @@ -662,14 +673,6 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item ) { html += QString( "%1: %2
" ).arg( tr( "Tags" ) ).arg( metadata->value( "tags" ) ); } - if ( ! metadata->value( "author_email" ).isEmpty() ) - { - html += QString( "%1: %3
" ).arg( tr( "Author" ) ).arg( metadata->value( "author_email" ) ).arg( metadata->value( "author_name" ) ); - } - else if ( ! metadata->value( "author_name" ).isEmpty() ) - { - html += QString( "%1: %2
" ).arg( tr( "Author" ) ).arg( metadata->value( "author_name" ) ); - } if ( ! metadata->value( "homepage" ).isEmpty() || ! metadata->value( "tracker" ).isEmpty() || ! metadata->value( "code_repository" ).isEmpty() ) { html += QString( "%1: " ).arg( tr( "More info" ) ); @@ -687,9 +690,19 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item ) } html += "
"; } - html += "
" ; + if ( ! metadata->value( "author_email" ).isEmpty() ) + { + html += QString( "%1: %3" ).arg( tr( "Author" ) ).arg( metadata->value( "author_email" ) ).arg( metadata->value( "author_name" ) ); + html += "

" ; + } + else if ( ! metadata->value( "author_name" ).isEmpty() ) + { + html += QString( "%1: %2" ).arg( tr( "Author" ) ).arg( metadata->value( "author_name" ) ); + html += "

" ; + } + if ( ! metadata->value( "version_installed" ).isEmpty() ) { QString ver = metadata->value( "version_installed" );