From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/themes/default_combobox/templates/main.tpl.htm | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 902cce8..142794e 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -5,9 +5,9 @@
<title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
<meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
<meta http-equiv="X-UA-Compatible" content="IE=8"/>
- <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
+ <link href="themes/default_304/css/central.css" rel="stylesheet" type="text/css"/>
<!--[if lte IE 7]>
- <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
+ <link href="themes/default_304/css/patches/central.css" rel="stylesheet" type="text/css" />
<![endif]-->
<!--[if lte ie 6]>
<style type="text/css" media="screen">
@@ -53,15 +53,16 @@
.uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
</style>
<![endif]-->
- <link href="themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
- <link href="themes/default/css/screen/jquery-ui-custom.css" rel="stylesheet" type="text/css"/>
+ <link href="themes/default_304/css/screen/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+ <link href="themes/default_304/css/screen/jquery-ui-custom.css" rel="stylesheet" type="text/css"/>
<link href="themes/default_combobox/css/additional.css" rel="stylesheet" type="text/css"/>
- <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
+ <link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
<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 type="text/javascript" src="js/jquery.tipsy.js"></script>
<script language="JavaScript" type="text/javascript">
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
if(!is_chrome && getInternetExplorerVersion() > 8.0) {
@@ -92,12 +93,25 @@
noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
});
+
+ jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+
+ tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled>';
+ tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled>';
+ tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
+ tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
});
jQuery(document).bind("change", function(event) {
- if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
- $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
- }
+ var elName = event.target.localName;
+ if (jQuery(".panel #Filter").length > 0 && elName == 'select') {
+ event.preventDefault();
+ jQuery(".panel #Filter").trigger('click');
+ }
+ if(elName == 'select' || elName == 'input' || elName == 'textarea') {
+ // set marker that something was changed
+ pageFormChanged = true;
+ }
});
jQuery(".ui-autocomplete a").live("click", function(event) {
@@ -106,10 +120,16 @@
}
});
- //Use jQuery submit with keypress Enter in panel filterbar
jQuery(document).bind("keypress", function(event) {
- if (event.which == '13' && $(".panel #Filter").length > 0) {
- $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ //Use jQuery submit with keypress Enter in panel filterbar
+ if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+ event.preventDefault();
+ jQuery(".panel #Filter").trigger('click');
+ }
+ //Use jQuery submit with keypress Enter in forms
+ if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && jQuery(event.target).is(':input')) {
+ event.preventDefault();
+ jQuery(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
}
});
@@ -273,7 +293,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 name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</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