camaleon_cms 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde50d023af5d5b8c20010a1b05d865b2a9102fe
-  data.tar.gz: d17b74a4a5bac6fb7ef869784a778f27dd29a0a8
+  metadata.gz: 289ef1eabd68fa970c95a6abdb5dfb37908fc788
+  data.tar.gz: 1e19ff8c9e625de6849d1e54616f49f42238ca48
 SHA512:
-  metadata.gz: 035738fecbcab32bafe7f3591c6d428e8ea6264152b330c8d56a2e3d5064ba026e65d94b99b6957b7f1394b592f2ee03f35f5b34c22208719e2bafae20bbc1c5
-  data.tar.gz: 4a9126ebdd52874f2fcf3c7486ed9c12473b175ed3e5fd672f179a3489ddb69d4243d8b6d562c9163c8149b6d3d855ac4e85ad9a94c0774f1ce9825ffac170ed
+  metadata.gz: 4a4ef462928c29569278fa1171e97de6c7573818aaaa09975f415948d7a90661de544adf87c697f58fc6c6d3ef70b84750c545e54e6e408d81364ef0c4d1e9ee
+  data.tar.gz: 25947d06a6e681ea99a988b65d385514dd6f333558658d0802e3a34d913823985356d44c795d91debfe976332397a5f2f748e100ddd4a2295ab92566e74afef8

data/app/assets/javascripts/admin/actions.js

