mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 15:35:12 +00:00
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/strings.php
This commit is contained in:
redmatrix
commit
8c7472c6c3
6 changed files with 191 additions and 162 deletions
|
|
@ -528,7 +528,7 @@ function photos_content(&$a) {
|
|||
$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
|
||||
}
|
||||
|
||||
$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
|
||||
$aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : '');
|
||||
|
||||
$selname = (($datum) ? hex2bin($datum) : '');
|
||||
|
||||
|
|
@ -546,7 +546,7 @@ function photos_content(&$a) {
|
|||
'$albums' => $albums['albums'],
|
||||
'$selname' => $selname,
|
||||
'$permissions' => t('Permissions'),
|
||||
'$aclselect' => $aclselect_e,
|
||||
'$aclselect' => $aclselect,
|
||||
'$lockstate' => $lockstate,
|
||||
'$uploader' => $ret['addon_text'],
|
||||
'$default' => (($ret['default_upload']) ? true : false),
|
||||
|
|
@ -892,7 +892,7 @@ function photos_content(&$a) {
|
|||
if($can_post) {
|
||||
$album_e = $ph[0]['album'];
|
||||
$caption_e = $ph[0]['description'];
|
||||
$aclselect_e = populate_acl($ph[0]);
|
||||
$aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : '');
|
||||
$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
|
||||
|
||||
$_SESSION['album_return'] = bin2hex($ph[0]['album']);
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
2015-06-13.1062
|
||||
2015-06-14.1063
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
/**
|
||||
* Copyright (c) 2011-2013 Felix Gnass
|
||||
* Copyright (c) 2011-2014 Felix Gnass
|
||||
* Licensed under the MIT license
|
||||
* http://spin.js.org/
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -8,42 +9,40 @@
|
|||
Basic Usage:
|
||||
============
|
||||
|
||||
$('#el').spin(); // Creates a default Spinner using the text color of #el.
|
||||
$('#el').spin({ ... }); // Creates a Spinner using the provided options.
|
||||
$('#el').spin() // Creates a default Spinner using the text color of #el.
|
||||
$('#el').spin({ ... }) // Creates a Spinner using the provided options.
|
||||
|
||||
$('#el').spin(false); // Stops and removes the spinner.
|
||||
$('#el').spin(false) // Stops and removes the spinner.
|
||||
|
||||
Using Presets:
|
||||
==============
|
||||
|
||||
$('#el').spin('small'); // Creates a 'small' Spinner using the text color of #el.
|
||||
$('#el').spin('large', '#fff'); // Creates a 'large' white Spinner.
|
||||
$('#el').spin('small') // Creates a 'small' Spinner using the text color of #el.
|
||||
$('#el').spin('large', '#fff') // Creates a 'large' white Spinner.
|
||||
|
||||
Adding a custom preset:
|
||||
=======================
|
||||
|
||||
$.fn.spin.presets.flower = {
|
||||
lines: 9
|
||||
length: 10
|
||||
width: 20
|
||||
radius: 0
|
||||
lines: 9
|
||||
, length: 10
|
||||
, width: 20
|
||||
, radius: 0
|
||||
}
|
||||
|
||||
$('#el').spin('flower', 'red');
|
||||
$('#el').spin('flower', 'red')
|
||||
|
||||
*/
|
||||
|
||||
(function(factory) {
|
||||
;(function(factory) {
|
||||
|
||||
if (typeof exports == 'object') {
|
||||
// CommonJS
|
||||
factory(require('jquery'), require('spin'))
|
||||
}
|
||||
else if (typeof define == 'function' && define.amd) {
|
||||
factory(require('jquery'), require('spin.js'))
|
||||
} else if (typeof define == 'function' && define.amd) {
|
||||
// AMD, register as anonymous module
|
||||
define(['jquery', 'spin'], factory)
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Browser globals
|
||||
if (!window.Spinner) throw new Error('Spin.js not present')
|
||||
factory(window.jQuery, window.Spinner)
|
||||
|
|
@ -54,17 +53,17 @@ $('#el').spin('flower', 'red');
|
|||
$.fn.spin = function(opts, color) {
|
||||
|
||||
return this.each(function() {
|
||||
var $this = $(this),
|
||||
data = $this.data();
|
||||
var $this = $(this)
|
||||
, data = $this.data()
|
||||
|
||||
if (data.spinner) {
|
||||
data.spinner.stop();
|
||||
delete data.spinner;
|
||||
data.spinner.stop()
|
||||
delete data.spinner
|
||||
}
|
||||
if (opts !== false) {
|
||||
opts = $.extend(
|
||||
{ color: color || $this.css('color') },
|
||||
$.fn.spin.presets[opts] || opts
|
||||
{ color: color || $this.css('color') }
|
||||
, $.fn.spin.presets[opts] || opts
|
||||
)
|
||||
data.spinner = new Spinner(opts).spin(this)
|
||||
}
|
||||
|
|
@ -72,9 +71,9 @@ $('#el').spin('flower', 'red');
|
|||
}
|
||||
|
||||
$.fn.spin.presets = {
|
||||
tiny: { lines: 8, length: 2, width: 2, radius: 3 },
|
||||
small: { lines: 8, length: 4, width: 3, radius: 5 },
|
||||
large: { lines: 10, length: 8, width: 4, radius: 8 }
|
||||
tiny: { lines: 8, length: 2, width: 2, radius: 3, position: 'relative' }
|
||||
, small: { lines: 8, length: 4, width: 3, radius: 5, position: 'relative' }
|
||||
, large: { lines: 10, length: 8, width: 4, radius: 8, position: 'relative' }
|
||||
}
|
||||
|
||||
}));
|
||||
|
|
|
|||
290
view/js/spin.js
290
view/js/spin.js
|
|
@ -1,65 +1,82 @@
|
|||
//fgnass.github.com/spin.js#v1.3
|
||||
|
||||
/**
|
||||
* Copyright (c) 2011-2013 Felix Gnass
|
||||
* Copyright (c) 2011-2014 Felix Gnass
|
||||
* Licensed under the MIT license
|
||||
* http://spin.js.org/
|
||||
*
|
||||
* Example:
|
||||
var opts = {
|
||||
lines: 12, // The number of lines to draw
|
||||
, length: 7, // The length of each line
|
||||
, width: 5, // The line thickness
|
||||
, radius: 10 // The radius of the inner circle
|
||||
, scale: 1.0 // Scales overall size of the spinner
|
||||
, corners: 1 // Roundness (0..1)
|
||||
, color: '#000' // #rgb or #rrggbb
|
||||
, opacity: 1/4 // Opacity of the lines
|
||||
, rotate: 0 // Rotation offset
|
||||
, direction: 1 // 1: clockwise, -1: counterclockwise
|
||||
, speed: 1 // Rounds per second
|
||||
, trail: 100 // Afterglow percentage
|
||||
, fps: 20 // Frames per second when using setTimeout()
|
||||
, zIndex: 2e9 // Use a high z-index by default
|
||||
, className: 'spinner' // CSS class to assign to the element
|
||||
, top: '50%' // center vertically
|
||||
, left: '50%' // center horizontally
|
||||
, shadow: false // Whether to render a shadow
|
||||
, hwaccel: false // Whether to use hardware acceleration (might be buggy)
|
||||
, position: 'absolute' // Element positioning
|
||||
}
|
||||
var target = document.getElementById('foo')
|
||||
var spinner = new Spinner(opts).spin(target)
|
||||
*/
|
||||
(function(root, factory) {
|
||||
;(function (root, factory) {
|
||||
|
||||
/* CommonJS */
|
||||
if (typeof exports == 'object') module.exports = factory()
|
||||
if (typeof exports == 'object') module.exports = factory()
|
||||
|
||||
/* AMD module */
|
||||
else if (typeof define == 'function' && define.amd) define(factory)
|
||||
|
||||
/* Browser global */
|
||||
else root.Spinner = factory()
|
||||
}
|
||||
(this, function() {
|
||||
"use strict";
|
||||
}(this, function () {
|
||||
"use strict"
|
||||
|
||||
var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
|
||||
, animations = {} /* Animation rules keyed by their name */
|
||||
, useCssAnimations /* Whether to use CSS animations or setTimeout */
|
||||
, sheet /* A stylesheet to hold the @keyframe or VML rules. */
|
||||
|
||||
/**
|
||||
* Utility function to create elements. If no tag name is given,
|
||||
* a DIV is created. Optionally properties can be passed.
|
||||
*/
|
||||
function createEl(tag, prop) {
|
||||
function createEl (tag, prop) {
|
||||
var el = document.createElement(tag || 'div')
|
||||
, n
|
||||
|
||||
for(n in prop) el[n] = prop[n]
|
||||
for (n in prop) el[n] = prop[n]
|
||||
return el
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends children and returns the parent.
|
||||
*/
|
||||
function ins(parent /* child1, child2, ...*/) {
|
||||
for (var i=1, n=arguments.length; i<n; i++)
|
||||
function ins (parent /* child1, child2, ...*/) {
|
||||
for (var i = 1, n = arguments.length; i < n; i++) {
|
||||
parent.appendChild(arguments[i])
|
||||
}
|
||||
|
||||
return parent
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a new stylesheet to hold the @keyframe or VML rules.
|
||||
*/
|
||||
var sheet = (function() {
|
||||
var el = createEl('style', {type : 'text/css'})
|
||||
ins(document.getElementsByTagName('head')[0], el)
|
||||
return el.sheet || el.styleSheet
|
||||
}())
|
||||
|
||||
/**
|
||||
* Creates an opacity keyframe animation rule and returns its name.
|
||||
* Since most mobile Webkits have timing issues with animation-delay,
|
||||
* we create separate rules for each line/segment.
|
||||
*/
|
||||
function addAnimation(alpha, trail, i, lines) {
|
||||
var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-')
|
||||
function addAnimation (alpha, trail, i, lines) {
|
||||
var name = ['opacity', trail, ~~(alpha * 100), i, lines].join('-')
|
||||
, start = 0.01 + i/lines * 100
|
||||
, z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
|
||||
, prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
|
||||
|
|
@ -84,25 +101,26 @@
|
|||
/**
|
||||
* Tries various vendor prefixes and returns the first supported property.
|
||||
*/
|
||||
function vendor(el, prop) {
|
||||
function vendor (el, prop) {
|
||||
var s = el.style
|
||||
, pp
|
||||
, i
|
||||
|
||||
if(s[prop] !== undefined) return prop
|
||||
prop = prop.charAt(0).toUpperCase() + prop.slice(1)
|
||||
for(i=0; i<prefixes.length; i++) {
|
||||
if (s[prop] !== undefined) return prop
|
||||
for (i = 0; i < prefixes.length; i++) {
|
||||
pp = prefixes[i]+prop
|
||||
if(s[pp] !== undefined) return pp
|
||||
if (s[pp] !== undefined) return pp
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets multiple style properties at once.
|
||||
*/
|
||||
function css(el, prop) {
|
||||
for (var n in prop)
|
||||
el.style[vendor(el, n)||n] = prop[n]
|
||||
function css (el, prop) {
|
||||
for (var n in prop) {
|
||||
el.style[vendor(el, n) || n] = prop[n]
|
||||
}
|
||||
|
||||
return el
|
||||
}
|
||||
|
|
@ -110,51 +128,50 @@
|
|||
/**
|
||||
* Fills in default values.
|
||||
*/
|
||||
function merge(obj) {
|
||||
for (var i=1; i < arguments.length; i++) {
|
||||
function merge (obj) {
|
||||
for (var i = 1; i < arguments.length; i++) {
|
||||
var def = arguments[i]
|
||||
for (var n in def)
|
||||
for (var n in def) {
|
||||
if (obj[n] === undefined) obj[n] = def[n]
|
||||
}
|
||||
}
|
||||
return obj
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the absolute page-offset of the given element.
|
||||
* Returns the line color from the given string or array.
|
||||
*/
|
||||
function pos(el) {
|
||||
var o = { x:el.offsetLeft, y:el.offsetTop }
|
||||
while((el = el.offsetParent))
|
||||
o.x+=el.offsetLeft, o.y+=el.offsetTop
|
||||
|
||||
return o
|
||||
function getColor (color, idx) {
|
||||
return typeof color == 'string' ? color : color[idx % color.length]
|
||||
}
|
||||
|
||||
// Built-in defaults
|
||||
|
||||
var defaults = {
|
||||
lines: 12, // The number of lines to draw
|
||||
length: 7, // The length of each line
|
||||
width: 5, // The line thickness
|
||||
radius: 10, // The radius of the inner circle
|
||||
rotate: 0, // Rotation offset
|
||||
corners: 1, // Roundness (0..1)
|
||||
color: '#000', // #rgb or #rrggbb
|
||||
direction: 1, // 1: clockwise, -1: counterclockwise
|
||||
speed: 1, // Rounds per second
|
||||
trail: 100, // Afterglow percentage
|
||||
opacity: 1/4, // Opacity of the lines
|
||||
fps: 20, // Frames per second when using setTimeout()
|
||||
zIndex: 2e9, // Use a high z-index by default
|
||||
className: 'spinner', // CSS class to assign to the element
|
||||
top: 'auto', // center vertically
|
||||
left: 'auto', // center horizontally
|
||||
position: 'relative' // element position
|
||||
lines: 12 // The number of lines to draw
|
||||
, length: 7 // The length of each line
|
||||
, width: 5 // The line thickness
|
||||
, radius: 10 // The radius of the inner circle
|
||||
, scale: 1.0 // Scales overall size of the spinner
|
||||
, corners: 1 // Roundness (0..1)
|
||||
, color: '#000' // #rgb or #rrggbb
|
||||
, opacity: 1/4 // Opacity of the lines
|
||||
, rotate: 0 // Rotation offset
|
||||
, direction: 1 // 1: clockwise, -1: counterclockwise
|
||||
, speed: 1 // Rounds per second
|
||||
, trail: 100 // Afterglow percentage
|
||||
, fps: 20 // Frames per second when using setTimeout()
|
||||
, zIndex: 2e9 // Use a high z-index by default
|
||||
, className: 'spinner' // CSS class to assign to the element
|
||||
, top: '50%' // center vertically
|
||||
, left: '50%' // center horizontally
|
||||
, shadow: false // Whether to render a shadow
|
||||
, hwaccel: false // Whether to use hardware acceleration (might be buggy)
|
||||
, position: 'absolute' // Element positioning
|
||||
}
|
||||
|
||||
/** The constructor */
|
||||
function Spinner(o) {
|
||||
if (typeof this == 'undefined') return new Spinner(o)
|
||||
function Spinner (o) {
|
||||
this.opts = merge(o || {}, Spinner.defaults, defaults)
|
||||
}
|
||||
|
||||
|
|
@ -162,30 +179,28 @@
|
|||
Spinner.defaults = {}
|
||||
|
||||
merge(Spinner.prototype, {
|
||||
|
||||
/**
|
||||
* Adds the spinner to the given target element. If this instance is already
|
||||
* spinning, it is automatically removed from its previous target b calling
|
||||
* stop() internally.
|
||||
*/
|
||||
spin: function(target) {
|
||||
spin: function (target) {
|
||||
this.stop()
|
||||
|
||||
var self = this
|
||||
, o = self.opts
|
||||
, el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
|
||||
, mid = o.radius+o.length+o.width
|
||||
, ep // element position
|
||||
, tp // target position
|
||||
, el = self.el = createEl(null, {className: o.className})
|
||||
|
||||
css(el, {
|
||||
position: o.position
|
||||
, width: 0
|
||||
, zIndex: o.zIndex
|
||||
, left: o.left
|
||||
, top: o.top
|
||||
})
|
||||
|
||||
if (target) {
|
||||
target.insertBefore(el, target.firstChild||null)
|
||||
tp = pos(target)
|
||||
ep = pos(el)
|
||||
css(el, {
|
||||
left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px',
|
||||
top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px'
|
||||
})
|
||||
target.insertBefore(el, target.firstChild || null)
|
||||
}
|
||||
|
||||
el.setAttribute('role', 'progressbar')
|
||||
|
|
@ -197,27 +212,27 @@
|
|||
, start = (o.lines - 1) * (1 - o.direction) / 2
|
||||
, alpha
|
||||
, fps = o.fps
|
||||
, f = fps/o.speed
|
||||
, ostep = (1-o.opacity) / (f*o.trail / 100)
|
||||
, astep = f/o.lines
|
||||
, f = fps / o.speed
|
||||
, ostep = (1 - o.opacity) / (f * o.trail / 100)
|
||||
, astep = f / o.lines
|
||||
|
||||
;(function anim() {
|
||||
i++;
|
||||
;(function anim () {
|
||||
i++
|
||||
for (var j = 0; j < o.lines; j++) {
|
||||
alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
|
||||
|
||||
self.opacity(el, j * o.direction + start, alpha, o)
|
||||
}
|
||||
self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
|
||||
self.timeout = self.el && setTimeout(anim, ~~(1000 / fps))
|
||||
})()
|
||||
}
|
||||
return self
|
||||
},
|
||||
}
|
||||
|
||||
/**
|
||||
* Stops and removes the Spinner.
|
||||
*/
|
||||
stop: function() {
|
||||
, stop: function () {
|
||||
var el = this.el
|
||||
if (el) {
|
||||
clearTimeout(this.timeout)
|
||||
|
|
@ -225,124 +240,137 @@
|
|||
this.el = undefined
|
||||
}
|
||||
return this
|
||||
},
|
||||
}
|
||||
|
||||
/**
|
||||
* Internal method that draws the individual lines. Will be overwritten
|
||||
* in VML fallback mode below.
|
||||
*/
|
||||
lines: function(el, o) {
|
||||
, lines: function (el, o) {
|
||||
var i = 0
|
||||
, start = (o.lines - 1) * (1 - o.direction) / 2
|
||||
, seg
|
||||
|
||||
function fill(color, shadow) {
|
||||
function fill (color, shadow) {
|
||||
return css(createEl(), {
|
||||
position: 'absolute',
|
||||
width: (o.length+o.width) + 'px',
|
||||
height: o.width + 'px',
|
||||
background: color,
|
||||
boxShadow: shadow,
|
||||
transformOrigin: 'left',
|
||||
transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
|
||||
borderRadius: (o.corners * o.width>>1) + 'px'
|
||||
position: 'absolute'
|
||||
, width: o.scale * (o.length + o.width) + 'px'
|
||||
, height: o.scale * o.width + 'px'
|
||||
, background: color
|
||||
, boxShadow: shadow
|
||||
, transformOrigin: 'left'
|
||||
, transform: 'rotate(' + ~~(360/o.lines*i + o.rotate) + 'deg) translate(' + o.scale*o.radius + 'px' + ',0)'
|
||||
, borderRadius: (o.corners * o.scale * o.width >> 1) + 'px'
|
||||
})
|
||||
}
|
||||
|
||||
for (; i < o.lines; i++) {
|
||||
seg = css(createEl(), {
|
||||
position: 'absolute',
|
||||
top: 1+~(o.width/2) + 'px',
|
||||
transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
|
||||
opacity: o.opacity,
|
||||
animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
|
||||
position: 'absolute'
|
||||
, top: 1 + ~(o.scale * o.width / 2) + 'px'
|
||||
, transform: o.hwaccel ? 'translate3d(0,0,0)' : ''
|
||||
, opacity: o.opacity
|
||||
, animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1 / o.speed + 's linear infinite'
|
||||
})
|
||||
|
||||
if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
|
||||
|
||||
ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')))
|
||||
if (o.shadow) ins(seg, css(fill('#000', '0 0 4px #000'), {top: '2px'}))
|
||||
ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
|
||||
}
|
||||
return el
|
||||
},
|
||||
}
|
||||
|
||||
/**
|
||||
* Internal method that adjusts the opacity of a single line.
|
||||
* Will be overwritten in VML fallback mode below.
|
||||
*/
|
||||
opacity: function(el, i, val) {
|
||||
, opacity: function (el, i, val) {
|
||||
if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
|
||||
function initVML() {
|
||||
function initVML () {
|
||||
|
||||
/* Utility function to create a VML tag */
|
||||
function vml(tag, attr) {
|
||||
function vml (tag, attr) {
|
||||
return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
|
||||
}
|
||||
|
||||
// No CSS transforms but VML support, add a CSS rule for VML elements:
|
||||
sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
|
||||
|
||||
Spinner.prototype.lines = function(el, o) {
|
||||
var r = o.length+o.width
|
||||
, s = 2*r
|
||||
Spinner.prototype.lines = function (el, o) {
|
||||
var r = o.scale * (o.length + o.width)
|
||||
, s = o.scale * 2 * r
|
||||
|
||||
function grp() {
|
||||
function grp () {
|
||||
return css(
|
||||
vml('group', {
|
||||
coordsize: s + ' ' + s,
|
||||
coordorigin: -r + ' ' + -r
|
||||
}),
|
||||
{ width: s, height: s }
|
||||
coordsize: s + ' ' + s
|
||||
, coordorigin: -r + ' ' + -r
|
||||
})
|
||||
, { width: s, height: s }
|
||||
)
|
||||
}
|
||||
|
||||
var margin = -(o.width+o.length)*2 + 'px'
|
||||
var margin = -(o.width + o.length) * o.scale * 2 + 'px'
|
||||
, g = css(grp(), {position: 'absolute', top: margin, left: margin})
|
||||
, i
|
||||
|
||||
function seg(i, dx, filter) {
|
||||
ins(g,
|
||||
ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
|
||||
ins(css(vml('roundrect', {arcsize: o.corners}), {
|
||||
width: r,
|
||||
height: o.width,
|
||||
left: o.radius,
|
||||
top: -o.width>>1,
|
||||
filter: filter
|
||||
}),
|
||||
vml('fill', {color: o.color, opacity: o.opacity}),
|
||||
vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
|
||||
function seg (i, dx, filter) {
|
||||
ins(
|
||||
g
|
||||
, ins(
|
||||
css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx})
|
||||
, ins(
|
||||
css(
|
||||
vml('roundrect', {arcsize: o.corners})
|
||||
, { width: r
|
||||
, height: o.scale * o.width
|
||||
, left: o.scale * o.radius
|
||||
, top: -o.scale * o.width >> 1
|
||||
, filter: filter
|
||||
}
|
||||
)
|
||||
, vml('fill', {color: getColor(o.color, i), opacity: o.opacity})
|
||||
, vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
|
||||
)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
if (o.shadow)
|
||||
for (i = 1; i <= o.lines; i++)
|
||||
for (i = 1; i <= o.lines; i++) {
|
||||
seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
|
||||
}
|
||||
|
||||
for (i = 1; i <= o.lines; i++) seg(i)
|
||||
return ins(el, g)
|
||||
}
|
||||
|
||||
Spinner.prototype.opacity = function(el, i, val, o) {
|
||||
Spinner.prototype.opacity = function (el, i, val, o) {
|
||||
var c = el.firstChild
|
||||
o = o.shadow && o.lines || 0
|
||||
if (c && i+o < c.childNodes.length) {
|
||||
c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild
|
||||
if (c && i + o < c.childNodes.length) {
|
||||
c = c.childNodes[i + o]; c = c && c.firstChild; c = c && c.firstChild
|
||||
if (c) c.opacity = val
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
|
||||
if (typeof document !== 'undefined') {
|
||||
sheet = (function () {
|
||||
var el = createEl('style', {type : 'text/css'})
|
||||
ins(document.getElementsByTagName('head')[0], el)
|
||||
return el.sheet || el.styleSheet
|
||||
}())
|
||||
|
||||
if (!vendor(probe, 'transform') && probe.adj) initVML()
|
||||
else useCssAnimations = vendor(probe, 'animation')
|
||||
var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
|
||||
|
||||
if (!vendor(probe, 'transform') && probe.adj) initVML()
|
||||
else useCssAnimations = vendor(probe, 'animation')
|
||||
}
|
||||
|
||||
return Spinner
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="form-group field checkbox">
|
||||
<div id="{{$field.0}}_container" class="form-group field checkbox">
|
||||
<label for="id_{{$field.0}}">{{$field.1}}</label>
|
||||
<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
|
||||
<span class="help-block">{{$field.3}}</span>
|
||||
|
|
|
|||
|
|
@ -79,9 +79,11 @@
|
|||
<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
|
||||
</div>
|
||||
<div class="form-group btn-group pull-right">
|
||||
{{if $edit.aclselect}}
|
||||
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
|
||||
<i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Reference in a new issue