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

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

Issue 270081: Facelifts to sync UI (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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
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,td,div,p,a,font,span {font-family: arial,sans-serif;} 5 body,td,div,p,a,font,span {font-family: arial,sans-serif;}
6 body { bgcolor:"#ffffff" } 6 body { bgcolor:"#ffffff" }
7 .gaia.le.button { font-family: Arial, Helvetica, sans-serif; font-size: smaller; } 7 .gaia.le.button { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
8 .endaligned {
9 text-align: right;
10 }
11 html[dir='rtl'] .endaligned {
12 text-align: left;
13 }
14 .textaligned {
15 text-align: left;
16 }
17 html[dir='rtl'] .textaligned {
18 text-align: right;
19 }
8 </style> 20 </style>
9 <script> 21 <script>
10 function advanceThrobber() { 22 function advanceThrobber() {
11 var throbber = document.getElementById('throb'); 23 var throbber = document.getElementById('throb');
12 throbber.style.backgroundPositionX = 24 throbber.style.backgroundPositionX =
13 ((parseInt(throbber.style.backgroundPositionX) - 16) % 576) + 'px'; 25 ((parseInt(throbber.style.backgroundPositionX) - 16) % 576) + 'px';
14 } 26 }
15 27
16 function acceptMergeAndSync() { 28 function acceptMergeAndSync() {
17 var throbber = document.getElementById('throbber_container'); 29 var throbber = document.getElementById('throbber_container');
18 throbber.style.display = "inline"; 30 throbber.style.display = "inline";
19 document.getElementById("acceptMerge").disabled = true; 31 document.getElementById("acceptMerge").disabled = true;
20 chrome.send("SubmitMergeAndSync", [""]); 32 chrome.send("SubmitMergeAndSync", [""]);
21 } 33 }
22 34
23 function Close() { 35 function Close() {
24 chrome.send("DialogClose", [""]); 36 chrome.send("DialogClose", [""]);
25 } 37 }
26 38
27 function showMergeAndSyncDone() { 39 function showMergeAndSyncDone() {
28 var throbber = document.getElementById('throbber_container'); 40 var throbber = document.getElementById('throbber_container');
29 throbber.style.display = "none"; 41 throbber.style.display = "none";
30 document.getElementById("header").innerHTML = 42 document.getElementById("header").innerHTML =
31 "<p><font size='-1'><b>" + templateData['alldone'] 43 "<p><font size='-1'><b>" + templateData['alldone']
32 + "</b></font></p>"; 44 + "</b></font></p>";
33 document.getElementById("close").value = templateData['closelabel']; 45 document.getElementById("close").value = templateData['closelabel'];
34 setTimeout(Close, 1600); 46 setTimeout(Close, 1600);
35 } 47 }
36 48
37 function showMergeAndSyncError() { 49 function showMergeAndSyncError() {
38 var throbber = document.getElementById('throbber_container'); 50 var throbber = document.getElementById('throbber_container');
39 throbber.style.display = "none"; 51 throbber.style.display = "none";
40 document.getElementById("header").innerHTML = 52 document.getElementById("header").innerHTML =
41 "<p><font size='-1'><b>" + templateData['setuperror'] 53 "<p><font size='-1'><b>" + templateData['setuperror']
42 + "</b></font></p>"; 54 + "</b></font></p>";
43 } 55 }
44 56
45 </script> 57 </script>
46 </head> 58 </head>
47 <body onload="setInterval(advanceThrobber, 30);"> 59 <body onload="setInterval(advanceThrobber, 30);">
48 <div id="header"> 60 <table height="100%">
49 <p><font size="-1"><b><span i18n-content="introduction"></span></b> 61 <tr valign="top">
50 </font></p> 62 <td align="center">
51 </div> 63 <div id="header" align="left">
52 <br /> 64 <p class="textaligned"><font size="-1"><b>
53 <img src="merge_and_sync.png" i18n-values="alt:mergeandsynclabel" /> 65 <span i18n-content="introduction"></span>
54 <br /> 66 </b></font></p>
55 <p><font size="-1"><span i18n-content="mergeandsyncwarning"></span></font></p> 67 </div>
56 <br /> 68 <br />
57 <table align="right"> 69 <img src="merge_and_sync.png" i18n-values="alt:mergeandsynclabel" />
58 <tr> 70 <br />
59 <td> 71 <p class="textaligned"><font size="-1"><span i18n-content="mergeandsyncwar ning"></span></font></p>
72 <br />
60 <div id="throbber_container" style="display:none"> 73 <div id="throbber_container" style="display:none">
61 <div id="throb" style="background-image:url(throbber.png); 74 <div id="throb" style="background-image:url(throbber.png);
62 width:16px; height:16px; background-position:0px;"> 75 width:16px; height:16px; background-position:0px;">
63 </div> 76 </div>
64 </div> 77 </div>
65 </td> 78 </td>
66 <td> 79 </tr>
80 <tr class="endaligned" valign="bottom">
81 <td class="endaligned">
67 <input id="acceptMerge" type="button" class="gaia le button" name="accept" 82 <input id="acceptMerge" type="button" class="gaia le button" name="accept"
68 i18n-values="value:mergeandsynclabel" 83 i18n-values="value:mergeandsynclabel"
69 onclick="acceptMergeAndSync();" /> 84 onclick="acceptMergeAndSync();" />
70 </td>
71 <td>
72 <input id="close" type="button" i18n-values="value:abortlabel" 85 <input id="close" type="button" i18n-values="value:abortlabel"
73 onclick="Close();"/> 86 onclick="Close();" style="width:85"/>
74 </td> 87 </td>
75 </tr> 88 </tr>
76 </table> 89 </table>
77 </body> 90 </body>
78 </html> 91 </html>
OLDNEW
« no previous file with comments | « chrome/browser/sync/resources/gaia_login.html ('k') | chrome/browser/sync/resources/setup_done.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698