RubyGems - mdd - Versions diffs - 3.1.1 → 3.1.2 - Mend

mdd 3.1.1 → 3.1.2

Files changed (61) hide show

data/lib/generators/mdwa/sandbox/templates/app/views/layouts/login.html.erb CHANGED

@@ -5,6 +5,9 @@
 	  <%= stylesheet_link_tag "mdwa/login_manifest", :media => "all" %>
   	  <%= javascript_include_tag "mdwa/login_manifest" %>
   	  <%= csrf_meta_tags %>
+      <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,600,300' rel='stylesheet' type='text/css'>
 	</head>
 	<body>
@@ -12,7 +15,7 @@
 		<div id="mainbody">
 			<%= render '/template/mdwa/login_text' %>
-	  		<%= yield %>
+  		<%= yield %>
 		</div>
 	</body>

data/lib/generators/mdwa/sandbox/templates/app/views/layouts/public.html.erb CHANGED

@@ -3,10 +3,10 @@
 	<head>
 	  <title>MDWA Public pages</title>
 	  <%= stylesheet_link_tag "mdwa/public_manifest", :media => "all" %>
-  	  <%= javascript_include_tag "mdwa/public_manifest" %>
-  	  <%= csrf_meta_tags %>
+	  <%= javascript_include_tag "mdwa/public_manifest" %>
+	  <%= csrf_meta_tags %>
 	</head>
 	<body>
-  		<%= yield %>
+		<%= yield %>
 	</body>
 </html>

data/lib/generators/mdwa/sandbox/templates/app/views/layouts/system.html.erb CHANGED

@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>MDWA Application</title>
+    <title>MDWA Application - Administration</title>
     <%= stylesheet_link_tag 'mdwa/system_manifest' %>
     <%= javascript_include_tag 'mdwa/system_manifest' %>
     <%= csrf_meta_tag %>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,700,600,300' rel='stylesheet' type='text/css'>
   </head>
   <body>
@@ -14,7 +16,7 @@
     <div id="header" class="yui3-g">
       <div id="logo" class="yui3-u-1-3">
-        <%= link_to "MDWA Application", a_root_path, :target => '_self' %>
+        <%= link_to image_tag('rails.png'), a_root_path, :target => '_self' %>
       </div>
       <div id="logged_info" class="yui3-u-1-3">
         <%= render "/a/users/welcome" %>
@@ -22,8 +24,8 @@
       <div class="clear"></div>
     </div>
-    <div id="leftbar">
-      <%= render '/template/mdwa/leftbar' %>
+    <div id="menu">
+      <%= render '/template/mdwa/menubar' %>
     </div>
     <div id="content">

data/lib/generators/mdwa/sandbox/templates/app/views/template/mdwa/_login_text.html.erb ADDED

@@ -0,0 +1,4 @@
+<div id="login_session_text">
+  <%= image_tag 'rails.png' %>
+  <%= t('login.login_text_pre_form').html_safe %>
+</div>

data/lib/generators/mdwa/sandbox/templates/app/views/template/mdwa/_menubar.html.erb ADDED

@@ -0,0 +1,3 @@
+<ul>
+  <%= render '/template/mdwa/menubar/administrators' %>
+</ul>

data/lib/generators/mdwa/sandbox/templates/app/views/template/mdwa/menubar/_administrators.html.erb ADDED

@@ -0,0 +1,10 @@
+<% if can? :index, A::Administrator %>
+  <li>
+    <%= link_to a_administrators_path do %><span><%= t 'menu.administrators' %></span><% end %>
+    <% if can? :create, A::Administrator %>
+      <ul class="submenu">
+        <li><%= link_to new_a_administrator_path do %><span><%= t( 'menu.add_administrator' ) %></span><% end %></li>
+      </ul>
+    <% end %>
+  </li>
+<% end %>

data/lib/generators/mdwa/sandbox/templates/config/initializers/mime_types.rb ADDED

	@@ -0,0 +1,2 @@
1	+ # -- encoding : utf-8 --
2	+ Mime::Type.register "application/xls", :xls

data/lib/generators/mdwa/sandbox/templates/config/locales/mdwa.en.yml CHANGED

@@ -5,6 +5,14 @@ en:
     login_button_label: "Login"
     login_text_pre_form: "Welcome to a MDWA software. <br />Please login to access this app."
+  will_paginate:
+    previous_label: "Previous"
+    next_label: "Next"
+    page_gap: "&hellip;"
+    all: '- All -'
+    show_label: 'Show'
   system:
     error: "error"
     logged_info_user: "Welcome, <span>%{user}</span>."

data/lib/generators/mdwa/sandbox/templates/deploy.sh ADDED

@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Procedure for updating the production version
+# Usage: sh deploy.sh <production|staging>
+BRANCH=$1
+git reset --hard
+git checkout $BRANCH
+git pull origin $BRANCH
+rm -rf .bundle vendor/bundle
+bundle install
+bundle install --deployment
+rake db:migrate RAILS_ENV=production
+rake db:seed RAILS_ENV=production
+chown -R www-data:www-data .
+chmod -R 744 .

data/lib/generators/mdwa/templates/templates/scaffold/controller.erb CHANGED

@@ -17,7 +17,7 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
     -%>
     <%- if !atributos_com_filtro.count.zero? -%>
       <%- atributos_com_filtro.each do |atributo| -%>
-        <%- if [:integer, :float, :decimal, :boolean].include? atributo.type.to_sym  -%>
+        <%- if [:integer, :float, :decimal, :boolean, :status].include? atributo.type.to_sym  -%>
     conditions << "(<%= @model.plural_name %>.<%= atributo.name %> = '#{params[:<%= atributo.name %>]}')" unless params[:<%= atributo.name %>].blank?
         <%- elsif [:string, :text].include? atributo.type.to_sym  -%>
     conditions << "(<%= @model.plural_name %>.<%= atributo.name %> LIKE '%#{params[:<%= atributo.name %>]}%')" unless params[:<%= atributo.name %>].blank?
@@ -37,11 +37,15 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
     conditions << "(<%= @model.plural_name %>.<%= associacao.name %>_id = #{params[:<%= associacao.name %>_id]})" unless params[:<%= associacao.name %>_id].blank?
     <%- end -%>
-    @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page], :per_page => params[:per_page], :conditions => conditions.join(' AND ')
+    @<%= @model.plural_name %> = <%= @model.klass %>.not_removed.where(conditions.join(' AND '))
+    unless params[:skip_pagination]
+      @<%= @model.plural_name %> = @<%= @model.plural_name %>.paginate page: params[:page], per_page: params[:per_page]
+    end
     respond_to do |format|
       format.html
       format.js
+      format.xls
     end
   end
@@ -149,7 +153,9 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
   def destroy
     @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
-    @system_notice = t('<%= @model.plural_name %>.notice.destroy') if @<%= @model.singular_name %>.destroy
+    @<%= @model.singular_name %>.removed = true
+    @system_notice = t('<%= @model.plural_name %>.notice.destroy') if @<%= @model.singular_name %>.save
     respond_to do |format|
     <%- if @entity.ajax? -%>
@@ -159,6 +165,18 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
     <%- end -%>
     end
   end
+  def batch_update
+    <%= @model.klass %>.where(id: params[:ids]).each do |<%= @model.singular_name %>|
+      <%= @model.singular_name %>.update_column( params[:attribute], params[:value] )
+    end
+    @system_notice = t('<%= @model.plural_name %>.notice.batch_update')
+    respond_to do |format|
+      format.js
+    end
+  end
 end

data/lib/generators/mdwa/templates/templates/scaffold/model.erb CHANGED

@@ -5,51 +5,93 @@ class <%= @model.klass %> < <%= !@entity.user? ? 'ActiveRecord::Base' : 'User' %
 <%- # model attributes -%>
 <%- unless @model.attributes.count.zero? -%>
