admin_data 1.0.22 → 1.1.0

data/app/views/admin_data/crud/association/_association_info.html.erb

@@ -0,0 +1,11 @@
+<div class="block rounded">
+  <h3>Association Information</h3>
+  <div class='content association_info'>
+    <% if AdminData::ActiveRecordUtil.has_association_info?(klass) %>
+      <%= render 'admin_data/crud/association/belongs_to_info' ,  :klass => klass, :model => model %>
+      <%= render 'admin_data/crud/association/has_one_info',      :klass => klass, :model => model %>
+      <%= render 'admin_data/crud/association/has_many_info' ,    :klass => klass, :model => model %>
+      <%= render 'admin_data/crud/association/habtm_info' ,       :klass => klass, :model => model %>
+    <% end %>
+  </div>
+</div>

data/app/views/admin_data/crud/association/_belongs_to_info.html.erb

@@ -0,0 +1,7 @@
+<% if AdminData::ActiveRecordUtil.declared_belongs_to_association_names(klass).any? %>
+  <p class='belongs_to'>
+    <strong>belongs_to :</strong>
+    &nbsp;
+    <%= belongs_to_data(model, klass).html_safe %>
+  </p>
+<% end %>

data/app/views/admin_data/{main → crud}/association/_habtm_info.html.erb

@@ -1,7 +1,7 @@
 <% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
   <p>
     <strong>has_and_belongs_to_many :</strong>
-    <%= admin_data_habtm_data(model, klass).html_safe %>
+    <%= habtm_data(model, klass).html_safe %>
     &nbsp;
-  </p> 
-<% end %>  
+  </p>
+<% end %>

data/app/views/admin_data/{main → crud}/association/_has_many_info.html.erb

@@ -1,7 +1,7 @@
 <% if AdminData::ActiveRecordUtil.declared_has_many_association_names(klass).any? %>
   <p>
     <strong>has_many :</strong>
-    <%= admin_data_has_many_data(model, klass).html_safe %>
+    <%= has_many_data(model, klass).html_safe %>
     &nbsp;
-  </p> 
-<% end %>  
+  </p>
+<% end %>

data/app/views/admin_data/crud/association/_has_one_info.html.erb

@@ -0,0 +1,6 @@
+<% if AdminData::ActiveRecordUtil.declared_has_one_association_names(klass).any? %>
+  <p>
+    <strong>has_one :</strong>
+    <%= has_one(model, klass).html_safe %>
+  </p>
+<% end %>

data/app/views/admin_data/{main → crud}/edit.html.erb

@@ -1,22 +1,22 @@
 <div id="main">
   <div>
     <h1 class='search_path'>
-      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
+      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>
       >
-      <%= link_to "ID #{@model.id}", ''%>  
+      <%= link_to "ID #{@model.id}", ''%>
     </h1>
     <div class='clear'></div>
   </div>
 
   <div class="block" id="block-tables">
 
-    <div class="content rounded">          
+    <div class="content rounded">
       <div class="inner umbrella">
-        <% url = admin_data_path(:klass => @klass.name, :id => @model)  
+        <% url = admin_data_path(:klass => @klass.name, :id => @model)
            html_options = {:class => 'form', :method => :put} %>
            <%= form_for @model, :as => @klass.name.underscore.to_sym, :url => url, :html=> html_options do |f| %>
           <%= render 'admin_data/shared/flash_message', :model => @model %>
-          <%= render 'admin_data/main/misc/form', :klass => @klass, :f => f %>
+          <%= render 'admin_data/crud/misc/form', :klass => @klass, :f => f %>
         <% end %>
       </div>
     </div>
@@ -25,12 +25,12 @@
 </div>
 
 <div id="sidebar">
-  <%= render 'admin_data/main/association/association_info', :klass => @klass, :model => @model %>
-  <%= render 'admin_data/main/misc/modify_record', :model => @model, :klass => @klass %>
-</div>  
+  <%= render 'admin_data/crud/association/association_info', :klass => @klass, :model => @model %>
+  <%= render 'admin_data/crud/misc/modify_record', :model => @model, :klass => @klass %>
+</div>
 
 <style type="text/css">
   #main {
     width:70%;
   }
-</style>  
+</style>

