bootstrap2-rails 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,31 +1,31 @@
 == bootstrap2-rails gem
-Warning: this gem is under development, bugs are present. Works only with Rails > 3.0
+This gem is under development and works only with Rails > 3.0.
 
-This gem replaces Rails default scaffold to create views based on Bootstrap 2, from Twitter (http://twitter.github.com/bootstrap). There is also a toast message feature based on JQuery Toast Message plugin.
+This gem replaces Rails default scaffold to create views based on Bootstrap 2, from Twitter (http://twitter.github.com/bootstrap). There is also a toast message feature using JQuery Toast Message plugin.
 
 When installed, this gem overrides Rails default scaffold templates, which means that any call to scaffold generator will use the gem templates. The views also are generated with some others features like search and sort.
 There is also a dropdown menu generator to avoid manual menu creation.
 
 === Installation
-You can use this gem with only Rails 3. Include this line inside your Gemfile:
+Include this line inside your Gemfile:
   gem 'bootstrap2-rails'
 
 Run the bundle command to install required gems in your Rails application:
   bundle
 
 === Generating view files
-After installing gem, run the views generator to copy some needed files (caution: it will override application.html.erb)
+After installing gem, run the views generator to copy some needed files (caution: it will override application.html.erb, but this action will be prompted to user). You can also modify the generated views as you need.
   rails generate bootstrap:views
 
-=== Loading bootstrap and JQuery Toast Message CSS files (required)
+=== Loading Bootstrap and JQuery Toast Message CSS files (required)
 Include these lines in your app/assets/stylesheets/application.css file to load required CSS files
    *= require bootstrap
    *= require jquery.toastmessage
 
-Important: Rails default scaffold.css file overrides some CSS styles. So delete scaffold.css file or clean it up to correct working of Bootstrap styles.
+Important: Rails default scaffold.css file overrides some CSS styles. So delete scaffold.css file or clean it up to correct working of Bootstrap styles, otherwise you layout will be messy.
 
-=== Loading bootstrap and JQuery Toast Message javascript files (required)
-Include these lines in your app/assets/stylesheets/application.css file to load required CSS files
+=== Loading Bootstrap and JQuery Toast Message javascript files (required)
+Include these lines in your app/assets/javascripts/application.js file to load required javascript files
    //= require bootstrap
    //= require jquery.toastmessage
 
@@ -39,15 +39,41 @@ where message is the message text and type is one of the four types of messages
 
   <%= display_toast_message('hello workd', 'notice') %>
 
-=== Menu generator (under development, not working)
-The menu generator creates a dropdown menu for your actions inside your controllers. There are two steps needed for creating a menu:
-
-1) Define wich items and subitems will be available. In a dropdown menu there is a main item and several subitems. The main item is only a text explaining the content (e.g. File, Window, Tools). The subitems are controller actions (e.g. New, Save, Close). To define the main item and corresponding subitems, insert this line in your application_controller.rb:
-  menu_options [{:title => 'Index', :itens => [
-    {:text => 'Projects', :controller => 'projects', :action => 'index'}
-  ]}]
-
-The menu_options parameter is an array of hashes with 2 keys: title and itens. The title is the text of the main item and can be anything you want. The itens is an array of hashes, wich one with 3 keys: text (the subitem text), controller (the controller with the action) and action (the action itself).
+=== Menu generator
+The menu generator creates a menu bar for your controller actions. There are two steps needed for creating a menu:
+
+1) Define which items and subitems will be available. In a dropdown menu there is a main item and several subitems. You can also put a separator between subitems. The main item is only a text explaining the content (e.g. File, Window, Tools). The subitems are controller actions (e.g. New, Save, Close). To define the main item and corresponding subitems you need to use MenuBar and MenuDropdown classes. For example:
+  
+  # Creates a MenuBar instance
+  menu = MenuCreator::MenuBar.new
+  
+  # Define project name that will be displayed on left side
+  menu.project = {caption: "Project name", controller: "index", action: "index"}
+
+  # Create a dropdown menu with 3 subitems and one separator on left side
+  dropdown1 = MenuCreator::MenuDropdown.new
+  dropdown1.position = :left
+  dropdown1.caption = "Dropdown 1"
+  dropdown1.subitems << {caption: "subitem 1", controller: "index", action: "index"}
+  dropdown1.subitems << {caption: "subitem 2", controller: "index", action: "index"}
+  dropdown1.subitems << "---"
+  dropdown1.subitems << {caption: "subitem 3", controller: "index", action: "index"}
+  menu.add_dropdown dropdown1
+
+  # Create a dropdown menu with 3 subitems and one separator on right side
+  dropdown2 = MenuCreator::MenuDropdown.new
+  dropdown2.position = :right
+  dropdown2.caption = "Dropdown 2"
+  dropdown2.subitems << {caption: "subitem 1", controller: "index", action: "index"}
+  dropdown2.subitems << {caption: "subitem 2", controller: "index", action: "index"}
+  dropdown2.subitems << "---"
+  dropdown2.subitems << {caption: "subitem 3", controller: "index", action: "index"}
+  menu.add_dropdown dropdown2
+
+  # Set menu to MenuCreator
+  MenuCreator.set_menu menu
+
+Note that you have to define the caption, the controller and the action to each subitem otherwise the menu will not work. Each subitem will be turned to a link.
 
 2) Include a menu_bar call in your html page:
