admin_data 1.0.16 → 1.0.17

data/History.txt

@@ -1,3 +1,12 @@
+
+=== 2010-10-12 v1.0.17
+* use image for advance search add and remove link
+* fix bug regarding "Destroy All"
+* layout change
+* have only one drop down in the homepage
+
+=== 2010-09-22 v1.0.11
+
 === 2010-10-12 v1.0.14
 * use the new way of routing. remove deprecation
 

data/app/views/admin_data/main/all_models.html.erb

@@ -1,11 +1,7 @@
 <div id="main">
   <div class="block" id="block-tables">
     <div class="content rounded select_box">          
-      <h2 style='margin-left:0;'>Select a model</h2>
-      <p class='notice'>
-        Note that this drop down is also available at top right corner of every page .
-      </p>
-      <%= render '/admin_data/shared/drop_down_klasses', :drop_down_for_klasses => @drop_down_for_klasses %>
+      <h2 style='margin-left:0;'>Select from the drop down menu above</h2>
       <div class="clear"></div>
     </div>
   </div>

data/app/views/admin_data/main/edit.html.erb

@@ -1,13 +1,12 @@
 <div id="main">
-  <%= admin_data_breadcrum do %>
-    <%= link_to @klass, admin_data_search_path(:klass => @klass.name.underscore) %> 
-    >
-    <%= link_to "ID #{@model.id}", ''%>  
-  <% end %>
-
-  <h2 class="title">
-    Editing <%=@model.class.name%> id <%=@model.id%>
-  </h2>        
+  <div>
+    <h1 style='float:left;font-weight:bold;font-size: 35px;'>
+      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
+      >
+      <%= link_to "ID #{@model.id}", ''%>  
+    </h1>
+    <div class='clear'></div>
+  </div>
 
   <div class="block" id="block-tables">
 

data/app/views/admin_data/main/show.html.erb

@@ -1,12 +1,13 @@
 <div id="main">
 
-  <%= admin_data_breadcrum do %>
-    <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %> 
-    >
-    <%= link_to "ID #{@model.id}", ''%>  
-  <% end %>
-
-  <h2 class="title"><%=@model.class.name%> ID <%=@model.id%></h2>        
+  <div>
+    <h1 style='float:left;font-weight:bold;font-size: 35px;'>
+      <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
+      >
+      <%= link_to "ID #{@model.id}", ''%>  
+    </h1>
+    <div class='clear'></div>
+  </div>
 
   <%= render 'admin_data/shared/flash_message', :model => @model %>
   

data/app/views/admin_data/main/table_structure.html.erb

@@ -15,7 +15,6 @@
       <h2 class="title"></h2>
       <div class="inner">
         <h1 class='table_name'>Table name : <%=@klass.send(:table_name)%></h1>
-        <h2>Columns</h2>
         <table class="table colorize">
           <tr>
             <th>Column Name</th>

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

@@ -1,8 +1,12 @@
-<%= admin_data_breadcrum do %>
-  <%= link_to klass.name, admin_data_search_path(:klass => klass.name.underscore) %> 
-<% end %>  
-
 <div class="block" id="block-text">
+
+  <div>
+    <h1 style='float:left;font-weight:bold;font-size: 35px;'> Listing <%=klass.name%></h1>
+    <h3 style='float:left;margin:22px 0 0 10px;color:gray;'><%=total_records_info(klass)%></h3>
+    <div class='clear'></div>
+  </div>
+
+
   <div class="secondary-navigation">
     <%= render 'admin_data/shared/secondary_navigation', :klass => klass %>
     <div class="clear"></div>

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

@@ -8,14 +8,15 @@
      </table>
 
       <div class='sortby_umbrella'>
-        <input type="submit" value="Search" class='submit_search' />
-        <div class='group'>     
-          <div class='sortby_text'>sort by</div>
+        <div class='group' style='padding-left:20px;'>     
+          <div class='sortby_text' style='font-size:16px;'>Sort by</div>
           <select name='sortby' id='sortby'>
             <%= AdminData::Util.build_sort_options(klass,params[:sortby]).html_safe %>
           </select>
+          <br />
         </div> 
         <div class='clear'></div>
+        <input type="submit" value="Search" class='submit_search' />
       </div> 
    </div>
 

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

@@ -2,7 +2,7 @@
 
   <div class='search_box'>
     <div id='quick_search'>
