Clean filters button added to the search input. I also optimized load…

…ing of the template files.
Olog · Nov 12, 2014 · c687a00 · c687a00
1 parent d184942
commit c687a00
Show file tree

Hide file tree

Showing 7 changed files with 380 additions and 318 deletions.
diff --git a/Olog/public_html/index.html b/Olog/public_html/index.html
@@ -99,7 +99,8 @@ <h5>Filter Log Entries</h5>
 						<input id="search-order" type="checkbox"> Show newest first
 					</label>
 					<div class="input-append">
-						<input type="text" placeholder="Search ..." id="search-query" class="search_input">
+						<input autocomplete="off" type="text" placeholder="Search ..." id="search-query" class="search_input" />
+						<img alt="" id="search-query-clean" src="static/img/clean.png" />
 						<button id="search-button" type="button" class="btn">Search</button>
 					</div>
 				</div>

diff --git a/Olog/public_html/static/css/style.css b/Olog/public_html/static/css/style.css
@@ -273,7 +273,23 @@ html, body {
 
 .search_input {
 	display: inline-block;
-	width: 80%;
+	width: 70%;
+	padding-right: 40px !important;
+}
+
+#search-query-clean {
+	position:relative;
+	left: -30px;
+	top: 5px;
+	z-index: -1;
+	cursor: pointer;
+	width: 16px;
+	height: 16px;
+}
+
+#search-button {
+	position: relative;
+	left: -15px;
 }
 
 .form-search-box {

diff --git a/Olog/public_html/static/img/clean.png b/Olog/public_html/static/img/clean.png
diff --git a/Olog/public_html/static/js/common.js b/Olog/public_html/static/js/common.js
@@ -556,9 +556,17 @@ function enableCreatingAndModifying() {
 function saveFilterData(dataToBeSaved) {
 	l("save filters data");
 	l(dataToBeSaved);
+	showHideSearchCleanButton($('#search-query'));
 	$.cookie(filtersCookieName, JSON.stringify(dataToBeSaved));
 }
 
+/**
+ * Delete filter cookie when user presses clean filters button
+ */
+function deleteFilterData() {
+	$.removeCookie(filtersCookieName);
+}
+
 /**
  * Save settings data to a cookie
  * @param {type} dataToBeSaved data to be saved into a cookie