easy_admin_ui 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/easy_admin_ui.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_admin_ui}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-09-19}
   s.description = %q{Very simple DRY admin UI.}
   s.email = %q{martin@wulffeld.org}
   s.extra_rdoc_files = [
@@ -40,14 +40,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/wulffeld/easy_admin_ui}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easy Admin UI.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/easy_admin_ui/view_helpers.rb

@@ -4,8 +4,19 @@ module EasyAdminUi
       will_paginate(collection, :previous_label => t('will_paginate.previous'), :next_label => t('will_paginate.next'))
     end
 
-    def table_head(titles, actions, options = {:class => "easy"})
-      concat("<table class='#{options[:class]}' id='#{options[:id]}'>" +
+    def table(items, titles, actions, options = {}, &block)
+      html = ''.html_safe
+      html << table_head(titles, actions, options)
+      html << render(items)
+      html << my_table_end
+      html
+    end
+
+    def table_head(titles, actions, options = {})
+      options[:class] ||= 'easy'
+      html = ''.html_safe
+      html << "<table class='#{options[:class]}' id='#{options[:id]}'>".html_safe
+      html <<
         content_tag(:thead,
           content_tag(:tr, (
               titles.map do |title, th_class|
@@ -16,7 +27,7 @@ module EasyAdminUi
                       content_tag(:div,
                         link_to('', '#', :class => 'sort_up') +
                         link_to('', '#', :class => 'sort_down'),
-                        :class => 'sort')
+                        {:class => 'sort'})
                     else
                       nil
                     end,
@@ -24,13 +35,11 @@ module EasyAdminUi
                   ].compact.join(''),
                   :class => th_class)
               end
-            ).join('') + (actions ? content_tag(:th, '', :class => 'actions') : '')
+            ).join('').html_safe + (actions ? content_tag(:th, '', :class => 'actions') : '')
           )
         )
-      )
-      options[:body_id] ? concat("<tbody id=\"#{options[:body_id]}\">") : concat('<tbody>')
-      yield
-      concat('</tbody></table>')
+      html << options[:body_id] ? "<tbody id=\"#{options[:body_id]}\">" : '<tbody>'
+      html
     end
 
     def table_row(options = {})
@@ -48,9 +57,13 @@ module EasyAdminUi
             cell_opts ||= {}
             content_tag(:td, txt, cell_opts)
           end,
-          options[:actions].blank? ? '' : content_tag(:td, options[:actions].join(' '), :class => "act")
-        ].join(' '),
-        :id => options[:id], :class => ["#{cyc = cycle("even", "odd")}", options[:class]].join(' '))
+          options[:actions].blank? ? '' : content_tag(:td, options[:actions].join(' ').html_safe, :class => "act")
+        ].join(' ').html_safe,
+        :id => options[:id], :class => ["#{cyc = cycle("even", "odd")}", options[:class]].join(' ')).html_safe
+    end
+
+    def my_table_end
+      '</tbody></table>'.html_safe
     end
 
     def right_align(content)
@@ -62,7 +75,7 @@ module EasyAdminUi
     end
 
     def admin_new_link
-      content_tag(:span, ' - ' + link_to('New', :action => 'new'))
+      content_tag(:span, raw(' - ') + link_to('New', :action => 'new'))
     end
 
     def admin_edit_link(item)
@@ -79,7 +92,7 @@ module EasyAdminUi
       delete_path ||= eval("#{obj.class.to_s.underscore.singularize}_path(obj)")
       link_to_function(image_tag('/images/icons/delete.png'), "$('cnf_#{obj.id}').show();") + ' ' +
         raw('<span id="cnf_' + obj.id.to_s + '" class="conf_link" style="display: none;">Are you sure? ') +
-        link_to_remote("Yes", :url => delete_path, :method => :delete) + ' ' +
+        link_to("Yes", delete_path, :method => :delete, :remote => true) + ' ' +
         link_to_function("No", "$('cnf_#{obj.id}').hide();") + raw('</span>')
     end
   end

data/templates/easy_admin_ui/edit.html.erb

@@ -10,11 +10,11 @@
   <%= render :partial => 'after_title' %>
 <% end -%>
 
-<% semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore}_path(@item)"), :html => { :multipart => true }) do |f| %>
-  <% f.inputs do %>
+<%= semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore}_path(@item)"), :html => { :multipart => true }) do |f| %>
+  <%= f.inputs do %>
     <%= render :partial => 'form', :locals => {:f => f} %>
   <% end -%>
-  <% f.buttons do %>
+  <%= f.buttons do %>
     <%= f.commit_button 'Submit' %>
   <% end -%>
 <% end -%>

data/templates/easy_admin_ui/index.html.erb

@@ -8,9 +8,7 @@
 
 <%= wpaginate @items if @items.respond_to?(:total_pages) %>
 
-<% table_head(@options[:columns], @options[:actions]) do %>
-  <%= render @items %>
-<% end -%>
+<%= table(@items, @options[:columns], @options[:actions]) %>
 
 <%= wpaginate @items if @items.respond_to?(:total_pages) %>
 

data/templates/easy_admin_ui/new.html.erb

@@ -10,11 +10,11 @@
   <%= render :partial => 'after_title' %>
 <% end -%>
 
-<% semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore.pluralize}_path"), :html => { :multipart => true }) do |f| %>
-  <% f.inputs do %>
+<%= semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore.pluralize}_path"), :html => { :multipart => true }) do |f| %>
+  <%= f.inputs do %>
     <%= render :partial => 'form', :locals => {:f => f} %>
   <% end -%>
-  <% f.buttons do %>
+  <%= f.buttons do %>
     <%= f.commit_button 'Submit' %>
   <% end -%>
 <% end -%>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: easy_admin_ui
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Martin Moen Wulffeld
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -57,23 +58,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy Admin UI.