data/app/views/admin_data/{main → crud}/misc/_form.html.erb

@@ -4,13 +4,13 @@
     <span class='col_type'>[<%= col.type.to_s %>]</span>
   </div>
   <div class='data'>
-    <%= admin_data_form_field(klass, @model, col, f).html_safe %>
-  </div>  
+    <%= form_field(klass, @model, col, f).html_safe %>
+  </div>
 <% end %>
 
 <% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
   <div class='data'>
-    <%= admin_data_form_field_for_habtm_records(klass, @model, f, '').html_safe %>
+    <%= form_field_for_habtm_records(klass, @model, f, '').html_safe %>
   </div>
 <% end %>
 
@@ -24,15 +24,15 @@
 </div>
 
 <style>
-  .col_name { 
+  .col_name {
     color: #222;
     font-size: 15px;
   }
   .col_type {
     color: dimgray;
   }
-  .col_box { 
+  .col_box {
     margin-top: 20px;
     padding-bottom: 4px;
   }
-</style>   
+</style>

data/app/views/admin_data/{main → crud}/misc/_modify_record.html.erb

@@ -1,16 +1,16 @@
-<% if controller.send(:admin_data_is_allowed_to_update?) %>
+<% if controller.send(:is_allowed_to_update?) %>
   <div class="block rounded">
     <h3>Modify Record</h3>
     <div style='padding-left:15px'>
       <p>
-        <%= link_to 'Edit', admin_data_edit_path(:klass => klass.name.underscore, :id => model) %> 
+        <%= link_to 'Edit', admin_data_edit_path(:klass => klass.name.underscore, :id => model) %>
       </p>
       <p>
         <%= link_to 'Delete', admin_data_del_path(:klass => klass.name.underscore, :id => model) ,
-               { :confirm => ' You are deleting (not destroying) a record. Are you sure?', :method => :delete} %> 
+               { :confirm => ' You are deleting (not destroying) a record. Are you sure?', :method => :delete} %>
       </p>
       <p>
-        <%= link_to "Destroy", admin_data_path(:klass => klass.name.underscore, :id => model), 
+        <%= link_to "Destroy", admin_data_path(:klass => klass.name.underscore, :id => model),
               { :confirm => 'You are destroying a record. Are you sure?', :method => :delete} %>
       </p>
     </div>

data/app/views/admin_data/{main → crud}/new.html.erb

@@ -1,23 +1,23 @@
 <div id="main">
 
-  <%= admin_data_breadcrum do %>
-    <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %> 
+  <%= breadcrum do %>
+    <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>
   <% end %>
 
   <div class="block" id="block-tables">
     <div class="secondary-navigation">
       <%= render 'admin_data/shared/secondary_navigation', :klass => @klass %>
       <div class="clear"></div>
-    </div>          
+    </div>
 
-    <div class="content rounded">          
+    <div class="content rounded">
       <div class="inner umbrella">
         <h1>Create a new record</h1>
-        <%= form_for @model,  :as => @klass.name.underscore.to_sym, 
-                              :url  => admin_data_index_path(:klass => @klass.name), 
+        <%= form_for @model,  :as => @klass.name.underscore.to_sym,
+                              :url  => admin_data_index_path(:klass => @klass.name),
                               :html => {:class => 'form', :method => :post} do |f| %>
           <%= render 'admin_data/shared/flash_message', :model => @model %>
-          <%= render 'admin_data/main/misc/form', :klass => @klass, :f => f %>
+          <%= render 'admin_data/crud/misc/form', :klass => @klass, :f => f %>
         <% end %>
       </div>
     </div>

data/app/views/admin_data/{main → crud}/show.html.erb

@@ -2,25 +2,25 @@
 
   <div>
     <h1 class='search_path'>
-      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
+      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>
       >
-      <%= link_to "ID #{@model.id}", ''%>  
+      <%= link_to "ID #{@model.id}", ''%>
     </h1>
     <div class='clear'></div>
   </div>
 
   <%= render 'admin_data/shared/flash_message', :model => @model %>
-  
+
   <div class="block" id="block-tables">
-    <div class="content rounded">          
+    <div class="content rounded">
       <div class="inner">
         <table class="table with_border" cellspacing="3" cellpadding="3">
           <% AdminData::Util.label_values_pair_for(@model, self).each do |pair| %>
             <tr>
               <td><%=pair[0]%></td>
               <td class='smaller'><%=pair[1]%></td>
-            </tr>   
-          <% end %>   
+            </tr>
+          <% end %>
         </table>
       </div>
     </div>
@@ -28,9 +28,9 @@
 </div>
 
 <div id="sidebar">
-  <%= render 'admin_data/main/association/association_info', :klass => @klass, :model => @model %>
-  <%= render 'admin_data/main/misc/modify_record', :model => @model, :klass => @klass %>
-</div> 
+  <%= render 'admin_data/crud/association/association_info', :klass => @klass, :model => @model %>
+  <%= render 'admin_data/crud/misc/modify_record', :model => @model, :klass => @klass %>
+</div>
 
 <style>
   #main {
@@ -39,4 +39,4 @@
   table.with_border td.smaller {
     font-size: 120%;
   }
-</style>  
+</style>

data/app/views/admin_data/{main → home}/index.html.erb

@@ -1,6 +1,6 @@
 <div id="main">
   <div class="block" id="block-tables">
-    <div class="content rounded select_box">          
+    <div class="content rounded select_box">
       <h2 id='main_page_label'>Select from the drop down menu above</h2>
       <div class="clear"></div>
     </div>
@@ -18,4 +18,4 @@
     color: dimgray;
     font-size:15px;
   }
-</style>   
+</style>

data/app/views/admin_data/migration/index.html.erb

@@ -1,15 +1,15 @@
 <div id="main">
   <div class="block" id="block-tables">
-    <div class="content rounded">          
+    <div class="content rounded">
       <h2 class="title">Migration Information from schema_migrations table</h2>
       <div class="inner">
         <table class="table colorize">
-          <tr>             
+          <tr>
             <th class='first last'>version</th>
           </tr>
           <% @data.each do |record| %>
             <tr><td><%=record.values.first%></td></tr>
-          <% end %>  
+          <% end %>
         </table>
       </div>
       <div class="clear"></div>

data/app/views/admin_data/search/_search_base.html.erb

@@ -10,21 +10,21 @@
   <div class="secondary-navigation">
     <%= render 'admin_data/shared/secondary_navigation', :klass => klass %>
     <div class="clear"></div>
-  </div>          
+  </div>
 
-  <div class="content">         
+  <div class="content">
     <% if advance_search %>
       <%= render 'admin_data/search/search/advance_search_form', :klass => klass %>
     <% else %>
       <%= render 'admin_data/search/search/search_form', :klass => klass %>
-    <% end %>  
+    <% end %>
   </div>
 
   <div class='clear'></div>
 
-  <div class='main2 rounded'> 
+  <div class='main2 rounded'>
     <div class="block" id="block-tables">
-      <div class="content">          
+      <div class="content">
         <div class='inner'>
           <div id='results'>
             <% if params[:action] == 'quick_search' %>

data/app/views/admin_data/search/quick_search.html.erb

@@ -1,6 +1,6 @@
 <div id='main'>
-  <%= render '/admin_data/search/search_base' , :klass => @klass, 
-                                                :model => @model, 
-                                                :records => @records, 
+  <%= render '/admin_data/search/search_base' , :klass => @klass,
+                                                :model => @model,
+                                                :records => @records,
                                                 :advance_search => false %>
-</div>  
+</div>

data/app/views/admin_data/search/search/_listing.html.erb

@@ -1,6 +1,6 @@
 <%@records = @relation.order(@order).paginate(:page => params[:page]) if @records.nil?%>
-<%= render :partial => 'admin_data/search/search/title', :locals => { 
-                                                            :records => @records, 
+<%= render :partial => 'admin_data/search/search/title', :locals => {
+                                                            :records => @records,
                                                             :total_num_of_children => @total_num_of_children } %>
 
 <div class="pagination">
@@ -12,25 +12,27 @@
 
   <thead>
      <tr>
-      <% AdminData::Util.columns_order(klass.name).each do |column| %>
-        <th> <%= column %> </th>
+      <% columns_order(klass).each do |column| %>
+        <th> <%= column_title(klass, column) %> </th>
       <% end %>
     </tr>
   </thead>
 
+  <tbody>
   <% @records.each do |record| %>
     <tr>
-      <% AdminData::Util.columns_order(klass.name).each do |column| %>
+      <% columns_order(klass).each do |column| %>
         <td>
           <% if (column == klass.primary_key) %>
-            <%= link_to(record.send(column), admin_data_path(:klass => klass.name.underscore, :id => record)) %>
+            <%= link_to(record.to_param.to_s, admin_data_path(:klass => klass.name.underscore, :id => record)) %>
          <% else %>
-            <%=h  admin_data_get_value_for_column(admin_data_column_native(klass, column), record) %>
-          <% end %>  
+            <%=h get_value_for_column(column_native(klass, column), record) %>
+          <% end %>
         </td>
       <% end %>
     </tr>
-  <% end %>  
+  <% end %>
+  </tbody>
 </table>
 
 <div class="pagination">

data/app/views/admin_data/search/search/_sortby.html.erb

@@ -1,12 +1,13 @@
 <label class='label sortby_label'>Sort by</label>
+
 <select name='sortby' id='sortby'>
   <%= AdminData::Util.build_sort_options(klass, params[:sortby]).html_safe %>
 </select>
 
 <style>
-  .sortby_label { 
+  .sortby_label {
     float: left;
-    vertical-align: bottom; 
+    vertical-align: bottom;
     margin-left: 40px;
     width: 70px;
   }
@@ -14,5 +15,5 @@
     width: 200px;
     float: left;
   }
-</style>   
+</style>
 

data/app/views/admin_data/search/search/_title.html.erb

@@ -1,15 +1,15 @@
 <div>
-  <h2 class='title' id='search_result_title'> 
+  <h2 class='title' id='search_result_title'>
     <%= search_result_title(total_num_of_children, records) %>
   </h2>
 
-  <% if admin_data_is_allowed_to_update? && params[:action] == 'advance_search' %>
+  <% if is_allowed_to_update? && params[:action] == 'advance_search' %>
     <div class='delete_destroy_box'>
       <span style=''>
         <%= link_to 'Delete All', '#', :id => 'advance_search_delete_all' %>
       </span>
       |
-      <span> 
+      <span>
         <%= link_to 'Destroy All', '#', :id => 'advance_search_destroy_all' %>
       </span>
     </div>
@@ -22,13 +22,13 @@
 <style>
   #search_result_title {
     float: left;
-    margin-top: 5px; 
-    padding-top: 5px; 
+    margin-top: 5px;
+    padding-top: 5px;
   }
-  .delete_destroy_box { 
+  .delete_destroy_box {
     float: left;
     margin-top: 6px;
     padding-top: 6px;
     margin-left: 20px;
   }
-</style>   
+</style>

data/app/views/admin_data/shared/_breadcrum.html.erb

@@ -1,10 +1,16 @@
 <div class='breadcrum rounded'>
-  <%= link_to 'Home',admin_data_index_path %>
-  >
+  <%= link_to 'Home', admin_data_root_path %>
+
+  <% unless data.blank? %>
+    >
+  <% end %>
+
   <%= data %>
+
   <% if params[:klass] && !(params[:action] == 'show') %>
     <span class='description'>
-      (<%= pluralize(@klass.count, 'record') %> ) 
-    </span>  
-  <% end %>  
+      (<%= pluralize(@klass.count, 'record') %> )
+    </span>
+  <% end %>
+
 </div>

data/app/views/admin_data/shared/_header.html.erb

@@ -1,13 +1,13 @@
 <div id="header">
-  <h1> &nbsp; </h1>  
+  <h1> &nbsp; </h1>
 
   <ul id='subnav'>
-    <li> 
-      <% label = "Back to Site " + image_tag('https://github.com/neerajdotname/admin_data/raw/master/public/images/site.png', :width => '12') %>
-      <%= link_to label.html_safe, '/' %> 
+    <li>
+      <% label = "Back to Site " + image_tag('site.png', :width => '12') %>
+      <%= link_to label.html_safe, '/' %>
     </li>
-    <li> 
-      <%= link_to AdminData::Config.setting[:app_name] , '/admin_data' %> 
+    <li>
+      <%= link_to 'admin_data' , '/admin_data' %>
     </li>
   </ul>