Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> |
| 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/ca_trust_ edit_dialog.html"> | 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/ca_trust_ edit_dialog.html"> |
| 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_delete_confirmation_dialog.html"> | 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_delete_confirmation_dialog.html"> |
| 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_list.html"> | |
| 8 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_decryption_dialog.html"> | |
| 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_encryption_dialog.html"> | 9 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_encryption_dialog.html"> |
| 8 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_decryption_dialog.html"> | 10 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica tes_browser_proxy.html"> |
| 9 | 11 |
| 10 <dom-module id="settings-certificate-manager-page"> | 12 <dom-module id="settings-certificate-manager-page"> |
| 11 <link rel="import" type="css" href="certificate_manager_page.css"> | |
| 12 <template> | 13 <template> |
| 13 <paper-tabs selected="{{selected}}"> | 14 <style> |
| 14 <paper-tab i18n-content="certificateManagerYourCertificates"></paper-tab> | 15 :host { |
| 15 <paper-tab i18n-content="certificateManagerServers"></paper-tab> | 16 --paper-tabs-selection-bar-color: blue; |
|
Dan Beam
2016/03/22 02:08:28
where did you get this color from?
dpapad
2016/03/22 18:07:02
It is blue-ish on the mocks. Should probably be ch
| |
| 16 <paper-tab i18n-content="certificateManagerAuthorities"></paper-tab> | 17 } |
| 17 <paper-tab i18n-content="certificateManagerOthers"></paper-tab> | 18 </style> |
| 19 <paper-tabs selected="{{selected}}" no-slide> | |
|
Dan Beam
2016/03/22 02:08:28
why no-slide?
dpapad
2016/03/22 18:07:02
Removed. It looked funky IMO, and the mocks don't
| |
| 20 <paper-tab>$i18n{certificateManagerYourCertificates}</paper-tab> | |
| 21 <paper-tab>$i18n{certificateManagerServers}</paper-tab> | |
| 22 <paper-tab>$i18n{certificateManagerAuthorities}</paper-tab> | |
| 23 <paper-tab>$i18n{certificateManagerOthers}</paper-tab> | |
| 18 </paper-tabs> | 24 </paper-tabs> |
| 19 | 25 <iron-pages selected="[[selected]]"> |
| 20 <iron-pages selected="{{selected}}"> | |
| 21 <div> | 26 <div> |
| 22 <div i18n-content="certificateManagerYourCertificatesSubtitle"></div> | 27 <!-- |
| 23 <div class="privacy-buttons layout horizontal end-justified"> | 28 certificate-type value must match settings.CertificateType.PERSONAL |
| 24 <paper-button i18n-content="certificateManagerView"></paper-button> | 29 --> |
|
Dan Beam
2016/03/22 02:08:28
just mirror the enum somewhere on |this|, as in
dpapad
2016/03/22 18:07:02
1/2 Done. I mirrored the enum, such that I don't n
| |
| 25 <paper-button i18n-content="certificateManagerImport"></paper-button> | 30 <settings-certificate-list id="personalCerts" |
| 26 <paper-button i18n-content="certificateManagerImportAndBind"> | 31 certificates="[[personalCerts]]" certificate-type="personal"> |
| 27 </paper-button> | 32 </settings-certificate-list> |
| 28 <paper-button i18n-content="certificateManagerExport"></paper-button> | |
| 29 <paper-button i18n-content="certificateManagerDelete"></paper-button> | |
| 30 <span class="flex"></span> | |
| 31 <paper-button raised i18n-content="certificateManagerDone"> | |
| 32 </paper-button> | |
| 33 </div> | |
| 34 </div> | 33 </div> |
| 35 <div> | 34 <div> |
| 36 <div i18n-content="certificateManagerServersSubtitle"></div> | 35 <!-- |
| 37 <div class="privacy-buttons layout horizontal end-justified"> | 36 certificate-type value must match settings.CertificateType.SERVER |
| 38 <paper-button disabled i18n-content="certificateManagerView"> | 37 --> |
| 39 </paper-button> | 38 <template is="dom-if" if="[[isTabSelected_(selected, 1)]]"> |
| 40 <paper-button i18n-content="certificateManagerImport"></paper-button> | 39 <settings-certificate-list id="serverCerts" |
| 41 <paper-button disabled i18n-content="certificateManagerExport"> | 40 certificates="[[serverCerts]]" certificate-type="server"> |
| 42 </paper-button> | 41 </settings-certificate-list> |
| 43 <paper-button disabled i18n-content="certificateManagerDelete"> | 42 </template> |
| 44 </paper-button> | |
| 45 <span class="flex"></span> | |
| 46 <paper-button raised i18n-content="certificateManagerDone"> | |
| 47 </paper-button> | |
| 48 </div> | |
| 49 </div> | 43 </div> |
| 50 <div> | 44 <div> |
| 51 <div i18n-content="certificateManagerAuthoritiesSubtitle"></div> | 45 <!-- |
| 52 <div class="privacy-buttons layout horizontal end-justified"> | 46 certificate-type value must match settings.CertificateType.CA |
| 53 <paper-button i18n-content="certificateManagerView"></paper-button> | 47 --> |
| 54 <paper-button i18n-content="certificateManagerImport"></paper-button> | 48 <template is="dom-if" if="[[isTabSelected_(selected, 2)]]"> |
| 55 <paper-button i18n-content="certificateManagerExport"></paper-button> | 49 <settings-certificate-list id="caCerts" |
| 56 <paper-button i18n-content="certificateManagerDelete"></paper-button> | 50 certificates="[[caCerts]]" certificate-type="ca"> |
| 57 <span class="flex"></span> | 51 </settings-certificate-list> |
| 58 <paper-button raised i18n-content="certificateManagerDone"> | 52 </template> |
| 59 </paper-button> | |
| 60 </div> | |
| 61 </div> | 53 </div> |
| 62 <div> | 54 <div> |
| 63 <div i18n-content="certificateManagerOthersSubtitle"></div> | 55 <!-- |
| 64 <div class="privacy-buttons layout horizontal end-justified"> | 56 certificate-type value must match settings.CertificateType.OTHER |
| 65 <paper-button disabled i18n-content="certificateManagerView"> | 57 --> |
| 66 </paper-button> | 58 <template is="dom-if" if="[[isTabSelected_(selected, 3)]]"> |
| 67 <paper-button disabled i18n-content="certificateManagerExport"> | 59 <settings-certificate-list id="otherCerts" |
| 68 </paper-button> | 60 certificates="[[otherCerts]]" |
| 69 <paper-button disabled i18n-content="certificateManagerDelete"> | 61 certificate-type="other"> |
| 70 </paper-button> | 62 </settings-certificate-list> |
| 71 <span class="flex"></span> | 63 </template> |
| 72 <paper-button raised i18n-content="certificateManagerDone"> | |
| 73 </paper-button> | |
| 74 </div> | |
| 75 </div> | 64 </div> |
| 76 </iron-pages> | 65 </iron-pages> |
| 77 </template> | 66 </template> |
| 78 <script src="certificate_manager_page.js"></script> | 67 <script src="certificate_manager_page.js"></script> |
| 79 </dom-module> | 68 </dom-module> |
| OLD | NEW |