adminpanel 2.0.0 → 2.0.1

data/app/assets/javascripts/adminpanel/wysiwyg.js

@@ -0,0 +1,5 @@
+$(document).ready(function(){
+  $('.wysihtml5').each(function(i, elem) {
+    $(elem).wysihtml5();
+  });
+});

data/app/assets/stylesheets/adminpanel/bootstrap-wysihtml5.css

@@ -0,0 +1,102 @@
+ul.wysihtml5-toolbar {
+	margin: 0;
+	padding: 0;
+	display: block;
+}
+
+ul.wysihtml5-toolbar::after {
+	clear: both;
+	display: table;
+	content: "";
+}
+
+ul.wysihtml5-toolbar > li {
+	float: left;
+	display: list-item;
+	list-style: none;
+	margin: 0 5px 10px 0;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=bold] {
+	font-weight: bold;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=italic] {
+	font-style: italic;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=underline] {
+	text-decoration: underline;
+}
+
+ul.wysihtml5-toolbar a.btn.wysihtml5-command-active {
+	background-image: none;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+	background-color: #E6E6E6;
+	background-color: #D9D9D9;
+	outline: 0;
+}
+
+ul.wysihtml5-commands-disabled .dropdown-menu {
+	display: none !important;
+}
+
+ul.wysihtml5-toolbar div.wysihtml5-colors {
+  display:block;
+  width: 50px;
+  height: 20px;
+  margin-top: 2px;
+  margin-left: 5px;
+  position: absolute;
+  pointer-events: none;
+}
+
+ul.wysihtml5-toolbar a.wysihtml5-colors-title {
+  padding-left: 70px;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="black"] {
+  background: black !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="silver"] {
+  background: silver !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="gray"] {
+  background: gray !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="maroon"] {
+  background: maroon !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="red"] {
+  background: red !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="purple"] {
+  background: purple !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="green"] {
+  background: green !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="olive"] {
+  background: olive !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="navy"] {
+  background: navy !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="blue"] {
+  background: blue !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="orange"] {
+  background: orange !important;
+}

data/app/assets/stylesheets/application-admin.css

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require adminpanel/medium-editor
  *= require font-awesome
  *= require_tree ./adminpanel/.
  */

data/app/controllers/adminpanel/analytics_controller.rb

@@ -1,5 +1,6 @@
 module Adminpanel
-    class AnalyticsController < Adminpanel::ApplicationController
+  class AnalyticsController < Adminpanel::ApplicationController
+    skip_authorization_check
     authorize_resource :class => false
 		skip_before_filter :set_model
 

data/app/controllers/adminpanel/application_controller.rb

@@ -12,6 +12,7 @@ module Adminpanel
 
     before_filter :signed_in_user, :set_model, :strong_params_for_cancan
 
+  private
     def strong_params_for_cancan
       resource = controller_name.singularize.to_sym
       method = "#{resource}_params"
@@ -24,7 +25,7 @@ module Adminpanel
     end
 
     def signed_in_user
-      redirect_to signin_url, :notice => I18n.t("authentication.welcome") unless signed_in?
+      redirect_to signin_url, :notice => I18n.t('authentication.welcome') unless signed_in?
     end
 
     def set_model

data/app/controllers/adminpanel/sections_controller.rb

@@ -28,7 +28,7 @@ module Adminpanel
       @section = Section.find(params[:id])
 
       if @section.update_attributes(params[:section])
-        redirect_to section_path(@section), :notice => "La seccion se ha actualizado"
+        redirect_to section_path(@section), :notice => 'La seccion se ha actualizado'
       else
         render 'edit'
       end

data/app/controllers/adminpanel/sessions_controller.rb

@@ -1,7 +1,7 @@
 module Adminpanel
 	class SessionsController < Adminpanel::ApplicationController
-
-		layout "admin-login"
+		skip_authorization_check
+		layout 'admin-login'
 		skip_before_filter :signed_in_user, :set_model
 
 		def new

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -27,7 +27,7 @@ module Adminpanel
       params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
       create! do |success, failure|
         success.html do
