Bug 1163360 - Update Pocket code to latest version (May 9th code drop) r=jaws, a=dolske
authorJustin Dolske <dolske@mozilla.com>
Sun, 10 May 2015 17:16:57 -0700
changeset 274569 042cb568f4dd48f3cf91fabe1afdc88111eb1f8e
parent 274568 50d6fcc42b55f8e609168bb6df7a9b8b91488b66
child 274570 6af1bc0bcd35d72a63c2d1d0ae5b789f54486842
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, dolske
bugs1163360
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1163360 - Update Pocket code to latest version (May 9th code drop) r=jaws, a=dolske
browser/components/pocket/panels/css/saved.css
browser/components/pocket/panels/css/signup.css
browser/components/pocket/panels/js/dictionary.js
browser/components/pocket/panels/js/saved.js
browser/components/pocket/panels/js/signup.js
browser/components/pocket/panels/js/tmpl.js
browser/components/pocket/panels/tmpl/signup_shell.handlebars
--- a/browser/components/pocket/panels/css/saved.css
+++ b/browser/components/pocket/panels/css/saved.css
@@ -7,16 +7,17 @@
  *  Global
  *  Loading spinner
  *  Core detail
  *  Tag entry
  *  Recent/suggested tags
  *  Premium upsell
  *  Token input/autocomplete
  *  Overflow mode
+ *  Language overrides
  */
 
 /*=Global
 --------------------------------------------------------------------------------------- */
 .pkt_ext_containersaved {
     background-color: #fbfbfb;
     border-radius: 4px;
     display: block;
@@ -807,8 +808,18 @@
     box-sizing: border-box;
     left: 0;
     padding-left: 1em;
     padding-right: 1em;
     text-align: center;
     top: 8.3em;
     width: 100%;
 }
+
+/*=Language overrides
+--------------------------------------------------------------------------------------- */
+.pkt_ext_saved_es .pkt_ext_btn {
+    min-width: 5em;
+}
+.pkt_ext_saved_de .pkt_ext_btn,
+.pkt_ext_saved_ru .pkt_ext_btn {
+    min-width: 6em;
+}
--- a/browser/components/pocket/panels/css/signup.css
+++ b/browser/components/pocket/panels/css/signup.css
@@ -4,16 +4,17 @@
  *  With base elements out of the way, this sets all custom styling for the extension.
  *
  *  Contents:
  *  Global
  *  Core detail
  *  Core detail - storyboard
  *  Buttons
  *  Overflow mode
+ *  Language overrides
  */
 
 /*=Global
 --------------------------------------------------------------------------------------- */
 .pkt_ext_containersignup {
     background-color: #ebebeb;
     color: #333;
     display: block;
@@ -322,9 +323,54 @@
     font-size: 14px;
     min-width: 12.6em;
     padding-left: 0.75em;
     padding-right: 0.75em;
 }
 .pkt_ext_signup_overflow .signup-btn-firefox .text {
     padding-left: 0;
     padding-right: 0;
+}
+
+/*=Language overrides
+--------------------------------------------------------------------------------------- */
+.pkt_ext_signup_de .pkt_ext_introstoryone_img {
+    margin-right: -5px;
+    padding-left: 0;
+}
+.pkt_ext_signup_de .pkt_ext_introstorytwo .pkt_ext_tagline,
+.pkt_ext_signup_es .pkt_ext_introstorytwo .pkt_ext_tagline,
+.pkt_ext_signup_ja .pkt_ext_introstorytwo .pkt_ext_tagline,
+.pkt_ext_signup_ru .pkt_ext_introstorytwo .pkt_ext_tagline {
+    margin-bottom: 0.5em;
+}
+.pkt_ext_signup_de .signup-btn-firefox .text,
+.pkt_ext_signup_de .signup-btn-email,
+.pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-firefox .text,
+.pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-email,
+.pkt_ext_signup_ja .signup-btn-firefox .text,
+.pkt_ext_signup_ja .signup-btn-email,
+.pkt_ext_signup_ru .signup-btn-firefox .text,
+.pkt_ext_signup_ru .signup-btn-email {
+    font-size: 15px;
+}
+.pkt_ext_signup_ja .signup-btn-firefox .text,
+.pkt_ext_signup_ru .signup-btn-firefox .text {
+    left: 15px;
+}
+.pkt_ext_signup_de .signup-btn-email,
+.pkt_ext_signup_es .pkt_ext_signupdetail_hero .signup-btn-email,
+.pkt_ext_signup_ja .signup-btn-email,
+.pkt_ext_signup_ru .signup-btn-email {
+    min-width: 13em;
+    padding: 0.8533em 1.2667em;
+}
+.pkt_ext_signup_de .pkt_ext_logo,
+.pkt_ext_signup_es .pkt_ext_logo,
+.pkt_ext_signup_ru .pkt_ext_logo {
+    padding-top: 15px;
+}
+.pkt_ext_signup_de .pkt_ext_introdetailhero .pkt_ext_tagline,
+.pkt_ext_signup_es .pkt_ext_introdetailhero .pkt_ext_tagline,
+.pkt_ext_signup_ja .pkt_ext_introdetailhero .pkt_ext_tagline,
+.pkt_ext_signup_ru .pkt_ext_introdetailhero .pkt_ext_tagline {
+    font-size: 13px;
 }
