Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/sync/resources/firstpassphrase.html

Issue 6353013: Bring the first passphrase screen UI up to date with equivalent changes made ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync/sync_setup_wizard.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <html i18n-values="dir:textdirection;"> 1 <html i18n-values="dir:textdirection;">
2 <head> 2 <head>
3 <title></title> 3 <title></title>
4 <style type="text/css"> 4 <style type="text/css">
5 body { 5 body {
6 line-height: 1.5em; 6 line-height: 1.5em;
7 background: #FFFFFF; 7 background: #FFFFFF;
8 font-size: 11pt; 8 font-size: 11pt;
9 } 9 }
10 html[os='mac'] body { 10 html[os='mac'] body {
(...skipping 21 matching lines...) Expand all
32 right: 0px; 32 right: 0px;
33 bottom: 0px; 33 bottom: 0px;
34 margin-right: 10px; 34 margin-right: 10px;
35 margin-bottom: 10px; 35 margin-bottom: 10px;
36 } 36 }
37 .sync-section { 37 .sync-section {
38 background: #EEE; 38 background: #EEE;
39 margin: 5px; 39 margin: 5px;
40 padding: 10px; 40 padding: 10px;
41 } 41 }
42
43 #learn-more-link {
44 float: right;
45 }
46
42 html[dir='rtl'] .sync-footer { 47 html[dir='rtl'] .sync-footer {
43 text-align: left; 48 text-align: left;
44 left: 0px; 49 left: 0px;
45 bottom: 0px; 50 bottom: 0px;
46 margin-left: 20px; 51 margin-left: 20px;
47 } 52 }
48 input[type='button'], 53 input[type='button'],
49 input[type='submit'] { 54 input[type='submit'] {
50 min-width: 87px; 55 min-width: 87px;
51 min-height: 26px; 56 min-height: 26px;
52 } 57 }
53 html[os='mac'] input[type='button'], 58 html[os='mac'] input[type='button'],
54 html[os='mac'] input[type='submit'] { 59 html[os='mac'] input[type='submit'] {
55 font-size: 12pt; 60 font-size: 12pt;
56 } 61 }
57 62
58 #passphrase { 63 #passphrase {
59 margin-top: 5px; 64 margin-top: 5px;
60 } 65 }
61 66
62 #passphraseLabel,
63 #confirmPassphraseLabel {
64 width: 145px;
65 float: left;
66 text-align: right;
67 margin-right: 4px;
68 padding-top: 3px;
69 }
70
71 </style> 67 </style>
72 <script src="chrome://resources/js/cr.js"></script> 68 <script src="chrome://resources/js/cr.js"></script>
73 <script> 69 <script>
74 var currentMode; 70 var currentMode;
75 71
76 // Called once, when this html/js is loaded. 72 // Called once, when this html/js is loaded.
77 function setupDialog(args) { 73 function setupDialog(args) {
78 // Allow platform specific rules 74 // Allow platform specific rules
79 if (cr.isMac) { 75 if (cr.isMac) {
80 document.documentElement.setAttribute('os', 'mac'); 76 document.documentElement.setAttribute('os', 'mac');
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 mismatchError.style.display = "none"; 116 mismatchError.style.display = "none";
121 117
122 if (getRadioCheckedValue() != "explicit") { 118 if (getRadioCheckedValue() != "explicit") {
123 return true; 119 return true;
124 } 120 }
125 var f = document.getElementById("form"); 121 var f = document.getElementById("form");
126 if (f.passphrase.value.length == 0) { 122 if (f.passphrase.value.length == 0) {
127 emptyError.style.display = "block"; 123 emptyError.style.display = "block";
128 return false; 124 return false;
129 } 125 }
130 if (f.confirmpassphrase.value.length > 0 && 126 if (f.confirmpassphrase.value != f.passphrase.value) {
131 f.confirmpassphrase.value != f.passphrase.value) {
132 mismatchError.style.display = "block"; 127 mismatchError.style.display = "block";
133 return false; 128 return false;
134 } 129 }
135 return true; 130 return true;
136 } 131 }
137 132
138 function sendValuesAndClose() { 133 function sendValuesAndClose() {
139 var f = document.getElementById("form"); 134 var f = document.getElementById("form");
140 if (!checkPassphraseMatch()) { 135 if (!checkPassphraseMatch()) {
141 return false; 136 return false;
(...skipping 10 matching lines...) Expand all
152 <div class="sync-header" id="title" i18n-content="title"></div> 147 <div class="sync-header" id="title" i18n-content="title"></div>
153 <div class="sync-instructions" id="instructions" 148 <div class="sync-instructions" id="instructions"
154 i18n-content="instructions"></div> 149 i18n-content="instructions"></div>
155 <div> 150 <div>
156 <input name="option" type="radio" value="google" onchange="onRadioChange();" > 151 <input name="option" type="radio" value="google" onchange="onRadioChange();" >
157 <span i18n-content="googleOption"></span> 152 <span i18n-content="googleOption"></span>
158 </input> 153 </input>
159 </div> 154 </div>
160 <div> 155 <div>
161 <input name="option" type="radio" value="explicit" onchange="onRadioChange() ;"> 156 <input name="option" type="radio" value="explicit" onchange="onRadioChange() ;">
157 <div id="learn-more-link">
158 <a i18n-values="href:encryptionhelpurl" target="_blank"
159 i18n-content="learnmore"></a>
160 </div>
162 <span i18n-content="explicitOption"></span> 161 <span i18n-content="explicitOption"></span>
163 </input> 162 </input>
164 </div> 163 </div>
165 <div> 164 <div>
166 <input name="option" type="radio" value="nothanks" onchange="onRadioChange() ;"> 165 <input name="option" type="radio" value="nothanks" onchange="onRadioChange() ;">
167 <span i18n-content="nothanksOption"></span> 166 <span i18n-content="nothanksOption"></span>
168 </input> 167 </input>
169 </div> 168 </div>
170 169
171 <div class="sync-section" id="section-google"> 170 <div class="sync-section" id="section-google">
172 <div i18n-content="sectionGoogleMessage"></div> 171 <div i18n-content="sectionGoogleMessage"></div>
173 </div> 172 </div>
174 <div class="sync-section" id="section-explicit"> 173 <div class="sync-section" id="section-explicit">
175 <div i18n-content="sectionExplicitMessage"></div> 174 <div i18n-content="sectionExplicitMessage"></div>
176 <div> 175 <div>
177 <div i18n-content="passphraseLabel" id="passphraseLabel"></div> 176 <div i18n-content="passphraseLabel" id="passphraseLabel"></div>
178 <input id="passphrase" name="passphrase" label="passphraseLabel" 177 <input id="passphrase" name="passphrase" label="passphraseLabel"
179 type="password" onkeyup="checkPassphraseMatch();" 178 type="password"/>
180 onchange="checkPassphraseMatch();"/>
181 </div> 179 </div>
182 <div> 180 <div>
183 <div i18n-content="confirmLabel" id="confirmPassphraseLabel"> 181 <div i18n-content="confirmLabel" id="confirmPassphraseLabel">
184 </div> 182 </div>
185 <input id="confirmpassphrase" name="confirmpassphrase" type="password" 183 <input id="confirmpassphrase" name="confirmpassphrase" type="password"
186 label="confirmPassphraseLabel" 184 label="confirmPassphraseLabel" />
187 onkeyup="checkPassphraseMatch();"
188 onchange="checkPassphraseMatch();" />
189 </div> 185 </div>
190 <div class="error" style="display:none" 186 <div class="error" style="display:none"
191 id="emptyerror" i18n-content="emptyErrorMessage"></div> 187 id="emptyerror" i18n-content="emptyErrorMessage"></div>
192 <div class="error" style="display:none" 188 <div class="error" style="display:none"
193 id="mismatcherror" i18n-content="mismatchErrorMessage"></div> 189 id="mismatcherror" i18n-content="mismatchErrorMessage"></div>
194 </div> 190 </div>
195 <div class="sync-section" id="section-nothanks"> 191 <div class="sync-section" id="section-nothanks">
196 <div i18n-content="sectionNothanksMessage"></div> 192 <div i18n-content="sectionNothanksMessage"></div>
197 </div> 193 </div>
198 194
199 <div class="sync-footer"> 195 <div class="sync-footer">
200 <input id="okButton" type="submit" i18n-values="value:ok" /> 196 <input id="okButton" type="submit" i18n-values="value:ok" />
201 </div> 197 </div>
202 </form> 198 </form>
203 </body> 199 </body>
204 </html> 200 </html>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/sync_setup_wizard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698