tb_cms 1.2.3 → 1.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf65740efa862344b081383199dda50eaa2bc61f
-  data.tar.gz: 71e232020d75218667de0f13b3e93b44649871f1
+  metadata.gz: de4396854d57732f8a52e8efbace10d73fdcaded
+  data.tar.gz: 93a220547d65d8c0a94fb9123ae346409a782391
 SHA512:
-  metadata.gz: b7582f9009303390f4a44f57441a2df2a68e8ecc16ce78d0752d6d4886d2c218817a587decc8b46924fc7acc2e33d9d2e46b10df8f60bfafc02af30473116c87
-  data.tar.gz: 4ab3e64d0df2deca7acefa2683753c6d3bd239dc97cbcb605b83c7f80c5addc3668a8549eba31d8be6e83ea6b3960171a3c3073b87d5ac9690fdeb6251d1ebfc
+  metadata.gz: 8857e4dabfd684a60633fa40e179a1c596cc2efa9d3c5ad9485020e37959bcfdff74971aa1faf41d18ed01900b04ccfca81d8ad7cdbe78e6a6dda82c063cb737
+  data.tar.gz: 673da85578b647fe67ce656dea4908d42658d274f6157759834d97acf703978df27166926cc1d28a157800758aecc22657f4854289608a1ffa41a194efb35e2c

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/app/assets/javascripts/admin/cms/menu_items.js

