forgeos_core 1.9.2 → 1.9.3

data/README.textile

@@ -2,40 +2,18 @@ h1. Introduction
 
 ForgeosCore is the core of Forgeos project "http://www.forgeos.com":http://www.forgeos.com
 
-VERSION : 0.9.6
+VERSION : 1.9.2
 
 h1. Prerequisites
 
 h2. Plugins
 
-* engines
 * attachment_fu
 * localized_dates
 
-h2. Gems
-
-* acts-as-taggable-on
-* fastercsv >= 1.5.1
-* ar-extensions >= 0.9.2
-* bcrypt-ruby >= 2.1.2
-* authlogic >= 2.1.3
-* haml >= 2.2.15
-* will_paginate > 2.3.11
-* mime-types >= 1.16
-* acts_as_list >= 0.1.2
-* acts_as_tree >= 0.1.1
-* acts_as_commentable = 3.0.0
-* webpulser-jrails >= 0.4.2
-* webpulser-habtm_list = 0.1.2
-* globalize2
-* thinking-sphinx >= 1.3.14
-* ruleby = 0.6
-* aasm = 2.1.5
-
 h1. Initialize
 
  <pre><code>
-  ./script/generate plugin_migration forgeos_core
   rake forgeos:core:install
  </code></pre>
 

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

@@ -112,6 +112,8 @@ function InitCustomSelects() {
 
     // set the proper index
     realselect.selectedIndex = option.find('span.index').text();
+    realselect.find('option').attr('selected', false);
+    realselect.find('option:eq('+option.find('span.index').text()+')').attr('selected', true);
     /* Begin of Webpulser code */
     realselect.trigger('change');
     enhanced.find('.dropdown').addClass(realselect.val());

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

@@ -10,8 +10,9 @@ function openimageUploadDialog(link){
 }
 
 //open an upload dialog Box
-function openimageUploadDialogLeftSidebar(link){
-  initImageUploadLeftSidebar(link);
+function openimageLeftSidebarUploadDialog(link){
+  jQuery('#imageLeftSidebarUploadDialog').dialog('open');
+  forgeosInitUpload('#imageLeftSidebar','add_picture_to_category');
 }
 
 //open an upload dialog Box
@@ -31,4 +32,22 @@ function toggleSelectedOverlay(element){
     jQuery(element).addClass('selected');
     jQuery(element).siblings().removeClass('selected');
   }
-}
+}
+
+function add_picture_to_category(path, id, name){
+  var cat_id = get_rails_element_id($('.tree-li-selected-to-add-image'));
+  jQuery.ajax({
+    "success": function(result){
+      jQuery.jstree._focused().refresh();
+      jQuery('#imageLeftSidebarSelectDialog').dialog('close');
+    },
+    "error": function(){},
+    "data":  {
+      'category[attachment_ids]': [id],
+      authenticity_token: window._forgeos_js_vars.token
+    },
+    "dataType": 'json',
+    "type": 'put',
+    "url": '/admin/categories/'+ cat_id +'.json',
+  });
+}

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

