Skip to content

Commit 2f4ff71

Browse files
falkotimmefalkotimme
committed
- Styled search box.
- Added search box to other templates as well.
1 parent 59118c7 commit 2f4ff71

File tree

6 files changed

+67
-34
lines changed

6 files changed

+67
-34
lines changed

‎interface/web/dashboard/ajax_get_json.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343

4444
if($type == 'globalsearch'){
45-
$q = $app->db->quote($_GET["q"]);
45+
$q = $app->db->quote(trim($_GET["q"]));
4646
$authsql = " AND ".$app->tform->getAuthSQL('r');
4747
$modules = explode(',', $_SESSION['s']['user']['modules']);
4848

‎interface/web/themes/default/css/screen/content_ispc.css‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,18 @@
10041004
text-decoration: none;
10051005
font-size: 1em;
10061006
}
1007+
div.gs-container input{
1008+
height:20px;
1009+
border:1px solid #444;
1010+
padding:0 5px 2px 5px;
1011+
color:#444;
1012+
-moz-border-radius:5px;
1013+
-webkit-border-radius:5px;
1014+
-khtml-border-radius:5px;
1015+
-o-border-radius:5px;
1016+
-ms-border-radius:5px;
1017+
border-radius:5px;
1018+
}
10071019
input.gs-loading{
10081020
background-image: url(../../icons/x16/loading.gif);
10091021
background-repeat: no-repeat;
@@ -1014,7 +1026,7 @@
10141026
padding: 0 !important;
10151027
width: 300px;
10161028
z-index: 999999;
1017-
border: 1px solid #aaa;
1029+
border: 1px solid #777;
10181030
font-size: 11px;
10191031
background: #fff;
10201032
-moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
@@ -1024,43 +1036,19 @@
10241036
-ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
10251037
box-shadow: 2px 2px 5px 0 #c5c5c5;
10261038
list-style: none;
1027-
/*
1028-
-moz-border-radius-bottomleft:10px;
1029-
-webkit-border-bottom-left-radius:10px;
1030-
-khtml-border-bottom-left-radius:10px;
1031-
-o-border-bottom-left-radius:10px;
1032-
-ms-border-bottom-left-radius:10px;
1033-
border-bottom-left-radius:10px;
1034-
-moz-border-radius-bottomright:10px;
1035-
-webkit-border-bottom-right-radius:10px;
1036-
-khtml-border-bottom-right-radius:10px;
1037-
-o-border-bottom-right-radius:10px;
1038-
-ms-border-bottom-right-radius:10px;
1039-
border-bottom-right-radius:10px;
1040-
*/
1039+
-moz-border-radius:5px;
1040+
-webkit-border-radius:5px;
1041+
-khtml-border-radius:5px;
1042+
-o-border-radius:5px;
1043+
-ms-border-radius:5px;
1044+
border-radius:5px;
10411045
}
10421046
ul.gs-resultbox li{
10431047
float: left;
10441048
width: 100%;
10451049
clear: both;
10461050
cursor: pointer;
10471051
}
1048-
/*
1049-
ul.gs-resultbox li:last-child{
1050-
-moz-border-radius-bottomleft:10px;
1051-
-webkit-border-bottom-left-radius:10px;
1052-
-khtml-border-bottom-left-radius:10px;
1053-
-o-border-bottom-left-radius:10px;
1054-
-ms-border-bottom-left-radius:10px;
1055-
border-bottom-left-radius:10px;
1056-
-moz-border-radius-bottomright:10px;
1057-
-webkit-border-bottom-right-radius:10px;
1058-
-khtml-border-bottom-right-radius:10px;
1059-
-o-border-bottom-right-radius:10px;
1060-
-ms-border-bottom-right-radius:10px;
1061-
border-bottom-right-radius:10px;
1062-
}
1063-
*/
10641052
ul.gs-resultbox li.gs-cheader{
10651053
height: 13px;
10661054
overflow: hidden;
@@ -1122,5 +1110,21 @@
11221110
font-weight: bold;
11231111
color: #000;
11241112
}
1113+
ul.gs-resultbox li:first-child{
1114+
-moz-border-radius:5px 5px 0 0;
1115+
-webkit-border-radius:5px 5px 0 0;
1116+
-khtml-border-radius:5px 5px 0 0;
1117+
-o-border-radius:5px 5px 0 0;
1118+
-ms-border-radius:5px 5px 0 0;
1119+
border-radius:5px 5px 0 0;
1120+
}
1121+
ul.gs-resultbox li:last-child{
1122+
-moz-border-radius:0 0 5px 5px;
1123+
-webkit-border-radius:0 0 5px 5px;
1124+
-khtml-border-radius:0 0 5px 5px;
1125+
-o-border-radius:0 0 5px 5px;
1126+
-ms-border-radius:0 0 5px 5px;
1127+
border-radius:0 0 5px 5px;
1128+
}
11251129
}
11261130

