maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

update js folder

Browse Source 
- add images from jquery-ui to css folder, the stylesheet expects them being around even though we don't use them, adding them and not using them is better then editing the stylesheet and then forgetting about it again after every jquery-ui update, i suppose..
- fix html5shiv name, it was minified to begin with
- bump flot to 0.8.3, fix plugin name (no functional changes for us)
- bump tablesorter to 2.16.4 (likewise)
This commit is contained in:
Robert Förster (Dessa)
2014-05-20 19:50:57 +02:00
parent 641c0a09e5
commit 73acfb5d7c
29 changed files with 30 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Sparkle/header.tpl vendored
View File

@@ -9,11 +9,11 @@
</if>
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui.min.js"></script>
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<if isset($intrafficpage)>
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.min.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="js/jquery.flot.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/flot.resize.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jquery.flot.resize.min.js"></script>
<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/traffic.js"></script>
</if>
<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/tipper.min.js"></script>

2
templates/Sparkle/index.tpl vendored
View File

@@ -15,7 +15,7 @@
<link href="templates/{$theme}/assets/img/touchicon.png" rel="apple-touch-icon" />
<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
<title>{$title}Froxlor Server Management Panel</title>

2
templates/Sparkle/misc/alreadyinstalledhint.tpl vendored
View File

@@ -5,7 +5,7 @@
<meta http-equiv="Default-Style" content="text/css" />
<link rel="stylesheet" href="../templates/Sparkle/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="../templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="../templates/Sparkle/assets/js/main.js"></script>
<link href="../templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />

2
templates/Sparkle/misc/configurehint.tpl vendored
View File

@@ -5,7 +5,7 @@
<meta http-equiv="Default-Style" content="text/css" />
<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />

2
templates/Sparkle/misc/dberrornice.tpl vendored
View File

@@ -5,7 +5,7 @@
<meta http-equiv="Default-Style" content="text/css" />
<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />

2
templates/Sparkle/misc/ownershiphint.tpl vendored
View File

@@ -5,7 +5,7 @@
<meta http-equiv="Default-Style" content="text/css" />
<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.js"></script><![endif]-->
<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/Sparkle/assets/js/main.js"></script>
<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />