speedo 0.2.5 → 0.3.0

data/app/assets/stylesheets/speedo/plugins.css.scss

@@ -43,47 +43,62 @@ div.uni-uploader {
   }
 }
 
+$labelwidth: 100px;
 .formtastic {
-  textarea {
-    padding:5px;
-  }  
-  .fragments .label, .choices .label {
-    position:relative;
-    width:25%;
-    margin-right:-25%;
-    label {
-      position:relative;
-    }
-  }
-  .label { // Override bootstrap label styling
-    font-size: inherit;
-    font-weight: inherit;
-    line-height: inherit;
-    text-shadow: none;
-    vertical-align: inherit;
-    white-space: inherit;
-    border:0;
-    border-radius:0;
-    padding:0;
-    color: $text;
-    background-color: transparent;
-  }
-  .inline_choices {
-    .choices-group {
-      width:100%;
-      .choice {
-        display:inline-block; zoom:1;*display:inline;
-        vertical-align:top;
-        margin-right:1em;
-        margin:0 1em 0 0;
+  fieldset {
+    .control-group {
+      @include clearfix;
+      label.control-label {
+        float:left;
+        width:$labelwidth;
+        abbr[title] {
+          border-bottom:0;
+          color:#900;
+        }
+      }
+      .controls {
+        margin-left:$labelwidth;
+        input {
+          width:100%;
+          &[type=radio], &[type=checkbox] {
+            width:auto;
+          }
+        }
+        textarea {
+          width:100%;
+        }
+        select {
+          width:100%;
+        }
+        &.choices {
+          .choice {
+            .uni-radio, .uni-checker {
+              margin-left:-18px;
+            }
+          }
+        }
+      }
+      &.inline_choices {
+        .choices {
+          .choice {
+            display:inline-block; zoom:1;*display:inline;
+            vertical-align:top;
+            margin-right:2em;
+            padding-top:0;
+          }
+        }
       }
     }
   }
+  .errors {
+    color:#cc0000;
+    margin:0.5em 0 1.5em 25%;
+    list-style:square;
+  }
 }
 
 
 ul.as-selections {
-  width:72%; // To match the formtastic input widths
   border:1px solid #999;
   @include border-radius(3px);
   padding:5px;

data/app/assets/stylesheets/speedo/speedo.css.scss

@@ -1,5 +1,4 @@
 @import 'bootstrap';
-@import 'formtastic-buttonless';
 @import 'autoSuggest';
 @import 'chosen';
 @import 'jquery.dataTables';

data/app/assets/stylesheets/speedo/theme.css.scss

@@ -1,5 +1,5 @@
 /* Colors, base.css */
-$bg:          #ddd;     /* Background color (if not in web-app mode) */
+$bg:          #fff;     /* Background color (if not in web-app mode) */
 $text:        #333;
 $link:        #0090d5;
 $hover:       #17639b;

data/app/views/speedo/home/examples.html.haml

@@ -2,12 +2,15 @@
 
 %h1 Forms with Uniform, AutoGrowing, AutoSuggesting - h1
 = semantic_form_for 'speedo' do |f|
+  / = f.semantic_errors
   = f.inputs do
-    = f.input 'Title', placeholder: 'Type your title'
+    .row-fluid
+      = f.input 'Title', placeholder: 'Type your title', wrapper_html: {class: 'span6'}
+      = f.input 'Name', wrapper_html: {class: 'span6'}
     = f.input 'Singer', input_html: { class: 'autoSuggest' }
     = f.input 'Description', as: :text, input_html: { placeholder: 'AutoGrowing', class: 'autogrow tip', :rows => 2, title: 'Tip: you can type what you like, and this will get bigger to fit!', data: {placement: 'bottom'} }
     = f.input 'Attachment', as: :file, required: false
-    = f.input 'Select', as: :select, include_blank: false
+    = f.input 'Select', as: :select, include_blank: false, hint: 'Just select one!'
     = f.input 'Are you real?', as: :radio, wrapper_html: { class: 'inline_choices' }
     = f.input 'Which do you own?', as: :check_boxes, collection: ['Speedo','Swim Short','Bikini']
   

data/lib/generators/speedo/install_generator.rb

@@ -92,6 +92,19 @@ module Speedo
       def run_formtastic_generator
         generate "formtastic:install"
       end
+      
+      def bootstrap_formtastic
+        if File.exist? 'config/initializers/formtastic.rb'
+          unless File.read('config/initializers/formtastic.rb').match /SpeedoFormstrap/
+            append_file 'config/initializers/formtastic.rb' do
+              "\n# config/initializers/formtastic.rb"
+              "\nFormtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder"
+            end
+          end
+        else
+          say "Make sure to add `Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder` to config/initializers/formtastic.rb."
+        end
+      end
 
       private
 

data/lib/speedo/version.rb

@@ -1,3 +1,3 @@
 module Speedo
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/speedo.rb

@@ -4,6 +4,7 @@ require 'speedo/layout_helper'
 require 'haml'
 require 'coffee-script'
 require 'formtastic'
+require 'speedo-formstrap'
 
 module Speedo
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speedo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2166511840 !ruby/object:Gem::Requirement
+  requirement: &2153343480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2166511840
+  version_requirements: *2153343480
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2166510660 !ruby/object:Gem::Requirement
+  requirement: &2153342160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166510660
+  version_requirements: *2153342160
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2166509580 !ruby/object:Gem::Requirement
+  requirement: &2153341480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166509580
+  version_requirements: *2153341480
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2166508940 !ruby/object:Gem::Requirement
+  requirement: &2153340820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166508940
+  version_requirements: *2153340820
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &2166508060 !ruby/object:Gem::Requirement
+  requirement: &2153339860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,21 +66,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166508060
+  version_requirements: *2153339860
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2166507100 !ruby/object:Gem::Requirement
+  requirement: &2153338820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153338820
+- !ruby/object:Gem::Dependency
+  name: speedo-formstrap
+  requirement: &2153337640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc
+        version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2166507100
+  version_requirements: *2153337640
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2166506560 !ruby/object:Gem::Requirement
+  requirement: &2153336760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166506560
+  version_requirements: *2153336760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2166506060 !ruby/object:Gem::Requirement
+  requirement: &2153335980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166506060
+  version_requirements: *2153335980
 description: This is a layout gem intended as a backdrop for developing rails applications
   quickly. Its intention is to speed initial development, removing the need for any
   intensive front-end development until the app is functional.
@@ -179,7 +190,6 @@ files:
 - vendor/assets/stylesheets/speedo/dataTables/ui-icons_454545_256x240.png
 - vendor/assets/stylesheets/speedo/dataTables/ui-icons_888888_256x240.png
 - vendor/assets/stylesheets/speedo/dataTables/ui-icons_cd0a0a_256x240.png
-- vendor/assets/stylesheets/speedo/formtastic-buttonless.css
 - vendor/assets/stylesheets/speedo/jquery-ui-1.8.18.custom.css
 - vendor/assets/stylesheets/speedo/jquery.dataTables.css
 - vendor/assets/stylesheets/speedo/jqueryui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -363,7 +373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1333860995035779373
+      hash: -1722773184336694848
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -372,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1333860995035779373
+      hash: -1722773184336694848
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/vendor/assets/stylesheets/speedo/formtastic-buttonless.css

@@ -1,271 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-
-
-
-
-THIS FILE HAS BEEN MODIFIED FOR SPEEDO: ALL REFERENCES TO .button(s), .action(s), .button_action 
-AND .link_action HAVE BEEN REMOVED, TO REMOVE CONFLICTS WITH GH-BUTTONS
-
-
-
-
-It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
-this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
-This will allow you to update formtastic.css with new releases without clobbering your own changes.
-
-This stylesheet forms part of the Formtastic Rails Plugin
-(c) 2008-2011 Justin French
-
---------------------------------------------------------------------------------------------------*/
-
-/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
---------------------------------------------------------------------------------------------------*/
-.formtastic,
-.formtastic ul,
-.formtastic ol,
-.formtastic li,
-.formtastic fieldset,
-.formtastic legend,
-.formtastic input,
-.formtastic textarea,
-.formtastic select,
-.formtastic p {
-  margin:0;
-  padding:0;
-}
-
-.formtastic fieldset {
-  border:0;
-}
-
-.formtastic em,
-.formtastic strong {
-  font-style:normal;
-  font-weight:normal;
-}
-
-.formtastic ol,
-.formtastic ul {
-  list-style:none;
-}
-
-.formtastic abbr,
-.formtastic acronym {
-  border:0;
-  font-variant:normal;
-}
-
-.formtastic input,
-.formtastic textarea {
-  font-family:sans-serif;
-  font-size:inherit;
-  font-weight:inherit;
-}
-
-.formtastic input,
-.formtastic textarea,
-.formtastic select {
-  font-size:100%;
-}
-
-.formtastic legend {
-  white-space:normal;
-  color:#000;
-}
-
-
-/* SEMANTIC ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 1.5em 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* INPUTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inputs {
-  overflow:hidden; /* clear containing floats */
-}
-
-.formtastic .input {
-  overflow:hidden; /* clear containing floats */
-  padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
-  margin-top:-0.5em;
-  margin-bottom:1em;
-}
-
-
-/* LEFT ALIGNED LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .label {
-  display:block;
-  width:25%;
-  float:left;
-  padding-top:.2em;
-}
-
-.formtastic .fragments .label,
-.formtastic .choices .label {
-  position:absolute;
-  width:95%;
-  left:0px;
-}
-
-.formtastic .fragments .label label,
-.formtastic .choices .label label {
-  position:absolute;
-}
-
-/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices {
-  position:relative;
-}
-
-.formtastic .choices-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .choice {
-  padding:0;
-  border:0;
-}
-
-
-/* INLINE HINTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .input .inline-hints {
-  color:#666;
-  margin:0.5em 0 0 25%;
-}
-
-
-/* INLINE ERRORS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inline-errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-}
-
-.formtastic .errors {
-  color:#cc0000;
-  margin:0.5em 0 0 25%;
-  list-style:square;
-}
-
-.formtastic .errors li {
-  padding:0;
-  border:none;
-  display:list-item;
-}
-
-
-/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .stringish input {
-  width:72%;
-}
-
-.formtastic .stringish input[size] {
-  width:auto;
-  max-width:72%;
-}
-
-
-/* TEXTAREA OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .text textarea {
-  width:72%;
-}
-
-.formtastic .text textarea[cols] {
-  width:auto;
-  max-width:72%;
-}
-
-
-/* HIDDEN OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .hidden {
-  display:none;
-}
-
-
-/* BOOLEAN LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .boolean label {
-  padding-left:25%;
-  display:block;
-}
-
-
-/* CHOICE GROUPS
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices-group {
-  margin-bottom:-0.5em;
-}
-
-.formtastic .choice {
-  margin:0.1em 0 0.5em 0;
-}
-
-.formtastic .choice label {
-  float:none;
-  width:100%;
-  line-height:100%;
-  padding-top:0;
-  margin-bottom:0.6em;
-}
-
-
-/* ADJUSTMENTS FOR INPUTS INSIDE LABELS (boolean input, radio input, check_boxes input)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choice label input,
-.formtastic .boolean label input {
-  margin:0 0.3em 0 0.1em;
-  line-height:100%;
-}
-
-
-/* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
---------------------------------------------------------------------------------------------------*/
-.formtastic .fragments {
-  position:relative;
-}
-
-.formtastic .fragments-group {
-  float:left;
-  width:74%;
-  margin:0;
-  padding:0 0 0 25%;
-}
-
-.formtastic .fragment {
-  float:left;
-  width:auto;
-  margin:0 .3em 0 0;
-  padding:0;
-  border:0;
-}
-
-.formtastic .fragment label {
-  display:none;
-}
-
-.formtastic .fragment label input {
-  display:inline;
-  margin:0;
-  padding:0;
-}
-