beautiful_scaffold 0.3.3 → 0.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. data/CHANGELOG +9 -0
  2. data/beautiful_scaffold.gemspec +1 -1
  3. data/lib/generators/beautiful_devisecancan_generator.rb +2 -2
  4. data/lib/generators/beautiful_locale_generator.rb +32 -19
  5. data/lib/generators/beautiful_scaffold_common_methods.rb +7 -4
  6. data/lib/generators/beautiful_scaffold_generator.rb +6 -2
  7. data/lib/generators/templates/app/assets/javascripts/application-bs.js +2 -8
  8. data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js +11 -11
  9. data/lib/generators/templates/app/assets/javascripts/bootstrap-colorpicker.js +1 -1
  10. data/lib/generators/templates/app/assets/javascripts/bootstrap-datepicker.js +799 -799
  11. data/lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js +17 -15
  12. data/lib/generators/templates/app/assets/javascripts/bootstrap-timepicker.js +135 -131
  13. data/lib/generators/templates/app/assets/javascripts/bootstrap-wysihtml5.js +24 -16
  14. data/lib/generators/templates/app/assets/javascripts/fixed_menu.js +7 -7
  15. data/lib/generators/templates/app/assets/stylesheets/application-bs.css +1 -0
  16. data/lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss +4 -4
  17. data/lib/generators/templates/app/assets/stylesheets/bootstrap_and_overrides.css.less +40 -0
  18. data/lib/generators/templates/app/assets/stylesheets/colorpicker.css +1 -1
  19. data/lib/generators/templates/app/assets/stylesheets/datepicker.css +2 -2
  20. data/lib/generators/templates/app/assets/stylesheets/timepicker.css +3 -6
  21. data/lib/generators/templates/app/controllers/base.rb +4 -4
  22. data/lib/generators/templates/app/controllers/master_base.rb +1 -1
  23. data/lib/generators/templates/app/helpers/beautiful_helper.rb +31 -33
  24. data/lib/generators/templates/app/initializers/link_renderer.rb +5 -5
  25. data/lib/generators/templates/app/views/_form.html.erb +2 -2
  26. data/lib/generators/templates/app/views/_form_habtm_tag.html.erb +2 -2
  27. data/lib/generators/templates/app/views/_mass_inserting.html.erb +6 -6
  28. data/lib/generators/templates/app/views/_modal_columns.html.erb +19 -15
  29. data/lib/generators/templates/app/views/edit.html.erb +1 -1
  30. data/lib/generators/templates/app/views/index.html.erb +36 -34
  31. data/lib/generators/templates/app/views/layout.html.erb +19 -28
  32. data/lib/generators/templates/app/views/new.html.erb +1 -1
  33. data/lib/generators/templates/app/views/partials/_forget_password.html.erb +21 -17
  34. data/lib/generators/templates/app/views/partials/_form_field.html.erb +40 -58
  35. data/lib/generators/templates/app/views/partials/_index_batch.html.erb +2 -2
  36. data/lib/generators/templates/app/views/partials/_index_column.html.erb +17 -17
  37. data/lib/generators/templates/app/views/partials/_index_header.html.erb +7 -7
  38. data/lib/generators/templates/app/views/partials/_index_search.html.erb +1 -1
  39. data/lib/generators/templates/app/views/partials/_index_search_default_fields.html.erb +1 -1
  40. data/lib/generators/templates/app/views/partials/_register_form.html.erb +38 -34
  41. data/lib/generators/templates/app/views/partials/_sign_in_form.html.erb +4 -4
  42. data/lib/generators/templates/app/views/show.html.erb +2 -2
  43. metadata +40 -20
@@ -5,7 +5,7 @@ if not namespace_alone.blank? then
5
5
  end
6
6
  -%>
7
7
 
8
- <%%= form_for(<%= strformfor %>, :html => { :class => "form-horizontal" }) do |f| %>
8
+ <%%= form_for(<%= strformfor %>) do |f| %>
9
9
  <%% if @<%= singular_table_name %>.errors.any? %>
10
10
  <div id="error_explanation">
11
11
  <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
@@ -16,7 +16,7 @@ end
16
16
  </div>
17
17
  <%% end %>
18
18
  <%= render_partial 'app/views/partials/_form_field.html.erb' %><!-- Beautiful_scaffold - AddField - Do not remove -->
