forgeos_core 1.9.2 → 1.9.3

data/app/views/admin/sidebars/_attachments_popups.html.haml

@@ -1,11 +1,11 @@
-#imageUploadDialogLeftSidebar.upload-lightbox-container.white
-  #imageUploadLeftSidebar
+#imageLeftSidebarUploadDialog.upload-lightbox-container.white
+  #imageLeftSidebarUpload
   %span= I18n.t('or')
-  = link_to_function I18n.t('media.add_form_library'), "$('#imageSelectDialogLeftSidebar').dialog('open');"
+  = link_to_function I18n.t('media.add_from_library'), "$('#imageLeftSidebarSelectDialog').dialog('open');"
 
-#imageSelectDialogLeftSidebar.media-hoverlay
+#imageLeftSidebarSelectDialog.media-hoverlay
   .media-hoverlay-header
-    = link_to_function content_tag(:span, I18n.t('media.picture.upload.action').capitalize, :class=>'big-icons add-picture'), "$(\'#imageUploadDialogLeftSidebar\').dialog(\'open\'); $(\'#imageSelectDialogLeftSidebar\').dialog(\'close\')", :class=>'backgrounds button'
+    = link_to_function content_tag(:span, I18n.t('media.picture.upload.action').capitalize, :class=>'big-icons add-picture'), "$(\'#imageLeftSidebarUploadDialog\').dialog(\'open\'); $(\'#imageLeftSidebarSelectDialog\').dialog(\'close\')", :class=>'backgrounds button'
     .display-mode
       .heading-separator
       .display-thumbnails
@@ -27,75 +27,6 @@
       %tr
         %td
 
-= dataSlides_tag :url => forgeos_core.admin_attachments_path(:format => :json, :skin => 'thumbnail', :file_type => 'picture', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table', :autostart => false
+= dataSlides_tag :url => forgeos_core.admin_pictures_path(:format => :json, :skin => 'thumbnail', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table', :autostart => false
 
-= dataTables_tag :id => 'image-table', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'picture',:mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{I18n.t('media.filename')}'}",    "{ 'sTitle': '#{I18n.t('media.content_type')}'}",    "{ 'sTitle': '#{I18n.t('media.updated_at')}'}",   "{ 'sTitle': '#{I18n.t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}'], :autostart => false
-
-
--# TODO move to base.js
-:javascript
-  function initImageUploadLeftSidebar(link){
-    $('#imageUploadDialogLeftSidebar').dialog('open');
-    $('#imageUploadDialogLeftSidebar').html('<div id="imageUploadLeftSidebar"></div><div class="library-add"><span>#{t(:or)}</span><a href="#" onclick="$(\'#imageUploadDialogLeftSidebar\').dialog(\'close\'); $(\'#imageSelectDialogLeftSidebar\').dialog(\'open\'); return false;">#{t('media.add_from_library')}</a></div>');
-    var uploadify_datas = { "format": "json" };
-    uploadify_datas[window._forgeos_js_vars.session_key] = window._forgeos_js_vars.session;
-
-  $('#imageUploadLeftSidebar').uploadify({
-    "uploader": "/assets/forgeos/uploadify/uploadify.swf",
-    "cancelImg": "/assets/forgeos/admin/big-icons/delete-icon.png",
-    "script": "#{forgeos_core.admin_attachments_path(:file_type => "picture")}",
-    "buttonImg": "#{image_path("forgeos/uploadify/upload-picture_#{I18n.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'){
-        $.ajax({
-          "success": function(result){
-            jQuery.tree.focused().refresh();
-          },
-          "error": function(){},
-          "data":  {
-            'category[attachment_ids]': [result.id],
-            authenticity_token: window._forgeos_js_vars.token
-          },
-          "dataType": 'json',
-          "type": 'put',
-          "url": '/admin/categories/'+ link +'.json',
-        });
-      } else {
-        display_notification_message('error',result.error)
-      }
-    },
-    "onAllComplete": function(){
-      $('#imageUploadDialogLeftSidebar').dialog('close');
-    }
-  });
-  }
-
-  function add_picture_to_category(){
-    var image_id = get_rails_element_id($('.row_selected')[0]);
-    var cat_id = get_rails_element_id($('.tree-li-selected-to-add-image'));
-    $.ajax({
-      "success": function(result){
-        jQuery.tree.focused().refresh();
-        jQuery('#imageSelectDialogLeftSidebar').dialog('close');
-      },
-      "error": function(){},
-      "data":  {
-        'category[attachment_ids]': [image_id],
-        authenticity_token: window._forgeos_js_vars.token
-      },
-      "dataType": 'json',
-      "type": 'put',
-      "url": '/admin/categories/'+ cat_id +'.json',
-    });
-  }
+= dataTables_tag :id => 'image-table', :url => forgeos_core.admin_pictures_path(:format => :json, :mode => 'selection'), :columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }", "{ 'sTitle': '#{I18n.t('media.filename')}'}", "{ 'sTitle': '#{I18n.t('media.content_type')}'}", "{ 'sTitle': '#{I18n.t('media.updated_at')}'}", "{ 'sTitle': '#{I18n.t('media.size')}'}", '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}', '{ "bVisible": false}'], :autostart => false

