binda 0.0.7 → 0.1.0

data/app/views/binda/manage/users/_form_body.html.erb

@@ -1,58 +1,63 @@
-<div class="row">
-<div class="form-body--container col-sm-12">
+<div class="standard-form">
 
 <%= simple_form_for manage_user, url: get_form_manage_user_url do |f| %>
-  <% if manage_user.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize( manage_user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
+  <%= f.error_notification %>
+  
+  <% if f.object.errors.any? %>
+    <div class="standard-form--error-explanation">
+      <div class="alert alert-error">
+        <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>.
+      </div>
       <ul>
-      <% manage_user.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
+        <% f.object.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
       </ul>
     </div>
   <% end %>
-  
-  <div class="row">
-		<div class="col-sm-8">
 
-			<div class="form-section--wide-container row">
-				<div class="col-sm-12">
-				
-					<h4>Edit User Details</h4>
+  <div class="standard-form--body">
 
-					<h5>Email</h5>
-			  	<%= f.input :email, label: false %>
+    <div class="standard-form--container">
 
-					<h5>Password</h5>
-			  	<%= f.input :password, label: false %>
+      <div class="standard-form--header">
+        <p>Edit User Details</p>
+      </div>
 
-					<h5>Password confirmation</h5>
-			  	<%= f.input :password_confirmation, label: false %>
+      <%= f.input :email, label: "Email" %>
 
+      <%= f.input :password, label: "Password" %>
 
-			  	<% if !current_user.is_superadmin %>
-						<h5>Administrator priviledges</h5>
-				  	<%= f.input :is_superadmin, label: false, as: :radio_buttons %>
-			  	<% end %>
+      <%= f.input :password_confirmation, label: "Password confirmation" %>
 
-			  </div>
-		  </div>
-	  </div>
 
-		<div class="col-sm-4">
+      <% if !current_user.is_superadmin %>
+        <h5>Administrator priviledges</h5>
+        <%= f.input :is_superadmin, label: false, as: :radio_buttons %>
+      <% end %>
 
-			<div class="form-section--narrow-container row">
-				<div class="col-sm-12">
-					<h4>Publish</h4>
-			    <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
-			  </div>
-		  </div>
+    </div>
 
-	  </div>
   </div>
+
+  <div class="standard-form--sidebar">
+
+    <div class="standard-form--header">
+      <p><%= "#{ t :setting }".pluralize.capitalize %></p>
+    </div>
+
+    <div class="standard-form--container">
+
+      <div class="standard-form--main-actions">
+        <%= button_tag "<i class=\"fas fa-check\"></i>Save changes".html_safe, { class: 'b-btn b-btn-primary', id: 'save' } %>
+      </div>
+
+    </div>
+
+  </div>
+
 <% end %>
 
 </div>
-</div>
+

data/app/views/binda/manage/users/edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :header do %>
-	<h3>Editing User</h3>
+	<p class="main-header--title"><%= t('binda.edit_user') %></p>
   <a href="<%= manage_users_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
 <% end %>
 

data/app/views/binda/manage/users/index.html.erb

@@ -1,38 +1,38 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to 'New User', new_manage_user_path, class: 'main-header--link btn btn-primary' %>    
+    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New User".html_safe, new_manage_user_path, class: 'main-header--link b-btn b-btn-primary' %>
   </div>
   <h3>Manage Users</h3>
 <% end %>
 
 <% content_for :content do %>
-  <div class="main-table--row row">
-    <div class="col-sm-12">
+  <div class="main-table--container">
 
-      <table class="table table-striped">
-        <thead>
-          <tr>
-            <th colspan="3">Email</th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
+    <table class="standard-form--container">
+      <thead>
+        <tr>
+          <th style="width: 70%;" class="standard-form--header">Email</th>
+          <th style="width: 30%;" class="standard-form--header"></th>
+        </tr>
+      </thead>
+      <tbody>
 
-          <% @users.order( :email ).each.with_index(1) do |manage_user, index| %>
+        <% @users.order( :email ).each.with_index(1) do |manage_user, index| %>
 
-            <tr>
-              <td colspan="3"><%= manage_user.email %></td>
-              <td><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <%= link_to 'Edit', edit_manage_user_path( manage_user.id ) %> <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> <%= link_to 'Destroy', manage_user_path( manage_user.id ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-danger'  %></td>
-            </tr>
+          <tr>
+            <td><%= manage_user.email %></td>
+            <td class="main-table--actions">
+              <%= link_to "<i class=\"fas fa-pencil-alt\"></i> Edit".html_safe, edit_manage_user_path( manage_user.id ) %>
+              <%= link_to "<i class=\"far fa-trash-alt\"></i> Destroy".html_safe, manage_user_path( manage_user.id ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-destroy'  %></td>
+          </tr>
 
-          <% end %>
+        <% end %>
 
-        </tbody>      
-      </table>
+      </tbody>
+    </table>
 
-      <%= link_to 'New User', new_manage_user_path, class: 'main-header--link btn btn-default' %>    
+    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New User".html_safe, new_manage_user_path, class: 'main-header--link b-btn b-btn-primary' %>
 
-    </div>
   </div>
 
 <% end %>

data/app/views/binda/structures/_form_body.html.erb

@@ -1,62 +1,56 @@
-  <div class="row">
-    <div class="form-body--container col-sm-12">
-      
-      <%= simple_form_for structure, defaults: { label: false }, html: { class: 'form-body' } do |f| %>
-        <%= f.error_notification %>
-        
-        <div class="row">
-          <div class="col-sm-8">
-
-            <div class="form-section--wide-container row">
-              <div class="col-sm-12">
-
-                <h4><%= "#{ t :details }".capitalize %></h4>
-
-                <h5><%= "#{ t :title }".capitalize %></h5>
-                <p class="text-muted"><%= t :title_hint %></p>
-                <%= f.input :name %>
-                
-                <% if structure.slug.nil? %>
-                  <%= f.input :slug, as: :hidden %>
-                <% else %>
-                  <h5><%= "#{ t :slug }".capitalize %></h5>
-                  <%= f.input :slug %>
-                <% end %>
-                
-              </div>
-            </div>
-
-            <div class="form-section--wide-container row">
-              <div class="col-sm-12 form-section">
-
-                <%= render "form_section", section: structure, f: f %>
-
-              </div>
-            </div>
-
-          </div>
-          <div class="col-sm-4">
-
-            <div class="form-section--narrow-container row">
-              <div class="col-sm-12">
-                <h4><%= "#{ t :publish }".capitalize %></h4>
-                <h5><%= "#{ t :structure_instance_type }".capitalize %></h5>
-                <%= f.input :instance_type, as: :radio_buttons, collection: ['component','board'] %>
-                <h5><%= "#{ t :structure_has_categories }".capitalize %></h5>
-                <%= f.input :has_categories, as: :radio_buttons %>
-                <hr>
-                <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
-
-                <% unless @structure.new_record? %>
-                  <a class="form-body--delete btn btn-default" href="<%= url_for([@structure]) %>" data-method="delete" data-confirm="This operation will delete this structure and there is no coming back. Are you ok with that?">Delete Structure <span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
-                <% end %>
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      
-      <% end %>
+<div class="standard-form">
+
+<%= simple_form_for structure, html: { class: 'form-body' } do |f| %>
+  <%= f.error_notification %>
+
+  <% if f.object.errors.any? %>
+    <div class="standard-form--error-explanation">
+      <div class="alert alert-error">
+        <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>.
+      </div>
+      <ul>
+        <% f.object.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="standard-form--body">
+
+    <div class="standard-form--container">
+
+      <div class="standard-form--header">
+        <p><%= "#{ t :details }".capitalize %></p>
+      </div>
+
+      <div class="standard-form--fields">
+
+        <%= f.input :name, hint: t(:title_hint), label: "#{t('binda.title')}".capitalize  %>
+
+        <% if structure.slug.nil? %>
+          <%= f.input :slug, as: :hidden %>
+        <% else %>
+          <%= f.input :slug %>
+        <% end %>
+      </div>
 
     </div>
-  </div>
+
+    <div class="standard-form--container">
+      <div class="form-section">
+        <%= render "form_section", section: structure, f: f %>
+      </div>
+    </div>
+
+  </div>
+
+  <div class="standard-form--sidebar">
+    <div class="standard-form--container">
+        <%= render "form_sidebar", section: structure, f: f %>
+    </div>
+  </div>
+
+<% end %>
+
+</div>

data/app/views/binda/structures/_form_section.html.erb

@@ -1,12 +1,13 @@
-<h4><%= "#{ t :field_group }".pluralize.capitalize %></h4>
-
+<div class="standard-form--header">
+  <p><%= "#{ t :field_group }".pluralize %></p>
+</div>
 
 <%# - - - - - - - - - - - - %>
 <%# FORM ITEM               %>
 <%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for :field_groups, f.object.field_groups.order( :position, :name ) do |ff| %>
 
-  <div class="form-item">
+  <div id="form-item-<%= ff.object.id %>" class="form-item">
 
 		<%= ff.input :structure_id, as: :hidden %>
 		<%= ff.input :id, as: :hidden %>
@@ -15,24 +16,34 @@
 		<%# - - - - - - - - - - - - %>
 		<%# EDIT/REMOVE BUTTONS     %>
 		<%# - - - - - - - - - - - - %>
-	  <% unless ff.object.slug.nil? %>
-			<a href="<%= structure_field_group_path( @structure.slug, ff.object.slug ) %>" data-method="delete" data-confirm="This operation will delete this group and all related field settings and component content. Are you ok with that?"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
-			<a href="<%= structure_field_group_path( @structure.slug, ff.object.slug ) %>"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
-	  <% end %>
 
+    <div class="standard-form--secondary-header main-actions--header">
+
+      <% unless ff.object.slug.nil? %>
+
+        <%= link_to  "<i class=\"far fa-trash-alt\"></i>".html_safe,
+                     structure_field_group_path( @structure.slug, ff.object.slug ),
+                     method: :delete,
+                     data: { confirm: 'Are you sure?' },
+                     class: 'text-destroy' %>
+
+        <%= link_to "<i class=\"fas fa-pencil-alt\"></i>".html_safe,
+                    structure_field_group_path( @structure.slug, ff.object.slug ) %>
+
+      <% end %>
+
+    </div>
 
 		<%# - - - - - - - - - - - - %>
 		<%# NAME                    %>
 		<%# - - - - - - - - - - - - %>
-	  <h5 class="form-item--name"><%= "#{ t :name }".capitalize %></h5>
-		<%= ff.input :name %>
+		<%= ff.input :name, label: "#{ t :name }".capitalize  %>
 
 
 		<%# - - - - - - - - - - - - %>
 		<%# SLUG                    %>
 		<%# - - - - - - - - - - - - %>
 	  <% unless ff.object.slug.nil? %>
-      <h5><%= "#{ t :slug }".capitalize %></h5>
       <%= ff.input :slug, as: :string, input_html: { class: "form-item--input" } %>
 	  <% end %>
 
@@ -45,11 +56,12 @@
 <%# FORM NEW ITEM           %>
 <%# - - - - - - - - - - - - %>
 <%= f.simple_fields_for 'new_field_groups[]', @structure.field_groups.build() do |ff| %>
-	<div id="new-child-1" class="form-item form-item--new">
-		<%= ff.input :structure_id, as: :hidden %>
-		<%= ff.input :id, as: :hidden %>
-	  <h5 class="form-item--name"><%= "#{ t :name }".capitalize %></h5>
-		<%= ff.input :name %>
+  <div id="field-group-<%= f.object.id %>--new-form-item" class="form-item form-item--new">
+		<div class="form-item--editor">
+			<%= ff.input :structure_id, as: :hidden %>
+			<%= ff.input :id, as: :hidden %>
+			<%= ff.input :name, label: "#{ t :name }".capitalize %>
+		</div>
 	</div>
 <% end %>
 
@@ -58,7 +70,9 @@
 <%# 'ADD NEW FORM ITEM' BUTTON  %>
 <%# - - - - - - - - - - - - - - %>
 <% if section.slug.nil? %>
-  <h5><%= t( :hint_create_parent_before_child, arg1: "#{ t :structure }", arg2: "#{ t :field_group }" ).capitalize %></h5>
+  <p class="standard-form--suggestion"><%= t( :hint_create_parent_before_child, arg1: "#{ t :structure }", arg2: "#{ t :field_group }" ).capitalize %></p>
 <% else %>
-  <a class="form-item--add-new main-header--link btn btn-default" href="<%= new_structure_field_group_path( @structure.slug ) %>" data-new-child-id="new-child-1"><%= "#{ t :new }".capitalize %> <%= t :field_group %></a>
-<% end %>
+  <a id="form-item--field-group-<%= f.object.id %>--add-new" class="form-item--add-new main-header--link b-btn b-btn-primary b-btn-settings" href="<%= new_structure_field_group_path( @structure.slug ) %>" data-new-form-item-id="field-group-<%= f.object.id %>--new-form-item">
+    <%= "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> #{ t(:new).capitalize }".html_safe %> <%= t :field_group %>	
+  </a>
+<% end %>

data/app/views/binda/structures/_form_sidebar.html.erb

@@ -0,0 +1,35 @@
+<div class="standard-form--header">
+  <p><%= "#{ t :publish }".capitalize %></p>
+</div>
+
+<div class="standard-form--radio">
+  <%= f.input :instance_type,
+            as: :radio_buttons,
+            collection: ['component','board'],
+            include_blank: false,
+            label_method: -> (x){ "<span class=\"standard-form--input-box\"></span>#{x}".html_safe }%>
+
+</div>
+<% if !@structure.new_record? && @structure.instance_type == 'component' %>
+  <div class="standard-form--radio">
+    <%= f.input :has_categories,
+                label: "<span class=\"standard-form--input-box\"></span>#{ t('binda.has_categories')}".html_safe,
+                as: :boolean,
+                include_blank: false,
+                hint: t('binda.has_categories_hint') %>
+  </div>
+  <div class="standard-form--radio">
+    <%= f.input :has_preview,
+                label: "<span class=\"standard-form--input-box\"></span>#{ t('binda.has_preview')}".html_safe,
+                as: :boolean,
+                include_blank: false,
+                hint: "#{t('binda.preview_path_warning')}:<br /> #{binda.root_path}#{@structure.slug}/:slug".html_safe %>
+  </div>
+<% end %>
+<div class="standard-form--main-actions">
+  <%= button_tag '<i class="fas fa-check"></i>Save changes'.html_safe, { class: 'b-btn-block b-btn b-btn-primary b-btn-settings', id: 'save' } %>
+
+  <% unless @structure.new_record? %>
+    <a class="form-body--delete b-btn-block b-btn b-btn-outline-danger b-btn-settings" href="<%= url_for([@structure]) %>" data-method="delete" data-confirm="This operation will delete this structure and there is no coming back. Are you ok with that?"><i class="far fa-trash-alt"></i> <%= t('binda.delete').capitalize %> <%= @structure.name.capitalize %></a>
+  <% end %>
+</div>

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

@@ -1,8 +1,8 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to 'New Structure', new_structure_path, class: 'main-header--link btn btn-primary' %>    
+    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
   </div>
-  <h3>Editing Structure</h3>
+	<p class="main-header--title"><%= t('binda.edit_structure', { arg1: @structure.name })%></p>
   <a href="<%= structures_path %>" class="main-header--back"><span class="glyphicon glyphicon-list"></span> Back to list</a>
 <% end %>
 

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

@@ -1,36 +1,41 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to 'New Structure', new_structure_path, class: 'main-header--link btn btn-primary' %>    
+    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+    <%= get_structures_sort_index_link %>
   </div>
   <h3>Structures</h3>
 <% end %>
 
-<% content_for :content do %> 
-  <div class="main-table--row row">
-    <div class="col-sm-12">
+<% content_for :content do %>
+  <div class="main-table--container">
 
-      <table class="table table-striped">
+      <table class="standard-form--container">
         <thead>
           <tr>
-            <th colspan="3">Structure</th>
-            <th></th>
+            <th style="width: 70%" class="standard-form--header">Structures</th>
+            <th style="width: 30%" class="standard-form--header"></th>
           </tr>
         </thead>
         
-        <tbody class="sortable" data-update-url="<%= structures_sort_path() %>">
+        <tbody>
           <% @structures.order( :name ).each do |structure| %>
-            <tr id="structure_<%= structure.id %>">    
-              <td colspan="3"><%= structure.name %></td>
-              <td><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <%= link_to 'Edit', edit_structure_path(structure) %> <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> <%= link_to 'Destroy', structure, method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-danger' %></td>
+            <tr class="main-table--hover" id="structure_<%= structure.id %>">
+
+              <td><%= link_to structure.name, structure_path(structure) %></td>
+              <td class="main-table--actions">
+                <%= link_to "<i class=\"fas fa-pencil-alt\"></i> Edit".html_safe, edit_structure_path(structure) %>
+                <%= link_to  "<i class=\"far fa-trash-alt\"></i> Destroy".html_safe, structure, method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-destroy' %>
+              </td>
             </tr>
           <% end %>
         <tbody>
       </table>
-    
-    <%= paginate @structures %>
 
-    <%= link_to 'New Structure', new_structure_path, class: 'main-header--link btn btn-default' %>    
-        
+    <div class="b-btn--container">
+      <%= paginate @structures %>
+      <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New Structure".html_safe, new_structure_path, class: 'main-header--link b-btn b-btn-primary' %>
+    </div>
+
   </div>
-</div>
+
 <% end %>