-  <%= menu_bar %>
+  <%= menu_bar %>

data/app/views/shared/_menu.html.erb

@@ -0,0 +1,32 @@
+<% if menu %>
+  <div class="navbar navbar-static" style="margin: -2px">
+    <div class="navbar-inner">
+      <div class="container" style="width: auto;">
+
+        <% if menu.project %>
+          <%= link_to(menu.project[:caption], {controller: menu.project[:controller], action: menu.project[:action]}, class: "brand") %>
+        <% end %>
+
+        <% menu.dropdowns.each do |dropdown| %>
+          <ul class="nav <%= dropdown.position.to_s == 'right' ? 'pull-right' : '' %>">
+            <li class="dropdown">
+              <%= link_to("#{dropdown.caption} <b class='caret'></b>".html_safe, "#", {class: "dropdown-toggle", 'data-toggle' => "dropdown"}) %>
+              <ul class="dropdown-menu">
+              <% dropdown.subitems.each do |item| %>
+                <% unless item == "---" %>
+                  <li>
+                    <%= link_to(item[:caption], {controller: item[:controller], action: item[:action]}) %>
+                  </li>
+                <% else %>
+                  <li class="divider"></li>
+                <% end %>
+              <% end %>
+              </ul>
+            </li>
+          </ul>
+        <% end %>
+
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/shared/_search.html.erb

@@ -1,4 +1,4 @@
 <%= form_tag({action: "index"}, {method: :get, class: 'form-search'}) do %>
   <%= text_field_tag("search", params[:search], {size: 70, placeholder: placeholder, class: 'input-medium search-query'}) %>
   <%= submit_tag("Search", class: 'btn') %>
-<% end %>
+<% end %>

data/lib/bootstrap2-rails/menu_creator.rb

@@ -1,39 +1,60 @@
 module MenuCreator
-  @@loaded = false
-  @@menu_params = []
-
-  def menu_options(params)
-    @@menu_params = params unless @@loaded
-  end
+  @@menu = nil
+  class MenuBar
+    attr_accessor :project, :dropdowns
+  
+    def initialize
+      @dropdowns = []
+    end
 
-  def menu_bar
-    return nil unless @@menu_params
+    def add_dropdown(dropdown)
+      @dropdowns << dropdown if valid_dropdown?(dropdown)
+    end
 
