beautiful_scaffold 0.2.7 → 0.3.0.pre

data/lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js

@@ -1,43 +1,46 @@
-$('.dropdown-toggle').dropdown();
-$('.dpicker').livequery(function(){
-    $(this).datepicker({ format : 'dd/mm/yyyy', language : $('html').attr("lang") }).on('changeDate', function(ev){
-        idday   = '#' + $('#' + ev.currentTarget.id).data('id') + '_3i';
-        idmonth = '#' + $('#' + ev.currentTarget.id).data('id') + '_2i';
-        idyear  = '#' + $('#' + ev.currentTarget.id).data('id') + '_1i';
-        $(idday).val(ev.date.getDate());
-        $(idmonth).val(ev.date.getMonth()+1);
-        $(idyear).val(ev.date.getFullYear());
+function datetimepicker_init(){
+
+    $('.dpicker').livequery(function(){
+        $(this).datepicker({ format : 'dd/mm/yyyy', language : $('html').attr("lang") }).on('changeDate', function(ev){
+            idday   = '#' + $('#' + ev.currentTarget.id).data('id') + '_3i';
+            idmonth = '#' + $('#' + ev.currentTarget.id).data('id') + '_2i';
+            idyear  = '#' + $('#' + ev.currentTarget.id).data('id') + '_1i';
+            $(idday).val(ev.date.getDate());
+            $(idmonth).val(ev.date.getMonth()+1);
+            $(idyear).val(ev.date.getFullYear());
+        });
+        $(this).change(function(){
+            if( !$(this).val() ){
+                id = '#' + $(this).data('id');
+                $(id + '_3i').val("");
+                $(id + '_2i').val("");
+                $(id + '_1i').val("");
+            }
+        });
     });
-    $(this).change(function(){
-        if( !$(this).val() ){
-            id = '#' + $(this).data('id');
-            $(id + '_3i').val("");
-            $(id + '_2i').val("");
-            $(id + '_1i').val("");
+    $('.add-on').live('click', function(){
+        try{
+            dpick = $(this).parent().find('.dpicker');
+            dpick.trigger('focus');
+            dpick.trigger('select');
+        }catch (e){
         }
     });
-});
-$('.add-on').live('click', function(){
-    try{
-        dpick = $(this).parent().find('.dpicker');
-        dpick.trigger('focus');
-        dpick.trigger('select');
-    }catch (e){
-    }
-});
-$('.tpicker').livequery(function(){
-    $(this).timepicker({ template: 'modal', showMeridian: false, minuteStep: 1, defaultTime: false, showInputs: false, disableFocus: true }).on('change', function(ev){
-        tpickerdate = new Date("01/01/1970 " + ev.currentTarget.value);
-        idhour   = '#' + $('#' + ev.currentTarget.id).data('id') + '_4i';
-        idmin    = '#' + $('#' + ev.currentTarget.id).data('id') + '_5i';
-        $(idhour).val(tpickerdate.getHours());
-        $(idmin).val(tpickerdate.getMinutes());
+    $('.tpicker').livequery(function(){
+        $(this).timepicker({ template: 'modal', showMeridian: false, minuteStep: 1, defaultTime: false, showInputs: false, disableFocus: true }).on('change', function(ev){
+            tpickerdate = new Date("01/01/1970 " + ev.currentTarget.value);
+            idhour   = '#' + $('#' + ev.currentTarget.id).data('id') + '_4i';
+            idmin    = '#' + $('#' + ev.currentTarget.id).data('id') + '_5i';
+            $(idhour).val(tpickerdate.getHours());
+            $(idmin).val(tpickerdate.getMinutes());
+        });
+        $(this).change(function(){
+            if( !$(this).val() ){
+                id = '#' + $(this).data('id');
+                $(id + '_4i').val("");
+                $(id + '_5i').val("");
+            }
+        });
     });
-    $(this).change(function(){
-        if( !$(this).val() ){
-            id = '#' + $(this).data('id');
-            $(id + '_4i').val("");
-            $(id + '_5i').val("");
-        }
-    });
-});
+
+}

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

@@ -0,0 +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");
+
+    span2.children("ul").removeClass("well");
+
+    var span10 = $("body>div.container-fluid>div.row-fluid>div.span10");
+    span10.addClass("filler");
+    span10.removeClass("span10");
+
+    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);
+
+    $('body').show();
+}

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

@@ -0,0 +1,26 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require reset
+ *= require datepicker
+ *= require timepicker
+ *= require beautiful-scaffold
+ *= require tagit-dark-grey
+ *= require colorpicker
+ *= require bootstrap-wysihtml5
+ *= require bootstrap_and_overrides
+ *= require markitup/skins/simple/style.css
+ *= require markitup/sets/bbcode/style.css
+ *= require markitup/sets/wiki/style.css
+ *= require markitup/sets/markdown/style.css
+ *= require markitup/sets/html/style.css
+ *= require markitup/sets/textile/style.css
+ */

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

@@ -94,4 +94,49 @@ label.bs-label-ib{
 label.bs-label-ib input{
   margin-right:3px;
   margin-top:0;
-}
+}
+
+/* Fixed left menu */
+
+.fixed {
+  width: 200px;
+  float: left;
+}
+.fixed + div {
+  margin-left: 200px;
+  padding-left:20px;
+  overflow: hidden;
+  min-height:500px;
+  background:white;
+}
+body {
+  padding-top:70px;
+}
+@media (max-width: 979px) {
+  .fixed + div {
+    margin-left: 0;
+    padding:10px;
+  }
+  body {
+    padding-top:0px;
+  }
+}
+html, body {
+  height: 100%;
+}
+.filler:after{
+  background-color:inherit;
+  bottom: 0;
+  content: "";
+  height: auto;
+  min-height: 100%;
+  left: 0;
+  margin:inherit;
+  right: 0;
+  position: absolute;
+  top: 0;
+  width: inherit;
+  z-index: -1;
+}
+
+#jstree-marker-line {pointer-events: none;}

data/lib/generators/templates/app/views/_form_habtm_tag.html.erb

@@ -11,11 +11,12 @@
   }
   # Example to put in a _form.html.erb
 %>
+<% path_namespace = '/' + namespace_bs if not namespace_bs.blank? %>
 
 <div class="control-group">
     <%= f.label plural_linked_model_name.to_sym, t(plural_linked_model_name.to_sym, :default => plural_linked_model_name.capitalize), :class => "control-label" %>
     <div class="controls">
-        <ul id="<%= model_name %>_<%= linked_model_name %>_ids" name="<%= model_name %>[<%= linked_model_name %>_ids][]">
+        <ul class="bs-tagit" id="<%= model_name %>_<%= linked_model_name %>_ids" name="<%= model_name %>[<%= linked_model_name %>_ids][]" data-url="<%= path_namespace %>/<%= plural_linked_model_name %>/search_and_filter.json" data-param="q[<%= field_to_search_for_linked_model %>_cont]" data-result="caption">
           <% begin %>
             <% for elt in model_class.send(plural_linked_model_name) %>
             <li data-value="<%= elt.id %>"><%= elt.caption %></li>
@@ -24,28 +25,4 @@
           <% end %>
         </ul>
     </div>
-</div>
-<script type="text/javascript">
-  $('#<%= model_name %>_<%= linked_model_name %>_ids').tagit({
-    tagSource : function( request, response ) {
-      <% path_namespace = '/' + namespace_bs if not namespace_bs.blank? %>
-      $.ajax({
-        url: "<%= path_namespace %>/<%= plural_linked_model_name %>/search_and_filter.json",
-        type: "POST",
-        data: {
-            "q[<%= field_to_search_for_linked_model %>_cont]" : request.term,
-            "skip_save_search" : true
-        },
-        dataType: "json",
-        success: function( data ) {
-          response( $.map( data, function( item ) {
-            return { label: String(item.<%= field_to_search_for_linked_model %>), value: item.id };
-          }));
-        }
-      });
-    },
-    triggerKeys:['enter', 'comma', 'tab'],
-    select : true,
-    allowNewTags : false
-  });
-</script>
+</div>

data/lib/generators/templates/app/views/_mass_inserting.html.erb

@@ -3,7 +3,7 @@
   <% formparams << namespace %>
 <% end %>
 <% formparams << model_name.camelize.constantize.new %>
-<%= form_for formparams, :method => :post, :html => { :class => "well well-small form-horizontal mass-inserting" } do |f| %>
+<%= form_for formparams, :method => :post, :html => { :class => "well well-small form-horizontal mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
   <%= hidden_field_tag :mass_inserting, true %>
   <% for col in model_columns %>
     <div <%= visible_column(model_name, col, 'inline') %> class="col-<%= col %>">
@@ -31,13 +31,6 @@
     </div>
   <% end %>
   <div style="display:inline;">
-    <%= f.submit t(:create, :default => "Create"), :class => 'btn' %>
+    <%= f.submit t(:create, :default => "Create"), :class => "btn" %>
   </div>
-<% end %>
-
-<% if params[:mass_inserting] then %>
-  <script type="text/javascript">
-    elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
-    $(elt).focus();
-  </script>
 <% end %>

data/lib/generators/templates/app/views/_modal_columns.html.erb

@@ -11,35 +11,7 @@
     <% end %>
   </div>
   <div class="modal-footer">
-    <button type="button" class="btn btn-primary" id="filter-columns">Ok</button>
+    <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
     <button type="button" class="btn" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
   </div>
-  <script type="text/javascript">
-    $('#filter-columns').on('click', function(){
-      var return_json = [];
-      $.each($('input[name^="field"]:checked'), function(index, value) {
-        return_json.push($(value).val());
-      });
-      $.ajax({
-        url: '/<%= model_name %>/select_fields',
-        data: { 'fields' : return_json },
-        success: function(data) {
-          $('table.table th[class^="col"], table.table td[class^="col"]').css('display', 'none');
-          $.each(return_json, function(index, value) {
-            $('table.table th.col-' + value + ', table.table td.col-' + value).css('display', 'table-cell');
-          });
-          $('div[class^="col"]').css('display', 'none');
-          $.each(return_json, function(index, value) {
-            $('div.col-' + value).css('display', 'inline');
-          });
-          $('#modal-columns').modal('hide');
-        }
-      });
-      return false;
-    });
-    $('#cancel-filter-columns').on('click', function(){
-      $('#modal-columns').modal('hide');
-      return false;
-    });
-  </script>
 </div>

data/lib/generators/templates/app/views/dashboard.html.erb

@@ -0,0 +1 @@
+<h2><%%= t(:dashboard, :default => 'Dashboard') %></h2>

data/lib/generators/templates/app/views/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:editing, :default => 'Editing') %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
+<h2><%%= t(:editing, :default => 'Editing') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 
 <%%= render 'form' %>
 

data/lib/generators/templates/app/views/index.html.erb

@@ -1,9 +1,9 @@
-<h2><%%= t(:listing, :default => "Listing") %> <%%= t(:<%= plural_table_name %>, :default => "<%= plural_table_name %>") %></h2>
+<h2><%%= t(:listing, :default => "Listing") %> <%%= <%= i18n_t_m_p(singular_table_name) %> %></h2>
 
 <p>
-  <%%= link_to '<i class="icon-plus"></i>'.html_safe + t(:new, :default => "New") + ' ' + t(:<%= model %>, :default => "<%= model %>"), new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
+  <%%= link_to '<i class="icon-plus"></i>'.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
   <%% if <%= model_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
-    <%%= link_to '<i class="icon-folder-close"></i>'.html_safe + t(:treeview, :default => "Treeview") + ' ' + t(:<%= model %>, :default => "<%= model %>"), treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
+    <%%= link_to '<i class="icon-folder-close"></i>'.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
   <%% end %>
 </p>
 
@@ -46,11 +46,6 @@
             </th>
             <th>
               <%%= check_box_tag :checkall, '' %>
-              <script type="text/javascript">
-                $('#checkall').click(function(){
-                  $('.cbbatch').attr('checked', ($(this).attr('checked') != undefined));
-                });
-              </script>
             </th>
             <%= render_partial 'app/views/partials/_index_header.html.erb' %>
             <!-- Beautiful_scaffold - AddField - Header - Do not remove -->
@@ -110,6 +105,7 @@
   <div class="span3">
     <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "well well-small" }, :method => :post do |f| %>
       <%= render_partial 'app/views/partials/_index_search.html.erb' %>
+      <%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
       <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
       <%%= f.submit t(:filter, :default => "Filter"), :class => "btn btn-primary" %>
       <%%= link_to  t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn" %>

data/lib/generators/templates/app/views/layout.html.erb

@@ -7,46 +7,45 @@
     <meta name="description" content="Beautiful Scaffold">
     <meta name="author" content="You or me Sylvain Claudel (http://blog.escarworld.com)">
 
-    <%%= stylesheet_link_tag "reset", "bootstrap.min", "bootstrap-responsive.min", "datepicker", "timepicker", "beautiful-scaffold", "tagit-dark-grey", "colorpicker", "bootstrap-wysihtml5" %>
-    <style>
-        body {
-            padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-        }
-    </style>
-    <%%= javascript_include_tag "application", "jquery.pjax" %>
-    <%%= javascript_include_tag "jquery.markitup.js" %>
-    <%%= javascript_include_tag "markitup/sets/default/set.js" %>
-    <%%= stylesheet_link_tag "markitup/skins/simple/style.css" %>
-
-    <% miufile = ["bbcode","wiki","markdown","html","textile"] %>
-    <%%= stylesheet_link_tag <%= miufile.map{ |code| "'markitup/sets/#{code}/style.css'" }.join(',') %> %>
-    <%%= javascript_include_tag <%= miufile.map{ |code| "'markitup/sets/#{code}/set.js'" }.join(',') %> %>
+    <%%= stylesheet_link_tag "application-bs" %>
+    <%%= javascript_include_tag "application-bs" %>
 
     <%%= csrf_meta_tags %>
     <%%= yield :head %>
   </head>
-  <body>
-    <div class="container-fluid">
-      <div class="navbar navbar-fixed-top">
-        <div class="navbar-inner">
-          <div class="container">
-            <a class="brand" href="#">
-              Beautiful-Scaffold
-            </a>
-            <ul class="nav">
-              <li class="active">
-                <a href="/">Home</a>
-              </li>
-            </ul>
-            <ul class="nav pull-right">
-              <li>
-                <!-- Beautiful_scaffold - Signin - Do not remove -->
-              </li>
+  <body style="display:none;">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#">
+            Beautiful-Scaffold
+          </a>
+          <ul class="nav">
+            <li class="active">
+              <a href="/">Home</a>
+            </li>
+            <li class="hidden-desktop">
+              <!-- Mobile navbar -->
+              <a href="#" class="nopjax" data-toggle="collapse" data-target=".nav-collapse">
+                <i class="icon-th-list"></i>
+              </a>
+            </li>
+          </ul>
+          <ul class="nav pull-right">
+            <li>
+              <!-- Beautiful_scaffold - Signin - Do not remove -->
+            </li>
+          </ul>
+          <div class="nav-collapse collapse">
+            <ul class="nav hidden-desktop">
+              <%% @nopjax = "nopjax" %>
+              <%%= render :partial => "layouts/beautiful_menu" %>
             </ul>
           </div>
         </div>
       </div>
-
+    </div>
+    <div class="container-fluid">
       <div class="row-fluid">
         <div class="span2">
           <ul class="nav nav-list well">
@@ -92,19 +91,16 @@
       $('<%%= @opened_modal %>').modal('show');
       <%% end %>
     </script>
-
-    <%%= javascript_include_tag "bootstrap.min", "bootstrap-alert", "bootstrap-datepicker" ,"bootstrap-timepicker", "bootstrap-dropdown", "bootstrap-modal", "bootstrap-tooltip", "bootstrap-colorpicker", "a-wysihtml5-0.3.0.min", "bootstrap-wysihtml5" %>
     <script type="text/javascript">
-      ;(function($){
-        $.fn.datepicker.dates['<%= I18n.locale.to_s %>'] = {
-          days:        <%= (I18n.t("date.day_names") + [I18n.t("date.day_names").first]).map(&:capitalize).to_s.html_safe %>,
-          daysShort:   <%= (I18n.t("date.abbr_day_names") + [I18n.t("date.abbr_day_names").first]).map(&:capitalize).to_s.html_safe %>,
-          daysMin:     <%= (I18n.t("date.abbr_day_names") + [I18n.t("date.abbr_day_names").first]).map{ |d| d.capitalize[0..2] }.to_s.html_safe %>,
-          months:      <%= I18n.t("date.month_names")[1..12].map(&:capitalize).to_s.html_safe %>,
-          monthsShort: <%= I18n.t("date.abbr_month_names")[1..12].map(&:capitalize).to_s.html_safe %>
-        };
-      }(jQuery));
+        ;(function($){
+            $.fn.datepicker.dates['<%%= I18n.locale.to_s %>'] = {
+                days:        <%%= (t("date.day_names") + [t("date.day_names").first]).map(&:capitalize).to_s.html_safe %>,
+                daysShort:   <%%= (t("date.abbr_day_names") + [t("date.abbr_day_names").first]).map(&:capitalize).to_s.html_safe %>,
+                daysMin:     <%%= (t("date.abbr_day_names") + [t("date.abbr_day_names").first]).map{ |d| d.capitalize[0..2] }.to_s.html_safe %>,
+                months:      <%%= t("date.month_names")[1..12].map(&:capitalize).to_s.html_safe %>,
+                monthsShort: <%%= t("date.abbr_month_names")[1..12].map(&:capitalize).to_s.html_safe %>
+            };
+        }(jQuery));
     </script>
-    <%%= javascript_include_tag "bootstrap-datetimepicker-for-beautiful-scaffold" %>
   </body>
 </html>

data/lib/generators/templates/app/views/new.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:new, :default => 'New') %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
+<h2><%%= t(:new, :default => 'New') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 
 <%%= render 'form' %>