rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2173 from lvuch/lv-0820 

cleanup dropdown, input group on form val
This commit is contained in:
Westly Wright 2018-08-23 13:33:16 -07:00 committed by GitHub
parent 1a9db5cbe9 b61b6f40a5
commit fc887051a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 114 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/authenticated/cluster/quotas/index/template.hbs
View File

@ -30,7 +30,7 @@
{{/if}} {{/if}}
</td> </td>
<td data-title="{{dt.default}}"> <td data-title="{{dt.default}}">
{{#if obj.isDefault}}<i class="icon icon-star-fill ml-20"/>{{/if}} {{#if obj.isDefault}}<i class="icon icon-star-fill text-warning ml-20"/>{{/if}}
</td> </td>
<td data-title="{{dt.created}}"> <td data-title="{{dt.created}}">
{{date-calendar obj.created}} {{date-calendar obj.created}}

2
app/authenticated/cluster/storage/classes/index/template.hbs
View File

@ -34,7 +34,7 @@
{{obj.displayProvisioner}} {{obj.displayProvisioner}}
</td> </td>
<td data-title="{{dt.default}}"> <td data-title="{{dt.default}}">
{{#if obj.isDefault}}<i class="icon icon-star-fill ml-20"/>{{/if}} {{#if obj.isDefault}}<i class="icon icon-star-fill text-warning ml-20"/>{{/if}}
</td> </td>
<td data-title="{{dt.actions}}" class="actions"> <td data-title="{{dt.actions}}" class="actions">
{{action-menu model=obj}} {{action-menu model=obj}}

4
app/components/modal-edit-host/template.hbs
View File

@ -2,7 +2,7 @@
<h1>{{t 'editHost.title'}}</h1> <h1>{{t 'editHost.title'}}</h1>
</section> </section>
<section class="horizontal-form container-fluid"> <section class="horizontal-form container-fluid">
<div class="row inline-form"> <div class="input-group">
<div class="col span-2 col-inline"> <div class="col span-2 col-inline">
<label>{{t 'editHost.hostname.label'}}</label> <label>{{t 'editHost.hostname.label'}}</label>
</div> </div>
@ -42,4 +42,4 @@
</section> </section>
{{top-errors errors=errors}} {{top-errors errors=errors}}
{{save-cancel editing=editing save="save" cancel="cancel"}} {{save-cancel editing=editing save="save" cancel="cancel"}}

24
app/components/page-header-environment/template.hbs
View File

@ -10,36 +10,37 @@
<a class="{{if twoLine 'two-line'}} text-white"> <a class="{{if twoLine 'two-line'}} text-white">
{{#if (eq pageScope "project")}} {{#if (eq pageScope "project")}}
<div class="clip"> <div class="clip">
<span>{{project.cluster.displayName}}</span>
<i class="icon icon-cluster icon-fw"></i> <i class="icon icon-cluster icon-fw"></i>
{{project.cluster.displayName}}
</div> </div>
<div class="pl-15 clip text-muted"> <div class="pl-15 clip text-muted">
<span>{{project.displayName}}</span>
<i class="{{project.icon}} project-icon icon-fw"></i> <i class="{{project.icon}} project-icon icon-fw"></i>
{{project.displayName}}
</div> </div>
{{else if (eq pageScope "cluster")}} {{else if (eq pageScope "cluster")}}
<div class="clip"> <div class="clip">
<span>{{cluster.displayName}}</span>
<i class="icon icon-cluster icon-fw"></i> <i class="icon icon-cluster icon-fw"></i>
{{cluster.displayName}}
</div> </div>
{{else if (eq pageScope "clusters")}} {{else if (eq pageScope "clusters")}}
<div class="clip"> <div class="clip">
{{t 'nav.environment.manage'}} <span>{{t 'nav.environment.manage'}}</span>
</div> </div>
{{else if (eq pageScope "global")}} {{else if (eq pageScope "global")}}
<div class="clip"> <div class="clip">
<span>{{t 'nav.admin.tab'}}</span>
<i class="icon icon-globe icon-fw"></i> <i class="icon icon-globe icon-fw"></i>
{{t 'nav.admin.tab'}}
</div> </div>
{{else}} {{else}}
<div class="clip"> <div class="clip">
<span>{{pageScope}}</span>
<i class="icon icon-question icon-fw"></i> <i class="icon icon-question icon-fw"></i>
{{pageScope}}
</div> </div>
{{/if}} {{/if}}
<i class="icon icon-chevron-down chevron"></i>
<span class="sr-only">{{t 'nav.srToggleDropdown'}}</span> <span class="sr-only">{{t 'nav.srToggleDropdown'}}</span>
<i class="icon icon-chevron-down chevron"></i>
</a> </a>
{{/dd.trigger}} {{/dd.trigger}}
@ -50,8 +51,8 @@
<li class="header {{if (eq pageScope "global") 'active selected' 'inactive'}}"> <li class="header {{if (eq pageScope "global") 'active selected' 'inactive'}}">
<a href="{{href-to "global-admin"}}"> <a href="{{href-to "global-admin"}}">
<i class="icon icon-globe icon-fw"></i> <span>{{t 'nav.admin.tab'}}</span>
{{t 'nav.admin.tab'}} <i class="icon icon-globe icon-fw"></i>
</a> </a>
</li> </li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
@ -64,8 +65,8 @@
<li class="header {{if entry.active (if (eq pageScope 'cluster') 'active selected') 'inactive'}}"> <li class="header {{if entry.active (if (eq pageScope 'cluster') 'active selected') 'inactive'}}">
{{#link-to 'authenticated.cluster' entry.cluster.id}} {{#link-to 'authenticated.cluster' entry.cluster.id}}
<span>{{t 'generic.cluster'}}: {{entry.cluster.displayName}}</span>
<i class="icon icon-cluster icon-fw"></i> <i class="icon icon-cluster icon-fw"></i>
{{t 'generic.cluster'}}: {{entry.cluster.displayName}}
{{/link-to}} {{/link-to}}
</li> </li>
@ -75,9 +76,8 @@
<li class="{{if (and (eq pageScope "project") p.active) 'active selected' (unless entry.active 'inactive')}} subitem text-muted"> <li class="{{if (and (eq pageScope "project") p.active) 'active selected' (unless entry.active 'inactive')}} subitem text-muted">
{{#link-to 'authenticated.project' p.id class="clip project-link"}} {{#link-to 'authenticated.project' p.id class="clip project-link"}}
<span>{{p.displayName}}</span>
<i class="icon {{p.icon}} icon-fw"></i> <i class="icon {{p.icon}} icon-fw"></i>
{{p.displayName}}
{{/link-to}} {{/link-to}}
</li> </li>

26
app/components/page-header/template.hbs
View File

@ -50,7 +50,8 @@
qp=subitem.qp qp=subitem.qp
activeParent="LI" activeParent="LI"
}} }}
<i class="{{subitem.icon}}"/> {{maybe-t subitem.localizedLabel subitem.label}} <span>{{maybe-t subitem.localizedLabel subitem.label}}</span>
<i class="{{subitem.icon}}"/>
{{/link-to-as-attrs}} {{/link-to-as-attrs}}
</li> </li>
{{/if}} {{/if}}
@ -59,7 +60,8 @@
{{else}} {{else}}
{{! Just a label }} {{! Just a label }}
<li class="dropdown-header"> <li class="dropdown-header">
<i class="{{subitem.icon}}"/> {{maybe-t subitem.localizedLabel subitem.label}} <span>{{maybe-t subitem.localizedLabel subitem.label}}</span>
<i class="{{subitem.icon}}"/>
</li> </li>
{{/if}} {{/if}}
{{/each}} {{/each}}
@ -131,12 +133,24 @@
{{/if}} {{/if}}
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li>{{#link-to "authenticated.apikeys"}}{{t 'nav.api.link'}} <i class="icon icon-key icon-fw"/>{{/link-to}}</li> <li>{{#link-to "authenticated.apikeys"}}
<li>{{#link-to "nodes.node-templates"}}{{t 'nav.nodeTemplates.link'}} <i class="icon icon-host icon-fw"/>{{/link-to}}</li> <span>{{t 'nav.api.link'}}</span>
<i class="icon icon-key icon-fw"/>{{/link-to}}
</li>
<li>{{#link-to "nodes.node-templates"}}
<span>{{t 'nav.nodeTemplates.link'}}</span>
<i class="icon icon-host icon-fw"/>{{/link-to}}
</li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li>{{#link-to "authenticated.prefs"}}{{t 'nav.userPreferences.link'}} <i class="icon icon-gear icon-fw"/>{{/link-to}}</li> <li>{{#link-to "authenticated.prefs"}}
<span>{{t 'nav.userPreferences.link'}}</span>
<i class="icon icon-gear icon-fw"/>{{/link-to}}
</li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li>{{#link-to "logout" class="user-logout"}}{{t 'nav.user.logout'}} <i class="icon icon-logout icon-fw"/>{{/link-to}}</li> <li>{{#link-to "logout" class="user-logout"}}
<span>{{t 'nav.user.logout'}}</span>
<i class="icon icon-logout icon-fw"/>{{/link-to}}
</li>
{{/dd.content}} {{/dd.content}}
{{!-- </ul> --}} {{!-- </ul> --}}
{{/hover-dropdown}} {{/hover-dropdown}}

1
app/styles/components/_alerts.scss
View File

@ -1,5 +1,4 @@
.alert { .alert {
border: solid 2px $border;
padding: 40px; padding: 40px;
.alert-header { .alert-header {

2
app/styles/components/_button.scss
View File

@ -169,6 +169,8 @@ fieldset[disabled] .btn {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
padding: 0;
.btn:first-child { .btn:first-child {
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;

8
app/styles/components/_dropdown.scss
View File

@ -64,7 +64,9 @@ $ember-basic-dropdown-content-z-index: 1500;
// Links within the dropdown menu // Links within the dropdown menu
> li > a { > li > a {
display: block; display: flex;
align-items: center;
justify-content: space-between;
padding: 6px 12px; padding: 6px 12px;
clear: both; clear: both;
font-weight: normal; font-weight: normal;
@ -73,6 +75,10 @@ $ember-basic-dropdown-content-z-index: 1500;
cursor: pointer; cursor: pointer;
@extend .clip; @extend .clip;
.icon {
font-size: 12px;
}
// Hover/Focus state // Hover/Focus state
&:hover, &:hover,
&:focus { &:focus {

2
app/styles/components/over-hr.scss
View File

@ -3,6 +3,8 @@
text-align : center; text-align : center;
overflow : hidden; overflow : hidden;
white-space : nowrap; white-space : nowrap;
@extend .pt-10;
@extend .pb-10;
& > span { & > span {
position : relative; position : relative;

10
app/styles/pages/_host.scss
View File

@ -179,11 +179,11 @@ ol > li::before {
content: counter(li); content: counter(li);
counter-increment: li; counter-increment: li;
position: absolute; position: absolute;
top: calc(50% - 20px); // top: calc(50% - 20px);
left: -20px; left: -14.5px;
width: 40px; width: 25px;
height: 40px; height: 25px;
line-height: 40px; line-height: 26px;
margin-right: 8px; margin-right: 8px;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;

50
lib/shared/addon/components/form-value-array/template.hbs
View File

@ -1,30 +1,34 @@
<label class="acc-label block">{{t valueLabel}}</label> <label class="acc-label block">{{t valueLabel}}</label>
{{#if ary.length}} {{#if ary.length}}
<table class="table fixed no-lines mb-10">
{{#each ary as |row|}}
<tr> {{#each ary as |row|}}
<td class="pb-10" data-title="{{t valueLabel}}"> <div class="input-group mb-10">
{{#if hasBlock}} <span data-title="{{t valueLabel}}">
{{yield this row}} {{#if hasBlock}}
{{else if editing}} {{yield this row}}
{{input-paste pasted="pastedValues" class="form-control input-sm value" type="text" value=row.value placeholder=valuePlaceholder}} {{else if editing}}
{{else}} {{input-paste pasted="pastedValues" class="form-control input-sm value" type="text" value=row.value placeholder=valuePlaceholder}}
{{row.value}} {{else}}
{{/if}} {{row.value}}
</td> {{/if}}
{{#if editing}} </span>
<td width="30" class="pb-10 text-right"> {{#if editing}}
<button class="btn bg-primary btn-sm" {{action "remove" row}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button> <span class="input-group-btn">
</td> <button class="btn bg-primary btn-sm" {{action "remove" row}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
{{/if}} </span>
</tr> {{/if}}
{{/each}} </div>
</table> {{/each}}
{{else if (not editing)}} {{else if (not editing)}}
<tr><td class="text-center text-muted">{{t noDataLabel}}</td></tr> <p class="text-center text-muted">{{t noDataLabel}}</p>
{{/if}} {{/if}}
{{#if editing}} {{#if editing}}
<button class="btn bg-link icon-btn" {{action "add"}}><span class="darken"><i class="icon icon-plus text-small"/></span> <span>{{t addActionLabel}}</span></button>
<button class="btn bg-link icon-btn mt-10" {{action "add"}}><span class="darken"><i class="icon icon-plus text-small"/></span> <span>{{t addActionLabel}}</span></button>
{{#if ary.length}} {{#if ary.length}}
{{#if showProTip}} {{#if showProTip}}
@ -33,4 +37,4 @@
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}

38
lib/shared/addon/components/sortable-table/template.hbs
View File

@ -33,23 +33,29 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
{{#if rightActions}}
<div class="pull-right pl-20"> <div class="pull-right">
{{yield this 'right-actions'}} {{#if search}}
</div> <div class="vertical-middle">
{{/if}} {{#ember-wormhole to=searchToWormhole renderInPlace=(not searchToWormhole)}}
{{#if search}} <div class="{{unless searchToWormhole 'pull-right'}} search-group input-group">
{{#ember-wormhole to=searchToWormhole renderInPlace=(not searchToWormhole)}} {{input value=searchText aria-title=(t 'generic.search') type="search" class="input-sm pull-right" placeholder=(t 'generic.search')}}
<div class="{{unless searchToWormhole 'pull-right'}} search-group input-group"> {{#if searchText}}
{{input value=searchText aria-title=(t 'generic.search') type="search" class="input-sm pull-right" placeholder=(t 'generic.search')}} <span class="input-group-btn">
{{#if searchText}} <button class="btn bg-transparent text-info pl-10 pr-10" {{action 'clearSearch'}}><i class="icon icon-close"/></button>
<span class="input-group-btn"> </span>
<button class="btn bg-transparent text-info pl-10 pr-10" {{action 'clearSearch'}}><i class="icon icon-close"/></button> {{/if}}
</span> </div>
{{/if}} {{/ember-wormhole}}
</div> </div>
{{/ember-wormhole}} {{/if}}
{{/if}}
{{#if rightActions}}
<div class="vertical-middle pl-20">
{{yield this 'right-actions'}}
</div>
{{/if}}
</div>
</div> </div>
{{/if}} {{/if}}

4
translations/en-us.yaml
View File

@ -1794,8 +1794,8 @@ catalogSettings:
help-name: Unique name help-name: Unique name
help-repo: 'Repository URL :' help-repo: 'Repository URL :'
help-branch: "<i>Optional</i> : If using a GIT based catalog, a branch name is also required" help-branch: "<i>Optional</i> : If using a GIT based catalog, a branch name is also required"
help-git: "GIT based catalog URL, <i class='text-lowercase'>e.g. https://github.com/{appName}/charts.git</i>" help-git: "GIT based catalog URL, <em class='text-lowercase'>e.g. https://github.com/{appName}/charts.git</em>"
help-chart: 'Helm Charts server URL, <i>e.g. https://kubernetes-charts.storage.googleapis.com/ (see <a href="https://docs.helm.sh/developing_charts/#hosting-chart-repositories" target="_blank" rel="nofollow noopener noreferrer">Hosting Chart Repositories</a> for specifics)</i>' help-chart: 'Helm Charts server URL, <em>e.g. https://kubernetes-charts.storage.googleapis.com/ (see <a href="https://docs.helm.sh/developing_charts/#hosting-chart-repositories" target="_blank" rel="nofollow noopener noreferrer">Hosting Chart Repositories</a> for specifics)</em>'
addActionLabel: Add Catalog addActionLabel: Add Catalog
noMatch: No catalogs match the current search. noMatch: No catalogs match the current search.
noData: There are no custom catalogs defined. noData: There are no custom catalogs defined.

11
yarn.lock
View File

@ -2090,6 +2090,10 @@ commander@2.9.0:
dependencies: dependencies:
graceful-readlink ">= 1.0.0" graceful-readlink ">= 1.0.0"
commander@^2.10.0:
version "2.17.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
commander@^2.5.0, commander@^2.6.0, commander@^2.9.0: commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
version "2.15.1" version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@ -2578,6 +2582,13 @@ domain-browser@~1.1.0:
version "1.1.7" version "1.1.7"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
dot-object@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-1.7.0.tgz#3b8ecda78b0f2aa52b8871c180fe1b3e09926a41"
dependencies:
commander "^2.10.0"
glob "^7.1.2"
dot-prop@^4.1.0: dot-prop@^4.1.0:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"