Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Bug 836776 - [Settings UX] [Activity Indicator] Use activity indicator to tell user of system searching for wifi network #8780

Merged
merged 1 commit into from

2 participants

@pivanov
Collaborator

Bug #836776

@samjoch samjoch merged commit aac434b into mozilla-b2g:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 3, 2013
  1. @pivanov

    Bug 836776 - [Settings UX] [Activity Indicator] Use activity indicato…

    pivanov authored
    …r to tell user of system searching for wifi network
This page is out of date. Refresh to see the latest.
Showing with 20 additions and 4 deletions.
  1. +4 −3 apps/settings/index.html
  2. +16 −1 apps/settings/style/lists.css
View
7 apps/settings/index.html
@@ -317,7 +317,7 @@ <h1 data-l10n-id="wifi"> Wi-Fi </h1>
<small data-l10n-id="networkNotification-expl">Notify me when an open network is available</small>
<a data-l10n-id="networkNotification">Network notification</a>
</li>
- <li id="wps-column" hidden>
+ <li id="wps-column">
<small data-l10n-id="wpsDescription">Automatic wireless network configuration</small>
<a data-l10n-id="wpsMessage">Connect with WPS</a>
</li>
@@ -330,8 +330,8 @@ <h2 data-l10n-id="availableNetworks"> Available Networks </h2>
<li class="explanation" data-state="off" data-l10n-id="wifi-disabled">
Turn Wi-Fi on to view available networks.
</li>
- <li class="explanation" data-state="on" data-l10n-id="scanning">
- Searching…
+ <li data-state="on">
+ <progress></progress><span data-l10n-id="scanning">Searching…</span>
</li>
<li data-state="ready">
<label>
@@ -354,6 +354,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
<script src="js/wifi.js"></script>
<link rel="stylesheet" type="text/css" href="shared/style/buttons.css"/>
+ <link rel="stylesheet" type="text/css" href="shared/style_unstable/progress_activity.css"/>
-->
</section>
View
17 apps/settings/style/lists.css
@@ -44,6 +44,21 @@ ul li.disabled > a {
pointer-events: none;
}
+ul > li > progress {
+ display: inline-block;
+ margin: 0 0 0 3rem;
+ padding: 0;
+}
+
+ul > li > progress + span {
+ display: inline-block;
+ vertical-align: middle;
+ margin: 0;
+ padding: 0 0 0 1rem;
+ color: #505b5b;
+ font-size: 1.4rem;
+}
+
/* description + value on the same line */
ul li > a span {
position: absolute;
@@ -308,7 +323,7 @@ section[role="region"] > ul > li > p + .fake-select {
* Progress, Meter
*/
-ul li progress, ul li meter {
+li progress, li meter {
display: block;
width: calc(100% - 6rem);
height: 3rem;
Something went wrong with that request. Please try again.