lolita-file-upload 0.4.12 → 0.4.13

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "lolita", "~>3.2.0.rc.6"
-gem "carrierwave", "~> 0.5.8"
+gem "carrierwave", "~> 0.6.0"
 gem "mini_magick"
 gem 'jquery-rails', '>= 1.0.12'
 group :test do
@@ -11,7 +11,7 @@ group :test do
   gem "sqlite3"
   gem "rspec", "~> 2.6"
   gem 'cover_me', '>= 1.0.0.rc6'
-  gem 'rails', "~> 3.1.0"
+  gem 'rails', "~> 3.2.0"
 end
 
 group :development do

data/VERSION

@@ -1 +1 @@
-0.4.12
+0.4.13

data/app/controllers/lolita/uploads_controller.rb

@@ -1,32 +1,36 @@
 class Lolita::UploadsController < ApplicationController
   include Lolita::ControllerAdditions
   before_filter :authenticate_lolita_user!
-  before_filter :set_tab, :only=>[:edit,:update,:destroy,:create]
+  before_filter :set_tab, :only=>[:index,:edit,:update,:destroy,:create]
   before_filter :set_resource, :only=>[:create,:edit,:update,:destroy]
   before_filter :set_file, :only=>[:edit,:update,:destroy,:create]
 
   respond_to :js,:html
 
+  def index
+    render_component *@tab.build("",:list,:file=>@file)
+  end
+
   def create
-    can?(:create,@file.class)
+    authorization_proxy.can?(:create,@file.class)
     @file.send(:"#{@tab.uploader}=",params[:file])
     @file.save! 
-    render_component *@tab.build("",:row,:file=>@file, :format => "html")
+    render_component *@tab.build("",:image,:file=>@file, :format => "html")
   end
 
   def edit
-    can?(:update,@file.class)
+    authorization_proxy.can?(:update,@file.class)
     render_component *@tab.build("",:edit,:file=>@file)
   end
 
   def update
-    can?(:update,@file.class)
+    authorization_proxy.can?(:update,@file.class)
     @file.update_attributes!(params[:file])
     render_component *@tab.build("",:update,:file=>@file)
   end
 
   def destroy
-    can?(:destroy,@file.class)
+    authorization_proxy.can?(:destroy,@file.class)
     @file.destroy
     render_component *@tab.build("",:destroy,:file=>@file)
   end
@@ -58,4 +62,4 @@ class Lolita::UploadsController < ApplicationController
   def tab_by_association name
     resource_class.lolita.tabs.detect{|tab| tab.type == :files && (tab.try(:association) && tab.association.name == name.to_sym)}
   end
-end
+end

data/app/models/lolita/upload/file.rb

@@ -2,7 +2,7 @@ module Lolita
   module Upload
     class File < ActiveRecord::Base
       set_table_name :lolita_files
-
+      attr_accessible :asset, :name, :fileable_type, :asset_extension
       mount_uploader :asset, FileUploader
       belongs_to :fileable, :polymorphic=>true
 

data/app/views/components/lolita/configuration/field/string/text_gallery/_display.html.haml

@@ -0,0 +1,20 @@
+= current_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple 
+- if @textarea_component_include_tinymce_once.nil? 
+  :javascript
+    $(function(){
+      load_tinymce({
+      theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code,gallery",
+      setup : function(ed) {
+          // Add a custom button
+          ed.addButton('gallery', {
+            title : '#{t('lolita.tinymce.gallery')}',
+            image : '#{asset_path('lolita/tinymce_gallery.png')}',
+            onclick : function() {
+              $('#fixed-gallery button').css("top",$(window).height()/4-30);
+              $('#fixed-gallery').css("height",$(window).height()/4).toggle();
+            }
+          })
+        }
+      });
+    })
+- @textarea_component_include_tinymce_once = "done" 

data/app/views/components/lolita/configuration/tab/files/_cells.html.erb

@@ -7,6 +7,6 @@
   <% end %>
 </td>
 <td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 55px;text-align: center; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
