RubyGems - bootstrapped - Versions diffs - 0.0.6 → 0.9.0 - Mend

bootstrapped 0.0.6 → 0.9.0

Files changed (113) hide show

data/lib/generators/bootstrapped/layout/layout_generator.rb CHANGED

@@ -3,20 +3,26 @@ require 'generators/bootstrapped'
 module Bootstrapped
   module Generators
     class LayoutGenerator < Base
-      argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
+      desc "This generator generates layout file with navigation."
+      argument :layout_name, :type => :string, :default => "application"
+      argument :layout_type, :type => :string, :default => "fixed",
+               :banner => "*fixed or fluid"
-      def create_layout
-        template 'layout.html.erb', "app/views/layouts/#{file_name}.html.erb"
+      attr_reader :app_name, :container_class
+      def generate_layout
+        app = ::Rails.application
+        @app_name = app.class.to_s.split("::").first
+        @container_class = layout_type == "fluid" ? "container-fluid" : "container"
+        template "layout.html.erb", "app/views/layouts/#{layout_name}.html.erb"
+      end
+      def copy_additional_files
         copy_file 'layout_helper.rb', 'app/helpers/layout_helper.rb'
         copy_file 'error_messages_helper.rb', 'app/helpers/error_messages_helper.rb'
         copy_file '_flash.html.erb', 'app/views/share/_flash.html.erb'
       end
-      private
-      def file_name
-        layout_name.underscore
-      end
     end
   end
 end

data/lib/generators/bootstrapped/layout/templates/layout.html.erb CHANGED

@@ -1,36 +1,106 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
-    <%%= stylesheet_link_tag "application" %>
-    <%%= javascript_include_tag "application" %>
-    <%%= csrf_meta_tag %>
+    <meta charset="utf-8">
+    <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <%%= csrf_meta_tags %>
     <%%= yield(:head) %>
+    <%%= stylesheet_link_tag "application", :media => "all" %>
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+      .sidebar-nav {
+        padding: 9px 0;
+      }
+    </style>
+    <!--[if lt IE 9]>
+      <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
   </head>
-  <body class="with-header">
-    <div class="topbar">
-      <div class="fill">
-        <div class="container">
-          <%%= link_to app_name, '#', :class => "brand" %>
-          <ul class="nav">
-          	<li class="active">
-          		<a href='#'>Home</a>
-          	</li>
-          	<li>
-          		<a href='#'>About</a>
-          	</li>
-          </ul>
-        <p class="pull-right"><%%= text_field '#', '#'%></p>
+  <body>
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <%- if layout_type == "fluid" -%>
+          <div class="container-fluid">
+        <%- else -%>
+          <div class="container">
+        <%- end -%>
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="#">Project name</a>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="active"><a href="#">Home</a></li>
+              <li><a href="#about">About</a></li>
+              <li><a href="#contact">Contact</a></li>
+            </ul>
+            <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
+          </div><!--/.nav-collapse -->
         </div>
       </div>
     </div>
-    <%%= display_flash_message %>
+  <%- if layout_type == "fluid" -%>
+    <div class="container-fluid">
+  <%- else -%>
     <div class="container">
-      <%%= content_tag :h1, yield(:title) if show_title %>
-      <%%= yield %>
+  <%- end -%>
+    <%- if layout_type == "fluid" -%>
+      <div class="row-fluid">
+    <%- else -%>
+      <div class="row">
+    <%- end -%>
+        <div class="span3">
+          <div class="well sidebar-nav">
+            <ul class="nav nav-list">
+              <li class="nav-header">Sidebar</li>
+            <%- (1..3).each do |i| -%>
+              <li><a href="#">Link</a></li>
+              <li><a href="#">Link</a></li>
+              <li><a href="#">Link</a></li>
+            <% end %>
+              <li class="nav-header">Sidebar</li>
+            <%- (1..3).each do |i| -%>
+              <li><a href="#">Link</a></li>
+              <li><a href="#">Link</a></li>
+              <li><a href="#">Link</a></li>
+            <% end %>
+            </ul>
+          </div><!--/.well -->
+        </div><!--/span-->
+        <div class="span9">
+          <%%= content_tag :h1, yield(:title) if show_title %>
+          <%%= yield %>
+        </div><!--/span-->
+      </div><!--/row-->
+      <hr>
       <footer>
-         <p><%%= app_name %> &copy;  <%= Time.now.year %></p>
+        <p><%%= app_name %> &copy;  <%= Time.now.year %></p>
       </footer>
-    </div>
+    </div><!--/.fluid-container-->
+    <%%= javascript_include_tag "application" %>
   </body>
