binda 0.0.7 → 0.1.0

data/app/uploaders/binda/{asset → image}/image_uploader.rb

@@ -1,5 +1,5 @@
 module Binda
-  class Asset::ImageUploader < CarrierWave::Uploader::Base
+  class Image::ImageUploader < CarrierWave::Uploader::Base
 
     # Include RMagick or MiniMagick support:
     # include CarrierWave::RMagick
@@ -47,14 +47,6 @@ module Binda
       process resize_to_fit: [200, 200]
     end
 
-    version :medium do
-      process resize_to_fit: [700, 700]
-    end
-
-    version :large do
-      process resize_to_fit: [1400, 1400]
-    end
-
     # ================================
 
     # Add a white list of extensions which are allowed to be uploaded.
@@ -72,5 +64,31 @@ module Binda
     #   "something.jpg" if original_filename
     # end
 
+
+    # Generating medium and large version creates slowness if the uploaded file is a gif.
+    #   Conditional versioning could be a solution, but you might want to do it in your 
+    #   application usign a initializer.
+    #   
+    #   @example 
+    #     require 'active_support/concern'
+    #     module ComponentExtension
+    #       extend ActiveSupport::Concern
+    #       included do 
+    #         version :medium, if: :is_not_gif? do
+    #           process resize_to_fit: [700, 700]
+    #         end
+    #         
+    #         version :large, if: :is_not_gif? do
+    #           process resize_to_fit: [1400, 1400]
+    #         end
+    #       end
+    #       protected
+    #         class_methods do
+    #           def is_not_gif? new_file
+    #             new_file.extension.downcase != 'gif'
+    #           end
+    #         end
+    #     end
+    #     ::Binda::Component.send(:include, ComponentExtension)
   end
 end

data/app/uploaders/binda/video/video_uploader.rb

@@ -0,0 +1,51 @@
+module Binda
+  class Video::VideoUploader < CarrierWave::Uploader::Base
+
+    # Include RMagick or MiniMagick support:
+    # include CarrierWave::RMagick
+    # include CarrierWave::MiniMagick
+
+    # Choose what kind of storage to use for this uploader:
+    # storage :file
+    # storage :fog
+
+    # Override the directory where uploaded files will be stored.
+    # This is a sensible default for uploaders that are meant to be mounted:
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    # Provide a default URL as a default if there hasn't been a file uploaded:
+    # def default_url(*args)
+    #   # For Rails 3.1+ asset pipeline compatibility:
+    #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+    #
+    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+    # end
+
+    # Process files as they are uploaded:
+    # process scale: [200, 300]
+    #
+    # def scale(width, height)
+    #   # do something
+    # end
+
+    # Create different versions of your uploaded files:
+    # version :thumb do
+    #   process resize_to_fit: [50, 50]
+    # end
+
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    def extension_whitelist
+      %w(mp4 webm ogg)
+    end
+
+    # Override the filename of the uploaded files:
+    # Avoid using model.id or version_name here, see uploader/store.rb for details.
+    # def filename
+    #   "something.jpg" if original_filename
+    # end
+
+  end
+end

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

@@ -1,5 +1,10 @@
 <% content_for :header do %>
-  <h3><%= "#{ t :edit }".capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %></h3>
+  <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' %>
+    <% end %>
+  </div>
+  <p class="main-header--title"><%= "#{ t :edit }".capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %></p>
 <% end %>
 
 <% content_for :content do %>

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

@@ -1,58 +1,59 @@
-<div class="row">
-<div class="form-body--container col-sm-12">
-
-<%= simple_form_for category, url: get_form_category_url, defaults: { label: false } do |f| %>
-  <% if category.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize( category.errors.count, "error") %> prohibited this category from being saved:</h2>
-
+<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">
+      <div class="alert alert-error">
+        <%= t('binda.standard_form_error_heading') %> <%= pluralize(f.object.errors.count, t("binda.standard_form_error")) %>.
+      </div>
       <ul>
-      <% category.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="standard-form--body">
 
-      <div class="form-section--wide-container row">
-        <div class="col-sm-12">
+    <div class="standard-form--container">
 
-          <h4><%= "#{ t :details }".capitalize %></h4>
-          
-          <h5><%= t(:name).capitalize %></h5>
-          <%= f.input :name %>
+      <div class="standard-form--header">
+        <p><%= "#{ t :details }".capitalize %></p>
+      </div>
+
+      <div class="standard-form--fields">
 
-          <% if category.slug.nil? %>
-            <%= f.input :slug, as: :hidden %>
-          <% else %>
-            <h5><%= "#{ t :slug }".capitalize %></h5>
-            <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
-          <% end %>
+        <%= f.input :name, label: "#{t('binda.title')}".capitalize %>
 
-          <h5><%= t(:description).capitalize %></h5>
-          <%= f.input :description %>
+        <% if f.object.slug.nil? %>
+          <%= f.input :slug, as: :hidden %>
+        <% else %>
+          <%= f.input :slug, disabled: true, hint: "#{ t :slug_disable_hint }" %>
+        <% end %>
 
-          <h5><%= t(:position).capitalize %></h5>
-          <%= f.input :position %>
+        <%= f.input :description, label: "#{t('description')}".capitalize %>
 
-        </div>
       </div>
 
     </div>
-    <div class="col-sm-4">
-      <div class="form-section--narrow-container row">
-        <div class="col-sm-12">
-          <div class="form-actions">
-            <h4><%= t(:setting).capitalize.pluralize %></h4>
-            <%= f.button :submit, 'Save changes', class: 'btn btn-primary' %>
-          </div>
-        </div>
-      </div>
+
+  </div>
+
+  <div class="standard-form--container standard-form--sidebar">
+
+    <div class="standard-form--header">
+      <p><%= t(:setting).capitalize.pluralize %></p>
     </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>
