camaleon_cms 2.1.1.4 → 2.1.2.0

data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js.coffee

@@ -13,7 +13,7 @@ window["cama_init_media"] = (media_panel) ->
         "<div class='p_label'><b>"+I18n("button.name")+": </b><br> <span>"+data["name"]+"</span></div>" +
         "<div class='p_body'>" +
         "<div><b>"+I18n("button.url")+":</b><br> <a target='_blank' href='"+data["url"]+"'>"+data["url"]+"</a></div>" +
-        "<div><b>"+I18n("button.size")+":</b><br> <span>"+data["size"]+"</span></div>" +
+        "<div><b>"+I18n("button.size")+":</b> <span>"+cama_humanFileSize(data["size"])+"</span></div>" +
         "</div>"
 
     if window["callback_media_uploader"]
@@ -24,15 +24,16 @@ window["cama_init_media"] = (media_panel) ->
 
     media_info.html(tpl)
     media_info.find(".p_thumb").html(item.find(".thumb").html())
-    if data["format"] == "image" && media_panel.attr("data-dimension") # verify dimensions
-      img = $('<img src="'+data["url"]+'">').hide()
-      btn = media_info.append(img).find(".p_footer .insert_btn")
-      btn.prop('disabled', true)
-      img.load ->
-        media_info.find(".p_body").append("<div class='cdimension'><b>"+I18n("button.dimension")+": </b><span>"+this.width+"x"+this.height+"</span></div>")
-        ww = parseInt(media_panel.attr("data-dimension").split("x")[0]) || this.width
-        hh = parseInt(media_panel.attr("data-dimension").split("x")[1]) || this.height
-        if media_panel.attr("data-dimension") && this.width == ww && this.height == hh
+    if data["format"] == "image"
+      ww = parseInt(data['dimension'].split("x")[0])
+      hh = parseInt(data['dimension'].split("x")[1])
+      media_info.find(".p_body").append("<div class='cdimension'><b>"+I18n("button.dimension")+": </b><span>"+ww+"x"+hh+"</span></div>")
+      if media_panel.attr("data-dimension") # verify dimensions
+        btn = media_info.find(".p_footer .insert_btn")
+        btn.prop('disabled', true)
+        _ww = parseInt(media_panel.attr("data-dimension").split("x")[0])
+        _hh = parseInt(media_panel.attr("data-dimension").split("x")[1])
+        if _ww == ww && _hh == hh
           btn.prop('disabled', false)
         else
           media_info.find(".cdimension").css("color", 'red')
@@ -40,7 +41,6 @@ window["cama_init_media"] = (media_panel) ->
             $.fn.upload_url({url: data["url"]})
           )
           btn.after(cut)
-        media_info.find(".p_thumb").html(img.show())
 
     if window["callback_media_uploader"] # trigger callback
       media_info.find(".insert_btn").click ->
@@ -59,16 +59,17 @@ window["cama_init_media"] = (media_panel) ->
   ########## file uploader
   p_upload = media_panel.find(".cama_media_fileuploader")
   customFileData = ->
