From 2f4ff71a53a14f202ae820025bf7117c0867ed5e Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 11 May 2012 10:18:19 -0400
Subject: [PATCH] - Styled search box. - Added search box to other templates as well.
---
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 10 +++++
interface/web/themes/default/templates/main.tpl.htm | 3 -
interface/web/themes/default/css/screen/content_ispc.css | 66 +++++++++++++++++---------------
interface/web/themes/default_combobox/templates/main.tpl.htm | 10 +++++
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 10 +++++
interface/web/dashboard/ajax_get_json.php | 2
6 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php
index 817853d..b134a84 100644
--- a/interface/web/dashboard/ajax_get_json.php
+++ b/interface/web/dashboard/ajax_get_json.php
@@ -42,7 +42,7 @@
if($type == 'globalsearch'){
- $q = $app->db->quote($_GET["q"]);
+ $q = $app->db->quote(trim($_GET["q"]));
$authsql = " AND ".$app->tform->getAuthSQL('r');
$modules = explode(',', $_SESSION['s']['user']['modules']);
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index bb8b836..3b74355 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -1004,6 +1004,18 @@
text-decoration: none;
font-size: 1em;
}
+ div.gs-container input{
+ height:20px;
+ border:1px solid #444;
+ padding:0 5px 2px 5px;
+ color:#444;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ -khtml-border-radius:5px;
+ -o-border-radius:5px;
+ -ms-border-radius:5px;
+ border-radius:5px;
+ }
input.gs-loading{
background-image: url(../../icons/x16/loading.gif);
background-repeat: no-repeat;
@@ -1014,7 +1026,7 @@
padding: 0 !important;
width: 300px;
z-index: 999999;
- border: 1px solid #aaa;
+ border: 1px solid #777;
font-size: 11px;
background: #fff;
-moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
@@ -1024,20 +1036,12 @@
-ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
box-shadow: 2px 2px 5px 0 #c5c5c5;
list-style: none;
- /*
- -moz-border-radius-bottomleft:10px;
- -webkit-border-bottom-left-radius:10px;
- -khtml-border-bottom-left-radius:10px;
- -o-border-bottom-left-radius:10px;
- -ms-border-bottom-left-radius:10px;
- border-bottom-left-radius:10px;
- -moz-border-radius-bottomright:10px;
- -webkit-border-bottom-right-radius:10px;
- -khtml-border-bottom-right-radius:10px;
- -o-border-bottom-right-radius:10px;
- -ms-border-bottom-right-radius:10px;
- border-bottom-right-radius:10px;
- */
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ -khtml-border-radius:5px;
+ -o-border-radius:5px;
+ -ms-border-radius:5px;
+ border-radius:5px;
}
ul.gs-resultbox li{
float: left;
@@ -1045,22 +1049,6 @@
clear: both;
cursor: pointer;
}
- /*
- ul.gs-resultbox li:last-child{
- -moz-border-radius-bottomleft:10px;
- -webkit-border-bottom-left-radius:10px;
- -khtml-border-bottom-left-radius:10px;
- -o-border-bottom-left-radius:10px;
- -ms-border-bottom-left-radius:10px;
- border-bottom-left-radius:10px;
- -moz-border-radius-bottomright:10px;
- -webkit-border-bottom-right-radius:10px;
- -khtml-border-bottom-right-radius:10px;
- -o-border-bottom-right-radius:10px;
- -ms-border-bottom-right-radius:10px;
- border-bottom-right-radius:10px;
- }
- */
ul.gs-resultbox li.gs-cheader{
height: 13px;
overflow: hidden;
@@ -1122,5 +1110,21 @@
font-weight: bold;
color: #000;
}
+ ul.gs-resultbox li:first-child{
+ -moz-border-radius:5px 5px 0 0;
+ -webkit-border-radius:5px 5px 0 0;
+ -khtml-border-radius:5px 5px 0 0;
+ -o-border-radius:5px 5px 0 0;
+ -ms-border-radius:5px 5px 0 0;
+ border-radius:5px 5px 0 0;
+ }
+ ul.gs-resultbox li:last-child{
+ -moz-border-radius:0 0 5px 5px;
+ -webkit-border-radius:0 0 5px 5px;
+ -khtml-border-radius:0 0 5px 5px;
+ -o-border-radius:0 0 5px 5px;
+ -ms-border-radius:0 0 5px 5px;
+ border-radius:0 0 5px 5px;
+ }
}
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index a8c389b..2129325 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -90,7 +90,6 @@
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
-
});
@@ -119,7 +118,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <input type="text" id="globalsearch" size="30" value="" />
+ <input type="text" id="globalsearch" size="25" value="" />
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index c7fca67..f5bad43 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -61,6 +61,7 @@
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+ <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script language="JavaScript" type="text/javascript">
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -81,6 +82,14 @@
jQuery('.subsectiontoggle').live("click", function(){
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+ });
+
+ jQuery('#globalsearch').ispconfigSearch({
+ dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
});
@@ -109,6 +118,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ <input type="text" id="globalsearch" size="25" value="" />
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 55917da..902cce8 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -61,6 +61,7 @@
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+ <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script language="JavaScript" type="text/javascript">
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -82,6 +83,14 @@
jQuery('.subsectiontoggle').live("click", function(){
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+ });
+
+ jQuery('#globalsearch').ispconfigSearch({
+ dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
});
@@ -264,6 +273,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ <input type="text" id="globalsearch" size="25" value="" />
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 61df5fd..1230998 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -61,6 +61,7 @@
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+ <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
<script language="JavaScript" type="text/javascript">
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -81,6 +82,14 @@
jQuery('.subsectiontoggle').live("click", function(){
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+ });
+
+ jQuery('#globalsearch').ispconfigSearch({
+ dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
});
@@ -110,6 +119,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ <input type="text" id="globalsearch" size="25" value="" />
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
--
Gitblit v1.9.1