-      <label class='label keyword_label'>search keyword</label>
+      <label class='label keyword_label'>Search keyword</label>
       <input type="text" id="quick_search_input" name="query" value="<%=params[:query]%>" />
       <%= render :partial => 'admin_data/search/search/sortby', :locals => {:klass => klass} %>
       <div class='clear'></div>

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

@@ -1,4 +1,4 @@
-<label class='label sortby_label'>sort by</label>
+<label class='label sortby_label'>Sort by</label>
 <select name='sortby' id='sortby'>
   <%= AdminData::Util.build_sort_options(klass, params[:sortby]).html_safe %>
 </select>

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

@@ -1,4 +1,5 @@
 <select class='drop_down_value_klass' id='drop_down_klasses'> 
   <option></option>
   <%= options_for_select(drop_down_for_klasses, @drop_down_url) %> 
+  <option value="<%=admin_data_migration_information_path%>">Migration Information</option>
 </select>

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

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

data/app/views/layouts/admin_data.html.erb

@@ -12,9 +12,7 @@
 
     <%= AdminData::Util.google_hosted_jquery(self).html_safe %>
 
-    <!-- It is breaking the html markup and test is full of messages 
-          like ignoring attempt to close string with script Hence not including jquery.form in test -->
-    <%= AdminData::Util.javascript_include_tag('vendor/jquery.form').html_safe unless Rails.env.test? %> 
+    <%= AdminData::Util.javascript_include_tag('vendor/jquery.form').html_safe %> 
 
     <%= AdminData::Util.javascript_include_tag('vendor/log', 
                                                'vendor/rails',
@@ -23,9 +21,7 @@
                                                'advance_search/global_ajax_setting',
                                                'misc/js_util').html_safe %>
 
-    <!-- assert_tag is throwing a lot of warning with these inline javascripts.  
-    no need of these javascripts in test mode -->
-    <% if params[:action] == 'advance_search' && !Rails.env.test? %>
+    <% if params[:action] == 'advance_search' %>
       <%= AdminData::Util.javascript_include_tag(
                                                  'advance_search/advance_search', 
                                                  'advance_search/advance_search_structure', 

data/lib/admin_data/helpers.rb

@@ -1,5 +1,9 @@
 module AdminData::Helpers
 
+  def total_records_info(klass)
+    '(Total ' + pluralize(klass.count, 'record') + ' )'
+  end
+
   def search_result_title(total_num_of_children, records)
     output = []
     if params[:base]

data/lib/admin_data/railtie.rb

@@ -1,5 +1,4 @@
 require 'admin_data_date_validation'
-require 'admin_data/compatibility'
 require 'admin_data/settings'
 require 'admin_data/helpers'
 require 'admin_data/util'

data/lib/admin_data/settings.rb

@@ -5,6 +5,7 @@ class AdminData::Config
   def self.set=(input = {})
     valid_keys =
     %w(
+    app_name
     adapter_name
     find_conditions
     plugin_dir
@@ -36,6 +37,8 @@ class AdminData::Config
   def self.initialize_defaults
     self.setting = {
 
+      :app_name             => "admin_data",
+      # TODO get rid of plugin_dir
       :plugin_dir                   => File.expand_path(File.join(File.dirname(__FILE__), '..', '..')),
 
       :will_paginate_per_page       => 50,

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.0.16'
+  VERSION = '1.0.17'
 end

data/lib/admin_data.rb

@@ -14,7 +14,6 @@ require 'admin_data_date_validation'
 
 require 'admin_data/helpers'
 require 'admin_data/chelper'
-require 'admin_data/compatibility'
 require 'admin_data/settings'
 require 'admin_data/util'
 

data/lib/css/base.css

@@ -22,11 +22,18 @@ body {
 #container {
   min-width: 940px;
   margin: 0 10px;
+  background: #B3D8EF;
+  background: #0f61a1;
+  background: #e4e4e4;
 }
 
-#header, #wrapper {
+#header {
   padding: 0 20px;
 }
+#wrapper {
+  padding: 0 20px;
+  margin: 0;
+}
 
 #header {
   position: relative;
@@ -64,6 +71,8 @@ body {
 #main {  
   width: 70%;
   float: left;    
+  background: #fff;
+  padding: 0 20px;
 }
 
 .actions-bar {
@@ -110,7 +119,7 @@ body {
 }
 
 #wrapper {
-  padding-top: 20px;
+  padding-top: 10px;
 }
 
 #main .block {
@@ -406,6 +415,11 @@ a { -moz-outline: none; }
 body {
   color: #222;
   background: #ededec;
+  background: #0F61FF;
+  background: #0072bc;
+  background: #fff;
+  background: #0f61a1;
+  background: #e4e4e4;
   font-family: helvetica, arial, sans-serif;
 }
 
@@ -911,7 +925,7 @@ table#view_table tr:hover {
 #model_drop_down {
   position: absolute;
   top: 10px;
-  right: 600px;
+  left: 100px;
 }
 
 .drop_down_value_klass {
@@ -1011,22 +1025,23 @@ table#missing_index tr td {
 }
 
 .submit_search { 
+    -moz-border-radius: 5px; /* Firefox */
+    -webkit-border-radius: 5px; /* Safari */
   float: left;
-  border: 2px solid #127BC4;
-  color: #fff;
-  background: #4F8AFF;
+  border: 1px solid #000;
+  color: #000;
+ /*background: #4F8AFF;*/
   padding: 3px;
   font-weight: bold;
   font-size: 16px;
+  cursor: pointer;
 }
 
 
 .add_row_link, .remove_row {
   font-size: 30px;
   text-decoration: none;
-  border: 1px solid #127BC4;
   color: #fff;
-  background: #4F8AFF;
   padding: 0 3px;
   margin: 0;
 }
