From 825dd6792d2d46b7d97e1f1626a9071382977cd2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 19 Dec 2014 15:15:19 -0500
Subject: [PATCH] - First run of template converting for new layout

---
 interface/web/themes/default/templates/main.tpl.htm |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 5192d1e..bb40c50 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -39,15 +39,15 @@
           <div id='headerbar' class='clear'>
             <!-- logout button -->
             <tmpl_if name="cpuser">
-				<button type='button' id='logout-button' class='btn btn-sm btn-danger' onclick="loadContent('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' data-load-content="login/logout.php"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></button>
 				<tmpl_if name='usertype' op='==' value='normaluser'>
 					<!-- search field -->
 					<form action='#' method='get' id='searchform' role='form'>
 					  <div>
 						<div>
 						  <div class='input-group input-group-sm'>
-							<input id='globalsearch' type='text' class='form-control' placeholder='Search' />
-							<span class='input-group-btn'>
+							<div class="col-sm-9"><input type="text" id='globalsearch' class="form-control" placeholder='Search' />
+							</div><span class='input-group-btn'>
 							  <button class='btn btn-default btn-sm' title='Search…'>
 								<span class='icon icon-lens'></span>
 							  </button>
@@ -139,6 +139,14 @@
 			}
 		}
 	});
+	
+	$(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
+		e.preventDefault();
+		var content_to_load = $(this).attr('data-load-content');
+		if(!content_to_load) return this;
+		
+		loadContent(content_to_load);
+	});
 
 	$(document).bind("keypress", function(event) {
 		//Use $ submit with keypress Enter in panel filterbar

--
Gitblit v1.9.1