chrome/browser/resources/settings/signin_page/signin_page.html - Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

Side by Side Diff: chrome/browser/resources/settings/signin_page/signin_page.html

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix an egreious git cl format error Created 5 years 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

« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/browser/resources/settings/signin_page/signin_page.js » ('j') | chrome/browser/ui/webui/settings/people_handler.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">

7 <link rel="import" href="chrome://md-settings/sync_page/sync_page.html">

8 <link rel="import" href="chrome://md-settings/sync_page/sync_private_api.html">

9 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">

10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">

11

12 <dom-module id="settings-signin-page">

13 <link rel="import" type="css"

14 href="chrome://md-settings/settings_shared.css">

15 <template>

16 <settings-animated-pages id="pages" current-route="{{currentRoute}}"

17 section="people">

18 <neon-animatable id="main">

19 <div class="settings-box">

20 <div class="split">

21 <span class="start">

22 <!-- TODO(tommycli): Show current profile icon and name here.

23 To be done by December 2015. -->

24 </span>

25 <span>

26 <template is="dom-if" if="[[!syncStatus.signedIn]]">

27 <paper-button on-tap="onSigninTap_" raised

28 disabled="[[syncStatus.setupInProgress]]">

29 [[i18n('syncSignin')]]

30 </paper-button>

31 </template>

32 <template is="dom-if" if="[[syncStatus.signedIn]]">

33 <paper-button on-tap="onDisconnectTap_"

34 disabled="[[syncStatus.setupInProgress]]">

35 [[i18n('syncDisconnect')]]

36 </paper-button>

37 </template>

38 </span>

39 </div>

40 <div hidden="[[syncStatus.signedIn]]">[[i18n('syncOverview')]]</div>

41 </div>

42

43 <div class="settings-box split"

44 hidden="[[!isStatusTextSet_(syncStatus)]]">

45 <span id="syncStatusText"></span>

46 <paper-button on-tap="onActionLinkTap_">

47 [[syncStatus.actionLinkText]]

48 </paper-button>

49 </div>

50

51 <template is="dom-if"

52 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">

53 <div class="settings-box">

54 <paper-button on-tap="onSyncTap_" raised>

55 [[i18n('syncPageTitle')]]

56 </paper-button>

57 </div>

58 </template>

59

60 <div class="settings-box">

61 <paper-button i18n-content="manageOtherPeople"

62 on-tap="onManageOtherPeople_">

63 </paper-button>

64 </div>

65 </neon-animatable>

66 <neon-animatable id="sync">

67 <settings-subheader i18n-values="page-title:syncPageTitle">

68 </settings-subheader>

69 <settings-sync-page current-route="[[currentRoute]]">

70 </settings-sync-page>

71 </neon-animatable>

72 </settings-animated-pages>

73

74 <paper-dialog modal id="disconnectDialog">

75 <h2 i18n-content="syncDisconnectTitle"></h2>

76 <div i18n-values=".innerHTML:syncDisconnectExplanation"></div>

77 <if expr="(not chromeos and is_posix) or is_win or is_macosx">

78 <paper-checkbox id="deleteProfile"

79 i18n-content="syncDisconnectDeleteProfile">

80 </paper-checkbox>

81 </if>

82 <div class="button-strip">

83 <paper-button dialog-dismiss i18n-content="cancel">

84 </paper-button>

85 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_"

86 i18n-content="syncDisconnectConfirm">

87 </paper-button>

88 </div>

89 </paper-dialog>

90 </template>

91 <script src="signin_page.js"></script>

92 </dom-module>

OLD	NEW