LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix login window according to specs

Browse source
This commit is contained in:
iRouge 2015-03-08 17:42:38 -04:00 committed by Francis Lachapelle
parent f1cdb3a472
commit bdbbc5be47
2 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UI/Templates/MainUI/SOGoRootPage.wox
View file

@ -46,22 +46,26 @@
<div id="logo"> <div id="logo">
<img const:alt="*" id="splash" rsrc:src="img/sogo-full.svg"/> <img const:alt="*" id="splash" rsrc:src="img/sogo-full.svg"/>
</div> </div>
<form name="loginForm" layout="column" ng-controller="loginController" ng-submit="login(creds)"> <form name="loginForm" layout="column" ng-controller="loginController" ng-submit="login(creds)">
<var:if condition="hasLoginSuffix"><input type="hidden" ng-model="creds.loginSuffix" var:value="loginSuffix"/></var:if> <var:if condition="hasLoginSuffix"><input type="hidden" ng-model="creds.loginSuffix" var:value="loginSuffix"/></var:if>
<div ng-show="warning" ng-cloak="ng-cloak" alert="alert" class="alert-box radius warning">{{warning}}</div> <div ng-show="warning" ng-cloak="ng-cloak" alert="alert" class="alert-box radius warning">{{warning}}</div>
<md-input-container> <md-input-container>
<label><var:string label:value="Username:"/> <label>
<var:string label:value="Username:"/>
</label> </label>
<input type="text" ng-model="creds.username" required="required" /> <input type="text" ng-model="creds.username" required="required" />
</md-input-container> </md-input-container>
<md-input-container> <md-input-container>
<label><var:string label:value="Password:"/> <label>
<var:string label:value="Password:"/>
</label> </label>
<input type="password" ng-model="creds.password" required="required" /> <input type="password" ng-model="creds.password" required="required" />
</md-input-container> </md-input-container>
<div layout="row" layout-align="start end">
<label><var:string label:value="Language:"/> <label class="login-lang">
<var:string label:value="Language:"/>
</label>
<md-select ng-model="creds.language" label:placeholder="choose"> <md-select ng-model="creds.language" label:placeholder="choose">
<var:foreach list="languages" item="item"> <var:foreach list="languages" item="item">
<md-option var:value="item"> <md-option var:value="item">
@ -69,8 +73,9 @@
</md-option> </md-option>
</var:foreach> </var:foreach>
</md-select> </md-select>
</div>
</label>
<var:if condition="hasLoginDomains"> <var:if condition="hasLoginDomains">
<label><var:string label:value="Domain:"/><br/> <label><var:string label:value="Domain:"/><br/>
<var:popup const:name="domain" <var:popup const:name="domain"
@ -88,8 +93,14 @@
<label><var:string label:value="Remember username"/></label> <label><var:string label:value="Remember username"/></label>
</md-checkbox> --> </md-checkbox> -->
<!-- <label> --> <!-- <label> -->
<md-button type="submit" class="md-raised md-primary" ng-disabled='!loginForm.$valid'> <div class="fieldset" layout="row" layout-align="end center">
<var:string label:value="Connect" /></md-button> <md-button type="submit" class="md-primary" ng-disabled='!loginForm.$valid'>
<span>
<var:string label:value="Connect"/>
</span>
</md-button>
</div>
<!-- </label> --> <!-- </label> -->
<md-switch ng-model="creds.rememberLogin"> <md-switch ng-model="creds.rememberLogin">
<var:string label:value="Remember username"/> <var:string label:value="Remember username"/>

5
UI/WebServerResources/scss/views/LoginUI.scss
View file

@ -8,3 +8,8 @@
[id=logo] img { [id=logo] img {
max-width: 100%; max-width: 100%;
} }
label.login-lang {
margin: 0 $bl $bl 0;
}