-</html>
+</html>

data/lib/generators/bootstrapped/scaffold/scaffold_generator.rb CHANGED

@@ -20,7 +20,6 @@ module Bootstrapped
       class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
       class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
-      class_option :shoulda, :desc => 'Use shoulda for test files.', :group => 'Test framework', :type => :boolean
       def initialize(*args, &block)
         super
@@ -64,10 +63,6 @@ module Bootstrapped
         end
       end
-      def add_gems
-        add_gem "mocha", :group => :test
-      end
       def create_model
         unless @skip_model
           template 'model.rb', "app/models/#{model_path}.rb"
@@ -276,8 +271,6 @@ module Bootstrapped
           return @test_framework = :testunit
         elsif options.rspec?
           return @test_framework = :rspec
-        elsif options.shoulda?
-          return @test_framework = :shoulda
         else
           return @test_framework = default_test_framework
         end

data/lib/generators/bootstrapped/scaffold/templates/views/erb/_form.html.erb CHANGED

@@ -1,16 +1,17 @@
-<%%= error_messages_for <%= item_path :instance_variable => true %> %>
-<%%= form_for <%= item_path :instance_variable => true %> do |f| %>
-	<fieldset>
-	<%- model_attributes.each do |attribute| -%>
-	  <div class="clearfix">
-	    <%%= f.label :<%= attribute.name %> %>
-	    <div class="input">
-	      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "xxlarge" %>
-	    </div>
-	  </div>
-	<%- end -%>
-	  <div class="actions">
-	    <%%= f.submit :class => "btn primary float-right"%>
-	  </div>
-	<fieldset>
+<%%= form_for <%= item_path :instance_variable => true %>, :html => { :class => 'form-horizontal' } do |f| %>
+  <fieldset>
+    <legend><%%= form_action_title %> <%= singular_name.titleize %></legend>
+    <%- model_attributes.each do |attribute| -%>
+    <div class="control-group">
+      <%%= f.label :<%= attribute.name %>, :class => 'control-label' %>
+      <div class="controls">
+        <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => '<%= attribute.field_type %>' %>
+      </div>
+    </div>
+    <%- end -%>
+    <div class="form-actions">
+      <%%= f.submit nil, :class => 'btn btn-primary' %>
+      <%%= link_to 'Cancel', <%= items_path %>, :class => 'btn' %>
+    </div>
+  </fieldset>
 <%% end %>

data/lib/generators/bootstrapped/scaffold/templates/views/erb/edit.html.erb CHANGED

@@ -1,14 +1 @@
-<%% title "Edit <%= singular_name.titleize %>" %>
-<%= render_form %>
-<%- if actions? :show, :index -%>
-<p>
-<%- if action? :show -%>
-  <%%= link_to "Show", <%= item_path :instance_variable => true %> %> |
-<%- end -%>
-<%- if action? :index -%>
-  <%%= link_to "View All", <%= items_path %> %>
-<%- end -%>
-</p>
-<%- end -%>
+<%%= render :partial => 'form', :locals => { :form_action_title => 'Edit' } %>

data/lib/generators/bootstrapped/scaffold/templates/views/erb/index.html.erb CHANGED

@@ -1,39 +1,43 @@
 <%% title "<%= plural_name.titleize %>" %>
 <div class="well">