-    attr_accessible <%= @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.collect {|a| ":" + a.name }.join(', ') %>
+  attr_accessible <%= @model.attributes.select{|a| !['id', 'created_at', 'updated_at', 'removed'].include?(a.name)}.collect {|a| ":" + a.name }.join(', ') %>
 <%- end -%>
 <%- # paperclip file uploads -%>
 <%- unless @model.attributes.select{|attr| attr.type.to_sym == :file}.count.zero? -%>
-    has_attached_file <%= @model.attributes.select{|attr| attr.type.to_sym == :file}.collect {|a| ":" + a.name }.join(', ') %>
+  has_attached_file <%= @model.attributes.select{|attr| attr.type.to_sym == :file}.collect {|a| ":" + a.name }.join(', ') %>
 <%- end -%>
 <%- if @entity.user? -%>
   <%- require_all "#{MDWA::DSL::USERS_PATH}#{@entity.file_name}.rb" -%>
   <%- @roles =  MDWA::DSL.user(@entity.name).nil? ? @roles = [@model.name] : MDWA::DSL.user(@entity.name).user_roles -%>
   <%- @roles.each do |role| -%>
-    after_create :create_<%= role.underscore %>_permission
-    def create_<%= role.underscore %>_permission
-      <%= role.underscore %>_permission = Permission.find_by_name('<%= role.underscore %>')
-      <%= role.underscore %>_permission = Permission.create(:name => '<%= role.underscore %>') if <%= role.underscore %>_permission.nil?
-      self.permissions.push <%= role.underscore %>_permission
-    end
+  after_create :create_<%= role.underscore %>_permission
+  def create_<%= role.underscore %>_permission
+    <%= role.underscore %>_permission = Permission.find_by_name('<%= role.underscore %>')
+    <%= role.underscore %>_permission = Permission.create(:name => '<%= role.underscore %>') if <%= role.underscore %>_permission.nil?
+    self.permissions.push <%= role.underscore %>_permission
+  end
   <%- end -%>
 <%- end -%>
 <%- # model associations -%>
 <%- @model.associations.each do |association| -%>
   <%- if association.belongs_to? -%>
-    belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
-    attr_accessible :<%= association.model2.singular_name.foreign_key %>
+  belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+  attr_accessible :<%= association.model2.singular_name.foreign_key %>
   <%- end -%>
   <%- if association.has_one? -%>
-    has_one :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+  has_one :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
   <%- end -%>
   <%- if association.has_many? -%>
-    has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>'
+  has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>'
   <%- end -%>
   <%- if association.has_and_belongs_to_many? -%>
-    has_and_belongs_to_many :<%= association.model2.plural_name %>, :join_table => :<%= association.ordered.first.plural_name %>_<%= association.ordered.last.plural_name %>
+  has_and_belongs_to_many :<%= association.model2.plural_name %>, :join_table => :<%= association.ordered.first.plural_name %>_<%= association.ordered.last.plural_name %>
   <%- end -%>
   <%- if association.nested_one? -%>
-    belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
-    attr_accessible :<%= association.model2.singular_name %>_attributes, :<%= association.model2.singular_name.foreign_key %>
-    accepts_nested_attributes_for :<%= association.model2.singular_name %>, :allow_destroy => true
+  belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+  attr_accessible :<%= association.model2.singular_name %>_attributes, :<%= association.model2.singular_name.foreign_key %>
+  accepts_nested_attributes_for :<%= association.model2.singular_name %>, :allow_destroy => true
   <%- end -%>
   <%- if association.nested_many? -%>
-    has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>', :dependent => :destroy
-    attr_accessible :<%= association.model2.plural_name %>_attributes
-    accepts_nested_attributes_for :<%= association.model2.plural_name %>, :allow_destroy => true
+  has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>', :dependent => :destroy
+  attr_accessible :<%= association.model2.plural_name %>_attributes
+  accepts_nested_attributes_for :<%= association.model2.plural_name %>, :allow_destroy => true
   <%- end -%>
 <%- end -%>
