bowtie 0.2.5 → 0.3

data/README.rdoc

@@ -10,6 +10,10 @@ Reads the information on your models and creates a nice panel in which you can v
 
   $ sudo gem install bowtie
 
+= Important
+
+From version 0.3, Bowtie is meant to be used from DataMapper 1.0.0 on. For previous versions please install with -v=0.2.5.
+
 = Configuration
 
 Mount Bowtie wherever you want by editing your config.ru file, optionally including the admin/pass combination for the panel.

data/bowtie.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.2.5"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomás Pollak"]

data/lib/bowtie/core_extensions.rb

@@ -21,7 +21,7 @@ class Class
 	end
 
 	def searchable_fields
-		self.properties.map{|a| a.name if a.type == String}.compact
+		self.properties.map{|a| a.name if a.class == DataMapper::Property::String}.compact
 	end
 
 	def subtypes

data/lib/bowtie/public/css/bowtie.css

@@ -1,5 +1,5 @@
 /*
-CSS for Bowtie
+CSS for Bowtie Datamapper Admin
 By Tomas Pollak - Fork Limited
 http://usefork.com
 ----------------------------------------- */
@@ -54,11 +54,38 @@ h2 { margin:10px 0; font-size:130%;}
 /* header, navigation
 -------------------------------------------------------------*/
 
-#header { background:#000; padding: 8px 5% 0 5%; border-bottom:1px solid #444;border-bottom:5px solid #528e00;}
-#header h1 { color:#333; font-size: 3em; font-weight:bold; margin: 10px 0;}
-#header h1 a{ color: #fff; text-decoration: none}
-#header ul li { display:inline;}
-#header ul li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block;  padding:8px; -webkit-border-top-right-radius:6px; -webkit-border-top-left-radius:6px; }
+#header {
+	background:#000;
+	padding: 8px 5% 0 5%;
+	border-bottom:1px solid #444;
+	border-bottom:5px solid #528e00;
+}
+#header h1 {
+	color:#333;
+	font-size: 3em;
+	font-weight:bold;
+	margin: 10px 0;
+}
+#header h1 a{
+	color: #fff;
+	text-decoration: none
+}
+#header ul li {
+	display:inline;
+}
+
+#header ul li a {
+	color:#fff;
+	text-decoration:none;
+	margin-right:10px;
+	display:inline-block;
+	padding:8px;
+	-webkit-border-top-right-radius:6px;
+	-webkit-border-top-left-radius:6px;
+	-moz-border-top-right-radius: 6px;
+	-moz-border-top-left-radius: 6px;
+}
+
 #header ul li a:hover { background:#333;}
 #header ul li.current a { background: #528e00; font-weight:bold; color:#fff;}
 
@@ -141,8 +168,13 @@ table td{
 
 }
 