-	<table class="zebra-striped">
-	  <tr>
-	  <%- model_attributes.each do |attribute| %>
-	    <th><%= attribute.human_name.titleize %></th>
-	  <%- end -%>
-		<%- if action? :show -%>
-      <th></th>
-    <%- end -%>
-    <%- if action? :edit -%>
-      <th></th>
-    <%- end -%>
-    <%- if action? :destroy -%>
-      <th></th>
-    <%- end -%>
-	  </tr>
-	  <%% @<%= instances_name %>.each do |<%= instance_name %>| %>
-	    <tr>
-	    <%- model_attributes.each do |attribute| %>
-	      <td><%%= <%= instance_name %>.<%= attribute.name %> %></td>
-	    <%- end -%>
-	    <%- if action? :show -%>
-	      <td><%%= link_to "Show", <%= item_path %> %></td>
-	    <%- end -%>
-	    <%- if action? :edit -%>
-	      <td><%%= link_to "Edit", <%= item_path :action => :edit %> %></td>
-	    <%- end -%>
-	    <%- if action? :destroy -%>
-	      <td><%%= link_to "Destroy", <%= item_path %>, :confirm => 'Are you sure?', :method => :delete %></td>
-	    <%- end -%>
-	    </tr>
-	  <%% end %>
+	<table class="table table-striped">
+	  <thead>
+  	  <tr>
+  	  <%- model_attributes.each do |attribute| -%>
+  	    <th><%= attribute.human_name.titleize %></th>
+  	  <%- end -%>
+  		<%- if action? :show -%>
+        <th></th>
+      <%- end -%>
+      <%- if action? :edit -%>
+        <th></th>
+      <%- end -%>
+      <%- if action? :destroy -%>
+        <th></th>
+      <%- end -%>
+  	  </tr>
+  	</thead>
+  	<tbody>
+  	  <%% @<%= instances_name %>.each do |<%= instance_name %>| %>
+  	    <tr>
+  	    <%- model_attributes.each do |attribute| -%>
+  	      <td><%%= <%= instance_name %>.<%= attribute.name %> %></td>
+  	    <%- end -%>
+  	    <%- if action? :show -%>
+  	      <td><%%= link_to "Show", <%= item_path %>, :class => 'btn btn-mini btn-primary' %></td>
+  	    <%- end -%>
+  	    <%- if action? :edit -%>
+  	      <td><%%= link_to "Edit", <%= item_path :action => :edit %>, :class => 'btn btn-mini' %></td>
+  	    <%- end -%>
+  	    <%- if action? :destroy -%>
+  	      <td><%%= link_to "Destroy", <%= item_path %>, :confirm => 'Are you sure?', :method => :delete, :class => 'btn btn-mini btn-danger' %></td>
+  	    <%- end -%>
+  	    </tr>
+  	  <%% end %>
+  	</tbody>
 	</table>
 </div>
 <%- if action? :new -%>
-<p><%%= link_to "New <%= singular_name.titleize %>", <%= item_path :action => :new %>, :class => 'btn primary float-right' %></p>
+<p><%%= link_to "New <%= singular_name.titleize %>", <%= item_path :action => :new %>, :class => 'btn primary' %></p>
 <%- end -%>

data/lib/generators/bootstrapped/scaffold/templates/views/erb/new.html.erb CHANGED

@@ -1,7 +1 @@
-<%% title "New <%= singular_name.titleize %>" %>
-<%= render_form %>
-<%- if action? :index -%>
-<p><%%= link_to "Back to List", <%= items_path %> %></p>
-<%- end -%>
+<%%= render :partial => 'form', :locals => { :form_action_title => 'New' } %>

data/lib/generators/bootstrapped/scaffold/templates/views/erb/show.html.erb CHANGED

@@ -1,23 +1,21 @@
 <%% title "<%= singular_name.titleize %> Details" %>
 <div class="well">
-  <%- model_attributes.each do |attribute| %>
+  <%- model_attributes.each do |attribute| -%>
   <p>
     <strong><%= attribute.human_name.titleize %>:</strong>
 	  <%%= @<%= instance_name %>.<%= attribute.name %> %>
   </p>
   <% end -%>
 </div>
 <p>
 <%- if action? :edit -%>
-  <%%= link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %>, :class => 'btn float-right' %> |
+  <%%= link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %>, :class => 'btn' %> |
 <%- end -%>
 <%- if action? :destroy -%>
-  <%%= link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete, :class => 'btn float-right' %> |
+  <%%= link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete, :class => 'btn' %> |
 <%- end -%>
 <%- if action? :index -%>
-  <%%= link_to "View All", <%= items_path %>, :class => 'btn float-right' %>
+  <%%= link_to "View All", <%= items_path %>, :class => 'btn btn-danger' %>
 <%- end -%>
 </p>

data/vendor/assets/images/glyphicons-halflings-white.png ADDED

Binary file

data/vendor/assets/images/glyphicons-halflings.png ADDED

Binary file

data/vendor/assets/javascripts/bootstrap-alert.js ADDED

@@ -0,0 +1,91 @@
+/* ==========================================================
+ * bootstrap-alert.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+!function( $ ){
+  "use strict"
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function ( el ) {
+        $(el).on('click', dismiss, this.close)
+      }
+  Alert.prototype = {
+    constructor: Alert
+  , close: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+      $parent = $(selector)
+      $parent.trigger('close')
+      e && e.preventDefault()
+      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+      $parent.removeClass('in')
+      function removeElement() {
+        $parent.remove()
+        $parent.trigger('closed')
+      }
+      $.support.transition && $parent.hasClass('fade') ?
+        $parent.on($.support.transition.end, removeElement) :
+        removeElement()
+    }
+  }
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+  $.fn.alert = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+  $.fn.alert.Constructor = Alert
+ /* ALERT DATA-API
+  * ============== */
+  $(function () {
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
+  })
+}( window.jQuery )