ADD: missing js files, views refactoring

antaresproject · Mar 10, 2017 · 2055831 · 2055831
1 parent 996447d
commit 2055831
Show file tree

Hide file tree

Showing 29 changed files with 2,433 additions and 25,502 deletions.
diff --git a/public/css/antares.css b/public/css/antares.css
diff --git a/public/css/bower_assets.css b/public/css/bower_assets.css
diff --git a/public/css/external.css b/public/css/external.css
diff --git a/public/img/theme/billevo/logo/favicon--big.png b/public/img/theme/billevo/logo/favicon--big.png
diff --git a/public/img/theme/billevo/logo/favicon.png b/public/img/theme/billevo/logo/favicon.png
diff --git a/public/img/theme/billevo/logo/logo-white.png b/public/img/theme/billevo/logo/logo-white.png
diff --git a/public/img/theme/billevo/logo/logo__old.png b/public/img/theme/billevo/logo/logo__old.png
diff --git a/public/img/theme/billevo/logo/logo_circle.png b/public/img/theme/billevo/logo/logo_circle.png
diff --git a/public/img/theme/billevo/logo/logo_full.png b/public/img/theme/billevo/logo/logo_full.png
diff --git a/public/img/theme/billevo/logo/logo_mobile.png b/public/img/theme/billevo/logo/logo_mobile.png
diff --git a/public/img/theme/billevo/logo/logo_tear.png b/public/img/theme/billevo/logo/logo_tear.png
diff --git a/public/packages/core/css/additionals.css b/public/packages/core/css/additionals.css
@@ -388,6 +388,9 @@ aside.main-sidebar ul.main-menu > li > a .text{
 .separator-small{
     height:5px;
 }
+.separator-medium{
+    height:20px;
+}
 
 .tbl-c table tr td img{
     max-height: 29px;
@@ -475,4 +478,7 @@ table.possible-additional-row tr.new-tr:hover td{
 }
 form fieldset .form-block span.error{
     padding-top:0px;
+}
+.form-block .input-field.input-field--desc input{
+    margin:0px;
 }
diff --git a/public/packages/core/js/on-load.js b/public/packages/core/js/on-load.js
@@ -120,6 +120,7 @@ var ConfirmModal = (function () {
                 return this.isGetHttpMethod() ? 'GET' : 'POST';
             },
             ConfirmModal.prototype.buildForm = function () {
+
                 var $footer = this.getFooter();
 
                 var $methodInput = $('<input/>', {
@@ -162,6 +163,7 @@ var ConfirmModal = (function () {
         form.submit();
     };
     ConfirmModal.prototype.open = function () {
+
         var self = this;
         var isMassAction = self.from.hasClass('mass-action');
         if (isMassAction) {
@@ -363,7 +365,7 @@ $(document).ready(function () {
     $('.mail-change-driver', document).on("change", function (e) {
         var handler = $(this), driver = handler.val();
 
-        handler.closest('form').find('input').each(function (index, item) {
+        handler.closest('form').find('.mail-control').each(function (index, item) {
             var element = $(item).closest('.form-block');
             if (element.attr('role') === driver) {
                 element.removeClass('hidden-block');

diff --git a/public/webpack/app_cache.js b/public/webpack/app_cache.js
diff --git a/public/webpack/forms_advanced.js b/public/webpack/forms_advanced.js
diff --git a/public/webpack/translations_requirements.js b/public/webpack/translations_requirements.js
diff --git a/public/webpack/view_acl.js b/public/webpack/view_acl.js
diff --git a/public/webpack/view_brand_settings.js b/public/webpack/view_brand_settings.js
diff --git a/resources/config/dependable_actions.php b/resources/config/dependable_actions.php
@@ -11,9 +11,7 @@
                 return [
                     'title'      => trans('antares/users::messages.dependable.' . $title),
                     'url'        => handles('antares/foundation::users/' . $model->id . '/status'),
-                    //
                     'attributes' => [
-                        'class'            => 'triggerable confirm',
                         'data-icon'        => $model->status ? 'minus' : 'check',
                         'data-title'       => trans("antares/users::messages.dependable.user_change_status_question"),
                         'data-description' => trans('antares/users::messages.dependable.' . $description, ['fullname' => $model->fullname])]

diff --git a/resources/views/default/exception/404.twig b/resources/views/default/exception/404.twig
@@ -6,7 +6,7 @@
                 <div class="error-container">
                     <div class="top-area">
                         <div class="app-logo">
-                            <img src="{{ brand_logo('big','/img/theme/antares/logo/logo_mobile.png') }}" alt="{{ brand_title() }}">
+                            <img src="{{ brand_logo('big','/img/theme/antares/logo/full-logo-white.svg') }}" alt="{{ brand_title() }}">
                         </div>
                         <div class="error-message">
                             <div class="error-message__bg"></div>

diff --git a/resources/views/default/layouts/antares/main.twig b/resources/views/default/layouts/antares/main.twig
@@ -105,7 +105,11 @@
                 {% endblock %}
             </div>
         </div>                  
+        <template id="sweet-alert-template">
+            <div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" style="display: none" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <img class="sweet-image"> <div class="header"><h2>Title</h2><i class="zmdi zmdi-close swal__close"></i></div><div class="sweet-content">Text</div><hr class="sweet-spacer"><div class="footer"><button class="sweet-confirm">OK</button><button class="sweet-cancel">Cancel</button></div></div>
+        </template>
         {% include 'antares/foundation::layouts.antares.partials._spinner' %}
         {% include 'antares/foundation::layouts.antares.partials._scripts_webpack' %}                
+
     </body>
 </html>
diff --git a/resources/views/default/layouts/antares/partials/_head_webpack.twig b/resources/views/default/layouts/antares/partials/_head_webpack.twig
@@ -14,7 +14,6 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
 {% block javascripts %}
     {%  set asset = app('antares.asset').container('antares.header')               
-               .style('bower_assets', asset('/css/bower_assets.css'))
                .style('external_css', '/css/external.css')
                .style('antares_css', '/css/antares.css')
                .style('additionals', 'packages/core/css/additionals.css')                               

diff --git a/resources/views/default/layouts/antares/partials/form/vertical.twig b/resources/views/default/layouts/antares/partials/form/vertical.twig
@@ -36,7 +36,7 @@
     {% if buttons is not empty %}
         <div class="app-content__footer">
             <div class="btn-group">
-                {% for button in buttons %}  
+                {% for button in buttons %}                      
                     {% if button.attributes.attributes.type not in ['submit','button'] %}
                         {% set links = links|merge([button]) %}
                     {% else %}
@@ -45,14 +45,15 @@
                         {% endif %}
                     {% endif %}
                 {% endfor %}
+                {% for test in tests %}
+                    {{ test|raw }}
+                {% endfor %} 
                 {% for link in links %}  
                     {% if not link.hasWrapper() %}
                         {{ link.getField(row, link, [])|raw }}
                     {% endif %}
                 {% endfor %}
-                {% for test in tests %}
-                    {{ test|raw }}
-                {% endfor %} 
+
             </div>
         </div>
         {% for button in buttons %}  

diff --git a/resources/views/default/layouts/antares/partials/form/vertical/_input_password.twig b/resources/views/default/layouts/antares/partials/form/vertical/_input_password.twig
@@ -5,13 +5,13 @@
         {{ Form.label(control.name, control.label,{'class':'form-block__name'})|raw }}    
     </div>
     <div class="col-16">
-        <div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : ''  }}">
-            {{ control.getField(row, control, [])|raw }}
-            {% if control.inlineHelp|length>1 or control.help|length>1 %}
-                {% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}             
-            {% endif %}
+        <div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : '' }} {{ control.get('fieldClass')|raw }}">
+            {{ control.getField(row, control, [])|raw }}            
         </div>
     </div>
+    {% if control.inlineHelp|length>1 or control.help|length>1 %}
+        {% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}             
+    {% endif %}
     <span id="{{ control.id }}_error" class="error col-13 col-mb-11">
         {{ errors.first(control.name, format)|raw }}
     </span>

diff --git a/resources/views/default/layouts/antares/partials/form/vertical/_input_text.twig b/resources/views/default/layouts/antares/partials/form/vertical/_input_text.twig
@@ -7,7 +7,7 @@
         </div>
     {% endif %}
     <div class="col-16">
-        <div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : ''  }} {{ control.get('fieldClass')|raw }} ">        
+        <div class="input-field {{ (control.inlineHelp|length>1 or control.help|length>1) ? 'input-field--desc' : ''  }} {{ control.get('fieldClass')|raw }}">        
             {{ control.get('before')|raw }}            
             {{ control.getField(row, control, [])|raw }}           
         </div>

diff --git a/resources/views/default/layouts/antares/partials/form/vertical/_select.twig b/resources/views/default/layouts/antares/partials/form/vertical/_select.twig
@@ -7,10 +7,10 @@
     <div class="col-16">
         <div class="input-field input-field--desc {{ control.get('fieldClass')|raw }}">
             {{ control.get('prepend')|raw }}
-            {{ control.getField(row, control, [])|raw }}
-            {% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}             
+            {{ control.getField(row, control, [])|raw }}            
         </div>
     </div>
+    {% include 'antares/foundation::layouts.antares.partials.form.vertical._description' %}             
     <span id="{{ control.id }}_error" class="error col-13 col-mb-11">
         {{ errors.first(control.name, format)|raw }}
     </span>

diff --git a/resources/views/default/layouts/exception/exception.twig b/resources/views/default/layouts/exception/exception.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
-        {% include 'antares/foundation::layouts.exception.partials._head_webpack' %} 
+        {% include 'antares/foundation::layouts.exception.partials._head' %} 
     </head>
     <body>
         {% block content %}
@@ -17,6 +17,6 @@
 
             </div>
         </div> 
-        {% include 'antares/foundation::layouts.exception.partials._scripts_webpack' %}     
+        {% include 'antares/foundation::layouts.exception.partials._scripts' %}     
     </body>
 </html>
diff --git a/resources/views/default/layouts/exception/partials/_head.twig b/resources/views/default/layouts/exception/partials/_head.twig
@@ -13,7 +13,6 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
 {% block javascripts %}    
     {%  set asset = app('antares.asset').container('antares.header')               
-               .style('bower_assets', '/css/bower_assets.css')
                .style('external_css', '/css/external.css')
                .style('antares_css', '/css/antares.css')
                .style('additionals', '/packages/core/css/additionals.css')                               

diff --git a/resources/views/default/layouts/quest/partials/_head.twig b/resources/views/default/layouts/quest/partials/_head.twig
@@ -13,7 +13,6 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="#27ae60">
 {% block javascripts %}    
     {%  set asset = app('antares.asset').container('antares.header')               
-               .style('bower_assets', '/css/bower_assets.css')
                .style('external_css', '/css/external.css')
                .style('antares_css', '/css/antares.css')
                .style('additionals', '/packages/core/css/additionals.css')