Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve LoginPage across browsers #859

Merged
merged 3 commits into from
Aug 8, 2018
Merged

Improve LoginPage across browsers #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e77ba74
Change Footer layout
swaterkamp Aug 7, 2018
7ca944f
Make space for Footer in Main
swaterkamp Aug 7, 2018
43818e3
Improve LoginPage across browsers
swaterkamp Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion gsa/src/web/components/structure/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,17 @@ const Link = glamorous(ExternalLink)({
});

const Footer = glamorous.footer({
position: 'fixed',
bottom: 0,
right: 0,
left: 0,
padding: '2px',
backgroundColor: 'white',
fontSize: '10px',
textAlign: 'right',
color: '#787878',
margin: '10px 5px',
marginTop: '10px',
paddingRight: '5px',
});

const GreenboneFooter = () => {
Expand Down
1 change: 1 addition & 0 deletions gsa/src/web/components/structure/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import withLayout from '../layout/withLayout.js';
const Main = glamorous.main({
padding: '5px 10px',
height: '100%',
paddingBottom: '20px',
});

Main.displayName = 'Main';
Expand Down
91 changes: 43 additions & 48 deletions gsa/src/web/pages/loginpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,13 @@ import Icon from '../components/icon/icon.js';

import Footer from '../components/structure/footer.js';
import Header from '../components/structure/header.js';
import Main from '../components/structure/main.js';

const log = logger.getLogger('web.login');

const panelcss = {
marginTop: '5px',
marginBottom: '5px',
paddingBottom: '10px',
width: '380px',
fontSize: '9pt',
};

Expand All @@ -75,6 +73,12 @@ const LoginPanel = glamorous(Layout)(
panelcss,
);

const Div = glamorous.div({
display: 'flex',
flexDirection: 'row',
margin: '0 auto',
});

const Error = glamorous.p(
'error',
{
Expand Down Expand Up @@ -126,7 +130,7 @@ class LoginForm extends React.Component {
const {username, password} = this.state;
const protocol_insecure = window.location.protocol !== 'https:';
return (
<Layout flex="column" shrink="0">
<React.Fragment>
{protocol_insecure &&
<Panel>
<Error>{_('Warning: Connection unencrypted')}</Error>
Expand All @@ -141,13 +145,8 @@ class LoginForm extends React.Component {
flex="column"
align="space-around"
>
<Layout
flex="column"
align="space-around"
grow="1"
width="380px"
>
<Layout flex="row">
<Layout flex="row">
<Div>
<StyledIcon img="login-label.png" size="default"/>
<Layout flex="column">
<FormGroup title={_('Username')} titleSize="4">
Expand Down Expand Up @@ -180,15 +179,15 @@ class LoginForm extends React.Component {
/>
</FormGroup>
</Layout>
</Layout>
</Div>
</Layout>
</LoginPanel>
{isDefined(error) &&
<Panel>
<Error>{error}</Error>
</Panel>
}
</Layout>
</React.Fragment>
);
}
}
Expand All @@ -199,40 +198,43 @@ LoginForm.propTypes = {
};

const GreenboneIcon = glamorous(GBIcon)({
minWidth: '60px',
width: '100%',
minHeight: '60px',
height: '100%', // for IE11 fix
maxHeight: '315px',
margin: '40px 0px',
width: '30vh',
margin: '30px auto',
position: 'sticky',
});

const LoginMain = glamorous(Main)({
background: '#fefefe',
const LoginLayout = glamorous(Layout)({
height: '100%',
width: '420px',
margin: '0 auto',
padding: '20px 20px 0px 20px',
});

const LoginLayout = glamorous(Layout)({
height: '100%',
const StyledLayout = glamorous(Layout)({
flexDirection: 'column',
height: '100vh',
});

const LoginHeader = glamorous(Header)({
color: '#393637',
position: 'absolute',
top: 0,
left: 0,
right: 0,
});

const StyledIcon = glamorous(Icon)({
height: '95px',
marginTop: '-7px',
});

const StyledLayout = glamorous(Layout)({
margin: '0 auto',
height: '100%',
marginLeft: '5px',
});

const MenuSpacer = glamorous.div({
minHeight: '35px',
background: '#393637',
position: 'absolute',
top: '42px',
left: 0,
right: 0,
height: '35px',
zIndex: '500',
});

const Wrapper = glamorous.div({
Expand Down Expand Up @@ -290,27 +292,20 @@ class LoginPage extends React.Component {
}

return (
<LoginLayout flex="column" className="login">
<StyledLayout>
<LoginHeader/>
<MenuSpacer/>
<LoginMain>
<StyledLayout
flex="column"
align={['start', 'center']}
grow="1"
position="relative"
>
<GreenboneIcon/>
<Wrapper>
<LoginForm
error={message}
onSubmit={this.handleSubmit}
/>
</Wrapper>
</StyledLayout>
</LoginMain>
<LoginLayout flex="column" className="login">
<GreenboneIcon/>
<Wrapper>
<LoginForm
error={message}
onSubmit={this.handleSubmit}
/>
</Wrapper>
</LoginLayout>
<Footer/>
</LoginLayout>
</StyledLayout>
);
}
}
Expand Down