diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 49be48dc0..60812b272 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -217,6 +217,9 @@
.tooltip.in{opacity:1;filter:alpha(opacity=100)}
.oc-logo-white{background-image:url(../images/october-logo-white.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain}
.oc-bg-logo{background-image:url(../images/october-logo-transparent.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:50% auto}
+.sweet-alert{text-align:left}
+.sweet-alert h4{margin:10px 0 20px 0;color:#2b3e50;font-size:18px}
+.sweet-alert p.text-muted{margin-bottom:20px;color:#555555}
.control-balloon-selector ul{padding:0;margin-top:-5px}
.control-balloon-selector ul li{list-style:none;display:inline-block;padding:6px 7px 5px;margin-right:5px;margin-top:6px;text-transform:uppercase;background:#bcc3c7;color:#ffffff;font-size:10px;line-height:100%;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-balloon-selector ul li.active{background:#da5700 !important}
@@ -448,9 +451,6 @@ table.name-value-list th,table.name-value-list td{padding:4px 0 4px 0;vertical-a
table.name-value-list tr:first-child th,table.name-value-list tr:first-child td{padding-top:0}
table.name-value-list th{font-weight:600;color:#95a5a6;padding-right:15px;text-transform:uppercase}
table.name-value-list td{color:#2b3e50;word-wrap:break-word}
-.sweet-alert{text-align:left}
-.sweet-alert h4{margin:10px 0 20px 0;color:#2b3e50;font-size:18px}
-.sweet-alert p.text-muted{margin-bottom:20px;color:#555555}
.scrollpad-scrollbar-size-tester{width:50px;height:50px;overflow-y:scroll;position:absolute;top:-200px;left:-200px}
.scrollpad-scrollbar-size-tester div{height:100px}
.scrollpad-scrollbar-size-tester::-webkit-scrollbar{width:0;height:0}
diff --git a/modules/backend/assets/js/backend.js b/modules/backend/assets/js/backend.js
index ee2c6ffaa..9a368ccc6 100644
--- a/modules/backend/assets/js/backend.js
+++ b/modules/backend/assets/js/backend.js
@@ -3,7 +3,7 @@
*/
/*
- * Implement "Sweet Alert"
+ * Implement "Sweet Alert" with AJAX framework
*/
$(window).on('ajaxErrorMessage', function(event, message){
@@ -43,14 +43,19 @@ $(window).on('ajaxConfirmMessage', function(event, message){
* Path helpers
*/
-function backendUrl(url) {
- if (typeof backendBasePath === 'undefined' || !backendBasePath)
- return url;
+if ($.oc === undefined)
+ $.oc = {}
- if (url.substr(0,1) == '/')
- url = url.substr(1);
+$.oc.backendUrl = function(url) {
+ var backendBasePath = $('meta[name="backend-base-path"]').attr('content')
- return backendBasePath + url;
+ if (!backendBasePath)
+ return url
+
+ if (url.substr(0, 1) == '/')
+ url = url.substr(1)
+
+ return backendBasePath + '/' + url
}
/*
@@ -181,13 +186,13 @@ AssetManager = function() {
assetManager = new AssetManager();
/*
- * Inverse Click Event
+ * Inverse Click Event (not used)
*
* Calls the handler function if the user has clicked outside the object
* and not on any of the elements in the exception list.
*/
-
- $.fn.extend({
+/*
+$.fn.extend({
clickOutside: function(handler, exceptions) {
var $this = this;
@@ -204,11 +209,11 @@ assetManager = new AssetManager();
return this;
}
})
-
+*/
/*
- * String escape
+ * String escape (not used)
*/
-
+/*
if ($.oc === undefined)
$.oc = {}
@@ -226,4 +231,5 @@ $.oc.escapeHtmlString = function(string) {
return ('' + string).replace(htmlEscaper, function(match) {
return htmlEscapes[match];
})
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 652d6e625..a699dd805 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -4368,57 +4368,7 @@ return'
'+state.text
return state.text}
$('select.custom-select:not([data-no-auto-update-on-render=true])').select2({formatResult:formatSelectOption,formatSelection:formatSelectOption,escapeMarkup:function(m){return m;}})})
$(document).on('disable','select.custom-select',function(event,status){$(this).select2('enable',!status)})
-$(document).on('focus','select.custom-select',function(event){setTimeout($.proxy(function(){$(this).select2('focus')},this),10)})})(jQuery);$(window).on('ajaxErrorMessage',function(event,message){if(!message)return
-swal({title:message,confirmButtonClass:'btn-default'})
-event.preventDefault()})
-$(window).on('ajaxConfirmMessage',function(event,message){if(!message)return
-swal({title:message,showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()})
-event.preventDefault()
-return true})
-function backendUrl(url){if(typeof backendBasePath==='undefined'||!backendBasePath)
-return url;if(url.substr(0,1)=='/')
-url=url.substr(1);return backendBasePath+url;}
-AssetManager=function(){var o={load:function(collection,callback){var jsList=(collection.js)?collection.js:[],cssList=(collection.css)?collection.css:[],imgList=(collection.img)?collection.img:[]
-jsList=$.grep(jsList,function(item){return $('head script[src="'+item+'"]').length==0})
-cssList=$.grep(cssList,function(item){return $('head link[href="'+item+'"]').length==0})
-var cssCounter=0,jsLoaded=false,imgLoaded=false
-if(jsList.length===0&&cssList.length===0&&imgList.length===0){callback&&callback()
-return}
-o.loadJavaScript(jsList,function(){jsLoaded=true
-checkLoaded()})
-$.each(cssList,function(index,source){o.loadStyleSheet(source,function(){cssCounter++
-checkLoaded()})})
-o.loadImage(imgList,function(){imgLoaded=true
-checkLoaded()})
-function checkLoaded(){if(!imgLoaded)
-return false
-if(!jsLoaded)
-return false
-if(cssCounter-1){return;}else if($.contains($this[0],event.target)){return;}else{handler(event,$this);}});return this;}})
-if($.oc===undefined)
-$.oc={}
-$.oc.escapeHtmlString=function(string){var htmlEscapes={'&':'&','<':'<','>':'>','"':'"',"'":''','/':'/'},htmlEscaper=/[&<>"'\/]/g
-return(''+string).replace(htmlEscaper,function(match){return htmlEscapes[match];})}
-+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype
+$(document).on('focus','select.custom-select',function(event){setTimeout($.proxy(function(){$(this).select2('focus')},this),10)})})(jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype
var Scrollpad=function(element,options){this.$el=$(element)
this.scrollbarElement=null
this.dragHandleElement=null
@@ -5111,4 +5061,54 @@ data[option].apply(data,methodArgs)}})}
$.fn.sidenavTree.Constructor=SidenavTree
$.fn.sidenavTree.noConflict=function(){$.fn.sidenavTree=old
return this}
-$(document).ready(function(){$('[data-control=sidenav-tree]').sidenavTree()})}(window.jQuery);
\ No newline at end of file
+$(document).ready(function(){$('[data-control=sidenav-tree]').sidenavTree()})}(window.jQuery);$(window).on('ajaxErrorMessage',function(event,message){if(!message)return
+swal({title:message,confirmButtonClass:'btn-default'})
+event.preventDefault()})
+$(window).on('ajaxConfirmMessage',function(event,message){if(!message)return
+swal({title:message,showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()})
+event.preventDefault()
+return true})
+if($.oc===undefined)
+$.oc={}
+$.oc.backendUrl=function(url){var backendBasePath=$('meta[name="backend-base-path"]').attr('content')
+if(!backendBasePath)
+return url
+if(url.substr(0,1)=='/')
+url=url.substr(1)
+return backendBasePath+'/'+url}
+AssetManager=function(){var o={load:function(collection,callback){var jsList=(collection.js)?collection.js:[],cssList=(collection.css)?collection.css:[],imgList=(collection.img)?collection.img:[]
+jsList=$.grep(jsList,function(item){return $('head script[src="'+item+'"]').length==0})
+cssList=$.grep(cssList,function(item){return $('head link[href="'+item+'"]').length==0})
+var cssCounter=0,jsLoaded=false,imgLoaded=false
+if(jsList.length===0&&cssList.length===0&&imgList.length===0){callback&&callback()
+return}
+o.loadJavaScript(jsList,function(){jsLoaded=true
+checkLoaded()})
+$.each(cssList,function(index,source){o.loadStyleSheet(source,function(){cssCounter++
+checkLoaded()})})
+o.loadImage(imgList,function(){imgLoaded=true
+checkLoaded()})
+function checkLoaded(){if(!imgLoaded)
+return false
+if(!jsLoaded)
+return false
+if(cssCounter
+
- = e(trans($this->pageTitle)) ?> | = e(Backend\Models\BrandSettings::get('app_name')) ?>
+ = e(trans($this->pageTitle)) ?> | = e(Backend\Models\BrandSettings::get('app_name')) ?>
-
+