‎interface/web/themes/default/templates/main.tpl.htm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
9191
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
9292
});
93-
9493
});
9594

9695

@@ -119,7 +118,7 @@
119118
<!-- end: skip link navigation -->
120119
<tmpl_if name="cpuser">
121120
<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>
122-
<input type="text" id="globalsearch" size="30" value="" />
121+
<input type="text" id="globalsearch" size="25" value="" />
123122
</tmpl_if>
124123
</div>
125124
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>

‎interface/web/themes/default_64_navimg/templates/main.tpl.htm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
6262
<script type="text/javascript" src="js/scrigo.js.php"></script>
6363
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
64+
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6465
<script language="JavaScript" type="text/javascript">
6566
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
6667
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -82,6 +83,14 @@
8283
jQuery('.subsectiontoggle').live("click", function(){
8384
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
8485
});
86+
87+
jQuery('#globalsearch').ispconfigSearch({
88+
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
89+
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
90+
noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
91+
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
92+
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
93+
});
8594
});
8695

8796
jQuery(document).bind("change", function(event) {
@@ -109,6 +118,7 @@
109118
<!-- end: skip link navigation -->
110119
<tmpl_if name="cpuser">
111120
<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>
121+
<input type="text" id="globalsearch" size="25" value="" />
112122
</tmpl_if>
113123
</div>
114124
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>

‎interface/web/themes/default_combobox/templates/main.tpl.htm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
6262
<script type="text/javascript" src="js/scrigo.js.php"></script>
6363
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
64+
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6465
<script language="JavaScript" type="text/javascript">
6566
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
6667
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -83,6 +84,14 @@
8384
jQuery('.subsectiontoggle').live("click", function(){
8485
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
8586
});
87+
88+
jQuery('#globalsearch').ispconfigSearch({
89+
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
90+
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
91+
noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
92+
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
93+
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
94+
});
8695
});
8796

8897
jQuery(document).bind("change", function(event) {
@@ -264,6 +273,7 @@
264273
<!-- end: skip link navigation -->
265274
<tmpl_if name="cpuser">
266275
<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>
276+
<input type="text" id="globalsearch" size="25" value="" />
267277
</tmpl_if>
268278
</div>
269279
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>

‎interface/web/themes/default_no_navimg/templates/main.tpl.htm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
6262
<script type="text/javascript" src="js/scrigo.js.php"></script>
6363
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
64+
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6465
<script language="JavaScript" type="text/javascript">
6566
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
6667
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -82,6 +83,14 @@
8283
jQuery('.subsectiontoggle').live("click", function(){
8384
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
8485
});
86+
87+
jQuery('#globalsearch').ispconfigSearch({
88+
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
89+
resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
90+
noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
91+
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
92+
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
93+
});
8594
});
8695

8796
jQuery(document).bind("change", function(event) {
@@ -110,6 +119,7 @@
110119
<!-- end: skip link navigation -->
111120
<tmpl_if name="cpuser">
112121
<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>
122+
<input type="text" id="globalsearch" size="25" value="" />
113123
</tmpl_if>
114124
</div>
115125
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>

0 commit comments

Comments
 (0)