data/app/views/admin/users/index.json.erb

@@ -1,6 +1,8 @@
 <%
   output = {
-    :iTotalDisplayRecords => @users.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @users.total_entries || 0,
+    :iTotalDisplayRecords => @users.size,
     :aaData => @users.collect do |user|
       link_id = "user_#{user.id}"
       klass = user.active? ? 'see-on' : 'see-off'

data/app/views/admin/visual/_visual_popup.html.haml

@@ -1,12 +1,7 @@
 #imagepictureUploadDialog.upload-lightbox-container.white
   #imagepictureUpload
-    /= form.file_field :uploaded_data
-    /= hidden_field_tag :target, params[:target]
-    /= hidden_field_tag :target_id, params[:target_id]
-    /= form.submit t('save').capitalize
-
   %span= t('or')
-  = link_to_function t('media.add_form_library'), "$('#imagepictureSelectDialog').dialog('open');"
+  = link_to_function t('media.add_from_library'), "$('#imagepictureSelectDialog').dialog('open');"
 
 #imagepictureSelectDialog.media-hoverlay.project
   .media-hoverlay-header
@@ -32,67 +27,10 @@
       %tr
         %td
 
-= dataSlides_tag :url => forgeos_core.admin_attachments_path(:format => :json, :skin => 'thumbnail', :file_type => 'picture', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-picture', :autostart => false
-
-= dataTables_tag :id => 'image-table-picture', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'picture',:mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{t('media.filename')}'}",    "{ 'sTitle': '#{t('media.content_type')}'}",    "{ 'sTitle': '#{t('media.updated_at')}'}",   "{ 'sTitle': '#{t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}'], :autostart => false
-
--# TODO move to base.js
-- session_key = ActionController::Base.session_options[:key]
-- javascript_tag do
-  function initpictureImageUpload(){
-
-  $('#imagepictureUploadDialog').html('<div id="imagepictureUpload"></div><div class="library-add"><span>or</span><a href="#" onclick="$(\'#imagepictureUploadDialog\').dialog(\'close\'); $(\'#imagepictureSelectDialog\').dialog(\'open\'); return false;">add from library</a></div>');
-
-  $('#imagepictureUpload').uploadify({
-  uploader: '/assets/forgeos/uploadify/uploadify.swf',
-  cancelImg: '/assets/forgeos/big-icons/delete-icon.png',
-  = "script: '#{forgeos_core.admin_attachments_path(:file_type => 'picture')}',"
-  = "buttonImg:'#{image_path("uploadify/choose-picture_#{I18n.locale}.png")}',"
-  width: 154,
-  height:24,
-  scriptData: {
-  format: 'json',
-  = "'authenticity_token': encodeURIComponent('#{u form_authenticity_token}')," if protect_against_forgery?
-  = "'#{session_key}': encodeURIComponent('#{cookies[session_key]}')"
-  },
-  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'){
-  add_picture_picture_to_element(result.path,result.id,fileObj.name);
-  } else {
-  display_notification_message('error',result.error)
-  }
-  },
-  onAllComplete: function(){
-  $('#imagepictureUploadDialog').dialog('close');
-  }
-  });
-  }
-
-  function add_picture_picture_to_element(path,id,name){
-  = "object_name='#{form.object_name}';"
-  $('#picture-picture ul.sortable').html('<li><img src="'+path+'" alt="'+name+'"/><a href="#" onclick="$(this).parents(\'li\').remove();  $(\'#picture\').val(\'null\'); return false;" class="big-icons delete"></a></li>');
-  $("#picture").val(id);
-  }
-
 #imageimageUploadDialog.upload-lightbox-container.white
   #imageimageUpload