-  <%= link_to  image_tag("lolita/upload/edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true %>
+  <%= link_to image_tag("lolita/upload/edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true %>
   <%= link_to image_tag("lolita/upload/delete-picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
-</td>
+</td>

data/app/views/components/lolita/configuration/tab/files/_destroy.js.erb

@@ -1,2 +1,5 @@
-$("#upload_<%=tab.association.name%>_row_<%=file.id%>").remove()
-$("input.<%=tab.association.name%>-ids[value=<%=file.id%>]").remove()
+$("#upload_<%=tab.association.name%>_item_<%=file.id%>").remove()
+$("input.<%=tab.association.name%>-ids[value=<%=file.id%>]").remove()
+//return to list
+$("#<%= tab.association.name %>_form").show()
+$("#<%= tab.association.name %>_form").siblings(".edit-file-form").remove()

data/app/views/components/lolita/configuration/tab/files/_display.html.erb

@@ -2,13 +2,12 @@
   model_name = tab.dbi.klass.model_name.plural.downcase
   addon = model_name == model_name.singularize ? "_index" : ""
 %>
-<%= form_tag(send(:"create_upload_lolita_#{model_name}#{addon}_path", :association => tab.association.name),:method=>:post, :id=>"#{tab.association.name}_form") do %>
+<%= form_tag(send(:"create_upload_lolita_#{model_name}#{addon}_path", :association => tab.association.name),:method=>:post, :id=>"#{tab.association.name}_form", :class=>"lolita-file-upload-form") do %>
   <div id="file_upload_container_<%="#{tab.association.name}"%>">
-    Your bowser don't have HTML5 or Flash support.
+    Your browser don't have HTML5 or Flash support.
   </div>
+  <div class="filelist">
+    <%= render_component tab,:list %>
+  </div>
+  <%= render_component tab, :upload_script, :container => "file_upload_container_#{tab.association.name}"%>
 <% end %>
- <div id="filelist">
-  <%= render_component tab,:list %>
-</div>
-<%= render_component tab, :upload_script, :container => "file_upload_container_#{tab.association.name}"%>
-<%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>

data/app/views/components/lolita/configuration/tab/files/_edit.js.erb

@@ -1 +1 @@
-$("#upload_<%=tab.association.name%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(*tab.build("",:list_form,:file=>file,:format=>"html")))%>");
+$("#upload_<%=tab.association.name%>_item_<%=file.id%>").closest(".lolita-file-upload-form").hide().after("<%=escape_javascript(render_component(*tab.build("",:form,:file=>file,:format=>"html")))%>");

data/app/views/components/lolita/configuration/tab/files/_form.html.erb

@@ -1,7 +1,24 @@
-<%= form_tag send(:"lolita_#{resource_class.model_name.singular}_upload_path", "#{resource_class.model_name.singular}_id" => resource.id, :association => tab.association.name, :id=>file.id),:method=>:put,:remote=>true,:id=>"edit_#{tab.association.name}_#{file.id}" do %>
-  <% tab.editable_fields.each do |name| %>
-    <%= label_tag "file[#{name}]", file.class.human_attribute_name(name) %>
-    <%= text_field_tag "file[#{name}]",file.send(name) %>
-    <br />
-  <% end %>
-<% end %>
+<%= form_tag send(:"lolita_#{resource_class.model_name.singular}_upload_path", "#{resource_class.model_name.singular}_id" => resource.id, :association => tab.association.name, :id=>file.id),:method=>:put,:remote=>true,:id=>"edit_#{tab.association.name}_#{file.id}", :class => "edit-file-form" do %>
+  <div class="file-editor">
+    <% url = file.send(tab.uploader).normalized.blank? ? file.send(tab.uploader).url : file.send(tab.uploader).normalized.url %>
+    <%= image_tag url, :class => "editable-image" %>
+    <div class="fields"> 
+      <% tab.editable_fields.each do |name| %>
+        <%= label_tag "file[#{name}]", file.class.human_attribute_name(name) %>
+        <%= text_field_tag "file[#{name}]",file.send(name) %>
+        <br />
+      <% end %>
+    </div>
+    <div class="action-links">
+      <div class="navigation">
+        <%= link_to t("lolita.tabs.images.back"), send(:"lolita_#{tab.dbi.klass.model_name.singular}_uploads_path"), :remote => true, :class => "back" %>
+        <%#= link_to t("lolita.tabs.images.previous"), "#", :class => "previous" %>
+        <%#= link_to t("lolita.tabs.images.next"), "#", :class => "next" %>
+      </div>
+      <div class="actions">
+        <%= link_to t("lolita.tabs.images.delete"), send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?", :class => "delete" %>
+        <%= link_to t("lolita.tabs.images.save"), "#", :class => "save" %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/components/lolita/configuration/tab/files/_image.html.erb

@@ -0,0 +1,29 @@
+<div class="file-item" id="upload_<%=tab.association.name%>_item_<%=file.id%>" data-<%=tab.association.name%>-id="<%=file.id%>">
+  <div class="window">
+    <% if file.send(tab.uploader).to_s =~ /(jpg|jpeg|png|gif)$/i %>
+      <% url = file.send(tab.uploader).normalized.blank? ? file.send(tab.uploader).url : file.send(tab.uploader).normalized.url %>
+      <%#= link_to image_tag(url, :style=>"width:300px; height 160px;"), url %>
+      <%= image_tag url %>
+    <% else %>
+      <%#= link_to file.send(tab.uploader).url, file.send(tab.uploader).url %>
+      <%= file.send(tab.uploader).url %>
+    <% end %>
+    <div class="links">
+      <%= link_to t("lolita.tabs.images.edit"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true, :class => "edit_link" %>
+      <%= link_to t("lolita.tabs.images.delete"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?", :class => "delete_link" %>
+    </div>
+  </div>
+  <p><%= File.basename(file.send(tab.uploader).url) %></p>
+</div>
+<script>
+  $('#fixed-gallery').append("<%=escape_javascript(render_component(*tab.build("",:file,:file=>file,:format=>"html")))%>");
+  <% if tab.association_type == :many
+      ids = "#{resource_name}[#{tab.association.name.to_s.singularize}_ids][]"
+    else
+      ids = "#{resource_name}[#{tab.association.name.to_s.singularize}_new]"
+    end %>
+  <% if resource && resource.new_record? && resource.errors.any? %>
+    $(".tabs form:first").append('<input type="hidden" class="<%=tab.association.name%>-ids" name="<%= ids %>" value="<%= file.id %>" />')
+  <% end %>
+
+</script>

data/app/views/components/lolita/configuration/tab/files/_list.html.erb

@@ -1,14 +1,6 @@
-<table id="file_list_for_<%=tab.association.name%>">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>*</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% files = tab.association_type == :one ? [resource.send(tab.association.name)].compact :  resource.send(tab.association.name) %>
-    <% files.each do |file| %>
-      <%= render_component *tab.build("",:row,:file=>file,:value=>nil) %>
-    <% end %>
-  </tbody>
-</table>
+<div id="file_list_for_<%= tab.association.name %>" class="filelist-container">
+  <% files = tab.association_type == :one ? [resource.send(tab.association.name)].compact : resource.send(tab.association.name) %>
+  <% files.each do |file| %>
+    <%= render_component *tab.build("", :image, :file => file, :value => nil) %>
+  <% end %>
+</div>

data/app/views/components/lolita/configuration/tab/files/_list.js.erb

@@ -0,0 +1,2 @@
+$("#<%= tab.association.name %>_form").show()
+$("#<%= tab.association.name %>_form").siblings(".edit-file-form").remove()

data/app/views/components/lolita/configuration/tab/files/_update.js.erb

@@ -1 +1 @@
-$("#upload_<%=tab.association.name%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(*tab.build("",:cells,:file=>file,:format=>"html")))%>")
+$("#edit_<%=tab.association.name%>_<%=file.id%>").replaceWith("<%=escape_javascript(render_component(*tab.build("",:form,:file=>file,:format=>"html")))%>")

data/app/views/components/lolita/configuration/tab/files/_upload_script.html.erb

@@ -1,6 +1,6 @@
   <%= stylesheet_link_tag "lolita/upload/application_vendor.css" %>
   <%= javascript_include_tag "lolita/upload/application_vendor.js" %>
-<% unless Lolita.locale.to_s.downcase=="en" %>
+<% unless ::I18n.locale.to_s.downcase=="en" %>
   <%= javascript_include_tag "lolita/upload/I18n/#{Lolita.locale}.js"%>
 <% end %>
 <script type="text/javascript">  
@@ -24,13 +24,17 @@
       ],
     <% end %>
     multipart: true,
+    <% if tab.association_type == :one %>
+    max_file_count: 1,
+    multi_selection: false,
+    <% end %>
     multipart_params: {  
       "authenticity_token" : '<%= form_authenticity_token %>',
       <% if tab.association.options[:as] -%>
       "<%="upload[#{tab.association.options[:as]}_type]"%>": "<%=resource.class%>",
       "<%="upload[#{tab.association.options[:as]}_id]"%>": "<%=resource.new_record? ? 0 : resource.id%>"
       <% else -%>
-      "<%="upload[#{lolita_mapping.singular}_id]"%>": "<%=resource.new_record? ? 0 : resource.id%>"
+      "<%="upload[#{tab.association.foreign_key}]"%>": "<%=resource.new_record? ? 0 : resource.id%>"
       <% end -%>
     },
     headers:{
@@ -42,11 +46,11 @@
     init:{
       FileUploaded:function(uploader, file, info){
         <% if tab.association_type == :many %>
-          $("#file_list_for_<%=tab.association.name%>>tbody").append(info.response)
+          $("#file_list_for_<%=tab.association.name%>").append(info.response)
         <% else %>
           uploader.splice(0,10);
-          $("#file_list_for_<%=tab.association.name%>>tbody").html("")
-          $("#file_list_for_<%=tab.association.name%>>tbody").append(info.response)
+          $("#file_list_for_<%=tab.association.name%>").html("")
+          $("#file_list_for_<%=tab.association.name%>").append(info.response)
         <% end %>
 
         <% if tab.association_type == :many %>
@@ -61,13 +65,13 @@
         })
 
         var new_ids=[]
-        $("#file_list_for_<%=tab.association.name%> tr[data-<%=tab.association.name%>-id]").each(function(){
+        $("#file_list_for_<%=tab.association.name%> .file-item[data-<%=tab.association.name%>-id]").each(function(){
           if($.inArray($(this).attr("data-<%=tab.association.name%>-id"),existing_ids)<0){
             new_ids.push($(this).attr("data-<%=tab.association.name%>-id"))
           }
         })
         for(var i in new_ids){
-          $("#<%=tab.association.name%>_form").append('<input type="hidden" class="<%=tab.association.name%>-ids" name="'+ids+'" value="'+new_ids[i]+'" />')
+          $(".tabs form:first").append('<input type="hidden" class="<%=tab.association.name%>-ids" name="'+ids+'" value="'+new_ids[i]+'" />')
         }
 
       }  

data/config/locales/en.yml

@@ -6,6 +6,13 @@ en:
     tabs:
       titles:
         files: "Files"
+      images:
+        edit: "Edit"
+        delete: "Delete"
+        back: "Back"
+        previous: "Previous"
+        next: "Next"
+        save: "Save"
     support:
       bytes:
         byte:
@@ -19,4 +26,6 @@ en:
           other: megabytes
         gigabyte:
           one: gigabyte
-          other: gigabytes
+          other: gigabytes
+    tinymce:
+      gallery: Gallery

data/config/locales/lv.yml

@@ -5,4 +5,13 @@ lv:
         "file too big": "fails par lielu (maksimums %{value} %{unit})"
     tabs:
       titles:
-        files: "Faili"
+        files: "Faili"
+      images:
+        edit: "Labot"
+        delete: "Dzēst"
+        back: "Atpakaļ"
+        previous: "Iepriekšējais"
+        next: "Nākamais"
+        save: "Saglabāt"
+    tinymce:
+      gallery: Galerija

data/lib/lolita-file-upload.rb

@@ -33,6 +33,15 @@ Lolita::Hooks.component(:"/lolita/configuration/tab/form").around do
   end
 end
 
+Lolita::Hooks.component(:"/lolita/configuration/field/string/text/display").around do
+  field = self.component_locals[:field]
+  if field.dbi.klass.lolita.tabs.by_type(:files)
+    self.render_component "lolita/configuration/field/string/text_gallery", :display, :field => field
+  else
+    let_content
+  end
+end
+
 require 'lolita-file-upload/module'
 
 if defined?(Rails)

data/lib/lolita-file-upload/configuration/tab/files.rb

@@ -14,6 +14,7 @@ module Lolita
         # And block.
   	  	def initialize(dbi,*args,&block)
           @type=:files
+          @dissociate = true
   	  		@filters=[]
           @dbi=dbi
           @editable_fields=[]

data/lib/lolita-file-upload/module.rb

@@ -1,6 +1,6 @@
 # append route
 Lolita.add_module Lolita::FileUpload, :nested=>true,:route=>lambda{|resource|
-  if resource.lolita.tabs.by_type(:files)
+  if resource && resource.respond_to?(:lolita) && resource.lolita.tabs.by_type(:files)
     return :file_upload
   end
 }

data/lolita-file-upload.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = "2011-12-29"
+  s.date = "2012-08-28"
   s.description = "File upload gem for Lolita with with fulll integration - models, controller, views"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -24,11 +24,17 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "app/assets/images/lolita/upload/delete-picture.png",
+    "app/assets/images/lolita/tinymce_gallery.png",
+    "app/assets/images/lolita/upload/back.png",
+    "app/assets/images/lolita/upload/delete.png",
     "app/assets/images/lolita/upload/edit.png",
+    "app/assets/images/lolita/upload/next.png",
+    "app/assets/images/lolita/upload/prev.png",
+    "app/assets/images/lolita/upload/save.png",
     "app/controllers/lolita/uploads_controller.rb",
     "app/models/lolita/upload/file.rb",
     "app/uploaders/file_uploader.rb",
+    "app/views/components/lolita/configuration/field/string/text_gallery/_display.html.haml",
     "app/views/components/lolita/configuration/tab/files/_cells.html.erb",
     "app/views/components/lolita/configuration/tab/files/_destroy.js.erb",
     "app/views/components/lolita/configuration/tab/files/_display.html.erb",
@@ -36,7 +42,9 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/tab/files/_file.html.erb",
     "app/views/components/lolita/configuration/tab/files/_fixed_gallery.html.haml",
     "app/views/components/lolita/configuration/tab/files/_form.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_image.html.erb",
     "app/views/components/lolita/configuration/tab/files/_list.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_list.js.erb",
     "app/views/components/lolita/configuration/tab/files/_list_form.html.erb",
     "app/views/components/lolita/configuration/tab/files/_row.html.erb",
     "app/views/components/lolita/configuration/tab/files/_update.js.erb",
@@ -103,12 +111,13 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/lolita/upload/plupload.full.js",
     "vendor/assets/stylesheets/lolita/upload/application_vendor.css",
     "vendor/assets/stylesheets/lolita/upload/jquery.ui.plupload.css.erb",
+    "vendor/assets/stylesheets/lolita/upload/lolita_file_upload.css.scss",
     "vendor/assets/stylesheets/lolita/upload/plupload.queue.css"
   ]
   s.homepage = "http://github.com/ithouse/lolita-file-upload"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.13"
+  s.rubygems_version = "1.8.24"
   s.summary = "File upload gem for Lolita CMS"
 
   if s.respond_to? :specification_version then
@@ -116,7 +125,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc.6"])
-      s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5.8"])
+      s.add_runtime_dependency(%q<carrierwave>, ["~> 0.6.0"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 0"])
       s.add_runtime_dependency(%q<jquery-rails>, [">= 1.0.12"])
       s.add_development_dependency(%q<cucumber>, ["~> 1.0"])
@@ -125,7 +134,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
     else
       s.add_dependency(%q<lolita>, ["~> 3.2.0.rc.6"])
-      s.add_dependency(%q<carrierwave>, ["~> 0.5.8"])
+      s.add_dependency(%q<carrierwave>, ["~> 0.6.0"])
       s.add_dependency(%q<mini_magick>, [">= 0"])
       s.add_dependency(%q<jquery-rails>, [">= 1.0.12"])
       s.add_dependency(%q<cucumber>, ["~> 1.0"])
@@ -135,7 +144,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<lolita>, ["~> 3.2.0.rc.6"])
-    s.add_dependency(%q<carrierwave>, ["~> 0.5.8"])
+    s.add_dependency(%q<carrierwave>, ["~> 0.6.0"])
     s.add_dependency(%q<mini_magick>, [">= 0"])
     s.add_dependency(%q<jquery-rails>, [">= 1.0.12"])
     s.add_dependency(%q<cucumber>, ["~> 1.0"])

data/vendor/assets/javascripts/lolita/upload/application_vendor.js

@@ -1,3 +1,13 @@
 //= require jquery-ui
 //= require lolita/upload/plupload.full
 //= require lolita/upload/jquery.ui.plupload
+//= require_self
+
+// $("#filelist .file-item .window").height(function(index, height){
+//   return ($("#content").width() - 10) * 0.3;
+// })
+//
+$(".file-editor .save").live("click", function() {
+  $(this).closest("form").submit();
+  return false;
+})

data/vendor/assets/stylesheets/lolita/upload/application_vendor.css

@@ -1,4 +1,5 @@
 /*
 *= require lolita/upload/jquery.ui.plupload
+*= require lolita/upload/lolita_file_upload
 
-*/
+*/

data/vendor/assets/stylesheets/lolita/upload/lolita_file_upload.css.scss

@@ -0,0 +1,64 @@
+#main #content .box .lolita-file-upload-form {padding: 20px 0 0 0;}
+
+.filelist {padding: 6% 1% 6% 6%; overflow: hidden;}
+.filelist .filelist-container {overflow: hidden;}
+.filelist .file-item {
+  float: left; 
+  width: 26%; 
+  margin-right: 5%; 
+  margin-bottom: 20px; 
+  padding: 1%; 
+  background-color: #e9e9e9; 
+  border-radius: 4px; 
+  -moz-border-radius: 4px; 
+  -webkit-border-radius: 4px; 
+  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+  -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+}
+.filelist .file-item .window {overflow: hidden; height: 200px; background: #f9f9f9; border: 3px solid #e9e9e9; 
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  position: relative;
+}
+.filelist .file-item .window:hover {border-color: #887bd4; height: 200px;}
+.filelist .file-item .window .links {display: none; position: absolute; top: 80px; padding: 10px 0; text-align: center; width: 100%; background: #f6f6f6;}
+.filelist .file-item .window .links .edit_link {margin-right: 10px; background: image-url("lolita/upload/edit.png") no-repeat left center; padding-left: 15px;}
+.filelist .file-item .window .links .delete_link {background: image-url("lolita/upload/delete.png") no-repeat left center; padding-left: 15px;}
+.filelist .file-item .window:hover .links {display: block;}
+.filelist .file-item img {max-width: 100%;}
+.filelist .file-item p {height: 40px; line-height: 20px; text-align: center; margin: 5px 0; color: #777;}
+
+#main #content .box .edit-file-form {}
+#main #content .box .edit-file-form .file-editor {
+  background: #e9e9e9;
+  padding: 20px 20px 10px 20px;
+  border-radius: 4px; 
+  -moz-border-radius: 4px; 
+  -webkit-border-radius: 4px; 
+  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+  -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
+}
+#main #content .box .edit-file-form .file-editor .editable-image {width: 35%; float: left;}
+#main #content .box .edit-file-form .file-editor .fields {width: 60%; float: right;}
+#main #content .box .edit-file-form .file-editor .fields label {width: 20%; display: inline-block;}
+#main #content .box .edit-file-form .file-editor .fields input,
+#main #content .box .edit-file-form .file-editor .fields textarea {width: 70%; border: 1px solid #cdcdcd; padding: 3px 10px; color: #494949;
+  border-radius: 4px; 
+  -moz-border-radius: 4px; 
+  -webkit-border-radius: 4px; 
+}
+#main #content .box .edit-file-form .file-editor .action-links {clear: both; padding-top: 20px; overflow: hidden;}
+#main #content .box .edit-file-form .file-editor .action-links .navigation {
+  float: left;
+  .back {margin-right: 15px; padding-left: 15px; background: image-url("lolita/upload/back.png") no-repeat left center;}
+  .previous {padding-left: 15px; margin-right: 10px; background: image-url("lolita/upload/prev.png") no-repeat left center}
+  .next {padding-right: 15px; background: image-url("lolita/upload/next.png") no-repeat right center}
+}
+#main #content .box .edit-file-form .file-editor .action-links .actions {
+  float: right;
+  .delete {padding-left: 15px; margin-right: 10px; background: image-url("lolita/upload/delete.png") no-repeat left center}
+  .save {padding-left: 15px; background: image-url("lolita/upload/save.png") no-repeat left center}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-29 00:00:00.000000000Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &80229970 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,31 @@ dependencies:
         version: 3.2.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *80229970
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0.rc.6
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &80229630 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *80229630
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &80229330 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80229330
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &80228910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *80228910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.12
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &80228570 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *80228570
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &80228090 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +102,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *80228090
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80227750 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +118,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *80227750
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80227430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +134,12 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *80227430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -116,11 +156,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/assets/images/lolita/upload/delete-picture.png
+- app/assets/images/lolita/tinymce_gallery.png
+- app/assets/images/lolita/upload/back.png
+- app/assets/images/lolita/upload/delete.png
 - app/assets/images/lolita/upload/edit.png
+- app/assets/images/lolita/upload/next.png
+- app/assets/images/lolita/upload/prev.png
+- app/assets/images/lolita/upload/save.png
 - app/controllers/lolita/uploads_controller.rb
 - app/models/lolita/upload/file.rb
 - app/uploaders/file_uploader.rb
+- app/views/components/lolita/configuration/field/string/text_gallery/_display.html.haml
 - app/views/components/lolita/configuration/tab/files/_cells.html.erb
 - app/views/components/lolita/configuration/tab/files/_destroy.js.erb
 - app/views/components/lolita/configuration/tab/files/_display.html.erb
@@ -128,7 +174,9 @@ files:
 - app/views/components/lolita/configuration/tab/files/_file.html.erb
 - app/views/components/lolita/configuration/tab/files/_fixed_gallery.html.haml
 - app/views/components/lolita/configuration/tab/files/_form.html.erb
+- app/views/components/lolita/configuration/tab/files/_image.html.erb
 - app/views/components/lolita/configuration/tab/files/_list.html.erb
+- app/views/components/lolita/configuration/tab/files/_list.js.erb
 - app/views/components/lolita/configuration/tab/files/_list_form.html.erb
 - app/views/components/lolita/configuration/tab/files/_row.html.erb
 - app/views/components/lolita/configuration/tab/files/_update.js.erb
@@ -195,6 +243,7 @@ files:
 - vendor/assets/javascripts/lolita/upload/plupload.full.js
 - vendor/assets/stylesheets/lolita/upload/application_vendor.css
 - vendor/assets/stylesheets/lolita/upload/jquery.ui.plupload.css.erb
+- vendor/assets/stylesheets/lolita/upload/lolita_file_upload.css.scss
 - vendor/assets/stylesheets/lolita/upload/plupload.queue.css
 homepage: http://github.com/ithouse/lolita-file-upload
 licenses:
@@ -211,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 803058995
+      hash: 3399707713405550945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: File upload gem for Lolita CMS