TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up some LESS and JS

This commit is contained in:
Samuel Georges 2015-06-20 21:13:03 +10:00
parent b65019dac4
commit 9cce76c574
8 changed files with 98 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/backend/assets/css/october.css
View File

@ -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}

34
modules/backend/assets/js/backend.js
View File

@ -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];
})
}
}
*/

104
modules/backend/assets/js/october-min.js vendored
View File

@ -4368,57 +4368,7 @@ return'<img class="select-image" src="'+imageSrc+'" alt="" /> '+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<cssList.length)
return false
callback&&callback()}},loadStyleSheet:function(source,callback){var cssElement=document.createElement('link')
cssElement.setAttribute('rel','stylesheet')
cssElement.setAttribute('type','text/css')
cssElement.setAttribute('href',source)
cssElement.addEventListener('load',callback,false)
if(typeof cssElement!='undefined'){document.getElementsByTagName('head')[0].appendChild(cssElement)}
return cssElement},loadJavaScript:function(sources,callback){if(sources.length<=0)
return callback()
var source=sources.shift(),jsElement=document.createElement('script');jsElement.setAttribute('type','text/javascript')
jsElement.setAttribute('src',source)
jsElement.addEventListener('load',function(){o.loadJavaScript(sources,callback)},false)
if(typeof jsElement!='undefined'){document.getElementsByTagName('head')[0].appendChild(jsElement)}},loadImage:function(sources,callback){if(sources.length<=0)
return callback()
var loaded=0
$.each(sources,function(index,source){var img=new Image()
img.onload=function(){if(++loaded==sources.length&&callback)
callback()}
img.src=source})}};return o;};assetManager=new AssetManager();$.fn.extend({clickOutside:function(handler,exceptions){var $this=this;$('body').on('click',function(event){if(exceptions&&$.inArray(event.target,exceptions)>-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={'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#x27;','/':'&#x2F;'},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);
$(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<cssList.length)
return false
callback&&callback()}},loadStyleSheet:function(source,callback){var cssElement=document.createElement('link')
cssElement.setAttribute('rel','stylesheet')
cssElement.setAttribute('type','text/css')
cssElement.setAttribute('href',source)
cssElement.addEventListener('load',callback,false)
if(typeof cssElement!='undefined'){document.getElementsByTagName('head')[0].appendChild(cssElement)}
return cssElement},loadJavaScript:function(sources,callback){if(sources.length<=0)
return callback()
var source=sources.shift(),jsElement=document.createElement('script');jsElement.setAttribute('type','text/javascript')
jsElement.setAttribute('src',source)
jsElement.addEventListener('load',function(){o.loadJavaScript(sources,callback)},false)
if(typeof jsElement!='undefined'){document.getElementsByTagName('head')[0].appendChild(jsElement)}},loadImage:function(sources,callback){if(sources.length<=0)
return callback()
var loaded=0
$.each(sources,function(index,source){var img=new Image()
img.onload=function(){if(++loaded==sources.length&&callback)
callback()}
img.src=source})}};return o;};assetManager=new AssetManager();

2
modules/backend/assets/js/october.js
View File

@ -20,7 +20,6 @@
=require ../../../system/assets/ui/storm.js
=require october.controls.js
=require october.utils.js
=require october.scrollpad.js
=require october.verticalmenu.js
=require october.navbar.js
@ -36,5 +35,4 @@
=require october.sidenav-tree.js
=require backend.js
*/

14
modules/backend/assets/less/controls/alert.less
View File

@ -1,14 +0,0 @@
.sweet-alert {
text-align: left;
h4 {
margin: 10px 0 20px 0;
color: #2b3e50;
font-size: 18px;
}
p.text-muted {
margin-bottom: 20px;
color: #555555;
}
}

20
modules/backend/assets/less/controls/common.less
View File

@ -43,3 +43,23 @@
background-repeat: no-repeat;
background-size: 50% auto;
}
//
// Alerts
//
.sweet-alert {
text-align: left;
h4 {
margin: 10px 0 20px 0;
color: #2b3e50;
font-size: 18px;
}
p.text-muted {
margin-bottom: 20px;
color: #555555;
}
}

1
modules/backend/assets/less/october.less
View File

@ -33,7 +33,6 @@
@import "controls/selector-group.less";
@import "controls/tree-path.less";
@import "controls/namevaluelist.less";
@import "controls/alert.less";
@import "controls/scrollpad.less";
//

9
modules/backend/layouts/_head.htm
View File

@ -1,15 +1,12 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0, minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
<link rel="icon" type="image/png" href="<?= Backend::skinAsset('assets/images/favicon.png') ?>">
<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
<?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
<?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
</title>
<script>
<!--
backendBasePath = '<?= Backend::baseUrl() ?>';
// -->
</script>
<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= System\Models\Parameters::get('system::core.build', 1) ?>" rel="stylesheet">
<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>"></script>