19
- <div class="form-actions">
19
+ <div>
20
20
  <%%= f.submit :class => "btn btn-primary" %>
21
21
  </div>
22
22
  <%% end %>
@@ -13,9 +13,9 @@
13
13
  %>
14
14
  <% path_namespace = '/' + namespace_bs if not namespace_bs.blank? %>
15
15
 
16
- <div class="control-group">
16
+ <div class="form-group">
17
17
  <%= f.label plural_linked_model_name.to_sym, t(plural_linked_model_name.to_sym, :default => plural_linked_model_name.capitalize), :class => "control-label" %>
18
- <div class="controls">
18
+ <div>
19
19
  <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">
20
20
  <% begin %>
21
21
  <% for elt in model_class.send(plural_linked_model_name) %>
@@ -3,7 +3,7 @@
3
3
  <% formparams << namespace %>
4
4
  <% end %>
5
5
  <% formparams << model_name.camelize.constantize.new %>
6
- <%= form_for formparams, :method => :post, :html => { :class => "well well-small form-horizontal mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
6
+ <%= form_for formparams, :method => :post, :html => { :class => "well well-small form-inline mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
7
7
  <%= hidden_field_tag :mass_inserting, true %>
8
8
  <% for col in model_columns %>
9
9
  <div <%= visible_column(model_name, col, 'inline') %> class="col-<%= col %>">
@@ -13,24 +13,24 @@
13
13
  case ar.type
14
14
  when :integer then
15
15
  if col =~ /.*_id/ then
16
- f.collection_select((col).to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, { :class => "input-small" })
16
+ f.collection_select((col).to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, {:class => "form-control"})
17
17
  else
18
- f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
18
+ f.text_field(col.to_sym, :placeholder => t(i18n_translate_path(model_name, col)).capitalize, :class => "form-control")
19
19
  end
20
20
  when :boolean then
21
21
  (
22
22
  "<label class='bs-label-ib'>#{f.check_box(col.to_sym, {}, true, false)}#{t(i18n_translate_path(model_name, col)).capitalize}</label>".html_safe
23
23
  )
24
24
  else
25
- f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
25
+ f.text_field(col.to_sym, :placeholder => t(i18n_translate_path(model_name, col)).capitalize, :class => "form-control")
26
26
  end
27
27
  else
28
- f.collection_select((col + '_id').to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, { :class => "input-small" })
28
+ f.collection_select((col + '_id').to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, {:class => "form-control"})
29
29
  end
30
30
  %>
31
31
  </div>
32
32
  <% end %>
33
33
  <div style="display:inline;">
34
- <%= f.submit t(:create, :default => "Create"), :class => "btn" %>
34
+ <%= f.submit t(:create, :default => "Create"), :class => "btn btn-default" %>
35
35
  </div>
36
36
  <% end %>
@@ -1,17 +1,21 @@
1
- <div class="modal hide" id="modal-columns">
2
- <div class="modal-header">
3
- <button type="button" class="close" data-dismiss="modal">×</button>
4
- <h3><%= t(:select_columns, :default => "Select Columns") %></h3>
5
- </div>
6
- <div class="modal-body">
7
- <% for field in model_columns %>
8
- <label class="checkbox">
9
- <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
10
- </label><br />
11
- <% end %>
12
- </div>
13
- <div class="modal-footer">
14
- <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
15
- <button type="button" class="btn" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
1
+ <div class="modal fade" id="modal-columns">
2
+ <div class="modal-dialog">
3
+ <div class="modal-content">
4
+ <div class="modal-header">
5
+ <button type="button" class="close" data-dismiss="modal">×</button>
6
+ <h3><%= t(:select_columns, :default => "Select Columns") %></h3>
7
+ </div>
8
+ <div class="modal-body">
9
+ <% for field in model_columns %>
10
+ <label class="checkbox">
11
+ <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
12
+ </label><br />
13
+ <% end %>
14
+ </div>
15
+ <div class="modal-footer">
16
+ <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
17
+ <button type="button" class="btn btn-default" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
18
+ </div>
19
+ </div>
16
20
  </div>
17
21
  </div>
@@ -2,4 +2,4 @@
2
2
 
3
3
  <%%= render 'form' %>
4
4
 
5
- <%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn" %>
5
+ <%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>
@@ -1,9 +1,9 @@
1
1
  <h2><%%= t(:listing, :default => "Listing") %> <%%= <%= i18n_t_m_p(singular_table_name) %> %></h2>
2
2
 
3
3
  <p>
4
- <%%= 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" %>
4
+ <%%= link_to '<i class="fa fa-plus"></i> '.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn btn-default" %>
5
5
  <%% if <%= model_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
6
- <%%= 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" %>
6
+ <%%= link_to '<i class="fa fa-folder-close"></i> '.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn btn-default" %>
7
7
  <%% end %>
8
8
  </p>
9
9
 
@@ -14,26 +14,26 @@
14
14
  <%% if not scopes.blank? then %>
15
15
  <div class="btn-toolbar">
16
16
  <div class="btn-group">
17
- <%%= link_to "All (#{@<%= model %>_scope_for_scope.count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => ""), :class => "btn #{((session[:scope][:<%= model %>].to_s == '') ? 'active' : '')}" %>
17
+ <%%= link_to "All (#{@<%= model %>_scope_for_scope.count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => ""), :class => "btn btn-default #{((session[:scope][:<%= model %>].to_s == '') ? 'active' : '')}" %>
18
18
  <%% for scope in scopes %>
19
- <%%= link_to "#{scope} (#{@<%= model %>_scope_for_scope.send(scope).count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => scope), :class => "btn #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
19
+ <%%= link_to "#{scope} (#{@<%= model %>_scope_for_scope.send(scope).count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => scope), :class => "btn btn-default #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
20
20
  <%% end %>
21
21
  </div>
22
22
  </div>
23
23
  <%% end %>
24
24
 
25
- <div class="row-fluid">
26
- <div class="span9">
25
+ <div class="row">
26
+ <div class="col-md-9">
27
27
  <%%= form_tag batch_<%= namespace_for_route %><%= plural_table_name %>_path, :class => "form-inline" do %>
28
28
  <div class="well well-small">
29
29
  <label class="control-label" for="select01"><%%= t(:batch, :default => "Batch") %></label>
30
30
 
31
- <select id="select01" name="actionprocess">
31
+ <select id="select01" name="actionprocess" class="form-control">
32
32
  <option value="destroy"><%%= t(:destroy, :default => "Destroy") %></option>
33
- <%= render_partial 'app/views/partials/_index_batch.html.erb' %>
33
+ <%= render_partial 'app/views/partials/_index_batch.html.erb' %>
34
34
  <!-- Beautiful_scaffold - AddField - Batch - Do not remove -->
35
35
  </select>
36
- <button class="btn" type="submit"><i class="icon-ok"></i> <%%= t(:process, :default => "Process") %></button>
36
+ <button class="btn btn-default" type="submit"><i class="fa fa-ok"></i> <%%= t(:process, :default => "Process") %></button>
37
37
  </div>
38
38
 
39
39
  <%%= render :partial => "layouts/modal_columns", :locals => { :model_name => "<%= singular_table_name %>", :model_columns => [<%= (attributes.map{ |e| "'#{e.name}'" }.to_a + ["'created_at'", "'updated_at'"]).join(',') %>] } %>
@@ -42,23 +42,23 @@
42
42
  <thead>
43
43
  <tr>
44
44
  <th class="ac">
45
- <a class="" data-toggle="modal" href="#modal-columns" title="<%%= t(:select_columns, :default => "Select Columns") %>" ><i class="icon-th-list"></i></a>
45
+ <a class="" data-toggle="modal" href="#modal-columns" title="<%%= t(:select_columns, :default => "Select Columns") %>" ><i class="fa fa-th-list"></i></a>
46
46
  </th>
47
47
  <th>
48
48
  <%%= check_box_tag :checkall, '' %>
49
49
  </th>
50
- <%= render_partial 'app/views/partials/_index_header.html.erb' %>
50
+ <%= render_partial 'app/views/partials/_index_header.html.erb' %>
51
51
  <!-- Beautiful_scaffold - AddField - Header - Do not remove -->
52
- <th <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="col-created_at">
52
+ <th <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="bs-col-created_at">
53
53
  <%%= sorting_header("<%= singular_table_name %>", "created_at", "<%= namespace_alone %>") %>
54
54
  </th>
55
- <th <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at">
55
+ <th <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="bs-col-updated_at">
56
56
  <%%= sorting_header("<%= singular_table_name %>", "updated_at", "<%= namespace_alone %>") %>
57
57
  </th>
58
58
  <th colspan="3">
59
59
  <label class="checkbox">
60
60
  <%%= check_box_tag :checkallelt, 'all' %>
61
- <%%= pluralize(@<%= singular_table_name %>_scope.count, "<%= i18n_t_m(singular_table_name) %>", "<%= i18n_t_m_p(singular_table_name) %>") %>
61
+ <%%= pluralize(@<%= singular_table_name %>_scope.count, <%= i18n_t_m(singular_table_name) %>, <%= i18n_t_m_p(singular_table_name) %>) %>
62
62
  </label>
63
63
  </th>
64
64
  </tr>
@@ -68,16 +68,16 @@
68
68
  <tr class="line-<%%= cycle("1","2") %>">
69
69
  <td class="ar"><%%= <%= singular_table_name %>.id %></td>
70
70
  <td><%%= check_box_tag "ids[]",<%= singular_table_name %>.id, false, :class => 'cbbatch' %></td>
71
- <%= render_partial 'app/views/partials/_index_column.html.erb' %><!-- Beautiful_scaffold - AddField - Column - Do not remove -->
72
- <td <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="col-created_at <%%= align_attribute("datetime") %>">
71
+ <%= render_partial 'app/views/partials/_index_column.html.erb' %><!-- Beautiful_scaffold - AddField - Column - Do not remove -->
72
+ <td <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="bs-col-created_at <%%= align_attribute("datetime") %>">
73
73
  <%%= l(<%= singular_table_name %>.created_at, :format => :long) %>
74
74
  </td>
75
- <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at <%%= align_attribute("datetime") %>">
75
+ <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="bs-col-updated_at <%%= align_attribute("datetime") %>">
76
76
  <%%= l(<%= singular_table_name %>.updated_at, :format => :long) %>
77
77
  </td>
78
- <td class="ac am"><%%= link_to '<i class="icon-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
79
- <td class="ac am"><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
80
- <td class="ac am"><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :data => { :confirm => t(:are_you_sure, :default => "Are you sure?") }, :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
78
+ <td class="ac am"><%%= link_to '<i class="fa fa-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
79
+ <td class="ac am"><%%= link_to '<i class="fa fa-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
80
+ <td class="ac am"><%%= link_to '<i class="fa fa-times"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :data => { :confirm => t(:are_you_sure, :default => "Are you sure?") }, :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
81
81
  </tr>
82
82
  <%% end %>
83
83
  </tbody>
@@ -94,39 +94,41 @@
94
94
 
95
95
  </div>
96
96
  <div class="btn-group pull-right">
97
- <%%= link_to '<i class="icon-download"></i> CSV'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn" %>
98
- <%%= link_to '<i class="icon-download"></i> XML'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn" %>
99
- <%%= link_to '<i class="icon-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn" %>
100
- <%%= link_to '<i class="icon-download"></i> PDF'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn" %>
97
+ <%%= link_to '<i class="fa fa-download"></i> CSV'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn btn-default" %>
98
+ <%%= link_to '<i class="fa fa-download"></i> XML'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn btn-default" %>
99
+ <%%= link_to '<i class="fa fa-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn btn-default" %>
100
+ <%%= link_to '<i class="fa fa-download"></i> PDF'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn btn-default" %>
101
101
  </div>
102
102
  </div>
103
103
  <%% end %>
104
104
  </div>
105
- <div class="span3">
105
+ <div class="col-md-3">
106
106
  <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "well well-small search-and-filter" }, :method => :post do |f| %>
107
107
 
108
108
  <h3><%%= t("search_and_filter", :default => "Search & filter") %></h3>
109
109
 
110
- <%= render_partial 'app/views/partials/_index_search.html.erb' %>
110
+ <%= render_partial 'app/views/partials/_index_search.html.erb' %>
111
111
 
112
- <div class="accordion">
113
- <div class="accordion-group">
114
- <div class="accordion-heading">
112
+ <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
113
+
114
+ <div class="panel-group">
115
+ <div class="panel panel-default">
116
+ <div class="panel-heading">
115
117
  <a class="accordion-toggle" data-toggle="collapse-next">
116
118
  <%%= t(:more_options, :default => "More options...") %>
117
119
  </a>
118
120
  </div>
119
- <div class="accordion-body collapse">
120
- <div class="accordion-inner">
121
- <%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
121
+ <div class="panel-collapse collapse">
122
+ <div class="panel-body">
123
+ <%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
122
124
  </div>
123
125
  </div>
124
126
  </div>
125
127
  </div>
126
128
 
127
- <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
129
+
128
130
  <%%= f.submit t(:filter, :default => "Filter"), :class => "btn btn-primary" %>
129
- <%%= link_to t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn" %>
131
+ <%%= link_to t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn btn-default" %>
130
132
  <%% end %>
131
133
  </div>
132
134
  </div>
@@ -15,47 +15,38 @@
15
15
  <%%= yield :head %>
16
16
  </head>
17
17
  <body style="display:none;">
18
- <div class="navbar navbar-fixed-top">
19
- <div class="navbar-inner">
20
- <div class="container">
21
- <a class="brand" href="#">
18
+ <div class="navbar navbar-default navbar-fixed-top">
19
+ <div class="container">
20
+ <div class="navbar-header">
21
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
22
+ <span class="sr-only">Toggle navigation</span>
23
+ <i class="fa fa-bars"></i>
24
+ </button>
25
+ <a class="navbar-brand" href="#">
22
26
  Beautiful-Scaffold
23
27
  </a>
24
- <ul class="nav">
25
- <li class="active">
26
- <a href="/">Home</a>
27
- </li>
28
- <li class="hidden-desktop">
29
- <!-- Mobile navbar -->
30
- <a href="#" data-toggle="collapse" data-target=".nav-collapse">
31
- <i class="icon-th-list"></i>
32
- </a>
33
- </li>
28
+ </div>
29
+ <div class="navbar-collapse collapse">
30
+ <ul class="nav navbar-nav">
31
+ <li class="active"><a href="/">Home</a></li>
32
+ <%%= render :partial => "layouts/beautiful_menu" %>
34
33
  </ul>
35
- <ul class="nav pull-right">
34
+ <ul class="nav navbar-nav pull-right">
36
35
  <li>
37
36
  <!-- Beautiful_scaffold - Signin - Do not remove -->
38
37
  </li>
39
38
  </ul>
40
- <div class="nav-collapse collapse">
41
- <ul class="nav hidden-desktop">
42
- <%%= render :partial => "layouts/beautiful_menu" %>
43
- </ul>
44
- </div>
45
39
  </div>
46
40
  </div>
47
41
  </div>
48
42
  <div class="container-fluid">
49
- <div class="row-fluid">
50
- <div class="span2">
51
- <ul class="nav nav-list well">
52
- <li class="nav-header">
53
- Menu
54
- </li>
43
+ <div class="row">
44
+ <div class="col-md-2">
45
+ <ul class="nav nav-pills nav-stacked">
55
46
  <%%= render :partial => "layouts/beautiful_menu" %>
56
47
  </ul>
57
48
  </div>
58
- <div class="span10">
49
+ <div class="col-md-10">
59
50
  <%% if not flash[:notice].blank? then %>
60
51
  <div class="alert alert-info">
61
52
  <a class="close" data-dismiss="alert" href="#">×</a>
@@ -64,7 +55,7 @@
64
55
  </div>
65
56
  <%% end %>
66
57
  <%% if not flash[:error].blank? then %>
67
- <div class="alert alert-error">
58
+ <div class="alert alert-danger">
68
59
  <a class="close" data-dismiss="alert" href="#">×</a>
69
60
  <h4 class="alert-heading">Error : </h4>
70
61
  <%%= flash[:error] %>
@@ -2,4 +2,4 @@
2
2
 
3
3
  <%%= render 'form' %>
4
4
 
5
- <%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn" %>
5
+ <%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>
@@ -1,21 +1,25 @@
1
- <div class="modal hide" id="modal-forget-password">
2
- <div class="modal-header">
3
- <button type="button" class="close" data-dismiss="modal">×</button>
4
- <h3><%%= t(:forgot_password, :default => "Forgot password") %></h3>
5
- </div>
6
- <div class="modal-body">
7
- <%%= form_for('<%= model %>', :as => '<%= model %>', :url => password_path('<%= model %>'), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
8
- <div class="control-group">
9
- <%%= f.label :email, t(:email, :default => "Email"), :class => "control-label" %>
10
- <div class="controls">
11
- <%%= f.email_field :email %>
12
- </div>
1
+ <div class="modal fade" id="modal-forget-password">
2
+ <div class="modal-dialog">
3
+ <div class="modal-content">
4
+ <div class="modal-header">
5
+ <button type="button" class="close" data-dismiss="modal">×</button>
6
+ <h3><%%= t(:forgot_password, :default => "Forgot password") %></h3>
13
7
  </div>
14
- <div class="control-group">
15
- <div class="controls">
16
- <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn' %>
17
- </div>
8
+ <div class="modal-body">
9
+ <%%= form_for('<%= model %>', :as => '<%= model %>', :url => password_path('<%= model %>'), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
10
+ <div class="form-group">
11
+ <%%= f.label :email, t(:email, :default => "Email"), :class => "control-label" %>
12
+ <div>
13
+ <%%= f.email_field :email %>
14
+ </div>
15
+ </div>
16
+ <div class="form-group">
17
+ <div>
18
+ <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn btn-default' %>
19
+ </div>
20
+ </div>
21
+ <%% end %>
18
22
  </div>
19
- <%% end %>
23
+ </div>
20
24
  </div>
21
25
  </div>
@@ -1,23 +1,19 @@
1
1
  <%- attributes.each do |attribute| -%>
2
2
  <%- if @beautiful_attributes.include?(attribute.name + ':richtext') then -%>
3
- <div class="control-group">
3
+ <div class="form-group">
4
4
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
5
- <div class="controls">
6
- <%%= f.text_area :<%= attribute.name %>, :class => "richtext-editor" %>
7
- </div>
5
+ <%%= f.text_area :<%= attribute.name %>, :class => "richtext-editor" %>
8
6
  </div>
9
- <div class="control-group">
7
+ <div class="form-group">
10
8
  <label class="control-label" for="inlineCheckboxes"></label>
11
- <div class="controls">
12
- <% for type in richtext_type %>
13
- <%% hashradio = {:id => "<%= attribute.name %>-<%= type %>", :class => "select-richtext", 'data-editor' => 'markItUp<%= singular_table_name.capitalize %>_<%= attribute.name.downcase %>', 'data-spleditor' => '<%= singular_table_name %>_<%= attribute.name %>' } %>
14
- <%% hashradio[:checked] = "checked" if @<%= singular_table_name %>.<%= attribute.name %>_typetext == "<%= type %>" %>
15
- <label for="<%= attribute.name %>-<%= type %>" class="label-richtext-type checkbox inline">
16
- <%%= f.radio_button :<%= attribute.name %>_typetext, "<%= type %>", hashradio %>
17
- <%= type.capitalize %>
18
- </label>
19
- <% end %>
20
- </div>
9
+ <% for type in richtext_type %>
10
+ <%% hashradio = {:id => "<%= attribute.name %>-<%= type %>", :class => "select-richtext", 'data-editor' => 'markItUp<%= singular_table_name.capitalize %>_<%= attribute.name.downcase %>', 'data-spleditor' => '<%= singular_table_name %>_<%= attribute.name %>' } %>
11
+ <%% hashradio[:checked] = "checked" if @<%= singular_table_name %>.<%= attribute.name %>_typetext == "<%= type %>" %>
12
+ <label for="<%= attribute.name %>-<%= type %>" class="label-richtext-type checkbox inline">
13
+ <%%= f.radio_button :<%= attribute.name %>_typetext, "<%= type %>", hashradio %>
14
+ <%= type.capitalize %>
15
+ </label>
16
+ <% end %>
21
17
  </div>
22
18
 
23
19
  <%% rttype = @<%= singular_table_name %>.<%= attribute.name %>_typetext.to_s %>
@@ -30,73 +26,59 @@
30
26
  </script>
31
27
  <%% end %>
32
28
  <%- elsif @beautiful_attributes.include?(attribute.name + ':wysiwyg') then -%>
33
- <div class="control-group">
29
+ <div class="form-group">
34
30
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
35
- <div class="controls">
36
- <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor" %>
37
- </div>
31
+ <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor form-control" %>
38
32
  </div>
39
33
  <%%= f.hidden_field :<%= attribute.name %>_typetext, :value => "html" %>
40
34
  <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
41
- <div class="control-group">
35
+ <div class="form-group">
42
36
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
43
- <div class="controls">
44
- <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.camelcase %>.all, :id, :caption, :include_blank => true %>
45
- </div>
37
+ <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.camelcase %>.all, :id, :caption, { :include_blank => true }, { :class => "form-control" } %>
46
38
  </div>
47
39
  <%- elsif @beautiful_attributes.include?(attribute.name + ':price') then -%>
48
- <div class="control-group">
40
+ <div class="form-group">
49
41
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
50
- <div class="controls">
51
- <div class="input-prepend">
52
- <span class="add-on">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
53
- </div>
42
+ <div class="input-group">
43
+ <span class="input-group-addon">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
54
44
  </div>
55
45
  </div>
56
46
  <%- elsif @beautiful_attributes.include?(attribute.name + ':date') then -%>
57
- <div class="control-group">
47
+ <div class="form-group">
58
48
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
59
- <div class="controls">
60
- <div class="input-append">
61
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
62
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
63
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
64
- <%%= f.text_field :<%= attribute.name %>, :class => "dpicker" %><span class="add-on"><i class="icon-calendar"></i></span>
65
- </div>
49
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
50
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
51
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
52
+ <div class="input-group">
53
+ <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
66
54
  </div>
67
55
  </div>
68
56
  <%- elsif @beautiful_attributes.include?(attribute.name + ':datetime') then -%>
69
- <div class="control-group">
57
+ <div class="form-group">
70
58
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
71
- <div class="controls">
72
- <div class="input-append">
73
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
74
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
75
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
76
- <%%= f.text_field :<%= attribute.name %>, :class => "dpicker" %><span class="add-on"><i class="icon-calendar"></i></span>
77
- </div>
78
- <div class="input-append">
79
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(4i)]" id="<%= singular_table_name %>_<%= attribute.name %>_4i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.min rescue "" end %>" />
80
- <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(5i)]" id="<%= singular_table_name %>_<%= attribute.name %>_5i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.hour rescue "" end %>" />
81
- <%%= f.text_field :<%= attribute.name %>, :class => "tpicker" %><span class="add-on"><i class="icon-time"></i></span>
82
- </div>
59
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
60
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
61
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
62
+ <div class="input-group">
63
+ <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
64
+ </div>
65
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(4i)]" id="<%= singular_table_name %>_<%= attribute.name %>_4i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.min rescue "" end %>" />
66
+ <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(5i)]" id="<%= singular_table_name %>_<%= attribute.name %>_5i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.hour rescue "" end %>" />
67
+ <div class="input-group">
68
+ <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%H:%M") rescue "" end), :class => "tpicker form-control" %><span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
83
69
  </div>
