Permalink
Browse files

Merge pull request #7288 from dscravag/nightly2

Nightly 2013-01-04
  • Loading branch information...
dscravag committed Jan 4, 2013
2 parents ea325f7 + ea2b9f6 commit 67b917fa8146708828708cd1077ed007200fa2c9
Showing with 599 additions and 3,470 deletions.
  1. +1 −1 apps/browser/style/browser.css
  2. +1 −0 apps/communications/contacts/index.html
  3. +0 −39 apps/communications/contacts/style/contacts.css
  4. +43 −0 apps/communications/contacts/style/overlay.css
  5. +14 −0 apps/communications/ftu/index.html
  6. +2 −0 apps/communications/ftu/js/app.js
  7. +1 −1 apps/communications/ftu/js/data_mobile.js
  8. +2 −1 apps/communications/ftu/js/navigation.js
  9. +8 −0 apps/communications/ftu/js/sim_manager.js
  10. +1 −0 apps/communications/ftu/js/ui.js
  11. +4 −3 apps/communications/ftu/locales/ftu.en-US.properties
  12. +0 −3,050 apps/communications/ftu/resources/apn.json
  13. +3 −1 apps/email/index.html
  14. +26 −2 apps/email/js/compose-cards.js
  15. +2 −1 apps/email/style/compose-cards.css
  16. +69 −44 apps/music/js/metadata.js
  17. +15 −1 apps/settings/index.html
  18. +221 −0 apps/settings/js/about.js
  19. +4 −2 apps/settings/js/bluetooth.js
  20. +2 −0 apps/settings/js/call.js
  21. +2 −1 apps/settings/js/onpair.js
  22. +5 −5 apps/settings/js/phone_lock.js
  23. +2 −193 apps/settings/js/settings.js
  24. +3 −0 apps/settings/locales/settings.en-US.properties
  25. +52 −34 apps/sms/js/sms.js
  26. +4 −4 apps/system/index.html
  27. +0 −27 apps/system/js/activities.js
  28. +18 −0 apps/system/js/battery_manager.js
  29. +10 −2 apps/system/js/cards_view.js
  30. +3 −1 apps/system/js/list_menu.js
  31. +4 −0 apps/system/js/sleep_menu.js
  32. +54 −30 apps/system/js/window_manager.js
  33. +5 −8 apps/video/js/video.js
  34. +4 −8 apps/video/js/view.js
  35. +5 −8 shared/js/media/video_player.js
  36. +9 −3 shared/js/mediadb.js
