adopt twitter bootstap basics

dominic · dominic · commit b20e776753f7 · 2011-09-04T16:31:03.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -23,7 +23,7 @@ gem 'mm-devise',              '>= 1.2'
 gem 'cancan'
 
 gem 'inherited_resources'
-gem 'simple_form'
+gem 'simple_form', :git => "https://github.com/bitzesty/bootstrap_form.git"
 gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,6 +4,14 @@ GIT
   specs:
     semantic_menu (0.1.0)
 
+GIT
+  remote: https://github.com/bitzesty/bootstrap_form.git
+  revision: 1b33bf01c7daf56bb42e3f944d745ee25d620cca
+  specs:
+    simple_form (1.5.0.dev)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -176,9 +184,6 @@ GEM
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    simple_form (1.4.2)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
     sprockets (2.0.0.beta.15)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -227,7 +232,7 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 3.1.0.rc)
   semantic_menu!
-  simple_form
+  simple_form!
   sqlite3
   uglifier
   unicorn
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
@@ -1,3 +1,7 @@
+body {
+  padding-top: 50px;
+}
+
 .flash{
   color: red;
   padding: 2px;
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,19 +2,28 @@
 %html
   %head
     %title Hackety Hack!
-    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.1.min.css">
+
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css">
+
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
   %body
-    = render "shared/menu/user"
-    = render "shared/menu/main"
+    %header.topbar
+      .topbar-inner
+        .container
+          %h3 
+            = link_to "Hackety Hack", root_path
+          = render "shared/menu/main"
+          = render "shared/menu/user"
     
-    - if flash[:notice]
-      .flash #{flash[:notice]}
+    .container
+      - if flash[:notice]
+        .flash #{flash[:notice]}
 
-    %h1.title
-      = yield :title
+      %h1.title
+        = yield :title
 
-    = yield :links
-    = yield
+      = yield :links
+      = yield
diff --git a/app/views/questions/_form.html.haml b/app/views/questions/_form.html.haml
@@ -3,7 +3,7 @@
 
   .inputs
     = f.input :title
-    = f.input :description
+    = f.input :description, :as => :text
 
   .actions
     = f.button :submit , 'Ask Everyone'
diff --git a/app/views/shared/menu/_main.html.haml b/app/views/shared/menu/_main.html.haml
@@ -1,3 +1,2 @@
-= semantic_menu do |root|
-  - root.add "Home", root_path
+= semantic_menu :class => "nav" do |root|
   - root.add "Questions", questions_path
diff --git a/app/views/shared/menu/_user.html.haml b/app/views/shared/menu/_user.html.haml
@@ -1,6 +1,6 @@
-= semantic_menu do |root|
+= semantic_menu :class => "nav secondary-nav" do |root|
   - if current_user
-    = current_user.username
+    - root.add current_user.username, root_path
     - root.add "Log Out", logout_path
   - else
     - root.add "Log In", login_path
diff --git a/app/views/static/root.html.haml b/app/views/static/root.html.haml
@@ -1 +1,4 @@
-%h1 Home!
+- content_for :title do
+  Home!
+
+Home!
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
@@ -3,15 +3,18 @@
   # Components used by the form builder to generate a complete input. You can remove
   # any of them, change the order, or even add your own components to the stack.
   # config.components = [ :placeholder, :label_input, :hint, :error ]
+  config.components = [ :placeholder, :label_input, :hint ]
 
   # Default tag used on hints.
   # config.hint_tag = :span
 
   # CSS class to add to all hint tags.
   # config.hint_class = :hint
-
+  config.hint_class = "help-inline"
+  
   # CSS class used on errors.
   # config.error_class = :error
+  config.error_class = "help-inline"
 
   # Default tag used on errors.
   # config.error_tag = :span
@@ -30,12 +33,18 @@
 
   # You can wrap all inputs in a pre-defined tag.
   # config.wrapper_tag = :div
+  config.wrapper_tag = :div
+
+  config.input_wrapper_tag = :div
+  config.input_wrapper_class = 'input'
 
   # CSS class to add to all wrapper tags.
   # config.wrapper_class = :input
-
+  config.wrapper_class = :clearfix
+  
   # CSS class to add to the wrapper if the field has errors.
   # config.wrapper_error_class = :field_with_errors
+  config.wrapper_error_class = :error
 
   # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
   # config.collection_wrapper_tag = nil
@@ -51,6 +60,7 @@
 
   # How the label text should be generated altogether with the required text.
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
+  config.label_text = lambda { |label, required| "#{label} #{required}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil

-Original file line number
+Diff line change
@@ @@ -1 +1,4 @@ @@
 -%h1 Home!
 +- content_for :title do
 +  Home!
++
 +Home!