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

list

This commit is contained in:
lvuch 2017-07-17 09:44:11 -07:00
parent 992cf7230e
commit d6379ef73e
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin-tab/auth/azuread/template.hbs
View File

@ -47,7 +47,7 @@
<div class="inline-form">
<label class="acc-label pb-5">{{t 'authPage.azuread.configure.tenantId.label'}}{{field-required}}</label>
{{input type="text" value=model.tenantId placeholder=(t 'authPage.azuread.configure.tenantId.placeholder') classNames="form-control"}}
<p class="text-info">{{t 'authPage.azuread.configure.tenantId.help'}}</p>
<p class="help-block">{{t 'authPage.azuread.configure.tenantId.help'}}</p>
</div>
</div>
<div class="col span-4">
@ -69,7 +69,7 @@
<div class="inline-form">
<label class="acc-label pb-5">{{t 'authPage.azuread.configure.adminAccountUsername.label'}}{{field-required}}</label>
{{input type="text" value=model.adminAccountUsername placeholder=(t 'authPage.azuread.configure.adminAccountUsername.placeholder') classNames="form-control"}}
<p class="text-info">{{t 'authPage.azuread.configure.adminAccountUsername.help'}}</p>
<p class="help-block">{{t 'authPage.azuread.configure.adminAccountUsername.help'}}</p>
</div>
</div>
<div class="col span-6">

6
app/admin-tab/auth/github/template.hbs
View File

@ -92,7 +92,7 @@
<div class="inline-form">
<label class="acc-label pb-5">{{t 'authPage.github.notAuthenticated.form.clientId.labelText'}}{{field-required}}</label>
{{input type="text" name="username" value=githubConfig.clientId classNames="form-control"}}
<p class="text-info">{{t 'authPage.github.notAuthenticated.form.subtext'}}</p>
<p class="help-block">{{t 'authPage.github.notAuthenticated.form.subtext'}}</p>
</div>
</div>
@ -101,11 +101,11 @@
<label class="acc-label pb-5">{{t 'authPage.github.notAuthenticated.form.clientSecret.labelText'}}{{field-required}}</label>
{{input type="password" name="password" value=githubConfig.clientSecret classNames="form-control"}}
</div>
<div class="checkbox pt-15">
<div class="checkbox pt-10">
<label class="acc-label pb-5">{{input type="checkbox" checked=isEnterprise}} {{t 'authPage.github.notAuthenticated.form.ghEnterprise.labelText'}}</label>
</div>
{{#liquid-if isEnterprise}}
<div class="checkbox pt-15">
<div class="checkbox pt-10">
<label class="acc-label pb-5">{{input type="checkbox" checked=secure}} {{t 'authPage.github.notAuthenticated.form.isGHEnterprise.labelText'}} (<code>https://</code>).</label>
</div>
{{/liquid-if}}

4
app/components/container/form-image/template.hbs
View File

@ -1,8 +1,4 @@
<<<<<<< HEAD
<label class="pb-5 acc-label">{{t 'formImage.label'}}{{field-required}}</label>
=======
<label class="acc-label pb-5">{{t 'formImage.label'}}{{field-required}}</label>
>>>>>>> put a lable on it
{{input-suggest
value=userInput

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

@ -237,6 +237,11 @@ ol > li::before {
text-align: center;
background: $info;
color: white;
}
.box ol > li {
background: lighten($accent-bg, 2);
border: solid $accent-border 1px;
}
.host-blurb {

16
app/templates/ldap-config.hbs
View File

@ -85,15 +85,15 @@
<section class="mt-40 box">
<h3>{{t 'ldap.accessConfig.header' providerName=(t providerName)}}</h3>
<hr/>
<p class="text-info">{{t 'ldap.accessConfig.subtext1' providerName=(t providerName) htmlSafe=true}}</p>
<p class="text-info mb-0">{{t 'ldap.accessConfig.subtext1' providerName=(t providerName) htmlSafe=true}}</p>
<div class="row">
<div class="col span-6">
<div class="col span-6 mb-0">
<div class="inline-form">
<label class="acc-label pb-5">{{t 'ldap.accessConfig.hostName.labelText'}}{{field-required}}</label>
{{input value=model.server classNames="form-control"}}
</div>
</div>
<div class="col span-6">
<div class="col span-6 mb-0">
<label class="acc-label pb-5">{{t 'ldap.accessConfig.port.labelText'}}</label>
<div class="input-group">
{{input-integer value=model.port min=1 max=65535 classNames="form-control"}}
@ -103,15 +103,15 @@
</div>
</div>
</div>
<p class="text-info">{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}</p>
<hr class="mt-30 mb-30"/>
<p class="text-info mb-0">{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}</p>
<div class="row">
{{#unless isOpenLdap}}
<div class="col span-4">
<div class="inline-form">
<label class="acc-label pb-5">{{t 'ldap.accessConfig.defaultDomain.labelText'}}</label>
{{input value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}}
<p class="text-info">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p>
<p class="help-block">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p>
</div>
</div>
{{/unless}}
@ -134,14 +134,14 @@
<div class="inline-form">
<label class="acc-label pb-5">{{t 'ldap.accessConfig.userSearchBase.labelText'}}{{field-required}}</label>
{{input value=model.domain classNames="form-control" placeholder=(t 'ldap.accessConfig.userSearchBase.placeholder')}}
<p class="text-info">{{t 'ldap.accessConfig.userSearchBase.helpText'}}</p>
<p class="help-block">{{t 'ldap.accessConfig.userSearchBase.helpText'}}</p>
</div>
</div>
<div class="col span-6">
<div class="inline-form">
<label class="acc-label pb-5">{{t 'ldap.accessConfig.groupSearchBase.labelText'}}{{field-required}}</label>
{{input value=model.groupDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.groupSearchBase.placeholder')}}
<p class="text-info">{{t 'ldap.accessConfig.groupSearchBase.helpText'}}</p>
<p class="help-block">{{t 'ldap.accessConfig.groupSearchBase.helpText'}}</p>
</div>
</div>
</div>