diff options
Diffstat (limited to 'chromium/chrome/browser/resources/print_preview/new/destination_dialog.html')
| -rw-r--r-- | chromium/chrome/browser/resources/print_preview/new/destination_dialog.html | 76 |
1 files changed, 49 insertions, 27 deletions
diff --git a/chromium/chrome/browser/resources/print_preview/new/destination_dialog.html b/chromium/chrome/browser/resources/print_preview/new/destination_dialog.html index e740071ef93..182e131217b 100644 --- a/chromium/chrome/browser/resources/print_preview/new/destination_dialog.html +++ b/chromium/chrome/browser/resources/print_preview/new/destination_dialog.html @@ -3,7 +3,9 @@ <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> <link rel="import" href="chrome://resources/html/action_link_css.html"> +<link rel="import" href="chrome://resources/html/event_tracker.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html"> +<link rel="import" href="../metrics.html"> <link rel="import" href="../data/destination.html"> <link rel="import" href="../data/destination_store.html"> <link rel="import" href="../data/invitation.html"> @@ -12,8 +14,10 @@ <link rel="import" href="destination_list.html"> <link rel="import" href="print_preview_search_box.html"> <link rel="import" href="print_preview_shared_css.html"> +<link rel="import" href="provisional_destination_resolver.html"> <link rel="import" href="search_dialog_css.html"> <link rel="import" href="select_css.html"> +<link rel="import" href="strings.html"> <link rel="import" href="throbber_css.html"> <dom-module id="print-preview-destination-dialog"> @@ -21,10 +25,24 @@ <style include="print-preview-shared button action-link select cr-hidden-style search-dialog throbber"> :host #dialog { --cr-dialog-native: { + border-radius: 2px; box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(0, 0, 0, 0.15); + min-height: calc(100vh - 40px); width: 640px; - } + }; + --cr-dialog-wrapper: { + height: 100%; + }; + --cr-dialog-body: { + -webkit-padding-end: 16px; + -webkit-padding-start: 16px; + padding-bottom: 0; + padding-top: 0; + }; + --cr-dialog-body-container: { + flex: 1; + }; } :host .user-info { @@ -91,15 +109,19 @@ flex-direction: column; } - :host #invitationPromo .invitation-text { - padding-bottom: 12px; + :host #invitationPromo .invitation-buttons { + padding: 12px 0; } - :host #invitationPromo .invitation-reject-button { - -webkit-margin-start: 10px; + print-preview-destination-list { + padding-bottom: 18px; + } + + print-preview-destination-list:last-child { + padding-bottom: 0; } </style> - <cr-dialog id="dialog" on-close="onCloseOrCancel_"> + <cr-dialog id="dialog" on-close="onCloseOrCancel_" show-close-button> <div slot="title"> <div>$i18n{destinationSearchTitle}</div> <div class="user-info" hidden$="[[!userInfo.loggedIn]]"> @@ -122,18 +144,23 @@ </print-preview-search-box> </div> <div slot="body" scrollable> - <print-preview-destination-list - destinations="[[recentDestinationList_]]" - search-query="[[searchQuery_]]" - title="$i18n{recentDestinationsTitle}" - on-destination-selected="onDestinationSelected_"> - </print-preview-destination-list> - <print-preview-destination-list destinations="[[destinations_]]" - has-action-link loading-destinations="[[loadingDestinations_]]" - search-query="[[searchQuery_]]" - title="$i18n{printDestinationsTitle}" - on-destination-selected="onDestinationSelected_"> - </print-preview-destination-list> + <div> + <print-preview-destination-list + destinations="[[recentDestinationList_]]" + search-query="[[searchQuery_]]" + title="$i18n{recentDestinationsTitle}" + on-destination-selected="onDestinationSelected_"> + </print-preview-destination-list> + <print-preview-destination-list destinations="[[destinations_]]" + has-action-link loading-destinations="[[loadingDestinations_]]" + search-query="[[searchQuery_]]" + title="$i18n{printDestinationsTitle}" + on-destination-selected="onDestinationSelected_"> + </print-preview-destination-list> + </div> + <print-preview-provisional-destination-resolver id="provisionalResolver" + destination-store="[[destinationStore]]"> + </print-preview-provisional-destination-resolver> </div> <div slot="button-container"> <button class="cancel-button" on-click="onCancelButtonClick_"> @@ -148,20 +175,15 @@ <div class="close-button"></div> </div> <div class="promo" id="invitationPromo" hidden="[[!invitation_]]"> - <div class="invitation-text" - inner-h-t-m-l="[[getInvitationText_(invitation_)]]"> - </div> + <div inner-h-t-m-l="[[getInvitationText_(invitation_)]]"></div> <div class="invitation-buttons"> - <button class="invitation-accept-button" - on-click="onInvitationAcceptClick_"> + <button on-click="onInvitationAcceptClick_"> [[getAcceptButtonText_(invitation_)]] </button> - <button class="invitation-reject-button" - on-click="onInvitationRejectClick_"> - $i18n{reject} - </button> + <button on-click="onInvitationRejectClick_">$i18n{reject}</button> <div id="invitation-process-throbber" class="throbber" hidden></div> </div> + <div>$i18nRaw{registerPrinterInformationMessage}</div> </div> </div> </cr-dialog> |