-          flash[:success] = I18n.t("action.save_success")
+          flash[:success] = I18n.t('action.save_success')
           redirect_to resource
         end
         failure.html do
@@ -35,11 +35,10 @@ module Adminpanel
           render 'shared/new'
         end
         success.js do
-          flash.now[:success] = I18n.t("action.save_success")
           if params[:belongs_request]
-            render 'shared/create_belongs_to', :locals => {:resource => resource }
+            render 'shared/create_belongs_to', :locals => { :resource => resource }
           else
-            render 'shared/create_has_many', :locals => {:resource => resource }
+            render 'shared/create_has_many', :locals => { :resource => resource }
           end
         end
         failure.js do
@@ -62,7 +61,7 @@ module Adminpanel
     def update
       update! do |success, failure|
         success.html do
-          flash[:success] = I18n.t("action.save_success")
+          flash.now[:success] = I18n.t('action.save_success')
           render 'shared/index'
         end
         failure.html do

data/app/helpers/adminpanel/{custom_form_builder.rb → adminpanel_form_builder.rb}

@@ -1,5 +1,5 @@
 module Adminpanel
-	class CustomFormBuilder < ActionView::Helpers::FormBuilder
+	class AdminpanelFormBuilder < ActionView::Helpers::FormBuilder
 
 		alias_method :text_field_original, :text_field
 		alias_method :radio_button_original, :radio_button
@@ -70,27 +70,18 @@ module Adminpanel
 
 		def wysiwyg_field(name, *args)
 			options = args.extract_options!
-			label = options["label"]
-			options.delete("label")
+			label = options['label']
+			options.delete('label')
 
-			@template.content_tag(:div, :class => "control-group") do
-				@template.content_tag(:label, label, :class => "control-label") +
-				@template.content_tag(:div, :class => "controls") do
-					if self.object.send(name).nil?
-						@template.content_tag(
-							:div,
-							self.object.send(name),
-							:id => name,
-							"data-placeholder" => I18n.t("Write description here")
-						)
-					else
-						@template.content_tag(
-							:div,
-							self.object.send(name).html_safe,
-							:id => name,
-							"data-placeholder" => I18n.t("Write description here")
-						)
-					end
+			@template.content_tag(:div, :class => 'control-group') do
+				@template.content_tag(:label, label, :class => 'control-label') +
+				@template.content_tag(:div, :class => 'controls') do
+					self.text_area(
+						name,
+						class: 'wysihtml5 span10',
+						placeholder: I18n.t('wysiwyg.description'),
+						rows: '6'
+					)
 				end
 			end
 		end
@@ -149,12 +140,12 @@ module Adminpanel
 
 		def select(name, select_options, *args)
 			options = args.extract_options!
+			label = options['label']
+			options.delete('label')
 
 			options.reverse_merge! :class => "span7"
 
 			options.reverse_merge! :include_blank => "(Seleccione por favor)";
-			label = options['label']
-			options.delete('label')
 
 			@template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
@@ -189,21 +180,6 @@ module Adminpanel
 			end
 		end
 
-		def text_area(name, *args)
-			options = args.extract_options!
-
-			options.reverse_merge! :class => "span7"
-			options.reverse_merge! :rows => "10"
-			options.reverse_merge! :label => name
-			label = options['label']
-			options.delete('label')
-
-			@template.content_tag :div, :class => "control-group" do
-				@template.content_tag(:label, label, :class => "control-label") +
-				@template.content_tag(:div, super(name, *args << options), :class => "controls")
-			end
-		end
-
 		def submit(name, *args)
 			options = args.extract_options!
 

data/app/helpers/adminpanel/application_helper.rb

@@ -4,9 +4,9 @@ module Adminpanel
 		include BreadcrumbsHelper
 		include SharedPagesHelper
 
-		def custom_form_for(name, *args, &block)
+		def adminpanel_form_for(name, *args, &block)
 			options = args.extract_options!
-			options.reverse_merge! :builder => Adminpanel::CustomFormBuilder, :html => { :class => "form-horizontal" }
+			options.reverse_merge! :builder => Adminpanel::AdminpanelFormBuilder, :html => { :class => "form-horizontal" }
 
 			form_for(name, *(args << options), &block)
 		end

