typus 0.9.28 → 0.9.29

data/README.rdoc

@@ -47,7 +47,7 @@ Notes on the application demo:
 
 == Installing
 
-Install from GitHub the latest version which it's compatible with Rails 2.3.2.
+Install from GitHub the latest version which it's compatible with Rails 2.3.4.
 
     $ script/plugin install git://github.com/fesplugas/typus.git
 
@@ -72,12 +72,12 @@ Hire us to work on your next project. We build large and small websites.
 Contribute your patches to the community & support people on the 
 mailing list.
 
-Tell everybody about Typus, tell your friends and colleagues about 
-Typus and blog about Typus.
+Tell everybody about *Typus*, tell your friends and colleagues about 
+*Typus* and blog about *Typus*.
 
-== Fancyzoom for assets
+== Fancybox for assets
 
-This feature is a work in progress. Only previews images.
+You can preview assets using Fancybox[http://fancybox.net/example].
 
     # db/migrate/create_photos.rb
 
@@ -100,23 +100,32 @@ This feature is a work in progress. Only previews images.
 
     # app/models/photo.rb
 
+    ##
+    # Styles are predefined but you can use your own by defining them
+    # on `config/initializers/typus.rb`.
+    #
+    #     Typus::Configuration.options[:file_preview] = :my_preview
+    #     Typus::Configuration.options[:file_thumbnail] = :my_thumbnail
+    ##
     class Photo < ActiveRecord::Base
-      has_attached_file :asset, :styles => { :typus => "692x461" }
+      has_attached_file :asset, :styles => { :typus_preview => "692x461", :typus_thumbnail => "100x100" }
     end
 
     # app/views/admin/photos/_index.html.erb
 
+    <%- content_for :stylesheets do -%>
+      <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
+    <%- end -%>
+
     <%- content_for :javascripts do -%>
 
-      <%= javascript_include_tag 'admin/prototype' %>
-      <%= javascript_include_tag 'admin/scriptaculous' %>
-      <%= javascript_include_tag 'admin/fancyzoom' %>
+      <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
+      <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
 
-      <script type="text/javascript">
-        FancyZoomBox.directory = '/images/admin/fancyzoom';
-        $(document).observe('dom:loaded', function() {
+      <script type="text/javascript" charset="utf-8">
+        $(document).ready(function() {
           <%- @items.each do |item| -%>
-            new FancyZoom('<%= item.to_dom %>');
+            $("#<%= item.to_dom %>").fancybox();
           <%- end -%>
         });
       </script>
@@ -147,7 +156,9 @@ This feature is a work in progress. Only previews images.
 == Acknowledgments
 
 - *Typus* uses "Paginator" by Bruce Williams http://codefluency.com.
-- *Typus* has been inspired by "Django Admin" http://www.djangoproject.com.
+- *Typus* has been inspired by "Django Admin" http://djangoproject.com.
+- *Typus* uses http://fancybox.net.
+- *Typus* uses UI icons from http://jqueryui.com.
 
 Copyright (c) 2007-2009 Francesc Esplugas Marti, released under the 
 MIT license

data/VERSION

@@ -1 +1 @@
-0.9.28
+0.9.29

data/app/helpers/admin/form_helper.rb

@@ -7,32 +7,26 @@ module Admin::FormHelper
                 :minute_step => @resource[:class].typus_options_for(:minute_step) }
 
     returning(String.new) do |html|
+
       html << (error_messages_for :item, :header_tag => 'h3')
       html << '<ul>'
 
       fields.each do |key, value|
-        if template = @resource[:class].typus_template(key)
-          html << typus_template_field(key, template, options)
-          next
-        end
-        case value
-        when :belongs_to then      html << typus_belongs_to_field(key)
-        when :boolean then         html << typus_boolean_field(key)
-        when :date then            html << typus_date_field(key, options)
-        when :datetime then        html << typus_datetime_field(key, options)
-        when :file then            html << typus_file_field(key)
-        when :password then        html << typus_password_field(key)
-        when :selector then        html << typus_selector_field(key)
-        when :text then            html << typus_text_field(key)
-        when :tiny_mce then        html << typus_tiny_mce_field(key)
-        when :time then            html << typus_time_field(key, options)
-        when :tree then            html << typus_tree_field(key)
-        else
-          html << typus_string_field(key)
-        end
+
+        html << case value
+                when :belongs_to  then typus_belongs_to_field(key)
+                when :tree        then typus_tree_field(key)
+                when :boolean, :date, :datetime, :file, :password, :selector, :string, :text, :time, :tiny_mce
+                  typus_template_field(key, value.to_s, options)
+                else
+                  typus_template_field(key, 'string', options)
+                end
       end
+
       html << '</ul>'
+
     end
+
   end
 
   def typus_belongs_to_field(attribute)
@@ -69,104 +63,6 @@ module Admin::FormHelper
 
   end
 
-  def typus_boolean_field(attribute)
-    attribute_name = attribute.gsub(/\?$/,'')
-    custom_true = @resource[:class].typus_boolean(attribute)[:true]
-    custom_true = custom_true != 'True' ? custom_true : "Checked if active"
-    <<-HTML
-<li><label>#{@resource[:class].human_attribute_name(attribute)}</label>
-#{check_box :item, attribute_name} <label class="inline_label" for="item_#{attribute_name}">#{_(custom_true)}</label></li>
-    HTML
-  end
-
-  def typus_date_field(attribute, options)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{date_select :item, attribute, options, { :disabled => attribute_disabled?(attribute)} }</li>
-    HTML
-  end
-
-  def typus_datetime_field(attribute, options)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{datetime_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)}}</li>
-    HTML
-  end
-
-  # Optimize
-  def typus_file_field(attribute)
-
-    attachment = attribute.split('_file_name').first
-
-    unless @item.send(attribute).blank?
-      item = @item.send(attachment)
-      preview = if @item.send("#{attachment}_content_type") =~ /^image\/.+/ && item.styles.member?(:typus_thumbnail)
-                    image_tag item.url(:typus_thumbnail)
-                  else
-                    link_to @item.send(attribute), item.url
-                  end
-    end
-
-    <<-HTML
-<li><label for="item_#{attribute}">#{_(attachment.humanize)}</label>
-#{file_field :item, attachment, :disabled => attribute_disabled?(attribute)}
-#{preview}
-</li>
-    HTML
-
-  end
-
-  def typus_password_field(attribute)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{password_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute)}</li>
-    HTML
-  end
-
-  def typus_selector_field(attribute)
-    returning(String.new) do |html|
-      options = []
-      @resource[:class].send(attribute).each do |option|
-        case option.kind_of?(Array)
-        when true
-          selected = (@item.send(attribute).to_s == option.last.to_s) ? 'selected' : ''
-          options << "<option #{selected} value=\"#{option.last}\">#{option.first}</option>"
-        else
-          selected = (@item.send(attribute).to_s == option.to_s) ? 'selected' : ''
-          options << "<option #{selected} value=\"#{option}\">#{option}</option>"
-        end
-      end
-      html << <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-<select id="item_#{attribute}" #{attribute_disabled?(attribute) ? 'disabled="disabled"' : ''} name="item[#{attribute}]">
-<option value=""></option>
-#{options.join("\n")}
-</select></li>
-      HTML
-    end
-  end
-
-  def typus_text_field(attribute)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{text_area :item, attribute, :class => 'text', :rows => @resource[:class].typus_options_for(:form_rows), :disabled => attribute_disabled?(attribute)}</li>
-    HTML
-  end
-
-  def typus_tiny_mce_field(attribute)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{text_area :item, attribute, :class => 'mceEditor', :disabled => attribute_disabled?(attribute)}</li>
-    HTML
-  end
-
-  def typus_time_field(attribute, options)
-    <<-HTML
-<li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
-#{time_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)}}</li>
-    HTML
-  end
-
   def typus_tree_field(attribute, items = @resource[:class].roots, attribute_virtual = 'parent_id')
     <<-HTML
 <li><label for="item_#{attribute}">#{@resource[:class].human_attribute_name(attribute)}</label>
