Merge branch 'develop'

melisplatform · Mar 8, 2018 · 301333a · 301333a
2 parents a01596f + 562c60d
commit 301333a
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 4 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -364,6 +364,7 @@
             'layout/layoutCore' => __DIR__ . '/../view/layout/layoutCore.phtml',
             'layout/layoutLogin' => __DIR__ . '/../view/layout/layoutLogin.phtml',
             'layout/layoutBlank' => __DIR__ . '/../view/layout/layoutBlank.phtml',
+            'layout/layout' => __DIR__ . '/../view/layout/layoutBlank.phtml',
             'melis-core/index/index' => __DIR__ . '/../view/melis-core/index/index.phtml',
             'melis-core/plugin-view/generate' => __DIR__ . '/../view/melis-core/plugin-view/generate.phtml',
             'error/404' => __DIR__ . '/../view/error/404.phtml',

diff --git a/language/en_EN.interface.php b/language/en_EN.interface.php
@@ -256,6 +256,7 @@
 	    'tr_meliscore_module_management_inactive_title' => 'Deactivate module',
 	    'tr_meliscore_module_management_checking_dependencies' => 'Checking dependencies...',
 	    'tr_meliscore_module_management_no_dependencies' => 'No dependencies',
+	    'tr_meliscore_module_management_select_deselect_all_module_noti' => 'Select / deselect all modules',
         'tr_meliscore_general_proceed' => 'Proceed',
         'tr_meliscore_general_confirm' => 'Confirm',
 
@@ -602,5 +603,7 @@
         'tr_meliscore_platform_scheme_success_restore_message' => 'Platform scheme restored successfully',
 
         'tr_melis_user_tabs_close_all_open_tabs' => 'Close all tabs',
+        'tr_melis_core_common_close' => 'Close',
+        'tr_melis_core_common_add' => 'Add',
 	);
 ?>
diff --git a/language/fr_FR.interface.php b/language/fr_FR.interface.php
@@ -257,6 +257,7 @@
         'tr_meliscore_module_management_inactive_title' => 'Deactivate module',
         'tr_meliscore_module_management_checking_dependencies' => 'Checking dependencies...',
         'tr_meliscore_module_management_no_dependencies' => 'No dependencies',
+        'tr_meliscore_module_management_select_deselect_all_module_noti' => 'Sélectionner / désélectionner tous les modules',
         'tr_meliscore_general_proceed' => 'Proceed',
         'tr_meliscore_general_confirm' => 'Confirm',
 
@@ -618,5 +619,7 @@
         'tr_meliscore_platform_scheme_success_restore_message' => 'Thème de la plateforme restauré avec succès',
 
         'tr_melis_user_tabs_close_all_open_tabs' => 'Fermer tous les onglets',
+        'tr_melis_core_common_close' => 'Annuler',
+        'tr_melis_core_common_add' => 'Ajouter',
     );
 ?>
diff --git a/public/css/styles.css b/public/css/styles.css
@@ -2108,6 +2108,23 @@ table.dataTable.dtr-inline.collapsed > tbody > tr > td:first-child, table.dataTa
     cursor: move;
 }
 