-    html = '<div class="topbar-wrapper" style="z-index:5">'
-    html += '<div class="topbar" data-dropdown="dropdown">'
-    html += '<div class="topbar-inner">'
-    html += '<div class="container">'
-    html += '<ul class="nav">'
-    
-    @@menu_params.each do |param|
-      html += '<li class="dropdown">'
-      html += link_to(param[:title], '#', class: 'dropdown-toggle')
-      html += '<ul class="dropdown-menu">'
+    # Check if is a valid dropdown
+    # A valid dropdown is a class with position an caption attributes and
+    # an array of subitems
+    def valid_dropdown?(dropdown)
+      return false unless dropdown.position
+      return false unless %W(left right).include? dropdown.position.to_s
+      return false unless dropdown.caption      
+      return false unless valid_subitems?(dropdown.subitems)
+      true
+    end
 
-      param[:itens].each do |subitem|
-        html += content_tag(:li, link_to(subitem[:text], controller: subitem[:controller], action: subitem[:action]))
+    # Check if all subitems are valid
+    # Subitem must be a hash with keys :caption, :controller and :action or
+    # a string "---" in case of a separator
+    def valid_subitems?(subitems)
+      return false if subitems.length == 0
+      subitems.each do |subitem|
+        if subitem.class.to_s == "Hash"
+          return false unless subitem.has_key?(:caption) && subitem.has_key?(:controller) &&
+            subitem.has_key?(:action)
+        else
+          return false unless subitem.to_s == '---'
+        end
       end
+      true
+    end    
+  end
+
+  # Dropdown menu class
+  class MenuDropdown
+    attr_accessor :position, :caption, :subitems
 
-      html += '</ul>'
-      html += '</li>'
+    def initialize
+      @subitems = []
     end
-    
-    html += '</ul>'  
-    html += '</div>'
-    html += '</div>'
-    html += '</div>'
-    html += '</div>'
+  end
+
+  # Draw menu content
+  def menu_bar
+    render partial: '/shared/menu', locals: {menu: @@menu}
+  end
 
-    html.html_safe
+  # Set menu to draw
+  def self.set_menu(menu)
+    @@menu = menu
   end
 end

data/lib/bootstrap2-rails/version.rb

@@ -1,3 +1,3 @@
 module BootstrapRails
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vendor/assets/stylesheets/bootstrap.css

@@ -565,7 +565,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
   line-height: normal;
   border: 0;
   cursor: pointer;
-  border-radius: 0 \0/;
+  border-radius: 0;
 }
 input[type="file"] {
   padding: initial;
@@ -2661,7 +2661,7 @@ button.btn.small, input[type="submit"].btn.small {
 .pagination li {
   display: inline;
 }
-.pagination a {
+.pagination a, .pagination em {
   float: left;
   padding: 0 14px;
   line-height: 34px;
@@ -2669,7 +2669,7 @@ button.btn.small, input[type="submit"].btn.small {
   border: 1px solid #ddd;
   border-left-width: 0;
 }
-.pagination a:hover, .pagination .active a {
+.pagination a:hover, .pagination .active a, .pagination em {
   background-color: #f5f5f5;
 }
 .pagination .active a {
@@ -2681,7 +2681,7 @@ button.btn.small, input[type="submit"].btn.small {
   background-color: transparent;
   cursor: default;
 }
-.pagination li:first-child a {
+.pagination li:first-child a, .pagination .previous_page {
   border-left-width: 1px;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap2-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &69169280 !ruby/object:Gem::Requirement
+  requirement: &72698580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69169280
+  version_requirements: *72698580
 description: This is a scaffold replacement with a Twitter Bootstrap look
 email:
 - stapait@gmail.com
@@ -34,8 +34,8 @@ files:
 - README.rdoc
 - Rakefile
 - app/views/layouts/application.html.erb
+- app/views/shared/_menu.html.erb
 - app/views/shared/_search.html.erb
-- app/views/shared/_search.html.erb~
 - bootstrap2-rails.gemspec
 - lib/bootstrap2-rails.rb
 - lib/bootstrap2-rails/bootstrap_helper.rb

data/app/views/shared/_search.html.erb~

@@ -1,4 +0,0 @@
-<%= form_tag({action: "index"}, {method: :get, class: 'form-search'}) do %>
-  <%= text_field_tag("search", params[:search], {size: 70, placeholder: placeholder}) %>
-  <%= submit_tag("Search", class: 'btn') %>
-<% end %>