-    return {folder: media_panel.attr("data-folder"), formats: media_panel.attr("data-formats") }
+    return {folder: media_panel.attr("data-folder").replace(/\/{2,}/g, '/'), formats: media_panel.attr("data-formats") }
 
   p_upload.uploadFile({
     url: p_upload.attr("data-url"),
     fileName: "file_upload",
-    dragDropStr: '<span><b>'+p_upload.attr('data-dragDropStr')+'</b></span>',
+    uploadButtonClass: "btn btn-primary btn-block",
+    dragDropStr: '<span style="display: block;"><b>'+p_upload.attr('data-dragDropStr')+'</b></span>',
     uploadStr: p_upload.attr('data-uploadStr'),
     dynamicFormData: customFileData,
     onSuccess: ((files,res_upload,xhr,pd)->
-      if res_upload.search("<") == 0 # success upload
+      if res_upload.search("media_item") >= 0 # success upload
         media_panel.trigger("add_file", {item: res_upload, selected: $(pd.statusbar).siblings().not('.error_file_upload').size() == 0})
         $(pd.statusbar).remove();
       else
@@ -83,9 +84,13 @@ window["cama_init_media"] = (media_panel) ->
   ######### folders breadcrumb
   media_panel.find(".media_folder_breadcrumb").on("click", "a", ->
     media_panel.trigger("navigate_to", {folder: $(this).attr("data-path")})
+    return false
   )
   media_panel.on("click", ".folder_item", ->
-    media_panel.trigger("navigate_to", {folder: media_panel.attr("data-folder")+"/"+$(this).attr("data-key")})
+    f = media_panel.attr("data-folder")+"/"+$(this).attr("data-key")
+    if $(this).attr("data-key").search('/') >= 0
+      f = $(this).attr("data-key")
+    media_panel.trigger("navigate_to", {folder: f.replace(/\/{2,}/g, '/')})
   )
   media_panel.bind("update_breadcrumb", ->
     folder = media_panel.attr("data-folder").replace("//", "/")
@@ -103,7 +108,7 @@ window["cama_init_media"] = (media_panel) ->
         breadrumb.push("<li><span>"+name+"</span></li>")
       else
         folder_prefix.push(value)
-        breadrumb.push("<li><a data-path='"+(folder_prefix.join("/") || "/")+"' href='#'>"+name+"</a></li>")
+        breadrumb.push("<li><a data-path='"+(folder_prefix.join("/") || "/").replace(/\/{2,}/g, '/')+"' href='#'>"+name+"</a></li>")
     media_panel.find(".media_folder_breadcrumb").html(breadrumb.join(""))
   ).trigger("update_breadcrumb")
   ## end folders
@@ -118,7 +123,7 @@ window["cama_init_media"] = (media_panel) ->
     media_link_tab_upload.click()
 
     showLoading()
-    $.get(media_panel.attr("data-url"), {folder: folder, partial: true, media_formats: media_panel.attr("data-formats")}, (res)->
+    $.get(media_panel.attr("data-url"), {folder: folder.replace(/\/{2,}/g, '/'), partial: true, media_formats: media_panel.attr("data-formats")}, (res)->
       media_panel.find(".media_browser_list").html(res)
       hideLoading()
     )
@@ -129,6 +134,23 @@ window["cama_init_media"] = (media_panel) ->
       item.click()
   )
 
+  # search file
+  media_panel.find('#cama_search_form').submit ->
+    showLoading()
+    $.get(media_panel.attr("data-url"), {search: $(this).find('input:text').val(), partial: true, media_formats: media_panel.attr("data-formats")}, (res)->
+      media_panel.find(".media_browser_list").html(res)
+      hideLoading()
+    )
+    return false
+
+  # reload current directory
+  media_panel.find('.cam_media_reload').click (e)->
+    showLoading()
+    $.get(media_panel.attr("data-url"), {partial: true, media_formats: media_panel.attr("data-formats"), folder: media_panel.attr("data-folder"), cama_media_reload: $(this).attr('data-action')}, (res)->
+      media_panel.find(".media_browser_list").html(res)
+      hideLoading()
+    )
+    e.preventDefault()
 
   # element actions
   media_panel.on("click", "a.add_folder", ->
@@ -143,10 +165,10 @@ window["cama_init_media"] = (media_panel) ->
       ).trigger("keyup")
       modal.find("form").submit ->
         showLoading()
-        $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+input.val(), media_action: "new_folder"}, (res)->
+        $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+input.val().replace(/\/{2,}/g, '/'), media_action: "new_folder"}, (res)->
           hideLoading()
           modal.modal("hide")
-          if res.search("<") == 0 # success upload
+          if res.search("folder_item") >= 0 # success upload
             media_panel.find(".media_browser_list").append(res)
           else
             $.fn.alert({type: 'error', content: res, title: "Error"})
@@ -163,7 +185,7 @@ window["cama_init_media"] = (media_panel) ->
     link = $(this)
     item = link.closest(".media_item")
     showLoading()
-    $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+item.attr("data-key"), media_action: if link.hasClass("del_folder") then "del_folder" else "del_file"}, (res)->
+    $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+item.attr("data-key").replace(/\/{2,}/g, '/'), media_action: if link.hasClass("del_folder") then "del_folder" else "del_file"}, (res)->
       hideLoading()
       if res
         $.fn.alert({type: 'error', content: res, title: I18n("button.error")})
@@ -192,14 +214,14 @@ $ ->
   # folder: default current folder
   $.fn.upload_url = (args)->
     media_panel = $("#cama_media_gallery")
