camaleon_cms 2.1.1 → 2.1.1.4

data/app/assets/javascripts/camaleon_cms/admin/momentjs/zh.js

@@ -0,0 +1,127 @@
+//! moment.js locale configuration
+//! locale : chinese (zh-cn)
+//! author : suupic : https://github.com/suupic
+//! author : Zeno Zeng : https://github.com/zenozeng
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var zh_cn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah点mm分',
+            LTS : 'Ah点m分s秒',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日Ah点mm分',
+            LLLL : 'YYYY年MMMD日ddddAh点mm分',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日Ah点mm分',
+            llll : 'YYYY年MMMD日ddddAh点mm分'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            sameElse : 'LL'
+        },
+        ordinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd':
+            case 'D':
+            case 'DDD':
+                return number + '日';
+            case 'M':
+                return number + '月';
+            case 'w':
+            case 'W':
+                return number + '周';
+            default:
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return zh_cn;
+
+}));

data/app/assets/javascripts/camaleon_cms/admin/nav-menu.js

@@ -6,6 +6,7 @@ function do_add_item_menu(data){
     var link = data.link ? data.link.toString() : "";
     var parent_id = data.parent_id;
     var extra_html = data.extra_html;
+    var item_id = data.item_id;
     var id = data.id ? data.id : $("#nestable .dd-item").length + 1;
 
     var link_data = '';
@@ -20,7 +21,7 @@ function do_add_item_menu(data){
     // custom fields icon
     if(main_menus_panel.attr("data-fields_support") == "true") link_data += '<a class="text-edit" title="'+I18n("button.settings")+'" href="'+data.url_content+'" onclick="do_settings_menu(this); return false;" rel="1"><i class="fa fa-cog"></i></a>';
 
-    var item = $('<li class="dd-item dd3-item" data-type="'+type+'" data-id="'+id+'" data-parent="'+(parent_id ? parent_id : "")+'"><div class="dd-handle dd3-handle"></div> <div class="dd3-content"><span>'+text + "</span> " + extra_html +' <span class="label">'+type+'</span> '+ link_data +' <a href="#" onclick="do_delete_menu(this); return false;" class="text-danger" title="'+I18n("button.delete")+'"><i class="fa fa-times-circle"></i></a> </div></li>');
+    var item = $('<li class="dd-item dd3-item" data-type="'+type+'" data-id="'+id+'" data-item_id="'+item_id+'" data-parent="'+(parent_id ? parent_id : "")+'"><div class="dd-handle dd3-handle"></div> <div class="dd3-content"><span>'+text + "</span> " + extra_html +' <span class="label">'+type+'</span> '+ link_data +' <a href="#" onclick="do_delete_menu(this); return false;" class="text-danger" title="'+I18n("button.delete")+'"><i class="fa fa-times-circle"></i></a> </div></li>');
     item.attr("data-fields", data.fields).attr("data-label", text).attr("data-link", link);
     if(parent_id > 0)
     {
@@ -91,15 +92,15 @@ function do_delete_menu(link){
 // edit form for custom links
 function do_edit_menu(link){
     var li = $(link).closest("li");
-    open_modal({title: "Edit Menu", url: $(link).attr("href"), mode: "ajax", callback: function(modal){
+    open_modal({title: "Edit Menu", url: RENDER_FORM.replace('-9999', li.attr('data-item_id')), mode: "ajax", callback: function(modal){
         modal.find(".panel-footer").html("<button type='submit' class='btn btn-primary'>Update</button>");
         var form = modal.find("form");
-        form.find("#external_label").val(li.attr("data-label"));
-        form.find("#external_url").val(li.attr("data-link"));
+        form.find("#external_label").val(li.data("label"));
+        form.find("#external_url").val(li.data("link"));
         init_form_validations(form);
         form.submit(function(){
-            li.attr("data-label", form.find("#external_label").val());
-            li.attr("data-link", form.find("#external_url").val());
+            li.data("label", form.find("#external_label").val());
+            li.data("link", form.find("#external_url").val());
             li.children(".dd3-content").children("span:first").html(form.find("#external_label").val());
             modal.modal("hide");
             return false;
@@ -111,27 +112,13 @@ function do_edit_menu(link){
 // edit form for custom fields
 function do_settings_menu(link){
     var li = $(link).closest("li");
-    open_modal({title: "Configuration Menu", url: $(link).attr("href")+"&custom_fields=true", mode: "ajax", callback: function(modal){
+    open_modal({id: 'menu_item_'+li.attr('data-id'), title: "Configuration Menu", url: RENDER_FORM.replace('-9999', li.attr('data-item_id'))+"&custom_fields=true", mode: "ajax", callback: function(modal){
+        modal.attr('data-skip_destroy', true);
         var form = modal.find("form");
-        setTimeout(function(){
-            form.find(".translated-item").trigger("trans_integrate");
-            var data = eval("("+(li.attr("data-fields")||"{}")+")");
-            for(var key in data){
-                if(data[key]) form.find("[name='field_options["+key+"][values][]']").val(data[key]);
-            }
-            init_form_validations(form);
-        }, 300);
         form.submit(function(){
             if(!form.valid()) return false;
-            form.find(".translated-item").trigger("trans_integrate");
-            var data = {};
-            var form_fields = form.serializeObject().field_options;
-            console.log(form_fields);
-            for(var key in form_fields){
-                data[key] = form.find("[name='field_options["+key+"][values][]']").val();
-                console.log("ssss", data);
-            }
-            li.attr("data-fields", JSON.stringify(data));
+            form.find(".translate-item").trigger("change_in");
+            li.attr("data-fields", JSON.stringify(form.serializeObject().field_options));
             modal.modal("hide");
             return false;
         });
@@ -143,7 +130,7 @@ function do_settings_menu(link){
 function render_menu(items){
     $.each(items, function (i, item) {
         var r_id = do_add_item_menu({
-            id: item.id,
+            item_id: item.id,
             type: item.type,
             link: item.link,
             url_edit: item.url_edit,
@@ -170,6 +157,9 @@ function render_menu(items){
         }
     });
 
+    // change menu selector
+    $("#menu_items #menu").change(function(){ $(this).closest('form').submit(); });
+
     // save menu items (main form)
     $("#menu_form").submit(function () {
         var menu_data = $('#nestable').nestable("serialize").length == 0 ? [] : $('#nestable').nestable("serialize");

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/nl.js

@@ -0,0 +1,219 @@
+tinymce.addI18n('nl',{
+"Cut": "Knippen",
+"Heading 5": "Kop 5",
+"Header 2": "Kop 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Uw browser ondersteunt geen toegang tot het klembord. Gelieve ctrl+X\/C\/V sneltoetsen te gebruiken.",
+"Heading 4": "Kop 4",
+"Div": "Div",
+"Heading 2": "Kop 2",
+"Paste": "Plakken",
+"Close": "Sluiten",
+"Font Family": "Lettertype",
+"Pre": "Pre",
+"Align right": "Rechts uitlijnen",
+"New document": "Nieuw document",
+"Blockquote": "Quote",
+"Numbered list": "Nummering",
+"Heading 1": "Kop 1",
+"Headings": "Koppen",
+"Increase indent": "Inspringing vergroten",
+"Formats": "Opmaak",
+"Headers": "Kopteksten",
+"Select all": "Alles selecteren",
+"Header 3": "Kop 3",
+"Blocks": "Blok",
+"Undo": "Ongedaan maken",
+"Strikethrough": "Doorhalen",
+"Bullet list": "Opsommingsteken",
+"Header 1": "Kop 1",
+"Superscript": "Superscript",
+"Clear formatting": "Opmaak verwijderen",
+"Font Sizes": "Tekengrootte",
+"Subscript": "Subscript",
+"Header 6": "Kop 6",
+"Redo": "Opnieuw",
+"Paragraph": "Paragraaf",
+"Ok": "Ok\u00e9",
+"Bold": "Vet",
+"Code": "Code",
+"Italic": "Cursief",
+"Align center": "Centreren",
+"Header 5": "Kop 5",
+"Heading 6": "Kop 6",
+"Heading 3": "Kop 3",
+"Decrease indent": "Inspringing verkleinen",
+"Header 4": "Kop 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Plakken gebeurt nu als platte tekst. Tekst wordt nu ingevoegd zonder opmaak tot deze optie uitgeschakeld wordt.",
+"Underline": "Onderstreept",
+"Cancel": "Annuleren",
+"Justify": "Uitlijnen",
+"Inline": "Inlijn",
+"Copy": "Kopi\u00ebren",
+"Align left": "Links uitlijnen",
+"Visual aids": "Hulpmiddelen",
+"Lower Greek": "Griekse letters",
+"Square": "Vierkant",
+"Default": "Standaard",
+"Lower Alpha": "Kleine letters",
+"Circle": "Cirkel",
+"Disc": "Bolletje",
+"Upper Alpha": "Hoofdletters",
+"Upper Roman": "Romeinse cijfers groot",
+"Lower Roman": "Romeinse cijfers klein",
+"Name": "Naam",
+"Anchor": "Anker",
+"You have unsaved changes are you sure you want to navigate away?": "U hebt niet opgeslagen wijzigingen! Wilt u de pagina echt verlaten?",
+"Restore last draft": "Herstel het laatste concept",
+"Special character": "Speciale karakters",
+"Source code": "Broncode",
+"B": "Blauw",
+"R": "Rood",
+"G": "Groen",
+"Color": "Kleur",
+"Right to left": "Rechts naar links",
+"Left to right": "Links naar rechts",
+"Emoticons": "Emoticons",
+"Robots": "Robots",
+"Document properties": "Document eigenschappen",
+"Title": "Titel",
+"Keywords": "Sleutelwoorden",
+"Encoding": "Codering",
+"Description": "Omschrijving",
+"Author": "Auteur",
+"Fullscreen": "Volledig scherm",
+"Horizontal line": "Horizontale lijn",
+"Horizontal space": "Horizontale ruimte",
+"Insert\/edit image": "Afbeelding invoegen\/bewerken",
+"General": "Algemeen",
+"Advanced": "Geavanceerd",
+"Source": "Bron",
+"Border": "Rand",
+"Constrain proportions": "Verhoudingen behouden",
+"Vertical space": "Verticale ruimte",
+"Image description": "Afbeelding omschrijving",
+"Style": "Stijl",
+"Dimensions": "Afmetingen",
+"Insert image": "Afbeelding invoegen",
+"Zoom in": "Inzoomen",
+"Contrast": "Contrast",
+"Back": "Terug",
+"Gamma": "Gamma",
+"Flip horizontally": "Horizontaal spiegelen",
+"Resize": "Formaat aanpassen",
+"Sharpen": "Scherpte",
+"Zoom out": "Uitzoomen",
+"Image options": "Afbeelding opties",
+"Apply": "Toepassen",
+"Brightness": "Helderheid",
+"Rotate clockwise": "Rechtsom draaien",
+"Rotate counterclockwise": "Linksom draaien",
+"Edit image": "Bewerk afbeelding",
+"Color levels": "Kleurniveau's",
+"Crop": "Uitsnijden",
+"Orientation": "Orientatie",
+"Flip vertically": "Verticaal spiegelen",
+"Invert": "Omkeren",
+"Insert date\/time": "Voeg datum\/tijd in",
+"Remove link": "Link verwijderen",
+"Url": "Url",
+"Text to display": "Linktekst",
+"Anchors": "Anker",
+"Insert link": "Hyperlink invoegen",
+"New window": "Nieuw venster",
+"None": "Geen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingegeven URL verwijst naar een extern adres. Wil je er \"http:\/\/\" aan toevoegen?",
+"Target": "Doel",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingegeven URL lijkt op een e-mailadres. Wil je er \"mailto:\" aan toevoegen?",
+"Insert\/edit link": "Hyperlink invoegen\/bewerken",
+"Insert\/edit video": "Video invoegen\/bewerken",
+"Poster": "Poster",
+"Alternative source": "Alternatieve bron",
+"Paste your embed code below:": "Plak u in te sluiten code hieronder:",
+"Insert video": "Video invoegen",
+"Embed": "Insluiten",
+"Nonbreaking space": "Vaste spatie invoegen",
+"Page break": "Pagina einde",
+"Paste as text": "Plakken als tekst",
+"Preview": "Voorbeeld",
+"Print": "Print",
+"Save": "Opslaan",
+"Could not find the specified string.": "Kan de opgegeven tekenreeks niet vinden",
+"Replace": "Vervangen",
+"Next": "Volgende",
+"Whole words": "Alleen hele woorden",
+"Find and replace": "Zoek en vervang",
+"Replace with": "Vervangen door",
+"Find": "Zoeken",
+"Replace all": "Alles vervangen",
+"Match case": "Identieke hoofd\/kleine letters",
+"Prev": "Vorige",
+"Spellcheck": "Spellingscontrole",
+"Finish": "Einde",
+"Ignore all": "Alles negeren",
+"Ignore": "Negeren",
+"Add to Dictionary": "Toevoegen aan woordenlijst",
+"Insert row before": "Voeg rij boven toe",
+"Rows": "Rijen",
+"Height": "Hoogte",
+"Paste row after": "Plak rij onder",
+"Alignment": "Uitlijning",
+"Border color": "Randkleur",
+"Column group": "Kolomgroep",
+"Row": "Rij",
+"Insert column before": "Voeg kolom in voor",
+"Split cell": "Cel splitsen",
+"Cell padding": "Ruimte binnen cel",
+"Cell spacing": "Celruimte",
+"Row type": "Rijtype",
+"Insert table": "Tabel invoegen",
+"Body": "Body",
+"Caption": "Onderschrift",
+"Footer": "Voettekst",
+"Delete row": "Verwijder rij",
+"Paste row before": "Plak rij boven",
+"Scope": "Bereik",
+"Delete table": "Verwijder tabel",
+"H Align": "Links uitlijnen",
+"Top": "Bovenaan",
+"Header cell": "Kopcel",
+"Column": "Kolom",
+"Row group": "Rijgroep",
+"Cell": "Cel",
+"Middle": "Centreren",
+"Cell type": "Celtype",
+"Copy row": "Kopieer rij",
+"Row properties": "Rij eigenschappen",
+"Table properties": "Tabel eigenschappen",
+"Bottom": "Onderaan",
+"V Align": "Boven uitlijnen",
+"Header": "Koptekst",
+"Right": "Rechts",
+"Insert column after": "Voeg kolom in na",
+"Cols": "Kolommen",
+"Insert row after": "Voeg rij onder toe",
+"Width": "Breedte",
+"Cell properties": "Cel eigenschappen",
+"Left": "Links",
+"Cut row": "Knip rij",
+"Delete column": "Verwijder kolom",
+"Center": "Midden",
+"Merge cells": "Cellen samenvoegen",
+"Insert template": "Sjabloon invoegen",
+"Templates": "Sjablonen",
+"Background color": "Achtergrondkleur",
+"Custom...": "Eigen...",
+"Custom color": "Eigen kleur",
+"No color": "Geen kleur",
+"Text color": "Tekstkleur",
+"Show blocks": "Blokken tonen",
+"Show invisible characters": "Onzichtbare karakters tonen",
+"Words: {0}": "Woorden: {0}",
+"Insert": "Invoegen",
+"File": "Bestand",
+"Edit": "Bewerken",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Druk ALT-F9 voor het menu. Druk ALT-F10 voor de toolbar. Druk ALT-0 voor help.",
+"Tools": "Gereedschap",
+"View": "Beeld",
+"Table": "Tabel",
+"Format": "Opmaak"
+});

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

@@ -1,28 +1,46 @@
-window["cama_init_media"] = (media_panel)->
+window["cama_init_media"] = (media_panel) ->
   media_info = media_panel.find(".media_file_info")
   media_info_tab_info = media_panel.find(".media_file_info_col .nav-tabs .link_media_info")
   media_link_tab_upload = media_panel.find(".media_file_info_col .nav-tabs .link_media_upload")
 
   ################ visualize item
   show_file = (item) ->
+    item.addClass('selected').siblings().removeClass('selected')
     data = eval("("+item.find(".data_value").val()+")")
     media_info_tab_info.click()
     tpl =
       "<div class='p_thumb'></div>" +
-      "<div class='p_label'><b>"+I18n("button.name")+": </b><br> <span>"+data["name"]+"</span></div>" +
-      "<div class='p_body'>" +
+        "<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>"
+        "</div>"
 
     if window["callback_media_uploader"]
-      if !media_panel.attr("data-formats") || (media_panel.attr("data-formats")  && $.inArray(data["format"], media_panel.attr("data-formats").split(",")) >= 0)
+      if !media_panel.attr("data-formats") || (media_panel.attr("data-formats")  && ($.inArray(data["format"], media_panel.attr("data-formats").split(",")) >= 0 || $.inArray(data["url"].split(".").pop().toLowerCase(), media_panel.attr("data-formats").split(",")) >= 0))
         tpl += "<div class='p_footer'>" +
-                "<a href='#' class='btn btn-primary insert_btn'>"+I18n("button.insert")+"</a>" +
-                "</div>"
+          "<button class='btn btn-primary insert_btn'>"+I18n("button.insert")+"</button>" +
+          "</div>"
 
     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
+          btn.prop('disabled', false)
+        else
+          media_info.find(".cdimension").css("color", 'red')
+          cut = $("<button class='btn btn-info pull-right'><i class='fa fa-crop'></i> "+I18n("button.crop_image")+"</button>").click(->
+            $.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 ->
@@ -41,21 +59,24 @@ window["cama_init_media"] = (media_panel)->
   ########## file uploader
   p_upload = media_panel.find(".cama_media_fileuploader")
   customFileData = ->
-    return {folder: media_panel.attr("data-folder") }
+    return {folder: media_panel.attr("data-folder"), 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>',
+    uploadStr: p_upload.attr('data-uploadStr'),
     dynamicFormData: customFileData,
-    onSuccess: (files,res_upload,xhr,pd)->
+    onSuccess: ((files,res_upload,xhr,pd)->
       if res_upload.search("<") == 0 # success upload
-        p = media_panel.find(".media_browser_list").prepend(res_upload)
-        if $(pd.statusbar).siblings().length == 0
-          p.children().first().click()
+        media_panel.trigger("add_file", {item: res_upload, selected: $(pd.statusbar).siblings().not('.error_file_upload').size() == 0})
         $(pd.statusbar).remove();
-
       else
         $(pd.statusbar).find(".ajax-file-upload-progress").html("<span style='color: red;'>"+res_upload+"</span>");
+    ),
+    onError: ((files,status,errMsg,pd) ->
+      $(pd.statusbar).addClass('error_file_upload').find(".ajax-file-upload-filename").append(" <i class='fa fa-times btn btn-danger btn-xs' onclick='$(this).closest(\".ajax-file-upload-statusbar\").remove();'></i>")
+    )
   })
   ## end file uploader
 
@@ -101,14 +122,19 @@ window["cama_init_media"] = (media_panel)->
       media_panel.find(".media_browser_list").html(res)
       hideLoading()
     )
+  ).bind("add_file", (e,  data)-> # add html item in the list
+    item = $(data["item"])
+    media_panel.find(".media_browser_list").prepend(item)
+    if data["selected"] == true || data["selected"] == undefined
+      item.click()
   )
 
 
   # element actions
   media_panel.on("click", "a.add_folder", ->
-    content = $("<form><div><label for=''>Folder: </label> <input name='folder' class='form-control required'> </div><div><button class='btn btn-primary' type='submit'>Create</button></div> </form>")
+    content = $("<form><div><label for=''>"+I18n('button.folder')+": </label> <div class='input-group'><input name='folder' class='form-control required' placeholder='Folder name..'><span class='input-group-btn'><button class='btn btn-primary' type='submit'>"+I18n('button.create')+"</button></span></div></div> </form>")
     callback = (modal)->
-      btn = modal.find("button")
+      btn = modal.find(".btn-primary")
       input = modal.find("input").keyup(->
         if $(this).val()
           btn.removeAttr("disabled")
@@ -129,6 +155,7 @@ window["cama_init_media"] = (media_panel)->
     open_modal({title: "New Folder", content: content, callback: callback})
     return false
   )
+
   # destroy file and folder
   media_panel.on("click", "a.del_item, a.del_folder", ->
     unless confirm(I18n("msg.delete_item"))
@@ -139,23 +166,59 @@ window["cama_init_media"] = (media_panel)->
     $.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)->
       hideLoading()
       if res
-        $.fn.alert({type: 'error', content: res, title: "Error"})
+        $.fn.alert({type: 'error', content: res, title: I18n("button.error")})
       else
         item.remove()
         media_info.html("")
+    ).error(->
+      $.fn.alert({type: 'error', content: I18n("msg.internal_error"), title: I18n("button.error")})
     )
     return false
   )
 
+  # upload from url form
+  media_panel.find("#cama_media_external").submit( ->
+    unless $(this).valid()
+      return false
+    $.fn.upload_url({url: $(this).find("input").val(), callback: ->
+      media_panel.find("#cama_media_external")[0].reset();
+    })
+    return false
+  ).validate()
+
+$ ->
+  # sample: $.fn.upload_url({url: 'http://camaleon.tuzitio.com/media/132/logo2.png', dimension: '120x120', folder: 'my_folder'})
+  # dimension: default current dimension
+  # 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) ->
+      $.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
+        media_panel.trigger("add_file", {item: res_upload})
+        if data["callback"]
+          data["callback"](res_upload)
+      else
+        $.fn.alert({type: 'error', content: res_upload, title: I18n("button.error")})
+    ).error(->
+      $.fn.alert({type: 'error', content: I18n("msg.internal_error"), title: I18n("button.error")})
+    )
+
 
 # jquery library for modal updaloder
 $ ->
-  # sample: $.fn.upload_filemanager({title: "My title", formats: "image,video", selected: function(file){ alert(file["name"]) }})
+  # sample: $.fn.upload_filemanager({title: "My title", formats: "image,video", dimension: "30x30", selected: function(file){ alert(file["name"]) }})
   # file structure: {"name":"422.html","size":1547, "url":"http://localhost:3000/media/1/422.html", "format":"doc","type":"text/html"}
+  # dimension: dimension: "30x30" | "x30" | dimension: "30x"
   $.fn.upload_filemanager = (args)->
     args = args || {}
-    open_modal({title: args["title"] || I18n("msg.media_title"), modal_size: "modal-lg", mode: "ajax", url: root_url+"/admin/media/ajax", ajax_params: {media_formats: args["formats"]}, callback: (modal)->
+    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)->
       if args["selected"]
         window["callback_media_uploader"] = args["selected"]
       modal.css("z-index", args["zindex"] || 99999).children(".modal-dialog").css("width", "90%")
-    })
+    })