data/app/helpers/adminpanel/router_helper.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   module RouterHelper
-    def gallery_children(resource)
+    def get_gallery_children(resource)
       resource_class(resource).gallery_children
     end
 
@@ -8,6 +8,15 @@ module Adminpanel
       resource_class(resource).routes_options
     end
 
+    def rest_path_names
+      {
+        path_names: {
+          new: I18n.t('routes.new'),
+          edit: I18n.t('routes.edit'),
+          show: I18n.t('routes.show')
+        }
+      }
+    end
   private
     def resource_class(resource)
       "adminpanel/#{resource.to_s.singularize}".classify.constantize

data/app/models/adminpanel/analytic.rb

@@ -3,7 +3,7 @@ module Adminpanel
     include Adminpanel::Base
 
     def self.display_name
-      'Google Analtico'
+      I18n.t('model.Analytic')
     end
 
     def self.icon

data/app/models/adminpanel/gallery.rb

@@ -47,7 +47,7 @@ module Adminpanel
 		end
 
 		def self.display_name
-			I18n.t('gallery.name')
+			I18n.t('model.Gallery')
 		end
 
 		def self.icon

data/app/models/adminpanel/section.rb

@@ -6,18 +6,34 @@ module Adminpanel
 
 	  mount_images :images
 
-	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == 'phone'}, :message => I18n.t('activerecord.errors.messages.not_phone')
-	  validates_presence_of :description, :minimum => 9, :on => :update, :if => lambda{|section| section.has_description == true}
-	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == 'phone'}
+	  validates_length_of :description,
+				minimum: 10,
+				maximum: 10,
+				on: :update,
+				if: :is_invalid_phone?,
+				message: I18n.t('activerecord.errors.messages.not_phone')
+	  validates_presence_of :description,
+				minimum: 9,
+				on: :update,
+				if: lambda{|section| section.has_description == true }
+	  validates :description,
+				numericality: { only_integer: true },
+				on: :update,
+				if: :is_invalid_phone?
 	  validates_presence_of :key
 	  validates_presence_of :name
 	  validates_presence_of :page
+
 		VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-		validates_format_of :description, :with => VALID_EMAIL_REGEX, if: lambda{|section| section.key == 'email'}
+		validates_format_of :description, with: VALID_EMAIL_REGEX, if: lambda{|section| section.key == 'email'}
+
+	  default_scope { order("page ASC") }
 
-	  default_scope { order("page ASC")}
+	  scope :of_page, lambda{ |page|
+			where(page: page)
+		}
 
-	  scope :of_page, lambda{|page| where(:page => page)}
+	  scope :with_description, -> { where.not( description: '') }
 
 		def self.form_attributes
 			[
@@ -45,5 +61,10 @@ module Adminpanel
 				return self.attributes['description']
 			end
 		end
+
+		private
+		def is_invalid_phone?
+			key == 'phone' && description != ''
+		end
 	end
 end

data/app/models/adminpanel/user.rb

@@ -71,6 +71,7 @@ module Adminpanel
         {
           'group_id' => {
             'type' => 'belongs_to',
+            'name' => 'Group',
             'model' => 'Adminpanel::Group',
             'remote_resource' => false,
             'placeholder' => I18n.t('model.attributes.group_id'),

data/app/models/concerns/adminpanel/base.rb

@@ -115,7 +115,10 @@ module Adminpanel
       end
 
       def routes_options
-        { path: display_name.pluralize(I18n.default_locale).downcase }
+        { path: ActiveSupport::Inflector.transliterate(
+            display_name.pluralize(I18n.default_locale).downcase
+          ).tr(' ', '-')
+        }
       end
 
       def has_route?(route)

data/app/views/adminpanel/categories/_category_form.html.erb

@@ -1,4 +1,4 @@
-<%= custom_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :currentcontroller => params[:currentcontroller], :belongs_request => params[:belongs_request]}, :remote => true, :html => {:class => "form-horizontal", :id => "new-category-form"}) do |f| -%>
+<%= adminpanel_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :currentcontroller => params[:currentcontroller], :belongs_request => params[:belongs_request]}, :remote => true, :html => {:class => "form-horizontal", :id => "new-category-form"}) do |f| -%>
   <div class="row-fluid">
     <div class="modal-body">
         <%= render 'shared/error_messages', :object => resource %>

