Skip to content
Snippets Groups Projects
Commit d35b34d0 authored by Marius Cramer's avatar Marius Cramer
Browse files

- prepared layout change for login page

parent 57496f7c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
interface/web/index.php
+ 1
− 0
View file @ d35b34d0
...@@ -35,6 +35,7 @@ if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] = ...@@ -35,6 +35,7 @@ if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] =
$app->uses('tpl'); $app->uses('tpl');
$app->tpl->newTemplate('main.tpl.htm'); $app->tpl->newTemplate('main.tpl.htm');
$app->tpl->setVar('logged_in', ($_SESSION['s']['user']['active'] != 1 ? 'n' : 'y'));
// tab change warning? // tab change warning?
// read misc config // read misc config
......
interface/web/login/templates/index.htm
+ 0
− 1
View file @ d35b34d0
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
</tmpl_if> </tmpl_if>
<div class="pnl_formsarea"> <div class="pnl_formsarea">
<legend>{tmpl_var name='login_txt'}</legend>
<div class="form-group"> <div class="form-group">
<label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label> <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div> <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div>
......
interface/web/themes/default/assets/stylesheets/login.css 0 → 100644
+ 9
− 0
View file @ d35b34d0
#content {
margin: 0 auto;
float: none;
}
.form-group input[type="checkbox"] {
width: auto;
height: auto;
}
\ No newline at end of file
interface/web/themes/default/templates/main.tpl.htm
+ 5
− 4
View file @ d35b34d0
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/themes/default/theme.min.css' /> <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/themes/default/theme.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2.css' /> <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2-bootstrap.css' /> <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2-bootstrap.css' />
<tmpl_if name='logged_in' value='n'><link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/login.css' /></tmpl_if>
</head> </head>
<body> <body>
...@@ -59,8 +60,8 @@ ...@@ -59,8 +60,8 @@
</tmpl_if> </tmpl_if>
</div> </div>
</div> </div>
<div id='topnav-container'> <tmpl_if name='logged_in' value='y'><div id='topnav-container'>
</div> </div></tmpl_if>
<div class='clear'> <div class='clear'>
<!-- content --> <!-- content -->
<div id='content' class='right'> <div id='content' class='right'>
...@@ -69,8 +70,8 @@ ...@@ -69,8 +70,8 @@
</form> </form>
</div> </div>
<!-- news sidebar --> <!-- news sidebar -->
<div id='sidebar' class='news-sidebar left'> <tmpl_if name='logged_in' value='y'><div id='sidebar' class='news-sidebar left'>
</div> </div></tmpl_if>
</div> </div>
<footer id='footer'> <footer id='footer'>
powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a> powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment