From be531cf1d37d2293a572eef25d0190e23fc8a3b4 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 07 May 2015 04:12:05 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/themes/default/templates/main.tpl.htm | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 67b37e8..eea836c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -14,10 +14,12 @@
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/ispconfig.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/pushy.min.css' />
+ <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap-datetimepicker.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/responsive.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-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>
@@ -33,7 +35,7 @@
<!-- off canvas menu button -->
<div class='menu-btn left'>☰</div>
<!-- logo -->
- <div id='logo'><a href='#'></a></div>
+ <div id='logo' style="background: url({tmpl_var name="base64_logo_txt"}) no-repeat;width:{tmpl_var name="base64_logo_width"};height:{tmpl_var name="base64_logo_height"}"><a href='#'></a></div>
</div>
<div id='headerbar' class='clear'>
<!-- logout button -->
@@ -59,8 +61,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 +71,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>
@@ -81,6 +83,7 @@
<script type="text/javascript" src="js/jquery.min.js"></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap.min.js'></script>
+ <script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap-datetimepicker.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/ispconfig.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/modernizr.custom.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/pushy.min.js'></script>
--
Gitblit v1.9.1