+  scope :not_removed, -> {where('removed != 1')}
+<%- # create the status attributes %>
+<%- if @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.count > 0 -%>
+<%- @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.each do |name, attr| -%>
+  <%- attr.options[:possible_values].each_with_index do |value, index| -%>
+  <%= value.to_s.underscore.upcase %> = <%= index %>
+  <%- end -%>
+<%- end -%>
+<%- @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.each do |name, attr| -%>
+  <%- attr.options[:possible_values].each do |value| -%>
+  def <%= attr.name.to_s + '_' + value.to_s.underscore %>?
+    <%= attr.name.to_s %> == <%= value.to_s.underscore.upcase %>
+  end
+  <%- end -%>
+  def <%= attr.name.to_s %>_to_s
+  <%- attr.options[:possible_values].each do |value| -%>
+    return I18n.t('<%= @model.plural_name %>.<%= attr.name %>.<%= value.to_s.underscore %>') if <%= attr.name.to_s + '_' + value.to_s.underscore %>?
+  <%- end -%>
+  end
+<%- end -%>
+<%- @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.each do |name, attr| -%>
+  def self.<%= attr.name.to_s %>_to_select
+    [
+  <%- attr.options[:possible_values].each do |value| -%>
+      [I18n.t('<%= @model.plural_name %>.<%= attr.name %>.<%= value.to_s.underscore %>'), <%= value.to_s.underscore.upcase %>],
+  <%- end -%>
+    ]
+  end
+<%- end -%>
+<%- end -%>
+<%- # create boolean methods for all boolean attributes %>
+<%- @model.attributes.select{|attr| attr.type.to_sym == :boolean}.each do |attr| -%>
+  def <%= attr.name %>?
+    <%= attr.name %>
+  end
+<%- end -%>
 end

data/lib/generators/mdwa/templates/templates/scaffold/views/_form.html.erb CHANGED

@@ -2,13 +2,11 @@
 <%%= <%= 'nested_' if @model.nested_many? %>form_for(<%= @model.to_route_object('@') %><%= ", :remote => true, :html => {:class => :mdwa_ajax #{',:multipart => true' unless @model.attributes.select{|attr| attr.type.to_sym == :file}.count.zero?}}" if @entity.ajax %>) do |f| %>
 	<div id="mdwa_error">
-	   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
+   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
 	</div>
 	<div class="yui3-g">
-		<div class="yui3-u">
-			<%%= render 'form_fields', :f => f %>
-  	  	</div>
+		<%%= render 'form_fields', :f => f %>
 	</div>
 	<div class="actions">
@@ -17,7 +15,7 @@
 		<%- else -%>
 		<%%= link_to t('system.cancel_button'), '#', :class => :cancel %>
 		<%- end -%>
-	    <%%= f.submit t('system.save_button'), :class => :button %>
+    <%%= f.submit t('system.save_button'), :class => :button %>
 	</div>
 <%% end %>

data/lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb CHANGED

@@ -1,29 +1,37 @@
 ===entity_code===
-<%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr| -%>
-<div class="field">
+<%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at', 'removed'].include?(a.name)}.each do |attr| -%>
+<div class="yui3-u-1-3">
+	<div class="field">
    	<%%= f.label :<%= attr.name %>, t('<%= @model.plural_name %>.edit.<%= attr.name %>') %>