@@ -2,14 +2,21 @@ jQuery(function($){
     // initialize all validations for forms
     init_form_validations();
     setTimeout(page_actions, 1000);
-    setTimeout(init_intro, 500);
+    if(!$("body").attr("data-intro")) setTimeout(init_intro, 500);
 });
 
 // show admin intro presentation
 function init_intro(){
-    if($("body").attr("data-intro")) return;
     var finish = function(){
         $.get(root_url+"/admin/ajax", {mode: "save_intro"});
+        var layer = $(".introjs-overlay").clone();
+        var of = $(".introjs-tooltip").offset();
+        var c = $(".introjs-tooltip").clone().css($.extend({}, {"min-width": "0", position: "absolute", overflow: "hidden", "zIndex": 9999999}, of));
+        $("html, body").animate({scrollTop: $("body").height()}, 0);
+        setTimeout(function(){
+            $("body").append(layer, c);
+            c.animate($.extend({}, {width: 75, height: 20}, $("#link_see_intro").offset()), "slow", function(){ setTimeout(function(){ c.remove(); layer.remove(); }, 500); });
+        }, 5)
     }
     introJs().setOptions({exitOnEsc: false,
         exitOnOverlayClick: false,
@@ -18,6 +25,10 @@ function init_intro(){
         disableInteraction: true
     }).oncomplete(finish).onexit(finish).onbeforechange(function(ele) {
         if($(ele).hasClass("treeview") && !$(ele).hasClass("active")) $(ele).children("a").click();
+        if($(ele).is("li")){
+            var tree = $(ele).closest("ul");
+            if(!tree.hasClass("menu-open")) tree.prev("a").click();
+        }
     }).start();
 }
 
@@ -26,7 +37,7 @@ var page_actions = function(){
     // button actions
     $('#admin_content table').addClass('table').wrap('<div class="table-responsive"></div>');
     $('#admin_content a[role="back"]').on('click',function(){ window.history.back(); return false; });
-    $('[data-toggle="tooltip"], a[title!=""]', "#admin_content").not(".skip_tooltip").tooltip();
+    $('a[data-toggle="tooltip"], button[data-toggle="tooltip"], a[title!=""]', "#admin_content").not(".skip_tooltip").tooltip();
 
     /* PANELS */
     $("#admin_content").on("click", ".panel .panel-collapse", function(){

data/app/assets/javascripts/admin/admin-manifest.js

@@ -30,15 +30,12 @@
 
 //= require ./libraries
 //= require ./actions
+//= require ./introjs/intro.min
 
 
 //= require ./modal
-//= require ./grid-editor
 
 //= require ./tageditor/jquery.caret.min
 //= require ./tageditor/jquery.tag-editor
 
 //= require ./lte/app
-
-//= require ./introjs/intro.min
-

data/app/assets/javascripts/admin/custom_fields.js

@@ -89,12 +89,12 @@ function custom_field_editor($field){
             var inputs = textarea.data("translation_inputs");
             if(inputs){ // multiples languages
                 for(var lang in inputs){
-                    tinymce.init($.extend({} ,DATA.tiny_mce.advanced, {selector: '#' + inputs[lang].attr("id"), language: CURRENT_LOCALE, height: 120}));
+                    tinymce.init(cama_get_tinymce_settings({selector: '#' + inputs[lang].attr("id"), height: 120}));
                 }
                 return;
             }
         }
-        tinymce.init($.extend({} ,DATA.tiny_mce.advanced, {selector: '#' + id, height: 120}));
+        tinymce.init(cama_get_tinymce_settings({selector: '#' + id, height: 120}));
     }
 }
 function custom_field_field_attrs_val($field, value){

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

@@ -1,108 +1,74 @@
-var DATA = {
-    tiny_mce: {
-        advanced:{
-            selector: ".tinymce_textarea",
-            plugins: [
-                "advlist autolink lists link image charmap print preview hr anchor pagebreak",
-                "searchreplace wordcount visualblocks visualchars code fullscreen",
-                "insertdatetime media nonbreaking save table contextmenu directionality",
-                "emoticons template paste textcolor colorpicker textpattern filemanager"
-            ],
-            menubar: "edit insert view format table tools",
-            image_advtab: true,
-            statusbar: true,
-            paste: true,
-            toolbar_items_size: 'small',
-            content_css: tinymce_assets["custom_css"],
-            convert_urls: false,
-            //forced_root_block: '',
-            extended_valid_elements: 'i[*],div[*],p[*],li[*],a[*],ol[*],ul[*],span[*]',
-            toolbar: "bold italic | alignleft aligncenter alignright alignjustify | fontselect fontsizeselect | bullist numlist | outdent indent | undo redo | link unlink image media | forecolor backcolor | styleselect template",
-            language: CURRENT_LOCALE,
-            relative_urls: false,
-            remove_script_host: false,
-            browser_spellcheck : true,
-            language_url: tinymce_assets["language_url"],
-            file_browser_callback: function(field_name, url, type, win) {
-                $.fn.upload_elfinder({
-                    selected: function(res){
-                        var file = _.first(res)
-                        if(type == 'media') type = 'video';
-                        if(file.mime && (file.mime.indexOf(type) > -1 || type == "file")){
-                            $('#'+field_name).val(file.url.to_url());
-                        }else{
-                            alert("You must upload a valid format: "+type)
-                        }
+// generate default settings for tinymce editor
+function cama_get_tinymce_settings(settings){
+    if(!settings) settings = {};
+    var def = {
+        selector: ".tinymce_textarea",
+        plugins: [
+            "advlist autolink lists link image charmap print preview hr anchor pagebreak",
+            "searchreplace wordcount visualblocks visualchars code fullscreen",
+            "insertdatetime media nonbreaking save table contextmenu directionality",
+            "emoticons template paste textcolor colorpicker textpattern filemanager"
+        ],
+        menubar: "edit insert view format table tools",
+        image_advtab: true,
+        statusbar: true,
+        paste: true,
+        toolbar_items_size: 'small',
+        content_css: tinymce_global_settings["custom_css"].join(","),
+        convert_urls: false,
+        //forced_root_block: '',
+        extended_valid_elements: 'i[*],div[*],p[*],li[*],a[*],ol[*],ul[*],span[*]',
+        toolbar: "bold italic | alignleft aligncenter alignright alignjustify | fontselect fontsizeselect | bullist numlist | outdent indent | undo redo | link unlink image media | forecolor backcolor | styleselect template "+tinymce_global_settings["custom_toolbar"].join(","),
+        language: CURRENT_LOCALE,
+        relative_urls: false,
+        remove_script_host: false,
+        browser_spellcheck : true,
+        language_url: tinymce_global_settings["language_url"],
+        file_browser_callback: function(field_name, url, type, win) {
+            $.fn.upload_elfinder({
+                selected: function(res){
+                    var file = _.first(res)
+                    if(type == 'media') type = 'video';
+                    if(file.mime && (file.mime.indexOf(type) > -1 || type == "file")){
+                        $('#'+field_name).val(file.url.to_url());
+                    }else{
+                        alert("You must upload a valid format: "+type)
                     }
-                });
-            },
-            setup: function (editor) {
-                editor.on('blur', function () {
-                    tinymce.triggerSave();
-                    $('textarea#'+editor.id).trigger('change');
-                });
+                }
+            });
+        },
+        setup: function (editor) {
+            editor.on('blur', function () {
+                tinymce.triggerSave();
+                $('textarea#'+editor.id).trigger('change');
+            });
 
-                editor.addMenuItem('append_line', {
-                    text: 'New line at the end',
-                    context: 'insert',
-                    onclick: function () { editor.dom.add(editor.getBody(), 'p', {}, '-New line-');  }
-                });
-                editor.addMenuItem('add_line', {
-                    text: 'New line',
-                    context: 'insert',
-                    onclick: function () { editor.insertContent('<p>-New line-</p>');  }
-                });
+            editor.addMenuItem('append_line', {
+                text: 'New line at the end',
+                context: 'insert',
+                onclick: function () { editor.dom.add(editor.getBody(), 'p', {}, '-New line-');  }
+            });
+            editor.addMenuItem('add_line', {
+                text: 'New line',
+                context: 'insert',
+                onclick: function () { editor.insertContent('<p>-New line-</p>');  }
+            });
 
-                // eval all extra setups
-                for(var ff in editor.settings.extra_setups) editor.settings.extra_setups[ff](editor);
-                editor.on('postRender', function(e) {
-                    editor.settings.onPostRender(editor);
-                });
-
-                editor.on('init', function(e) {
-                    // auto switch on grid editor detected
-                    if($.fn.isGridEditorContent($(editor.targetElm).val()))
-                        $(editor.targetElm).gridEditor(editor);
-                });
-
-                // grid editor button
-                editor.addButton('grid_editor', {
-                    text: 'Grid Editor',
-                    icon: false,
-                    onclick: function(){
-                        if(!confirm("Are you sure to change the editor?")) return false;
-                        var area = $(editor.targetElm).gridEditor(editor);
-                    }
-                });
+            // eval all extra setups
+            for(var ff in tinymce_global_settings["setups"]) tinymce_global_settings["setups"][ff](editor);
 
-            },
-            onPostRender: function(editor){}, //custom callback for post render
-            extra_toolbar: [], //custom callback for
-            extra_setups: [] //custom callback for
-
-        }
-    },
-    tiny_mce3: {
-        advanced:{
-            // General options
-            mode : "textareas",
-            editor_selector : "tinymce_advanced",
-            theme : "advanced",
-            plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
-
-            // Theme options
-            theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
-            theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
-            theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
-            theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
-            theme_advanced_toolbar_location : "top",
-            theme_advanced_toolbar_align : "left",
-            theme_advanced_statusbar_location : "bottom",
-            theme_advanced_resizing : true,
+            editor.on('postRender', function(e) {
+                editor.settings.onPostRender(editor);
+                // eval all extra setups
+                for(var ff in tinymce_global_settings["post_render"]) tinymce_global_settings["post_render"][ff](editor);
+            });
 
-            // Skin options
-            skin : "bootstrap",
-            language: CURRENT_LOCALE
-        }
-    }
+            editor.on('init', function(e) {
+                for(var ff in tinymce_global_settings["init"]) tinymce_global_settings["init"][ff](editor);
+            });
+        },
+        onPostRender: function(editor){}
+    };
+    return $.extend({}, def, settings);
 }
+

data/app/assets/javascripts/admin/libraries.js

@@ -127,6 +127,49 @@ var init_form_validations = function(form){
 // jquery custom validations and default values
 (function($){
 
+    // file formats
+    $.file_formats = {
+        jpg: "image",
+        gif: "image",
+        png: "image",
+        bmp: "image",
+        jpeg: "image",
+
+        mp3: "audio",
+        ogg: "audio",
+        mid: "audio",
+        mod: "audio",
+        wav: "audio",
+
+        mp4: "video",
+        wmv: "video",
+        avi: "video",
+        swf: "video",
+        mov: "video",
+        mpeg: "video",
+        mjpg: "video"
+    }
+
+    // verify the url for youtube, vimeo...
+    // return youtube | metcafe|dailymotion|vimeo
+    $.cama_check_video_url = function(url){
+        var regYoutube = new RegExp(/^.*((youtu.be\/)|(v\/)|(\/u\/w\/)|(embed\/)|(watch?))??v?=?([^#&?]*).*/);
+        var regVimeo = new RegExp(/^.*(vimeo.com\/)((channels\/[A-z]+\/)|(groups\/[A-z]+\/videos\/))?([0-9]+)/);
+        var regDailymotion = new RegExp(/^.+dailymotion.com\/(video|hub)\/([^_]+)[^#]*(#video=([^_&]+))?/);
+        var regMetacafe = new RegExp(/^.*(metacafe.com)(\/watch\/)(d+)(.*)/i);
+        if(regYoutube.test(url)) {
+            return 'youtube';
+        }else if (regMetacafe.test(url)) {
+            return 'metacafe';
+        }else if(regDailymotion.test(url)){
+            return 'dailymotion';
+        }else if(regVimeo.test(url)) {
+            return 'vimeo';
+        }else{
+            return false;
+        }
+    }
+
     // helper validate only letters latin
     var regex = /^[a-z\sÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏàáâãäåæçèéêëìíîïÐÑÒÓÔÕÖØÙÚÛÜÝÞßðñòóôõöøùúûüýþÿ]+$/i;
     jQuery.validator.addMethod("lettersonly", function(value, element) {
@@ -158,48 +201,10 @@ var init_form_validations = function(form){
     // validate file extension defined in data-formats
     // data-formats: (default '') image | audio | video (support also external youtube metacafe, dailymotion, vimeo) | or file extension like: jpg|png
     $.validator.addMethod("file_format", function(value, element) {
-        function check_url(url) {
-            var regYoutube = new RegExp(/^.*((youtu.be\/)|(v\/)|(\/u\/w\/)|(embed\/)|(watch?))??v?=?([^#&?]*).*/);
-            var regVimeo = new RegExp(/^.*(vimeo.com\/)((channels\/[A-z]+\/)|(groups\/[A-z]+\/videos\/))?([0-9]+)/);
-            var regDailymotion = new RegExp(/^.+dailymotion.com\/(video|hub)\/([^_]+)[^#]*(#video=([^_&]+))?/);
-            var regMetacafe = new RegExp(/^.*(metacafe.com)(\/watch\/)(d+)(.*)/i);
-            if(regYoutube.test(url)) {
-                return 'youtube';
-            }else if (regMetacafe.test(url)) {
-                return 'metacafe';
-            }else if(regDailymotion.test(url)){
-                return 'dailymotion';
-            }else if(regVimeo.test(url)) {
-                return 'vimeo';
-            }else{
-                return false;
-            }
-        }
-        var _formats = {
-            jpg: "image",
-            gif: "image",
-            png: "image",
-            bmp: "image",
-            jpeg: "image",
-
-            mp3: "audio",
-            ogg: "audio",
-            mid: "audio",
-            mod: "audio",
-            wav: "audio",
-
-            mp4: "video",
-            wmv: "video",
-            avi: "video",
-            swf: "video",
-            mov: "video",
-            mpeg: "video",
-            mjpg: "video"
-        }
         var formats = $(element).attr("data-formats");
         var ext = value.split(".").pop().toLowerCase();
         if(formats)
-            return ($.inArray("video", formats.split(",")) >= 0 && check_url(value)) || $.inArray(_formats[ext], formats.split(",")) >= 0 || $.inArray(ext, formats.split(",")) >= 0
+            return ($.inArray("video", formats.split(",")) >= 0 && $.cama_check_video_url(value)) || $.inArray($.file_formats[ext], formats.split(",")) >= 0 || $.inArray(ext, formats.split(",")) >= 0
 
         return true;
     }, "File format not accepted.");
@@ -208,54 +213,6 @@ var init_form_validations = function(form){
     });
 })(jQuery);
 
-// Sortable
-(function($){
-    $.fn.table_order = function (options){
-        var default_options = {url: "", table: ".table", on_success: false, on_change: false};
-        options = $.extend(default_options, options || {});
-        var th_data = false;
-        var $table = this ? $(this) : $(options.table);
-        $table.addClass('table_order')
-        var th_new = '<th class="center" data-sortable="0"></th>';
-        $table.find('thead tr').prepend(th_new);
-        $table.find('tbody tr').each(function(i, el) {
-            var id = $(this).attr('data-id');
-            var td_new = '<td>'
-                +'<div class="moved" style="cursor: all-scroll">'
-                +'<i class="fa fa-arrows"></i>'
-                +'<input type="hidden" name="values[]" value="'+id+'" />'
-                +'</div>'
-            '</td>';
-            $(this).prepend(td_new);
-        });
-
-        $table.find('tbody').sortable({
-            axis: "y",
-            placeholder: "ui-state-highlight",
-            handle: ".moved",
-            //items: "tr:not(.sortable)",
-            items: "tr",
-            start: function(event, ui) {
-                ui.item.startPos = ui.item.index();
-            },
-            stop: function( event, ui ) {
-                $.post(options.url, $table.find("input" ).serialize(), function(res){
-                    if(ui.item.startPos != ui.item.index()){
-                        if(options.on_success) options.on_success({res: res, item: ui.item})
-                    }
-                }).fail(function() {
-                    if(options.on_success) options.on_success({res: {error: 'Error Server'}, item: ui.item})
-                });
-            },
-            change: function(event, ui) {
-                if(options.on_change) options.on_change()
-            }
-        });
-        $table.find('tbody').disableSelection();
-    };
-
-})(jQuery);
-
 // convert string into hashcode
 String.prototype.hashCode = function() {
     var message = this;
@@ -279,5 +236,7 @@ String.prototype.hashCode = function() {
     return ret;
 };
 
+// convert string path into full url
+String.prototype.to_url = function () { return root_url.slice(0, root_url.length - 1) + this; };
 // jquery browser supoer
 !function(a){"function"==typeof define&&define.amd?define(["jquery"],function(b){a(b)}):"object"==typeof module&&"object"==typeof module.exports?module.exports=a(require("jquery")):a(window.jQuery)}(function(a){"use strict";function b(a){void 0===a&&(a=window.navigator.userAgent),a=a.toLowerCase();var b=/(edge)\/([\w.]+)/.exec(a)||/(opr)[\/]([\w.]+)/.exec(a)||/(chrome)[ \/]([\w.]+)/.exec(a)||/(version)(applewebkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+).*(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[],c=/(ipad)/.exec(a)||/(ipod)/.exec(a)||/(iphone)/.exec(a)||/(kindle)/.exec(a)||/(silk)/.exec(a)||/(android)/.exec(a)||/(windows phone)/.exec(a)||/(win)/.exec(a)||/(mac)/.exec(a)||/(linux)/.exec(a)||/(cros)/.exec(a)||/(playbook)/.exec(a)||/(bb)/.exec(a)||/(blackberry)/.exec(a)||[],d={},e={browser:b[5]||b[3]||b[1]||"",version:b[2]||b[4]||"0",versionNumber:b[4]||b[2]||"0",platform:c[0]||""};if(e.browser&&(d[e.browser]=!0,d.version=e.version,d.versionNumber=parseInt(e.versionNumber,10)),e.platform&&(d[e.platform]=!0),(d.android||d.bb||d.blackberry||d.ipad||d.iphone||d.ipod||d.kindle||d.playbook||d.silk||d["windows phone"])&&(d.mobile=!0),(d.cros||d.mac||d.linux||d.win)&&(d.desktop=!0),(d.chrome||d.opr||d.safari)&&(d.webkit=!0),d.rv||d.edge){var f="msie";e.browser=f,d[f]=!0}if(d.safari&&d.blackberry){var g="blackberry";e.browser=g,d[g]=!0}if(d.safari&&d.playbook){var h="playbook";e.browser=h,d[h]=!0}if(d.bb){var i="blackberry";e.browser=i,d[i]=!0}if(d.opr){var j="opera";e.browser=j,d[j]=!0}if(d.safari&&d.android){var k="android";e.browser=k,d[k]=!0}if(d.safari&&d.kindle){var l="kindle";e.browser=l,d[l]=!0}if(d.safari&&d.silk){var m="silk";e.browser=m,d[m]=!0}return d.name=e.browser,d.platform=e.platform,d}return window.jQBrowser=b(window.navigator.userAgent),window.jQBrowser.uaMatch=b,a&&(a.browser=window.jQBrowser),window.jQBrowser});

data/app/assets/javascripts/admin/modal.js

@@ -83,7 +83,7 @@ jQuery(function(){
  * return modal object
  */
 function open_modal(settings){
-    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, modal_size: "", type: '', modal_settings:{}, callback: function(){}}
+    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, modal_size: "", type: '', modal_settings:{}, on_submit: null, callback: function(){}}
     settings = $.extend({}, def, settings);
     var modal = $('<div id="ow_inline_modal" class="modal fade modal-'+settings.type+'">'+
         '<div class="modal-dialog '+settings.modal_size+'">'+
@@ -93,16 +93,28 @@ function open_modal(settings){
         '<h4 class="modal-title">'+settings.title+'</h4>'+
         '</div>'+
         '<div class="modal-body"></div>'+
-        (settings.show_footer?'<div class="modal-footer"><button type="button" class="btn btn-default" data-dismiss="modal">'+I18n("button.close")+'</button></div>':'')+
+        ((settings.show_footer || settings.on_submit)?'<div class="modal-footer"> '+(settings.on_submit ? '<button type="button" class="btn btn-primary modal_submit" ><i class="fa fa-save"></i> '+I18n("button.save")+'</button>' : '')+' <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-arrow-circle-down"></i> '+I18n("button.close")+'</button></div>':'')+
         '</div>'+
         '</div>'+
         '</div>');
 
-    modal.on("hidden.bs.modal", function(e){ if(!$(e["currentTarget"]).attr("data-skip_destroy")) $(e["currentTarget"]).remove(); });
+    // on modal hide
+    modal.on("hidden.bs.modal", function(e){
+        if(!$(e["currentTarget"]).attr("data-skip_destroy")) $(e["currentTarget"]).remove();
+    });
+
+    // submit button
+    if(settings.on_submit) modal.find(".modal-footer .modal_submit").click(function(){
+        settings.on_submit(modal);
+    });
+
+    // on modal show
     modal.on("show.bs.modal", function(e){
         if(!modal.find(".modal-title").text()) modal.find(".modal-header .close").css("margin-top", "-9px");
         settings.callback(modal);
     });
+
+    // show modal
     if(settings.mode == "inline"){
         modal.find(".modal-body").html(settings.content);
         modal.modal(settings.modal_settings);