fullstack-admin 0.1.35 → 0.1.36

data/VERSION

@@ -1 +1 @@
-0.1.35
+0.1.36

data/app/assets/javascripts/support/file_input.js.coffee

@@ -0,0 +1,31 @@
+$(document).ready ->
+  $(".file-input-choose-file-button").live "click", ->
+    self = $(@)
+    
+    if self.hasClass("disabled")
+      return 0
+    
+    file_input = self.find("~ input[type='file']")
+    file_name_span = self.closest(".input").find(".file-input-attachment-filename")
+     
+    file_input.change ->
+      file_input_val = file_input.val()
+      file_name      = file_input_val.substring(file_input_val.lastIndexOf('/') + 1).substring(file_input_val.lastIndexOf('\\') + 1)
+      file_name_span.text(file_name)
+
+    file_input.click()
+    
+  $(".file-input-delete-attachment-button").live "click", ->
+    
+    btn = $(@)
+    input_container = btn.closest(".input")
+    
+    if btn.hasClass("active")
+      input_container.find(".btn:not(.file-input-delete-attachment-button)").addClass("disabled")
+      btn.siblings(".file-input-attachment-filename").css({"text-decoration": "line-through", opacity: 0.5})
+      btn.find("~ .file-input-delete-attachment-checkbox").attr('checked', true);
+    else
+      input_container.find(".btn:not(.file-input-delete-attachment-button)").removeClass("disabled")
+      btn.siblings(".file-input-attachment-filename").css({"text-decoration": "none", opacity: 1})
+      btn.find("~ .file-input-delete-attachment-checkbox").attr('checked', false);
+      

data/app/assets/javascripts/support/forms.js.coffee

@@ -11,6 +11,8 @@
 #= require jquery.validate
 #= require ckeditor/init
 #= require support/nested_forms
+#= require support/file_input
+
 ## require jquery.form
 
 

data/app/assets/stylesheets/admin/base.css

@@ -17,6 +17,21 @@
   padding-bottom: 180px;
 }
 