data/app/views/adminpanel/sections/edit.html.erb

@@ -6,7 +6,7 @@
     <div class = "widget-header"><i class = "fa fa-tasks"></i><h5><%= @section.name %></h5></div>
     <div class = "widget-body">
       <div class = "widget-forms clearfix">
-        <%= custom_form_for(@section, :url => section_path(@section)) do |f| %>
+        <%= adminpanel_form_for(@section, :url => section_path(@section)) do |f| %>
           <%= render 'shared/error_messages', :object => @section %>
 
           <% if @section.has_description %>

data/app/views/shared/_form_fields.html.erb

@@ -1,102 +1,105 @@
 <% @model.form_attributes.each do |entries| %>
 <% entries.each do |attribute, properties| %>
 
-	<% if properties['type'] == 'wysiwyg_field' %>
-		<% type = properties['type'] %>
-		<% args = properties.except('type') %>
-		<div style="display:none;">
-			<%= f.hidden_field attribute, :id => "#{attribute}-field", :value => resource.send(attribute) %>
-		</div>
-		<%= f.send(type, attribute, args) %>
-		<%= content_for :scripts do %>
-			<script type="text/javascript">
-				<%= render 'shared/init_editor', :field_var => attribute, :label => properties[:label] %>
-			</script>
-		<% end %>
+	<% field_type = properties['type'] %>
+	<% properties = properties.except('type') %>
 
-	<% elsif properties['type'] == 'adminpanel_file_field' %>
-	<% if !defined? remote_request %>
-		<%= content_tag :div, :class => 'file-collection-container', :data => {:max => properties['max-files'].nil? ? 0 : properties['max-files'] } do %>
-			<%= f.fields_for(attribute) do |builder| %>
-	    	<%= render 'shared/image_fields', :f => builder %>
-	  	<% end -%>
-  		<%= link_to_add_fields t("Add Image"), f, attribute %>
-		<% end %>
+	<% if field_type == 'wysiwyg_field' %>
+		<%= f.send(field_type, attribute) %>
 
-	<% end %>
-  <% elsif properties['type'] == 'belongs_to' %>
-	<% if !defined? remote_request %>
-		<% args = properties.except('type', 'model') %>
-		<% args.symbolize_keys! %>
-  	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
+	<% elsif field_type == 'adminpanel_file_field' %>
 
+		<% if !defined? remote_request %>
+			<!-- if not making resource from other form -->
+			<%= content_tag :div, :class => 'file-collection-container', :data => {:max => properties['max-files'].nil? ? 0 : properties['max-files'] } do %>
+				<%= f.fields_for(attribute) do |builder| %>
+		    	<%= render 'shared/image_fields', :f => builder %>
+		  	<% end -%>
+	  		<%= link_to_add_fields t('Add Image'), f, attribute %>
+			<% end %>
 
-		<% if(properties['remote_resource'].nil? || properties['remote_resource']) %>
-			<!-- Button to create a new of this belongs_to resource -->
-			<% model_name = properties['model'].classify.constantize.model_name.to_s.demodulize.downcase %>
-			<%=
-			link_to(
-				I18n.t('other.add',
-					:model => properties['model'].classify.constantize.display_name
-				),
-				polymorphic_path(
-					[:new, :"#{model_name}"],
-					:model => @model.display_name,
-					:model_name => @model.name.demodulize.downcase,
-					:belongs_request => true
-				),
-				:class => 'btn btn-info',
-				:id => "#{model_name}-modal-link",
-				:'data-target' => "#new-modal",
-				:'data-toggle' => 'modal',
-				:remote => true
-			)
-			%>
 		<% end %>
