Index: trunk/www/sites/www/applications/applicationpage.php
===================================================================
--- trunk/www/sites/www/applications/applicationpage.php	(revision 1529942)
+++ trunk/www/sites/www/applications/applicationpage.php	(revision 1529943)
@@ -1,259 +1,259 @@
 <?php
 // error_reporting(E_ALL);
 // ini_set('display_errors', 1);
 
 function nameToUrl($s)
 {
     return str_replace(' ', '', strtolower($s));
 }
 
 include 'classes/class_appdata.inc';
 $app = new AppData($_GET['application']);
 if (nameToUrl($app->category()) != $_GET['category']) {
     $extra = "";
     if( isset($_GET['development']) ) 
     { $extra = "/development/"; }
 
     header("Location: /applications/" . strtolower($app->category()) . "/" . nameToUrl($app->name()) . $extra);
     return;
 }
 
 $development = isset($_GET['development']);
 
 $page_title=$app->name()." - ".$app->genericName();
 if ($development) {
     $page_title=$app->name()." - Development Information";
 }
 $page_title_extra_html = '<div class="app-icon"><img src="/images/icons/'.nameToUrl($app->name()).'_48.png" alt="'.$app->name().' Icon" /></div>';
 
 function printSidebar($app, $backToOverview=false)
 {
     $content = '';
 
     $content .= '<div id="infobox-return">';
     if ($backToOverview) {
 //         print '<a href="/applications/'.strtolower($app->category()).'/'.strtolower($app->name()).'"><img src="/images/icons/'.strtolower($app->name()).'_22.png" alt="" />Back to '.$app->name().'</a>';
         $content .= '<a href="/applications/'.nameToUrl($app->category()).'/'.nameToUrl($app->name()).'">Back to overview</a>';
     } else {
         $content .= '<a href="/applications/'.nameToUrl($app->category()).'"><img id="infobox-overviewicon" src="/images/icons/categories/'.nameToUrl($app->category()).'_22.png" alt="" />Back to '.$app->category().'</a>';
     }
     $content .= '</div>';
 
     if ($app->hasHomepage() || $app->hasKDEApps()) {
         $content .= '<div class="infobox"><strong>More about '.$app->name().'</strong>';
         if ($app->hasHomepage()) {
             $content .= '<br /><a href="'.$app->homepage().'">'.$app->name().' Homepage</a>';
         }
         if ($app->hasKDEApps()) {
             $url = htmlspecialchars("http://kde-apps.org/content/show.php?content=".$app->KDEAppsId());
             $content .= '<br /><a href="'.$url.'">'.$app->name().' on KDE-Apps.org</a>';
         }
         $content .= '</div>';
     }
 
     if ($app->hasAppstream()) {
         $content .= '<div class="infobox"><strong>Get '.$app->name().'</strong>';
         $content .= '<br /><a href="appstream://'.$app->AppStreamId().'">Install via AppStream</a>';
         $content .= '</div>';
     }
 
     $content .= '<div class="infobox"><strong>Get help</strong>';
     if ($app->hasUserbase()) {
         $content .= '<br /><a href="'.$app->userbase().'">'.$app->name().' on UserBase</a>';
     }
     $content .= '<br /><a href="'.$app->forumUrl().'">KDE Community Forums</a>';
     if ($app->hasHandbook()) {
         $content .= '<br /><a href="'.$app->handbook().'">'.$app->name().' Handbook</a>';
     }
     $content .= '</div>';
 
     $content .= '<div class="infobox"><strong>Contact the authors</strong>';
 
     //Bug tracker links
     if ($app->hasBugTracker()) {
         if ($app->isBugTrackerExternal()) {
             $content .= '<br /><a href="'.htmlentities($app->bugzillaProduct()).'">Report a bug</a>';
         } else { //KDE Bugzilla
             $componentstring = "";
             if ($app->bugzillaComponent()) {
                 $componentstring = '&amp;component='.$app->bugzillaComponent();
             }
             $content .= '<br /><a href="https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product='.$app->bugzillaProduct().$componentstring.'">Report a bug</a>';
         }
     } else { //Empty bugtracker, use default link
         $content .= '<br /><a href="https://bugs.kde.org/wizard.cgi">Report a bug</a>';
     }
     foreach ($app->ircChannels() as $channel) {
         $content .= '<br />IRC: <a href="irc://irc.freenode.org/'.$channel.'">'.$channel.' on Freenode</a>';
     }
     foreach ($app->mailingLists() as $ml) {
         //KDE mailing lists
         if (substr($ml, -8, 8) == "@kde.org") {
             $base = substr($ml, 0, -8);
             $content .= '<br />Mailing List: <a href="mailto:'.htmlspecialchars($ml).'">' .htmlspecialchars($base).'</a>';
             $content .= '<br />(<a href="https://mail.kde.org/mailman/listinfo/'.$base.'">subscribe</a>, <a href="https://mail.kde.org/mailman/listinfo/'.$base.'/">list information</a>)';
         } else if (substr($ml, -22, 22) == "@lists.sourceforge.net") { //Sourceforge.net
             $base = substr($ml, 0, -22);
             $content .= '<br />Mailing List: <a href="mailto:'.htmlspecialchars($ml).'">'.htmlspecialchars($base).'</a>';
             $content .= '<br />(<a href="https://lists.sourceforge.net/lists/listinfo/'.$base.'">subscribe</a>, <a href="http://sourceforge.net/mailarchive/forum.php?forum_name='.$base.'">archive</a>)';
         } else if (substr($ml, 0, 31) == "http://groups.google.com/group/") { //Google Groups (web)
             $base = substr($ml, 31, strlen($ml)-31);
             $content .= '<br />Mailing List: <a href="mailto:'.htmlspecialchars($base).'@googlegroups.com">'.htmlspecialchars($base).'</a>';
             $content .= '<br />(<a href="http://groups.google.com/group/'.$base.'/subscribe?note=1">subscribe</a>, <a href="http://groups.google.com/group/'.$base.'/topics">archive</a>)';
         } else if (substr($ml, -17, 17) == "@googlegroups.com") { //Google Groups (mail)
             $base = substr($ml, 0, -17);
             $content .= '<br />Mailing List: <a href="mailto:'.htmlspecialchars($ml).'">'.htmlspecialchars($base).'</a>';
             $content .= '<br />(<a href="http://groups.google.com/group/'.$base.'/subscribe?note=1">subscribe</a>, <a href="http://groups.google.com/group/'.$base.'/topics">archive</a>)';
         } else { //Default mail
             $content .= '<br />Mailing List: <a href="mailto:'.htmlspecialchars($ml).'">'.$app->name().'</a>';
         }
     }
     $content .= '</div>';
 
     if( !$backToOverview )
     {
 	$content .= '<div class="infobox"><strong><a href="/applications/'.nameToUrl($app->category()).'/'.nameToUrl($app->name()).'/development">Development Information</a></strong></div>';
     }
     return $content;
 }
 
 function printPage($app)
 {
     print '<div class="main-content">';
 
     //Print screenshot or dummy "no screenshot available" image
     $screenshotUrl = '/images/screenshots/'.nameToUrl($app->name()).'.png';
     $screenshotResizedUrl = '/images/screenshots/resized/'.nameToUrl($app->name()).'.png';
     if (file_exists($_SERVER["DOCUMENT_ROOT"].$screenshotUrl)) {
         print '<div class="app-screenshot"><a href="'.$screenshotUrl.'">
         <img class="app-screenshot" src="'.$screenshotResizedUrl.'" alt="Screenshot" />
         </a></div>'; ///TODO: image size
     } else {
         print '<div class="app-screenshot">
         <img class="app-screenshot" src="/images/screenshots/no_screenshot_available.png" alt="No screenshot available" />
         </div>'; ///TODO: image size
     }
 
     print $app->descriptionHtml();
     if ($app->hasFeatures()) {
         print "<h2>Features</h2>";
         print $app->featureHtml();
     }
     if ($app->hasVersions() || $app->hasAuthors() || $app->hasLicense()) {
         print '<p id="app-additional-info-paragraph"></p>';
         print '<div id="app-additional-info">';
         if ($app->hasAuthors()) {
             print '<h2>Developed By</h2>';
             print $app->authorHtml();
         }
         if ($app->hasVersions()) {
             ///TODO: Versions not yet implemented
         }
         if ($app->hasLicense()) {
             print '<h2>License</h2>';
             print $app->licenseHtml();
         }
         print '</div>';
     }
 
     //If JS available, hide the application details (authors) and show a toggle link
     ?>
     <script type="text/javascript">
     /* <![CDATA[ */
         $(document).ready(function(){
             $('#app-additional-info').toggle();
             $('#app-additional-info-paragraph').append('<a href="#" id="app-additional-info-toggle">Show more information about <?php print $app->name(); ?></a>');
             //Add toggle effect
             $('#app-additional-info-toggle').click(function(){
                $('#app-additional-info').slideToggle('slow');
                return false;
             });
         });
     /* ]]> */
     </script>
     <?php
     print '</div>';
-    print '<div style="clear:all;">&nbsp;</div>';
+    print '<div style="clear:both;">&nbsp;</div>';
 }
 
 function printDevelopmentPage($app)
 {
     print '<div class="main-content">';
 
     print '<h2>Source code repository</h2>';
 
     print $app->browseSourcesHtml();
 
     print $app->checkoutSourcesHtml();
 
     //Show bugzilla related links only for applications hosted at bugs.kde.org
     if ($app->hasBugTracker() && !$app->isBugTrackerExternal()) {
         print '<h2>Search for open bugs</h2>';
 
         $product = $app->bugzillaProduct();
 
         $componentstring = "";
         if ($app->bugzillaComponent()) {
             $componentstring = '&component='.$app->bugzillaComponent();
         }
 
         $majorBugs  = 'https://bugs.kde.org/buglist.cgi?short_desc_type=allwordssubstr&product='.$product.$componentstring.'&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=critical&bug_severity=grave&bug_severity=major&bug_severity=crash';
         $minorBugs  = 'https://bugs.kde.org/buglist.cgi?short_desc_type=allwordssubstr&product='.$product.$componentstring.'&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=normal&bug_severity=minor';
         $wishes     = 'https://bugs.kde.org/buglist.cgi?short_desc_type=allwordssubstr&product='.$product.$componentstring.'&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=wishlist';
         $juniorJobs = 'https://bugs.kde.org/buglist.cgi?keywords=junior-jobs&product='.$product.$componentstring.'&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit';
 
         print '<ul>';
         print '<li><a href="'.htmlspecialchars($majorBugs).'">Major Bug reports</a></li>';
         print '<li><a href="'.htmlspecialchars($minorBugs).'">Minor Bug reports</a></li>';
         print '<li><a href="'.htmlspecialchars($wishes).'">Wish reports</a></li>';
         print '<li><a href="'.htmlspecialchars($juniorJobs).'">Junior Jobs</a></li>';
         print '</ul>';
     }
 
     if ($app->hasEbn()) {
         print '<h2>Code checking</h2>';
         print '<p>Show results of automated code checking on the English Breakfast Network (EBN).</p>';
         print '<ul>';
         print '<li><a href="'.htmlspecialchars($app->ebnCodeCheckingUrl()).'">Code Checking</a></li>';
         print '<li><a href="'.htmlspecialchars($app->ebnDocCheckingUrl()).'">Documentation Sanitation</a></li>';
         print '</ul>';
     }
 
     print '</div>';
 }
 
 $sidebar_content = printSidebar( $app, isset($_GET['development']) );
 
 require('../aether/config.php');
 
 $pageConfig = array_merge($pageConfig, [
     'title' => $app->name(),
     'cssFile' => '/css/applications.css'
 ]);
 
 require('../aether/header.php');
 $site_root = "../";
 ?>
 <main class="container">
 
 <h1><?php print $app->name() ?></h1>
 
 <div id="sidebar">
 <?php print $sidebar_content; ?>
 </div>
 
 <script src="/js/jquery-3.1.1.min.js"></script>
 <?php
 
 if (!$development) {
     printPage($app);
 } else {
     printDevelopmentPage($app);
 }
 
 ?>
 <div style="clear: left;">&nbsp;</div>
 
 </main>
 <?php
   require('../aether/footer.php');