-table tr td.no-data { text-align:center; padding:40px 0; color:#999; font-style:italic; font-size:130%;}
-
+table tr td.no-data {
+	text-align:center;
+	padding:40px 0;
+	color:#999;
+	font-style:italic;
+	font-size:130%;
+}
 
 table .center{
 	text-align: center;
@@ -155,15 +187,20 @@ table .check-column{
 	text-align: center;
 }
 
-table .good{
-	color: green;
+table tr.good{
+/*	background: green;*/
 }
 
-table .bad, table .error{
-	color: #a00;
+table tr.bad td, table .error{
+/*	background-color: #fbf5dc;*/
+	background-color: #FFEFEF;
 }
 
-table td.rel, th.rel {
+table th.rel{
+	background: #999;
+	color: #fff
+}
+table td.rel {
 	background: #fafafa;
 }
 
@@ -182,13 +219,21 @@ input:focus{
 }
 
 form.destroy button{
-	font-size: 1em;
 	color: #666;
 	padding: 2px 5px;
+}
+
+.big.destroy button{
+	font-size: 1em;
 	margin-bottom: 20px;
 	color: #a00;
 }
 
+.destroy button:hover{
+	cursor: pointer;
+	color: #000;
+}
+
 form.resource small{
 	color: #ccc;
 }
@@ -240,10 +285,6 @@ form .submit input{
 .pager .disabled{
 	display: none;
 }
-.pager .current{
-	color: #666;
-	margin: 0 3px;
-}
 .pager a{
 	border: 1px solid;
 	padding: 3px 5px;
@@ -256,6 +297,11 @@ form .submit input{
 .pager a:hover{
 	color: #000;
 }
+.pager .active a{
+	color: #fff;
+	background: #528e00;
+	border-color: #528e00;
+}
 
 
 /* footer

data/lib/bowtie/views/field.erb

@@ -4,7 +4,7 @@
 	name = @p.name.to_s
 	value = @resource.send(@p.name).to_s
 
-	case @p.type.to_s
+	case @p.class.to_s.gsub("DataMapper::Property::",'')
 		when "Array", /Class/ # weird how datamapper names enum classes
 			html += '<select class="array" name="resource['+name+']">'
 			@resource.model.options_for_subtype(name.to_sym).each do |option|

data/lib/bowtie/views/form.erb

@@ -8,7 +8,7 @@
 	<% unless [:created_at, :id].include?(p.name) %>
 	<% @p = p %>
 	<tr>
-		<td class="left-col"><%= p.name.to_s.titleize %> <small>(<%= p.type.to_s %>)</small></td>
+		<td class="left-col"><%= p.name.to_s.titleize %> <small>(<%= p.class.name.to_s.gsub("DataMapper::Property::",'') %>)</small></td>
 		<td class="right-col"><%= partial(:field) %></td>
 	</tr>
 	<% end %>

data/lib/bowtie/views/index.erb

@@ -7,11 +7,11 @@
 
 <% if @resources.any? %>
 
-	<%= @resources.pager.to_html(@env['REQUEST_URI'].gsub(/\?.*/,'')) if @resources.respond_to?(:pager) %>
+	<%= @resources.pager.to_html(@env['REQUEST_URI']) if @resources.respond_to?(:pager) %>
 
 	<%= partial(:table) %>
 
-	<%= @resources.pager.to_html(@env['REQUEST_URI'].gsub(/\?.*/,'')) if @resources.respond_to?(:pager) %>
+	<%= @resources.pager.to_html(@env['REQUEST_URI']) if @resources.respond_to?(:pager) %>
 
 <% else %>
 

data/lib/bowtie/views/row.erb

@@ -1,4 +1,4 @@
-<tr id="resource-<%= @r.key.first.to_s %>" class="<%= @r.ok? ? 'good' : 'bad' if @r.respond_to? 'ok?' %>">
+<tr id="resource-<%= @r.key.first.to_s %>" class="<%= @r.ok? ? 'good' : 'bad' if @r.respond_to?('ok?') %>">
 	<td class="<%= @model.key.first.name.to_s %>-col"><a href="<%= url_for(@r) %>"><%= @r.key.first.to_s %></a></td>
 	<% @r.attributes.each do |a| %>
 	<% next if a[0] == @model.key.first.name %>
@@ -15,9 +15,9 @@
 		<% end %>
 	<% end %>
 	<% end %>
-	<td><a href="<%= url_for(@r) %>">Show/Edit</a></td>
+	<td><a href="<%= url_for(@r) %>">View</a></td>
 	<td>
-	<form method="post" action="<%= model_path(@r.model) %>/<%= @r.id %>" onsubmit="return confirm('Are you sure?');">
+	<form class="destroy" method="post" action="<%= model_path(@r.model) %>/<%= @r.id %>" onsubmit="return confirm('Are you sure?');">
 		<input type="hidden" name="_method" value="delete" />
 		<button type="submit">Destroy</button>
 	</form>

data/lib/bowtie/views/search.erb

@@ -1,7 +1,7 @@
 	<% model = params[:model] %>
 	<form id="search" action="<%= base_path %>/search" method="get">
 		<% params.each do |k, v| %>
-		<% next if ['splat', 'q'].include?(k) or v.blank? %>
+		<% next if ['splat', 'q', 'page'].include?(k) or v.blank? %>
 			<input type="hidden" name="<%= k %>" value="<%= v %>" />
 		<% end %>
 		<input type="text" name="q"  value="Find <%= model %>:" onfocus="if(this.value=='Find <%= model %>:')this.value='';" onblur="if(this.value=='')this.value='Find <%= model %>:';"/>

data/lib/bowtie/views/show.erb

@@ -1,6 +1,6 @@
 <h1><%= @title || @model.name + ':' + @resource.id.to_s %></h1>
 
-<form class="destroy" method="post" action="<%= model_path(@resource.model) %>/<%= @resource.id %>" onsubmit="return confirm('Are you sure?');">
+<form class="big destroy" method="post" action="<%= model_path(@resource.model) %>/<%= @resource.id %>" onsubmit="return confirm('Are you sure?');">
 	<input type="hidden" name="_method" value="delete" />
 	<button type="submit">Destroy</button>
 </form>

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"