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 | 168 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 121 insertions(+), 47 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index e264733..eea836c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,51 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<!DOCTYPE html>
+<html lang='en'>
<head>
-<title>ISPConfig</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="themes/default/style.css" rel="stylesheet" type="text/css">
-<script src="js/yui/yahoo/yahoo-min.js"></script>
-<script src="js/yui/connection/connection-min.js"></script>
-<!-- Dependencies -->
- <script type="text/javascript" src="http://yui.yahooapis.com/2.2.0/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-
- <!-- OPTIONAL: Connection (not required if not using Dialog/SimpleDialog) -->
- <script type="text/javascript" src="http://yui.yahooapis.com/2.2.0/build/connection/connection-min.js"></script>
-
- <!-- OPTIONAL: Animation (not required if not enabling animation) -->
- <script type="text/javascript" src="http://yui.yahooapis.com/2.2.0/build/animation/animation-min.js"></script>
-
- <!-- Source file -->
- <script type="text/javascript" src="http://yui.yahooapis.com/2.2.0/build/container/container-min.js"></script>
-<script src="js/scrigo.js"></script>
+ <meta charset='utf-8' />
+
+ <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 bgcolor="#FFFFFF" leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 onLoad="loadInitContent()">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
- <tr bgcolor="#496FA8">
- <td height="30" colspan="2" align="right" valign="top" background="themes/default/images/bg_nav_1.jpg"><img src="themes/default/images/mydnsconfig_logo.gif" border="0" alt=""></td>
- </tr>
- <tr bgcolor="#FFFFFF">
- <td height="1" colspan="2" align="center" valign="bottom"><img src="themes/default/images/x.gif" width="1" height="1"></td>
- </tr>
- <tr>
- <td width="128" height="18" align="left" valign="middle" bgcolor="#496FA8"><img src="themes/default/images/login_logout.gif" width="115" height="10" border="0" usemap="#Map"><br>
- </td>
- <td height="18" align="left" valign="bottom" bgcolor="#496FA8"><div id="topNav"> </div></td>
- </tr>
- <tr>
- <td width="128" height="26" background="themes/default/images/nav_top_bg.gif"> </td>
- <td rowspan="3" class="mainContent"><form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" style="margin:10px; width:99%; height:100%;"><div id="pageContent" style="width:100%; height:100%;"></div></form></td>
- </tr>
- <tr>
- <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><div id="sideNav"> </div></td>
- </tr>
- <tr>
- <td align="left" valign="bottom" bgcolor="#DEE4F2"> </td>
- </tr>
-</table>
-<map name="Map">
- <area shape="rect" coords="66,1,106,19" href="login/logout.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5">
- <area shape="rect" coords="5,1,50,10" href="help/index.php?phpsessid=d4307711e9e4905b0bf590198a1fc4a5" target="content">
-</map>
+
+<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>
+ <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