apps mgmt: style experimental apps section, small design fixes

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 999a7f9ea4a8a3440bf38d6b6f1eefd0a222459d..a9c0615885a5f1110d6cca68ce10e6e3ca47105a 100644 (file)
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -231,6 +231,14 @@ span.version {
        border-color: #ce3702;
        color: #fff;
 }
+.apps-experimental {
+       color: #ce3702;
+}
+
+.app-score {
+       position: relative;
+       top: 4px;
+}
 
 #apps-list {
        position: relative;
@@ -289,6 +297,10 @@ span.version {
 #app-category-1 {
        border-bottom: 1px solid #e8e8e8;
 }
+/* capitalize "Other" category */
+#app-category-925 {
+       text-transform: capitalize;
+}
 
 .app-dependencies {
        margin-top: 10px;

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 1629a46416d74e63f0e8debf4a8bc66a015533c6..31de7fa2318196c7540193d718ffcf72c7f58943 100644 (file)
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -41,12 +41,12 @@ script(
 
 <script id="app-template" type="text/x-handlebars">
        {{#if firstExperimental}}
-               <div style="background-color: lightyellow; border-top:1px solid black; border-bottom:  1px solid black;">
+               <div class="section apps-experimental">
                        <h2><?php p($l->t('Experimental applications ahead')) ?></h2>
                        <p>
                                <?php p($l->t('Experimental apps are not checked for security ' .
-                       'issues and are new or known to be unstable and under heavy ' .
-                       'development. Installing these can cause data loss or security ' .
+                       'issues, new or known to be unstable and under heavy ' .
+                       'development. Installing them can cause data loss or security ' .
                        'breaches.')) ?>
                        </p>
                </div>
@@ -66,12 +66,12 @@ script(
                {{/if}}
        </div>
        {{#if profilepage}}</a>{{/if}}
-       {{#if score}}
-       <div class="app-score">{{{score}}}</div>
-       {{/if}}
        <div class="app-level">
                {{{level}}}
        </div>
+       {{#if score}}
+       <div class="app-score">{{{score}}}</div>
+       {{/if}}
        <div class="app-detailpage"></div>
 
        <div class="app-description-container hidden">
@@ -138,14 +138,14 @@ script(
                        <button class="settings-button" data-apps-slide-toggle="#app-settings-content"></button>
                </div>
 
-               <div id="app-settings-content" style="color: #ce3702">
+               <div id="app-settings-content" class="apps-experimental">
                        <input type="checkbox" id="enable-experimental-apps" <?php if($_['experimentalEnabled']) { print_unescaped('checked="checked"'); }?>>
                        <label for="enable-experimental-apps"><?php p($l->t('Enable experimental apps')) ?></label>
                        <p>
                                <small>
                                        <?php p($l->t('Experimental apps are not checked for security ' .
-                                               'issues and are new or known to be unstable and under heavy ' .
-                                               'development. Installing these can cause data loss or security ' .
+                                               'issues, new or known to be unstable and under heavy ' .
+                                               'development. Installing them can cause data loss or security ' .
                                                'breaches.')) ?>
                                </small>
                        </p>