@@ -177,30 +73,6 @@ module Admin::FormHelper
     HTML
   end
 
-  def typus_string_field(attribute)
-
-    # Read only fields.
-    if @resource[:class].typus_field_options_for(:read_only).include?(attribute)
-      value = 'read_only' if %w( edit ).include?(params[:action])
-    end
-
-    # Auto generated fields.
-    if @resource[:class].typus_field_options_for(:auto_generated).include?(attribute)
-      value = 'auto_generated' if %w( new edit ).include?(params[:action])
-    end
-
-    comment = %w( read_only auto_generated ).include?(value) ? "<small>#{value} field</small>".humanize : ''
-
-    attribute_humanized = @resource[:class].human_attribute_name(attribute)
-    attribute_humanized += " (#{attribute})" if attribute.include?('_id')
-
-    <<-HTML
-<li><label for="item_#{attribute}">#{attribute_humanized}#{comment}</label>
-#{text_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) }</li>
-    HTML
-
-  end
-
   def typus_relationships
 
     @back_to = '/' + [ params[:controller], params[:action], params[:id] ].compact.join('/')
@@ -378,11 +250,9 @@ module Admin::FormHelper
   end
 
   def typus_template_field(attribute, template, options = {})
-    folder = Typus::Configuration.options[:templates_folder]
-    template_name = File.join(folder, template)
-
-    output = render(:partial => template_name, :locals => { :resource => @resource, :attribute => attribute, :options => options } )
-    output || "#{attribute}: Can not find the template '#{template}'"
+    template_name = File.join('admin', 'templates', template)
+    render :partial => template_name, 
+           :locals => { :resource => @resource, :attribute => attribute, :options => options }
   end
 
   def attribute_disabled?(attribute)

