- prepared layout change for login page

Marius Cramer · Marius Cramer · commit d35b34d03ffe · 2015-05-04T19:56:31.000+02:00
diff --git a/interface/web/index.php b/interface/web/index.php
@@ -35,6 +35,7 @@
 
 $app->uses('tpl');
 $app->tpl->newTemplate('main.tpl.htm');
+$app->tpl->setVar('logged_in', ($_SESSION['s']['user']['active'] != 1 ? 'n' : 'y'));
 
 // tab change warning?
 // read misc config
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
@@ -13,7 +13,6 @@ <h1><tmpl_var name="login_txt"></h1>
     </tmpl_if>
 
     <div class="pnl_formsarea">
-        <legend>{tmpl_var name='login_txt'}</legend>
             <div class="form-group">
                 <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>
diff --git a/interface/web/themes/default/assets/stylesheets/login.css b/interface/web/themes/default/assets/stylesheets/login.css
@@ -0,0 +1,9 @@
+#content {
+	margin: 0 auto;
+	float: none;
+}
+
+.form-group input[type="checkbox"] {
+	width: auto;
+	height: auto;
+}
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
@@ -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/select2.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>
 
 <body>
@@ -59,8 +60,8 @@
             </tmpl_if>
           </div>
         </div>
-		<div id='topnav-container'>
-		</div>
+		<tmpl_if name='logged_in' value='y'><div id='topnav-container'>
+		</div></tmpl_if>
 		<div class='clear'>
           <!-- content -->
           <div id='content' class='right'>
@@ -69,8 +70,8 @@
 			</form>
           </div>
           <!-- news sidebar -->
-          <div id='sidebar' class='news-sidebar left'>
-          </div>
+          <tmpl_if name='logged_in' value='y'><div id='sidebar' class='news-sidebar left'>
+          </div></tmpl_if>
         </div>
         <footer id='footer'>
           powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
