beautiful_scaffold 0.3.3 → 0.3.4

data/lib/generators/templates/app/assets/javascripts/bootstrap-wysihtml5.js

@@ -3,8 +3,8 @@
 
     var templates = {
         "font-styles": "<li class='dropdown'>" +
-                           "<a class='btn dropdown-toggle' data-toggle='dropdown' href='#'>" +
-                               "<i class='icon-font'></i>&nbsp;<span class='current-font'>Normal text</span>&nbsp;<b class='caret'></b>" +
+                           "<a class='btn btn-default dropdown-toggle' data-toggle='dropdown' href='#'>" +
+                               "<i class='fa fa-font'></i>&nbsp;<span class='current-font'>Normal text</span>&nbsp;<b class='caret'></b>" +
                            "</a>" +
                            "<ul class='dropdown-menu'>" +
                                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div'>Normal text</a></li>" +
@@ -14,21 +14,23 @@
                        "</li>",
         "emphasis":    "<li>" +
                            "<div class='btn-group'>" +
-                               "<a class='btn' data-wysihtml5-command='bold' title='CTRL+B'>Bold</a>" +
-                               "<a class='btn' data-wysihtml5-command='italic' title='CTRL+I'>Italic</a>" +
-                               "<a class='btn' data-wysihtml5-command='underline' title='CTRL+U'>Underline</a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='bold' title='CTRL+B'>Bold</a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='italic' title='CTRL+I'>Italic</a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='underline' title='CTRL+U'>Underline</a>" +
                            "</div>" +
                        "</li>",
         "lists":       "<li>" +
                            "<div class='btn-group'>" +
-                               "<a class='btn' data-wysihtml5-command='insertUnorderedList' title='Unordered List'><i class='icon-list'></i></a>" +
-                               "<a class='btn' data-wysihtml5-command='insertOrderedList' title='Ordered List'><i class='icon-th-list'></i></a>" +
-                               "<a class='btn' data-wysihtml5-command='Outdent' title='Outdent'><i class='icon-indent-right'></i></a>" +
-                               "<a class='btn' data-wysihtml5-command='Indent' title='Indent'><i class='icon-indent-left'></i></a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='insertUnorderedList' title='Unordered List'><i class='fa fa-list'></i></a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='insertOrderedList' title='Ordered List'><i class='fa fa-th-list'></i></a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='Outdent' title='Outdent'><i class='fa fa-outdent'></i></a>" +
+                               "<a class='btn btn-default' data-wysihtml5-command='Indent' title='Indent'><i class='fa fa-indent'></i></a>" +
                            "</div>" +
                        "</li>",
         "link":        "<li>" +
                            "<div class='bootstrap-wysihtml5-insert-link-modal modal hide fade'>" +
+                               "<div class='modal-dialog'>" +
+                               "<div class='modal-content'>" +
                                "<div class='modal-header'>" +
                                    "<a class='close' data-dismiss='modal'>&times;</a>" +
                                    "<h3>Insert Link</h3>" +
@@ -37,14 +39,18 @@
                                    "<input value='http://' class='bootstrap-wysihtml5-insert-link-url input-xlarge'>" +
                                "</div>" +
                                "<div class='modal-footer'>" +
-                                   "<a href='#' class='btn' data-dismiss='modal'>Cancel</a>" +
+                                   "<a href='#' class='btn btn-default' data-dismiss='modal'>Cancel</a>" +
                                    "<a href='#' class='btn btn-primary' data-dismiss='modal'>Insert link</a>" +
-                               "</div>" +
+                                "</div>" +
+                                "</div>" +
+                                "</div>" +
                            "</div>" +
-                           "<a class='btn' data-wysihtml5-command='createLink' title='Link'><i class='icon-share'></i></a>" +
+                           "<a class='btn btn-default' data-wysihtml5-command='createLink' title='Link'><i class='fa fa-share'></i></a>" +
                        "</li>",
         "image":       "<li>" +
                            "<div class='bootstrap-wysihtml5-insert-image-modal modal hide fade'>" +
+            "<div class='modal-dialog'>" +
+            "<div class='modal-content'>" +
                                "<div class='modal-header'>" +
                                    "<a class='close' data-dismiss='modal'>&times;</a>" +
                                    "<h3>Insert Image</h3>" +
@@ -53,17 +59,19 @@
                                    "<input value='http://' class='bootstrap-wysihtml5-insert-image-url input-xlarge'>" +
                                "</div>" +
                                "<div class='modal-footer'>" +
-                                   "<a href='#' class='btn' data-dismiss='modal'>Cancel</a>" +
-                                   "<a href='#' class='btn btn-primary' data-dismiss='modal'>Insert image</a>" +
+                                   "<a href='#' class='btn btn-default' data-dismiss='modal'>Cancel</a>" +
+                                   "<a href='#' class='btn btn-default btn-primary' data-dismiss='modal'>Insert image</a>" +
                                "</div>" +
+            "</div>" +
+            "</div>" +
                            "</div>" +
-                           "<a class='btn' data-wysihtml5-command='insertImage' title='Insert image'><i class='icon-picture'></i></a>" +
+                           "<a class='btn btn-default' data-wysihtml5-command='insertImage' title='Insert image'><i class='fa fa-picture-o'></i></a>" +
                        "</li>",
 
         "html":
                        "<li>" +
                            "<div class='btn-group'>" +
-                               "<a class='btn' data-wysihtml5-action='change_view' title='Edit HTML'><i class='icon-pencil'></i></a>" +
+                               "<a class='btn btn-default' data-wysihtml5-action='change_view' title='Edit HTML'><i class='fa fa-pencil'></i></a>" +
                            "</div>" +
                        "</li>"
     };