+.sidenav > li:first-child {
+-webkit-border-radius: 6px 6px 0 0;
+-moz-border-radius: 6px 6px 0 0;
+border-radius: 6px 6px 0 0;
+}
+.sidenav > li {
+display: block;
+margin: 0 0 -1px;
+padding: 8px 14px;
+border: 1px solid #E5E5E5;
+margin-left: -15px;
+margin-right: -15px;
+}
+
+
 .thumbnails > li {
   float: left;
   margin-left: 0 !important;

data/app/assets/stylesheets/support/forms.css

@@ -215,4 +215,18 @@ select,
 .boolean > .input label {
   display: inline-block;
   margin-left: 10px;
+}
+
+ul.choices-group {
+list-style-type: none;
+}
+
+.radio {
+padding-left: 0;
+}
+
+.file-input-attachment-filename {
+  width: 200px;
+  display: inline-block;
+  overflow: hidden;
 }

data/app/controllers/admin/base_controller.rb

@@ -26,7 +26,8 @@ class Admin::BaseController < ApplicationController
                 :collection_name,
                 :current_resource_class,
                 :current_resource, 
-                :current_collection
+                :current_collection,
+                :title_column
 
 
   def current_resource_class
@@ -53,4 +54,10 @@ class Admin::BaseController < ApplicationController
     instance_variable_get("@#{collection_name}")
   end
   
+  def title_column(model)
+    @_title_columns ||= {}
+    @_title_columns[model] ||= ( model.column_names.map{ |c| c.to_s } & %W(title name label browser_title seo_title seo_name key claim email) ).first
+  end
+  
+  
 end

data/app/helpers/admin_form_helper.rb

@@ -55,16 +55,7 @@ module AdminFormHelper
       except_attributes.map! {|a| :"#{a}"}
               
       columns = model.schema.hierarchy_field_names.map! {|a| :"#{a}"}
-      
-      if only_attributes.any?
-        columns = columns.select {|k| only_attributes.include?(k)}
-      elsif except_attributes.any?
-        columns = columns.delete_if {|k| except_attributes.include?(k)}
-      end
-
-
-      buff = ""
-      
+    
       attachment_definitions = (model.attachment_definitions || {}).keys
       attachment_columns = attachment_definitions.map {|a|
         [:"#{a}_file_name", :"#{a}_file_size", :"#{a}_content_type", :"#{a}_updated_at"]
@@ -72,8 +63,15 @@ module AdminFormHelper
       
       columns -= attachment_columns
       columns += attachment_definitions
-            
       
+      if only_attributes.any?
+        columns = columns.select {|k| only_attributes.include?(k)}
+      elsif except_attributes.any?
+        columns = columns.delete_if {|k| except_attributes.include?(k)}
+      end
+
+      buff = ""
+        
       columns.each {|k|
         k = "#{k}".gsub(/_ids?$/, "").gsub(/_type$/, "").to_sym
         assoc = model.reflect_on_association(k) 

data/app/helpers/scaffold_helper.rb

@@ -42,12 +42,6 @@ module ScaffoldHelper
       model.columns_hash["position"]
     end
     
-    def title_column(model)
-      @_title_columns ||= {}
-      @_title_columns[model] ||= ( model.column_names.map{ |c| c.to_s } & %W(title name label browser_title seo_title seo_name key claim email) ).first
-    end
-    
-    
     def skip_filter!
       @skip_filter = true
     end

data/app/inputs/file_input.rb

@@ -0,0 +1,67 @@
+class FileInput < FormtasticBootstrap::Inputs::FileInput
+  def to_html
+    generic_input_wrapping do
+      attachment = object.send(method)
+      
+      if !attachment.exists?
+        <<-eos
+          <span class="file-input-attachment-filename">
+            <i class="icon icon-file"></i> (#{I18n.t('fullstack.admin.no_file_uploaded', :default => "No file uploaded")})
+          </span> 
+        
+          <a class="btn btn-small file-input-choose-file-button" href="javascript:void(0)">
+            <i class="icon icon-upload"></i>
+            #{I18n.t('fullstack.admin.choose_a_file', :default => "Choose a file")}
+          </a>
+        eos
+      
+      else
+        preview_menu = ""
+        
+        preview_menu << template.content_tag(:li, template.link_to(I18n.t('fullstack.admin.original', :default => "Original"), 
+        attachment.url(:original),
+        :target => "_blank"
+        
+        ))
+        
+        preview_menu << template.content_tag(:li, "", :class => :divider) if !attachment.styles.empty?
+        
+        attachment.styles.map do |name, decl|
+          preview_menu << template.content_tag(:li,  template.link_to(name.to_s.humanize, attachment.url(name), :target => "_blank"))
+        end
+
+        <<-eos
+        
+        <span  class="file-input-attachment-filename"><i class="icon icon-file"></i> #{template.send(:html_escape, attachment.url.split("/").last.split("?").first)} </span> 
+        <a class="btn btn-small file-input-choose-file-button" href="javascript:void(0)">
+          <i class="icon icon-upload"></i>
+          #{I18n.t('fullstack.admin.change', :default => "Change")}
+        </a>
+        
+        <span class="dropdown">
+          <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#">
+            <i class="icon icon-eye-open"></i>
+            #{I18n.t('fullstack.admin.preview', :default => "Preview")}
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu">
+            #{preview_menu}
+          </ul>
+        
+        </span>
+        
+        #{template.button(
+          I18n.t('fullstack.admin.delete', :default => "Delete"),
+          "javascript:void(0)",
+          :type => :danger, :class => "file-input-delete-attachment-button btn-small", :"data-toggle" => :button
+          )}
+        
+        eos
+      
+      end.html_safe << builder.file_field(method, :style => "display:none;") << (builder.check_box("#{method}_delete", :class => "file-input-delete-attachment-checkbox", :style => "display:none;") if attachment.exists?)
+    end
+  end
+end
+
+
+        

data/app/views/admin/base/_associated_resources_table.html.erb

@@ -22,7 +22,7 @@
    
   </table>
   
-  <script type="text/html" charset="utf-8" class="resource-fields-template">
+  <script type="text/html" class="resource-fields-template">
     <%= f.admin_fields_for(association, association_class.new, :child_index => "___index___") do |f| %>
       <%= render :partial => "nested_form", :locals => {:index => "___index___", :f => f, :resource_name => resource_name, :association => association} %>
     <% end %>

data/app/views/admin/base/_nested_form.html.erb

@@ -36,7 +36,13 @@
         </h3>
       </div>
       <div class="modal-body">
-        <%= f.resource_inputs %>
+        
+        <% begin %>
+        <%= render :partial => "admin/#{association}/associated_fields", :locals => {:f => f} %>
+        <% rescue ActionView::MissingTemplate %>
+          <%= f.resource_inputs %>
+        <% end %>
+        
         <%= f.hidden_field(:_destroy, :class => "destroy-associated-resource") %>
         <% if positionable?(f.object) %>
         <%= f.hidden_field(:position, :class => "associated-resource-position") %>

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

@@ -37,7 +37,8 @@
     
     <% end %>
   <% end %>
-
+  
+ 
   <%= javascript_include_tag 'admin/admin' %>
   <%= yield :javascripts %>
 

data/config/locales/it.yml

@@ -21,9 +21,14 @@ it:
       upload: "Carica"
       ago: "fa"
       ok: "Ok"
+      manual_entry: "Inserimento manuale"
       this_record_contains_some_errors: "Questa linea contiene alcuni errori"
       new_record: "nuovo"
       drag_to_sort_items: "Trascina per ordinare gli elementi"
+      no_file_uploaded: "Nessun file caricato"
+      choose_a_file: "Carica"
+      change: "Cambia"
+      preview: "Anteprima"
       
       form:
         correct_these_errors_and_retry: "Correggi questi errori e riprova"

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.35"
+  s.version = "0.1.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-25"
+  s.date = "2012-08-30"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -931,6 +931,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/support/base.js.coffee",
     "app/assets/javascripts/support/bootstrap.js.coffee",
     "app/assets/javascripts/support/facebox.js.coffee",
+    "app/assets/javascripts/support/file_input.js.coffee",
     "app/assets/javascripts/support/forms.js.coffee",
     "app/assets/javascripts/support/gmap.js.coffee",
     "app/assets/javascripts/support/nested_forms.js.coffee",
@@ -959,7 +960,7 @@ Gem::Specification.new do |s|
     "app/inputs/country_input.rb",
     "app/inputs/daterange_input.rb",
     "app/inputs/datetime_input.rb",
-    "app/inputs/image_input.rb",
+    "app/inputs/file_input.rb",
     "app/inputs/iso3166.rb",
     "app/inputs/markup_input.rb",
     "app/inputs/simple_markup_input.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1189,6 +1189,7 @@ files:
 - app/assets/javascripts/support/base.js.coffee
 - app/assets/javascripts/support/bootstrap.js.coffee
 - app/assets/javascripts/support/facebox.js.coffee
+- app/assets/javascripts/support/file_input.js.coffee
 - app/assets/javascripts/support/forms.js.coffee
 - app/assets/javascripts/support/gmap.js.coffee
 - app/assets/javascripts/support/nested_forms.js.coffee
@@ -1217,7 +1218,7 @@ files:
 - app/inputs/country_input.rb
 - app/inputs/daterange_input.rb
 - app/inputs/datetime_input.rb
-- app/inputs/image_input.rb
+- app/inputs/file_input.rb
 - app/inputs/iso3166.rb
 - app/inputs/markup_input.rb
 - app/inputs/simple_markup_input.rb
@@ -1328,7 +1329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4441352441936102106
+      hash: -2718455350685329463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/inputs/image_input.rb

@@ -1,11 +0,0 @@
-class ImageInput < Formtastic::Inputs::FileInput
-  
-
-  def to_html
-    raise "not implemented yet"
-    # generic_input_wrapping do
-    #   builder.file_field(method, input_html_options)
-    # end
-  end
-
-end