summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2013-01-06 09:46:57 -0800
committerMarcel Klehr <mklehr@gmx.net>2013-01-06 09:46:57 -0800
commit2a89dc5913c54eb4b4367f89f104dde7a021e931 (patch)
treebe6d9651c8d428052ed088d8fb575e671dc55bb6 /src
parent6e7b6942430c7974fb66817de6452343b62a75fc (diff)
parent77315aa1d4c0026ee267dca684acb27ecfef0069 (diff)
downloadetherpad-lite-2a89dc5913c54eb4b4367f89f104dde7a021e931.zip
Merge pull request #1327 from mluto/order-styles-script
Optimize the order of styles and scripts
Diffstat (limited to 'src')
-rw-r--r--src/templates/pad.html8
-rw-r--r--src/templates/timeslider.html8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html
index a9313a1b..92f6c1ae 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -34,16 +34,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="shortcut icon" href="<%=settings.faviconPad%>">
- <link rel="localizations" type="application/l10n+json" href="../locales.json" />
- <script type="text/javascript" src="../static/js/html10n.js"></script>
- <script type="text/javascript" src="../static/js/l10n.js"></script>
-
<% e.begin_block("styles"); %>
<link href="../static/css/pad.css" rel="stylesheet">
<link href="../static/custom/pad.css" rel="stylesheet">
<style title="dynamicsyntax"></style>
<% e.end_block(); %>
+ <link rel="localizations" type="application/l10n+json" href="../locales.json" />
+ <script type="text/javascript" src="../static/js/html10n.js"></script>
+ <script type="text/javascript" src="../static/js/l10n.js"></script>
+
<!-- head and body had been removed intentionally -->
<% e.begin_block("body"); %>
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 16579942..6cddfc15 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -33,14 +33,14 @@
<meta name="robots" content="noindex, nofollow">
<link rel="shortcut icon" href="<%=settings.faviconTimeslider%>">
- <link rel="localizations" type="application/l10n+json" href="../../locales.json" />
- <script type="text/javascript" src="../../static/js/html10n.js"></script>
- <script type="text/javascript" src="../../static/js/l10n.js"></script>
-
<link rel="stylesheet" href="../../static/css/pad.css">
<link rel="stylesheet" href="../../static/css/timeslider.css">
<link rel="stylesheet" href="../../static/custom/timeslider.css">
<style type="text/css" title="dynamicsyntax"></style>
+
+ <link rel="localizations" type="application/l10n+json" href="../../locales.json" />
+ <script type="text/javascript" src="../../static/js/html10n.js"></script>
+ <script type="text/javascript" src="../../static/js/l10n.js"></script>
</head>
<body id="padbody" class="timeslider limwidth">