conte_rails_template 0.0.19 → 0.0.21

data/lib/conte_rails_template/version.rb

@@ -1,3 +1,3 @@
 module ConteRailsTemplate
-  VERSION = "0.0.19"
+  VERSION = "0.0.21"
 end

data/lib/generators/conte_rails_template/templates/erb/scaffold/_form.html.erb

@@ -1,5 +1,5 @@
-<%% content_for :page_toolbar do %>
-<%%= render partial: 'shared/page_toolbar', locals: {content: link_to(render_icon_and_text_content('icon-circle-arrow-left', "#{t('labels.back_to')}#{t('model.list', :model => <%= class_name.split('::').last %>.model_name.human)}"), <%= plural_table_name %>_path, class: 'btn btn-inverse')} %>
+<%% content_for :right_page_toolbar do %>
+<%%= link_to(render_icon_and_text_content('icon-circle-arrow-left', "#{t('labels.back_to')}#{t('model.list', :model => <%= class_name.split('::').last %>.model_name.human)}"), <%= plural_table_name %>_path, class: 'btn btn-inverse') %>
 <%% end %>
 
 <%%= simple_form_for(@<%= singular_table_name %>, :html => {:class => 'form-horizontal' }) do |f| %>

data/lib/generators/conte_rails_template/templates/erb/scaffold/edit.html.erb

@@ -1,8 +1,2 @@
-<%% content_for :breadcrumbs do %>
-<%%= render :partial => 'shared/breadcrumbs_default' %>
-<%%= content_tag :li, link_to(render_icon_and_text_content('icon-file-alt', t('model.list', model: <%= class_name.split('::').last %>.model_name.human)), <%= plural_table_name %>_path) %>
-<%%= content_tag :li, render_icon_and_text_content('icon-plus-sign', t('model.edit', model: <%= class_name.split('::').last %>.model_name.human)) %>
-<%% end %>
-
 <%%= render 'form' %>
 

data/lib/generators/conte_rails_template/templates/erb/scaffold/index.html.erb

@@ -1,14 +1,7 @@
-<%% content_for :breadcrumbs do %>
-<%%= render :partial => 'shared/breadcrumbs_default' %>
-<%%= content_tag :li, render_icon_and_text_content('icon-file-alt', t('model.list', model: <%= class_name.split('::').last %>.model_name.human)) %>
+<%% content_for :right_page_toolbar do %>
+<%%= link_to(render_icon_and_text_content('icon-plus-sign', t('model.create', :model => <%= class_name.split('::').last %>.model_name.human)), new_<%= class_name.split('::').last.underscore.downcase %>_path, :class => 'btn btn-inverse') %>
 <%% end %>
 
-<%% content_for :page_toolbar do %>
-<%%= render :partial => 'shared/page_toolbar', :locals => {:content => link_to(render_icon_and_text_content('icon-plus-sign', t('model.create', :model => <%= class_name.split('::').last %>.model_name.human)), new_<%= class_name.split('::').last.underscore.downcase %>_path, :class => 'btn btn-inverse')} %>
-<%% end %>
-
-<%%= render :partial => 'shared/notification' %>
-
 <%%= grid(@<%= class_name.split('::').last.underscore.downcase.pluralize %>_grid, :show_filters => :always) do |g|
 <% attributes.each do |attribute| -%>
   g.column :name => t('activerecord.attributes.<%= class_name.split('::').last.underscore.downcase %>.<%= attribute.name %>'), :html => {:class => "grid-cell"} do |<%= class_name.split('::').last.underscore.downcase %>|

data/lib/generators/conte_rails_template/templates/erb/scaffold/new.html.erb

@@ -1,7 +1,2 @@
-<%% content_for :breadcrumbs do %>
-<%%= render :partial => 'shared/breadcrumbs_default' %>
-<%%= content_tag :li, render_icon_and_text_content('icon-plus-sign', t('model.create', model: <%= class_name.split('::').last %>.model_name.human)) %>
-<%% end %>
-
 <%%= render 'form' %>
 

data/lib/generators/conte_rails_template/templates/layout.html.erb

