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 | 270 ++++++++++++++++++++++++-----------------------------
1 files changed, 122 insertions(+), 148 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index f80193a..eea836c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,151 +1,125 @@
<!DOCTYPE html>
-<html dir="ltr" lang="en-US">
- <head>
- <!--Possible? Vars in lang= ?-->
- <meta charset="<tmpl_var name="html_content_encoding">" />
- <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
- <meta http-equiv="X-UA-Compatible" content="IE=9"/>
- <link href="themes/default/css/styles.css" rel="stylesheet" media="screen" type="text/css" />
- <link href="themes/default/css/print.css" rel="stylesheet" media="print" type="text/css" />
- <!--[if IE 9]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
- <!--[if lte IE 8]><script type="text/javascript" src="themes/default/js/html5shiv.js"></script><![endif]-->
- <!--[if lte IE 7]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
- <link href="themes/default/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="/themes/default/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">
- jQuery(document).ready(function() {
- loadInitContent();
-
- $("#pageForm").submit(function(e){
- //Prevent form submit: e.preventDefault() in lists
- if ($(".panel #Filter").length > 0) {
- e.preventDefault();
- }
- });
-
- 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">'
- });
-
- 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) {
- 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') {
- if(jQuery(event.target).hasClass('no-page-form-change') == false) {
- // set marker that something was changed
- pageFormChanged = true;
- }
- }
- });
-
- jQuery(document).bind("keypress", function(event) {
- //Use jQuery submit with keypress Enter in panel filterbar
- if (event.which == '13' && jQuery(".panel #Filter").length > 0 && jQuery(event.target).hasClass('ui-autocomplete-input') == false ) {
- 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');
- }
- });
-
- jQuery(document).delegate('.pnl_listarea th', 'click', function(event) {
- if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0 && jQuery(this).hasClass('tbl_col_buttons') == false && jQuery(this).hasClass('tbl_col_limit') == false && jQuery(this).hasClass('tbl_col_nosort') == false) {
- event.preventDefault();
- var clickevent = jQuery('#Filter').attr('onclick');
- var element = jQuery(this).attr('class');
- if(typeof clickevent == 'string') {
- jQuery('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
- }
- jQuery(".panel #Filter").trigger('click');
-
- jQuery("#pageForm").ajaxComplete(function() {
- if(jQuery("th."+element).css("background-position") == '0px -15px') {
- if(jQuery("th."+element).css("text-align") == "right") {
- jQuery("th."+element).css("text-align","left");
- } else {
- jQuery("th."+element).css("text-align","right");
- }
- } else {
- jQuery(".pnl_listarea th").css("text-align","");
- }
- jQuery(".pnl_listarea th").css("background-position","0 0");
- jQuery("th."+element).css("background-position","0 -15px");
- });
- }
- });
-
- </script>
- </head>
- <body>
- <div id="page">
- <!-- begin: header -->
- <header>
- <nav id="topsubnav">
- <!-- start: skip link navigation -->
- <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
- <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
- <!-- end: skip link navigation -->
- <tmpl_if name="cpuser">
- <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
- <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
- </tmpl_if>
- </nav>
- <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
- <span>hosting control panel</span>
- </header>
- <!-- end: header -->
- <a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
- <!-- begin: main navigation #nav -->
- <nav id="topNav"> </nav>
- <!-- end: main navigation -->
+<html lang='en'>
+<head>
+ <meta charset='utf-8' />
- <!-- begin: main content area #main -->
- <section id="main" name="content">
- <nav id="sideNav" class="clearfix"> </nav>
- <!-- begin: #content -->
- <section id="content">
- <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div id="pageContent"><!-- AJAX CONTENT --></div>
- </form>
- <div id="ie_clearing"> </div>
- <!-- End: IE Column Clearing -->
- </section>
- <!-- end: #content -->
- </section>
- <!-- end: #main -->
- <!-- begin: footer -->
- <footer>
- Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
- </footer><!-- end: footer -->
+ <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+
+ <meta name='viewport' content='width=device-width, user-scalable=yes'>
+ <meta name='description' lang='en' content='' />
+ <meta name='keywords' lang='en' content='' />
+ <meta name='robots' content='index, follow' />
+
+ <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap.min.css' />
+ <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>
+ <!-- off canvas -->
+ <nav class='pushy pushy-left'></nav>
+ <div class='site-overlay'></div>
+
+ <div id='container'>
+ <div id='main-wrapper'>
+ <div id='inner-wrapper'>
+ <div class='clear'>
+ <div class='left clear'>
+ <!-- off canvas menu button -->
+ <div class='menu-btn left'>☰</div>
+ <!-- logo -->
+ <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 -->
+ <tmpl_if name="cpuser">
+ <button type='button' id='logout-button' class='btn btn-sm btn-danger' data-load-content="login/logout.php"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></button>
+ <tmpl_if name='usertype' op='==' value='normaluser'>
+ <!-- search field -->
+ <form action='#' method='get' id='searchform' role='form'>
+ <div>
+ <div>
+ <div class='input-group'>
+ <input id='globalsearch' type='text' class='form-control' placeholder='Search' />
+ <span class='input-group-btn'>
+ <button class='btn btn-default' title='Search…'>
+ <span class='icon icon-lens'></span>
+ </button>
+ </span>
+ </div>
+ </div>
+ </div>
+ </form>
+ </tmpl_if>
+ </tmpl_if>
+ </div>
</div>
- </body>
-</html>
+ <tmpl_if name='logged_in' value='y'><div id='topnav-container'>
+ </div></tmpl_if>
+ <div class='clear'>
+ <!-- content -->
+ <div id='content' class='right'>
+ <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class='form-horizontal' role='form'>
+ <div id="pageContent"><!-- AJAX CONTENT --></div>
+ </form>
+ </div>
+ <!-- news sidebar -->
+ <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>
+ </footer>
+ </div>
+ </div>
+ </div>
+
+ <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>
+ <script src='themes/<tmpl_var name='current_theme'>/assets/javascripts/responsive.min.js'></script>
+ <script src='js/select2/select2.min.js'></script>
+ <script src='js/scrigo.js.php'></script>
+ <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
+ <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+ <tmpl_loop name="js_d_includes">
+ <script type="text/javascript" src="js/js.d/<tmpl_var name='file'>"></script>
+ </tmpl_loop>
+ <script>
+ <!--
+ //$('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+
+ 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">';
+
+ <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).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: ''
+ });
+
+ });
+ //-->
+ </script>
+</body>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1