RubyGems - sunrise-core - Versions diffs - 0.1.1 → 0.1.2 - Mend

sunrise-core 0.1.1 → 0.1.2

Files changed (31) hide show

data/README.rdoc CHANGED Viewed

@@ -33,9 +33,9 @@ Generate simple_form configurations:
   rails generate simple_form:install
-Generate attach_file_field assets:
+Generate file uploads assets:
-  rails generate attach_file_field
+  rails generate sunrise:file_upload:install
 Migrate database:

data/app/controllers/manage/assets_controller.rb CHANGED Viewed

@@ -31,7 +31,7 @@ class Manage::AssetsController < Manage::BaseController
   end
   def sort
-    params[:picture].each_with_index do |id, index|
+    params[:asset].each_with_index do |id, index|
       @klass.move_to(index, id)
     end
@@ -64,7 +64,7 @@ class Manage::AssetsController < Manage::BaseController
       @klass = params[:klass].blank? ? Asset : params[:klass].classify.constantize
       if params[:collection].blank?
-        @asset = @klass.find(:first, :conditions=>[c_names.join(' AND ')] + c_values)
+        @asset = @klass.where([c_names.join(' AND ')] + c_values).first
       end
     end
 end

data/app/views/layouts/manage.html.erb CHANGED Viewed

@@ -4,23 +4,21 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<%= csrf_meta_tag %>
 	<title><%= t('manage.page_title') %></title>
-	<%= stylesheet_link_tag "manage/main", "fancybox/jquery.fancybox-1.3.4" %>
-	<%= stylesheet_link_tag "smoothness/jquery-ui-1.8.6.custom" %>
+	<%= stylesheet_link_tag "manage/main", "manage/buttons", "fancybox/jquery.fancybox-1.3.4" %>
+	<%= stylesheet_link_tag "smoothness/jquery-ui-1.8.13.custom" %>
  	<!--[if lt IE 7]><%= stylesheet_link_tag "manage/ie" %><![endif]-->
  	<script src="https://www.google.com/jsapi?key=" type="text/javascript"></script>
   <script language="Javascript" type="text/javascript">
   //<![CDATA[
     google.load("jquery", "1.5.1");
-    google.load("jqueryui", "1.8.6");
-    google.load("swfobject", "2.2");
+    google.load("jqueryui", "1.8.13");
   //]]>
   </script>
  	<%= javascript_include_tag "jquery.tmpl.min", "jquery.fancybox-1.3.4.pack", "jquery.cookie" %>
  	<%= javascript_include_tag "jquery-ui-timepicker-addon", "datepicker/jquery.ui.datepicker-#{I18n.locale}" %>
  	<%= javascript_include_tag :ckeditor, "preloader", "rails", "manage" %>
- 	<%= attach_include_files %>
 	<%= yield(:head)%>
 </head>
 <body>
@@ -36,5 +34,6 @@
     </div>
   </div>
   <%= yield(:footer) %>
+  <%= render :partial => 'manage/fileupload/tmpl' %>
 </body>
 </html>

data/app/views/manage/{assets/_picture.html.erb → fileupload/_asset.html.erb} RENAMED Viewed

