typus 0.9.18 → 0.9.19

data/README.rdoc

@@ -56,6 +56,55 @@ mailing list.
 Tell everybody about Typus, tell your friends and colleagues about 
 Typus and blog about Typus.
 
+== Fancyzoom for assets
+
+This feature is a work in progress. It currently works if the attached file is 
+named asset and only previews images.
+
+    # db/migrate/create_photos.rb
+
+    class CreatePhotos < ActiveRecord::Migration
+
+      def self.up
+        create_table :photos do |t|
+          t.string :asset_file_name
+          t.string :asset_content_type
+          t.integer :asset_file_size
+          t.datetime :asset_updated_at
+        end
+      end
+
+      def self.down
+        drop_table :photos
+      end
+
+    end
+
+    # app/models/photo.rb
+
+    class Photo < ActiveRecord::Base
+      has_attached_file :asset, :styles => { :typus => "692x461" }
+    end
+
+    # app/views/admin/photos/_index.html.erb
+
+    <%- content_for :javascripts do -%>
+
+      <%= javascript_include_tag 'admin/prototype' %>
+      <%= javascript_include_tag 'admin/scriptaculous' %>
+      <%= javascript_include_tag 'admin/fancyzoom' %>
+
+      <script type="text/javascript">
+        FancyZoomBox.directory = '/images/admin/fancyzoom';
+        $(document).observe('dom:loaded', function() {
+          <%- @items.each do |item| -%>
+            new FancyZoom('<%= item.to_dom %>');
+          <%- end -%>
+        });
+      </script>
+
+    <%- end -%>
+
 == Contributors
 
 - Laia Gargallo (Lover and tea provider) http://azotacalles.net
@@ -68,7 +117,7 @@ Typus and blog about Typus.
 - Erik Tigerholm (Code) http://github.com/eriktigerholm
 - George Guimarães (Portuguese translation and code) http://github.com/georgeguimaraes
 - José Valim (Code) http://github.com/josevalim
-- Luqman Amjad (Code) http://github.com/snake
+- Luqman Amjad (Code) http://github.com/luqman
 - Alexey Noskov (Russian translation and code) http://github.com/alno
 - Andres Gutierres (Bugfixes & feedback) http://github.com/andresgutgon
 - Komzák Nándor (Code, bugfixes & feedback) http://github.com/rubymood

data/VERSION

@@ -1 +1 @@
-0.9.18
+0.9.19

data/app/helpers/admin/table_helper.rb

@@ -21,6 +21,7 @@ module Admin::TableHelper
           when :boolean then           html << typus_table_boolean_field(key, item)
           when :datetime then          html << typus_table_datetime_field(key, item, fields.keys.first, link_options)
           when :date then              html << typus_table_datetime_field(key, item, fields.keys.first, link_options)
+          when :file then              html << typus_table_file_field(key, item, fields.keys.first, link_options)
           when :time then              html << typus_table_datetime_field(key, item, fields.keys.first, link_options)
           when :belongs_to then        html << typus_table_belongs_to_field(key, item)
           when :tree then              html << typus_table_tree_field(key, item)
@@ -30,8 +31,15 @@ module Admin::TableHelper
           else
             html << typus_table_string_field(key, item, fields.keys.first, link_options)
           end
+
         end
 
+      action = item.class.typus_options_for(:default_action_on_item)
+      content = link_to _(action.capitalize), :controller => "admin/#{item.class.name.tableize}", :action => action, :id => item.id
+      html << <<-HTML
+<td width="10px">#{content}</td>
+      HTML
+
       ##
       # This controls the action to perform. If we are on a model list we 
       # will remove the entry, but if we inside a model we will remove the 
@@ -39,24 +47,25 @@ module Admin::TableHelper
       #
       # Only shown is the user can destroy items.
       #
-
       if @current_user.can_perform?(model, 'delete')
 
+        trash = "<div class=\"sprite trash\">Trash</div>"
+
         case params[:action]
         when 'index'
-          perform = link_to image_tag('admin/trash.gif'), { :action => 'destroy', 
-                                                            :id => item.id }, 
-                                                            :confirm => _("Remove entry?"), 
-                                                            :method => :delete
+          perform = link_to trash, { :action => 'destroy', 
+                                     :id => item.id }, 
+                                     :confirm => _("Remove entry?"), 
+                                     :method => :delete
         else
-          perform = link_to image_tag('admin/trash.gif'), { :action => 'unrelate', 
-                                                            :id => params[:id], 
-                                                            :association => association, 
-                                                            :resource => model, 
-                                                            :resource_id => item.id }, 
-                                                            :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
-                                                                          :unrelate_model => model.typus_human_name, 
-                                                                          :unrelate_model_from => @resource[:class].typus_human_name)
+          perform = link_to trash, { :action => 'unrelate', 
+                                     :id => params[:id], 
+                                     :association => association, 
+                                     :resource => model, 
+                                     :resource_id => item.id }, 
+                                     :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
+                                     :unrelate_model => model.typus_human_name, 
+                                     :unrelate_model_from => @resource[:class].typus_human_name)
         end
 
         html << <<-HTML
@@ -90,13 +99,15 @@ module Admin::TableHelper
 
         if (model.model_fields.map(&:first).collect { |i| i.to_s }.include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym)) && params[:action] == 'index'
           sort_order = case params[:sort_order]