+  <% elsif field_type == 'belongs_to' %>
+		<% if !defined? remote_request %>
+			<!-- if not making resource from other form
+			so we don't have to manage infinite nested forms
+			-->
+			<% args = properties.except('model') %>
+	  	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
 
 
-	<% end %>
-  <% elsif properties['type'] == 'has_many' %>
-	<% if !defined? remote_request %>
-		<div class="control-group">
-			<div class="control-label">
-				<%= I18n.t('other.choose', :model => properties['model'].classify.constantize.display_name.pluralize) %>
-			</div>
-	  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
-			<div class="controls" id="<%= properties['model'].demodulize.downcase %>-relation">
-		  	<% @collections["#{properties['model']}"].each do |resource| %>
-		  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
-				<% end %>
+			<% if(properties['remote_resource'].nil? || properties['remote_resource']) %>
+				<!--
+				Button to create a new of this belongs_to resource
+				if it's supposed to be created remotely
+				-->
+				<% model_name = properties['model'].classify.constantize.model_name.to_s.demodulize.downcase %>
+				<%=
+				link_to(
+					I18n.t('other.add',
+						:model => properties['model'].classify.constantize.display_name
+					),
+					polymorphic_path(
+						[:new, :"#{model_name}"],
+						:model => @model.display_name,
+						:model_name => @model.name.demodulize.downcase,
+						:belongs_request => true
+					),
+					:class => 'btn btn-info',
+					:id => "#{model_name}-modal-link",
+					:'data-target' => "#new-modal",
+					:'data-toggle' => 'modal',
+					:remote => true
+				)
+				%>
+			<% end %>
+		<% end %>
+  <% elsif field_type == 'has_many' %>
+		<% if !defined? remote_request %>
+			<div class="control-group">
+				<div class="control-label">
+					<%= properties['label'] %>
+				</div>
+		  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
+				<div class="controls" id="<%= properties['model'].demodulize.downcase %>-relation">
+			  	<% @collections["#{properties['model']}"].each do |resource| %>
+			  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
+					<% end %>
+				</div>
 			</div>
-		</div>
 
-		<% if properties['remote_resource'].nil? || propeties['remote_resource'] %>
-			<!-- Button to create a new of this has_many resource -->
-			<% model_name = properties['model'].classify.constantize.model_name.to_s.demodulize.downcase %>
-			<%=
-			link_to(
-				I18n.t('other.add',
-					:model => properties['model'].classify.constantize.display_name
-				),
-				polymorphic_path(
-					[:new, :"#{model_name}"],
-					:model => @model.display_name,
-					:model_name => @model.name.demodulize.downcase
-				),
-				:class => 'btn btn-info',
-				:id => "#{model_name}-modal-link",
-				:'data-target' => "#new-modal",
-				:'data-toggle' => 'modal',
-				:remote => true
-			)
-			%>
+			<% if properties['remote_resource'].nil? || propeties['remote_resource'] %>
+				<!-- Button to create a new of this has_many resource
+						if it can be created remotely -->
+				<% model_name = properties['model'].classify.constantize.model_name.to_s.demodulize.downcase %>
+				<%=
+				link_to(
+					I18n.t('other.add',
+						:model => properties['model'].classify.constantize.display_name
+					),
+					polymorphic_path(
+						[:new, :"#{model_name}"],
+						:model => @model.display_name,
+						:model_name => @model.name.demodulize.downcase
+					),
+					:class => 'btn btn-info',
+					:id => "#{model_name}-modal-link",
+					:'data-target' => "#new-modal",
+					:'data-toggle' => 'modal',
+					:remote => true
+				)
+				%>
+			<% end %>
 		<% end %>
-	<% end %>
 
-  <% else %>
-		<% type = properties['type'] %>
-		<% args = properties.except('type', 'name') %>
-    <%= f.send(type, attribute, args) %>
+  <% elsif field_type == 'file_field' %>
+		<% if !defined? remote_request %>
+			<% args = properties.except('name') %>
+    	<%= f.send(field_type, attribute, args) %>
+		<% end %>
+	<% else %>
+		<% args = properties.except('name') %>
+    <%= f.send(field_type, attribute, args) %>
   <% end %>
 
 <% end %>