diff options
Diffstat (limited to 'polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html')
-rw-r--r-- | polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html index 2772594b75..912bbfa6a2 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html +++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html @@ -1,4 +1,5 @@ <!-- +@license Copyright (C) 2016 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,9 @@ limitations under the License. --> <link rel="import" href="../../../bower_components/polymer/polymer.html"> -<link rel="import" href="../../shared/gr-confirm-dialog/gr-confirm-dialog.html"> +<link rel="import" href="../../shared/gr-autocomplete/gr-autocomplete.html"> +<link rel="import" href="../../shared/gr-dialog/gr-dialog.html"> +<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html"> <link rel="import" href="../../../styles/shared-styles.html"> <dom-module id="gr-confirm-rebase-dialog"> @@ -48,12 +51,13 @@ limitations under the License. margin: .5em 0; } </style> - <gr-confirm-dialog + <gr-dialog + id="confirmDialog" confirm-label="Rebase" on-confirm="_handleConfirmTap" on-cancel="_handleCancelTap"> - <div class="header">Confirm rebase</div> - <div class="main"> + <div class="header" slot="header">Confirm rebase</div> + <div class="main" slot="main"> <div id="rebaseOnParent" class="rebaseOption" hidden$="[[!_displayParentOption(rebaseOnCurrent, hasParent)]]"> <input id="rebaseOnParentInput" @@ -92,21 +96,25 @@ limitations under the License. type="radio" on-tap="_handleRebaseOnOther"> <label id="rebaseOnOtherLabel" for="rebaseOnOtherInput"> - Rebase on a specific change or ref <span hidden$="[[!hasParent]]"> + Rebase on a specific change, ref, or commit <span hidden$="[[!hasParent]]"> (breaks relation chain) </span> </label> </div> <div class="parentRevisionContainer"> - <input is="iron-input" - type="text" + <gr-autocomplete id="parentInput" - bind-value="{{base}}" + query="[[_query]]" + no-debounce + text="{{_text}}" on-tap="_handleEnterChangeNumberTap" - placeholder="Change number"> + allow-non-suggested-values + placeholder="Change number, ref, or commit hash"> + </gr-autocomplete> </div> </div> - </gr-confirm-dialog> + </gr-dialog> + <gr-rest-api-interface id="restAPI"></gr-rest-api-interface> </template> <script src="gr-confirm-rebase-dialog.js"></script> </dom-module> |