@@ -23,9 +23,7 @@
           <div class="container-fluid">
             <div class="row-fluid">
               <div class="span6">
-                <ul class="breadcrumb">
-                  <%= yield :breadcrumbs %>
-                </ul>
+                <%= render :partial => 'shared/breadcrumbs' %>
               </div>
               <div class="span6">
                 <ul class="nav pull-right user-section">
@@ -48,7 +46,9 @@
           
         </div>
 
-        <%= yield :page_toolbar %>
+        <%= render :partial => 'shared/page_toolbar' %>
+
+        <%= render :partial => 'shared/notification' %>
 
         <div id="content">
           <%= yield %>

data/lib/generators/conte_rails_template/templates/shared/_breadcrumbs.html.erb

@@ -0,0 +1,3 @@
+<ul class="breadcrumbs">
+<%= render_navigation(level: 1..2, renderer: :breadcrumbs_renderer) %>
+</ul>

data/lib/generators/conte_rails_template/templates/shared/_page_toolbar.html.erb

@@ -1,8 +1,11 @@
 <div id="page-toolbar" class="container-fluid">
   <div class="row-fluid">
-    <div class="span6 offset6">
+    <div class="span6">
+      <%= yield :left_page_toolbar %>
+    </div>
+    <div class="span6">
       <div class="btn-toolbar pull-right">
-        <%= content %>
+      <%= yield :right_page_toolbar %>
       </div>
     </div>
   </div>

data/vendor/assets/stylesheets/conte.css.scss

@@ -18,7 +18,7 @@ a:hover {
 }
 
 body {
-  background: #3B3D43;
+  background: #E3E4E5;
   height: 100%;
   width: 100%;
   position: absolute;
@@ -28,7 +28,6 @@ body {
   #page {
     width: 100%; height: inherit;
     margin: 0px; padding: 0px;
-    background: #3B3D43;
 
     > .row-fluid {
       height: inherit;
@@ -123,16 +122,14 @@ body {
     #main {
       width: 84%; 
       margin: 0px;
-      background: #E3E4E5;
-      min-height: 100%;
       #header {
         position: relative;
         z-index: 1000;
         @include box-shadow(rgba(0, 0, 0, 0.3) 0px 2px 3px); 
         height: 50px;
-        .breadcrumb {
+        .breadcrumbs {
           background: none;
-          padding: 0px;
+          padding: 0px; margin: 0px;
 
           li {
             height: 50px;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conte_rails_template
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -110,9 +110,7 @@ files:
 - lib/generators/conte_rails_template/templates/layout.html.erb
 - lib/generators/conte_rails_template/templates/navigation_renderers.rb
 - lib/generators/conte_rails_template/templates/session.html.erb
-- lib/generators/conte_rails_template/templates/shared/_breadcrumbs_default.html.erb
-- lib/generators/conte_rails_template/templates/shared/_breadcrumbs_home.html.erb
-- lib/generators/conte_rails_template/templates/shared/_breadcrumbs_navigation.html.erb
+- lib/generators/conte_rails_template/templates/shared/_breadcrumbs.html.erb
 - lib/generators/conte_rails_template/templates/shared/_notification.html.erb
 - lib/generators/conte_rails_template/templates/shared/_page_toolbar.html.erb
 - lib/generators/conte_rails_template/templates/simple_navigation.rb

data/lib/generators/conte_rails_template/templates/shared/_breadcrumbs_default.html.erb

@@ -1,2 +0,0 @@
-<%= render :partial => 'shared/breadcrumbs_home' %>
-<%= render :partial => 'shared/breadcrumbs_navigation' %>

data/lib/generators/conte_rails_template/templates/shared/_breadcrumbs_home.html.erb

@@ -1 +0,0 @@
-<li><%= link_to render_icon_and_text_content('icon-home', t('labels.home')), "#{request.protocol}#{request.host_with_port}"%></li>

data/lib/generators/conte_rails_template/templates/shared/_breadcrumbs_navigation.html.erb

@@ -1 +0,0 @@
-<li><%= render_navigation(level: 1..2, renderer: :breadcrumbs_renderer) %></li>