@@ -1,10 +1,11 @@
-<%= content_tag(:div, :class=>"asset ill", :id => dom_id(picture)) do %>
+<%= content_tag(:div, :class => "asset ill", :id => "asset_#{asset.id}") do %>
   <%= link_to image_tag("manage/empty.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')),
-          manage_asset_path(picture),
+          manage_asset_path(asset),
           :remote => true,
           :method => :delete,
           :confirm => t('manage.confirm_delete'),
           :class => "del" %>
-  <%= link_to image_tag(picture.url(:thumb), :title => picture.filename), picture.url(:content), :class => "fancybox" %>
+  <%= link_to image_tag(asset.url(:thumb), :title => asset.filename, :width => 80, :height => 80),
+      asset.url, :class => "fancybox" %>
 <% end %>

data/app/views/manage/fileupload/_container.html.erb ADDED Viewed

@@ -0,0 +1,25 @@
+<%= content_tag(:div, :class => 'fileupload', :id => element_id) do %>
+  <div class="gray-blocks">
+    <div class="bg-bl">
+      <div class="gr-title"><%= label %></div>
+      <div class="fileupload-list ill-bl galery">
+        <%= render :partial => 'manage/fileupload/asset', :collection => assets %>
+      </div>
+      <div class="file-types">
+        <span class="fileupload-button">
+          <button type="button" class="cupid-green"><%= t('manage.fileupload.button') %></button>
+        </span>
+        <div class="type-info">
+          <span><%= file_title %>. <%= t('manage.fileupload.max_size') %>:</span><strong><%= file_max_size %> MB</strong>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>
+<%= javascript_tag :language => "Javascript" do -%>
+  $(document).ready(function(){
+    new qq.FileUploaderInput(<%=raw script_options %>);
+    Manage.init_assets('<%= element_id %>', '<%= sort_manage_assets_path(:klass=>asset_klass) %>', <%= multiple ? 'true' : 'false' %>);
+  });
+<% end -%>

data/app/views/manage/fileupload/_tmpl.html.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<script id="fileupload_tmpl" type="text/x-jquery-tmpl">
+<div class="asset ill" id="asset_${id}">
+  <%= link_to image_tag("manage/empty.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')),
+          "/manage/assets/${id}",
+          :remote => true,
+          :method => :delete,
+          :confirm => t('manage.confirm_delete'),
+          :class => "fileupload-cancel del" %>
+  <a href="${url}" class="fileupload-file fancybox">
+    <img width="80" height="80" src="${thumb_url}" title="${filename}">
+  </a>
+</div>
+</script>

data/app/views/manage/users/_form.html.erb CHANGED Viewed

@@ -1,3 +1,5 @@
+<% javascript "fileupload/fileuploader.js", "manage-fileuploader.js" %>
 <%= manage_form_for @user do |f| %>
   <div class="edit-cont">
     <div class="inputs-bl">
@@ -8,7 +10,9 @@
       <%= f.input :role_type_id, :collection => RoleType.all %>
     </div>
-    <%= f.attach_file_field :avatar, :input_html => { :file_max_size => 1 } %>
+    <%= f.attach_file_field :avatar, :file_max_size => 1 %>
+    <%= f.hidden_field :fileupload_guid if f.object.new_record? %>
   </div>
   <%= f.button :submit %>

data/app/views/manage/users/_model_filter.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
     <%= link_to_function t('manage.model_filter.title'), "Manage.toggle_element('block_filter')", :class=>"dark-arr" %>
     <%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
-      <%= form_for @search, :as => :search, :url=>manage_users_path, :html=>{:method=>:get, :id=>"form_filter"} do |f| %>
+      <%= form_for @search, :as => :search, :url=>manage_users_path, :html=>{:method=>:get} do |f| %>
         <%= f.label :email, t('activerecord.attributes.user.email') %>
         <%= f.text_field :email, :class=>"text" %>
@@ -11,8 +11,10 @@
         <%= f.text_field :name, :class=>"text" %>
         <div class="buts">
-          <%= f.submit t('manage.model_filter.search'), :style=>"display:none;" %>
-          <%= link_to_function content_tag(:span, t('manage.model_filter.search')), "$('#form_filter').submit()", :class=>"gr" %>
+          <%= content_tag(:button, :value => "search", :type => "submit", :name => "commit", :class => "gr cupid-green") do %>
+            <%= t('manage.model_filter.search') %>
+          <% end %>
           <%= link_to t('manage.model_filter.clear'), manage_users_path, :class=>"erase" %>
         </div>
       <% end %>

data/config/locales/manage/en.yml CHANGED Viewed

@@ -11,6 +11,7 @@ en:
         city_name: "City"
         about: "About"
         remember_me: "Remember me"
+        role_type_id: "Role type"
       structure:
         title: "Name"
@@ -213,6 +214,10 @@ en:
       position_asc: "for the position of the ascending"
       sort_order_desc: "to sort in descending order"
       sort_order_asc: "to sort in ascending order"
+    fileupload:
+      button: "Select file"
+      max_size: "Max size"
   flash:
     manage:

data/config/locales/manage/ru.yml CHANGED Viewed

@@ -11,6 +11,7 @@ ru:
         city_name: "Город"
         about: "О себе"
         remember_me: "Запомнить меня"
+        role_type_id: "Тип пользователя"
       structure:
         title: "Название"
@@ -213,6 +214,10 @@ ru:
       position_asc: "за позицией по возрастанию"
       sort_order_desc: "по сортировке по убыванию"
       sort_order_asc: "по сортировке по возрастанию"
+    fileupload:
+      button: "Выберите файл"
+      max_size: "Макс. р."
   flash:
     manage:

data/config/locales/manage/uk.yml CHANGED Viewed

@@ -11,6 +11,7 @@ uk:
         city_name: "Місто"
         about: "Про себе"
         remember_me: "Запам'ятати мене"
+        role_type_id: "Тип користувача"
       structure:
         title: "Назва"
@@ -213,6 +214,10 @@ uk:
       position_asc: "за позицією за зростанням"
       sort_order_desc: "по сортуванню за спаданням"
       sort_order_asc: "по сортуванню за зростанням"
+    fileupload:
+      button: "Оберіть файл"
+      max_size: "Макс. р."
   flash:
     manage:

data/lib/generators/sunrise/install_generator.rb CHANGED Viewed

@@ -59,12 +59,6 @@ module Sunrise
         get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
       end
-      # Add devise routes
-      def add_routes
-        route "devise_for :users"
-        route "resources :pages, :only => [:show]"
-      end
       # copy migration files
       def create_migrations
         if options.migrations
@@ -74,6 +68,32 @@ module Sunrise
         end
       end
+      def dependent_generators
+        say_status("invoke dependent generators", "", :green)
+        generate("simple_form:install")
+        generate("sunrise:file_upload:install")
+        generate("devise:install")
+      end
+      # Add devise routes
+      def add_routes
+        route "devise_for :users"
+        route "resources :pages, :only => [:show]"
+        route 'root :to => "welcome#index"'
+      end
+      def autoload_paths
+        log :autoload_paths, "models/defaults and app/sweepers"
+        sentinel = /\.autoload_paths\s+\+=\s+\%W\(\#\{config\.root\}\/extras\)\s*$/
+        code = 'config.autoload_paths += %W(#{config.root}/app/models/defaults #{config.root}/app/sweepers)'
+        in_root do
+          inject_into_file 'config/application.rb', "    #{code}\n", { :after => sentinel, :verbose => false }
+        end
+      end
       def self.next_migration_number(dirname)
         if ActiveRecord::Base.timestamped_migrations
           current_time.utc.strftime("%Y%m%d%H%M%S")

data/lib/generators/sunrise/templates/helpers/manage/assets_helper.rb CHANGED Viewed

@@ -1,16 +1,2 @@
 module Manage::AssetsHelper
-  def manage_assets_path_with_session_information(klass = 'Asset', options = {})
-    options = { :format => :xml, :protocol => "http://" }.merge(options)
-    session_key = Rails.application.config.send(:session_options)[:key]
-    options[session_key] = Rack::Utils.escape(cookies[session_key])
-    options[:klass] = klass
-    if protect_against_forgery?
-      options[request_forgery_protection_token] = Rack::Utils.escape(form_authenticity_token)
-    end
-    manage_assets_url(options)
-  end
 end

data/lib/generators/sunrise/templates/javascripts/manage-fileuploader.js ADDED Viewed

@@ -0,0 +1,182 @@
+// Collection of all instances on page
+qq.FileUploader.instances = new Object();
+/**
+ * Class that creates upload widget with drag-and-drop and file list
+ * @inherits qq.FileUploaderBasic
+ */
+qq.FileUploaderInput = function(o){
+    // call parent constructor
+    qq.FileUploaderBasic.apply(this, arguments);
+    // additional options
+    qq.extend(this._options, {
+        element: null,
+        // if set, will be used instead of qq-upload-list in template
+        listElement: null,
+        template_id: '#fileupload_tmpl',
+        classes: {
+            // used to get elements from templates
+            button: 'fileupload-button',
+            drop: 'fileupload-drop-area',
+            dropActive: 'fileupload-drop-area-active',
+            list: 'fileupload-list',
+            preview: 'fileupload-preview',
+            file: 'fileupload-file',
+            spinner: 'fileupload-spinner',
+            size: 'fileupload-size',
+            cancel: 'fileupload-cancel',
+            // added to list item when upload completes
+            // used in css to hide progress spinner
+            success: 'fileupload-success',
+            fail: 'fileupload-fail'
+        }
+    });
+    // overwrite options with user supplied
+    qq.extend(this._options, o);
+    this._element = document.getElementById(this._options.element);
+    this._listElement = this._options.listElement || this._find(this._element, 'list');
+    this._classes = this._options.classes;
+    this._button = this._createUploadButton(this._find(this._element, 'button'));
+    //this._setupDragDrop();
+    qq.FileUploader.instances[this._element.id] = this;
+};
+// inherit from Basic Uploader
+qq.extend(qq.FileUploaderInput.prototype, qq.FileUploaderBasic.prototype);
+qq.extend(qq.FileUploaderInput.prototype, {
+    /**
+     * Gets one of the elements listed in this._options.classes
+     **/
+    _find: function(parent, type){
+        var element = qq.getByClass(parent, this._options.classes[type])[0];
+        if (!element){
+            throw new Error('element not found ' + type);
+        }
+        return element;
+    },
+    _setupDragDrop: function(){
+        var self = this,
+            dropArea = this._find(this._element, 'drop');
+        var dz = new qq.UploadDropZone({
+            element: dropArea,
+            onEnter: function(e){
+                qq.addClass(dropArea, self._classes.dropActive);
+                e.stopPropagation();
+            },
+            onLeave: function(e){
+                e.stopPropagation();
+            },
+            onLeaveNotDescendants: function(e){
+                qq.removeClass(dropArea, self._classes.dropActive);
+            },
+            onDrop: function(e){
+                dropArea.style.display = 'none';
+                qq.removeClass(dropArea, self._classes.dropActive);
+                self._uploadFileList(e.dataTransfer.files);
+            }
+        });
+        dropArea.style.display = 'none';
+        qq.attach(document, 'dragenter', function(e){
+            if (!dz._isValidFileDrag(e)) return;
+            dropArea.style.display = 'block';
+        });
+        qq.attach(document, 'dragleave', function(e){
+            if (!dz._isValidFileDrag(e)) return;
+            var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
+            // only fire when leaving document out
+            if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){
+                dropArea.style.display = 'none';
+            }
+        });
+    },
+    _onSubmit: function(id, fileName){
+        qq.FileUploaderBasic.prototype._onSubmit.apply(this, arguments);
+        this._addToList(id, fileName);
+    },
+    _onProgress: function(id, fileName, loaded, total){
+        qq.FileUploaderBasic.prototype._onProgress.apply(this, arguments);
+        /*var item = this._getItemByFileId(id);
+        var size = this._find(item, 'size');
+        size.style.display = 'inline';
+        var text;
+        if (loaded != total){
+            text = Math.round(loaded / total * 100) + '% from ' + this._formatSize(total);
+        } else {
+            text = this._formatSize(total);
+        }
+        qq.setText(size, text);*/
+    },
+    _onComplete: function(id, fileName, result){
+        qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
+        var item = this._getItemByFileId(id);
+        var asset = result.asset;
+        // mark completed
+        //qq.remove(this._find(item, 'cancel'));
+        //qq.remove(this._find(item, 'spinner'));
+        if (asset && asset.id){
+            qq.addClass(item, this._classes.success);
+            $(item).replaceWith( $(this._options.template_id).tmpl(asset) );
+        } else {
+            qq.addClass(item, this._classes.fail);
+        }
+    },
+    _addToList: function(id, fileName){
+        if (this._listElement) {
+          if (this._options.multiple === false) {
+            $(this._listElement).empty();
+          }
+          var asset = {id: 0, filename: this._formatFileName(fileName),
+            url: "#",
+            thumb_url: "/images/manage/preloader.gif"};
+          var item = $(this._options.template_id)
+            .tmpl(asset)
+            .attr('qqfileid', id)
+            .appendTo( this._listElement );
+          this._bindCancelEvent(item);
+        }
+    },
+    _getItemByFileId: function(id){
+        return $(this._listElement).find('div[qqfileid=' + id  +']').get(0);
+    },
+    /**
+     * delegate click event for cancel link
+     **/
+    _bindCancelEvent: function(element){
+        var self = this,
+            item = $(element);
+        item.find('a.' + this._classes.cancel).bind('click', function(e){
+          self._handler.cancel( item.attr('qqfileid') );
+          item.remove();
+          qq.preventDefault(e);
+          return false;
+        });
+    }
+});

data/lib/generators/sunrise/templates/javascripts/manage.js CHANGED Viewed

@@ -85,8 +85,10 @@ var Manage = {
     }
   },
-  init_assets: function(query, url)
+  init_assets: function(element_id, url, sortable)
   {
+    var query = '#' + element_id + ' div.galery';
     $(query + " a.fancybox").fancybox({
 			'titleShow'		: false,
 			'transitionIn'	: 'none',
@@ -97,18 +99,20 @@ var Manage = {
       $(this).parents('div.asset').remove();
     });
-    $(query).sortable({
-		  revert: true,
-		  update: function(event, ui){
-		    var data = $(query).sortable('serialize');
-		    $.ajax({
-          url: url,
-          data: data,
-          dataType: 'script',
-          type: 'POST'
-        });
-		  }
-	  });
+    if (sortable) {
+      $(query).sortable({
+		    revert: true,
+		    update: function(event, ui){
+		      var data = $(query).sortable('serialize');
+		      $.ajax({
+            url: url,
+            data: data,
+            dataType: 'script',
+            type: 'POST'
+          });
+		    }
+	    });
+	  }
   }
 };

data/lib/generators/sunrise/templates/models/defaults/user.rb CHANGED Viewed

@@ -43,9 +43,5 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :name, :email, :password, :password_confirmation, :remember_me
-#  acts_as_attach_file :avatar
-  def to_param
-    "#{id}-#{login}"
-  end
+  fileuploads :avatar
 end

data/lib/generators/sunrise/templates/stylesheets/manage/buttons.css ADDED Viewed

@@ -0,0 +1,42 @@
+/* cupid green (inspired by okcupid.com)
+*******************************************************************************/
+button.cupid-green {
+  background: #7fbf4d;
+  background: -moz-linear-gradient(top, #7fbf4d 0%, #63a62f 100%);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#7fbf4d), to(#63a62f));
+  border: 1px solid #63a62f;
+  border-bottom: 1px solid #5b992b;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: inset 0 1px 0 0 #96ca6d;
+  -webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
+  box-shadow: inset 0 1px 0 0 #96ca6d;
+  color: #fff;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 1;
+  padding: 7px 0 8px 0;
+  text-align: center;
+  text-shadow: 0 -1px 0 #4c9021;
+  width: 120px;
+}
+button.cupid-green:hover {
+  background: #76b347;
+  background: -moz-linear-gradient(top, #76b347 0%, #5e9e2e 100%);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#76b347), to(#5e9e2e));
+  -moz-box-shadow: inset 0 1px 0 0 #8dbf67;
+  -webkit-box-shadow: inset 0 1px 0 0 #8dbf67;
+  box-shadow: inset 0 1px 0 0 #8dbf67;
+  cursor: pointer;
+}
+button.cupid-green:active {
+  border: 1px solid #5b992b;
+  border-bottom: 1px solid #538c27;
+  -moz-box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eee;
+  -webkit-box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eee;
+  box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eee;
+}

data/lib/generators/sunrise/templates/stylesheets/manage/main.css CHANGED Viewed

@@ -464,6 +464,17 @@ input.text {
 	display: block;
 	line-height: 37px;
 }
+.buts button.gr {
+	display: block;
+	float: left;
+	color: #fff;
+	text-decoration: none;
+	line-height: 37px;
+	font-size: 1.1em;
+}
+.controls {
+  padding: 20px 0px 10px 20px;
+}
 .sort {
 	display: block;
 	overflow: hidden;