Some minor language changes

mozilla-b2g · Nov 24, 2014 · dc9a0db · dc9a0db
1 parent 5498a01
commit dc9a0db
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 24 deletions.
diff --git a/apps/privacy-panel/locales/privacypanel.en-US.properties b/apps/privacy-panel/locales/privacypanel.en-US.properties
@@ -26,6 +26,7 @@ ala-custom-location-alert = You haven't set a custom location yet. Please set th
 # ALA-6 (ALA: Custom Location)
 custom-location = Custom Location
 set-custom-location = Set custom location
+custom-location-description = Set a custom location which is used as a fixed position.
 
 
 # ALA-7 (ALA: Precise Location)

diff --git a/apps/privacy-panel/resources/about.json b/apps/privacy-panel/resources/about.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.0.13",
-  "build": "?"
+  "version": "1.0",
+  "build": "d1bc8fe8"
 }
diff --git a/apps/privacy-panel/style/panels.css b/apps/privacy-panel/style/panels.css
@@ -121,6 +121,23 @@ section[data-geolocation="true"][data-ala="true"][data-type="user-defined"] .typ
   opacity: 1;
 }
 
+.panel-link {
+  padding-left: 30px;
+}
+
+.blur-label {
+  padding-top: 5px;
+}
+
+.custom-location-description {
+  min-height: 0;
+}
+
+.custom-location-description p {
+  padding-bottom: 0;
+  padding-top: 0;
+}
+
 /**
  * Guided tour
  */

diff --git a/apps/privacy-panel/templates/ala/exception.html b/apps/privacy-panel/templates/ala/exception.html
@@ -20,16 +20,17 @@ <h1 data-l10n-id="location-accuracy">Location Accuracy</h1>
           </a>
         </li>
         <li>
-          <p></p>
-          <span class="button icon icon-dialog">
-            <select class="app-type">
-              <option value="system-settings" data-l10n-id="global-settings">Global Settings</option>
-              <option value="blur" data-l10n-id="adjustment">Adjustment</option>
-              <option value="user-defined" data-l10n-id="custom-location">Custom Location</option>
-              <option value="no-location" data-l10n-id="no-location">No Location</option>
-              <option value="precise" data-l10n-id="precise">Precise</option>
-            </select>
-          </span>
+          <p>
+            <span class="button icon icon-dialog">
+              <select class="app-type">
+                <option value="system-settings" data-l10n-id="global-settings">Global Settings</option>
+                <option value="blur" data-l10n-id="adjustment">Adjustment</option>
+                <option value="user-defined" data-l10n-id="custom-location">Custom Location</option>
+                <option value="no-location" data-l10n-id="no-location">No Location</option>
+                <option value="precise" data-l10n-id="precise">Precise</option>
+              </select>
+            </span>
+          </p>
         </li>
 
         <li class="type-blur type-box">
@@ -39,8 +40,11 @@ <h1 data-l10n-id="location-accuracy">Location Accuracy</h1>
           </label>
         </li>
 
+        <li class="type-custom-location type-box custom-location-description">
+          <p class="description" data-l10n-id="custom-location-description">Set a custom location which is used as a fixed position.</p>
+        </li>
         <li class="type-custom-location type-box">
-          <a class="menu-item set-custom-location" data-icon="notifications" href="#set-custom-location">
+          <a class="menu-item set-custom-location panel-link" href="#set-custom-location">
             <span data-l10n-id="set-custom-location">Set custom location</span>
           </a>
         </li>

diff --git a/apps/privacy-panel/templates/ala/main.html b/apps/privacy-panel/templates/ala/main.html
@@ -31,29 +31,33 @@ <h1 data-l10n-id="location-accuracy">Location Accuracy</h1>
           </p>
         </li>
         <li class="show-when-ala-on geolocation-type-box">
-          <p></p>
-          <span class="button icon icon-dialog">
-            <select name="geolocation.type">
-              <option value="blur" data-l10n-id="adjustment">Adjustment</option>
-              <option value="user-defined" data-l10n-id="custom-location">Custom Location</option>
-              <option value="no-location" data-l10n-id="no-location" selected>No Location</option>
-              <option value="precise" data-l10n-id="precise">Precise</option>
-            </select>
-          </span>
+          <p>
+            <span class="button icon icon-dialog">
+              <select name="geolocation.type">
+                <option value="blur" data-l10n-id="adjustment">Adjustment</option>
+                <option value="user-defined" data-l10n-id="custom-location">Custom Location</option>
+                <option value="no-location" data-l10n-id="no-location" selected>No Location</option>
+                <option value="precise" data-l10n-id="precise">Precise</option>
+              </select>
+            </span>
+          </p>
         </li>
         <li class="type-blur type-box show-when-ala-on">
           <label>
             <p class="blur-label"></p>
             <input class="blur-slider" name="geolocation.blur.slider" type="range" step="1" min="1" max="12" data-default="1">
           </label>
         </li>
+        <li class="type-custom-location type-box show-when-ala-on custom-location-description">
+          <p class="description" data-l10n-id="custom-location-description">Set a custom location which is used as a fixed position.</p>
+        </li>
         <li class="type-custom-location type-box show-when-ala-on">
-          <a class="menu-item set-custom-location" data-icon="notifications" href="#">
+          <a class="menu-item set-custom-location panel-link" href="#">
             <span data-l10n-id="set-custom-location">Set custom location</span>
           </a>
         </li>
         <li class="show-when-ala-on add-exception-box">
-          <a class="menu-item pp-link" data-icon="notifications" href="#ala-exceptions">
+          <a class="menu-item pp-link panel-link" href="#ala-exceptions">
             <span data-l10n-id="add-exceptions">Add exceptions</span>
           </a>
         </li>