diff options
Diffstat (limited to 'polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html')
| -rw-r--r-- | polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html index 4de9a95d2d..bcfc9e1649 100644 --- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html +++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html @@ -1,4 +1,5 @@ <!-- +@license Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,11 +16,13 @@ limitations under the License. --> <link rel="import" href="../../../behaviors/base-url-behavior/base-url-behavior.html"> -<link rel="import" href="../../../behaviors/gr-url-encoding-behavior.html"> +<link rel="import" href="../../../behaviors/gr-url-encoding-behavior/gr-url-encoding-behavior.html"> <link rel="import" href="../../../bower_components/polymer/polymer.html"> <link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html"> <link rel="import" href="../../../bower_components/iron-input/iron-input.html"> <link rel="import" href="../../../styles/gr-form-styles.html"> +<link rel="import" href="../../../styles/gr-subpage-styles.html"> +<link rel="import" href="../../../styles/gr-table-styles.html"> <link rel="import" href="../../../styles/shared-styles.html"> <link rel="import" href="../../shared/gr-account-link/gr-account-link.html"> <link rel="import" href="../../shared/gr-autocomplete/gr-autocomplete.html"> @@ -31,40 +34,30 @@ limitations under the License. <dom-module id="gr-group-members"> <template> <style include="gr-form-styles"></style> + <style include="gr-table-styles"></style> + <style include="gr-subpage-styles"></style> <style include="shared-styles"> - main { - margin: 2em 1em; - } - .loading { - display: none; - } - #loading.loading { - display: block; - } - #loading:not(.loading) { - display: none; - } .input { width: 15em; } gr-autocomplete { width: 20em; --gr-autocomplete: { - font-size: 1em; + font-size: var(--font-size-normal); height: 2em; width: 20em; } } a { - color: var(--default-text-color); + color: var(--primary-text-color); text-decoration: none; } a:hover { text-decoration: underline; } th { - border-bottom: 1px solid #eee; - font-family: var(--font-family-bold); + border-bottom: 1px solid var(--border-color); + font-weight: var(--font-weight-bold); text-align: left; } .canModify #groupMemberSearchInput, @@ -117,7 +110,7 @@ limitations under the License. <td>[[item.email]]</td> <td class="deleteColumn"> <gr-button - class="deleteButton" + class="deleteMembersButton" on-tap="_handleDeleteMember"> Delete </gr-button> @@ -132,7 +125,8 @@ limitations under the License. <span class="value"> <gr-autocomplete id="includedGroupSearchInput" - text="{{_includedGroupSearch}}" + text="{{_includedGroupSearchName}}" + value="{{_includedGroupSearchId}}" query="[[_queryIncludedGroup]]" placeholder="Group Name"> </gr-autocomplete> @@ -140,7 +134,7 @@ limitations under the License. <gr-button id="saveIncludedGroups" on-tap="_handleSavingIncludedGroups" - disabled="[[!_includedGroupSearch]]"> + disabled="[[!_includedGroupSearchId]]"> Add </gr-button> <table id="includedGroups"> @@ -155,10 +149,15 @@ limitations under the License. <template is="dom-repeat" items="[[_includedGroups]]"> <tr> <td class="nameColumn"> - <a href$="[[_computeGroupUrl(item.url)]]" - rel="noopener"> + <template is="dom-if" if="[[item.url]]"> + <a href$="[[_computeGroupUrl(item.url)]]" + rel="noopener"> + [[item.name]] + </a> + </template> + <template is="dom-if" if="[[!item.url]]"> [[item.name]] - </a> + </template> </td> <td>[[item.description]]</td> <td class="deleteColumn"> |