binda 0.1.3 → 0.1.4

data/app/views/binda/categories/_form.html.erb

@@ -1,57 +1,30 @@
 <div class="standard-form">
-
-<%= simple_form_for category, url: get_form_category_url do |f| %>
-  
-  <%= f.error_notification %>
-  
-  <% if f.object.errors.any? %>
-    <div class="standard-form--error-explanation b-alert b-alert--error">
-      <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>:
-      <ul>
-        <% f.object.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
+  <%= simple_form_for category, url: get_form_category_url do |f| %>
+    <%= f.error_notification %>
+    <%= render 'layouts/binda/form_errors', f: f %>
+    <div class="standard-form--body">
+      <div class="standard-form--container">
+        <div class="standard-form--header">
+          <small><%= "#{ t :details }".capitalize %></small>
+        </div>
+        <div class="standard-form--fields">
+          <%= f.input :name, label: "#{t('binda.title')}".capitalize %>
+          <% if f.object.slug.nil? %>
+            <%= f.input :slug, as: :hidden %>
+          <% else %>
+            <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
+          <% end %>
+          <%= f.input :description, label: "#{t('description')}".capitalize %>
+        </div>
+      </div>
     </div>
-  <% end %>
-
-  <div class="standard-form--body">
-
-    <div class="standard-form--container">
-
+    <div class="standard-form--container standard-form--sidebar">
       <div class="standard-form--header">
-        <small><%= "#{ t :details }".capitalize %></small>
+        <small><%= t(:setting).capitalize.pluralize %></small>
       </div>
-
-      <div class="standard-form--fields">
-
-        <%= f.input :name, label: "#{t('binda.title')}".capitalize %>
-
-        <% if f.object.slug.nil? %>
-          <%= f.input :slug, as: :hidden %>
-        <% else %>
-          <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
-        <% end %>
-
-        <%= f.input :description, label: "#{t('description')}".capitalize %>
-
+      <div class="standard-form--main-actions">
+        <%= button_tag "<i class=\"fas fa-check\"></i>Save changes".html_safe, { class: 'b-btn b-btn-primary b-btn-settings', id: 'save' }%>
       </div>
-
-    </div>
-
-  </div>
-
-  <div class="standard-form--container standard-form--sidebar">
-
-    <div class="standard-form--header">
-      <small><%= t(:setting).capitalize.pluralize %></small>
     </div>
-    <div class="standard-form--main-actions">
-      <%= button_tag "<i class=\"fas fa-check\"></i>Save changes".html_safe, { class: 'b-btn b-btn-primary b-btn-settings', id: 'save' }%>
-    </div>
-
-  </div>
-
-<% end %>
-
-</div>
+  <% end %>
+</div>

data/app/views/binda/categories/edit.html.erb

@@ -1,8 +1,28 @@
+<% content_for :title do %>
+	<%= t('binda.edit_category', { arg1: @category.name }) %>	
+<% end %>
+
+
 <% content_for :header do %>
-	<p class="main-header--title"><%= t('binda.edit_category', { arg1: @category.name }) %></p>
-  <a href="<%= structure_categories_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= t(:back_to_index).capitalize %></a>
+  <div class="main-header--buttons">
+    <a href="<%= new_structure_category_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i> 
+      <%= t(:new).capitalize %> 
+      <%= t(:category).capitalize %>
+    </a>
+  </div>
+	<p class="main-header--title">
+		<%= t('binda.edit_category', { arg1: @category.name }) %>	
+	</p>
+  <a href="<%= structure_categories_path %>" 
+  	class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= t(:back_to_index).capitalize %>
+  </a>
 <% end %>
-		
+
+
 <% content_for :content do %> 
 	<%= render 'form', category: @category, structure: @structure %>
 <% end %>

data/app/views/binda/categories/index.html.erb

@@ -1,37 +1,61 @@
+<% content_for :title do %>
+  <%= @structure.name.capitalize %> 
+  <%= t(:category).capitalize.pluralize %>
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> #{ t(:new).capitalize } #{ t(:category).capitalize }".html_safe, new_structure_category_path, class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_category_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i> 
+      <%= t(:new).capitalize %> 
+      <%= t(:category).capitalize %>
+    </a>
   </div>
-  <h3><%= @structure.name.capitalize %> <%= t(:category).capitalize.pluralize %></h3>
+  <h3>
+    <%= @structure.name.capitalize %> 
+    <%= t(:category).capitalize.pluralize %>
+  </h3>
 <% end %>
 
 <% content_for :content do %> 
   <div class="main-table--container">
