Merge branch 'feature/gulp' into develop

0307fb63 · PavelBegunkov · 0a845ebe · 8db7e5a2 · 0307fb63 · 0307fb63
Commit 0307fb63 authored 9 years ago by PavelBegunkov
--- a/init_data/mmcs faculty/reports/groupList.jasper
+++ b/init_data/mmcs faculty/reports/groupList.jasper
--- a/init_data/mmcs faculty/reports/sheet.jasper
+++ b/init_data/mmcs faculty/reports/sheet.jasper
--- a/init_data/mmcs faculty/students.csv
+++ b/init_data/mmcs faculty/students.csv
--- a/init_data/mmcs faculty/subjects.csv
+++ b/init_data/mmcs faculty/subjects.csv
--- a/init_data/mmcs faculty/teachers other.csv
+++ b/init_data/mmcs faculty/teachers other.csv
--- a/init_data/mmcs faculty/teachers.csv
+++ b/init_data/mmcs faculty/teachers.csv
--- a/copy.sh
+++ b/copy.sh
--- a/deploy.sh
+++ b/deploy.sh
--- a/deploy_release.sh
+++ b/deploy_release.sh
--- a/install.sh
+++ b/install.sh
--- a/load_and_copy.sh
+++ b/load_and_copy.sh
--- a/status
+++ b/status
--- a/update.sh
+++ b/update.sh
--- a/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig
+++ b/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig
@@ -13,17 +13,17 @@
 <html>
    <head>
        <title>{% block pagename %}Вход в систему{% endblock %} | {{ System.Title }}</title>
-        {{ HTML.style('media/css/sign.css')|raw }}
-        {{ HTML.style('media/css/forms.css')|raw }}
-        {{ HTML.style('media/css/global.css')|raw }}
-        {{ HTML.script('media/js/config.js')|raw }}
-        {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }}
-        {{ HTML.script('media/js/sign.js')|raw }}
-        {{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }}
-        {{ HTML.script('media/js/jquery.sha1.js')|raw }}
+        {{ HTML.style('static/css/sign.css')|raw }}
+        {{ HTML.style('static/css/forms.css')|raw }}
+        {{ HTML.style('static/css/global.css')|raw }}
+        {{ HTML.script('static/js/config.js')|raw }}
+        {{ HTML.script('static/js/jquery-1.11.1.min.js')|raw }}
+        {{ HTML.script('static/js/sign.js')|raw }}
+        {{ HTML.script('static/js/libs/jquery.placeholder.js')|raw }}
+        {{ HTML.script('static/js/jquery.sha1.js')|raw }}

-        {{ HTML.script('media/js/jquery-plugins/jReject/jquery.reject.js')|raw }}
-        {{ HTML.style('media/js/jquery-plugins/jReject/jquery.reject.css')|raw }}
+        {{ HTML.script('static/js/libs/jReject/jquery.reject.js')|raw }}
+        {{ HTML.style('static/js/libs/jReject/jquery.reject.css')|raw }}
        <script>
        $(function() {
            $('input, textarea').placeholder();

--- a/~dev_rating/media/css/admin/base.css
+++ b/~dev_rating/media/css/admin/base.css
--- a/~dev_rating/media/css/admin/infoPage.css
+++ b/~dev_rating/media/css/admin/infoPage.css
--- a/~dev_rating/media/css/admin/inputGroup.css
+++ b/~dev_rating/media/css/admin/inputGroup.css
--- a/~dev_rating/media/css/admin/macro.css
+++ b/~dev_rating/media/css/admin/macro.css
--- a/~dev_rating/media/css/admin/profilePage.css
+++ b/~dev_rating/media/css/admin/profilePage.css
--- a/~dev_rating/media/css/admin/searchBox.css
+++ b/~dev_rating/media/css/admin/searchBox.css