@@ -2,44 +2,66 @@ spud.admin.cms.menu_items = {};
 
 (function() {
   var menu_items = spud.admin.cms.menu_items;
+  var val;
+  
+  var setUrl = function(){
+    return '/admin/menus/'+ val +'/menu_items/update_sort';
+  };
 
-  menu_items.init = function() {
-    $("#sort tbody").sortable({helper:fixHelper}).disableSelection();
-    sortableIcons();
+  var fixHelper = function(e, ui) {
+    ui.children().each(function() {
+      $(this).width($(this).width());
+    });
+    return ui;
+  };
+
+  menu_items.updateStatus = function(delay, shadow) {
+    if(!delay) { //Default 300ms delay if not provided
+      delay = 300;
+    }
+    setTimeout(function() {
+      $('.detail-wrapper').css({
+        boxShadow: shadow
+      });
+    }, delay);
   };
 
-  var sortableIcons = function(){
+  var sortableIcons = function() {
     $("#sort tbody").sortable({
       update : function(e, ui) {
         var sortArr = [];
         $("#sort tbody > tr > input").each(function() {
           sortArr.push($(this).attr('value'));
         });
-        //update order of menuItems
+        val = $("#menu-id").val();
+        //Update order of menuItems
         $.ajax(setUrl(), { 
           method: 'PUT', 
-          data: {order:sortArr}, 
+          data: {
+            order: sortArr
+          }, 
           dataType: "json",
           success: function(data, status, jqXHR) {
-
+            menu_items.updateStatus(200, '0px 0px 26px 2px rgba(4, 252, -49, 0.59)');
           },
-          error: function(XMLHttpRequest, textStatus, errorThrown) { 
-              alert("Status: " + textStatus); alert("Error: " + errorThrown); 
+          error: function(XMLHttpRequest, textStatus, errorThrown) {
+            menu_items.updateStatus(100, '0px 0px 26px 2px rgba(255, 0, 40, 0.59)');
+            alert("Status: " + textStatus); alert("Error: " + errorThrown); 
           }       
         });
       }
     });
   };
 
-  var fixHelper = function(e, ui) {
-    ui.children().each(function() {
-      $(this).width($(this).width());
+  menu_items.init = function() {
+    $("#sort tbody").sortable({
+      helper: fixHelper,
+      cursor: "move",
+      activate: function( event, ui ) {
+        menu_items.updateStatus(100, '0px 0px 26px 2px rgba(4, 252, 255, 0.59)');
+      }
     });
-    return ui;
-  };
-  
-  var setUrl = function(){
-    return '/admin/menus/'+$("#menu-id").val()+'/menu_items/update_sort';
+    sortableIcons();
   };
 
 })();

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

@@ -0,0 +1,11 @@
+/*
+	Jquery menu sort styles
+*/
+
+tbody.ui-sortable {
+	box-shadow: inset -1px 0px 10px 0px rgba(4, 252, 255, 0.59);
+}
+
+.ui-sortable-helper {
+	box-shadow: inset -1px 0px 10px 0px rgba(4, 252, 255, 0.59);
+}

data/app/controllers/admin/menu_items_controller.rb

@@ -1,116 +1,106 @@
 class Admin::MenuItemsController < Admin::ApplicationController
-	add_breadcrumb "Menus", :admin_menus_path
-	belongs_to_app :menus, :page_title => "Menu Items"
-	before_filter :load_menu
-	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy,:reorder]
-
-
-	def index
-		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items)
-		respond_with @menu_items
-	end
-
-	def new
-		add_breadcrumb "New", :new_admin_page_path
-
-		@menu_item = @menu.spud_menu_items.new
-		respond_with @menu_item
-	end
-
-	def create
-
-		add_breadcrumb "New", :new_admin_page_path
-		@menu_item = SpudMenuItem.new(menu_item_params)
-		@menu_item.spud_menu_id = @menu.id
-		if params[:spud_menu_item][:parent_id].blank?
-			@menu_item.parent_id = @menu.id
-			@menu_item.parent_type = "SpudMenu"
-		else
-			@menu_item.parent_type = "SpudMenuItem"
-		end
-		if @menu_item.name.blank? && !@menu_item.spud_page.blank?
-			@menu_item.name = @menu_item.spud_page.name
-		end
-		if @menu_item.menu_order.blank?
-			highest_sibling = @menu_item.parent.spud_menu_items.order("menu_order desc").first
-			if !highest_sibling.blank?
-				@menu_item.menu_order = highest_sibling.menu_order + 1
-			end
-		end
-		flash[:notice] = "Menu Created successfully!" if @menu_item.save
-
-
-
-		respond_with @menu_item,:location => admin_menu_menu_items_url
-	end
-
-	def edit
-		add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
-		if @menu_item.parent_type == "SpudMenu"
-			@menu_item.parent_id = nil
-		end
-		respond_with @menu_item
-	end
-
-	def update
-
-		add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
-		if params[:spud_menu_item][:parent_id].blank?
-			params[:spud_menu_item][:parent_type] = "SpudMenu"
-			params[:spud_menu_item][:parent_id] = @menu.id
-		else
-			params[:spud_menu_item][:parent_type] = "SpudMenuItem"
-		end
-		@menu_item.attributes = menu_item_params()
-		@menu_item.spud_menu_id = @menu.id
-		flash[:notice] = "Menu saved successfully!" if @menu_item.save
-
-		respond_with @menu_item,:location => admin_menu_menu_items_url
-	end
-
-	def destroy
-
-		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
-
-		respond_with @menu_item,:location => admin_menu_menu_items_url
-	end
-
-	def update_sort
-		if params[:order]
-			params[:order].each_with_index do |item, index|
-				val = item.to_i
-				menu_item = @menu.spud_menu_items.find_by_id(val)
-				menu_item.menu_order = index
-				menu_item.save
-			end
-		end
-		respond_to do |format|
-			format.json  { head :no_content }
-		end
-	end
-
-private
-	def load_menu
-
-		@menu = SpudMenu.where(:id => params[:menu_id]).first
-
-		if @menu.blank?
-			flash[:error] = "Menu not found!"
-			redirect_to admin_menus_url() and return false
-		end
-		add_breadcrumb "#{@menu.name}", :admin_menu_menu_items_path
-	end
-
-	def load_menu_item
-		@menu_item = SpudMenuItem.where(:id =>params[:id]).first
-		if @menu_item.blank?
-			flash[:error] = "Menu Item not found!"
-			redirect_to admin_menu_menu_items_url() and return false
-		end
-	end
-
-	def menu_item_params
-		params.require(:spud_menu_item).permit(:name, :parent_type, :parent_id, :item_type, :spud_page_id, :menu_order, :url, :classes)
-	end
+  add_breadcrumb 'Menus', :admin_menus_path
+  belongs_to_app :menus, page_title: 'Menu Items'
+  before_action :load_menu
+  before_action :load_menu_item, only: [:edit, :update, :show, :destroy, :reorder]
+
+  def index
+    @menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items)
+    respond_with @menu_items
+  end
+
+  def new
+    add_breadcrumb 'New', :new_admin_page_path
+
+    @menu_item = @menu.spud_menu_items.new
+    respond_with @menu_item
+  end
+
+  def create
+    add_breadcrumb 'New', :new_admin_page_path
+    @menu_item = SpudMenuItem.new(menu_item_params)
+    @menu_item.spud_menu_id = @menu.id
+    if params[:spud_menu_item][:parent_id].blank?
+      @menu_item.parent_id = @menu.id
+      @menu_item.parent_type = 'SpudMenu'
+    else
+      @menu_item.parent_type = 'SpudMenuItem'
+    end
+    if @menu_item.name.blank? && !@menu_item.spud_page.blank?
+      @menu_item.name = @menu_item.spud_page.name
+    end
+    if @menu_item.menu_order.blank?
+      highest_sibling = @menu_item.parent.spud_menu_items.order('menu_order desc').first
+      unless highest_sibling.blank?
+        @menu_item.menu_order = highest_sibling.menu_order + 1
+      end
+    end
+    flash[:notice] = 'Menu Created successfully!' if @menu_item.save
+
+    respond_with @menu_item, location: admin_menu_menu_items_url
+  end
+
+  def edit
+    add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
+    @menu_item.parent_id = nil if @menu_item.parent_type == 'SpudMenu'
+    respond_with @menu_item
+  end
+
+  def update
+    add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
+    if params[:spud_menu_item][:parent_id].blank?
+      params[:spud_menu_item][:parent_type] = 'SpudMenu'
+      params[:spud_menu_item][:parent_id] = @menu.id
+    else
+      params[:spud_menu_item][:parent_type] = 'SpudMenuItem'
+    end
+    @menu_item.attributes = menu_item_params()
+    @menu_item.spud_menu_id = @menu.id
+    flash[:notice] = 'Menu saved successfully!' if @menu_item.save
+
+    respond_with @menu_item, location: admin_menu_menu_items_url
+  end
+
+  def destroy
+    flash[:notice] = 'Menu Item removed!' if @menu_item.destroy
+
+    respond_with @menu_item, location: admin_menu_menu_items_url
+  end
+
+  def update_sort
+    params[:order]&.each_with_index do |item, index|
+      val = item.to_i
+      menu_item = @menu.spud_menu_items.find_by(id: val)
+      menu_item.menu_order = index
+      menu_item.save
+    end
+    respond_to do |format|
+      format.json { head :no_content }
+    end
+  end
+
+  private
+
+  def load_menu
+    @menu = SpudMenu.where(id: params[:menu_id]).first
+
+    if @menu.blank?
+      flash[:error] = 'Menu not found!'
+      redirect_to(admin_menus_url()) && (return false)
+    end
+    add_breadcrumb @menu.name.to_s, :admin_menu_menu_items_path
+  end
+
+  def load_menu_item
+    @menu_item = SpudMenuItem.where(id: params[:id]).first
+    if @menu_item.blank?
+      flash[:error] = 'Menu Item not found!'
+      redirect_to(admin_menu_menu_items_url()) && (return false)
+    end
+  end
+
+  def menu_item_params
+    params.require(:spud_menu_item).permit(:name, :parent_type, :parent_id, :item_type, :spud_page_id, :menu_order, :url, :classes)
+  end
 
 end

data/app/controllers/admin/menus_controller.rb

@@ -1,56 +1,55 @@
 class Admin::MenusController < Admin::ApplicationController
-	belongs_to_app :menus
-	add_breadcrumb "Menus", :admin_menus_path
-	before_filter :load_menu,:only => [:edit,:update,:show,:destroy]
-
-	def index
-		@menus = SpudMenu.all.paginate(:page => params[:page])
-		respond_with @menus
-	end
-
-	def new
-		add_breadcrumb "New", :new_admin_menu_path
-		@menu = SpudMenu.new
-		respond_with @menu
-	end
-
-	def create
-		add_breadcrumb "New", :new_admin_menu_path
-		@menu = SpudMenu.new(menu_params)
-		flash[:notice] = "New menu created" if @menu.save
-		respond_with @menu,:location => @menu.id != nil ? admin_menu_menu_items_url(:menu_id => @menu.id) : admin_menus_url
-	end
-
-	def edit
-		add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
-		respond_with @menu
-	end
-
-	def update
-		add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
-
-		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(menu_params)
-		respond_with @menu,:location => admin_menu_menu_items_url(:menu_id => @menu.id)
-	end
-
-	def destroy
-		flash[:notice] = "Menu removed!" if @menu.destroy
-		respond_with @menu,:location => admin_menus_url
-	end
-
-
-private
-
-	def load_menu
-		@menu = SpudMenu.where(:id => params[:id]).first
-		if @menu.blank?
-			flash[:error] = "Menu not found!"
-			redirect_to admin_menus_url() and return false
-		end
-	end
-
-	def menu_params
-		params.require(:spud_menu).permit(:name)
-	end
+  belongs_to_app :menus
+  add_breadcrumb 'Menus', :admin_menus_path
+  before_action :load_menu, only: [:edit, :update, :show, :destroy]
+
+  def index
+    @menus = SpudMenu.all.paginate(page: params[:page])
+    respond_with @menus
+  end
+
+  def new
+    add_breadcrumb 'New', :new_admin_menu_path
+    @menu = SpudMenu.new
+    respond_with @menu
+  end
+
+  def create
+    add_breadcrumb 'New', :new_admin_menu_path
+    @menu = SpudMenu.new(menu_params)
+    flash[:notice] = 'New menu created' if @menu.save
+    respond_with @menu, location: !@menu.id.nil? ? admin_menu_menu_items_url(menu_id: @menu.id) : admin_menus_url
+  end
+
+  def edit
+    add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
+    respond_with @menu
+  end
+
+  def update
+    add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
+
+    flash[:notice] = 'Menu saved successfully' if @menu.update_attributes(menu_params)
+    respond_with @menu, location: admin_menu_menu_items_url(menu_id: @menu.id)
+  end
+
+  def destroy
+    flash[:notice] = 'Menu removed!' if @menu.destroy
+    respond_with @menu, location: admin_menus_url
+  end
+
+  private
+
+  def load_menu
+    @menu = SpudMenu.where(id: params[:id]).first
+    if @menu.blank?
+      flash[:error] = 'Menu not found!'
+      redirect_to(admin_menus_url()) && (return false)
+    end
+  end
+
+  def menu_params
+    params.require(:spud_menu).permit(:name)
+  end
 
 end