chrome/browser/sync/resources/merge_and_sync.html - Issue 194092: Use jstemplates in merge and sync setup page.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/resources/merge_and_sync.html

Issue 194092: Use jstemplates in merge and sync setup page. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/sync/resources/merge_and_sync.html

===================================================================

--- chrome/browser/sync/resources/merge_and_sync.html (revision 25927)

+++ chrome/browser/sync/resources/merge_and_sync.html (working copy)

@@ -27,22 +27,29 @@

function showMergeAndSyncDone() {

var throbber = document.getElementById('throbber_container');

throbber.style.display = "none";

- document.getElementById("header").innerHTML =

- "<font size='-1'><b>All done!</b></font>";

- document.getElementById("close").value = "Close";

+ document.getElementById("header").style.display = "none";

+ document.getElementById("header_done").style.display = "block";

+ var closebutton = document.getElementById("close");

+ closebutton.value = document.getElementById("close_txt").innerHTML;

setTimeout(Close, 1600);

}

</script>

</HEAD>

-<p id="header"><font size="-1"><b>Your bookmarks will be merged.</b></font></p><br />

-<img src="merge_and_sync.png" alt="Merge and sync" />

+<div id="header">

+ <p><font size="-1"><b><span i18n-content="titlewarning"></span></b>

+ </font></p>

+</div>

+<div id="header_done" style="display:none">

+ <p><font size="-1">

+ <b><span i18n-content="alldone"></span></b>

+ </font></p>

+</div>

<br />

-<p><font size="-1">

-Your existing online bookmarks will be merged with the

-bookmarks on this machine. You can use the Bookmark Manager to organize

-your bookmarks after the merge.</font></p>

+<img src="merge_and_sync.png" i18n-values="alt:mergeandsynclabel" />

<br />

+<p><font size="-1"><span i18n-content="mergeandsyncwarning"></span></font></p>

+<br />

<tr>

<td>

@@ -54,11 +61,14 @@

</td>

<td>

<input id="acceptMerge" type="button" class="gaia le button" name="accept"

- value="Merge and sync"

+ i18n-values="value:mergeandsynclabel"

onclick="acceptMergeAndSync();" />

</td>

<td>

- <input id="close" type="button" value="Abort" onclick="Close();"/>

+ <input id="close" type="button" i18n-values="value:abortlabel"

+ onclick="Close();"/>

+ <span id="close_txt" i18n-content="closelabel" style="display:none">

+ </span>

</td>

</tr>

</table>

« no previous file with comments | « no previous file | chrome/browser/views/sync/sync_setup_wizard.cc » ('j') | no next file with comments »