-
-      <table class="standard-form--container">
-        <thead class="standard-form--header">
-          <tr>
-            <th style="width: 70%;"><%= t(:category).capitalize.pluralize %></th>
-            <th style="width: 30%;"></th>
+    <table class="standard-form--container">
+      <thead class="standard-form--header">
+        <tr>
+          <th colspan="7"><%= t(:category).capitalize.pluralize %></th>
+          <th colspan="3"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @categories.order( :position, :name ).each do |category| %>
+          <tr class="main-table--hover" id="category_<%= category.id %>">
+            <td colspan="7"><%= link_to category.name, structure_category_path( @structure.slug, category) %></td>
+            <td colspan="3" class="main-table--actions">
+              <a href="<%= edit_structure_category_path( @structure.slug, category) %>">
+                <i class="fas fa-pencil-alt"></i>
+                <%= t('binda.edit').capitalize %>
+              </a>
+              <a href="<%= structure_category_path(@structure.slug, category) %>"
+                class="text-destroy"
+                data-method="delete"
+                data-confirm="<%= t('binda.confirm_delete') %>">
+                <i class="far fa-trash-alt"></i>
+                <%= t('binda.delete').capitalize %>
+              </a>
+            </td>
           </tr>
-        </thead>
-        
-        <tbody>
-          <% @categories.order( :position, :name ).each do |category| %>
-            <tr class="main-table--hover" id="category_<%= category.id %>">
-              <td><%= link_to category.name, structure_category_path( @structure.slug, category) %></td>
-              <td class="main-table--actions">
-                <%= link_to "<i class=\"fas fa-pencil-alt\"></i> Edit".html_safe, edit_structure_category_path( @structure.slug, category) %>
-                <%= link_to "<i class=\"far fa-trash-alt\"></i> Destroy".html_safe, structure_category_path( @structure.slug, category ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-destroy' %>
-              </td>
-            </tr>
-          <% end %>
-        <tbody>
-      </table>
-
+        <% end %>
+      <tbody>
+    </table>
     <div class="b-btn--container">
-      <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i>New #{ t(:category).capitalize }".html_safe, new_structure_category_path, class: 'main-header--link b-btn b-btn-primary' %>
+      <a href="<%= new_structure_category_path %>" 
+        class="main-header--link b-btn b-btn-primary">
+        <i class="fa fa-plus" aria-hidden="true"></i>
+        <%= t(:new).capitalize %> 
+        <%= t(:category).capitalize %>
+      </a>
     </div>
-
   </div>
 <% end %>

data/app/views/binda/categories/new.html.erb

@@ -1,6 +1,25 @@
+<% content_for :title do %>
+  <%= "#{ t(:new).capitalize } #{ @structure.name.humanize } #{ t(:category).capitalize }" %>  
+<% end %>
+
+
 <% content_for :header do %>
-	<h3><%= "#{ t(:new).capitalize } #{ @structure.name.humanize } #{ t(:category).capitalize }" %></h3>
-  <a href="<%= structure_categories_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= t(:back_to_index).capitalize %></a>
+  <div class="main-header--buttons">
+    <a href="<%= new_structure_category_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i> 
+      <%= t(:new).capitalize %> 
+      <%= t(:category).capitalize %>
+    </a>
+  </div>	
+  <h3>
+    <%= "#{ t(:new).capitalize } #{ @structure.name.humanize } #{ t(:category).capitalize }" %>  
+  </h3>
+  <a href="<%= structure_categories_path %>" 
+  	class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= t(:back_to_index).capitalize %>
+  </a>
 <% end %>
 		
 <% content_for :content do %> 

data/app/views/binda/components/edit.html.erb

@@ -1,14 +1,37 @@
+<% content_for :title do %> 
+  <%= "#{ t :edit }".capitalize %> 
+  <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %> 
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
   	<% if @structure.has_preview %>
-	    <%= link_to "<i class=\"fas fa-link\"></i>#{ t 'binda.preview' } #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, "#{binda.root_path}#{@structure.slug}/#{@instance.slug}", class: 'main-header--link b-btn b-btn-primary' %>
+	    <a href="<%= "#{binda.root_path}#{@structure.slug}/#{@instance.slug}" %>"
+	    	class="main-header--link b-btn b-btn-primary">
+	    	<i class="fas fa-link"></i>
+	    	<%= t 'binda.preview' %> 
+	    	<%= @structure.name.humanize.split.map(&:capitalize).join(' ') %> 
+	    </a>
     <% end %>
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i>#{ t 'binda.new' } #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path , class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_component_path %>"
+    	class="main-header--link b-btn b-btn-primary">
+	    <i class="fa fa-plus" aria-hidden="true"></i>	
+	    <%= t 'binda.new' %> 
+	    <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>
+    </a>
   </div>
-  <p class="main-header--title"><%= "#{ t :edit }".capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %></p>
-  <a href="<%= structure_components_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to_index }".capitalize %></a>
+  <p class="main-header--title">
+  	<%= "#{ t :edit }".capitalize %> 
+  	<%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>	
+	</p>
+  <a href="<%= structure_components_path %>" class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= "#{ t :back_to_index }".capitalize %>
+  </a>
 <% end %>
 
+
 <% content_for :content do %>
 	<%= render 'binda/fieldable/form_body' %>
 <% end %>

data/app/views/binda/components/index.html.erb

@@ -1,86 +1,83 @@
+<% content_for :title do %>
+  <%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %>
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path , class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_component_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i> 
+      <%= t('binda.new') %> 
+      <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>
+    </a>
     <%= get_sort_index_link %>
   </div>
-  <p class="main-header--title"><%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %></p>
+  <p class="main-header--title">
+    <%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %>
+  </p>
 <% end %>
 
-<% content_for :content do %>
 
+<% content_for :content do %>
     <div class="main-table--container">
-
       <div class="pagination-links--bar">
         <%= paginate @components %>
       </div>
-
       <table class="standard-form--container" cellspacing="0">
-
         <thead class="standard-form--header">              
           <tr>
-            <th style="width: 50%">
-              <a href="<%=
-                if params[:order] == 'LOWER(name) ASC'
-                  structure_components_path([@structure], order:'LOWER(name) DESC')
-                else
-                  structure_components_path([@structure], order:'LOWER(name) ASC')
-                end
-                %>" class="sort-link">
-                Title
-                <% if params[:order] == 'LOWER(name) ASC' %>
-                  <i class="fa fa-sort-alpha-asc" aria-hidden="true"></i>
-                <% else %>
-                  <i class="fa fa-sort-alpha-desc" aria-hidden="true"></i>
-                <% end %>
+            <th colspan="4">
+              <a href="<%= get_sort_link_by('name').html_safe %>">
+                <%= t 'binda.title' %>
+                <%= get_sort_link_icon_by('name').html_safe %>
               </a>
             </th>
-            <th style="width: 20%">
-              <a href="<%=
-                if params[:order] == 'publish_state ASC, LOWER(name) ASC'
-                  structure_components_path([@structure], order:'publish_state DESC, LOWER(name) ASC')
-                else
-                  structure_components_path([@structure], order:'publish_state ASC, LOWER(name) ASC')
-                end
-                %>" class="sort-link">
-                Publish state
-                <% if params[:order] == 'LOWER(name) ASC' %>
-                  <i class="fa fa-sort-alpha-asc" aria-hidden="true"></i>
-                <% else %>
-                  <i class="fa fa-sort-alpha-desc" aria-hidden="true"></i>
-                <% end %>
+            <th colspan="2">
+              <a href="<%= get_sort_link_by('publish_state').html_safe %>">
+                <%= t 'binda.publish_state' %>
+                <%= get_sort_link_icon_by('publish_state').html_safe %>
               </a>
             </th>
-            <th style="width: 30%">Actions</th>
+            <th colspan="1">Actions</th>
           </tr>
         </thead>
         <tbody>
           <% @components.each do |component| %>
             <tr class="main-table--hover" id="component_<%= component.id %>">
-              <td><%= link_to component.name, structure_component_path( @structure.slug, component ) %></td>
-              <td><%= component.publish_state %></td>
-              <td class="main-table--actions">
-                  <%= link_to "<i class=\"fas fa-pencil-alt\"></i> #{t('binda.edit').capitalize}".html_safe, edit_structure_component_path( @structure.slug, component ) %>
-                  
-                  <%= link_to "<i class=\"far fa-trash-alt\"></i> #{t('binda.delete').capitalize}".html_safe, structure_component_path( @structure.slug, component.slug ),
-                              method: :delete,
-                              data: { confirm: 'Are you sure?' },
-                              class: 'text-destroy' %>
+              <td colspan="4">
+                <%= link_to component.name, structure_component_path( @structure.slug, component ) %>
               </td>
+              <td colspan="2"><%= component.publish_state %></td>
+              <td class="main-table--actions">
+                <a href="<%= edit_structure_component_path( @structure.slug, component ) %>">
+                  <i class="fas fa-pencil-alt"></i> 
+                  <%= t('binda.edit').capitalize %>
+                </a>
+                <a href="<%= structure_component_path( @structure.slug, component.slug ) %>"
+                  class="text-destroy"
+                  data-method="delete"
+                  data-confirm="<%= t('binda.confirm_delete') %>"
+                  >
+                  <i class="far fa-trash-alt"></i> 
+                  <%= t('binda.delete').capitalize %>
+                </a>                  
+              </td colspan="1">
             </tr>
           <% end %>
         <tbody>
-
       </table>
-
       <div class="pagination-links--bar">
         <%= paginate @components %>
       </div>
-
       <div class="b-btn--container">
-        <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path, class: 'main-header--link b-btn b-btn-primary', action: "new" %>
+        <a href="<%= new_structure_component_path %>"
+          class="main-header--link b-btn b-btn-primary">
+          <i class="fa fa-plus" aria-hidden="true"></i> 
+          <%= t('binda.new') %> 
+          <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>
+        </a>
         <%= get_sort_index_link %>
       </div>
-
     </div>
-
 <% end %>

data/app/views/binda/components/new.html.erb

@@ -1,6 +1,16 @@
+<% content_for :title do %>
+	<%= t('binda.new_component',{ arg1: @structure.name.humanize.split.map(&:capitalize).join(' ') }) %>	
+<% end %>
+
 <% content_for :header do %>
-	<p class="main-header--title"><%= t('binda.new_component',{ arg1: @structure.name.humanize.split.map(&:capitalize).join(' ') }) %></p>
-  <a href="<%= structure_components_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to_index }".capitalize %></a>
+	<p class="main-header--title">
+		<%= t('binda.new_component',{ arg1: @structure.name.humanize.split.map(&:capitalize).join(' ') }) %>	
+	</p>
+  <a href="<%= structure_components_path %>" 
+  	class="main-header--back">
+  	<i class="fas fa-list-ul"></i> 
+  	<%= "#{ t :back_to_index }".capitalize %>
+  </a>
 <% end %>
 		
 <% content_for :content do %> 

data/app/views/binda/components/sort_index.html.erb

@@ -1,23 +1,36 @@
+<% content_for :title do %>
+  <%= t('binda.sort').capitalize %> 
+  <%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %>  
+<% end %>
+
+
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path , class: 'main-header--link b-btn b-btn-primary' %>
+    <a href="<%= new_structure_component_path %>"
+      class="main-header--link b-btn b-btn-primary">
+      <i class="fa fa-plus" aria-hidden="true"></i> 
+      <%= t('binda.new') %> 
+      <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>
+    </a>
   </div>
-
-  <p class="main-header--title"><%= t('binda.sort').capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %></p>
-  <a href="<%= structure_components_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> <%= "#{ t :back_to_index }".capitalize %></a>
+  <p class="main-header--title">
+    <%= t('binda.sort').capitalize %> 
+    <%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %>  
+  </p>
+  <a href="<%= structure_components_path %>" 
+    class="main-header--back">
+    <i class="fas fa-list-ul"></i> 
+    <%= "#{ t :back_to_index }".capitalize %>
+  </a>
 <% end %>
 
 <% content_for :content do %>
-
   <%= render 'layouts/binda/popup_warning' %>
-
   <div class="main-sortable-table">
-
     <div class="main-sortable-table--header-row">
       <div class="main-sortable-table--header-title"><p>Title</p></div>
       <div class="main-sortable-table--header-title"><p>Publish State</p></div>
     </div>
-
     <div id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
       <% @components.order( :position, :name ).each do |component| %>
         <div class="main-sortable-table--row ui-sortable-handle" id="component_<%= component.id %>">
@@ -26,10 +39,12 @@
         </div>
       <% end %>
     </div>
-
   </div>
-
-  <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path, class: 'main-header--link b-btn b-btn-primary', action: "new" %>
-
-
+  <a href="<%= new_structure_component_path %>" 
+    class="main-header--link b-btn b-btn-primary"
+    action: "new">
+    <i class="fa fa-plus" aria-hidden="true"></i> 
+    <%= t('binda.new') %> 
+    <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %>
+  </a>
 <% end %>