-	<%- if attr.type.to_sym == :file -%>
-	<%% if !@<%= @model.singular_name %>.new_record? and !@<%= @model.singular_name %>.<%= attr.name %>.blank? %>
-		<span><%%= link_to image_tag(file_icon_path(@<%= @model.singular_name %>.<%= attr.name %>_file_name)), @<%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %></span>
-	<%% end %>
-	<%- end -%>
-   	<%%= f.<%= attr.form_field %> :<%= attr.name %> %>
+		<%- if attr.type.to_sym == :file -%>
+		<%% if !@<%= @model.singular_name %>.new_record? and !@<%= @model.singular_name %>.<%= attr.name %>.blank? %>
+			<span><%%= link_to image_tag(file_icon_path(@<%= @model.singular_name %>.<%= attr.name %>_file_name)), @<%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %></span>
+		<%% end %>
+			<%%= f.<%= attr.form_field %> :<%= attr.name %> %>
+		<%- elsif attr.type.to_sym == :status -%>
+			<%%= f.select :<%= attr.name %>, options_for_select(<%= @model.klass %>.<%= attr.name %>_to_select, f.object.<%= attr.name %>), :prompt => t('<%= @model.plural_name %>.<%= attr.name %>.prompt_select') %>
+		<%- else -%>
+	   	<%%= f.<%= attr.form_field %> :<%= attr.name %><%= ', class: :datepicker' if attr.type.to_sym == :date %> %>
+   	<%- end -%>
+	</div>
 </div>
 <%- end # model.attributes.each -%>
 <%- @model.associations.each do |assoc| -%>
 <%- next if assoc.skip_views? %>
 <%- if assoc.belongs_to? -%>
-<div class="field">
-	<%%= f.label :<%= assoc.model2.singular_name.foreign_key %>, t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>') %>
-	<%%= f.select :<%= assoc.model2.singular_name.foreign_key %>,
-		  options_for_select( <%= assoc.model2.klass %>.order('<%= assoc.reference_field %> ASC').collect{ |c| [c.<%= assoc.reference_field %>, c.id] }, f.object.<%= assoc.model2.singular_name.foreign_key %> ),
-			:prompt => t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>_select') %>
+<div class="yui3-u-1-3">
+	<div class="field">
+		<%%= f.label :<%= assoc.model2.singular_name.foreign_key %>, t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>') %>
+		<%%= f.select :<%= assoc.model2.singular_name.foreign_key %>,
+			  options_for_select( <%= assoc.model2.klass %>.not_removed.order('<%= assoc.reference_field %> ASC').collect{ |c| [c.<%= assoc.reference_field %>, c.id] }, f.object.<%= assoc.model2.singular_name.foreign_key %> ),
+				:prompt => t('<%= @model.plural_name %>.edit.<%= assoc.model2.singular_name %>_select') %>
+	</div>
 </div>
 <%- end # if -%>
 <%- if assoc.has_and_belongs_to_many? and assoc.composition? -%>
-<div class="nested">
+<div class="yui3-u-1 nested">
 	<%%- <%= assoc.model2.klass %>.order('<%= assoc.reference_field %> ASC').each do |<%= assoc.model2.singular_name %>| -%>
 	<div class="checkbox">
 		<%%= check_box_tag '<%= assoc.model2.plural_name %>[]', <%= assoc.model2.singular_name %>.id, (@<%= @model.singular_name %>.<%= assoc.model2.plural_name %>.include?(<%= assoc.model2.singular_name %>) ? true : false) %>
@@ -34,7 +42,7 @@
 <%- end -%>
 <%- if assoc.nested? -%>
-<div class="nested">
+<div class="yui3-u-1 nested">
 	<%%= f.fields_for :<%= (assoc.nested_many?) ? assoc.model2.plural_name : assoc.model2.singular_name %> do |ff| %>
 		<%%= render '<%= assoc.model2.space %>/<%= assoc.model2.plural_name %>/form_fields', :f => ff %>
 	<%- unless assoc.nested_one? -%>

data/lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb CHANGED

@@ -1,36 +1,48 @@
 ===entity_code===
 <table class="list">
   <thead>