data/app/helpers/admin/master_helper.rb

@@ -6,7 +6,7 @@ module Admin::MasterHelper
   include Admin::FormHelper
   include Admin::TableHelper
 
-  def display_link_to_previous # (_params = params)
+  def display_link_to_previous
 
     options = {}
     options[:resource_from] = @resource[:class].typus_human_name

data/app/helpers/admin/table_helper.rb

@@ -169,11 +169,11 @@ module Admin::TableHelper
   def typus_table_file_field(attribute, item, link_options = {})
 
     attachment = attribute.split('_file_name').first
+    file_preview = Typus::Configuration.options[:file_preview]
 
-    if item.send(attachment).styles.member?(:typus_preview) && item.send("#{attachment}_content_type") =~ /^image\/.+/
+    if item.send(attachment).styles.member?(file_preview) && item.send("#{attachment}_content_type") =~ /^image\/.+/
       <<-HTML
-<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(attachment)}</div>
+<td><a id="#{item.to_dom}" href="#{item.send(attachment).url(file_preview)}" title="#{item.typus_name}">#{item.send(attribute)}</a></td>
       HTML
     else
       <<-HTML

data/app/helpers/typus_helper.rb

@@ -75,7 +75,7 @@ module TypusHelper
 
         html << <<-HTML
 <tr class="#{cycle('even', 'odd')}">
-<td>#{link_to _(resource.humanize), resource_path}</td>
+<td>#{link_to _(resource.tableize.humanize), resource_path}</td>
 <td align="right" style="vertical-align: bottom;"></td>
 </tr>
         HTML
@@ -177,12 +177,4 @@ module TypusHelper
 
   end
 
-  def typus_message(message, html_class = 'notice')
-    <<-HTML
-<div id="flash" class="#{html_class}">
-  <p>#{message}</p>
-</div>
-    HTML
-  end
-
 end

data/app/views/admin/resources/show.html.erb

@@ -20,13 +20,16 @@
              !raw_data.nil? ? boolean_hash["#{raw_data}".to_sym] : @resource[:class].typus_options_for(:nil)
            when :belongs_to
              raw_data.typus_name
+           when :file
+             attachment = field.first.split('_file_name').first
+             @item.typus_preview(attachment)
            when :text
              defined?(RDiscount) ? markdown(raw_data) : raw_data
            else
-             raw_data
+             h(raw_data)
            end
   -%>
-  <dd><%= !data.blank? ? (data_type.eql?(:text) ? markdown(data) : h(data)) : '&#151;' %></dd>
+  <dd><%= !data.blank? ? data : '&#151;' %></dd>
 <%- end -%>
 </dl>
 

data/app/views/admin/templates/_boolean.html.erb