-    data = {folder: media_panel.attr("data-folder"), media_action: "crop_url", formats: media_panel.attr("data-formats"), onerror: (message) ->
+    data = {folder: media_panel.attr("data-folder").replace(/\/{2,}/g, '/'), media_action: "crop_url", formats: media_panel.attr("data-formats"), onerror: (message) ->
       $.fn.alert({type: 'error', content: message, title: I18n("msg.error_uploading")})
     }
     $.extend(data, args); on_error = data["onerror"]; delete data["onerror"];
     showLoading()
     $.post(media_panel.attr("data-url_actions"), data, (res_upload)->
       hideLoading()
-      if res_upload.search("<") == 0 # success upload
+      if res_upload.search("media_item") >= 0 # success upload
         media_panel.trigger("add_file", {item: res_upload})
         if data["callback"]
           data["callback"](res_upload)
@@ -217,8 +239,16 @@ $ ->
   # dimension: dimension: "30x30" | "x30" | dimension: "30x"
   $.fn.upload_filemanager = (args)->
     args = args || {}
-    open_modal({title: args["title"] || I18n("msg.media_title"), id: 'cama_modal_file_uploader', modal_size: "modal-lg", mode: "ajax", url: root_url+"/admin/media/ajax", ajax_params: {media_formats: args["formats"], dimension: args["dimension"] }, callback: (modal)->
+    open_modal({title: args["title"] || I18n("msg.media_title"), id: 'cama_modal_file_uploader', modal_size: "modal-lg", mode: "ajax", url: root_admin_url+"/media/ajax", ajax_params: {media_formats: args["formats"], dimension: args["dimension"] }, callback: (modal)->
       if args["selected"]
         window["callback_media_uploader"] = args["selected"]
       modal.css("z-index", args["zindex"] || 99999).children(".modal-dialog").css("width", "90%")
     })
+
+window['cama_humanFileSize'] = (size)->
+  units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  i = 0;
+  while(size >= 1024)
+    size /= 1024;
+    ++i;
+  return size.toFixed(1) + ' ' + units[i];

data/app/assets/javascripts/camaleon_cms/admin/user_profile.js

@@ -14,44 +14,37 @@ jQuery(function ($) {
 
     // on success photo crop
     function onSuccess() {
-        $("#cp_photo").parent("a").find("span").html("Choose another photo");
-        var img = $("#cp_target").find("#crop_image")
+        var form = $("#cp_crop");
+        var img = form.find("#crop_image");
         if (img.length === 1) {
-            $("#cp_img_path").val(img.attr("src"));
-
+            form.find("[name='cp_img_path']").val(img.attr("src"));
             img.cropper({
                 aspectRatio: 1,
+                minWidth: 100,
+                minHeight: 100,
+                maxWidth: 200,
+                maxHeight: 200,
                 done: function (data) {
-                    $("#ic_x").val(data.x);
-                    $("#ic_y").val(data.y);
-                    $("#ic_h").val(data.height);
-                    $("#ic_w").val(data.width);
+                    form.find("[name='ic_x']").val(data.x);
+                    form.find("[name='ic_y']").val(data.y);
+                    form.find("[name='ic_h']").val(data.height);
+                    form.find("[name='ic_w']").val(data.width);
                 }
             });
 
-            $("#cp_accept").prop("disabled", false).removeClass("disabled");
-            $("#cp_crop").css({"width": "400px", "margin": "0px auto"});
-            $("#cp_crop").find('.modal-body').css({"max-height": "400px", "overflow": "auto"});
-            $("#cp_accept").unbind("click").on("click", function () {
-                //$("#user_image").html('<img src="/assets/loader.gif"/>');
+            $("#cp_accept").prop("disabled", false).unbind("click").on("click", function () {
                 $("#modal_change_photo").modal("hide");
-                $("#cp_crop").ajaxForm({
-                    beforeSend: function () {
-                        showLoading();
-                    }, success: function (res) {
-                        hideLoading();
-                        if (res != "") $("#modal_change_password .modal-body").flash_message(res);
-                        $("#user_image").html('<img class="img-thumbnail" src="' + res + '?r=' + Math.random() + '"/>');
-                        hideLoading();
-                    },
-                    error: function(){
-                        $.fn.alert({type: 'error', content: 'Internal Error', title: "Error"})
-                    }
-                }).submit();
-                $("#cp_target").html("Use form below to upload file. Only image files.");
-                $("#cp_photo").val("").parent("a").find("span").html("Select file");
-                $("#cp_accept").prop("disabled", true).addClass("disabled");
+                showLoading();
+                $.post(form.attr('action'), form.serialize(), function(res){
+                    hideLoading();
+                    $("#user_image").html('<img class="img-thumbnail" src="' + res + '?r=' + Math.random() + '"/>');
+                }).error(function(){
+                    $.fn.alert({type: 'error', content: 'Internal Error', title: "Error"})
+                });
+                $("#cp_accept").prop("disabled", true);
                 $("#cp_img_path").val("");
+                $("#cp_target").html("");
+                return false;
             });
         }
     }
@@ -65,6 +58,7 @@ jQuery(function ($) {
             },
             user_pwd: '<%= current_user_pwd %>'
         });
+        return false;
     });
 
 });

data/app/assets/stylesheets/camaleon_cms/admin/_bootstrap-select.css

@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap-select v1.10.0 (http://silviomoreto.github.io/bootstrap-select)
+ *
+ * Copyright 2013-2016 bootstrap-select
+ * Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
+ */select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\9}.bootstrap-select>.dropdown-toggle{width:100%;padding-right:25px;z-index:1}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2}.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle{border-color:#b94a48}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{z-index:auto}.bootstrap-select.btn-group:not(.input-group-btn),.bootstrap-select.btn-group[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.btn-group.dropdown-menu-right,.bootstrap-select.btn-group[class*=col-].dropdown-menu-right,.row .bootstrap-select.btn-group[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select.btn-group,.form-horizontal .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group{margin-bottom:0}.form-group-lg .bootstrap-select.btn-group.form-control,.form-group-sm .bootstrap-select.btn-group.form-control{padding:0}.form-inline .bootstrap-select.btn-group .form-control{width:100%}.bootstrap-select.btn-group.disabled,.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group.disabled:focus,.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group.bs-container{position:absolute}.bootstrap-select.btn-group.bs-container .dropdown-menu{z-index:1060}.bootstrap-select.btn-group .dropdown-toggle .filter-option{display:inline-block;overflow:hidden;width:100%;text-align:left}.bootstrap-select.btn-group .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li.active small{color:#fff}.bootstrap-select.btn-group .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select.btn-group .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select.btn-group .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select.btn-group .dropdown-menu li a span.check-mark{display:none}.bootstrap-select.btn-group .dropdown-menu li a span.text{display:inline-block}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.btn-group.fit-width .dropdown-toggle .filter-option{position:static}.bootstrap-select.btn-group.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark{position:absolute;display:inline-block;right:15px;margin-top:5px}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none}

data/app/assets/stylesheets/camaleon_cms/admin/admin-manifest.css

@@ -15,13 +15,12 @@
  *= require ./lte/skins/skin-blue
  *= require ./_custom_admin
 
- *= require ./bootstrap-datepicker
+ *= require ./_bootstrap-datepicker
  *= require ./introjs/_introjs.min
  *= require ./tageditor/_jquery.tag-editor
 
  *= require ./uploader/_uploadfile
-
-
+ *= require ./_bootstrap-select
 
  // post
  *= require ./_jquery.tagsinput

data/app/assets/stylesheets/camaleon_cms/admin/colorpicker.css.scss

@@ -54,14 +54,15 @@
     display: none;
 }
 .colorpicker {
-    top: 0;
-    left: 0;
-    padding: 4px;
-    min-width: 120px;
-    margin-top: 1px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
+  top: 0;
+  left: 0;
+  padding: 4px;
+  min-width: 120px;
+  margin-top: 1px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  z-index: 99999;
 }
 .colorpicker.dropdown-menu {
     margin-top: 8px;

data/app/assets/stylesheets/camaleon_cms/admin/uploader/_uploadfile.css.scss

@@ -231,6 +231,7 @@ margin: 5px 10px 5px 0px;
       .ajax-upload-dragdrop{
         width: 100% !important;
         min-height: 200px;
+        padding-top: 65px;
         &.state-hover{
           background-color: #ccc;
         }
@@ -240,16 +241,4 @@ margin: 5px 10px 5px 0px;
       width: 100% !important;
     }
   }
-
-  .media_folder_breadcrumb{
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-  }
-  .add_folder{
-    position: absolute;
-    right: 17px;
-    top: 5px;
-  }
 }

data/app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb

@@ -9,116 +9,132 @@
 class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminController
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.appearance")
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.menus")
-  def menu
-    authorize! :manager, :menu
-    unless params[:new].present?
-      if params[:id].present?
-        @nav_menu = current_site.nav_menus.find_by_id(params[:id])
-        if request.delete? && @nav_menu.present?
-          @nav_menu.destroy
-          flash[:notice] = t('camaleon_cms.admin.menus.message.deleted')
-          redirect_to action: :menu
-          return
-        end
-      end
-
-      unless @nav_menu.present?
-        if params[:slug].present?
-          @nav_menu = current_site.nav_menus.where({slug: params[:slug]}).first
-        else
-          @nav_menu = current_site.nav_menus.last
-        end
-      end
-
-    end
-    @nav_menu = current_site.nav_menus.new unless @nav_menu.present?
-    items = []
-    unless @nav_menu.new_record?
-      items = get_nav_items(@nav_menu.children)
+  before_action :check_menu_permission
+  def index
+    if params[:id].present?
+      @nav_menu = current_site.nav_menus.find_by_id(params[:id])
+    elsif params[:slug].present?
+      @nav_menu = current_site.nav_menus.find_by_slug(params[:slug])
+    else
+      @nav_menu = current_site.nav_menus.first
     end
-    @items = items
-
-    @nav_menus = current_site.nav_menus.all
     @post_types = current_site.post_types
     add_asset_library("nav_menu")
     render "index"
   end
 
-  # save changes of the menu
-  def save
-    authorize! :manager, :menu
-    unless params[:nav_menu][:id].present?   # new
-      menu_data = params[:nav_menu]
-      @nav_menu = current_site.nav_menus.new(menu_data)
-      if @nav_menu.save
-        flash[:notice] = t('camaleon_cms.admin.menus.message.created')
-        render json: {new: 1, nav_menu: @nav_menu, redirect: cama_admin_appearances_nav_menus_menu_path({id: @nav_menu.id})}
-      else
-        render json: {error: t('camaleon_cms.admin.menus.message.error_menu')}
-      end
-    else
-      @nav_menu = current_site.nav_menus.find(params[:nav_menu][:id])
-      if @nav_menu.update(params[:nav_menu])
-        @nav_menu.add_menu_items(params[:menu_data])
+  def new
+    @nav_menu = current_site.nav_menus.new
+    render partial: 'form'
+  end
 
-        if params[:nav_menu_location].present?
-          params[:nav_menu_location].each do |location|
-            current_site.set_option("_nav_menu_#{location}", @nav_menu.id)
-          end
-        end
-        render json: {update: 1, nav_menu: @nav_menu}
-      else
-        render json: {error: t('camaleon_cms.admin.menus.message.error_menu')}
-      end
-    end
+  def create
+    nav_menu = current_site.nav_menus.new(params[:nav_menu])
+    nav_menu.save
+    flash[:notice] = t('.created_menu', default: 'Created Menu')
+    redirect_to action: :index, id: nav_menu.id
   end
 
-  # show external menu form
-  def form
-    if params[:custom_fields].present?
-      if params[:item_id] == 'undefined'
-        @nav_menu = current_site.nav_menus.find_by_id(params[:menu_id])
-      else
-        @nav_menu = current_site.nav_menu_items.find_by_id(params[:item_id])
-      end
-      render "_custom_fields", layout: "camaleon_cms/admin/_ajax"
-    else
-      render "_external_menu", layout: false, locals: {submit: true}
-    end
+  def update
+    nav_menu = current_site.nav_menus.find(params[:id])
+    nav_menu.update(params[:nav_menu])
+    flash[:notice] = t('.updated_menu', default: 'Menu updated')
+    redirect_to action: :index, id: nav_menu.id
   end
 
-  private
+  def edit
+    @nav_menu = current_site.nav_menus.find(params[:id])
+    render partial: 'form'
+  end
 
-  def get_nav_items(menu_items, parent_id = 0)
+  def destroy
+    current_site.nav_menus.find(params[:id]).destroy
+    flash[:notice] = t('.deleted_menu', default: 'Menu destroyed')
+    redirect_to action: :index
+  end
+
+  def custom_settings
+    @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
+    @nav_menu_item = current_site.nav_menu_items.find(params[:id])
+    render "_custom_fields", layout: "camaleon_cms/admin/_ajax"
+  end
+
+  def save_custom_settings
+    @nav_menu_item = current_site.nav_menu_items.find(params[:id])
+    @nav_menu_item.set_field_values(params[:field_options])
+    render nothing: true
+  end
+
+  # render edit external menu item
+  def edit_menu_item
+    render "_external_menu", layout: false, locals: {nav_menu: current_site.nav_menus.find(params[:nav_menu_id]), menu_item: current_site.nav_menu_items.find(params[:id])}
+  end
+
+  # update an external menu item
+  def update_menu_item
+    @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
+    item = current_site.nav_menu_items.find(params[:id])
+    item.update_menu_item({label: params[:external_label], link: params[:external_url]})
+    item.set_options(params[:options]) if params[:options].present?
+    render partial: 'menu_items', locals: {items: [item], nav_menu: @nav_menu}
+  end
+
+  def delete_menu_item
+    # @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
+    current_site.nav_menu_items.find(params[:id]).destroy
+    render nothing: true
+  end
+
+  # update the reorder of items
+  def reorder_items(items = nil, parent_id = nil, is_root = true)
+    items = params[:items] if items.nil?
+    parent_id = params[:nav_menu_id] if parent_id.nil?
+    items.each do |index, _item|
+      item = current_site.nav_menu_items.find(_item['id'])
+      item.update_column(:parent_id, parent_id)
+      reorder_items(_item['children'], _item['id'], false) if _item['children'].present?
+    end
+    render(inline: '') if is_root
+  end
+
+  # add items to specific nav-menu
+  def add_items
     items = []
-    menu_items.eager_load(:metas).each do |nav_item|
-      object = _get_object_nav_menu(nav_item)
-      if object.present?
-        items << {id: nav_item.id, label: object[:name], link: nav_item.options[:object_id], url_edit: object[:url_edit], type: nav_item.options[:type], parent: parent_id.to_i, fields: "#{nav_item.get_field_values_hash(true).to_json}"}
-        items += get_nav_items(nav_item.children, nav_item.id)
+    @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
+    if params[:external].present?
+      item = @nav_menu.append_menu_item({label: params[:external][:external_label], link: params[:external][:external_url], type: "external"})
+      item.set_options(params[:external][:options]) if params[:external][:options].present?
+      items << item
+    end
+
+    if params[:items].present?
+      params[:items].each do |index, item|
+        item = @nav_menu.append_menu_item({label: 'auto', link: item['id'], type: item['kind']})
+        items << item
       end
     end
-    return items
+    render partial: 'menu_items', locals: {items: items, nav_menu: @nav_menu}
   end
 
-  def _get_object_nav_menu(nav_menu_item)
+  private
+  def parse_menu_item(nav_menu_item)
     begin
       case nav_menu_item.get_option('type')
         when 'post'
           post = CamaleonCms::Post.find(nav_menu_item.get_option('object_id')).decorate
           return false unless post.status == 'published'
-          {link: post.the_url, name: post.the_title, url_edit: post.the_edit_url }
+          {name: post.the_title(locale: @frontend_locale), url_edit: post.the_edit_url }
         when 'category'
           category = CamaleonCms::Category.find(nav_menu_item.get_option('object_id')).decorate
-          {link: category.the_url, name: category.the_title, url_edit: category.the_edit_url}
+          {name: category.the_title, url_edit: category.the_edit_url}
         when 'post_tag'
           post_tag = CamaleonCms::PostTag.find(nav_menu_item.get_option('object_id')).decorate
-          {link: post_tag.the_url, name: post_tag.the_title, url_edit: post_tag.the_edit_url}
+          {name: post_tag.the_title, url_edit: post_tag.the_edit_url}
         when 'post_type'
           post_type = CamaleonCms::PostType.find(nav_menu_item.get_option('object_id')).decorate
-          {link: post_type.the_url, name: post_type.the_title, url_edit: post_type.the_edit_url}
+          {name: post_type.the_title, url_edit: post_type.the_edit_url}
         when 'external'
-          {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s}
+          {name: nav_menu_item.name.to_s}
         else
           false
       end
@@ -127,4 +143,9 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
       false
     end
   end
+  helper_method :parse_menu_item
+
+  def check_menu_permission
+    authorize! :manager, :menu
+  end
 end