fix admin reoladTree callback

fix admin leftPanel render method
fix admin reorder submit callback
remove usless images

resources/www/prod/js/record.editor.js

@@ -843,7 +843,7 @@ function updateEditSelectedRecords(evt) {
         }
     }
 
-    $('#idFrameE .ww_status', p4.edit.editBox).html(nrecsel + " record(s) selected for editing");
+    //$('#idFrameE .ww_status', p4.edit.editBox).html(nrecsel + " record(s) selected for editing");
 
     updateFieldDisplay();
 

resources/www/prod/skins/skin-shared.scss

@@ -4,8 +4,7 @@ $basketsColor: #076882;
 
 @import '../../_shared/styles/variables';
 
-::-webkit-scrollbar-track
+::-webkit-scrollbar-track {
-{
   border-radius: 0;
   background-color: $darkerBackgroundColor;
 }
@@ -26,11 +25,12 @@ $basketsColor: #076882;
   height: 0;
   display: none;
 }
+
 ::-webkit-scrollbar-corner {
   background-color: transparent;
 }
 
-*::-moz-selection, *::selection{
+*::-moz-selection, *::selection {
   background: #FFFFFF;
   color: $textPrimaryColor;
 }
@@ -100,7 +100,6 @@ EM {
   cursor: pointer;
 }
 
-
 .ui-state-default, .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
   font-weight: normal;
@@ -122,10 +121,9 @@ EM {
 .ui-widget-content.ui-autocomplete .ui-state-focus,
 .ui-widget-content.ui-autocomplete .ui-widget-content .ui-state-focus,
 .ui-widget-content.ui-autocomplete .ui-widget-header .ui-state-focus {
-  border : 1px solid #FFFFFF;
+  border: 1px solid #FFFFFF;
 }
 
-
 #maincontainer {
   min-width: 970px;
   min-height: 500px;
@@ -134,8 +132,8 @@ EM {
 #mainContent {
   // top: 40px;
   min-width: 960px;
-  overflow-x:auto;
+  overflow-x: auto;
-  overflow-y:auto;
+  overflow-y: auto;
 }
 
 .PNB {
@@ -185,12 +183,12 @@ div#PREVIEWTITLEWRAPPER {
   height: 16px;
 }
 
-.ww_status {
+/*.ww_status {
   background-image: url('#{$skinsImagesPath}ww_title.gif');
   background-repeat: repeat-x;
   color: #0077bc;
   font-size: 8pt;
-}
+}*/
 
 span.ww_winTitle {
   letter-spacing: 1px;
@@ -199,7 +197,6 @@ span.ww_winTitle {
   font-weight: bold;
 }
 
-
 #divpage {
   background-color: #212121;
   padding: 10px 0;
@@ -238,28 +235,25 @@ span.ww_winTitle {
 
 }
 
-
 .cont_infos {
   position: absolute;
   bottom: 10px;
-  right: 10px;
   height: 60px;
   top: auto;
   text-align: center;
   width: 70px;
   right: 60px;
+  div {
+    line-height: 20px;
+    font-size: $smallFontSize;
+    font-weight: bold;
+  }
+  span {
+    cursor: pointer;
+    font-size: $smallFontSize;
+  }
 }
 
-.cont_infos div {
-  line-height: 20px;
-  font-size: $smallFontSize;
-  font-weight: bold;
-}
-
-.cont_infos span {
-  cursor: pointer;
-  font-size: $smallFontSize;
-}
 
 #SPANTITLE img {
   height: 16px;
@@ -267,20 +261,15 @@ span.ww_winTitle {
   margin: 0 10px;
 }
 
-.cgu-dialog blockquote p {
-  margin: 10px 30px 10px 0;
-}
-
 .cgu-dialog blockquote {
   margin: 10px 30px;
   overflow: auto;
   max-height: 400px;
+  p {
+    margin: 10px 30px 10px 0;
+  }
 }
 
-
-
-
-
 .chim-wrapper {
   position: relative;
   float: left;
@@ -307,7 +296,6 @@ span.ww_winTitle {
   z-index: 10000;
 }
 
-
 /******* DIALOGS **************************************************************/
 
 #dialog_dwnl h1 {
@@ -340,8 +328,6 @@ span.ww_winTitle {
   position: relative;
 }
 
-
-
 /******* ORDER MANAGER ********************************************************/
 
 #order_manager tr.order_row {
@@ -365,7 +351,6 @@ span.ww_winTitle {
   margin: 0 5px;
 }
 
-
 #order_manager .order_list .thumb {
   float: left;
   position: relative;
@@ -409,7 +394,6 @@ H4 {
   MARGIN-LEFT: 5px
 }
 
-
 #notification_trigger .counter {
   position: relative;
   *position: static;
@@ -442,19 +426,16 @@ H4 {
 }
 
 #sizeAns_slider .ui-slider-handle, #nperpage_slider .ui-slider-handle,
-#EDIT_ZOOMSLIDER  .ui-slider-handle {
+#EDIT_ZOOMSLIDER .ui-slider-handle {
   background-color: $darkerBackgroundColor;
   width: 8px;
   cursor: col-resize;
 }
 
-
-
-
 /******* POPOVERS *************************************************************/
 
 #tooltip .popover {
-  background-color:inherit;
+  background-color: inherit;
 }
 
 .popover-inner {
@@ -477,6 +458,7 @@ H4 {
     border-color: $darkerBorderColor;
   }
 }
+
 .dragover {
   BACKGROUND-COLOR: #fff100
 }
@@ -520,18 +502,16 @@ H4 {
   display: inline-block;
   margin-right: 8px;
   margin-bottom: 0px;
-  &.status-active{
+  &.status-active {
     background-color: #58d5b5;
     box-shadow: 0 0 6px #69fcd6;
   }
   &.status-inactive {
     background-color: #aaaaaa;
-    box-shadow: inset 1px 1px 2px 0px rgba(0,0,0,0.7);
+    box-shadow: inset 1px 1px 2px 0px rgba(0, 0, 0, 0.7);
   }
 }
 
-
-
 @import 'ui-components/jquery-ui';
 @import 'ui-components/context-menu';
 @import 'ui-components/forms';

resources/www/prod/skins/ui-components/_actions.scss

@@ -1,33 +1,8 @@
 
 /******* ACTIONS **************************************************************/
 
-.toolbutton {
-  float: left;
-  width: 70px;
-  height: 50px;
-  overflow: hidden;
-  margin: 0px;
-  cursor: pointer;
-}
 
-.toolbuttonimg {
+/*#TOOL_disktt {
-  float: left;
-  width: 50px;
-  margin: 0px 10px 0px;
-  height: 30px;
-  overflow: hidden;
-  text-align: center;
-}
-
-.toolbuttonlabel {
-  float: left;
-  width: 70px;
-  height: 20px;
-  overflow: visible;
-  text-align: center;
-}
-
-#TOOL_disktt {
   background-image: url('#{$skinsImagesPath}disktt_0.gif');
   background-position: center center;
   background-repeat: no-repeat;
@@ -122,7 +97,7 @@
   background-position: center center;
   background-repeat: no-repeat;
 }
-
+*/
 .contextMenuTrigger {
   color: $textPrimaryColor;
   font-size: $smallFontSize;

resources/www/prod/skins/ui-components/_gui.scss

@@ -1,14 +1,6 @@
 
 /******* GUI ******************************************************************/
 
-/*.gui_grip {
-  background-image: url('#{$skinsImagesPath}grip.gif');
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  height: 19px;
-  width: 5px;
-}*/
-
 .gui_vsplitter,.ui-resizable-e {
   top: 50%;
   width: 13px;
@@ -75,7 +67,7 @@
   width: 12px;
   height: 12px;
   float: left;
-  background-image: url('#{$skinsImagesPath}ccoch0.gif');
+  background-image: url('#{$iconsPath}ccoch0.gif');
   cursor: pointer;
 }
 
@@ -85,7 +77,7 @@
   width: 12px;
   height: 12px;
   float: left;
-  background-image: url('#{$skinsImagesPath}ccoch1.gif');
+  background-image: url('#{$iconsPath}ccoch1.gif');
   cursor: pointer;
 }
 
@@ -95,6 +87,6 @@
   width: 12px;
   height: 12px;
   float: left;
-  background-image: url('#{$skinsImagesPath}ccoch2.gif');
+  background-image: url('#{$iconsPath}ccoch2.gif');
   cursor: pointer;
 }

resources/www/prod/skins/ui-components/_jquery-ui.scss

@@ -26,17 +26,20 @@ $modalBackground: $darkerBackgroundColor !default;
 .ui-tabs {
   .ui-tabs-nav {
     li {
-      background-color: $lightBackgroundColor; //$tabsNavBg;
+      background-color: lighten($lightBackgroundColor, 5); //$tabsNavBg;
       height: 30px;
       border: none;
       overflow: hidden;
       a {
         padding: 5px 8px;
         //font-size: 0.8em;
+        font-size: $xmediumFontSize;
         font-weight: normal;
-        color: $lightTextColor; // more contrasted  color
+        color: $mediumTextColor; // more contrasted  color
       }
       &.ui-tabs-active {
+        font-size: $mediumFontSize;
+        color: $lightTextColor;
         background-color: $mediumBackgroundColor; //$tabsNavBgActive;
         border: none;
       }

templates/web/admin/collection/collection.html.twig

@@ -1,6 +1,6 @@
 {% if reloadTree %}
     <script type="text/javascript">
-        reloadTree('base:{{ collection.get_sbas_id() }}');
+        AdminApp.LeftView.reloadTree('base:{{ collection.get_sbas_id() }}');
     </script>
 {% endif %}
 
@@ -307,9 +307,9 @@
                 success: function(datas) {
                     if(datas.success) {
                         if(submitLink.hasClass('reload')) {
-                            reloadTree('collection:{{ collection.get_base_id() }}', true);
+                            AdminApp.LeftView.reloadTree('collection:{{ collection.get_base_id() }}', true);
                         } else if(submitLink.hasClass('reload-tree')) {
-                            reloadTree('bases:bases', true);
+                            AdminApp.LeftView.reloadTree('bases:bases', true);
                         }
 
                         if ("undefined" !== typeof datas.msg) {

templates/web/admin/collection/reorder.html.twig

@@ -86,10 +86,12 @@
                     $this.prop('disabled',true)
                 },
                 success : function(datas) {
+                    console.log('reorder success')
                     var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), {
                         content:datas.msg
                     });
                     $('#notification').html(html);
+                    AdminApp.LeftView.reloadTree('bases:bases', true);
                 },
                 complete : function() {
                     $this.prop('disabled',false)

templates/web/admin/databases.html.twig

@@ -1,6 +1,6 @@
 {% if reloadTree %}
     <script type="text/javascript">
-        reloadTree('bases:bases');
+        AdminApp.LeftView.reloadTree('bases:bases');
     </script>
 {% endif %}
 

templates/web/admin/databox/databox.html.twig

@@ -1,6 +1,6 @@
 {% if reloadTree %}
     <script type="text/javascript">
-        reloadTree('bases:bases');
+        AdminApp.LeftView.reloadTree('bases:bases');
     </script>
 {% endif %}
 
@@ -371,9 +371,9 @@
                 success: function(datas) {
                     if(datas.success) {
                         if(submitLink.hasClass('reload')) {
-                            reloadTree('base:{{ databox.get_sbas_id() }}', true);
+                            AdminApp.LeftView.reloadTree('base:{{ databox.get_sbas_id() }}', true);
                         } else if(submitLink.hasClass('reload-tree')) {
-                            reloadTree('bases:bases', true);
+                            AdminApp.LeftView.reloadTree('bases:bases', true);
                         }
                     } else {
                         alert(datas.msg);

templates/web/prod/index.html.twig

@@ -7,7 +7,7 @@
             <div class="clksbas">
                 <span  onclick="deploy(this, '.sbascont_{{sbas_id}}' );" class="deployer_closed" ></span>
                 <input type="checkbox" checked style="display: none;" id="sbasChkr_{{sbas_id}}_{{unique_id}}" class="sbasChkr_{{sbas_id}}"
-                       onchange="clksbas(this, {{sbas_id}});" />AAAA
+                       onchange="clksbas(this, {{sbas_id}});" />
                 <label id="ADVSRCH_SBAS_LABEL_{{sbas_id}}" style="display: inline" class="checkbox danger_indicator" for="sbasChkr_{{sbas_id}}_{{unique_id}}">
                     <span>{{sbas_id|sbas_labels(app)}}</span>
                     <span class="infos_sbas_{{sbas_id}}">

www/scripts/apps/admin/main/views/leftPanel.js

@@ -29,7 +29,7 @@ define([
 
             var $this = this;
             this.eventManager.on("panel:left:success", function(data, click) {
-                $this.render.append(data);
+                $this.render(data);
                 $this.activeTree();
                 if (click) {
                     $this.clickSelected();