-                       when 'asc' then  'desc'
-                       when 'desc' then 'asc'
+                       when 'asc'   then  ['desc', '&darr;']
+                       when 'desc'  then  ['asc', '&uarr;']
+                       else
+                         [nil, nil]
                        end
           order_by = model.reflect_on_association(key.to_sym).primary_key_name rescue key
-          switch = (params[:order_by] == key) ? sort_order : ''
-          options = { :order_by => order_by, :sort_order => sort_order }
-          content = (link_to "<div class=\"#{switch}\">#{content}</div>", params.merge(options))
+          switch = (params[:order_by] == key) ? sort_order.last : ''
+          options = { :order_by => order_by, :sort_order => sort_order.first }
+          content = (link_to "#{content} #{switch}", params.merge(options))
         end
 
         headers << "<th>#{content}</th>"
@@ -131,22 +142,16 @@ module Admin::TableHelper
     HTML
   end
 
-  ##
-  # When detection of the attributes is made a default attribute 
-  # type is set. From the string_field we display other content 
-  # types.
-  #
   def typus_table_string_field(attribute, item, first_field, link_options = {})
+    <<-HTML
+<td>#{item.send(attribute)}</td>
+    HTML
+  end
 
-    action = item.class.typus_options_for(:default_action_on_item)
-
-    content = if first_field == attribute
-                link_to item.send(attribute) || item.class.typus_options_for(:nil), link_options.merge(:controller => "admin/#{item.class.name.tableize}", :action => action, :id => item.id)
-              else
-                item.send(attribute)
-              end
+  def typus_table_file_field(attribute, item, first_field, link_options = {})
     <<-HTML
-<td>#{content}</td>
+<td><a href="##{item.to_dom(:suffix => 'zoom')}" id="#{item.to_dom}" title="Click to preview">#{item.send(attribute)}</a></td>
+<div id="#{item.to_dom(:suffix => 'zoom')}">#{item.typus_preview}</div>
     HTML
   end
 
@@ -199,21 +204,16 @@ module Admin::TableHelper
 
   def typus_table_boolean_field(attribute, item)
 
-    boolean_icon = item.class.typus_options_for(:icon_on_boolean)
     boolean_hash = item.class.typus_boolean(attribute)
-
     status = item.send(attribute)
-
-    link_text = unless item.send(attribute).nil?
-                  (boolean_icon) ? image_tag("admin/status_#{status}.gif") : boolean_hash["#{status}".to_sym]
-                else
-                  item.class.typus_options_for(:nil) # Content is nil, so we show nil.
-                end
+    link_text = !item.send(attribute).nil? ? boolean_hash["#{status}".to_sym] : item.class.typus_options_for(:nil)
 
     options = { :controller => item.class.name.tableize, :action => 'toggle', :field => attribute.gsub(/\?$/,''), :id => item.id }
 
     content = if item.class.typus_options_for(:toggle) && !item.send(attribute).nil?
-                link_to link_text, params.merge(options), :confirm => _("Change {{attribute}}?", :attribute => item.class.human_attribute_name(attribute).downcase)
+                link_to link_text, params.merge(options), 
+                                   :confirm => _("Change {{attribute}}?", 
+                                   :attribute => item.class.human_attribute_name(attribute).downcase)
               else
                 link_text
               end

data/generators/typus/templates/config/initializers/typus.rb

@@ -5,6 +5,7 @@
 Typus::Configuration.options[:app_name] = '<%= application %>'
 # Typus::Configuration.options[:config_folder] = 'config/typus'
 # Typus::Configuration.options[:email] = 'admin@example.com'
+# Typus::Configuration.options[:image_preview_size] = :typus
 # Typus::Configuration.options[:locales] = [ [ "English", :en ], [ "Español", :es ] ]
 # Typus::Configuration.options[:recover_password] = true
 # Typus::Configuration.options[:root] = 'admin'
@@ -18,7 +19,6 @@ Typus::Configuration.options[:app_name] = '<%= application %>'
 # Typus::Configuration.options[:default_action_on_item] = 'edit'
 # Typus::Configuration.options[:end_year] = Time.now.year + 1
 # Typus::Configuration.options[:form_rows] = 10
-# Typus::Configuration.options[:icon_on_boolean] = false
 # Typus::Configuration.options[:index_after_save] = true
 # Typus::Configuration.options[:minute_step] = 5
 # Typus::Configuration.options[:nil] = 'nil'

data/generators/typus/templates/config/typus/README

@@ -39,7 +39,6 @@ only have set the most common settings.
         default_action_on_item: show
         end_year: 2015
         form_rows: 25
-        icon_on_boolean: true
         index_after_save: false
         minute_step: 15
         nil: 'nil'

data/generators/typus/templates/config/typus/typus.yml

@@ -9,6 +9,4 @@ TypusUser:
   filters: status, role
   search: first_name, last_name, email, role
   application: Typus
-  description: System Users Administration
-  options:
-    icon_on_boolean: false
+  description: System Users Administration

data/generators/typus/templates/public/javascripts/admin/builder.js

@@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1])
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        }
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return $(element);
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e);
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      };
+    });
+  }
+};