From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/themes/default/templates/main.tpl.htm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index c69b79d..058eec3 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -40,7 +40,7 @@
<div id='headerbar' class='clear'>
<!-- logout button -->
<tmpl_if name="cpuser">
- <button type='button' id='logout-button' class='btn btn-sm btn-danger' data-load-content="login/logout.php"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></button>
+ <button type='button' id='logout-button' class='btn btn-sm btn-danger text-uppercase' data-load-content="login/logout.php"><tmpl_var name="logout_txt"> <tmpl_var name="cpuser"></button>
<tmpl_if name='usertype' op='==' value='normaluser'>
<!-- search field -->
<form action='#' method='get' id='searchform' role='form'>
@@ -67,7 +67,7 @@
<!-- content -->
<div id='content' class='right'>
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class='form-horizontal' role='form'>
- <div id="pageContent"><!-- AJAX CONTENT --></div>
+ <div id="pageContent" data-startpage="{tmpl_var name="startpage"}"><!-- AJAX CONTENT --></div>
</form>
</div>
<!-- news sidebar -->
--
Gitblit v1.9.1