From be531cf1d37d2293a572eef25d0190e23fc8a3b4 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 07 May 2015 04:12:05 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/themes/default/templates/main.tpl.htm | 110 +++++++++++-------------------------------------------
1 files changed, 23 insertions(+), 87 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 61aa5c3..eea836c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -14,10 +14,12 @@
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/ispconfig.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/pushy.min.css' />
+ <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap-datetimepicker.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/responsive.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/themes/default/theme.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2-bootstrap.css' />
+ <tmpl_if name='logged_in' value='n'><link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/login.css' /></tmpl_if>
</head>
<body>
@@ -33,7 +35,7 @@
<!-- off canvas menu button -->
<div class='menu-btn left'>☰</div>
<!-- logo -->
- <div id='logo'><a href='#'></a></div>
+ <div id='logo' style="background: url({tmpl_var name="base64_logo_txt"}) no-repeat;width:{tmpl_var name="base64_logo_width"};height:{tmpl_var name="base64_logo_height"}"><a href='#'></a></div>
</div>
<div id='headerbar' class='clear'>
<!-- logout button -->
@@ -59,8 +61,8 @@
</tmpl_if>
</div>
</div>
- <div id='topnav-container'>
- </div>
+ <tmpl_if name='logged_in' value='y'><div id='topnav-container'>
+ </div></tmpl_if>
<div class='clear'>
<!-- content -->
<div id='content' class='right'>
@@ -69,8 +71,8 @@
</form>
</div>
<!-- news sidebar -->
- <div id='sidebar' class='news-sidebar left'>
- </div>
+ <tmpl_if name='logged_in' value='y'><div id='sidebar' class='news-sidebar left'>
+ </div></tmpl_if>
</div>
<footer id='footer'>
powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
@@ -81,6 +83,7 @@
<script type="text/javascript" src="js/jquery.min.js"></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap.min.js'></script>
+ <script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap-datetimepicker.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/ispconfig.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/modernizr.custom.min.js'></script>
<script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/pushy.min.js'></script>
@@ -94,93 +97,26 @@
</tmpl_loop>
<script>
<!--
- $(document).ready(function() {
- loadInitContent();
- });
-
- $('#searchform').submit(function(e) {
- e.preventDefault();
- });
-
- $("#pageForm").submit(function(e){
- //Prevent form submit: e.preventDefault() in lists
- if ($("#pageForm .table #Filter").length > 0) {
- e.preventDefault();
- }
- });
-
- $('#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">',
- resultBoxPosition: ''
- });
-
//$('.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">';
+ ISPConfig.tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">';
+ ISPConfig.tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled">';
+ ISPConfig.tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
+ ISPConfig.tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
- $(document).on("change", function(event) {
- var elName = event.target.localName;
- if ($("#pageForm .table #Filter").length > 0 && elName == 'select') {
- event.preventDefault();
- $("#pageForm .table #Filter").trigger('click');
- }
- if(elName == 'select' || elName == 'input' || elName == 'textarea') {
- if($(event.target).hasClass('no-page-form-change') == false) {
- // set marker that something was changed
- pageFormChanged = true;
- }
- }
- });
+ <tmpl_if name="use_loadindicator" value="y">ISPConfig.setOption('useLoadIndicator', true);</tmpl_if>
+ <tmpl_if name="use_combobox" value="y">ISPConfig.setOption('useComboBox', true);</tmpl_if>
- $(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).ready(function() {
+ $('#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">',
+ resultBoxPosition: ''
+ });
- $(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
- e.preventDefault();
- var content_to_load = $(this).attr('data-capp');
- if(!content_to_load) return this;
-
- capp(content_to_load);
- });
-
- $(document).bind("keypress", function(event) {
- //Use $ submit with keypress Enter in panel filterbar
- if (event.which == '13' && $("#pageForm .table #Filter").length > 0 && $(event.target).hasClass('ui-autocomplete-input') == false ) {
- event.preventDefault();
- $("#pageForm .table #Filter").trigger('click');
- }
- //Use $ submit with keypress Enter in forms
- if (event.which == '13' && $(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && $(event.target).is(':input')) {
- event.preventDefault();
- $(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
- }
- });
-
- $(document).on('click', 'th[data-column]', function(e) {
- var $self = $(this);
- var column = $self.attr('data-column');
- if(!column) return this;
-
- if($("#pageForm .table #Filter").length > 0 && $self.attr('data-sortable') != 'false') {
- var $el = $('#Filter');
- var act = $el.attr('data-form-action');
- var form = $el.attr('data-submit-form');
-
- act = act + '?orderby=' + column;
- submitForm(form, act);
- }
});
//-->
</script>
--
Gitblit v1.9.1