зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1163360 - Update Pocket code to latest version (May 9th code drop) r=jaws, a=dolske
This commit is contained in:
Justin Dolske
Родитель
e407b59c15
Коммит
b6eb9d341c
|
|
@ -12,6 +12,7 @@
|
|||
* Premium upsell
|
||||
* Token input/autocomplete
|
||||
* Overflow mode
|
||||
* Language overrides
|
||||
*/
|
||||
|
||||
/*=Global
|
||||
|
|
@ -812,3 +813,13 @@
|
|||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
* Core detail - storyboard
|
||||
* Buttons
|
||||
* Overflow mode
|
||||
* Language overrides
|
||||
*/
|
||||
|
||||
/*=Global
|
||||
|
|
@ -327,4 +328,49 @@
|
|||
.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;
|
||||
}
|
||||
|
|
@ -35,10 +35,10 @@ Translations.de =
|
|||
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",
|
||||
|
|
@ -65,10 +65,10 @@ Translations.es =
|
|||
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",
|
||||
|
|
@ -95,10 +95,10 @@ Translations.ja =
|
|||
alreadyhaveacct: "アカウントをお持ちですか？",
|
||||
continueff: "Firefox で続行",
|
||||
error1: "この項目に合うタグが見つかりません。",
|
||||
error2: "タグは 25 文字までです。",
|
||||
error3: "Pocket にログインしてやり直してください。",
|
||||
learnmore: "詳細",
|
||||
loginnow: "ログイン",
|
||||
maxtaglength: "タグは 25 文字までです。",
|
||||
onlylinkssaved: "リンクのみ保存できます",
|
||||
pagenotsaved: "ページを保存できませんでした",
|
||||
pageremoved: "ページを削除しました",
|
||||
|
|
@ -125,10 +125,10 @@ Translations.ru =
|
|||
alreadyhaveacct: "Уже используете Pocket?",
|
||||
continueff: "Продолжить через Firefox",
|
||||
error1: "Мы не смогли найти для этого элемента рекомендуемые теги.",
|
||||
error2: "Длина тега не должна превышать 25 символов.",
|
||||
error3: "Пожалуйста, войдите в Pocket, и попробуйте ещё раз.",
|
||||
learnmore: "Узнайте больше",
|
||||
loginnow: "Войдите",
|
||||
maxtaglength: "Длина тега не должна превышать 25 символов.",
|
||||
onlylinkssaved: "Можно сохранять только ссылки",
|
||||
pagenotsaved: "Страница не сохранена",
|
||||
pageremoved: "Страница удалена",
|
||||
|
|
|
|||
|
|
@ -568,6 +568,12 @@ PKT_SAVED_OVERLAY.prototype = {
|
|||
$('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));
|
||||
|
||||
|
|
|
|||
|
|
@ -195,6 +195,12 @@ PKT_SIGNUP_OVERLAY.prototype = {
|
|||
$('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')
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,15 +52,15 @@ templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data)
|
|||
+ 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});
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Загрузка…
Ссылка в новой задаче