ideyabox 0.1.0 → 0.1.2

data/app/assets/javascripts/default.js

@@ -8,6 +8,7 @@
 //= require jquery.ui.nestedSortable
 //= require chosen.jquery.js
 
+//
 $(document).ready(function(){
   $(".chosen_select").chosen();
   $('.pagination').hide();
@@ -17,7 +18,7 @@ $(document).ready(function(){
     return false;
   });
 
-  $('.visibility a').live('click', function(e){
+  $('.visibility a, .toggleshow').live('click', function(e){
     e.preventDefault();
     $(this).find('i').toggleClass('icon-eye-open').toggleClass('icon-eye-close not-work');
     
@@ -32,4 +33,28 @@ $(document).ready(function(){
     });
     e.preventDefault();
   });
+
+  $('.image_upload_form form').fileupload({
+      dataType: "script",
+      add: function (e, data) {
+        types = /(\.|\/)(gif|jpe?g|png)$/i;
+        file = data.files[0];
+        if (types.test(file.type) || types.test(file.name)) {
+          data.context = $(tmpl("template-upload", data.files[0]));
+          $(".image_upload_form form").append(data.context);
+          data.submit();
+        } else {
+          alert(file.name + " is not a gif, jpeg, ot png image file");
+        }
+      },
+      progress: function (e, data) {
+        if (data.context !== null) {
+          progress = parseInt(data.loaded / data.total * 100, 10);
+          data.context.find('.bar').css('width', progress + '%');
+        }
+      },
+      done: function (e, data) {
+        data.context.html('<span>Загрузка файла <strong>\'' + file.name + '\'</strong> завершена.</span>');
+      }
+  });
 });

data/app/assets/stylesheets/default.scss.erb

@@ -16,7 +16,7 @@ $active_color:#C4FFCB;
 $border_color:#d4d4d4;
 $shadows: rgb(150,150,150);
 
-html {overflow-y:scroll;}
+html {overflow-y:scroll;width: 100%;}
 body {width: 100%; 
   background: $bodycolor url(<%= asset_path 'admin/background-image.png' %>);
 
@@ -62,6 +62,7 @@ a.del {
   border-radius: 20px;
   background:$deepgreen;
 }
+form {width:100%;}
 table {
   width:100%;
   border-collapse:collapse;
@@ -69,6 +70,7 @@ table {
 
   tr {
     //&:first-child {border-top:1px solid $border_color;}
+    width:100%;
     border-top:1px solid $border_color;
     border-bottom:1px solid $border_color;
   }
@@ -160,7 +162,15 @@ ul.horizontal_items {
     span {display:none;}
   }
 }
-
+textarea {
+  width:100%;
+}
+img {
+  max-width:100%;
+}
+.clear {
+  clear:both;
+}
 #launchbar {
   background: $deepgreen;overflow: hidden;position: relative;text-align: left;z-index: 9999;padding: 0 3%;
   -webkit-box-shadow: 0 0 5px $shadows;
@@ -407,4 +417,66 @@ html.login {
     margin:0 0 5px 0;
     input {width:100%}
   }
+}
+@mixin gradient($top, $bottom) {
+  background: $top;
+  background: -moz-linear-gradient(top, $top 0%, $bottom 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$top), color-stop(100%,$bottom)); 
+  background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); 
+  background: -o-linear-gradient(top, $top 0%,$bottom 100%); 
+  background: -ms-linear-gradient(top, $top 0%,$bottom 100%);
+  background: linear-gradient(to bottom, $top 0%,$bottom 100%); 
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5eb6ff', endColorstr='#006ed6',GradientType=0 );
+}
+.image-list li{
+  display:inline-block;
+  width:47%;
+  margin:3px 0.5%;
+  padding:0;
+  position:relative;
+  border:1px solid grey;
+  .image_control_panel {
+    position:absolute;
+    bottom:0;
+    height:2.5em;
+    background:rgba(255,255,255,0.7);
+    width:100%;
+  }
+  img {width:100%;}
+  a {
+    &.delete_image {
+      color:#000;
+      position:absolute;
+      right:0;
+      bottom:0;
+      &:hover {
+        color:red;
+      }
+    }
+    &.toggleshow {
+      color:#000;
+      position:absolute;
+      left:0;
+      bottom:0;
+      .icon-eye-close {
+        color:#000;
+      }
+      &:hover {
+        color:#53B75F;
+      }      
+    }
+  }
+}
+
+.upload {
+  strong {color:#1B7726;}
+  margin-bottom:0.5em;
+}
+.progress {
+  border:1px solid grey;
+  background:#E6E6E6;
+}
+.bar {
+  @include gradient(#53B75F, #1B7726);
+  height: 10px;
 }

data/app/helpers/admin_helper.rb

@@ -37,11 +37,11 @@ module AdminHelper
     url_for :only_path => false, :params => params.merge(overwrite)
   end
 
-  def photo_sortable
+    def image_sortable
     %Q{
       <script type="text/javascript">
         $(document).ready(function() {
-          $('#photo-list').sortable( {
+          $('.image-list').sortable( {
             start: function(){$(this).find("a:not(.del)").unbind("click")},
             stop: function(){lightBox.reload()},            
             dropOnEmpty: false,
@@ -52,9 +52,9 @@ module AdminHelper
             update: function() {
               $.ajax( {
                 type: 'post',
-                data: $('#photo-list').sortable('serialize') + '&authenticity_token=#{u(form_authenticity_token)}',
+                data: $('.image-list').sortable('serialize') + '&authenticity_token=#{u(form_authenticity_token)}',
                 dataType: 'script',
-                url: '#{sort_admin_content_images_path(:auth_token => current_user.authentication_token)}'})
+                url: '#{sort_admin_post_images_path(:auth_token => current_user.authentication_token)}'})
               }
             });
           });
@@ -62,49 +62,32 @@ module AdminHelper
     }.gsub(/[\n ]+/, ' ').strip.html_safe
   end
 
-def content_images_uploadify(resource)
-    url = ""
-    url = "#{admin_content_images_path(:auth_token => current_user.authentication_token)}"
-    datatype = 'content_image[image]'
-    session_key_name = Rails.application.config.session_options[:key]
-    %Q{
-    <script type='text/javascript'>
-        $('#photo_upload').uploadify({
-          script          : '#{raw(url)}',
-          fileDataName    : '#{datatype}',
-          uploader        : '/assets/uploadify/uploadify.swf',
-          cancelImg       : '/assets/uploadify/cancel.png',
-          fileDesc        : 'Images',
-          fileExt         : '*.png;*.jpg;*.gif',
-          sizeLimit       : #{10.megabytes},
-          queueSizeLimit  : 24,
-          multi           : true,
-          auto            : true,
-          buttonText      : 'Add photo',
-          buttonImg       : '/assets/admin/addphoto.png',
-          width           : 202,
-          height          : 42,
-          scriptData      : {
-            '_http_accept': 'application/javascript',
-            '#{session_key_name}' : encodeURIComponent('#{u(cookies[session_key_name])}'),
-            'authenticity_token'  : encodeURIComponent('#{u(form_authenticity_token)}'),
-            'content_id'  : encodeURIComponent('#{resource.slug}')
-          },
-          onComplete      : function(a, b, c, response){ eval(response); },
-          onError : function (a, b, c, d) {
-         if (d.status == 404)
-            alert('Could not find upload script. Use a path relative to: '+'<?= getcwd() ?>');
-         else if (d.type === "HTTP")
-            console.log(d);
-         else if (d.type ==="File Size")
-            alert(c.name+' '+d.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB');
-         else
-            alert('error '+d.type+": "+d.text);
-}
-        });
-    </script>
+  def upload_form(parent, image)
+    new_image = image.new
+    undercored_image = image.to_s.underscore
+    form_for [:admin, parent, new_image], :id => "upload_form" do |f|
+      f.file_field :image, multiple: true, name: "#{undercored_image}[image]"
+    end
+  end
 
-    }.gsub(/[\n ]+/, ' ').strip.html_safe
+  def upload_script
+    html = ''
+    html << "<script id='template-upload' type=\"text/x-tmpl\">"
+    html <<  "<div class='upload'>"
+    html << '{%= o.name %}'
+    html << "<div class='progress'>"
+    html <<  "<div class='bar' style=\"width: 0%\">"
+    html <<  "</div></div></div></script>"
+    return raw html
   end
 
+  def uploader(parent, image)
+    html = ''
+    html << "#{upload_form(parent, image)}"
+    html << "#{upload_script}"
+    return raw html
+  end
+
+
+
 end

data/ideyabox.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "kaminari"
   gem.add_dependency "haml", ">= 3.1.6"
   gem.add_dependency "devise"
+  gem.add_dependency "jquery-fileupload-rails"
   gem.add_dependency "mini_magick"
   gem.add_dependency "sexy_validators", ">=0.0.5"
   gem.add_development_dependency "haml-rails", ">= 0.3.4"

data/lib/generators/ideyabox/admin/admin_generator.rb

@@ -31,7 +31,9 @@ module Ideyabox
         gem_group :development do
           gem 'haml-rails'
         end
-
+        gem_group :assets do
+          gem "jquery-fileupload-rails"
+        end
         inside Rails.root do
           run "bundle install"
         end

data/lib/generators/ideyabox/admin/templates/locales/ru.yml

@@ -6,7 +6,7 @@ ru:
   flash:
     notice:
       was_added: "добавлен"
-      was_edited: "обновлен"
+      was_updated: "обновлен"
       was_deleted: "удален"
   confirm:
     delete: "Точно удалить?"

data/lib/generators/ideyabox/admin/templates/views/layouts/admin.html.haml

@@ -27,6 +27,7 @@
             = yield(:page_sidebar)
           #content
             = yield
+          .clear
     #previews
       = yield(:preview)
     = debug(params) if Rails.env == "development"

data/lib/generators/ideyabox/images_scaffold/images_scaffold_generator.rb

@@ -0,0 +1,182 @@
+require 'rails/generators'
+require 'rails/generators/generated_attribute'
+
+module Ideyabox
+  module Generators
+    class ImagesScaffoldGenerator < ::Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      argument :controller_path,    :type => :string
+      argument :model_name,         :type => :string, :required => false
+      argument :layout,             :type => :string, :default => "application",
+                                    :banner => "Specify application layout"
+
+      def initialize(args, *options)
+        super(args, *options)
+        initialize_views_variables
+      end
+
+      def copy_views
+        generate_views
+      end
+
+      def add_locale_templates
+        add_to_locales
+      end
+
+      def add_resources_and_root
+        add_resource_route
+      end
+
+      def add_to_parent_view
+        final_string = "\n- content_for(:page_sidebar) do\n  - unless @#{parent_name}.new_record?\n    = render 'admin/#{plural_resource_name}/#{plural_resource_name}'\n"
+
+        inject_into_file "app/views/admin/#{plural_parent_name}/edit.html.haml", final_string, :before => "- content_for :page_header do"
+
+      end
+
+      def updating_models
+        inject_into_file "app/models/#{parent_name}.rb", "\n  has_many :#{plural_resource_name}", :after => "class #{parent_name.capitalize} < ActiveRecord::Base"   
+        inject_into_file "app/models/#{resource_name}.rb", "\n  belongs_to :#{parent_name}\n  mount_uploader :image, #{@model_name.demodulize}Uploader", :after => "class #{@model_name.demodulize} < ActiveRecord::Base"      
+      end
+
+      protected
+
+      def initialize_views_variables
+        @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
+        @controller_routing_path = @controller_file_path.gsub(/\//, '_')
+        @model_name = @controller_class_nesting + "::#{@base_name.singularize.camelize}" unless @model_name
+        @model_name = @model_name.camelize
+      end
+
+      def controller_routing_path
+        @controller_routing_path
+      end
+
+      def singular_controller_routing_path
+        @controller_routing_path.singularize
+      end
+
+      def model_name
+        @model_name
+      end
+
+      def plural_model_name
+        @model_name.pluralize
+      end
+
+      def resource_name
+        @model_name.demodulize.underscore
+      end
+
+      def parent_name
+        resource_name.split("_").first
+      end
+
+      def plural_parent_name
+        parent_name.pluralize
+      end     
+
+      def plural_resource_name
+        resource_name.pluralize
+      end
+
+      def sort_priority(column_name)
+        case column_name
+        when "position" then 1
+        when "visible" then 2
+        when "name" then 3
+        when "title" then 3
+        else 5
+        end
+      end
+
+      def columns
+        begin
+          excluded_column_names = %w[id created_at updated_at]
+          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.sort{|a, b| sort_priority(a.name) <=> sort_priority(b.name)}.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+        rescue NoMethodError
+          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+        end
+      end
+      
+      def column_names
+        @model_name.constantize.column_names
+      end
+
+      def extract_modules(name)
+        modules = name.include?('/') ? name.split('/') : name.split('::')
+        name    = modules.pop
+        path    = modules.map { |m| m.underscore }
+        file_path = (path + [name.underscore]).join('/')
+        nesting = modules.map { |m| m.camelize }.join('::')
+        [name, path, file_path, nesting, modules.size]
+      end
+
+      def generate_views
+        views = {
+          "views/edit.html.#{ext}"            => "app/views/admin/#{@controller_file_path}/edit.html.#{ext}",
+          "views/_image.html.#{ext}"          => "app/views/admin/#{@controller_file_path}/_#{resource_name}.html.#{ext}",
+          "views/_images.html.#{ext}"          => "app/views/admin/#{@controller_file_path}/_#{plural_resource_name}.html.#{ext}",
+          "views/create.js.haml"          => "app/views/admin/#{@controller_file_path}/create.js.haml",
+          "views/destroy.js.haml"          => "app/views/admin/#{@controller_file_path}/destroy.js.haml",
+          "uploader.rb"          => "app/uploaders/#{resource_name}_uploader.rb"
+
+        }
+        views.delete("_sort_buttons.html.#{ext}") unless column_names.include?("position")
+        selected_views = views
+        options.engine == generate_erb(selected_views)
+      end
+
+      def generate_erb(views)
+        views.each do |template_name, output_path|
+          template template_name, output_path
+        end
+        generate_controller
+      end
+
+      def ext
+        :haml
+      end
+
+      def generate_controller
+        template "controllers/controller.rb", "app/controllers/admin/#{plural_resource_name}_controller.rb"
+      end
+
+      def add_resource_route
+        resources_string = "\n    resources :#{plural_resource_name} do\n"
+        sort_string = "      post \"sort\", :on => :collection\n"
+        toggleshow_string = "      get \"toggleshow\", :on => :member\n"
+        
+        if column_names.include?("visible") && column_names.include?("position")
+          final_string = "#{resources_string}#{sort_string}#{toggleshow_string}    end\n"
+        elsif column_names.include?("visible")
+          final_string = "#{resources_string}#{toggleshow_string}    end\n"
+        elsif column_names.include?("position")
+          final_string = "#{resources_string}#{sort_string}    end\n"
+        else
+          final_string = "\n    resources :#{plural_resource_name}\n"
+        end
+
+        inject_into_file "config/routes.rb", final_string, :after => "\n  namespace :admin do\n"
+        inject_into_file "config/routes.rb", "\n      resources :#{plural_resource_name}\n", :after => "\n    resources :#{plural_parent_name} do"
+      end
+
+      def add_to_locales
+        locales = [:ru, :en]
+        
+        attributes = column_names.collect {|column| "        #{column}: \"#{column}\"\n"}
+
+        attributes_string = "      #{resource_name}:\n#{attributes.join}"
+
+        locales.each do |locale|
+          inject_into_file "config/locales/#{locale}.yml", "      #{resource_name}: \"#{resource_name}\"\n", :after => "models:\n"
+          inject_into_file "config/locales/#{locale}.yml", attributes_string, :after => "attributes:\n"
+        end
+      end
+
+
+
+
+    end
+  end
+end

data/lib/generators/ideyabox/images_scaffold/templates/controllers/controller.rb

@@ -0,0 +1,45 @@
+#coding: utf-8
+class Admin::<%= @model_name.demodulize.pluralize -%>Controller < Admin::ApplicationController
+
+<%- if column_names.include?("visible") -%>
+  def toggleshow
+    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    @<%= plural_resource_name %>.toggle(:visible)
+    @<%= plural_resource_name %>.save
+    render :nothing => true
+  end
+<%- end -%><%- if column_names.include?("position") -%>
+  def sort
+    params[:<%= resource_name %>].each_with_index do |id, idx|
+      @<%= resource_name %> = <%= @model_name.demodulize -%>.find(id)
+      @<%= resource_name %>.position = idx
+      @<%= resource_name %>.save
+    end
+    render :nothing => true
+  end
+  <%- end -%>
+  
+  def edit
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+  end
+  
+  def create
+    @<%= parent_name %> = <%= parent_name.capitalize -%>.find(params[:<%= parent_name %>_id])
+    @<%= resource_name %> = @<%= parent_name %>.<%= plural_resource_name %>.create(params[:<%= resource_name %>])
+  end
+
+  def update
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    if @<%= resource_name %>.update_attributes(params[:<%= resource_name %>])
+      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_updated'}"
+    else
+      render 'edit'
+    end
+  end
+  
+  def destroy
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    @<%= resource_name %>.destroy
+  end
+
+end

data/lib/generators/ideyabox/images_scaffold/templates/uploader.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+class <%= @model_name.demodulize %>Uploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+
+  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
+  # include Sprockets::Helpers::RailsHelper
+  # include Sprockets::Helpers::IsolatedHelper
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  version :admin_mini do
+    process :resize_to_fill => [160, 100]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    %w(jpg jpeg gif png)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

data/lib/generators/ideyabox/images_scaffold/templates/views/_image.html.haml

@@ -0,0 +1,10 @@
+%li{:id => "<%= resource_name %>_#{<%= resource_name %>.id}"}
+  = link_to [:edit, :admin, @<%= parent_name %>, <%= resource_name %>] do
+    = image_tag(<%= resource_name %>.image_url(:admin_mini), :class=>"admin_mini")
+  .image_control_panel
+    = link_to [:admin, @<%= parent_name %>, <%= resource_name %>], :remote => true, :method => :delete, :confirm => "#{t 'confirm.delete'}", :class=>'delete_image' do
+      %i{:class => "icon-trash icon-large"}
+    <%- if column_names.include?("visible") %>
+    = link_to [:toggleshow, :admin, <%= resource_name %>], :remote => true, :class=>'toggleshow' do
+      %i{:class => (<%= resource_name %>.visible? ? "icon-eye-open icon-large" : "icon-eye-close icon-large not-work")}
+    <% end %>

data/lib/generators/ideyabox/images_scaffold/templates/views/_images.html.haml

@@ -0,0 +1,8 @@
+%h2 Галерея изображений
+.image-list#<%=plural_resource_name%>
+  = render @<%=parent_name%>.<%=plural_resource_name%>
+  = image_sortable
+
+.image_upload_form.bordered_box
+  %h3 Загрузить изображения
+  = uploader(@<%=parent_name%>, <%=@model_name.demodulize%>)

data/lib/generators/ideyabox/images_scaffold/templates/views/create.js.haml

@@ -0,0 +1,4 @@
+- if @<%= resource_name %>.new_record?
+  alert("Failed to uploading")
+- else
+  $("#<%=plural_resource_name %>").append("#{j render(@<%=resource_name %>)}")

data/lib/generators/ideyabox/images_scaffold/templates/views/destroy.js.haml

@@ -0,0 +1 @@
+$("#<%= resource_name %>_#{@<%= resource_name %>.id}").remove();

data/lib/generators/ideyabox/images_scaffold/templates/views/edit.html.haml

@@ -0,0 +1,29 @@
+- content_for :page_header do
+  %p= link_to t('back'), [:edit, :admin, @<%=resource_name%>.<%= parent_name %>], :class => "bright_link"
+  %h1
+    - if @<%=resource_name%>.new_record?
+      = "#{t 'add'} #{<%= @model_name.demodulize %>.model_name.human}"
+    - else
+      = "#{t 'edit'} #{<%= @model_name.demodulize %>.model_name.human}"
+
+= form_for [:admin, @<%=resource_name%>.<%= parent_name %>, @<%=resource_name%>] do |f|
+  - if @<%=resource_name%>.errors.any?
+    #error_explanation
+      %h2= "#{t 'save_errors'}: #{@<%=resource_name%>.errors.count}"
+      %ul
+        - @<%=resource_name%>.errors.full_messages.each do |msg|
+          %li= msg
+  %table
+    %tr
+      %th{colspan: 2}
+        - if @<%=resource_name%>.image && @<%=resource_name%>.image_url
+          = image_tag @<%=resource_name%>.image_url
+          %br
+          Выберите другое изображение
+          %br
+    %tr
+      %th= f.label :image
+      %td= f.file_field :image    
+  
+  .actions
+    = f.submit t('save')

data/lib/generators/ideyabox/scaffold/templates/_index.html.haml

@@ -5,7 +5,7 @@
       <%- if column.name=='position' || column.name=='visible'-%>
       %th{:class => <%= (column.name=='position') ? "\'position\'" : "\'visibility\'" %>}
       <%- else -%>
-      <%= "%th= sortable_columns \"#{column.name}\", #{resource_name.capitalize}.human_attribute_name(\"#{column.name}\")" %>
+      <%= "%th= sortable_columns \"#{column.name}\", #{@model_name.demodulize}.human_attribute_name(\"#{column.name}\")" %>
       <%- end -%>
       <%- end -%>
       %th

data/lib/generators/ideyabox/scaffold/templates/controllers/controller.rb

@@ -1,9 +1,9 @@
 #coding: utf-8
-class Admin::<%= plural_resource_name.capitalize -%>Controller < Admin::ApplicationController
+class Admin::<%= @model_name.demodulize.pluralize -%>Controller < Admin::ApplicationController
   helper_method :sort_column, :sort_direction
 <%- if column_names.include?("visible") -%>
   def toggleshow
-    @<%= plural_resource_name %> = <%= resource_name.capitalize -%>.find(params[:id])
+    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
     @<%= plural_resource_name %>.toggle(:visible)
     @<%= plural_resource_name %>.save
     render :nothing => true
@@ -11,7 +11,7 @@ class Admin::<%= plural_resource_name.capitalize -%>Controller < Admin::Applicat
 <%- end -%><%- if column_names.include?("position") -%>
   def sort
     params[:<%= resource_name %>].each_with_index do |id, idx|
-      @<%= resource_name %> = <%= resource_name.capitalize -%>.find(id)
+      @<%= resource_name %> = <%= @model_name.demodulize -%>.find(id)
       @<%= resource_name %>.position = idx
       @<%= resource_name %>.save
     end
@@ -19,46 +19,46 @@ class Admin::<%= plural_resource_name.capitalize -%>Controller < Admin::Applicat
   end
   <%- end -%>
   def index
-    @<%= plural_resource_name %> = <%= resource_name.capitalize -%>.order(sort_column + " " + sort_direction)
+    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.order(sort_column + " " + sort_direction)
   end
   
   def new
-    @<%= resource_name %> = <%= resource_name.capitalize -%>.new
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.new
     render 'edit'
   end
   
   def edit
-    @<%= resource_name %> = <%= resource_name.capitalize -%>.find(params[:id])
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
   end
   
   def create
-    @<%= resource_name %> = <%= resource_name.capitalize -%>.new(params[:<%= resource_name %>])
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.new(params[:<%= resource_name %>])
     if @<%= resource_name %>.save
-      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= resource_name.capitalize %>.model_name.human} #{t 'flash.notice.was_added'}"
+      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_added'}"
     else
       render 'edit'
     end
   end
 
   def update
-    @<%= resource_name %> = <%= resource_name.capitalize -%>.find(params[:id])
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
     if @<%= resource_name %>.update_attributes(params[:<%= resource_name %>])
-      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= resource_name.capitalize %>.model_name.human} #{t 'flash.notice.was_updated'}"
+      redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_updated'}"
     else
       render 'edit'
     end
   end
   
   def destroy
-    @<%= resource_name %> = <%= resource_name.capitalize -%>.find(params[:id])
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
     @<%= resource_name %>.destroy
-    redirect_to admin_<%= plural_resource_name %>_path, :alert => "#{<%= resource_name.capitalize %>.model_name.human} #{t 'flash.notice.was_deleted'}"
+    redirect_to admin_<%= plural_resource_name %>_path, :alert => "#{<%= @model_name.demodulize %>.model_name.human} #{t 'flash.notice.was_deleted'}"
   end
 
   private
 
   def sort_column
-    <%= resource_name.capitalize -%>.column_names.include?(params[:sort]) ? params[:sort] : <%= column_names.include?("position") ? "\'position\'" : "\'created_at\'" %>
+    <%= @model_name.demodulize -%>.column_names.include?(params[:sort]) ? params[:sort] : <%= column_names.include?("position") ? "\'position\'" : "\'created_at\'" %>
   end
   
   def sort_direction

data/lib/generators/ideyabox/scaffold/templates/edit.html.haml

@@ -2,9 +2,9 @@
   %p= link_to t('back'), admin_<%= controller_routing_path %>_path, :class => "bright_link"
   %h1
     - if @<%= resource_name %>.new_record?
-      = "#{t 'add'} #{<%= resource_name.capitalize %>.model_name.human}"
+      = "#{t 'add'} #{<%= @model_name.demodulize %>.model_name.human}"
     - else
-      = "#{t 'edit'} #{<%= resource_name.capitalize %>.model_name.human}"
+      = "#{t 'edit'} #{<%= @model_name.demodulize %>.model_name.human}"
 
 = form_for [:admin, @<%= resource_name %>] do |f|
   - if @<%= resource_name %>.errors.any?

data/lib/generators/ideyabox/scaffold/templates/index.html.haml

@@ -1,5 +1,5 @@
 - content_for(:page_header) do
-  %p= link_to "#{t 'add'}  #{<%= resource_name.capitalize %>.model_name.human}", new_admin_<%= singular_controller_routing_path %>_path, :class => "bright_link"
+  %p= link_to "#{t 'add'}  #{<%= @model_name.demodulize %>.model_name.human}", new_admin_<%= singular_controller_routing_path %>_path, :class => "bright_link"
   %h1= link_to '<%= plural_resource_name %>', admin_<%= plural_resource_name %>_path
 -#= paginate @<%= plural_resource_name %>
 <%= if column_names.include?("position")

data/lib/ideyabox/version.rb

@@ -1,3 +1,3 @@
 module Ideyabox
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ideyabox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: russian
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-fileupload-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +244,16 @@ files:
 - lib/generators/ideyabox/admin/templates/views/layouts/admin.html.haml
 - lib/generators/ideyabox/admin/templates/views/layouts/login.html.haml
 - lib/generators/ideyabox/assets/assets_generator.rb
+- lib/generators/ideyabox/images_scaffold/.DS_Store
+- lib/generators/ideyabox/images_scaffold/images_scaffold_generator.rb
+- lib/generators/ideyabox/images_scaffold/templates/.DS_Store
+- lib/generators/ideyabox/images_scaffold/templates/controllers/controller.rb
+- lib/generators/ideyabox/images_scaffold/templates/uploader.rb
+- lib/generators/ideyabox/images_scaffold/templates/views/_image.html.haml
+- lib/generators/ideyabox/images_scaffold/templates/views/_images.html.haml
+- lib/generators/ideyabox/images_scaffold/templates/views/create.js.haml
+- lib/generators/ideyabox/images_scaffold/templates/views/destroy.js.haml
+- lib/generators/ideyabox/images_scaffold/templates/views/edit.html.haml
 - lib/generators/ideyabox/scaffold/.DS_Store
 - lib/generators/ideyabox/scaffold/scaffold_generator.rb
 - lib/generators/ideyabox/scaffold/templates/.DS_Store