Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

This commit is contained in:
Matthias Mees
2014-03-08 10:50:36 +01:00
5 changed files with 12 additions and 3 deletions
+5 -1
View File
@@ -5,7 +5,8 @@
<meta charset="{$CONST.LANG_CHARSET}">
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{serendipity_getFile file='admin/style.css'}">
<link rel="stylesheet" href="{$serendipityHTTPPath}{serendipity_getFile file='admin/style.css'}">
<script src="{$serendipityHTTPPath}{$templatePath}jquery.js"></script>
</head>
<body id="serendipity_admin_page">
<header id="top">
@@ -287,5 +288,8 @@
<footer id="meta">
<p>{$ADMIN_FOOTER_POWERED_BY|sprintf:$versionInstalled:$phpversion}</p>
</footer>
{* <script src="{$serendipityHTTPPath}{serendipity_getFile file='admin/js/installer_editor.js'}"></script> *}
</body>
</html>
+1 -1
View File
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="{$head_link_stylesheet}">
<script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$head_link_script}"></script>
<script src="{$serendipityHTTPPath}{$templatePath}jquery.js"></script>
</head>
<body id="serendipity_admin_page">
{if NOT $admin_vars.no_banner}