Author: bricks
Date: 2017-01-13 15:14:38 +0100 (Fri, 13 Jan 2017)
New Revision: 27208
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/ng/src/web/css/login.css
trunk/gsa/src/html/classic/ng/src/web/layout.js
trunk/gsa/src/html/classic/ng/src/web/login.js
Log:
* src/html/classic/ng/src/web/css/login.css,
src/html/classic/ng/src/web/layout.js,
src/html/classic/ng/src/web/login.js: Use flexbox layout also for the login
page and form.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2017-01-13 14:14:36 UTC (rev 27207)
+++ trunk/gsa/ChangeLog 2017-01-13 14:14:38 UTC (rev 27208)
@@ -1,5 +1,12 @@
2017-01-13 Bj�rn Ricks <bjoern.ri...@greenbone.net>
+ * src/html/classic/ng/src/web/css/login.css,
+ src/html/classic/ng/src/web/layout.js,
+ src/html/classic/ng/src/web/login.js: Use flexbox layout also for the
login
+ page and form.
+
+2017-01-13 Bj�rn Ricks <bjoern.ri...@greenbone.net>
+
* src/html/classic/ng/src/web/tasks/tasks.js,
src/html/classic/ng/src/web/toolbar.js: Also use flexbox layout for the
toolbar.
Modified: trunk/gsa/src/html/classic/ng/src/web/css/login.css
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/css/login.css 2017-01-13 14:14:36 UTC
(rev 27207)
+++ trunk/gsa/src/html/classic/ng/src/web/css/login.css 2017-01-13 14:14:38 UTC
(rev 27208)
@@ -3,7 +3,7 @@
height: 100%;
}
-.login main {
+.login .main {
background: #393637;
height: 100%;
}
@@ -14,11 +14,11 @@
color: #393637;
}
-.login main .greenbone-icon {
+.login .main .greenbone-icon {
width: 400px;
}
-.login .box {
+.login .login-panel {
margin-top: 30px;
margin-bottom: 30px;
padding: 10px;
Modified: trunk/gsa/src/html/classic/ng/src/web/layout.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/layout.js 2017-01-13 14:14:36 UTC
(rev 27207)
+++ trunk/gsa/src/html/classic/ng/src/web/layout.js 2017-01-13 14:14:38 UTC
(rev 27208)
@@ -35,7 +35,7 @@
return function(props) {
/* eslint-disable */
let {className, flex, align, grow, shrink, basis, float, box, offset,
- style = {}, ...other} = props;
+ style = {}, wrap, ...other} = props;
/* esline-enable */
let css = className;
@@ -49,7 +49,7 @@
if (is_empty(flex) || flex === true) {
flex = 'row';
}
- css = classes('flex', flex, css);
+ css = classes('flex', flex, wrap ? 'wrap' : undefined, css);
if (is_defined(align)) {
if (is_array(align)) {
Modified: trunk/gsa/src/html/classic/ng/src/web/login.js
===================================================================
--- trunk/gsa/src/html/classic/ng/src/web/login.js 2017-01-13 14:14:36 UTC
(rev 27207)
+++ trunk/gsa/src/html/classic/ng/src/web/login.js 2017-01-13 14:14:38 UTC
(rev 27208)
@@ -120,10 +120,10 @@
return (
<Layout flex="column" className="login">
<Header/>
- <main className="auto flex row wrap align-center justify-space-around">
+ <Layout flex align={['space-around', 'center']} wrap className="main">
<LoginForm onSubmit={this.onSubmit} error={message}/>
<LogoBox/>
- </main>
+ </Layout>
<Footer className="none"/>
</Layout>
);
@@ -181,34 +181,40 @@
let {error} = this.props;
let {username, password} = this.state;
return (
- <div className="none">
+ <Layout flex="column">
{error &&
- <div className="box">
+ <div className="login-panel">
<p className="error">{error}</p>
</div>
}
- <Layout flex align="space-arround" className="box">
+ <Layout flex align="space-around" className="login-panel">
<Icon img="login-label.png" className="none" size="default"/>
- <Layout float className="form-horizontal">
- <FormGroup title={_('Username')} titleSize="4">
- <TextField name="username" placeholder={_('e.g. johndoe')}
- value={username}
- autoFocus="autofocus"
- tabIndex="1"
- onChange={this.onUserNameChange}/>
- </FormGroup>
- <FormGroup title={_('Password')} titleSize="4">
- <PasswordField name="password" placeholder={_('Password')}
- value={password}
- onKeyDown={this.onKeyDown}
- onChange={this.onPasswordChange}/>
- </FormGroup>
+ <Layout flex="column" align="space-around" grow="1">
+ <Layout flex="column">
+ <FormGroup title={_('Username')} titleSize="4">
+ <TextField name="username"
+ grow="1"
+ placeholder={_('e.g. johndoe')}
+ value={username}
+ autoFocus="autofocus"
+ tabIndex="1"
+ onChange={this.onUserNameChange}/>
+ </FormGroup>
+ <FormGroup title={_('Password')} titleSize="4">
+ <PasswordField name="password"
+ grow="1"
+ placeholder={_('Password')}
+ value={password}
+ onKeyDown={this.onKeyDown}
+ onChange={this.onPasswordChange}/>
+ </FormGroup>
+ </Layout>
<FormGroup size="6" offset="6">
<SubmitButton title={_('Login')} onClick={this.onSubmit}/>
</FormGroup>
</Layout>
</Layout>
- </div>
+ </Layout>
);
}
}
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