@@ -19,7 +19,7 @@ function tmceInit(selector){
     content_css : "/assets/forgeos/tinyMCE/styles.css",
     convert_urls: 0,
     onchange_callback: function(inst){ jQuery(inst.getElement()).trigger('change'); },
-    theme_advanced_buttons1 : "undo,redo,|,pasteword,|,anchor,image,media,|,code,preview,|,removeformat,cleanup",
+    theme_advanced_buttons1 : "undo,redo,|,pasteword,|,anchor,image,media,|,code,preview,|,removeformat,cleanup,|, cut,copy,paste,|,bullist,numlist,|,outdent,indent,|,undo,redo,link,unlink,anchor,image,code,preview,|,forecolor,backcolor",
     theme_advanced_buttons2 : "bold,italic,underline,strikethrough,|,styleselect,formatselect,fontselect,fontsizeselect,forecolor,|,hr",
     theme_advanced_buttons3 : "",
     theme_advanced_resize_horizontal : false,

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

@@ -0,0 +1,55 @@
+function setup_upload_dialog(selector) {
+  jQuery(selector + 'Dialog').dialog({
+    autoOpen:false,
+    modal:true,
+    width: 500,
+    buttons: {
+      Upload: function() {
+        jQuery(selector).uploadifyUpload();
+      },
+      'Clear queue': function() {
+        jQuery(selector).uploadifyClearQueue();
+      }
+    },
+    resizable:'se'
+  });
+}
+
+function forgeosInitUpload(selector, callback) {
+  var upload = selector + 'Upload';
+  var dialog = upload + 'Dialog';
+  var select_dialog = selector + 'SelectDialog';
+
+  jQuery(selector + 'Dialog').html('<div id="'+upload.replace('#','')+'"></div><div class="library-add"><span>or</span><a href="#" onclick="$("'+dialog+'").dialog(\'close\'); $("'+select_dialog+'").dialog(\'open\'); return false;">add from library</a></div>');
+
+  var uploadify_datas = { "format": "json" };
+  uploadify_datas[window._forgeos_js_vars.session_key] = window._forgeos_js_vars.session;
+
+  $(upload).uploadify({
+    "uploader": '/assets/forgeos/uploadify/uploadify.swf',
+    "cancelImg": '/assets/forgeos/admin/big-icons/delete-icon.png',
+    "script": "/admin/pictures",
+    "buttonImg": '/assets/forgeos/uploadify/choose-picture_'+window._forgeos_js_vars.locale+'.png',
+    "width": "154",
+    "height": "24",
+    "scriptData": uploadify_datas,
+    "ScriptAccess": "always",
+    "multi": "true",
+    "displayData": "speed",
+    "onComplete": function(e,queueID,fileObj,response,data) {
+      if(typeof JSON=="object" && typeof JSON.parse=="function") {
+        result = JSON.parse(response);
+      } else{
+        result = eval('(' + response + ')');
+      }
+      if (result.result == 'success'){
+        eval(callback + '(result.path,result.id,fileObj.name);');
+      } else {
+        display_notification_message('error',result.error);
+      }
+    },
+    "onAllComplete": function() {
+      jQuery(dialog).dialog('close');
+    }
+  });
+}

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

@@ -1,12 +1,12 @@
 function openpictureimageUploadDialog(link){
-  initpictureImageUpload(link);
+  forgeosInitUpload('#imagepicture', 'add_picture_picture_to_element');
   jQuery('#imagepictureSelectDialog').dialog('open');
 }
 function openimageimageUploadDialog(link){
-  initimageImageUpload(link);
+  forgeosInitUpload('#imageimage','add_image_picture_to_element');
   jQuery('#imageimageSelectDialog').dialog('open');
 }
 function openvisualsimageUploadDialog(link){
-  initvisualsImageUpload(link);
+  forgeosInitUpload('#imagevisuals', 'add_picture_to_visuals');
   jQuery('#imagevisualsSelectDialog').dialog('open');
 }

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

@@ -8,37 +8,11 @@ jQuery(document).ready(function(){
     resizable:'se'
   });
 
-  jQuery('#imageUploadDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#imageUpload').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#imageUpload').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
-
-  jQuery('#imageUploadDialogLeftSidebar').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#imageUploadLeftSidebar').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#imageUploadLeftSidebar').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
+  setup_upload_dialog('#imageUpload');
+  setup_upload_dialog('#imageLeftSidebarUpload');
+  setup_upload_dialog('#fileUpload');
 
-  jQuery('#imageSelectDialogLeftSidebar').dialog({
+  jQuery('#imageLeftSidebarSelectDialog').dialog({
     autoOpen:false,
     modal:true,
     width: 800,
@@ -51,22 +25,6 @@ jQuery(document).ready(function(){
     resizable:'se'
   });
 
-
-  jQuery('#fileUploadDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#fileUpload').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#fileUpload').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
-
   jQuery('.display-thumbnails').click(function(e) {
     e.preventDefault();
     if(jQuery(this).hasClass('off')){

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

@@ -1,11 +1,28 @@
 jQuery(document).ready(function(){
 
+  setup_upload_dialog('#imagepictureUpload');
+  setup_upload_dialog('#imageimageUpload');
+  setup_upload_dialog('#imagevisualsUpload');
+
+
   // add a picture button
   jQuery('.add-picturepicture').live('click',function(){
      openpictureimageUploadDialog(jQuery(this));
      return false;
   });
 
+  // add visuals button
+  jQuery('.add-visualpictures').live('click',function(){
+     openvisualsimageUploadDialog(jQuery(this));
+     return false;
+  });
+
+  // add a image button
+  jQuery('.add-imagepicture').live('click',function(){
+     openimageimageUploadDialog(jQuery(this));
+     return false;
+  });
+
   // Dialog to select picture
   jQuery('#imagepictureSelectDialog.project').dialog({
     autoOpen:false,
@@ -32,27 +49,6 @@ jQuery(document).ready(function(){
     }
   });
 
-  jQuery('#imagepictureUploadDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#imagepictureUpload').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#imagepictureUpload').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
-
-  // add a image button
-  jQuery('.add-imagepicture').live('click',function(){
-     openimageimageUploadDialog(jQuery(this));
-     return false;
-  });
-
   // Dialog to select picture
   jQuery('#imageimageSelectDialog.project').dialog({
     autoOpen:false,
@@ -79,27 +75,6 @@ jQuery(document).ready(function(){
     }
   });
 
-  jQuery('#imageimageUploadDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#imageimageUpload').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#imageimageUpload').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
-
-  // add visuals button
-  jQuery('.add-visualpictures').live('click',function(){
-     openvisualsimageUploadDialog(jQuery(this));
-     return false;
-  });
-
   // Dialog to select pictures
   jQuery('#imagevisualsSelectDialog.project').dialog({
     autoOpen:false,
@@ -126,19 +101,4 @@ jQuery(document).ready(function(){
     }
   });
 
-  jQuery('#imagevisualsUploadDialog').dialog({
-    autoOpen:false,
-    modal:true,
-    width: 500,
-    buttons: {
-      Upload: function() {
-        jQuery('#imagevisualsUpload').uploadifyUpload();
-      },
-      'Clear queue': function() {
-        jQuery('#imagevisualsUpload').uploadifyClearQueue();
-      }
-    },
-    resizable:'se'
-  });
-
 });

data/app/assets/stylesheets/forgeos/960.css.sass

@@ -3,7 +3,6 @@
   margin-right: auto
   width: 960px
 
-
 .grid_1, .grid_2, .grid_3, .grid_4, .grid_5, .grid_6, .grid_7, .grid_8, .grid_9, .grid_10, .grid_11, .grid_12, .grid_13, .grid_14, .grid_15, .grid_16
   display: inline
   float: left
@@ -11,399 +10,280 @@
   margin-left: 10px
   margin-right: 10px
 
-
 .container_12 .grid_3, .container_16 .grid_4
   width: 220px
 
-
 .container_12 .grid_6, .container_16 .grid_8
   width: 460px
 
-
 .container_12 .grid_9, .container_16 .grid_12
   width: 700px
 
-
 .container_12 .grid_12, .container_16 .grid_16
   width: 940px
 
-
 .alpha
   margin-left: 0
 
-
 .omega
   margin-right: 0
 
-
 .container_12
   .grid_1
     width: 60px
-
   .grid_2
     width: 140px
-
   .grid_4
     width: 300px
-
   .grid_5
     width: 380px
-
   .grid_7
     width: 540px
-
   .grid_8
     width: 620px
-
   .grid_10
     width: 780px
-
   .grid_11
     width: 860px
 
-
 .container_16
   .grid_1
     width: 40px
-
   .grid_2
     width: 100px
-
   .grid_3
     width: 160px
-
   .grid_5
     width: 280px
-
   .grid_6
     width: 340px
-
   .grid_7
     width: 400px
-
   .grid_9
     width: 520px
-
   .grid_10
     width: 580px
-
   .grid_11
     width: 640px
-
   .grid_13
     width: 760px
-
   .grid_14
     width: 820px
-
   .grid_15
     width: 880px
 
-
 .container_12 .prefix_3, .container_16 .prefix_4
   padding-left: 240px
 
-
 .container_12 .prefix_6, .container_16 .prefix_8
   padding-left: 480px
 
-
 .container_12 .prefix_9, .container_16 .prefix_12
   padding-left: 720px
 
-
 .container_12
   .prefix_1
     padding-left: 80px
-
   .prefix_2
     padding-left: 160px
-
   .prefix_4
     padding-left: 320px
-
   .prefix_5
     padding-left: 400px
-
   .prefix_7
     padding-left: 560px
-
   .prefix_8
     padding-left: 640px
-
   .prefix_10
     padding-left: 800px
-
   .prefix_11
     padding-left: 880px
 
-
 .container_16
   .prefix_1
     padding-left: 60px
-
   .prefix_2
     padding-left: 120px
-
   .prefix_3
     padding-left: 180px
-
   .prefix_5
     padding-left: 300px
-
   .prefix_6
     padding-left: 360px
-
   .prefix_7
     padding-left: 420px
-
   .prefix_9
     padding-left: 540px
-
   .prefix_10
     padding-left: 600px
-
   .prefix_11
     padding-left: 660px
-
   .prefix_13
     padding-left: 780px
-
   .prefix_14
     padding-left: 840px
-
   .prefix_15
     padding-left: 900px
 
-
 .container_12 .suffix_3, .container_16 .suffix_4
   padding-right: 240px
 
-
 .container_12 .suffix_6, .container_16 .suffix_8
   padding-right: 480px
 
-
 .container_12 .suffix_9, .container_16 .suffix_12
   padding-right: 720px
 
-
 .container_12
   .suffix_1
     padding-right: 80px
-
   .suffix_2
     padding-right: 160px
-
   .suffix_4
     padding-right: 320px
-
   .suffix_5
     padding-right: 400px
-
   .suffix_7
     padding-right: 560px
-
   .suffix_8
     padding-right: 640px
-
   .suffix_10
     padding-right: 800px
-
   .suffix_11
     padding-right: 880px
 
-
 .container_16
   .suffix_1
     padding-right: 60px
-
   .suffix_2
     padding-right: 120px
-
   .suffix_3
     padding-right: 180px
-
   .suffix_5
     padding-right: 300px
-
   .suffix_6
     padding-right: 360px
-
   .suffix_7
     padding-right: 420px
-
   .suffix_9
     padding-right: 540px
-
   .suffix_10
     padding-right: 600px
-
   .suffix_11
     padding-right: 660px
-
   .suffix_13
     padding-right: 780px
-
   .suffix_14
     padding-right: 840px
-
   .suffix_15
     padding-right: 900px
 
-
 .container_12 .push_3, .container_16 .push_4
   left: 240px
 
-
 .container_12 .push_6, .container_16 .push_8
   left: 480px
 
-
 .container_12 .push_9, .container_16 .push_12
   left: 720px
 
-
 .container_12
   .push_1
     left: 80px
-
   .push_2
     left: 160px
-
   .push_4
     left: 320px
-
   .push_5
     left: 400px
-
   .push_7
     left: 560px
-
   .push_8
     left: 640px
-
   .push_10
     left: 800px
-
   .push_11
     left: 880px
 
-
 .container_16
   .push_1
     left: 60px
-
   .push_2
     left: 120px
-
   .push_3
     left: 180px
-
   .push_5
     left: 300px
-
   .push_6
     left: 360px
-
   .push_7
     left: 420px
-
   .push_9
     left: 540px
-
   .push_10
     left: 600px
-
   .push_11
     left: 660px
-
   .push_13
     left: 780px
-
   .push_14
     left: 840px
-
   .push_15
     left: 900px
 
-
 .container_12 .pull_3, .container_16 .pull_4
   left: -240px
 
-
 .container_12 .pull_6, .container_16 .pull_8
   left: -480px
 
-
 .container_12 .pull_9, .container_16 .pull_12
   left: -720px
 
-
 .container_12
   .pull_1
     left: -80px
-
   .pull_2
     left: -160px
-
   .pull_4
     left: -320px
-
   .pull_5
     left: -400px
-
   .pull_7
     left: -560px
-
   .pull_8
     left: -640px
-
   .pull_10
     left: -800px
-
   .pull_11
     left: -880px
 
-
 .container_16
   .pull_1
     left: -60px
-
   .pull_2
     left: -120px
-
   .pull_3
     left: -180px
-
   .pull_5
     left: -300px
-
   .pull_6
     left: -360px
-
   .pull_7
     left: -420px
-
   .pull_9
     left: -540px
-
   .pull_10
     left: -600px
-
   .pull_11
     left: -660px
-
   .pull_13
     left: -780px
-
   .pull_14
     left: -840px
-
   .pull_15
     left: -900px
 
-
 .clear
   clear: both
   display: block
@@ -412,13 +292,11 @@
   width: 0
   height: 0
 
-
 .clearfix
   display: inline-block
-
   &:after
     clear: both
-    content: ' '
+    content: " "
     display: block
     font-size: 0
     line-height: 0
@@ -426,10 +304,8 @@
     width: 0
     height: 0
 
-
 * html .clearfix
   height: 1%
 
-
 .clearfix
   display: block