From 54840e96ad2ee72e346691a90ca302d949f10958 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Tue, 7 Oct 2014 11:02:31 +0000
Subject: [PATCH] Move default js libraries to _layout.hbs in pages style

---
 .../server_side/_layout.handlebars            | 19 +++++++++++++++++++
 .../templates_src/server_side/bans.handlebars |  1 -
 .../server_side/group_edit.handlebars         |  1 -
 .../server_side/groups.handlebars             |  1 -
 .../server_side/history_thread.handlebars     | 13 -------------
 .../server_side/index.handlebars              |  1 -
 .../server_side/install_done.handlebars       | 15 ---------------
 .../server_side/operators.handlebars          |  1 -
 .../server_side/settings_features.handlebars  |  1 -
 .../server_side/updates.handlebars            |  1 -
 .../server_side/users.handlebars              | 18 ------------------
 11 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
index 29949c2b..682a76d5 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
@@ -10,6 +10,25 @@
     <link href="{{asset "@CurrentStyle/css/default.css"}}" rel="stylesheet" type="text/css" />
     <!--[if lte IE 7]><link href="{{asset "@CurrentStyle/css/default_ie.css"}}" rel="stylesheet" type="text/css" /><![endif] -->
     <!--[if lte IE 6]><script language="JavaScript" type="text/javascript" src="{{asset "@CurrentStyle/js/ie.js"}}"></script><![endif]-->
+
+    <!-- External libs -->
+    <script type="text/javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/libs/json2.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/libs/underscore-min.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/libs/backbone-min.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/libs/backbone.marionette.min.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/libs/handlebars.min.js"}}"></script>
+
+    <!-- Client side templates -->
+    <script type="text/javascript" src="{{asset "@CurrentStyle/templates_compiled/client_side/templates.js"}}"></script>
+
+    <!-- Default application files -->
+    <script type="text/javascript" src="{{asset "js/compiled/mibewapi.js"}}"></script>
+    <script type="text/javascript" src="{{asset "js/compiled/default_app.js"}}"></script>
+
+    <!-- Localized string -->
+    <script type="text/javascript" src="{{route "js_translation" locale=currentLocale}}"></script>
+
     {{#block "head"}}{{/block}}
 </head>
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
index 5340c935..fcf3a8b0 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript"><!--
             (function($) {
                 $(document).ready(function(){
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
index 80e35850..82d4c04f 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/group_edit.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/group.js"}}"></script>
     {{/override}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
index 6f9864a1..02be072d 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript"><!--
             (function($) {
                 $(document).ready(function(){
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars
index 37a2819d..0a61104f 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars
@@ -1,19 +1,6 @@
 {{#extends "_layout"}}
     {{#override "head"}}
-        <!-- External libs -->
-        <script type="text/javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/json2.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/underscore-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone.marionette.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/handlebars.min.js"}}"></script>
-
-        <!-- Client side templates -->
-        <script type="text/javascript" src="{{asset "@CurrentStyle/templates_compiled/client_side/templates.js"}}"></script>
-
         <!-- Application files -->
-        <script type="text/javascript" src="{{asset "js/compiled/mibewapi.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/compiled/default_app.js"}}"></script>
         <script type="text/javascript" src="{{asset "js/compiled/thread_log_app.js"}}"></script>
 
         <!-- Start application -->
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
index 1601d2e1..462e1a61 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
@@ -1,7 +1,6 @@
 {{#extends "_layout"}}
     {{#override "head"}}
         {{#if localeLinks}}
-            <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
             <script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/locale.js"}}"></script>
         {{/if}}
     {{/override}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/install_done.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/install_done.handlebars
index 616593f4..e0333628 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/install_done.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/install_done.handlebars
@@ -1,21 +1,6 @@
 {{#extends "install_step"}}
 
     {{#override "head"}}
-        <!-- External libs -->
-        <script type="text/javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/json2.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/underscore-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone.marionette.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/handlebars.min.js"}}"></script>
-
-        <!-- Client side templates -->
-        <script type="text/javascript" src="{{asset "@CurrentStyle/templates_compiled/client_side/templates.js"}}"></script>
-
-        <!-- Default application files -->
-        <script type="text/javascript" src="{{asset "js/compiled/mibewapi.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/compiled/default_app.js"}}"></script>
-
         <script type="text/javascript" language="javascript" src="{{asset "js/compiled/soundcheck.js"}}"></script>
     {{/override}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
index c373db1e..e1c67d76 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript"><!--
             (function($) {
                 $(document).ready(function(){
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
index d7faf151..414eed42 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/features.js"}}"></script>
     {{/override}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
index 5f16174e..307ea0ac 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
@@ -2,7 +2,6 @@
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
-        <script type="text/javascript" language="javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
         <script type="text/javascript" language="javascript" src="http://mibew.org/latestMibew.js"></script>
         <script type="text/javascript" language="javascript" src="{{asset "js/compiled/update.js"}}"></script>
     {{/override}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
index 87aaa57f..ac5cea08 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
@@ -7,26 +7,8 @@
         <!-- Plugins CSS files -->
         {{{additional_css}}}
 
-
-        <!-- External libs -->
-        <script type="text/javascript" src="{{asset "js/libs/jquery.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/json2.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/underscore-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone-min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/backbone.marionette.min.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/libs/handlebars.min.js"}}"></script>
-
-        <!-- Client side templates -->
-        <script type="text/javascript" src="{{asset "@CurrentStyle/templates_compiled/client_side/templates.js"}}"></script>
-
-        <!-- Application files -->
-        <script type="text/javascript" src="{{asset "js/compiled/mibewapi.js"}}"></script>
-        <script type="text/javascript" src="{{asset "js/compiled/default_app.js"}}"></script>
         <script type="text/javascript" src="{{asset "js/compiled/users_app.js"}}"></script>
 
-        <!-- Localized string -->
-        <script type="text/javascript" src="{{route "js_translation" locale=currentLocale}}"></script>
-
         <!-- Plugins JavaScript files -->
         {{{additional_js}}}