@@ -1069,3 +1084,8 @@ ul#subnav li a:hover {
 .col_box {
   border-top: 1px dotted #efefef;
 }
+
+#main .block .content p.error {
+  font-weight: bold;
+  font-size: 18px;
+}

data/lib/js/advance_search/act_on_result.js

@@ -31,16 +31,16 @@ AdminData.actOnResult = {
 };
 
 $('#advance_search_delete_all').live('click', function() {
-  if (window.confirm('Are you sure?')) {
+	if (window.confirm('Are you sure?')) {
 		AdminData.actOnResult.action('delete');
-  }
+	}
 	return false;
 });
 
 $('#advance_search_destroy_all').live('click', function() {
-  if (AdminData.jsUtil.confirm('Are you sure?')) {
+	if (window.confirm('Are you sure?')) {
 		AdminData.actOnResult.action('destroy');
-  }
+	}
 	return false;
 });
 

data/lib/js/advance_search/advance_search.js

@@ -2,59 +2,88 @@ var AdminData = AdminData || {};
 
 AdminData.advanceSearch = {
 
-  buildFirstRow: function(){
-    $('#advance_search_table')
-      .append(this.buildRow())
-      .find('tr td:last a')
-        .text('+')
-        .removeClass('remove_row')
-        .addClass('add_row_link');
-  },
-
-  buildCol1: function() {
-    var i, 
-        col = $('<select />', {className: 'col1' }).append($('<option />')),
-        tableStructure = $('#advance_search_table').data('table_structure');
-
-    for (i in tableStructure) {
-      $('<option />', {text: i, value: i}).appendTo(col);
-    }
-    return $('<td />').append(col);
-  },
-
-  buildCol2: function() {
-    return $('<td />')
-              .append('<select />')
-              .find('select')
-                .append('<option />')
-                .addClass('col2 disabled')
-                .attr({ disabled: true }).
-              end();
-  },
-
-  buildCol3: function() {
-    return $('<td />').append($('<input />',{disabled: true, className: 'col3'}));
-  },
-
-  buildCol4: function() {
-    return $('<td />').append($('<a />', {text: 'x', href: '#', className: 'remove_row'}));
-  },
-
-  buildRow: function() {
-    var $tr = $('<tr />'),
-        that = this,
-        randomNumber = AdminData.jsUtil.randomNumber(),
-        build_array = ['buildCol1', 'buildCol2', 'buildCol3', 'buildCol4'];
-    
-    $.each(build_array, function(index, value) {
-      $tr.append(that[value]());
-    });
-
-    $tr.find('select.col1').attr({ name: 'adv_search[' + randomNumber + '_row][col1]'});
-    $tr.find('select.col2').attr({ name: 'adv_search[' + randomNumber + '_row][col2]'});
-    $tr.find('input.col3').attr({ name: 'adv_search[' + randomNumber + '_row][col3]'});
-
-    return $tr;
-  }
+	buildFirstRow: function() {
+
+		var img = $('<img />', {
+			src: 'https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/add.png'
+		});
+
+		$('#advance_search_table').append(this.buildRow()).find('tr td:last a').attr('id','add_row_link_1').removeClass('remove_row').addClass('add_row_link').html('').append(img);
+	},
+
+	buildCol1: function() {
+		var i, col = $('<select />', {
+			className: 'col1'
+		}).append($('<option />')),
+		tableStructure = $('#advance_search_table').data('table_structure');
+
+		for (i in tableStructure) {
+			$('<option />', {
+				text: i,
+				value: i
+			}).appendTo(col);
+		}
+		return $('<td />').append(col);
+	},
+
+	buildCol2: function() {
+		var select = $('<select />', {
+			className: 'col2'
+		});
+		return $('<td />').append(select);
+	},
+
+	buildCol3: function() {
+		return $('<td />').append($('<input />', {
+			className: 'col3'
+		}));
+	},
+
+	buildCol4: function() {
+		var img = $('<img />', {
+			src: 'https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/no.png'
+		});
+
+		return $('<td />').append($('<a />', {
+			text: '',
+			href: '#',
+			className: 'remove_row'
+		}).append(img));
+	},
+
+	buildRow: function() {
+
+		var $tr = $('<tr />'),
+		currentRowNumber = $(document).data('currentRowNumber'),
+		that = this,
+		build_array = ['buildCol1', 'buildCol2', 'buildCol3', 'buildCol4'];
+
+		if (currentRowNumber === undefined) {
+			currentRowNumber = 1;
+			$(document).data('currentRowNumber', currentRowNumber)
+		} else {
+			currentRowNumber = parseInt(currentRowNumber) + 1;
+			$(document).data('currentRowNumber', currentRowNumber)
+		}
+
+		$.each(build_array, function(index, value) {
+			$tr.append(that[value]());
+		});
+
+		$tr.find('select.col1').attr({
+			name: 'adv_search[' + currentRowNumber + '_row][col1]'
+		});
+		$tr.find('select.col2').attr({
+			name: 'adv_search[' + currentRowNumber + '_row][col2]'
+		});
+		$tr.find('input.col3').attr({
+			name: 'adv_search[' + currentRowNumber + '_row][col3]'
+		});
+
+    $tr.find('.remove_row').attr('id', 'remove_row_'+currentRowNumber);
+
+		return $tr;
+	}
 
 };
