[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/sites/www/applications
From:       Harald Sitter <null () kde ! org>
Date:       2018-03-12 12:20:54
Message-ID: E1evMRi-0007Le-So () code ! kde ! org
[Download RAW message or body]

SVN commit 1512194 by sitter:

make 'install' actually visible and snazzy

uses fontawesome to get a downloadish icon.
I tried breeze's download icon but it looks fairly meh rendered into a line of text.


 M  +3 -0      .htaccess  
 M  +5 -0      README.md  
 M  +15 -6     applicationpage.php  
 A             download.css  
 A             fonts (directory)  
 A             fonts/css (directory)  
 A             fonts/css/fa-brands.css  
 A             fonts/css/fa-brands.min.css  
 A             fonts/css/fa-regular.css  
 A             fonts/css/fa-regular.min.css  
 A             fonts/css/fa-solid.css  
 A             fonts/css/fa-solid.min.css  
 A             fonts/css/fontawesome-all.css  
 A             fonts/css/fontawesome-all.min.css  
 A             fonts/css/fontawesome.css  
 A             fonts/css/fontawesome.min.css  
 A             fonts/webfonts (directory)  
 AM            fonts/webfonts/fa-solid-900.eot  
 A             fonts/webfonts/fa-solid-900.svg  
 AM            fonts/webfonts/fa-solid-900.ttf  
 AM            fonts/webfonts/fa-solid-900.woff  
 AM            fonts/webfonts/fa-solid-900.woff2  


--- trunk/www/sites/www/applications/.htaccess #1512193:1512194
@@ -2,6 +2,9 @@
 
 # NOTE: we'll skip all rules if the path is an icons path!
 RewriteCond %{REQUEST_FILENAME} "^.*/icons/.*"
+RewriteRule  .?  -  [S=5]
+# ... and also skip fonts.
+RewriteCond %{REQUEST_FILENAME} "^.*/fonts/.*"
 RewriteRule  .?  -  [S=4]
 RewriteRule ^([\w]+)/?$ applicationlist.php?category=$1
 RewriteRule ^([\w]+)/([\w\.]+)/?$ applicationpage.php?category=$1&application=$2
--- trunk/www/sites/www/applications/README.md #1512193:1512194
@@ -3,6 +3,11 @@
 Do not add stuff manually! Talk to sitter@kde.org if you need something added.
 In the future this should work automatically.
 
+# Fonts
+
+`fonts/` contains fontawesome 5 css + web fonts. They are used for icons. Only
+the "solid" font type is included as the others are unused.
+
 # Old Data
 
 Old data is still in `apps/` for compatibility. The extractor code for that is
--- trunk/www/sites/www/applications/applicationpage.php #1512193:1512194
@@ -47,12 +47,6 @@
         $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>'; @@ -110,6 +104,21 @@
     {
 	$content .= '<div class="infobox"><strong><a \
href="'.$_SERVER[REQUEST_URI].'/development">Development \
Information</a></strong></div>';  }
+
+    $content .= <<<EOT
+        <link href="/applications/fonts/css/fontawesome-all.min.css" \
rel="stylesheet"> +        <link rel="stylesheet" href="/applications/download.css">
+
+        <div class="infobox"><strong>Get {$app->name()}</strong>
+            <div class="downloadButton">
+                <a href="appstream://{$app->AppStreamId()}">
+                    <span class="fa fa-download"></span>
+                    Install
+                </a>
+            </div>
+        </div>
+EOT;
+
     return $content;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]