@@ -630,7 +630,7 @@ li[role="tab"] a {
outline: none;
margin-left: -30px;
text-overflow: ellipsis;
- max-width: calc(33% - 37px);
+ max-width: calc(33% - 39px);
overflow: hidden;
}
@@ -17,6 +17,7 @@
<link href="/contacts/style/app.css" rel="stylesheet">
<link href="/contacts/style/contacts.css" rel="stylesheet">
+ <link href="/contacts/style/overlay.css" rel="stylesheet">
<link href="/contacts/style/search.css" rel="stylesheet">
<link href="/contacts/style/input_cancel_button.css" rel="stylesheet">
<link href="/contacts/style/fixed_header.css" rel="stylesheet">
@@ -283,45 +283,6 @@ fieldset legend.action:after {
font-size: 1.4rem;
}
-/*
- Loading screen while loading contacts
-*/
-
-#loading-overlay {
- display: none;
- z-index: 200;
- background: rgba(0,0,0,.8);
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- padding: 2rem;
- -moz-box-sizing: border-box;
-}
-
-#loading-overlay.show-overlay {
- display: block;
-}
-
-.loading-container {
- position: relative;
- top: 50%;
- margin-top: -6rem;
-}
-
-.loading-header {
- text-align: left;
- padding: 2rem 1rem 4rem 1rem;
- -moz-box-sizing: border-box;
- color: white;
- font-size: -moz-calc(10 * 0.226rem);
- font-weight: 300;
- border-top: .1rem solid white;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
/* MARK AS REMOVED */
.removed {
@@ -0,0 +1,43 @@
+/*
+ Loading screen while loading contacts
+*/
+
+#loading-overlay {
+ display: none;
+ z-index: 200;
+ background: rgba(0,0,0,.8);
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: 2rem;
+ -moz-box-sizing: border-box;
+}
+
+#loading-overlay.show-overlay {
+ display: block;
+ visibility: visible;
+}
+
+.loading-container {
+ position: relative;
+ top: 50%;
+ margin-top: -6rem;
+}
+
+.loading-header {
+ text-align: left;
+ padding: 2rem 1rem 4rem 1rem;
+ -moz-box-sizing: border-box;
+ color: white;
+ font-size: -moz-calc(10 * 0.226rem);
+ font-weight: 300;
+ border-top: .1rem solid white;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.loading-icon {
+ text-align: center;
+}
@@ -11,8 +11,10 @@
<link rel="stylesheet" type="text/css" href="/shared/style/buttons.css">
<link rel="stylesheet" type="text/css" href="/shared/style/confirm.css">
<link rel="stylesheet" type="text/css" href="/shared/style_unstable/lists.css">
+ <link rel="stylesheet" type="text/css" href="/shared/style_unstable/progress_activity.css">
<!-- Specific style -->
+ <link rel="stylesheet" type="text/css" href="/contacts/style/overlay.css">
<link rel="stylesheet" type="text/css" href="/ftu/css/style.css">
<link rel="stylesheet" type="text/css" href="/ftu/css/fb_extensions.css">
<link rel="stylesheet" type="text/css" href="/facebook/style/curtain_frame.css">
@@ -29,6 +31,7 @@
<link rel="resource" type="application/l10n" href="/shared/locales/tz.ini"/>
<link rel="resource" type="application/json" href="/shared/resources/tz.json"/>
<link rel="resource" type="application/json" href="/shared/resources/languages.json"/>
+ <link rel="resource" type="application/json" href="/shared/resources/apn.json"/>
<script type="text/javascript" src="/shared/js/l10n.js"></script>
<script type="text/javascript" src="/shared/js/l10n_date.js"></script>
<script type="text/javascript" src="/shared/js/tz_select.js"></script>
@@ -485,6 +488,17 @@ <h1 data-l10n-id='offline-dialog-title'>You must be connected to the Internet to
</section>
</form>
+ <section id="loading-overlay" role="region" class="view">
+ <article class="loading-container">
+ <header class="loading-header" data-l10n-id="simContacts-importing">
+ Importing SIM contacts…
+ </header>
+ <p class="loading-icon" role="status">
+ <progress></progress>
+ </p>
+ </article>
+ </section>
+
<iframe id="fb-curtain" src="/facebook/curtain.html"></iframe>
<iframe id="fb-oauth" hidden src="/facebook/fb_oauth.html"></iframe>
<iframe id="fb-extensions"></iframe>
@@ -38,6 +38,8 @@ var AppManager = {
UIManager.pincodeScreen.classList.add('show');
document.getElementById('fake-sim-pin').focus();
} else {
+ // Set the unlocked status so we can still import
+ SimManager.unlocked = true;
UIManager.activationScreen.classList.add('show');
window.location.hash = '#languages';
}
@@ -41,7 +41,7 @@ var DataMobile = {
},
getAPN: function dm_getapn(callback) {
// TODO Use 'shared' version
- var APN_FILE = '/ftu/resources/apn.json';
+ var APN_FILE = '/shared/resources/apn.json';
var self = this;
// Retrieve the list of APN configurations
// load and query APN database, then trigger callback on results
@@ -218,7 +218,8 @@ var Navigation = {
break;
}
- if (steps[this.currentStep].hash === actualHash) {
+ if (this.currentStep <= numSteps &&
+ steps[this.currentStep].hash === actualHash) {
UIManager.navBar.classList.remove('back-only');
}
},
@@ -23,14 +23,22 @@ var SimManager = {
importContacts: function sm_importContacts() {
var feedback = UIManager.simImportFeedback;
+
feedback.innerHTML = _('simContacts-importing');
+ UIManager.navBar.setAttribute('aria-disabled', 'true');
+ UIManager.loadingOverlay.classList.add('show-overlay');
+
importSIMContacts(
function() {
feedback.innerHTML = _('simContacts-reading');
}, function(n) {
feedback.innerHTML = _('simContacts-imported3', {n: n});
+ UIManager.navBar.removeAttribute('aria-disabled');
+ UIManager.loadingOverlay.classList.remove('show-overlay');
}, function() {
feedback.innerHTML = _('simContacts-error');
+ UIManager.navBar.removeAttribute('aria-disabled');
+ UIManager.loadingOverlay.classList.remove('show-overlay');
}.bind(this));
},
@@ -13,6 +13,7 @@ var UIManager = {
'finish-screen',
'nav-bar',
'main-title',
+ 'loading-overlay',
// PIN Screen
'pincode-screen',
'pin-input',
@@ -97,12 +97,13 @@ simContacts-imported3[few] = Imported {{n}} contacts
simContacts-imported3[many] = Imported {{n}} contacts
simContacts-imported3[other] = Imported {{n}} contacts
importContacts2 = Import contacts from
-importSim2 = SIM card
-importFb2 = Facebook
-fb-checking = … checking
+importSim2 = SIM card
+importFb2 = Facebook
+fb-checking = … checking
facebook-stats = {{imported}}/{{total}} friends imported
notImportedYet = Not imported yet
otherAccount = Other accounts
+mobile = Mobile
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
# About your rights
Oops, something went wrong.

0 comments on commit 67b917f

Please sign in to comment.