forgeos_core 1.9.4 → 1.9.5.rc1

data/app/assets/javascripts/forgeos/admin/functions.js

@@ -0,0 +1 @@
+//= require forgeos/admin/functions/forgeos_core/all

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/all.js

@@ -0,0 +1 @@
+//= require_tree .

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/caching.js

@@ -0,0 +1,18 @@
+jQuery(document).ready(function(){
+  $.jstree._themes = '/assets/jstree/themes/';
+  jQuery('#caching-tree').jstree({
+    "json_data": {
+      "ajax": {
+        "url": '/admin/cachings.json',
+        "data" : function (n) {
+           return { id: (n.data ? n.data('name') : 0) };
+        }
+      }
+    },
+    "checkbox": {
+      real_checkboxes: true,
+      real_checkboxes_names: function (n) { return ["files[]", n.data('name')]; }
+    },
+    "plugins": ['ui', 'themes', 'checkbox','json_data']
+  });
+});

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/custom-select.js

@@ -1,8 +1,8 @@
 jQuery(document).ready(function(){
   //when click on selects, resize the otions container to stretch with the select's size
-  jQuery('.dropdown').bind('click', function()
-  {
+  InitCustomSelects();
+  jQuery('.dropdown').bind('click', function() {
     var divOption=jQuery(this).find('.options');
     divOption.width(jQuery(this).width()-15);
   });
-});
+});

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/import.js