-      <th class="list_show"><%%= t '<%= @model.plural_name %>.index.id' %></th>
-    <%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at'].include?(a.name)}.each do |attr| -%>
-      <th><%%= t '<%= @model.plural_name %>.index.<%= attr.name %>' %></th>
-    <%- end -%>
-    <%- @model.associations.each do |assoc| -%>
-      <th><%%= t '<%= @model.plural_name %>.index.<%= assoc.model2.singular_name %>' %></th>
-    <%- end -%>
-      <th class="list_edit"><%%= t '<%= @model.plural_name %>.index.edit' %></th>
-      <th class="list_remove"><%%= t '<%= @model.plural_name %>.index.remove' %></th>
+  <%% if can? :update, <%= @model.klass %> %>
+    <th><%%= check_all_th %></th>
+  <%% end %>
+    <th class="list_show"><%%= t '<%= @model.plural_name %>.index.id' %></th>
+  <%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at', 'removed'].include?(a.name)}.each do |attr| -%>
+    <th><%%= t '<%= @model.plural_name %>.index.<%= attr.name %>' %></th>
+  <%- end -%>
+  <%- @model.associations.each do |assoc| -%>
+    <th><%%= t '<%= @model.plural_name %>.index.<%= assoc.model2.singular_name %>' %></th>
+  <%- end -%>
+    <th class="list_edit"><%%= t '<%= @model.plural_name %>.index.edit' %></th>
+    <th class="list_remove"><%%= t '<%= @model.plural_name %>.index.remove' %></th>
   </thead>
 <%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
   <tr class="<%%= cycle 'odd_line', 'even_line' %>" >
+    <%% if can? :update, <%= @model.klass %> %>
+    <td>
+      <%%= check_all_td(<%= @model.singular_name %>.id) %>
+    </td>
+    <%% end %>
     <td class="list_show">
-		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
-	</td>
+  		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", class: 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
+  	</td>
-  <%- @model.attributes.select{|a| a.name != 'id' and a.name != 'created_at' and a.name != 'updated_at'}.each do |attr| -%>
-	<td>
-		<%- if attr.type.to_sym == :file -%>
-		<%% unless <%= @model.singular_name %>.<%= attr.name %>_file_name.blank? %>
-			<%%= link_to image_tag(file_icon_path(<%= @model.singular_name %>.<%= attr.name %>_file_name)), <%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %>
-		<%% else %>
-			<%%= t 'system.no_file' %>
-		<%% end %>
-		<%- else -%>
-		<%%= <%= @model.singular_name %>.<%= attr.name %> %>
-		<%- end -%>
-	</td>
-  <%- end -%>
+    <%- @model.attributes.select{|a| !['id', 'created_at', 'updated_at', 'removed'].include?(a.name)}.each do |attr| -%>
+  	<td>
+  		<%- if attr.type.to_sym == :file -%>
+  		<%% unless <%= @model.singular_name %>.<%= attr.name %>_file_name.blank? %>
+  			<%%= link_to image_tag(file_icon_path(<%= @model.singular_name %>.<%= attr.name %>_file_name)), <%= @model.singular_name %>.<%= attr.name %>.url, :target => '_blank' %>
+  		<%% else %>
+  			<%%= t 'system.no_file' %>
+  		<%% end %>
+  		<%- elsif attr.type.to_sym == :status -%>
+      <%%= <%= @model.singular_name %>.<%= attr.name %>_to_s %>
+      <%- else -%>
+  		<%%= <%= @model.singular_name %>.<%= attr.name %> %>
+  		<%- end -%>
+  	</td>
+    <%- end -%>
 	<%- @model.associations.each do |assoc| -%>
     <td>
@@ -49,8 +61,8 @@
       <%%= link_to t('<%= @model.plural_name %>.index.edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
     </td>
     <td class="list_remove">
-		<%%= link_to t('<%= @model.plural_name %>.index.remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('<%= @model.plural_name %>.index.confirm_deletion')} %>
-	</td>
+  		<%%= link_to t('<%= @model.plural_name %>.index.remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('<%= @model.plural_name %>.index.confirm_deletion')} %>
+  	</td>
   </tr>
 <%% end %>
 </table>