@@ -0,0 +1,8 @@
+<%
+  attribute_name = attribute.gsub(/\?$/,'')
+  custom_true = @resource[:class].typus_boolean(attribute)[:true]
+  custom_true = custom_true != 'True' ? custom_true : "Checked if active"
+%>
+
+<li><label><%= @resource[:class].human_attribute_name(attribute) %></label>
+<%= check_box :item, attribute_name %> <label class="inline_label" for="item_<%= attribute_name %>"><%= _(custom_true) %></label></li>

data/app/views/admin/templates/_date.html.erb

@@ -0,0 +1,2 @@
+<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
+<%= date_select :item, attribute, options, { :disabled => attribute_disabled?(attribute)} %></li>

data/app/views/admin/templates/_datetime.html.erb

@@ -0,0 +1,2 @@
+<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
+<%= datetime_select :item, attribute, options, {:disabled => attribute_disabled?(attribute)} %></li>

data/app/views/admin/templates/_file.html.erb

@@ -0,0 +1,44 @@
+<%- content_for :stylesheets do -%>
+  <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
+<%- end -%>
+
+<%- content_for :javascripts do -%>
+
+  <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
+  <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
+
+  <script type="text/javascript" charset="utf-8">
+    $(document).ready(function() {
+      $("#<%= @item.to_dom %>").fancybox();
+    });
+  </script>
+
+<%- end -%>
+
+<%
+
+  attachment = attribute.split('_file_name').first
+  file_preview = Typus::Configuration.options[:file_preview]
+  file_thumbnail = Typus::Configuration.options[:file_thumbnail]
+
+  unless @item.send(attribute).blank?
+    item = @item.send(attachment)
+    preview = if @item.send("#{attachment}_content_type") =~ /^image\/.+/ && item.styles.member?(file_thumbnail)
+                <<-HTML
+<a id="#{@item.to_dom}" href="#{@item.send(attachment).url(file_preview)}" title="#{@item.typus_name}">
+#{image_tag item.url(file_thumbnail)}
+</a>
+                HTML
+              else
+                <<-HTML
+#{link_to @item.send(attribute), item.url}
+                HTML
+              end
+  end
+
+%>
+
+<li><label for="item_<%= attribute %>"><%= _(attachment.humanize) %></label>
+<%= file_field :item, attachment, :disabled => attribute_disabled?(attribute) %>
+<%= preview %>
+</li>

data/app/views/admin/templates/_password.html.erb

@@ -0,0 +1,2 @@
+<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
+<%= password_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) %></li>

data/app/views/admin/templates/_selector.html.erb

@@ -0,0 +1,21 @@
+<%
+
+  options = []
+  @resource[:class].send(attribute).each do |option|
+    case option.kind_of?(Array)
+    when true
+      selected = (@item.send(attribute).to_s == option.last.to_s) ? 'selected' : ''
+      options << "<option #{selected} value=\"#{option.last}\">#{option.first}</option>"
+    else
+      selected = (@item.send(attribute).to_s == option.to_s) ? 'selected' : ''
+      options << "<option #{selected} value=\"#{option}\">#{option}</option>"
+    end
+  end
+
+%>
+
+<li><label for="item_<%= attribute %>"><%= @resource[:class].human_attribute_name(attribute) %></label>
+<select id="item_<%= attribute %>" <%= attribute_disabled?(attribute) ? 'disabled="disabled"' : '' %> name="item[<%= attribute %>]">
+<option value=""></option>
+<%= options.join("\n") %>
+</select></li>

data/app/views/admin/templates/_string.html.erb

@@ -0,0 +1,21 @@
+<%
+
+  # Read only fields.
+  if @resource[:class].typus_field_options_for(:read_only).include?(attribute)
+    value = 'read_only' if %w( edit ).include?(params[:action])
+  end
+
+  # Auto generated fields.
+  if @resource[:class].typus_field_options_for(:auto_generated).include?(attribute)
+    value = 'auto_generated' if %w( new edit ).include?(params[:action])
+  end
+
+  comment = %w( read_only auto_generated ).include?(value) ? "<small>#{value} field</small>".humanize : ''
+
+  attribute_humanized = @resource[:class].human_attribute_name(attribute)
+  attribute_humanized += " (#{attribute})" if attribute.include?('_id')
+
+%>
+
+<li><label for="item_<%= attribute %>"><%= attribute_humanized %> <%= comment %></label>
+<%= text_field :item, attribute, :class => 'text', :disabled => attribute_disabled?(attribute) %></li>