@@ -1,25 +1,7 @@
-function check_import_progress(data){
-  var pgb = jQuery('#progressbar');
-  var value = parseFloat(data).toFixed(0);
-  pgb.progressbar('value', value);
-  pgb.find('span').text(value + '%');
-  if (value != 100) setTimeout("jQuery.get('/admin/import/progress',check_import_progress);",5000);
-}
 jQuery(document).ready(function(){
-  jQuery('#map_fields_form .interact-links input').live('click',function(e){
-    e.preventDefault();
-    jQuery.ajax({
-      type: 'POST',
-      url: jQuery('#map_fields_form').attr('action'),
-      data: jQuery('#map_fields_form').serialize(),
-      complete: function(data, statusText){
-        if (statusText == 'error') jQuery('#progressbar').text(data.responseText);
-        jQuery('#progressbar').removeClass('running');
-        display_notifications();
-      }
-    });
-    jQuery('#progressbar').progressbar().addClass('running').append('<span>0%</span>');
-    check_import_progress('0');
-    return false;
+  jQuery('form#import_form').attr('action', 'import/create_'+ jQuery('select#import_model').val());
+
+  jQuery('select#import_model').live('change', function () {
+    jQuery('form#import_form').attr('action', 'import/create_'+this.value);
   });
 });

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/overlays.js

@@ -1,29 +1,18 @@
 jQuery(document).ready(function(){
   //init dialog Box
   jQuery('.lightbox-container').dialog({
-    autoOpen:false,
-    modal:true,
-    minHeight: 380,
-    width: 500,
-    resizable:'se'
+    "autoOpen": false,
+    "modal": true,
+    "minHeight": 380,
+    "width": 500,
+    "resizable":'se'
   });
 
   setup_upload_dialog('#imageUpload');
-  setup_upload_dialog('#imageLeftSidebarUpload');
   setup_upload_dialog('#fileUpload');
 
-  jQuery('#imageLeftSidebarSelectDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 800,
-    buttons: {
-      Ok: function() {
-       	add_picture_to_category();
-      },
-    },
-    open: function() { eval(jQuery('#image-table:visible,#thumbnail-table:visible').data('dataTables_init_function')+'()'); },
-    resizable:'se'
-  });
+  setup_select_dialog('#imageSelect', '#image-table:visible,#thumbnail-table:visible');
+  setup_select_dialog('#fileSelect', '#table-files');
 
   jQuery('.display-thumbnails').click(function(e) {
     e.preventDefault();
@@ -54,23 +43,21 @@ jQuery(document).ready(function(){
   });
 
   /*
-   *Add click function on .add-picture items
+   *Add click function on .add-image items
    *Those items are links that show dialog Box to uploads media
    **/
-  jQuery('#add-picture').live('click',function(e){
+  jQuery('.add-image').live('click',function(e){
     e.preventDefault();
-    openimageUploadDialog(jQuery(this));
+    jQuery('.add-image, .add-file').removeClass('current');
+    jQuery(this).addClass('current');
+    openimageUploadDialog();
     return false;
   });
 
-  jQuery('#add-attachment').live('click',function(e){
-    e.preventDefault();
-    openimageUploadDialog(jQuery(this));
-    return false;
-  });
-
-  jQuery('#add-file').live('click',function(e){
+  jQuery('.add-file').live('click',function(e){
     e.preventDefault();
+    jQuery('.add-image, .add-file').removeClass('current');
+    jQuery(this).addClass('current');
     openfileUploadDialog();
     return false;
   });
@@ -79,13 +66,12 @@ jQuery(document).ready(function(){
   *Add click function on .fieldset a.backgrounds  items
   *Those items are links that shows dialogBox to add some blocks/widgets
   **/
-  jQuery('#add-block, #add-widget').bind('click',function(e){
+  jQuery('#add-block, #add-widget').live('click',function(e){
     e.preventDefault();
     openBlockDialog(jQuery(this), jQuery(this).parent());
     return false;
   });
 
-
   jQuery('#fileSelectDialog #inner-lightbox a').live('click',function(){
     jQuery('#fileSelectDialog #inner-lightbox a').removeClass('selected');
     jQuery(this).addClass('selected');
@@ -108,18 +94,18 @@ jQuery(document).ready(function(){
   * add the new linked page in pages list
   *and close the dialogg box
   **/
-  jQuery('.link-page.small-icons.page').bind('click',function(){
+  jQuery('.link-page.small-icons.page').live('click',function(){
     if(!jQuery(this).hasClass('active')){
       var url = jQuery(this).attr('href');
       var block_id = url.split('/')[5];
       var page_id = jQuery(this).parent().attr('id').substr(5);
       jQuery.ajax({
-          url: url,
-            complete: putInPageList(jQuery(this).text(), jQuery(this).attr('title'), block_id, page_id),
-            data: 'authenticity_token=' + encodeURIComponent(window._forgeos_js_vars.token),
-            dataType:'script',
-            type:'post'
-            });
+        "url": url,
+        "complete": putInPageList(jQuery(this).text(), jQuery(this).attr('title'), block_id, page_id),
+        "data": { "authenticity_token": encodeURIComponent(window._forgeos_js_vars.token) },
+        "dataType": 'script',
+        "type": 'post'
+      });
       closeDialogBox();
     }
     return false;
@@ -137,13 +123,13 @@ jQuery(document).ready(function(){
   });
 
   jQuery('.lightbox-actuality').dialog({
-    autoOpen:false,
-    modal:true,
-    minHeight: 400,
-    width: 950,
-    open: function(){ tmce_load_children('#form_actuality'); },
-    beforeclose: function(){ tmce_unload_children('#form_actuality'); },
-    resizable: 'se'
+    "autoOpen": false,
+    "modal": true,
+    "minHeight": 400,
+    "width": 950,
+    "open": function(){ tmce_load_children('#form_actuality'); },
+    "beforeclose": function(){ tmce_unload_children('#form_actuality'); },
+    "resizable": 'se'
   });
 
   jQuery('.add-actuality').live('click',function(){
@@ -162,57 +148,4 @@ jQuery(document).ready(function(){
     jQuery('#submit_actuality').addClass('update-actuality');
     return false;
   });
-
-  jQuery('#imageSelectDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    minHeight: 380,
-    width: 800,
-    resizable:'se',
-    buttons: {
-      Ok: function(){
-        dataTableSelectRows('#image-table:visible,#thumbnail-table:visible',function(current_table,indexes){
-          for(var i=0; i<indexes.length; i++){
-            var row = current_table.fnGetData(indexes[i]);
-            var path = row.slice(-3,-2);
-            var id = row.slice(-2,-1);
-            var name = row.slice(-1);
-            add_picture_to_element(path,id,name);
-          }
-          //check_product_first_image();
-        });
-        jQuery('#imageSelectDialog').dialog('close');
-      }
-    },
-    open: function(e,ui){
-      eval(jQuery('#image-table:visible,#thumbnail-table:visible').data('dataTables_init_function')+'()');
-    }
-  });
-
-  jQuery('#fileSelectDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    minHeight: 380,
-    width: 800,
-    resizable:'se',
-    buttons: {
-      Ok: function(){
-        dataTableSelectRows('#table-files', function(current_table, indexes) {
-          for(var i=0; i<indexes.length; i++){
-            var row = current_table.fnGetData(indexes[i]);
-            var size = row.slice(-6,-5);
-            var type = row.slice(-8,-7);
-            var id = row.slice(-2,-1);
-            var name = row.slice(-1);
-
-            add_attachment_to_product(id,name,size,type);
-          }
-        });
-        jQuery('#fileSelectDialog').dialog('close');
-      }
-    },
-    open: function(e,ui){
-      eval(jQuery('#table-files').data('dataTables_init_function')+'()');
-    }
-  });
 });

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/right-sidebar.js

@@ -1,4 +1,10 @@
 jQuery(document).ready(function(){
+  //init closed_panels_list cookie
+  if(typeof jQuery.cookie === "undefined") { throw "jsTree cookie: jQuery cookie plugin not included."; }
+  if(jQuery.cookie('closed_panels_list') == null ){
+    jQuery.cookie('closed_panels_list', '', { path: '/admin/', expires: 10 });
+  }
+
   /*
    *Add change function on .check-me-it-appears items
    *Those items are checkboxes that show/hide the
@@ -16,45 +22,24 @@ jQuery(document).ready(function(){
     if (e.which == 13) {
 
       e.preventDefault();
-			var input = jQuery(this);
-			var hidden_field_tag_name = '<input type="hidden" name="tag_list[]" value="'+input.val()+'" />';
-		  var destroy = '<a href="#" class="big-icons gray-destroy">&nbsp;</a>';
-		  var new_tag = '<span >'+input.val()+hidden_field_tag_name+destroy+'</span>';
-
-		  jQuery('.tags .wrap_tags').append(new_tag);
-
-		  input.val('');
-		  var tags = [];
-		  jQuery(jQuery(this.form).serializeArray()).each(function(){
-		    if (this.name == 'tag_list[]' && this.value != ''){
-		      tags.push(this.value);
-		    }
-		  });
-		  var element = jQuery('textarea:regex(id,.+_meta_info_attributes_keywords)');
-		  if (element.is(':visible')){
-		    element.val(tags.join(', '));
-		  }
+      var input = jQuery(this);
+      var hidden_field_tag_name = '<input type="hidden" name="tag_list[]" value="'+input.val()+'" />';
+      var destroy = '<a href="#" class="big-icons gray-destroy">&nbsp;</a>';
+      var new_tag = '<span >'+input.val()+hidden_field_tag_name+destroy+'</span>';
+
+      jQuery('.tags .wrap_tags').append(new_tag);
+
+      input.val('');
+      var tags = [];
+      jQuery(jQuery(this.form).serializeArray()).each(function(){
+        if (this.name == 'tag_list[]' && this.value != ''){
+          tags.push(this.value);
+        }
+      });
+      var element = jQuery('textarea:regex(id,.+_meta_info_attributes_keywords)');
+      if (element.is(':visible')){
+        element.val(tags.join(', '));
+      }
     }
   });
 });
-
-
-function submit_tag(input){
-  var hidden_field_tag_name = '<input type="hidden" name="tag_list[]" value="'+input.val()+'" />';
-  var destroy = '<a href="#" class="big-icons gray-destroy">&nbsp;</a>';
-  var new_tag = '<span >'+input.val()+hidden_field_tag_name+destroy+'</span>';
-
-  jQuery('.tags .wrap_tags').append(new_tag);
-
-  input.val('');
-  var tags = [];
-  jQuery(jQuery(input.form).serializeArray()).each(function(){
-    if (input.name == 'tag_list[]' && input.value != ''){
-      tags.push(input.value);
-    }
-  });
-  var element = jQuery('textarea:regex(id,.+_meta_info_attributes_keywords)');
-  if (element.is(':visible')){
-    element.val(tags.join(', '));
-  }
-}

data/app/assets/javascripts/forgeos/admin/inits/forgeos_core/settings.js

@@ -12,4 +12,12 @@ jQuery(document).ready(function(){
     jQuery('.delivery_method_settings').hide();
     jQuery('#'+current_mailer_setting).show();
   }
+
+  jQuery('#setting_smtp_settings_authentication').change(function() {
+    if(this.value == 'none') {
+      jQuery('#authentication').addClass('hidden');
+    } else {
+      jQuery('#authentication').removeClass('hidden');
+    }
+  });
 });

data/app/assets/javascripts/forgeos/admin/inits.js

@@ -0,0 +1 @@
+//= require forgeos/admin/inits/forgeos_core/all

data/app/assets/javascripts/forgeos/admin/libs.js

@@ -0,0 +1,9 @@
+/*
+*= require tiny_mce/jquery.tinymce
+*= require jquery-ui
+*= require jquery_ujs
+*= require jquery.dataTables.min
+*= require forgeos/jquery.dataSlides
+*= require jquery.jstree
+*= require jquery.uploadify
+*/

data/app/assets/javascripts/forgeos/admin/login.js

@@ -0,0 +1,2 @@
+//= require forgeos/admin/functions/forgeos_core/notifications
+//= require forgeos/admin/inits/forgeos_core/clicks

data/app/assets/javascripts/forgeos/jquery.dataSlides.js

@@ -2612,13 +2612,13 @@
 					for ( i=0 ; i<iFixed ; i++ )
 					{
 						aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
-						aoData.push( { "name": "iSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
+						aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
 					}
 					
 					for ( i=0 ; i<iUser ; i++ )
 					{
 						aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
-						aoData.push( { "name": "iSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
+						aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
 					}
 				}
 				

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_all.css.sass

@@ -1,3 +1,5 @@
+@import forgeos/960
+@import forgeos/jquery-ui/themes/forgeos
 @import forgeos/admin/forgeos_core/colours
 @import forgeos/admin/forgeos_core/common
 @import forgeos/admin/forgeos_core/generals

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_common.css.sass

@@ -1,3 +1,6 @@
+@import compass
+@import compass/reset
+
 =left()
   float: left !important
 =block()
@@ -25,3 +28,4 @@
 =opacity($opacity)
   -ms-filter: alpha(opacity=#{$opacity*100})
   opacity: $opacity
+

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_content.css.sass

@@ -62,4 +62,4 @@
     right: 10px
     top: 4px
   &.running
-    background: url('/assets/spinner.gif') no-repeat center center
+    background: image_url("spinner.gif") no-repeat center center

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_customer.css.sass

@@ -62,6 +62,11 @@
 .fieldset.grid_11
   width: 635px
 
+.fieldset.grid_10
+  margin-left: 15px
+  padding-left: 15px
+  padding-bottom: 15px
+
 #ui-datepicker-div
   z-index: 999
 
@@ -83,3 +88,22 @@
     a
       text-decoration: underline
       color: $lightGray
+
+#page
+  #blocks-header
+    #mailer, #display
+      padding: 20px
+    #smtp, #sendmail
+      padding: 15px
+      padding-top: 0
+      label
+        float: left
+        width: 100%
+  #customer-see
+    .fieldset
+      padding: 15px
+      padding-top: 0
+      .main-infos
+        .order-billing-adress
+          padding-top: 20px
+

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_dashboard.css.sass

@@ -27,8 +27,8 @@
   +left
   margin: 0 5px
   border: 1px solid $lightBlueBg - #1a0601
-  +borderCorner
-  background: $lightBlueBg url(/images/admin/backgrounds/background-right-sidebar.png) repeat-x scroll center top
+  +border-radius(4px)
+  background: $lightBlueBg image_url("forgeos/admin/backgrounds/background-right-sidebar.png") repeat-x scroll center top
   span
     color: $blueLink
     padding-top: 2px
@@ -91,7 +91,7 @@
 
 .sales-info-block
   border: 1px solid $lightOrangeRedBg
-  +borderCorner
+  +border-radius(4px)
   background-color: $lightOrangeYellowBg
   margin: 5px 0
   padding: 5px

data/app/assets/stylesheets/forgeos/admin/forgeos_core/_datatable.css.sass

@@ -36,7 +36,7 @@ table
         border-left: 0
       &.sorting_desc, &.sorting_asc
         background-color: #e0e0e0
-        background-image: url(/assets/forgeos/admin/small-icons-16-16-verti.png)
+        background-image: image_url("forgeos/admin/small-icons-16-16-verti.png")
         background-repeat: no-repeat
       &.sorting_desc
         background-position: right -472px
@@ -115,7 +115,7 @@ table
   cursor: pointer
   color: $blueLink
   &.previous, &.next
-    background: $lightBlueBg url(/assets/forgeos/admin/small-icons-16-16-verti.png) no-repeat
+    background: $lightBlueBg image_url("forgeos/admin/small-icons-16-16-verti.png") no-repeat
     color: $blueLink
   &.first, &.last
     display: inline
@@ -157,7 +157,7 @@ tr
       outline: none
   &.open
     .image
-      background: url(/assets/forgeos/admin/small-icons/dark-blue-minus.png) no-repeat -1px
+      background: image_url("forgeos/admin/small-icons/dark-blue-minus.png") no-repeat -1px
     p
       display: block !important
 
@@ -169,7 +169,7 @@ tr
 
 .some-variants
   .image
-    background: url(/assets/forgeos/admin/small-icons/dark-blue-plus.png) no-repeat -1px
+    background: image_url("forgeos/admin/small-icons/dark-blue-plus.png") no-repeat -1px
 
 .image img
   width: 55px
@@ -249,7 +249,7 @@ tr
       .small-icons
         height: 16px
       .handler
-        background-image: url("/assets/forgeos/admin/backgrounds/drag-and-drop.png")
+        background-image: image_url("forgeos/admin/backgrounds/drag-and-drop.png")
         width: 6px
         height: 100%
         position: absolute !important