+.switch-all-container{
+    width: 100%;
+    text-align: right;
+    margin-top: -10px;
+    margin-bottom: -10px;
+}
+
+#select-deselect-all-module{
+    margin-right:21px;
+}
+
+.switch-all-noti{
+    top: -27px;
+    position: relative;
+    right: 10px;
+}
+
 
 /* bootstrap switch */
 .has-switch{

diff --git a/public/js/core/melisCore.js b/public/js/core/melisCore.js
@@ -269,6 +269,7 @@ var melisCore = (function(window){
         if( screenSize <= 767 ) {
             $("#newplugin-cont").toggleClass("show-menu");
         }
+        $("#close-all-tab").hide();
     }
 
     // --=[ MULTI LAYER MODAL FEATURE ]=--

diff --git a/public/js/core/melisHelper.js b/public/js/core/melisHelper.js
@@ -231,6 +231,11 @@ var melisHelper = (function(){
         var removedWidth = currentParent.width();
         var currentGrandParent = currentParent.parent().parent("li").find(".tab-element").data("id");
 
+        //This is for not showing the close all tab button
+        if(prevActiveTab == 'id_meliscore_center_dashboard' && !nextActiveTab){
+            $("#close-all-tab").hide();
+        }
+
         var navBox = currentParent.closest(".scroll");
         var hasdropdown = $(navBox).find(".nav-group-dropdown");
         if(currentParent.hasClass("active-parent")) {
@@ -321,6 +326,10 @@ var melisHelper = (function(){
 
     // TAB OPEN =====================================================================================================================
     function tabOpen(title, icon, zoneId, melisKey, parameters, navTabsGroup, callback){
+        //Show the close(X) button on header
+        if(melisKey != 'meliscore_center_dashboard'){
+            $("#close-all-tab").show();
+        }
         //check if the tab is already open and added to the main nav
         var alreadyOpen = $("body #melis-id-nav-bar-tabs li a.tab-element[data-id='"+ zoneId +"']");
 

diff --git a/public/js/tools/modules.tools.js b/public/js/tools/modules.tools.js
@@ -1,5 +1,15 @@
 $(document).ready(function() {
 
+    $("body").on("switch-change", "#select-deselect-all-module", function(e, data){
+        var val = "";
+        if(data.value === false){
+            val = "off";
+        }else{
+            val = "on";
+        }
+        $('.module-switch').find("div.switch-animate").removeClass("switch-on switch-off").addClass("switch-"+val);
+    });
+
     $("body").on('switch-change', 'div[data-module-name]', function (e, data) {
 
 		var moduleName = $(this).data("module-name");

diff --git a/view/melis-core/index/close-all-tabs.phtml b/view/melis-core/index/close-all-tabs.phtml
@@ -2,7 +2,7 @@
 <!-- START melis user tabs -->
 <li class="dropdown notification" >
 
-    <a href="#" class="dropdown-toggle menu-icon dropdown-hover" id="close-all-tab" title="<?= $this->translate('tr_melis_user_tabs_close_all_open_tabs'); ?>">
+    <a href="#" class="dropdown-toggle menu-icon dropdown-hover" id="close-all-tab" title="<?= $this->translate('tr_melis_user_tabs_close_all_open_tabs'); ?>" style="display:none;">
         <i class="fa fa-fw fa-times" style="font-size:16px;"></i>
         <span class="badge badge-success hidden">0</span>
     </a>

diff --git a/view/melis-core/language/render-tool-language-modal-add-content.phtml b/view/melis-core/language/render-tool-language-modal-add-content.phtml
@@ -9,10 +9,10 @@ echo $this->form()->closeTag();
 
 echo $this->melisModalInvoker()->render(
     array(
-        'text' => '<i class="fa fa-times"></i> '.$this->translate('tr_meliscms_common_close'),
+        'text' => '<i class="fa fa-times"></i> '.$this->translate('tr_melis_core_common_close'),
         'class' => 'btn btn-danger pull-left'
     ), 'dismiss');
 ?>
 
-<a class="btn btn-success pull-right" id="btnLangAdd"><i class="fa fa-plus"></i>  <?= $this->translate('tr_meliscms_common_add'); ?></a>
+<a class="btn btn-success pull-right" id="btnLangAdd"><i class="fa fa-plus"></i>  <?= $this->translate('tr_melis_core_common_add'); ?></a>
 </div> 
diff --git a/view/melis-core/modules/render-tool-modules-content.phtml b/view/melis-core/modules/render-tool-modules-content.phtml
@@ -9,9 +9,22 @@ if (!empty($this->zoneconfig['conf']['id']))
 
 <div <?= $id; ?> data-melisKey="<?= $data_melisKey; ?>">
 	<div class="spacing-x2 innerAll">
+        <div class="switch-all-container">
+            <div class="row">
+                <div class="col-md-12">
+                    <div id="select-deselect-all-module" class="make-switch " data-on-label="<?= $this->translate('tr_meliscore_common_active'); ?>" data-off-label="<?= $this->translate('tr_meliscore_common_inactive'); ?>" data-text-label="<?= $this->translate('tr_meliscore_tool_user_col_status'); ?>">
+                        <input type="checkbox" <?= $status; ?> checked/>
+                    </div>
+                </div>
+                <div class="switch-all-noti">
+                    <div class="icon-cont clearfix">
+                        <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="left" title="<?=$this->translate('tr_meliscore_module_management_select_deselect_all_module_noti'); ?>"></i>
+                    </div>
+                </div>
+            </div>
+        </div>
         <!-- modules -->
         <div class="module-settings">
-
             <div class="ms-heading">
                 <div class="pull-left">
                     <h4 id="meliscore-tool-module-content-title"><?= $this->translate('tr_meliscore_module_management_modules'); ?></h4>