select branch to use (restart required)
Saving...');
- $(this).hide();
- });
- },
- success: function(){
- setTimeout('config_success()', 2000)
- }
- });
+ $('#trim_zero, #fuzzy_dating').click(function() {
+ ui_update_trim_zero();
+ });
- $('#api_key').click(function(){ $('#api_key').select() });
- $("#generate_new_apikey").click(function(){
- $.get(sbRoot + '/config/general/generateKey',
- function(data){
- if (data.error != undefined) {
- alert(data.error);
- return;
- }
- $('#api_key').val(data);
- });
- });
+ ui_update_trim_zero();
- $('#branchCheckout').click(function(){
- url = sbRoot + '/home/branchCheckout?branch=' + $('#branchVersion').val();
- window.location.href = url;
- });
+ $('.datePresets').click(function(){
+ var elDatePresets = $('#date_presets'),
+ defaultPreset = elDatePresets.val();
+ if ($(this).prop('checked') && '%x' == defaultPreset) {
+ defaultPreset = '%a, %b %d, %Y';
+ $('#date_use_system_default').html('1')
+ } else if (!$(this).prop('checked') && '1' == $('#date_use_system_default').html())
+ defaultPreset = '%x';
+
+ elDatePresets.attr('name', 'date_preset_old');
+ elDatePresets.attr('id', 'date_presets_old');
+
+ var elDatePresets_na = $('#date_presets_na');
+ elDatePresets_na.attr('name', 'date_preset');
+ elDatePresets_na.attr('id', 'date_presets');
+
+ var elDatePresets_old = $('#date_presets_old');
+ elDatePresets_old.attr('name', 'date_preset_na');
+ elDatePresets_old.attr('id', 'date_presets_na');
+
+ if (defaultPreset)
+ elDatePresets.val(defaultPreset)
+ });
+
+ // bind 'myForm' and provide a simple callback function
+ $('#configForm').ajaxForm({
+ beforeSubmit: function(){
+ $('.config_submitter').each(function(){
+ $(this).attr('disabled', 'disabled');
+ $(this).after(' Saving...');
+ $(this).hide();
+ });
+ },
+ success: function(){
+ setTimeout('config_success()', 2000)
+ }
+ });
+
+ $('#api_key').click(function(){ $('#api_key').select() });
+ $("#generate_new_apikey").click(function(){
+ $.get(sbRoot + '/config/general/generateKey',
+ function(data){
+ if (data.error != undefined) {
+ alert(data.error);
+ return;
+ }
+ $('#api_key').val(data);
+ });
+ });
+
+ $('#branchCheckout').click(function(){
+ window.location.href = sbRoot + '/home/branchCheckout?branch=' + $('#branchVersion').val();
+ });
});
function config_success(){
- $('.config_submitter').each(function(){
- $(this).removeAttr('disabled');
- $(this).next().remove();
- $(this).show();
- });
- $('#email_show').trigger('notify');
+ $('.config_submitter').each(function(){
+ $(this).removeAttr('disabled');
+ $(this).next().remove();
+ $(this).show();
+ });
+ $('#email_show').trigger('notify');
}
diff --git a/gui/slick/js/fuzzyMoment.js b/gui/slick/js/fuzzyMoment.js
index dc81c399..ab319f94 100644
--- a/gui/slick/js/fuzzyMoment.js
+++ b/gui/slick/js/fuzzyMoment.js
@@ -11,152 +11,170 @@
*/
function fuzzyMoment(fmConfig) {
- var containerClass = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.containerClass)) ? '.fuzzydate' : fmConfig.containerClass),
- dateWithTime = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dateHasTime)) ? false : !!fmConfig.dateHasTime),
- dateFormat = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dateFormat)) ? '' : fmConfig.dateFormat),
- timeFormat = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.timeFormat)) ? '' : fmConfig.timeFormat),
- trimZero = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.trimZero)) ? false : !!fmConfig.trimZero),
- dtGlue = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtGlue)) ? '' : fmConfig.dtGlue), - dtInline = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtInline)) ? false : fmConfig.dtInline), + var containerClass = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.containerClass)) ? '.fuzzydate' : fmConfig.containerClass), + dateWithTime = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dateHasTime)) ? false : !!fmConfig.dateHasTime), + dateFormat = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dateFormat)) ? '' : fmConfig.dateFormat), + timeFormat = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.timeFormat)) ? '' : fmConfig.timeFormat), + trimZero = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.trimZero)) ? false : !!fmConfig.trimZero), + dtGlue = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtGlue)) ? '
' : fmConfig.dtGlue), + dtInline = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtInline)) ? false : fmConfig.dtInline), - jd = (function (str) { - var token_map = ['a', 'ddd', 'A', 'dddd', 'b', 'MMM', 'B', 'MMMM', 'd', 'DD', 'm', 'MM', 'y', 'YY', 'Y', 'YYYY', 'x', 'L', - 'H', 'HH', 'I', 'hh', 'M', 'mm', 'S', 'ss', 'p', 'A'], - result = ''; + jd = (function (str) { + var token_map = ['a', 'ddd', 'A', 'dddd', 'b', 'MMM', 'B', 'MMMM', 'd', 'DD', 'm', 'MM', 'y', 'YY', 'Y', 'YYYY', 'x', 'L', + 'H', 'HH', 'I', 'hh', 'M', 'mm', 'S', 'ss', 'p', 'A', 'P', 'a'], + result = ''; - for (var i = 0; i < str.length; i++) - if (/[aAbBdmyYxHIMSp]/.test(str[i])) { - for (var t = 0; t < token_map.length; t = t + 2) - if (str[i] == token_map[t]) { - result += token_map[t + 1]; - break; - } - } else if ('%' != str[i]) - result += str[i]; + for (var i = 0; i < str.length; i++) + if (/[aAbBdmyYxHIMSpP]/.test(str[i])) { + for (var t = 0; t < token_map.length; t = t + 2) + if (str[i] == token_map[t]) { + result += token_map[t + 1]; + break; + } + } else if ('%' != str[i]) + result += str[i]; - return result; - }), - dateToken = jd(dateFormat), - timeToken = jd(timeFormat), + return result; + }), + dateTemplate = jd(dateFormat), + timeTemplate = jd(timeFormat), - addQTip = (function() { - $(this).css('cursor', 'help'); - $(this).qtip({ - show: { - solo: true - }, - position: { - viewport: $(window), - my: 'left center', - adjust: { - y: -10, - x: 2 - } - }, - style: { - classes: 'qtip-dark qtip-rounded qtip-shadow' - } - }); - }); + addQTip = (function() { + $(this).css('cursor', 'help'); + $(this).qtip({ + show: { + solo: true + }, + position: { + viewport: $(window), + my: 'left center', + adjust: { + y: -10, + x: 2 + } + }, + style: { + classes: 'qtip-dark qtip-rounded qtip-shadow' + } + }); + }); - if (trimZero) { - timeToken = timeToken.replace(/hh/ig, 'h'); - dateToken = dateToken.replace(/\bDD\b/g, 'D'); - } + if (trimZero) { + timeTemplate = timeTemplate.replace(/hh/g, 'h'); + timeTemplate = timeTemplate.replace(/HH/g, 'H'); + dateTemplate = dateTemplate.replace(/\bDD\b/g, 'D'); + } - $(containerClass).each(function() { - var input = $(this).text(), - dateA = '[', - dtSeparator = ' ', - timeA = ']', timeB = '[' + timeA; + $(containerClass).each(function() { + var input = $(this).text(), + dateA = '[', + dtSeparator = ' ', + timeA = ']', timeB = '[' + timeA, + timeToken = timeTemplate; - if (dateWithTime) { - var timeMeta = input.match(/^.{6,}?([,\s]+)(\d{1,2}).(?:\d{2,2})(?:.(\d{2,2}))?(?:\s([ap]m))?$/im); - if (null != timeMeta) { - dtSeparator = (! /undefined/i.test(typeof(timeMeta[1])) ? timeMeta[1] : dtSeparator); - // adjust timeToken to num digits of input hours - timeToken = (! /undefined/i.test(typeof(timeMeta[2])) && 1 == timeMeta[2].length ? timeToken.replace(/hh/ig, 'h') : timeToken); - // adjust timeToken to use seconds if input has them - timeToken = (! /undefined/i.test(typeof(timeMeta[3])) && 2 == timeMeta[3].length ? timeToken : timeToken.replace(/.ss/, '')); - // adjust timeToken to am/pm or AM/PM if input has it - timeToken = (! /undefined/i.test(typeof(timeMeta[4])) && 2 == timeMeta[4].length ? timeToken.replace(/A$/, (/[ap]m/.test(timeMeta[4]) ? 'a' : 'A')) : timeToken); - } - timeA = '