pixelearth 0.0.4 → 0.0.5

data/lib/generators/project_files/templates/stylesheets/sass/pixelearth.scss

@@ -94,6 +94,9 @@ a.index_destroy {
 }
 
 /* show page */
+.resource_attribute {
+  margin-bottom:5px; 
+}
 .resource_label {
   background-color:#eee;
   width:200px; 
@@ -104,9 +107,11 @@ a.index_destroy {
   margin-left:220px;
   margin-top:-25px;
   padding:5px;
+  min-height:15px;
 }
 
 
+
 label {
   font-weight:800;
   color:#2B4F81;
@@ -120,6 +125,19 @@ div.field {
 }
 /* columns */
 
+.col_of_2 {
+  float:left;
+  width:49%;
+}
+.col_of_2.left {
+  margin-right:5px;
+}
+.col_of_2.right {
+  margin-left:5px;
+}
+
+
+
 .col_of_3 {
   float:left;
   width:30%;

data/lib/generators/project_files/templates/view_templates/haml/scaffold/_form.html.haml

@@ -1,5 +1,4 @@
-//formtastic
--semantic_form_for @resource do |form|
+-simple_form_for @resource do |form|
   = form.inputs 
   = form.buttons 
 

data/lib/generators/project_files/templates/view_templates/haml/scaffold/show.html.haml

@@ -1,5 +1,5 @@
 <% for attribute in attributes -%>
-%p.resource_attribute
+%div.resource_attribute
   .resource_label <%= attribute.human_name %>:
   .resource_value
     = @resource.<%= attribute.name %>

data/lib/generators/project_files/templates/views/application.html.haml

@@ -11,14 +11,15 @@
 
     = csrf_meta_tag 
     = stylesheet_link_tag       @layout[:css].flatten.uniq 
-    = javascript_include_tag    :defaults
-        
+
     /must be called before noConflict 
-    = javascript_include_tag   'https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js' 
+    = javascript_include_tag   'jquery-1.5.1.min.js' #apparently has to be called before prototype
 
     :javascript
       jQuery.noConflict(); //must be run before any other 'plugins' that use these libraries
 
+
+    = javascript_include_tag    :defaults
     = javascript_include_tag    @layout[:js].flatten.uniq
 
     %style

data/lib/pixelearth/version.rb

@@ -1,3 +1,3 @@
 module Pixelearth
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/pixelearth.rb

@@ -3,7 +3,7 @@ this_dir = File.expand_path('../', __FILE__)
 require 'rails'
 require 'haml-rails'
 require 'redcloth'
-require 'formtastic'
+require 'simple_form'
 require 'redgreen'
 require 'colored'  
 

data/lib/required/ruby_core_mods.rb

@@ -1,12 +1,3 @@
-class String
-  def first_caps
-    self.split(/ /).map{|x| x.capitalize}.join(' ')
-  end
-  def sp_to_underscore #fills in the gap in rails inflectors, since their #underscore method only works for CamelCase
-    self.downcase.gsub(/\s+/,"_")
-  end
-end
-
 class Dir
   def filter(regex)
     self.select do |x|

data/lib/required/string.rb

@@ -1,6 +1,8 @@
 class String
-  def say_hi
-    "hi mom"
+  def first_caps
+    self.split(/ /).map{|x| x.capitalize}.join(' ')
+  end
+  def my_underscore #fills in the gap in rails inflectors, since their #underscore method only works for CamelCase
+    self.downcase.gsub(/\s+/,"_")
   end
 end
-

data/pixelearth.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
                                   #these need to be included manually in pixelearth.rb
   s.add_dependency "haml-rails" 
   s.add_dependency "RedCloth"
-  s.add_dependency "formtastic"
+  s.add_dependency "simple_form"
   s.add_dependency "redgreen" #colorizes output for tests, 'required' test/test_helper.rb
   s.add_dependency "colored"  #colored output in terminal  http://github.com/defunkt/colored/blob/master/lib/colored.rb
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pixelearth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Benjamin Lieb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: simple_form
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false