-</div>

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

@@ -1,5 +1,5 @@
 <% content_for :header do %>
-	<h3><%= "#{ t(:edit).capitalize } #{ @structure.name.humanize } #{ t(:category).capitalize }" %></h3>
+	<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>
 <% end %>
 		

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

@@ -1,34 +1,37 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "#{ t(:new).capitalize } #{ t(:category).capitalize }", new_structure_category_path, class: 'main-header--link btn btn-primary' %>    
+    <%= 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' %>
   </div>
   <h3><%= @structure.name.capitalize %> <%= t(:category).capitalize.pluralize %></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">
+      <table class="standard-form--container">
         <thead>
           <tr>
-            <th colspan="3"><%= t(:category).capitalize.pluralize %></th>
-            <th></th>
+            <th style="width: 70%;" class="standard-form--header"><%= t(:category).capitalize.pluralize %></th>
+            <th style="width: 30%;" class="standard-form--header"></th>
           </tr>
         </thead>
         
         <tbody>
           <% @categories.order( :position, :name ).each do |category| %>
-            <tr id="category_<%= category.id %>">    
-              <td colspan="3"><%= category.name %></td>
-              <td><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <%= link_to 'Edit', edit_structure_category_path( @structure.slug, category) %> <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> <%= link_to 'Destroy', structure_category_path( @structure.slug, category ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-danger' %></td>
+            <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>
-    
-    <%= link_to "New #{ t(:category).capitalize }", new_structure_category_path, class: 'main-header--link btn btn-default' %>    
-        
+
+    <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' %>
+    </div>
+
   </div>
-</div>
 <% end %>

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

@@ -1,11 +1,14 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }", new_structure_component_path , class: 'main-header--link btn btn-primary' %>    
+  	<% 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' %>
+    <% 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' %>
   </div>
-  <h3><%= "#{ t :edit }".capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %></h3>
+  <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>
 <% end %>
 
 <% content_for :content do %>
 	<%= render 'binda/fieldable/form_body' %>
-<% end %>
+<% end %>

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

@@ -1,45 +1,86 @@
 <% content_for :header do %>
   <div class="main-header--buttons">
-    <%= link_to "New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }", new_structure_component_path , class: 'main-header--link btn btn-primary' %>    
+    <%= 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' %>
+    <%= get_sort_index_link %>
   </div>
-  <h3><%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %></h3>
+  <p class="main-header--title"><%= @structure.name.humanize.split.map(&:capitalize).join(' ').pluralize %></p>
 <% 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">
+
+      <div class="pagination-links--bar">
+        <%= paginate @components %>
+      </div>
+
+      <table class="standard-form--container" cellspacing="0">
 
-      <table class="table table-striped">
         <thead>
-          <tr>
-            <th class="col-sm-1"></th>
-            <th class="col-sm-5">Title</th>
-            <th class="col-sm-2">Publish state</th>
-            <th class="col-sm-3"></th>
-          </tr>
+
+            <th style="width: 50%", class="standard-form--header">
+              <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 %>
+              </a>
+            </th>
+            <th style="width: 20%", class="standard-form--header">
+              <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 %>
+              </a>
+            </th>
+            <th style="width: 30%", class="standard-form--header"><p style="float: right;">Actions</p></th>
+
         </thead>
-        
-        <tbody class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">
-          <% @components.order( :position, :name ).each do |component| %>
-            <tr id="component_<%= component.id %>">  
-              <td><span class="sortable--handle"></span></td>
+        <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>
-                  <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> 
-                  <%= link_to 'Edit', edit_structure_component_path( @structure.slug, component ) %> 
-                  <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> 
-                  <%= link_to 'Destroy', structure_component_path( @structure.slug, component.slug ), method: :delete, data: { confirm: 'Are you sure?' }, class: 'text-danger' %>
+              <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>
             </tr>
           <% end %>
         <tbody>
+
       </table>
 
-    <%= paginate @components %>
-    
-    <%= link_to "New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }", new_structure_component_path, class: 'main-header--link btn btn-default', action: "new" %>    
-        
-  </div>
-</div>
+      <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" %>
+        <%= get_sort_index_link %>
+      </div>
+
+    </div>
+
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :header do %>
-	<h3><%= "#{ t :new }".capitalize %> <%= @structure.name.humanize.split.map(&:capitalize).join(' ') %></h3>
+	<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>
 <% end %>
 		

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

@@ -0,0 +1,46 @@
+<% 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' %>
+  </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>
+<% end %>
+
+<% content_for :content do %>
+  <div class="sortable-warning sortable-warning--hidden">
+      <div class="sortable-warning--loader">
+        <span></span>
+        <span></span>
+        <span></span>
+        <span></span>
+      </div>
+      <p><%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %></p>
+  </div>
+  <div class="main-table--container">
+
+      <h5 class="text-muted"><%= t('binda.sort_index_hint', { arg1: @structure.name.humanize.split.join(' ').pluralize }).html_safe %></h5>
+
+      <table class="standard-form--container table-sort">
+        <thead>
+          <tr>
+            <th style="width: 50%;", class="standard-form--header">Title</th>
+            <th style="width: 50%;", class="standard-form--header">Publish state</th>
+            <th class="standard-form--header"></th>
+          </tr>
+        </thead>
+        <tbody id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">
+          <% @components.order( :position, :name ).each do |component| %>
+            <tr id="component_<%= component.id %>">
+              <td><%= link_to component.name, structure_component_path( @structure.slug, component ) %></td>
+              <td><%= component.publish_state %></td>
+              <td></td>
+            </tr>
+          <% end %>
+        <tbody>
+      </table>
+
+    <%= 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" %>
+        
+  </div>
+<% end %>