+

data/lib/js/advance_search/event_bindings.js

@@ -14,13 +14,9 @@ AdminData.bindings = {
 		col1ColumnType = tableStructure[$col1.val()];
 
 		if (value.length === 0 || ($.inArray(value, arrayList) > - 1)) {
-			 $col3.val('')
-            .attr('disabled', true)
-            .addClass('disabled');
+			 $col3.val('');
 
 		} else {
-			$col3.attr('disabled', false)
-           .removeClass('disabled');
 
 			if (col1ColumnType === 'datetime' || col1ColumnType === 'date') {
 				$col3.val(AdminData.jsUtil.dateToString(new Date())).addClass('datepicker');
@@ -45,20 +41,19 @@ AdminData.bindings = {
       $('#results').html(responseText);
     }});
     
-
 		AdminData.jsUtil.colorizeRows();
 	},
 
 	col1_change: function(e) {
-		var $col1 = $(e.target).closest('select'),
+		var col1 = $(e.target).closest('select'),
 		tableStructure = $('#advance_search_table').data('table_structure'),
-		columnType = tableStructure[$col1.val()],
-		options = AdminData.mappings[columnType]['options'];
+		columnType = tableStructure[col1.val()],
+		options = AdminData.mappings[columnType]['options'],
+		col2 = col1.parents('tr').find('td select.col2');
 
-		$col2 = $col1.parents('tr').find('td select.col2');
-		$col2.html('');
-		AdminData.jsUtil.buildOptionsFromArray(options, $col2);
-		$col2.trigger('change');
+		col2.html('');
+		AdminData.jsUtil.buildOptionsFromArray(options, col2);
+		col2.trigger('change');
 	}
 };
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: admin_data
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 0
-  - 16
-  version: 1.0.16
+  - 17
+  version: 1.0.17
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -04:00
+date: 2010-11-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,7 +147,6 @@ files:
 - config/routes.rb
 - lib/admin_data.rb
 - lib/admin_data/chelper.rb
-- lib/admin_data/compatibility.rb
 - lib/admin_data/helpers.rb
 - lib/admin_data/railtie.rb
 - lib/admin_data/search.rb

data/lib/admin_data/compatibility.rb

@@ -1,7 +0,0 @@
-class String
-  unless method_defined?(:html_safe)
-    def html_safe
-      self
-    end
-  end
-end