data/lib/generators/templates/app/assets/javascripts/fixed_menu.js

@@ -1,19 +1,19 @@
 function modify_dom_init(){
-    var span2 = $("body>div.container-fluid>div.row-fluid>div.span2");
-    span2.addClass("fixed visible-desktop");
-    span2.removeClass("span2");
+    var span2 = $("body>div.container-fluid>div.row>div.col-md-2");
+    span2.addClass("fixed visible-md visible-lg");
+    span2.removeClass("col-md-2");
 
     span2.children("ul").removeClass("well");
 
-    var span10 = $("body>div.container-fluid>div.row-fluid>div.span10");
+    var span10 = $("body>div.container-fluid>div.row>div.col-md-10");
     span10.addClass("filler");
-    span10.removeClass("span10");
+    span10.removeClass("col-md-10");
 
     var cnt2 = $("body>div.container-fluid").contents();
     $("body>div.container-fluid").replaceWith(cnt2);
 
-    var cnt = $("body>div.row-fluid").contents();
-    $("body>div.row-fluid").replaceWith(cnt);
+    var cnt = $("body>div.row").contents();
+    $("body>div.row").replaceWith(cnt);
 
     $('body').show();
     $('body').css('display','block'); /* Hack Firefox previous line dosen't work with firefox */

data/lib/generators/templates/app/assets/stylesheets/application-bs.css

@@ -10,6 +10,7 @@
  *
  *= require_self
  *= require reset
+ *= require jquery.ui.all
  *= require datepicker
  *= require timepicker
  *= require beautiful-scaffold

data/lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss

@@ -151,16 +151,16 @@ html, body {
 #jstree-marker-line {pointer-events: none;}
 
 /* Search & filter  */
-.search-and-filter div.accordion{
+.search-and-filter div.panel-group{
   margin-bottom:0;
 }
-.search-and-filter div.accordion .accordion-toggle{
+.search-and-filter div.panel-group .accordion-toggle{
   padding-left:0;
 }
-.search-and-filter div.accordion .accordion-group{
+.search-and-filter div.panel-group .panel.panel-default{
   border:0;
 }
-.search-and-filter div.accordion .accordion-inner{
+.search-and-filter div.panel-group .panel-body{
   padding:0;
   margin-top:0;
 }

data/lib/generators/templates/app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -0,0 +1,40 @@
+//= depend_on_asset "glyphicons-halflings-regular.eot"
+//= depend_on_asset "glyphicons-halflings-regular.woff"
+//= depend_on_asset "glyphicons-halflings-regular.ttf"
+//= depend_on_asset "glyphicons-halflings-regular.svg"
+//= depend_on_asset "twitter/bootstrap/glyphicons-halflings.png"
+//= depend_on_asset "twitter/bootstrap/glyphicons-halflings-white.png"
+//= depend_on_asset "fontawesome-webfont.eot"
+//= depend_on_asset "fontawesome-webfont.woff"
+//= depend_on_asset "fontawesome-webfont.ttf"
+//= depend_on_asset "fontawesome-webfont.svg"
+
+@import "twitter/bootstrap/bootstrap";
+
+// Set the correct sprite paths
+@iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
+@iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
+@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
+
+// Font Awesome
+@import "fontawesome/font-awesome";
+
+// Glyphicons
+//@import "twitter/bootstrap/sprites.less";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

data/lib/generators/templates/app/assets/stylesheets/colorpicker.css

@@ -119,7 +119,7 @@ background-position: 0 100%;
 .colorpicker-color div {
 height: 10px;
 }
-.input-append.color .add-on i, .input-prepend.color .add-on i {
+.input-group.color .input-group-addon i, .input-group.color .input-group-addon i {
 display: block;
 cursor: pointer;
 width: 16px;

data/lib/generators/templates/app/assets/stylesheets/datepicker.css

@@ -215,8 +215,8 @@
 .datepicker thead tr:first-child th:hover {
   background: #eeeeee;
 }
-.input-append.date .add-on i,
-.input-prepend.date .add-on i {
+.input-group.date .input-group-addon i,
+.input-group.date .input-group-addon i {
   display: block;
   cursor: pointer;
   width: 16px;

data/lib/generators/templates/app/assets/stylesheets/timepicker.css

@@ -28,10 +28,7 @@
     position: absolute;
     top: -6px;
 }
-.bootstrap-timepicker.modal {
-    margin-left: -100px;
-    margin-top: 0;
-    top: 30%;
+.bootstrap-timepicker.modal .modal-dialog {
     width: 200px;
 }
 .bootstrap-timepicker.modal .modal-content {
@@ -81,10 +78,10 @@
     text-align: center;
     width: 25px;
 }
-.bootstrap-timepicker-component .add-on {
+.bootstrap-timepicker-component .input-group-addon {
     cursor: pointer;
 }
-.bootstrap-timepicker-component .add-on i {
+.bootstrap-timepicker-component .input-group-addon i {
     display: block;
     height: 16px;
     width: 16px;

data/lib/generators/templates/app/controllers/base.rb

@@ -1,16 +1,16 @@
 # encoding : utf-8
 class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < BeautifulController
 
-  before_filter :load_<%= model %>, :only => [:show, :edit, :update, :destroy]
+  before_action :load_<%= model %>, :only => [:show, :edit, :update, :destroy]
 
   # Uncomment for check abilities with CanCan
   #authorize_resource
 
   def index
     session[:fields] ||= {}
-    session[:fields][:<%= model %>] ||= (<%= model_camelize %>.columns.map(&:name) - ["id"])[0..4]
-    do_select_fields(:<%= model %>)
-    do_sort_and_paginate(:<%= model %>)
+    session[:fields]["<%= model %>"] ||= (<%= model_camelize %>.columns.map(&:name) - ["id"])[0..4]
+    do_select_fields("<%= model %>")
+    do_sort_and_paginate("<%= model %>")
     
     @q = <%= model_camelize %>.search(
       params[:q]

data/lib/generators/templates/app/controllers/master_base.rb

@@ -9,7 +9,7 @@ class BeautifulController < ApplicationController
 
   # Call in AJAX
   def select_fields
-    model_sym = params[:model_sym].to_sym
+    model_sym = params[:model_sym]
 
     do_select_fields(model_sym)
 

data/lib/generators/templates/app/helpers/beautiful_helper.rb

@@ -2,7 +2,7 @@
 module BeautifulHelper
 
   def visible_column(model_name, field_name, display_default = 'table-cell', other_css = "")
-    return ('style="display:' + ((session[:fields][model_name.to_sym].to_a.include?(field_name))  ? display_default : 'none') + ';' + other_css + '"').html_safe
+    return ('style="display:' + ((session[:fields][model_name].to_a.include?(field_name))  ? display_default : 'none') + ';' + other_css + '"').html_safe
   end
 
   def dropdown_submenu(link_caption, &block)
@@ -23,13 +23,13 @@ module BeautifulHelper
     attr    = attr.to_s.downcase
     sortstr = sort.to_s.downcase
     opposite_sortstr = ""
-    csort = '' # <i class="icon-stop"></i>
+    csort = '' # <i class="fa fa-stop"></i>
     if attribute_name == attr then
       if sortstr == "asc" then
-        csort = '<i class="icon-chevron-up"></i>'
+        csort = '<i class="fa fa-chevron-up"></i>'
         opposite_sortstr = "desc"
       elsif sortstr == "desc" then
-        csort = '<i class="icon-chevron-down"></i>'
+        csort = '<i class="fa fa-chevron-down"></i>'
         opposite_sortstr = "asc"
       end
     else
@@ -85,7 +85,6 @@ module BeautifulHelper
     infostr   = ''
     response  = '' # See at end
     response += f.label name_field, t(cap, :default => default_caption).capitalize, :class => "control-label"
-    response += '<div class="controls">'
 
     type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?
     type_of_column ||= :other
@@ -95,25 +94,25 @@ module BeautifulHelper
         interval = (dt ? (1..5) : (1..3))
 
         # Greater than
-        response += '<div class="input-prepend input-append input-' + type_of_column.to_s + '">'
-        response += '<span class="add-on"><i class="icon-chevron-right"></i></span>'
+        response += '<div class="input-group input-' + type_of_column.to_s + '">'
+        response += '<span class="input-group-addon"><i class="fa fa-chevron-right"></i></span>'
         response += f.text_field(
             (name_field + "_dp_gt").to_sym,
             :value => (begin params[:q][(name_field + "_dp_gt").to_sym] rescue '' end),
-            :class => "span9 dpicker",
+            :class => "col-md-9 dpicker form-control",
             "data-id" => ("q_" + name_field + "_gteq"))
-        response += '<span class="add-on"><i class="icon-calendar"></i></span>'
+        response += '<span class="input-group-addon"><i class="fa fa-calendar"></i></span>'
         response += '</div>'
 
         if dt then
-          response += '<div class="input-prepend input-append input-' + type_of_column.to_s + '">'
-          response += '<span class="add-on"><i class="icon-chevron-right"></i></span>'
+          response += '<div class="input-group input-' + type_of_column.to_s + '">'
+          response += '<span class="input-group-addon"><i class="fa fa-chevron-right"></i></span>'
           response += f.text_field(
               (name_field + "_tp_gt").to_sym,
               :value => (begin params[:q][(name_field + "_tp_gt").to_sym] rescue '' end),
-              :class => "span9 tpicker",
+              :class => "col-md-9 tpicker form-control",
               "data-id" => ("q_" + name_field + "_gteq"))
-          response += '<span class="add-on"><i class="icon-time"></i></span>'
+          response += '<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>'
           response += '</div>'
         end
 
@@ -124,25 +123,25 @@ module BeautifulHelper
         end
 
         # Less than
-        response += '<div class="input-prepend input-append input-' + type_of_column.to_s + '">'
-        response += '<span class="add-on"><i class="icon-chevron-left"></i></span>'
+        response += '<div class="input-group input-' + type_of_column.to_s + '">'
+        response += '<span class="input-group-addon"><i class="fa fa-chevron-left"></i></span>'
         response += f.text_field(
             (name_field + "_dp_lt").to_sym,
             :value => (begin params[:q][(name_field + "_dp_lt").to_sym] rescue '' end),
-            :class => "span9 dpicker",
+            :class => "col-md-9 dpicker form-control",
             "data-id" => ("q_" + name_field + "_lteq"))
-        response += '<span class="add-on"><i class="icon-calendar"></i></span>'
+        response += '<span class="input-group-addon"><i class="fa fa-calendar"></i></span>'
         response += '</div>'
 
         if dt then
-          response += '<div class="input-prepend input-append input-' + type_of_column.to_s + '">'
-          response += '<span class="add-on"><i class="icon-chevron-left"></i></span>'
+          response += '<div class="input-group input-' + type_of_column.to_s + '">'
+          response += '<span class="input-group-addon"><i class="fa fa-chevron-left"></i></span>'
           response += f.text_field(
               (name_field + "_tp_lt").to_sym,
               :value => (begin params[:q][(name_field + "_tp_lt").to_sym] rescue '' end),
-              :class => "span9 tpicker",
+              :class => "col-md-9 tpicker form-control",
               "data-id" => ("q_" + name_field + "_lteq"))
-          response += '<span class="add-on"><i class="icon-time"></i></span>'
+          response += '<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>'
           response += '</div>'
         end
 
@@ -161,41 +160,40 @@ module BeautifulHelper
 
         infostr = (begin session[:search][model_name.to_sym][(name_field + "_eq").to_sym] == "on" ? "" : "info" rescue "" end)
       when :string then
-        response += f.text_field((name_field + "_cont").to_sym, :class => "filter span12")
+        response += f.text_field((name_field + "_cont").to_sym, :class => "filter col-md-12 form-control")
 
         infostr = info_input(model_name, (name_field + "_cont").to_sym)
       when :integer, :float, :decimal then
         if is_belongs_to_column?(name_field_bk) then
           btmodel = get_belongs_to_model(name_field_bk).camelize.constantize
-          response += f.collection_select((name_field + "_eq").to_sym, btmodel.all, :id, :caption, { :include_blank => t(:all, :default => "All") }, { :class => "span12" })
+          response += f.collection_select((name_field + "_eq").to_sym, btmodel.all, :id, :caption, { :include_blank => t(:all, :default => "All") }, { :class => "col-md-12 form-control" })
 
           infostr = info_input(model_name, (name_field + "_eq").to_sym)
         elsif name_field == "id" then
-          response += f.text_field((name_field + "_eq").to_sym, :class => "filter span12")
+          response += f.text_field((name_field + "_eq").to_sym, :class => "filter col-md-12 form-control")
 
           infostr = info_input(model_name, (name_field + "_eq").to_sym)
         else
-          response += '<div class="input-prepend">'
-          response += '<span class="add-on" rel="tooltip" title="' + t(:greater_than, :default => "Greater than") + '"><i class="icon-chevron-right"></i></span>'
-          response += f.text_field((name_field + "_gteq").to_sym, :class => "#{align_attribute("integer")} filter-min span10")
+          response += '<div class="input-group">'
+          response += '<span class="input-group-addon" rel="tooltip" title="' + t(:greater_than, :default => "Greater than") + '"><i class="fa fa-chevron-right"></i></span>'
+          response += f.text_field((name_field + "_gteq").to_sym, :class => "#{align_attribute("integer")} filter-min col-md-10 form-control")
           response += '</div>'
-          response += '<div class="input-prepend">'
-          response += '<span class="add-on" rel="tooltip" title="' + t(:smaller_than, :default => "Smaller than") + '"><i class="icon-chevron-left"></i></span>'
-          response += f.text_field((name_field + "_lteq").to_sym, :class => "#{align_attribute("integer")} filter-max span10")
+          response += '<div class="input-group">'
+          response += '<span class="input-group-addon" rel="tooltip" title="' + t(:smaller_than, :default => "Smaller than") + '"><i class="fa fa-chevron-left"></i></span>'
+          response += f.text_field((name_field + "_lteq").to_sym, :class => "#{align_attribute("integer")} filter-max col-md-10 form-control")
           response += '</div>'
 
           infostr = info_input(model_name, [(name_field + "_lteq").to_sym, (name_field + "_gteq").to_sym])
         end
       else
-        response += f.text_field((name_field + "_cont").to_sym, :class => "filter span12")
+        response += f.text_field((name_field + "_cont").to_sym, :class => "filter col-md-12 form-control")
         infostr = info_input(model_name, (name_field + "_cont").to_sym)
     end
 
-    response += '</div>'
     response += '</div>'
 
     # Add info class
-    response = '<div class="control-group ' + infostr + '">' + response
+    response = '<div class="form-group ' + infostr + '">' + response
 
     return response.html_safe
   end

data/lib/generators/templates/app/initializers/link_renderer.rb

@@ -8,22 +8,22 @@ module WillPaginate
     
       def page_number(page)
         unless page == current_page
-          link(page, page, :rel => rel_value(page), :class => "btn")
+          link(page, page, :rel => rel_value(page), :class => "btn btn-default")
         else
-          tag(:a, page, :class => 'current active btn')
+          tag(:a, page, :class => 'current active btn btn-default')
         end
       end
       
       def gap
         text = @template.will_paginate_translate(:page_gap) { '…' }
-        %(<a class="gap btn disabled">#{text}</a>)
+        %(<a class="gap btn btn-default disabled">#{text}</a>)
       end
       
       def previous_or_next_page(page, text, classname)
         if page
-          link(text, page, :class => classname + ' btn')
+          link(text, page, :class => classname + ' btn btn-default')
         else
-          tag(:a, text, :class => classname + ' disabled btn')
+          tag(:a, text, :class => classname + ' disabled btn btn-default')
         end
       end