Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/action_link.html"> | 2 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> | 6 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html"> |
| 8 <link rel="import" href="/passwords_and_forms_page/password_edit_dialog.html"> | 8 <link rel="import" href="/passwords_and_forms_page/password_edit_dialog.html"> |
| 9 <link rel="import" href="/passwords_and_forms_page/passwords_shared_css.html"> | 9 <link rel="import" href="/passwords_and_forms_page/passwords_shared_css.html"> |
| 10 <link rel="import" href="/prefs/prefs.html"> | 10 <link rel="import" href="/prefs/prefs.html"> |
| 11 <link rel="import" href="/settings_shared_css.html"> | 11 <link rel="import" href="/settings_shared_css.html"> |
| 12 | 12 |
| 13 <dom-module id="passwords-section"> | 13 <dom-module id="passwords-section"> |
| 14 <!-- action_link.css is needed for the |managePasswordsLabel| link --> | 14 <!-- action_link.css is needed for the |managePasswordsLabel| link --> |
| 15 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> | 15 <link rel="import" type="css" href="chrome://resources/css/action_link.css"> |
| 16 <template> | 16 <template> |
| 17 <style include="settings-shared passwords-shared"> | 17 <style include="settings-shared passwords-shared"> |
| 18 #manageLink { | |
| 19 margin-bottom: 24px; | |
| 20 } | |
| 21 | |
| 22 #password { | 18 #password { |
| 23 background-color: transparent; | 19 background-color: transparent; |
| 24 border: none; | 20 border: none; |
| 25 flex: 1; | 21 flex: 1; |
| 26 height: 20px; | 22 height: 20px; |
| 27 width: 0; | 23 width: 0; |
| 28 } | 24 } |
| 29 | 25 |
| 30 #autosigninCheckbox { | |
| 31 margin-bottom: 24px; | |
| 32 } | |
| 33 | |
| 34 .website-column { | 26 .website-column { |
| 35 flex: 3; | 27 flex: 3; |
| 36 } | 28 } |
| 37 | 29 |
| 38 .username-column { | 30 .username-column { |
| 39 -webkit-margin-end: 16px; | 31 -webkit-margin-end: 16px; |
| 40 -webkit-margin-start: 16px; | 32 -webkit-margin-start: 16px; |
| 41 flex: 2; | 33 flex: 2; |
| 42 } | 34 } |
| 43 | 35 |
| 44 .password-column { | 36 .password-column { |
| 45 align-items: center; | 37 align-items: center; |
| 46 display: flex; | 38 display: flex; |
| 47 flex: 2; | 39 flex: 2; |
| 48 } | 40 } |
| 49 | 41 |
| 50 .selectable { | 42 .selectable { |
| 51 -webkit-user-select: text; | 43 -webkit-user-select: text; |
| 52 } | 44 } |
| 53 | 45 |
| 54 .menu-item { | 46 .menu-item { |
| 55 @apply(--settings-actionable); | 47 @apply(--settings-actionable); |
| 56 } | 48 } |
| 57 </style> | 49 </style> |
| 58 <settings-checkbox id="autosigninCheckbox" | 50 <div class="settings-box first two-line"> |
|
Dan Beam
2017/01/10 22:28:01
why is this two-line?
dschuyler
2017/01/10 22:54:40
Likely for the sub-label="". It may be nicer if th
Dan Beam
2017/01/10 22:58:55
connected to the contents like this?
https://cs.ch
dschuyler
2017/01/10 23:05:19
Like that, yes.
| |
| 59 pref="{{prefs.credentials_enable_autosignin}}" | 51 <settings-checkbox id="autosigninCheckbox" |
| 60 label="$i18n{passwordsAutosigninLabel}" | 52 pref="{{prefs.credentials_enable_autosignin}}" |
| 61 sub-label="$i18n{passwordsAutosigninDescription}"> | 53 label="$i18n{passwordsAutosigninLabel}" |
| 62 </settings-checkbox> | 54 sub-label="$i18n{passwordsAutosigninDescription}"> |
| 63 <div id="manageLink">$i18nRaw{managePasswordsLabel}</div> | 55 </settings-checkbox> |
| 64 <div class="heading">$i18n{savedPasswordsHeading}</div> | 56 </div> |
| 65 <div class="item-list" scrollable> | 57 <div id="manageLink" class="settings-box first"> |
| 58 <!-- This span lays out the url correctly, relative to the label. --> | |
| 59 <span>$i18nRaw{managePasswordsLabel}</span> | |
| 60 </div> | |
| 61 <div class="settings-box first"> | |
| 62 <h2>$i18n{savedPasswordsHeading}</h2> | |
| 63 </div> | |
| 64 <div class="list-frame" scrollable> | |
| 66 <div class="list-item column-header"> | 65 <div class="list-item column-header"> |
| 67 <div class="website-column">$i18n{editPasswordWebsiteLabel}</div> | 66 <div class="website-column">$i18n{editPasswordWebsiteLabel}</div> |
| 68 <div class="username-column"> | 67 <div class="username-column"> |
| 69 $i18n{editPasswordUsernameLabel} | 68 $i18n{editPasswordUsernameLabel} |
| 70 </div> | 69 </div> |
| 71 <div class="password-column"> | 70 <div class="password-column"> |
| 72 $i18n{editPasswordPasswordLabel} | 71 $i18n{editPasswordPasswordLabel} |
| 73 </div> | 72 </div> |
| 74 </div> | 73 </div> |
| 75 <iron-list id="passwordList" | 74 <iron-list id="passwordList" |
| 76 items="[[getFilteredPasswords_(savedPasswords, filter)]]" | 75 items="[[getFilteredPasswords_(savedPasswords, filter)]]" |
| 77 class="vertical-list list-section list-with-header"> | 76 class="vertical-list list-with-header"> |
| 78 <template> | 77 <template> |
| 79 <div class="list-item"> | 78 <div class="list-item"> |
| 80 <div class="website-column"> | 79 <div class="website-column"> |
| 81 <a id="originUrl" target="_blank" class="selectable" | 80 <a id="originUrl" target="_blank" class="selectable" |
| 82 href="[[item.linkUrl]]">[[item.loginPair.originUrl]]</a> | 81 href="[[item.linkUrl]]">[[item.loginPair.originUrl]]</a> |
| 83 </div> | 82 </div> |
| 84 <div class="username-column selectable" | 83 <div class="username-column selectable" |
| 85 id="username">[[item.loginPair.username]]</div> | 84 id="username">[[item.loginPair.username]]</div> |
| 86 <div class="password-column"> | 85 <div class="password-column"> |
| 87 <!-- Password type and disabled in order to match mock. --> | 86 <!-- Password type and disabled in order to match mock. --> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 102 on-tap="onMenuEditPasswordTap_" | 101 on-tap="onMenuEditPasswordTap_" |
| 103 hidden="[[!showPasswords]]">$i18n{passwordViewDetails}</button> | 102 hidden="[[!showPasswords]]">$i18n{passwordViewDetails}</button> |
| 104 <button id="menuRemovePassword" class="list-item menu-item" | 103 <button id="menuRemovePassword" class="list-item menu-item" |
| 105 on-tap="onMenuRemovePasswordTap_">$i18n{removePassword}</button> | 104 on-tap="onMenuRemovePasswordTap_">$i18n{removePassword}</button> |
| 106 </cr-shared-menu> | 105 </cr-shared-menu> |
| 107 <template is="dom-if" if="[[activePassword]]" restamp> | 106 <template is="dom-if" if="[[activePassword]]" restamp> |
| 108 <password-edit-dialog on-close="unstampPasswordEditDialog_" | 107 <password-edit-dialog on-close="unstampPasswordEditDialog_" |
| 109 item="[[activePassword]]"> | 108 item="[[activePassword]]"> |
| 110 </password-edit-dialog> | 109 </password-edit-dialog> |
| 111 </template> | 110 </template> |
| 112 <div class="heading">$i18n{passwordExceptionsHeading}</div> | 111 <div class="settings-box block first"> |
| 113 <div id="passwordExceptionsList" | 112 <h2>$i18n{passwordExceptionsHeading}</h2> |
| 114 class="vertical-list list-section item-list"> | 113 </div> |
| 114 <div id="passwordExceptionsList" class="list-frame vertical-list"> | |
| 115 <template is="dom-repeat" items="[[passwordExceptions]]" | 115 <template is="dom-repeat" items="[[passwordExceptions]]" |
| 116 filter="[[passwordExceptionFilter_(filter)]]"> | 116 filter="[[passwordExceptionFilter_(filter)]]"> |
| 117 <div class="list-item two-line"> | 117 <div class="list-item two-line"> |
| 118 <div class="start"> | 118 <div class="start"> |
| 119 <a id="exception" href="[[item.linkUrl]]" target="_blank" | 119 <a id="exception" href="[[item.linkUrl]]" target="_blank" |
| 120 class="selectable">[[item.exceptionUrl]]</a> | 120 class="selectable">[[item.exceptionUrl]]</a> |
| 121 </div> | 121 </div> |
| 122 <paper-icon-button id="removeExceptionButton" | 122 <paper-icon-button id="removeExceptionButton" |
| 123 icon="cr:close" on-tap="onRemoveExceptionButtonTap_" | 123 icon="cr:close" on-tap="onRemoveExceptionButtonTap_" |
| 124 tabindex$="[[tabIndex]]" | 124 tabindex$="[[tabIndex]]" |
| 125 alt="$i18n{deletePasswordException}"> | 125 alt="$i18n{deletePasswordException}"> |
| 126 </paper-icon-button> | 126 </paper-icon-button> |
| 127 </div> | 127 </div> |
| 128 </template> | 128 </template> |
| 129 </div> | 129 </div> |
| 130 </template> | 130 </template> |
| 131 <script src="/passwords_and_forms_page/passwords_section.js"></script> | 131 <script src="/passwords_and_forms_page/passwords_section.js"></script> |
| 132 </dom-module> | 132 </dom-module> |
| OLD | NEW |