-    /= form.file_field :uploaded_data
-    /= hidden_field_tag :target, params[:target]
-    /= hidden_field_tag :target_id, params[:target_id]
-    /= form.submit t('save').capitalize
-
   %span= t('or')
-  = link_to_function t('media.add_form_library'), "$('#imageimageSelectDialog').dialog('open');"
+  = link_to_function t('media.add_from_library'), "$('#imageimageSelectDialog').dialog('open');"
 
 #imageimageSelectDialog.media-hoverlay.project
   .media-hoverlay-header
@@ -118,53 +56,26 @@
       %tr
         %td
 
-= dataSlides_tag :url => forgeos_core.admin_attachments_path(:format => :json, :skin => 'thumbnail', :file_type => 'picture', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-image'
-= dataTables_tag :id => 'image-table-image', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'picture',:mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{t('media.filename')}'}",    "{ 'sTitle': '#{t('media.content_type')}'}",    "{ 'sTitle': '#{t('media.updated_at')}'}",   "{ 'sTitle': '#{t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}']
+= dataSlides_tag :url => forgeos_core.admin_pictures_path(:format => :json, :skin => 'thumbnail', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-image'
 
--# TODO move to base.js
-- session_key = ActionController::Base.session_options[:key]
-- javascript_tag do
-  function initimageImageUpload(){
+= dataTables_tag :id => 'image-table-image', :url => forgeos_core.admin_pictures_path(:format => :json, :mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{t('media.filename')}'}",    "{ 'sTitle': '#{t('media.content_type')}'}",    "{ 'sTitle': '#{t('media.updated_at')}'}",   "{ 'sTitle': '#{t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}']
 
-  $('#imageimageUploadDialog').html('<div id="imageimageUpload"></div><div class="library-add"><span>or</span><a href="#" onclick="$(\'#imageimageUploadDialog\').dialog(\'close\'); $(\'#imageimageSelectDialog\').dialog(\'open\'); return false;">add from library</a></div>');
+= dataSlides_tag :url => forgeos_core.admin_pictures_path(:format => :json, :skin => 'thumbnail', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-picture', :autostart => false
 
-  $('#imageimageUpload').uploadify({
-  uploader: '/assets/forgeos/uploadify/uploadify.swf',
-  cancelImg: '/assets/forgeos/admin/big-icons/delete-icon.png',
-  = "script: '#{forgeos_core.admin_attachments_path(:file_type => 'picture')}',"
-  = "buttonImg:'#{image_path("uploadify/choose-picture_#{I18n.locale}.png")}',"
-  width: 154,
-  height:24,
-  scriptData: {
-  format: 'json',
-  = "'authenticity_token': encodeURIComponent('#{u form_authenticity_token}')," if protect_against_forgery?
-  = "'#{session_key}': encodeURIComponent('#{cookies[session_key]}')"
-  },
-  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'){
-  add_image_picture_to_element(result.path,result.id,fileObj.name);
-  } else {
-  display_notification_message('error',result.error)
-  }
-  },
-  onAllComplete: function(){
-  $('#imageimageUploadDialog').dialog('close');
-  }
-  });
+= dataTables_tag :id => 'image-table-picture', :url => forgeos_core.admin_pictures_path(:format => :json, :mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{t('media.filename')}'}",    "{ 'sTitle': '#{t('media.content_type')}'}",    "{ 'sTitle': '#{t('media.updated_at')}'}",   "{ 'sTitle': '#{t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}'], :autostart => false
+
+:javascript
+  function add_image_to_element(path,id,name,object_name,input) {
+    jQuery(input + '-picture ul.sortable').html('<li><img src="'+path+'" alt="'+name+'"/><a href="#" onclick="$(this).parents(\'li\').remove();  $("'+input+'").val(\'null\'); return false;" class="big-icons delete"></a></li>');
+    jQuery(input).val(id);
   }
 
   function add_image_picture_to_element(path,id,name){
-  = "object_name='#{form.object_name}';"
-  $('#image-picture ul.sortable').html('<li><img src="'+path+'" alt="'+name+'"/><a href="#" onclick="$(this).parents(\'li\').remove();  $(\'#image\').val(\'null\'); return false;" class="big-icons delete"></a></li>');
-  $("#image").val(id);
+    var object_name='#{form.object_name}';
+    add_image_to_element(path,id,name,object_name, '#image');
+  }
+
+  function add_picture_picture_to_element(path,id,name){
+    var object_name='#{form.object_name}';
+    add_image_to_element(path,id,name,object_name, '#picture');
   }

data/app/views/admin/visual/_visuals_popup.html.haml

@@ -6,7 +6,7 @@
     /= form.submit I18n.t('save').capitalize
 
   %span= I18n.t('or')
-  = link_to_function I18n.t('media.add_form_library'), "$('#imagevisualsSelectDialog').dialog('open');"
+  = link_to_function I18n.t('media.add_from_library'), "$('#imagevisualsSelectDialog').dialog('open');"
 
 #imagevisualsSelectDialog.media-hoverlay.project
   .media-hoverlay-header
@@ -32,52 +32,12 @@
       %tr
         %td
 
-= dataSlides_tag :url => forgeos_core.admin_attachments_path(:format => :json, :skin => 'thumbnail', :file_type => 'picture', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-visuals', :autostart => false
+= dataSlides_tag :url => forgeos_core.admin_pictures_path(:format => :json, :skin => 'thumbnail', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :id => 'thumbnail-table-visuals', :autostart => false
 
-= dataTables_tag :id => 'image-table-visuals', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'picture',:mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{I18n.t('media.filename')}'}",    "{ 'sTitle': '#{I18n.t('media.content_type')}'}",    "{ 'sTitle': '#{I18n.t('media.updated_at')}'}",   "{ 'sTitle': '#{I18n.t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}'], :autostart => false
+= dataTables_tag :id => 'image-table-visuals', :url => forgeos_core.admin_pictures_path(:format => :json, :mode => 'selection'),:columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }",    "{ 'sTitle': '#{I18n.t('media.filename')}'}",    "{ 'sTitle': '#{I18n.t('media.content_type')}'}",    "{ 'sTitle': '#{I18n.t('media.updated_at')}'}",   "{ 'sTitle': '#{I18n.t('media.size')}'}",   '{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}','{ "bVisible": false}',    '{ "bVisible": false}'], :autostart => false
 
--# TODO move to base.js
-- session_key = ActionController::Base.session_options[:key]
-- javascript_tag do
-  function initvisualsImageUpload(){
-
-  $('#imagevisualsUploadDialog').html('<div id="imagevisualsUpload"></div><div class="library-add"><span>or</span><a href="#" onclick="$(\'#imagevisualsUploadDialog\').dialog(\'close\'); $(\'#imagevisualsSelectDialog\').dialog(\'open\'); return false;">add from library</a></div>');
-
-  $('#imagevisualsUpload').uploadify({
-  uploader: '/assets/forgeos/uploadify/uploadify.swf',
-  cancelImg: '/assets/forgeos/min/big-icons/delete-icon.png',
-  = "script: '#{forgeos_core.admin_attachments_path(:file_type => 'picture')}',"
-  = "buttonImg:'#{image_path("uploadify/choose-picture_#{I18n.locale}.png")}',"
-  width: 154,
-  height:24,
-  scriptData: {
-  format: 'json',
-  = "authenticity_token: encodeURIComponent('#{u form_authenticity_token}')," if protect_against_forgery?
-  = "#{session_key}: encodeURIComponent('#{cookies[session_key]}')"
-  },
-  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'){
-  add_picture_to_element(result.path,result.id,fileObj.name);
-  } else {
-  display_notification_message('error',result.error)
+:javascript
+  function add_picture_to_visuals(path,id,name){
+    var object_name='#{form.object_name}';
+    jQuery('#visuals-picture ul.sortable').before('<li><a href="#" onclick="jQuery(this).parents(\'li\').remove(); return false;" class="big-icons trash"></a><input type="hidden" name="'+object_name+'[attachment_ids][]" value="'+id+'"/><img src="'+path+'" alt="'+name+'"/><div class="handler"><div class="inner"></div></div></li>');
   }
-  },
-  onAllComplete: function(){
-  $('#imagevisualsUploadDialog').dialog('close');
-  }
-  });
-  }
-
-  function add_picture_to_element(path,id,name){
-  = "object_name='#{form.object_name}';"
-  $('#visuals-picture ul.sortable').before('<li><a href="#" onclick="$(this).parents(\'li\').remove(); return false;" class="big-icons trash"></a><input type="hidden" name="'+object_name+'[attachment_ids][]" value="'+id+'"/><img src="'+path+'" alt="'+name+'"/><div class="handler"><div class="inner"></div></div></li>');  }

data/app/views/layouts/admin.html.haml

@@ -1,5 +1,5 @@
-!!! xml utf-8
-!!! 1.1
+!!! XML
+!!! 5
 %html{ "xml:lang" => I18n.locale, :xmlns => "http://www.w3.org/1999/xhtml" }
   %head
     %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }

data/app/views/layouts/admin_login.html.haml

@@ -1,5 +1,5 @@
-!!! xml utf-8
-!!! 1.1
+!!! XML
+!!! 5
 %html{ 'xml:lang' => I18n.locale, :xmlns => 'http://www.w3.org/1999/xhtml' }
   %head
     %meta{ :content => 'text/html; charset=utf-8', 'http-equiv' => 'Content-Type' }

data/config/locales/common/en.yml

@@ -214,6 +214,7 @@ en:
       action: 'save order for site display'
   media:
     list: list of media
+    add_from_library: add from library
     one: media
     other: media
     none: no media

data/config/locales/common/fr.yml

@@ -215,6 +215,7 @@ fr:
       action: "sauvegarder l'ordre pour le site"
   media:
     list: liste des médias
+    add_from_library: ajouter depuis la librairie
     one: média
     other: médias
     none: aucun média

data/config/routes.rb

@@ -59,8 +59,19 @@ Forgeos::Core::Engine.routes.draw do
     end
 
     match '/library' => 'attachments#index', :as => :library, :file_type => 'picture'
+
+    resources :attachments, :except => [:new] do
+      collection do
+        get :manage
+      end
+      member do
+        get :download
+      end
+    end
+
+
     %w(media picture doc pdf audio video attachment).each do |attachment|
-      resources attachment.pluralize.to_sym, :except => [:new] do
+      resources attachment.pluralize.to_sym, :controller => 'attachments', :file_type => attachment, :except => [:new] do
         collection do
           get :manage
         end

data/lib/forgeos/urlified.rb

@@ -0,0 +1,16 @@
+module Forgeos
+  module Urlified
+    def self.included(base)
+      base.before_validation :force_url_format, :generate_url
+    end
+
+    def force_url_format
+      self.url= Forgeos::url_generator(self.url)
+    end
+
+    def generate_url
+      return true if self.url.present?
+      self.url = self.name.parameterize if self.name.present?
+    end
+  end
+end

data/lib/tasks/install.rake

@@ -1,9 +1,9 @@
 namespace :forgeos do
   namespace :core do
     desc "load fixtures and generate forgeos_core controllers ACLs"
-    task :install => [ :environment, 'forgeos_core_engine:install:migrations', 'db:migrate' ] do
-      system 'rake "forgeos:core:fixtures:load[forgeos_core,people geo_zones settings]"'
-      system "rake 'forgeos:core:generate:acl[#{Gem.loaded_specs['forgeos_core'].full_gem_path}]'"
+    task :install do
+      Rake::Task['forgeos:core:fixtures:load'].invoke('forgeos_core','people geo_zones settings')
+      Rake::Task['forgeos:core:generate:acl'].invoke(Gem.loaded_specs['forgeos_core'].full_gem_path)
     end
   end
 end

data/lib/technoweenie/attachment_fu/backends/ftp_backend.rb

@@ -152,18 +152,12 @@ module Technoweenie # :nodoc:
         end
 
         def current_data
-          ftp = Net::FTP.new(ftp_config[:server])
-          ftp.login(ftp_config[:login], ftp_config[:password])
-          dest_path = File.join(ftp_config[:base_upload_path], full_filename)
-          puts(dest_path.inspect)
-          f = Tempfile.open('w')
-          f.close
-          ftp.getbinaryfile(dest_path, f.path)
-          ftp.close
-          f.open
-          v = f.read()
-          f.delete
-          v
+          Net::FTP.open(ftp_config[:server]) do |ftp|
+            ftp.login(ftp_config[:login], ftp_config[:password])
+            ftp.getbinaryfile(File.join(ftp_config[:base_upload_path], full_filename)) do |data|
+              return data
+            end
+          end
         end
 
         # Partitions the given path into an array of path components.
@@ -201,6 +195,7 @@ module Technoweenie # :nodoc:
         protected
           # Called in the after_destroy callback
           def destroy_file
+            return true if ftp_config[:read_only]
             ftp = Net::FTP.new(ftp_config[:server])
             ftp.login(ftp_config[:login], ftp_config[:password])
             dest_path = File.join(ftp_config[:base_upload_path], full_filename)
@@ -208,6 +203,7 @@ module Technoweenie # :nodoc:
           end
 
           def rename_file
+            return true if ftp_config[:read_only]
             return unless @old_filename && @old_filename != filename
             old_full_filename = File.join(base_path, @old_filename)