Skip to content

GitLab

T
tangled
Commit 9365332a authored by dbeam@chromium.org's avatar dbeam@chromium.org
Browse files
Options

Sync Promo: Fix up focus. 

R=sail@chromium.org,estade@chromium.org
BUG=98928
TEST=Focus starts on user name.  When you press shift tab you land on "Learn
more" link.  When you press enter on that link and press tab again, you're still
on the same link (that now reads "Hide").


Review URL: http://codereview.chromium.org/8502042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113123 0039d316-1c4b-4281-b951-d872f2087c98
parent b5cfec56
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 29 deletions
chrome/browser/browser_resources.grd
View file @ 9365332a
......@@ -120,8 +120,8 @@
<include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
<include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterprise_webstore_app\manifest.json" type="BINDATA" />
<if expr="not pp_ifdef('chromeos')">
<include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_promo.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
</if>
<if expr="pp_ifdef('chromeos')">
<include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.html" flattenhtml="true" type="BINDATA" />
......
chrome/browser/resources/sync_promo.css → chrome/browser/resources/sync_promo/sync_promo.css
View file @ 9365332a
......@@ -23,9 +23,14 @@ body {
margin: 0 auto;
max-width: 900px;
min-width: 830px;
position: relative;
width: auto;
}
#sync-setup-login > div:first-of-type {
position: relative;
}
#sync-setup-configure {
background-color: transparent;
margin-left: auto;
......@@ -34,12 +39,14 @@ body {
}
#sync-setup-login-promo-column {
margin-right: 385px;
left: 0;
position: absolute;
width: 444px;
}
html[dir='rtl'] #sync-setup-login-promo-column {
margin-left: 385px;
margin-right: 0;
left: auto;
right: 0;
}
#sync-setup-login-content-column {
......
chrome/browser/resources/sync_promo.html → chrome/browser/resources/sync_promo/sync_promo.html
View file @ 9365332a
......@@ -10,17 +10,17 @@
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="strings.js"></script>
<script src="../strings.js"></script>
<script src="sync_promo.js"></script>
<link rel="stylesheet" href="shared/css/button.css">
<link rel="stylesheet" href="shared/css/throbber.css">
<link rel="stylesheet" href="sync_setup_overlay.css">
<link rel="stylesheet" href="../shared/css/button.css">
<link rel="stylesheet" href="../shared/css/throbber.css">
<link rel="stylesheet" href="../sync_setup_overlay.css">
<link rel="stylesheet" href="sync_promo.css">
</head>
<body>
<div id="sync-promo">
<div id="sync-promo-contents">
<include src="sync_setup_overlay.html">
<include src="../sync_setup_overlay.html">
</div>
</div>
</body>
......
chrome/browser/resources/sync_promo.js → chrome/browser/resources/sync_promo/sync_promo.js
View file @ 9365332a
......@@ -3,8 +3,8 @@
// found in the LICENSE file.
// TODO(sail): Refactor options_page and remove this include.
<include src="options/options_page.js"/>
<include src="sync_setup_overlay.js"/>
<include src="../options/options_page.js"/>
<include src="../sync_setup_overlay.js"/>
cr.define('sync_promo', function() {
/**
......
chrome/browser/resources/sync_setup_overlay.html
View file @ 9365332a
......@@ -2,6 +2,23 @@
<div id="sync-setup-login" hidden>
<h1 id="promo-title" i18n-content="promoTitle" hidden></h1>
<div>
<div id="sync-setup-login-promo-column" hidden>
<h2 id="promo-message-title" i18n-content="promoMessageTitle"></h2>
<p>
<span i18n-values=".innerHTML:promoMessageBody"></span>
<a id="promo-learn-more-show" i18n-content="promoLearnMoreShow"
href="#" tabindex="1"></a>
<a id="promo-learn-more-hide" i18n-content="promoLearnMoreHide"
href="#" tabindex="1" hidden> </a>
</p>
<div id="promo-info-pane">
<img id="promo-infographic"
src="chrome://theme/IRD_SYNC_PROMO_INFO_GRAPHIC">
<div id="promo-information" i18n-values=".innerHTML:promoInformation"
hidden>
</div>
</div>
</div>
<div id="sync-setup-login-content-column">
<h1 id="sync-setup-overlay-title"
i18n-content="syncSetupOverlayTitle">
......@@ -107,23 +124,6 @@
</div>
</div>
</div>
<div id="sync-setup-login-promo-column" hidden>
<h2 id="promo-message-title" i18n-content="promoMessageTitle"></h2>
<p>
<span i18n-values=".innerHTML:promoMessageBody"></span>
<a id="promo-learn-more-show" i18n-content="promoLearnMoreShow"
href="#"></a>
<a id="promo-learn-more-hide" i18n-content="promoLearnMoreHide"
href="#" hidden> </a>
</p>
<div id="promo-info-pane">
<img id="promo-infographic"
src="chrome://theme/IRD_SYNC_PROMO_INFO_GRAPHIC">
<div id="promo-information" i18n-values=".innerHTML:promoInformation"
hidden>
</div>
</div>
</div>
</div>
<div id="promo-skip" hidden>
<button id="promo-skip-button" type="reset"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment