refinerycms-portfolio 0.9.8.rc2 → 0.9.8.rc3

data/app/controllers/admin/portfolio_controller.rb

@@ -1,6 +1,9 @@
 class Admin::PortfolioController < Admin::BaseController
 
-  crudify :portfolio_entry, :order => 'lft ASC', :conditions => "parent_id IS NULL", :sortable => true
+  crudify :portfolio_entry,
+          :order => 'lft ASC',
+          :conditions => {:parent_id => nil},
+          :sortable => true
 
   def emancipate
     if (entry = PortfolioEntry.find(params[:id])).present?

data/app/models/images_portfolio_entry.rb

@@ -0,0 +1,10 @@
+class ImagesPortfolioEntry < ActiveRecord::Base
+
+  belongs_to :image
+  belongs_to :portfolio_entry
+
+  before_save do |image_portfolio_entry|
+    image_portfolio_entry.position = (ImagesPortfolioEntry.maximum(:position) || -1) + 1
+  end
+
+end

data/app/models/portfolio_entry.rb

@@ -7,14 +7,20 @@ class PortfolioEntry < ActiveRecord::Base
   acts_as_nested_set
   default_scope :order => 'lft ASC'
 
-  has_and_belongs_to_many :images
+  has_many :images_portfolio_entries
+  has_many :images, :through => :images_portfolio_entries, :order => 'images_portfolio_entries.position ASC'
+  accepts_nested_attributes_for :images, :allow_destroy => false
 
-  alias_attribute :content, :body
+  def images_attributes=(data)
+    self.images.clear
 
-  def image_ids=(ids)
-    self.images = ids.reject{|id| id.blank?}.collect {|image_id|
-      Image.find(image_id.to_i) rescue nil
+    self.images = (0..(data.length-1)).collect { |i|
+      unless (image_id = data[i.to_s]['id'].to_i) == 0
+        Image.find(image_id) rescue nil
+      end
     }.compact
   end
 
+  alias_attribute :content, :body
+
 end

data/app/views/admin/portfolio/_form.html.erb

@@ -9,40 +9,51 @@
                :object => f.object,
                :include_object_name => true
              }  %>
-  <div class='field'>
+  <div id='portfolio_body' class='field clearfix'>
     <%= f.required_label t('.title') %>
     <%= f.text_field :title, :class => "larger widest" %>
   </div>
-  <div class='field images_field'>
-    <span class='clearfix label_inline_with_link'>
-      <%= label_tag('portfolio_entry_image_ids', t('.images')) %>
-      <%= link_to "#{refinery_icon_tag "add.png"} #{t('.add')}".html_safe,
-                  insert_admin_images_url(
-                    :dialog => true,
-                    :width => 866,
-                    :height => 510,
-                    :callback => "image_added"
-                  ),
-                  :name => t('.add_another_image'),
-                  :id => "add_image_link" %>
-    </span>
-    <ul id='portfolio_images' class='clearfix portfolio_entry_images'>
-      <% @portfolio_entry.images.each do |image| %>
-        <li id='image_<%= image.id %>'>
-          <%= image_fu image, '135x135#c' %>
-          <%= hidden_field_tag 'portfolio_entry[image_ids][]', image.id,
-                               :id => "portfolio_entry_image_id_#{image.id}" %>
+  <div class='field clearfix'>
+    <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content'>
+      <ul id='page_parts'>
+        <li class='ui-state-default ui-state-active'>
+          <%= link_to t('.content'), '#page_part_content'%>
         </li>
-      <% end %>
-      <li class='empty'>
-        <img id="current_portfolio_entry_image" src="" alt="" style='display: none' />
-        <input type='hidden' id='portfolio_entry_image_id' name='portfolio_entry[image_ids][]' />
-      </li>
-    </ul>
-  </div>
-  <div id='portfolio_body' class='field clearfix'>
-    <%= f.label :body, t('.content') %>
-    <%= f.text_area :body, :class => "wymeditor widest", :rows => 7 %>
+        <li class='ui-state-default'>
+          <%= link_to t('.images'), '#portfolio_image_picker'%>
+        </li>
+      </ul>
+    </div>
+    <div id='page_part_editors'>
+      <div id='page_part_content' class='page_part'>
+        <%= f.text_area :body, :class => "wymeditor widest", :rows => 7 %>
+      </div>
+      <div class='page_part wym_skin_refinery' id='portfolio_image_picker'>
+        <div class='wym_area_top'>
+          <span class='clearfix label_inline_with_link'>
+            <%= link_to t('.add_another_image').html_safe,
+                        insert_admin_images_url(:dialog => true,
+                                                :width => 866,
+                                                :height => 510,
+                                                :callback => "image_added"),
+                        :id => "add_image_link" %>
+          </span>
+        </div>
+        <div class='wym_box field images_field'>
+          <ul id='portfolio_images' class='clearfix portfolio_entry_images'>
+            <%= f.fields_for :images do |image_form| %>
+              <li id='image_<%= image_form.object.id %>'>
+                <%= image_form.hidden_field :id %>
+                <%= image_fu image_form.object, '135x135#c' %>
+              </li>
+            <% end %>
+            <li class='empty'>
+              <%= hidden_field_tag "portfolio_entry[images_attributes][#{@portfolio_entry.images.size}][id]" %>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
   </div>
   <% if (nested_portfolios = nested_set_options(PortfolioEntry, @portfolio_entry) {|i| "#{'-' * i.level} #{i.title}" }).present? %>
     <div class='field'>

data/app/views/admin/portfolio/index.html.erb

@@ -27,4 +27,4 @@
   <% end %>
 </div>
 <%= render :partial => "/shared/admin/make_sortable",
-           :locals => { :tree => ::Refinery::Portfolio.multi_level? } if PortfolioEntry.count > 1 %>
+           :locals => { :tree => ::Refinery::Portfolio.multi_level? } if PortfolioEntry.count > 1 %>

data/config/locales/lv.yml

@@ -2,7 +2,7 @@ lv:
   plugins:
     portfolio:
       title: Portfolio
-      description: Pārvaldīt portfeļa izmanto Refinery CMS
+      description: Portfolio pārvaldīšana iekš Refinery CMS
   admin:
     portfolio:
       index:

data/lib/gemspec.rb

@@ -30,4 +30,4 @@ Gem::Specification.new do |s|
 end
 EOF
 
-File.open(File.expand_path("../../refinerycms-portfolio.gemspec", __FILE__), 'w').puts(gemspec)
+File.open(File.expand_path("../../refinerycms-portfolio.gemspec", __FILE__), 'w').puts(gemspec)

data/lib/generators/portfolio/portfolio_generator.rb

@@ -56,4 +56,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/generators/portfolio/templates/db/seeds/portfolio.rb

@@ -27,4 +27,4 @@ if RefinerySetting.methods.map(&:to_sym).include?(:set)
   RefinerySetting.set(:image_thumbnails, new_thumbnails)
 else
   RefinerySetting[:image_thumbnails] = new_thumbnails
-end
+end

data/lib/portfolio/version.rb

@@ -1,7 +1,7 @@
 module Refinery
   module Portfolio
     def self.version
-      %q{0.9.8.rc2}
+      %q{0.9.8.rc3}
     end
   end
-end
+end

data/lib/portfolio.rb

@@ -2,4 +2,4 @@ require 'portfolio/version'
 
 unless defined?(::Refinery::Portfolio::Engine)
   require File.expand_path('../refinerycms-portfolio.rb', __FILE__)
-end
+end

data/lib/refinerycms-portfolio.rb

@@ -31,4 +31,4 @@ module Refinery
   end
 end
 
-require File.expand_path('../portfolio', __FILE__)
+require File.expand_path('../portfolio', __FILE__)

data/public/javascripts/portfolio.js

@@ -6,6 +6,7 @@ reset_functionality = function() {
     , 'placeholder': 'placeholder'
     , 'cursor': 'drag'
     , 'items': 'li'
+    , stop: reindex_images
   });
 
   $('#content #portfolio_images li:not(.empty)').each(function(index, li) {
@@ -16,6 +17,7 @@ reset_functionality = function() {
         img_delete.appendTo(image_actions);
         img_delete.click(function() {
           $(this).parents('li[id*=image_]').remove();
+          reindex_images();
         });
 
         image_actions.appendTo($(li));
@@ -26,19 +28,56 @@ reset_functionality = function() {
       $(this).find('.image_actions').hide();
     });
   });
+
+  reindex_images();
+}
+
+reindex_images = function() {
+  $('#portfolio_images li input:hidden').each(function(i, input){
+    // make the image's name consistent with its position.
+    parts = $(input).attr('name').split(']');
+    parts[1] = ('[' + i)
+    $(input).attr('name', parts.join(']'));
+
+    // make the image's id consistent with its position.
+    $(input).attr('id', $(input).attr('id').replace(/_\d_/, '_'+i+'_').replace(/_\d/, '_'+i));
+  });
 }
 
 image_added = function(image) {
   last_portfolio_entry_image_id = "";
+  new_list_item = (current_list_item = $('li.empty')).clone();
   image_id = $(image).attr('id').replace('image_', '');
-  hidden_identifier = $('li.empty').find('input:hidden');
-  hidden_identifier.attr('id', '').val(image_id);
-  $('li.empty').find('img').css('display', '').attr({'id': '', 'src': $(image).attr('src').replace('_dialog_thumb', '_grid'), 'title': $(image).attr('title'), 'alt': $(image).attr('alt')});
-  $('li.empty').attr('id', 'image_' + image_id).removeClass('empty');
+  current_list_item.find('input:hidden').val(image_id);
+  $.ajax({
+    async: false,
+    url: '/refinery/images/'+image_id+'/url',
+    data: {size: '135x135#c'},
+    success: function (result, status, xhr) {
+      if (result.error) {
+        if (console && console.log) {
+           console.log("Something went wrong with the image insertion!");
+           console.log(result);
+         }
+       } else {
+         (img = $("<img />")).attr({
+           title: $(image).attr('title')
+           , alt: $(image).attr('alt')
+           , src: result.url
+         }).appendTo(current_list_item);
+       }
+     },
+     error: function(xhr, txt, status) {
+       if (console && console.log) {
+         console.log("Something went wrong with the image insertion!");
+         console.log(xhr);
+         console.log(txt);
+         console.log(status);
+       }
+     }
+   });
 
-  new_list_item = $("<li class='empty'></li>");
-  $("<img id='current_portfolio_entry_image' src='' alt='' style='display:none;' />").appendTo(new_list_item);
-  $("<input type='hidden' id='portfolio_entry_image_id' name='portfolio_entry[image_ids][]' />").appendTo(new_list_item);
+  current_list_item.attr('id', 'image_' + image_id).removeClass('empty');
 
   new_list_item.appendTo($('#portfolio_images'));
   reset_functionality();
@@ -54,8 +93,30 @@ $(document).ready(function() {
     window.location = portfolio_entry_url + this.value;
   });
 
+  if ((tabs = $('.edit_portfolio_entry #page-tabs, .new_portfolio_entry #page-tabs')).length > 0) {
+    page_options.init(false, '', '');
+    $('a[href*=portfolio_image_picker]').click(function(){
+      if (!(picker = $('#portfolio_image_picker')).data('size-applied')){
+        wym_box = $('.page_part:first .wym_box');
+        iframe = $('.page_part:first iframe');
+        picker.css({
+          height: wym_box.height()
+          , width: wym_box.width()
+        }).data('size-applied', true).corner('tr 5px').corner('bottom 5px').find('.wym_box').css({
+          backgroundColor: 'white'
+          , height: iframe.height() + $('.page_part:first .wym_area_top').height() - parseInt($('.wym_area_top .label_inline_with_link a').css('lineHeight'))
+          , width: iframe.width() - 20
+          , 'border-color': iframe.css('border-top-color')
+          , 'border-style': iframe.css('border-top-style')
+          , 'border-width': iframe.css('border-top-width')
+          , padding: '0px 10px 0px 10px'
+        });
+      }
+    });
+  }
+
   var clicked_on = null;
-  $("ul#portfolio_images li a").click(function(event) {
+  $("ul#portfolio_images li a").click(function(e) {
     if (!$(this).hasClass('selected')) {
       clicked_on = $(this);
       $.get($(this).attr('href'), function(data, textStatus) {
@@ -72,6 +133,6 @@ $(document).ready(function() {
       });
     }
 
-    return false;
+    e.preventDefault();
   });
 });

data/public/stylesheets/portfolio.css

@@ -72,4 +72,11 @@
 #content #portfolio_images.ui-sortable li.placeholder {
     width: 135px;
     height: 135px;
+}
+.wym_area_top .label_inline_with_link a, #content .wym_area_top .label_inline_with_link a {
+  margin-top: 0px;
+  line-height: 29px;
+  background: url('/images/refinery/icons/add.png') no-repeat 0px 6px;
+  padding-left: 20px;
+  border-bottom: 0px none;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-portfolio
 version: !ruby/object:Gem::Version 
-  hash: 977940519
+  hash: 977940516
   prerelease: true
   segments: 
   - 0
   - 9
   - 8
-  - rc2
-  version: 0.9.8.rc2
+  - rc3
+  version: 0.9.8.rc3
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +12:00
+date: 2010-09-27 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - app/controllers/admin/portfolio_controller.rb
 - app/controllers/portfolio_controller.rb
 - app/helpers/portfolio_helper.rb
+- app/models/images_portfolio_entry.rb
 - app/models/portfolio_entry.rb
 - app/views/admin/portfolio/_form.html.erb
 - app/views/admin/portfolio/_list.html.erb