84
70
  </div>
85
71
  <%- elsif @beautiful_attributes.include?(attribute.name + ':color') then -%>
86
- <div class="control-group">
72
+ <div class="form-group">
87
73
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
88
- <div class="controls">
89
- <div class="input-append color" data-color="<%%= (@<%= model %>.<%= attribute.name %> || "rgba(0, 0, 0)") %>" data-color-format="rgba">
90
- <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %><span class="add-on"><i style="background-color: rgb(0, 0, 0)"></i></span>
91
- </div>
74
+ <div class="input-group color" data-color="<%%= (@<%= model %>.<%= attribute.name %> || "rgba(0, 0, 0)") %>" data-color-format="rgba">
75
+ <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %><span class="input-group-addon"><i style="background-color: rgb(0, 0, 0)"></i></span>
92
76
  </div>
93
77
  </div>
94
78
  <%- else -%>
95
- <div class="control-group">
79
+ <div class="form-group">
96
80
  <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
97
- <div class="controls">
98
- <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= ', :rows => 5' if attribute.field_type == :text_area %> %>
99
- </div>
81
+ <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= ', :rows => 5' if attribute.field_type == :text_area %>, :class => "form-control" %>
100
82
  </div>
101
83
  <%- end -%>
102
84
  <%- end -%>