\ No newline at end of file
--- a/browser/components/pocket/panels/js/dictionary.js
+++ b/browser/components/pocket/panels/js/dictionary.js
@@ -30,20 +30,20 @@ Translations.en =
 };
 
 Translations.de =
 {
   addtags: "Tags hinzufügen",
   alreadyhaveacct: "Sind Sie bereits Pocket-Nutzer?",
   continueff: "Mit Firefox fortfahren",
   error1: "Wir konnten keine vorgeschlagenen Tags für dieses Element finden.",
-  error2: "Tags dürfen höchsten 25 Zeichen lang sein.",
   error3: "Bitte melden Sie sich bei Pocket an und versuchen Sie es erneut.",
   learnmore: "Mehr erfahren",
   loginnow: "Anmelden",
+  maxtaglength: "Tags dürfen höchsten 25 Zeichen lang sein.",
   onlylinkssaved: "Es können nur Links gespeichert werden",
   pagenotsaved: "Seite nicht gespeichert",
   pageremoved: "Seite entfernt",
   pagesaved: "Bei Pocket gespeichert",
   processingremove: "Seite wird entfernt…",
   processingtags: "Tags werden hinzugefügt…",
   removepage: "Seite entfernen",
   save: "Speichern",
@@ -60,20 +60,20 @@ Translations.de =
 };
 
 Translations.es =
 {
   addtags: "Añadir etiquetas",
   alreadyhaveacct: "¿Ya tiene cuenta Pocket?",
   continueff: "Continuar con Firefox",
   error1: "No se han encontrado etiquetas sugeridas para este elemento.",
-  error2: "Las etiquetas están limitadas a 25 caracteres.",
   error3: "Inicie sesión en Pocket y vuelva a intentarlo.",
   learnmore: "Saber más",
   loginnow: "Iniciar sesión",
+  maxtaglength: "Las etiquetas están limitadas a 25 caracteres.",
   onlylinkssaved: "Solo se pueden guardar enlaces",
   pagenotsaved: "Página no guardada",
   pageremoved: "Página eliminada",
   pagesaved: "Guardada en Pocket",
   processingremove: "Eliminando página…",
   processingtags: "Añadiendo etiquetas…",
   removepage: "Eliminar página",
   save: "Guardar",
@@ -90,20 +90,20 @@ Translations.es =
 };
 
 Translations.ja =
 {
   addtags: "タグを追加",
   alreadyhaveacct: "アカウントをお持ちですか?",
   continueff: "Firefox で続行",
   error1: "この項目に合うタグが見つかりません。",
-  error2: "タグは 25 文字までです。",
   error3: "Pocket にログインしてやり直してください。",
   learnmore: "詳細",
   loginnow: "ログイン",
+  maxtaglength: "タグは 25 文字までです。",
   onlylinkssaved: "リンクのみ保存できます",
   pagenotsaved: "ページを保存できませんでした",
   pageremoved: "ページを削除しました",
   pagesaved: "Pocket に保存しました",
   processingremove: "ページを削除中...",
   processingtags: "タグを追加中...",
   removepage: "ページを削除",
   save: "保存",
@@ -120,20 +120,20 @@ Translations.ja =
 };
 
 Translations.ru =
 {
   addtags: "Добавить теги",
   alreadyhaveacct: "Уже используете Pocket?",
   continueff: "Продолжить через Firefox",
   error1: "Мы не смогли найти для этого элемента рекомендуемые теги.",
-  error2: "Длина тега не должна превышать 25 символов.",
   error3: "Пожалуйста, войдите в Pocket, и попробуйте ещё раз.",
   learnmore: "Узнайте больше",
   loginnow: "Войдите",
+  maxtaglength: "Длина тега не должна превышать 25 символов.",
   onlylinkssaved: "Можно сохранять только ссылки",
   pagenotsaved: "Страница не сохранена",
   pageremoved: "Страница удалена",
   pagesaved: "Сохранено в Pocket",
   processingremove: "Удаление страницы...",
   processingtags: "Добавление тегов...",
   removepage: "Удалить страницу",
   save: "Сохранить",
--- a/browser/components/pocket/panels/js/saved.js
+++ b/browser/components/pocket/panels/js/saved.js
@@ -563,16 +563,22 @@ PKT_SAVED_OVERLAY.prototype = {
         this.dictJSON.pockethost = this.pockethost;
 
         // extra modifier class for collapsed state
         if (this.inoverflowmenu)
         {
             $('body').addClass('pkt_ext_saved_overflow');
         }
 
+        // extra modifier class for language
+        if (this.locale)
+        {
+            $('body').addClass('pkt_ext_saved_' + this.locale);
+        }
+
         // Create actual content
         $('body').append(Handlebars.templates.saved_shell(this.dictJSON));
 
         // Add in premium content (if applicable based on premium status)
         this.createPremiumFunctionality();
 
         // Initialize functionality for overlay
         this.wrapper = $('.pkt_ext_containersaved');
--- a/browser/components/pocket/panels/js/signup.js
+++ b/browser/components/pocket/panels/js/signup.js
@@ -190,16 +190,22 @@ PKT_SIGNUP_OVERLAY.prototype = {
         this.dictJSON.pockethost = this.pockethost;
 
         // extra modifier class for collapsed state
         if (this.inoverflowmenu)
         {
             $('body').addClass('pkt_ext_signup_overflow');
         }
 
+        // extra modifier class for language
+        if (this.locale)
+        {
+            $('body').addClass('pkt_ext_signup_' + this.locale);
+        }
+
         // Create actual content
         if (this.variant == 'storyboard')
         {
             $('body').append(Handlebars.templates.signupstoryboard_shell(this.dictJSON));
         }
         else
         {
             $('body').append(Handlebars.templates.signup_shell(this.dictJSON));
--- a/browser/components/pocket/panels/js/tmpl.js
+++ b/browser/components/pocket/panels/js/tmpl.js
@@ -47,25 +47,25 @@ templates['signup_shell'] = template({"1
     + "</span></a></p>\n	<p class=\"btn-container\"><a href=\"http://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
     + "/signup?force=email&src=extension&s="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
     + "&t=wlm\" target=\"_blank\" class=\"btn btn-secondary signup-btn-email signup-btn-initstate\">"
     + escapeExpression(((helper = (helper = helpers.signupemail || (depth0 != null ? depth0.signupemail : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupemail","hash":{},"data":data}) : helper)))
     + "</a></p>\n";
 },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div class=\"pkt_ext_introdetail\">\n	<h2 class=\"pkt_ext_logo\">Pocket</h2>\n	<p class=\"pkt_ext_tagline\">"
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div class=\"pkt_ext_introdetail pkt_ext_introdetailhero\">\n	<h2 class=\"pkt_ext_logo\">Pocket</h2>\n	<p class=\"pkt_ext_tagline\">"
     + escapeExpression(((helper = (helper = helpers.tagline || (depth0 != null ? depth0.tagline : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"tagline","hash":{},"data":data}) : helper)))
-    + "</p>\n	<p><a class=\"pkt_ext_learnmore\" href=\"http://"
+    + "</p>\n	<p class=\"pkt_ext_learnmorecontainer\"><a class=\"pkt_ext_learnmore\" href=\"http://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
     + "?s="
     + escapeExpression(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"variant","hash":{},"data":data}) : helper)))
     + "&t=wlm&src=ff_learn_more\" target=\"_blank\">"
     + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
-    + "</a></p>\n	<div class=\"pkt_ext_introimg\"></div>\n</div>\n<div class=\"pkt_ext_signupdetail\">\n	<h4>"
+    + "</a></p>\n	<div class=\"pkt_ext_introimg\"></div>\n</div>\n<div class=\"pkt_ext_signupdetail pkt_ext_signupdetail_hero\">\n	<h4>"
     + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
     + "</h4>\n";
   stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
   if (stack1 != null) { buffer += stack1; }
   return buffer + "	<p class=\"alreadyhave\">"
     + escapeExpression(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))
     + " <a href=\"http://"
     + escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
--- a/browser/components/pocket/panels/tmpl/signup_shell.handlebars
+++ b/browser/components/pocket/panels/tmpl/signup_shell.handlebars
@@ -1,16 +1,16 @@
-<div class="pkt_ext_introdetail">
+<div class="pkt_ext_introdetail pkt_ext_introdetailhero">
 	<h2 class="pkt_ext_logo">Pocket</h2>
 	<p class="pkt_ext_tagline">{{tagline}}</p>
-  <p><a class="pkt_ext_learnmore" href="http://{{pockethost}}?s={{variant}}&t=wlm&src=ff_learn_more" target="_blank">{{learnmore}}</a></p>
-  <div class="pkt_ext_introimg"></div>
+	<p class="pkt_ext_learnmorecontainer"><a class="pkt_ext_learnmore" href="http://{{pockethost}}?s={{variant}}&t=wlm&src=ff_learn_more" target="_blank">{{learnmore}}</a></p>
+	<div class="pkt_ext_introimg"></div>
 </div>
-<div class="pkt_ext_signupdetail">
+<div class="pkt_ext_signupdetail pkt_ext_signupdetail_hero">
 	<h4>{{signuptosave}}</h4>
- {{#if fxasignedin}}
- <p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
- {{else}}
- <p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
- <p class="btn-container"><a href="http://{{pockethost}}/signup?force=email&src=extension&s={{variant}}&t=wlm" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
- {{/if}}
- <p class="alreadyhave">{{alreadyhaveacct}} <a href="http://{{pockethost}}/login?ep=3&src=extension&s={{variant}}&t=wlm" target="_blank">{{loginnow}}</a>.</p>
+	{{#if fxasignedin}}
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signinfirefox}}</span></a></p>
+	{{else}}
+	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?s={{variant}}&t=wlm" target=_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
+	<p class="btn-container"><a href="http://{{pockethost}}/signup?force=email&src=extension&s={{variant}}&t=wlm" target="_blank" class="btn btn-secondary signup-btn-email signup-btn-initstate">{{signupemail}}</a></p>
+	{{/if}}
+	<p class="alreadyhave">{{alreadyhaveacct}} <a href="http://{{pockethost}}/login?ep=3&src=extension&s={{variant}}&t=wlm" target="_blank">{{loginnow}}</a>.</p>
 </div>
\ No newline at end of file