')
tabs.ocTab({closable: false})
@@ -358,4 +362,4 @@
$('[data-plugin="exception-beautifier"]').exceptionBeautifier()
})
-}(window.jQuery)
\ No newline at end of file
+}(window.jQuery)
diff --git a/modules/system/assets/js/framework.extras.js b/modules/system/assets/js/framework.extras.js
index c7d9d5b..810fd38 100644
--- a/modules/system/assets/js/framework.extras.js
+++ b/modules/system/assets/js/framework.extras.js
@@ -5,23 +5,123 @@
* Copyright 2016 Alexey Bobkov, Samuel Georges
* ======================================================================== */
-/*
- * The stripe loading indicator.
- *
- * Displays the animated loading indicator stripe at the top of the page.
- *
- * JavaScript API:
- * $.oc.stripeLoadIndicator.show(event)
- * $.oc.stripeLoadIndicator.hide()
- *
- * By default if the show() method has been called several times, the hide() method should be
- * called the same number of times in order to hide the stripe. Use hide(true) to hide the
- * indicator forcibly.
- */
+function ($) { "use strict";
if ($.oc === undefined)
$.oc = {}
+ // @todo Provide an interface for configuration
+ // - Custom loader CSS class
+ // - Custom stripe loader color
+
+ var LOADER_CLASS = 'oc-loading';
+
+ // FLASH HANDLING
+ // ============================
+
+ $(document).on('ajaxError', '[data-request][data-request-flash]', function(event, context, message) {
+ if (!event.isDefaultPrevented() && message) {
+ $.oc.flashMsg({ text: message, class: 'error' })
+ event.preventDefault()
+ }
+ })
+
+ $(document).on('ajaxBeforeUpdate', '[data-request][data-request-flash]', function(event, context, data) {
+ if (data['X_OCTOBER_FLASH_MESSAGES']) {
+ $.each(data['X_OCTOBER_FLASH_MESSAGES'], function(type, message) {
+ $.oc.flashMsg({ text: message, class: type })
+ })
+ }
+ })
+
+ // FORM VALIDATION
+ // ============================
+
+ $(document).on('ajaxValidation', '[data-request][data-request-validate]', function(event, context, errorMsg, fields) {
+ var $this = $(this).closest('form'),
+ $container = $('[data-validate-error]', $this),
+ messages = [],
+ $field
+
+ $.each(fields, function(fieldName, fieldMessages) {
+ $field = $('[data-validate-for='+fieldName+']', $this)
+ messages = $.merge(messages, fieldMessages)
+ if (!!$field.length) {
+ if (!$field.text().length || $field.data('emptyMode') == true) {
+ $field
+ .data('emptyMode', true)
+ .text(fieldMessages.join(', '))
+ }
+ $field.addClass('visible')
+ }
+ })
+
+ if (!!$container.length) {
+ var $oldMessages = $('[data-message]', $container)
+ $container.addClass('visible')
+
+ if (!!$oldMessages.length) {
+ var $clone = $oldMessages.first()
+
+ $.each(messages, function(key, message) {
+ $clone.clone().text(message).insertAfter($clone)
+ })
+
+ $oldMessages.remove()
+ }
+ else {
+ $container.text(errorMsg)
+ }
+ }
+
+ $this.one('ajaxError', function(event){
+ event.preventDefault()
+ })
+ })
+
+ $(document).on('ajaxPromise', '[data-request][data-request-validate]', function() {
+ var $this = $(this).closest('form')
+ $('[data-validate-for]', $this).removeClass('visible')
+ $('[data-validate-error]', $this).removeClass('visible')
+ })
+
+ // LOADING BUTTONS
+ // ============================
+
+ $(document)
+ .on('ajaxPromise', '[data-request]', function() {
+ var $target = $(this)
+
+ if ($target.data('attach-loading') !== undefined) {
+ $target
+ .addClass(LOADER_CLASS)
+ .prop('disabled', true)
+ }
+
+ if ($target.is('form')) {
+ $('[data-attach-loading]', $target)
+ .addClass(LOADER_CLASS)
+ .prop('disabled', true)
+ }
+ })
+ .on('ajaxFail ajaxDone', '[data-request]', function() {
+ var $target = $(this)
+
+ if ($target.data('attach-loading') !== undefined) {
+ $target
+ .removeClass(LOADER_CLASS)
+ .prop('disabled', false)
+ }
+
+ if ($target.is('form')) {
+ $('[data-attach-loading]', $target)
+ .removeClass(LOADER_CLASS)
+ .prop('disabled', false)
+ }
+ })
+
+ // STRIPE LOAD INDICATOR
+ // ============================
+
var StripeLoadIndicator = function() {
var self = this
this.counter = 0
@@ -41,8 +141,9 @@
// Restart the animation
this.stripe.after(this.stripe = this.stripe.clone()).remove()
- if (this.counter > 1)
+ if (this.counter > 1) {
return
+ }
this.indicator.removeClass('loaded')
$(document.body).addClass('oc-loading')
@@ -50,8 +151,10 @@
StripeLoadIndicator.prototype.hide = function(force) {
this.counter--
- if (force !== undefined && force)
+
+ if (force !== undefined && force) {
this.counter = 0
+ }
if (this.counter <= 0) {
this.indicator.addClass('loaded')
@@ -62,7 +165,7 @@
$.oc.stripeLoadIndicator = new StripeLoadIndicator()
// STRIPE LOAD INDICATOR DATA-API
- // ==============
+ // ============================
$(document)
.on('ajaxPromise', '[data-request]', function(event) {
@@ -79,9 +182,75 @@
if ($el.closest('html').length === 0)
$.oc.stripeLoadIndicator.hide()
})
- }).on('ajaxFail ajaxDone', '[data-request]', function(event) {
+ })
+ .on('ajaxFail ajaxDone', '[data-request]', function(event) {
event.stopPropagation()
$.oc.stripeLoadIndicator.hide()
})
+ // FLASH MESSAGE
+ // ============================
+
+ var FlashMessage = function (options, el) {
+ var
+ options = $.extend({}, FlashMessage.DEFAULTS, options),
+ $element = $(el)
+
+ $('body > p.flash-message').remove()
+
+ if ($element.length == 0) {
+ $element = $('').addClass(options.class).html(options.text)
+ }
+
+ $element
+ .addClass('flash-message fade')
+ .attr('data-control', null)
+ .on('click', 'button', remove)
+ .on('click', remove)
+ .append('')
+
+ $(document.body).append($element)
+
+ setTimeout(function() {
+ $element.addClass('in')
+ }, 100)
+
+ var timer = window.setTimeout(remove, options.interval * 1000)
+
+ function removeElement() {
+ $element.remove()
+ }
+
+ function remove() {
+ window.clearInterval(timer)
+
+ $element.removeClass('in')
+ $.support.transition && $element.hasClass('fade')
+ ? $element
+ .one($.support.transition.end, removeElement)
+ .emulateTransitionEnd(500)
+ : removeElement()
+ }
+ }
+
+ FlashMessage.DEFAULTS = {
+ class: 'success',
+ text: 'Default text',
+ interval: 2
+ }
+
+ if ($.oc === undefined)
+ $.oc = {}
+
+ $.oc.flashMsg = FlashMessage
+
+ // FLASH MESSAGE DATA-API
+ // ===============
+
+ $(document).render(function(){
+ $('[data-control=flash-message]').each(function(){
+ $.oc.flashMsg($(this).data(), this)
+ })
+ })
+
}(window.jQuery);
diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index fba03a8..9b35005 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -80,12 +80,19 @@ if (window.jQuery === undefined)
if (options.data !== undefined && !$.isEmptyObject(options.data))
data.push($.param(options.data))
+ var requestHeaders = {
+ 'X-OCTOBER-REQUEST-HANDLER': handler,
+ 'X-OCTOBER-REQUEST-PARTIALS': this.extractPartials(options.update)
+ }
+
+ if (options.flash !== undefined) {
+ requestHeaders['X-OCTOBER-REQUEST-FLASH'] = 1
+ }
+
var requestOptions = {
+ url: window.location.href,
context: context,
- headers: {
- 'X-OCTOBER-REQUEST-HANDLER': handler,
- 'X-OCTOBER-REQUEST-PARTIALS': this.extractPartials(options.update)
- },
+ headers: requestHeaders,
success: function(data, textStatus, jqXHR) {
/*
* Halt here if beforeUpdate() or data-request-before-update returns false
@@ -148,13 +155,13 @@ if (window.jQuery === undefined)
* Trigger 'ajaxError' on the form, halt if event.preventDefault() is called
*/
var _event = jQuery.Event('ajaxError')
- $triggerEl.trigger(_event, [context, textStatus, jqXHR])
+ $triggerEl.trigger(_event, [context, errorMsg, textStatus, jqXHR])
if (_event.isDefaultPrevented()) return
/*
* Halt here if the data-request-error attribute returns false
*/
- if (options.evalError && eval('(function($el, context, textStatus, jqXHR) {'+options.evalError+'}.call($el.get(0), $el, context, textStatus, jqXHR))') === false)
+ if (options.evalError && eval('(function($el, context, errorMsg, textStatus, jqXHR) {'+options.evalError+'}.call($el.get(0), $el, context, errorMsg, textStatus, jqXHR))') === false)
return
requestOptions.handleErrorMessage(errorMsg)
@@ -228,6 +235,8 @@ if (window.jQuery === undefined)
* Focus fields with errors
*/
if (data['X_OCTOBER_ERROR_FIELDS']) {
+ $triggerEl.trigger('ajaxValidation', [context, data['X_OCTOBER_ERROR_MESSAGE'], data['X_OCTOBER_ERROR_FIELDS']])
+
var isFirstInvalidField = true
$.each(data['X_OCTOBER_ERROR_FIELDS'], function focusErrorField(fieldName, fieldMessages) {
var fieldElement = $form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [name$="['+fieldName+']"], [name$="['+fieldName+'][]"]').filter(':enabled').first()
@@ -250,8 +259,9 @@ if (window.jQuery === undefined)
if (data['X_OCTOBER_ASSETS']) {
assetManager.load(data['X_OCTOBER_ASSETS'], $.proxy(updatePromise.resolve, updatePromise))
}
- else
+ else {
updatePromise.resolve()
+ }
return updatePromise
}
@@ -328,6 +338,7 @@ if (window.jQuery === undefined)
confirm: $this.data('request-confirm'),
redirect: $this.data('request-redirect'),
loading: $this.data('request-loading'),
+ flash: $this.data('request-flash'),
update: paramToObj('data-request-update', $this.data('request-update')),
data: paramToObj('data-request-data', $this.data('request-data'))
}
diff --git a/modules/system/assets/js/lang/lang.fa.js b/modules/system/assets/js/lang/lang.fa.js
index 9e96ca0..209c1b5 100644
--- a/modules/system/assets/js/lang/lang.fa.js
+++ b/modules/system/assets/js/lang/lang.fa.js
@@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['fa'] = $.extend(
$.oc.langMessages['fa'] || {},
- {"markdowneditor":{"formatting":"\u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc","quote":"\u0646\u0642\u0644 \u0642\u0648\u0644","code":"\u06a9\u062f","header1":"\u0633\u0631\u062e\u0637 1","header2":"\u0633\u0631\u062e\u0637 2","header3":"\u0633\u0631\u062e\u0637 3","header4":"\u0633\u0631\u062e\u0637 4","header5":"\u0633\u0631\u062e\u0637 5","header6":"\u0633\u0631\u062e\u0637 6","bold":"\u0638\u062e\u06cc\u0645","italic":"\u0645\u0648\u0631\u0628","unorderedlist":"\u0644\u06cc\u0633\u062a \u0628\u062f\u0648\u0646 \u062a\u0631\u062a\u06cc\u0628","orderedlist":"\u0644\u06cc\u0633\u062a \u0628\u0627 \u062a\u0631\u062a\u06cc\u0628","video":"\u0648\u06cc\u062f\u06cc\u0648","image":"\u062a\u0635\u0648\u06cc\u0631","link":"\u0644\u06cc\u0646\u06a9","horizontalrule":"\u062f\u0631\u062c \u062e\u0637 \u0627\u0641\u0642\u06cc","fullscreen":"\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647","preview":"\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634"},"mediamanager":{"insert_link":"\u062f\u0631\u062c \u0622\u062f\u0631\u0633 \u0631\u0633\u0627\u0646\u0647","insert_image":"\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631","insert_video":"\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648","insert_audio":"\u062f\u0631\u062c \u0635\u0648\u062a","invalid_file_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0644\u06cc\u0646\u06a9 \u0622\u0646 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_file_single_insert":"\u0644\u0637\u0641\u0627 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_image_empty_insert":"\u0644\u0637\u0641\u0627 \u062a\u0635\u0648\u06cc\u0631(\u0647\u0627) \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_video_empty_insert":"\u0644\u0637\u0641\u0627 \u0648\u06cc\u062f\u06cc\u0648 \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f.","invalid_audio_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644 \u0635\u0648\u062a\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f"},"alert":{"confirm_button_text":"\u062a\u0627\u06cc\u06cc\u062f","cancel_button_text":"\u0627\u0646\u0635\u0631\u0627\u0641","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"all"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
+ {"markdowneditor":{"formatting":"\u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc","quote":"\u0646\u0642\u0644 \u0642\u0648\u0644","code":"\u06a9\u062f","header1":"\u0633\u0631\u062e\u0637 1","header2":"\u0633\u0631\u062e\u0637 2","header3":"\u0633\u0631\u062e\u0637 3","header4":"\u0633\u0631\u062e\u0637 4","header5":"\u0633\u0631\u062e\u0637 5","header6":"\u0633\u0631\u062e\u0637 6","bold":"\u0638\u062e\u06cc\u0645","italic":"\u0645\u0648\u0631\u0628","unorderedlist":"\u0644\u06cc\u0633\u062a \u0628\u062f\u0648\u0646 \u062a\u0631\u062a\u06cc\u0628","orderedlist":"\u0644\u06cc\u0633\u062a \u0628\u0627 \u062a\u0631\u062a\u06cc\u0628","video":"\u0648\u06cc\u062f\u06cc\u0648","image":"\u062a\u0635\u0648\u06cc\u0631","link":"\u0644\u06cc\u0646\u06a9","horizontalrule":"\u062f\u0631\u062c \u062e\u0637 \u0627\u0641\u0642\u06cc","fullscreen":"\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647","preview":"\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634"},"mediamanager":{"insert_link":"\u062f\u0631\u062c \u0622\u062f\u0631\u0633 \u0631\u0633\u0627\u0646\u0647","insert_image":"\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631","insert_video":"\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648","insert_audio":"\u062f\u0631\u062c \u0635\u0648\u062a","invalid_file_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0644\u06cc\u0646\u06a9 \u0622\u0646 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_file_single_insert":"\u0644\u0637\u0641\u0627 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_image_empty_insert":"\u0644\u0637\u0641\u0627 \u062a\u0635\u0648\u06cc\u0631(\u0647\u0627) \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_video_empty_insert":"\u0644\u0637\u0641\u0627 \u0648\u06cc\u062f\u06cc\u0648 \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f.","invalid_audio_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644 \u0635\u0648\u062a\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f"},"alert":{"confirm_button_text":"\u062a\u0627\u06cc\u06cc\u062f","cancel_button_text":"\u0627\u0646\u0635\u0631\u0627\u0641","widget_remove_confirm":"\u0627\u06cc\u0646 \u0627\u0628\u0632\u0627\u0631\u06a9 \u062d\u0630\u0641 \u0634\u0648\u062f\u061f"},"datepicker":{"previousMonth":"\u0645\u0627\u0647 \u0642\u0628\u0644","nextMonth":"\u0645\u0627\u0647 \u0628\u0639\u0630","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"\u0647\u0645\u0647"},"dates":{"all":"\u0647\u0645\u0647","filter_button_text":"\u0641\u06cc\u0644\u062a\u0631","reset_button_text":"\u0628\u0627\u0632\u0646\u0634\u0627\u0646\u06cc","date_placeholder":"\u062a\u0627\u0631\u06cc\u062e","after_placeholder":"\u0628\u0639\u062f \u0627\u0632","before_placeholder":"\u0642\u0628\u0644 \u0627\u0632"}},"eventlog":{"show_stacktrace":"\u0646\u0645\u0627\u06cc\u0634 \u0631\u0648\u0646\u062f \u0627\u062c\u0631\u0627","hide_stacktrace":"\u0645\u062e\u0641\u06cc \u0633\u0627\u0632\u06cc \u0631\u0648\u0646\u062f \u0627\u062c\u0631\u0627","tabs":{"formatted":"\u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc \u0634\u062f\u0647","raw":"\u062e\u0627\u0645"},"editor":{"title":"\u0648\u06cc\u0631\u0627\u06cc\u0634\u06af\u0631 \u06a9\u062f","description":"\u0633\u06cc\u0633\u062a\u0645 \u0639\u0627\u0645\u0644 \u0634\u0645\u0627 \u0628\u0627\u06cc\u062f \u0628\u0631\u0627\u06cc \u06cc\u06a9\u06cc \u0627\u0632 \u0627\u06cc\u0646 \u0634\u0645\u0627\u06cc \u0622\u062f\u0631\u0633 \u0647\u0627 \u067e\u06cc\u06a9\u0631\u0628\u0646\u062f\u06cc \u0634\u062f\u0647 \u0628\u0627\u0634\u062f.","openWith":"\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u062a\u0648\u0633\u0637","remember_choice":"\u06af\u0632\u06cc\u0646\u0647 \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 \u0631\u0627 \u0628\u0647 \u062e\u0627\u0637\u0631 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634","open":"\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646","cancel":"\u0627\u0646\u0635\u0631\u0627\u0641"}}}
);
//! moment.js locale configuration
diff --git a/modules/system/assets/js/lang/lang.nb-no.js b/modules/system/assets/js/lang/lang.nb-no.js
index 56e579e..f14744d 100644
--- a/modules/system/assets/js/lang/lang.nb-no.js
+++ b/modules/system/assets/js/lang/lang.nb-no.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['nb-no'] = $.extend(
$.oc.langMessages['nb-no'] || {},
- {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"all"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
+ {"markdowneditor":{"formatting":"Formatering","quote":"Sitat","code":"Kode","header1":"Overskrift 1","header2":"Overskrift 2","header3":"Overskrift 3","header4":"Overskrift 4","header5":"Overskrift 5","header6":"Overskrift 6","bold":"Fet","italic":"Kursiv","unorderedlist":"Punktliste","orderedlist":"Nummerert liste","video":"Video","image":"Bilde","link":"Lenke","horizontalrule":"Sett inn horisontal linje","fullscreen":"Fullskjerm","preview":"Forh\u00e5ndsvisning"},"mediamanager":{"insert_link":"Sett inn Media lenke","insert_image":"Sett inn Media bilde","insert_video":"Sett inn Media video","insert_audio":"Sett inn Media lyd","invalid_file_empty_insert":"Velg fil \u00e5 sette lenken inn i.","invalid_file_single_insert":"Vennligst velg \u00e9n enkelt fil.","invalid_image_empty_insert":"Velg bilde(r) \u00e5 sette inn.","invalid_video_empty_insert":"Velg en video \u00e5 sette inn.","invalid_audio_empty_insert":"Velg lyd \u00e5 sette inn."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Avbryt","widget_remove_confirm":"Fjerne widget?"},"datepicker":{"previousMonth":"Forrige m\u00e5ned","nextMonth":"Neste m\u00e5ned","months":["januar","februar","mars","april","mai","juni","july","august","september","oktober","november","desember"],"weekdays":["s\u00f8ndag","mandag","tirsdag","onsdag","torsdag","fredag","l\u00f8rdag"],"weekdaysShort":["s\u00f8n","man","tir","ons","tor","fre","l\u00f8r"]},"filter":{"group":{"all":"alle"},"dates":{"all":"alle","filter_button_text":"Filter","reset_button_text":"Tilbakestill","date_placeholder":"Dato","after_placeholder":"Etter","before_placeholder":"F\u00f8r"}},"eventlog":{"show_stacktrace":"Vis stacktrace","hide_stacktrace":"Skjul stacktrace","tabs":{"formatted":"Formattert","raw":"Raw"},"editor":{"title":"Kildekodeeditor","description":"Ditt operativsystem b\u00f8r v\u00e6re konfigurert for \u00e5 \u00e5pne ett av disse URL-schemaene.","openWith":"\u00c5pne med","remember_choice":"Husk valget for denne sesjonen","open":"\u00c5pne","cancel":"Avbryt"}}}
);
\ No newline at end of file
diff --git a/modules/system/assets/js/lang/lang.nl.js b/modules/system/assets/js/lang/lang.nl.js
index 73143d8..250b6f8 100644
--- a/modules/system/assets/js/lang/lang.nl.js
+++ b/modules/system/assets/js/lang/lang.nl.js
@@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['nl'] = $.extend(
$.oc.langMessages['nl'] || {},
- {"markdowneditor":{"formatting":"Opmaak","quote":"Quote","code":"Code","header1":"Koptekst 1","header2":"Koptekst 2","header3":"Koptekst 3","header4":"Koptekst 4","header5":"Koptekst 5","header6":"Koptekst 6","bold":"Vet","italic":"Cursief","unorderedlist":"Ongeordende lijst","orderedlist":"Gerangschikte lijst","video":"Video","image":"Afbeelding","link":"Hyperlink","horizontalrule":"Invoegen horizontale lijn","fullscreen":"Volledig scherm","preview":"Voorbeeldweergave"},"mediamanager":{"insert_link":"Invoegen Media Link","insert_image":"Invoegen Media Afbeelding","insert_video":"Invoegen Media Video","insert_audio":"Invoegen Media Audio","invalid_file_empty_insert":"Selecteer bestand om een link naar te maken.","invalid_file_single_insert":"Selecteer \u00e9\u00e9n bestand.","invalid_image_empty_insert":"Selecteer afbeelding(en) om in te voegen.","invalid_video_empty_insert":"Selecteer een video bestand om in te voegen.","invalid_audio_empty_insert":"Selecteer een audio bestand om in te voegen."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Annuleren","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Vorige maand","nextMonth":"Volgende maan","months":["Januari","Februari","Maart","April","Mei","Juni","Juli","Augustus","September","Oktober","November","December"],"weekdays":["Zondag","Maandag","Dinsdag","Woensdag","Donderdag","Vrijdag","Zaterdag"],"weekdaysShort":["Zo","Ma","Di","Wo","Do","Vr","Za"]},"filter":{"group":{"all":"alle"},"dates":{"all":"alle","filter_button_text":"Filteren","reset_button_text":"Resetten","date_placeholder":"Datum","after_placeholder":"Na","before_placeholder":"Voor"}},"eventlog":{"show_stacktrace":"Toon stacktrace","hide_stacktrace":"Verberg stacktrace","tabs":{"formatted":"Geformatteerd","raw":"Bronversie"},"editor":{"title":"Broncode editor","description":"Je besturingssysteem moet in staat zijn om met deze URL-schema's om te kunnen gaan.","openWith":"Openen met","remember_choice":"Onthoudt de geselecteerde optie voor deze browser-sessie","open":"Openen","cancel":"Annuleren"}}}
+ {"markdowneditor":{"formatting":"Opmaak","quote":"Quote","code":"Code","header1":"Koptekst 1","header2":"Koptekst 2","header3":"Koptekst 3","header4":"Koptekst 4","header5":"Koptekst 5","header6":"Koptekst 6","bold":"Vet","italic":"Cursief","unorderedlist":"Ongeordende lijst","orderedlist":"Gerangschikte lijst","video":"Video","image":"Afbeelding","link":"Hyperlink","horizontalrule":"Invoegen horizontale lijn","fullscreen":"Volledig scherm","preview":"Voorbeeldweergave"},"mediamanager":{"insert_link":"Invoegen Media Link","insert_image":"Invoegen Media Afbeelding","insert_video":"Invoegen Media Video","insert_audio":"Invoegen Media Audio","invalid_file_empty_insert":"Selecteer bestand om een link naar te maken.","invalid_file_single_insert":"Selecteer \u00e9\u00e9n bestand.","invalid_image_empty_insert":"Selecteer afbeelding(en) om in te voegen.","invalid_video_empty_insert":"Selecteer een video bestand om in te voegen.","invalid_audio_empty_insert":"Selecteer een audio bestand om in te voegen."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Annuleren","widget_remove_confirm":"Deze widget verwijderen?"},"datepicker":{"previousMonth":"Vorige maand","nextMonth":"Volgende maan","months":["Januari","Februari","Maart","April","Mei","Juni","Juli","Augustus","September","Oktober","November","December"],"weekdays":["Zondag","Maandag","Dinsdag","Woensdag","Donderdag","Vrijdag","Zaterdag"],"weekdaysShort":["Zo","Ma","Di","Wo","Do","Vr","Za"]},"filter":{"group":{"all":"alle"},"dates":{"all":"alle","filter_button_text":"Filteren","reset_button_text":"Resetten","date_placeholder":"Datum","after_placeholder":"Na","before_placeholder":"Voor"}},"eventlog":{"show_stacktrace":"Toon stacktrace","hide_stacktrace":"Verberg stacktrace","tabs":{"formatted":"Geformatteerd","raw":"Bronversie"},"editor":{"title":"Broncode editor","description":"Je besturingssysteem moet in staat zijn om met deze URL-schema's om te kunnen gaan.","openWith":"Openen met","remember_choice":"Onthoudt de geselecteerde optie voor deze browser-sessie","open":"Openen","cancel":"Annuleren"}}}
);
//! moment.js locale configuration
diff --git a/modules/system/assets/js/lang/lang.tr.js b/modules/system/assets/js/lang/lang.tr.js
index 4e51c96..49a44a1 100644
--- a/modules/system/assets/js/lang/lang.tr.js
+++ b/modules/system/assets/js/lang/lang.tr.js
@@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['tr'] = $.extend(
$.oc.langMessages['tr'] || {},
- {"markdowneditor":{"formatting":"Formatlama","quote":"Al\u0131nt\u0131","code":"Kod","header1":"Ba\u015fl\u0131k 1","header2":"Ba\u015fl\u0131k 2","header3":"Ba\u015fl\u0131k 3","header4":"Ba\u015fl\u0131k 4","header5":"Ba\u015fl\u0131k 5","header6":"Ba\u015fl\u0131k 6","bold":"Kal\u0131n","italic":"\u0130talik","unorderedlist":"S\u0131ras\u0131z Liste","orderedlist":"S\u0131ral\u0131 Liste","video":"Video","image":"G\u00f6rsel\/Resim","link":"Link","horizontalrule":"Yatay \u00c7izgi Ekle","fullscreen":"Tam Ekran","preview":"\u00d6nizleme"},"mediamanager":{"insert_link":"Medya Linki Ekle","insert_image":"Medya Resim Ekle","insert_video":"Medya Video Ekle","insert_audio":"Medya Ses Ekle","invalid_file_empty_insert":"L\u00fctfen link verilecek dosyay\u0131 se\u00e7in.","invalid_file_single_insert":"L\u00fctfen tek bir dosya se\u00e7in.","invalid_image_empty_insert":"L\u00fctfen eklenecek resim(ler)i se\u00e7in.","invalid_video_empty_insert":"L\u00fctfen eklenecek video dosyas\u0131n\u0131 se\u00e7in.","invalid_audio_empty_insert":"L\u00fctfen eklenecek ses dosyas\u0131n\u0131 se\u00e7in."},"alert":{"confirm_button_text":"TAMAM","cancel_button_text":"\u0130ptal","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"all"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
+ {"markdowneditor":{"formatting":"Formatlama","quote":"Al\u0131nt\u0131","code":"Kod","header1":"Ba\u015fl\u0131k 1","header2":"Ba\u015fl\u0131k 2","header3":"Ba\u015fl\u0131k 3","header4":"Ba\u015fl\u0131k 4","header5":"Ba\u015fl\u0131k 5","header6":"Ba\u015fl\u0131k 6","bold":"Kal\u0131n","italic":"\u0130talik","unorderedlist":"S\u0131ras\u0131z Liste","orderedlist":"S\u0131ral\u0131 Liste","video":"Video","image":"G\u00f6rsel\/Resim","link":"Link","horizontalrule":"Yatay \u00c7izgi Ekle","fullscreen":"Tam Ekran","preview":"\u00d6nizleme"},"mediamanager":{"insert_link":"Medya Linki Ekle","insert_image":"Medya Resim Ekle","insert_video":"Medya Video Ekle","insert_audio":"Medya Ses Ekle","invalid_file_empty_insert":"L\u00fctfen link verilecek dosyay\u0131 se\u00e7in.","invalid_file_single_insert":"L\u00fctfen tek bir dosya se\u00e7in.","invalid_image_empty_insert":"L\u00fctfen eklenecek resim(ler)i se\u00e7in.","invalid_video_empty_insert":"L\u00fctfen eklenecek video dosyas\u0131n\u0131 se\u00e7in.","invalid_audio_empty_insert":"L\u00fctfen eklenecek ses dosyas\u0131n\u0131 se\u00e7in."},"alert":{"confirm_button_text":"Evet","cancel_button_text":"\u0130ptal","widget_remove_confirm":"Bu eklentiyi kald\u0131rma istedi\u011finize emin misiniz?"},"datepicker":{"previousMonth":"\u00d6nceki Ay","nextMonth":"Sonraki Ay","months":["Ocak","\u015eubat","Mart","Nisan","May\u0131s","Haziran","Temmuz","A\u011fustos","Eyl\u00fcl","Ekim","Kas\u0131m","Aral\u0131k"],"weekdays":["Pazar","Pazartesi","Sal\u0131","\u00c7ar\u015famba","Per\u015fembe","Cuma","Cumartesi"],"weekdaysShort":["Paz","Pzt","Sal","\u00c7ar","Per","Cum","Cmt"]},"filter":{"group":{"all":"t\u00fcm\u00fc"},"dates":{"all":"t\u00fcm\u00fc","filter_button_text":"Filtrele","reset_button_text":"S\u0131f\u0131rla","date_placeholder":"Tarih","after_placeholder":"Sonra","before_placeholder":"\u00d6nce"}},"eventlog":{"show_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 g\u00f6ster","hide_stacktrace":"Veri y\u0131\u011f\u0131n\u0131n\u0131 gizle","tabs":{"formatted":"Formatl\u0131","raw":"Ham Veri"},"editor":{"title":"Kaynak kod edit\u00f6r\u00fc","description":"\u0130\u015fletim sisteminiz URL \u015femalar\u0131na yan\u0131t verecek \u015fekilde yap\u0131land\u0131r\u0131lmal\u0131d\u0131r.","openWith":"Birlikte a\u00e7","remember_choice":"Bu oturum i\u00e7in se\u00e7enekleri hat\u0131rla","open":"A\u00e7","cancel":"\u0130ptal"}}}
);
//! moment.js locale configuration
diff --git a/modules/system/assets/js/lang/lang.zh-cn.js b/modules/system/assets/js/lang/lang.zh-cn.js
index 16805f0..52a6f46 100644
--- a/modules/system/assets/js/lang/lang.zh-cn.js
+++ b/modules/system/assets/js/lang/lang.zh-cn.js
@@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['zh-cn'] = $.extend(
$.oc.langMessages['zh-cn'] || {},
- {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"Previous Month","nextMonth":"Next Month","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"weekdaysShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]},"filter":{"group":{"all":"all"},"dates":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","date_placeholder":"Date","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"Show the stacktrace","hide_stacktrace":"Hide the stacktrace","tabs":{"formatted":"Formatted","raw":"Raw"},"editor":{"title":"Source code editor","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"Remember selected option for this session","open":"Open","cancel":"Cancel"}}}
+ {"markdowneditor":{"formatting":"\u683c\u5f0f\u5316","quote":"\u5f15\u7528","code":"\u4ee3\u7801","header1":"\u6807\u9898 1","header2":"\u6807\u9898 2","header3":"\u6807\u9898 3","header4":"\u6807\u9898 4","header5":"\u6807\u9898 5","header6":"\u6807\u9898 6","bold":"\u7c97\u4f53","italic":"\u659c\u4f53","unorderedlist":"\u65e0\u5e8f\u5217\u8868","orderedlist":"\u6709\u5e8f\u5217\u8868","video":"\u89c6\u9891","image":"\u56fe\u7247","link":"\u94fe\u63a5","horizontalrule":"\u63d2\u5165\u5206\u5272\u7ebf","fullscreen":"\u5168\u5c4f","preview":"\u9884\u89c8"},"mediamanager":{"insert_link":"\u63d2\u5165\u94fe\u63a5","insert_image":"\u63d2\u5165\u56fe\u7247","insert_video":"\u63d2\u5165\u89c6\u9891","insert_audio":"\u63d2\u5165\u97f3\u9891","invalid_file_empty_insert":"\u8bf7\u9009\u62e9\u8981\u63d2\u5165\u7684\u6587\u4ef6\u3002","invalid_file_single_insert":"\u8bf7\u9009\u62e9\u8981\u63d2\u5165\u7684\u6587\u4ef6\u3002","invalid_image_empty_insert":"\u8bf7\u9009\u62e9\u8981\u63d2\u5165\u7684\u56fe\u7247\u6587\u4ef6\u3002","invalid_video_empty_insert":"\u8bf7\u9009\u62e9\u8981\u63d2\u5165\u7684\u89c6\u9891\u6587\u4ef6\u3002","invalid_audio_empty_insert":"\u8bf7\u9009\u62e9\u8981\u63d2\u5165\u7684\u97f3\u9891\u6587\u4ef6\u3002"},"alert":{"confirm_button_text":"\u786e\u5b9a","cancel_button_text":"\u53d6\u6d88","widget_remove_confirm":"Remove this widget?"},"datepicker":{"previousMonth":"\u4e0a\u4e00\u4e2a\u6708","nextMonth":"\u4e0b\u4e00\u4e2a\u6708","months":["\u4e00\u6708","\u4e8c\u6708","\u4e09\u6708","\u56db\u6708","\u4e94\u6708","\u516d\u6708","\u4e03\u6708","\u516b\u6708","\u4e5d\u6708","\u5341\u6708","\u5341\u4e00\u6708","\u5341\u4e8c\u6708"],"weekdays":["\u5468\u65e5","\u5468\u4e00","\u5468\u4e8c","\u5468\u4e09","\u5468\u56db","\u5468\u4e94","\u5468\u516d"],"weekdaysShort":["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d"]},"filter":{"group":{"all":"\u5168\u90e8"},"dates":{"all":"\u5168\u90e8","filter_button_text":"\u7b5b\u9009","reset_button_text":"\u91cd\u7f6e","date_placeholder":"\u65e5\u671f","after_placeholder":"After","before_placeholder":"Before"}},"eventlog":{"show_stacktrace":"\u663e\u793a\u5806\u6808","hide_stacktrace":"\u9690\u85cf\u5806\u6808","tabs":{"formatted":"\u683c\u5f0f\u5316\u7684","raw":"\u539f\u59cb"},"editor":{"title":"\u6e90\u4ee3\u7801\u7f16\u8f91\u5668","description":"Your operating system should be configured to listen to one of these URL schemes.","openWith":"Open with","remember_choice":"\u8bb0\u4f4f\u9009\u62e9","open":"\u6253\u5f00","cancel":"\u53d6\u6d88"}}}
);
//! moment.js locale configuration
diff --git a/modules/system/assets/less/framework.extras.less b/modules/system/assets/less/framework.extras.less
index 3247695..67b163d 100644
--- a/modules/system/assets/less/framework.extras.less
+++ b/modules/system/assets/less/framework.extras.less
@@ -10,6 +10,7 @@ body.oc-loading, body.oc-loading * {
@stripe-loader-color: #0090c0;
@stripe-loader-height: 5px;
+
.stripe-loading-indicator {
height: @stripe-loader-height;
@@ -31,7 +32,7 @@ body.oc-loading, body.oc-loading * {
.stripe {
width: 100%;
- .animation(infinite-loader 60s linear);
+ .animation(oc-infinite-loader 60s linear);
}
.stripe-loaded {
@@ -55,6 +56,138 @@ body.oc-loading, body.oc-loading * {
}
}
+//
+// Flash Messages
+// --------------------------------------------------
+
+@color-flash-success-bg: #8da85e;
+@color-flash-error-bg: #cc3300;
+@color-flash-warning-bg: #f0ad4e;
+@color-flash-info-bg: #5fb6f5;
+@color-flash-text: #ffffff;
+
+body > p.flash-message {
+ position: fixed;
+ width: 500px;
+ left: 50%;
+ top: 13px;
+ margin-left: -250px;
+ color: @color-flash-text;
+ font-size: 14px;
+ padding: 10px 30px 10px 15px;
+ z-index: @zindex-flashmessage;
+ word-wrap: break-word;
+ text-shadow: 0 -1px 0px rgba(0,0,0,.15);
+ text-align: center;
+ .box-shadow(@overlay-box-shadow);
+ .border-radius(@border-radius-base);
+
+ &.fade {
+ .opacity(0);
+ .transition(~'all 0.5s, width 0s');
+ .transform(~'scale(0.9)');
+ }
+
+ &.fade.in {
+ .opacity(1);
+ .transform( ~'scale(1)');
+ }
+
+ &.success { background: @color-flash-success-bg; }
+ &.error { background: @color-flash-error-bg; }
+ &.warning { background: @color-flash-warning-bg; }
+ &.info { background: @color-flash-info-bg; }
+
+ button.close {
+ float: none;
+ position: absolute;
+ right: 10px;
+ top: 8px;
+ color: white;
+ font-size: 21px;
+ line-height: 1;
+ font-weight: bold;
+ .opacity(.2);
+
+ padding: 0;
+ cursor: pointer;
+ background: transparent;
+ border: 0;
+ -webkit-appearance: none;
+ outline: none;
+
+ &:hover,
+ &:focus {
+ color: white;
+ text-decoration: none;
+ cursor: pointer;
+ .opacity(.5);
+ }
+ }
+}
+
+@media (max-width: @screen-sm) {
+ body > p.flash-message {
+ left: 10px;
+ right: 10px;
+ top: 10px;
+ margin-left: 0;
+ width: auto;
+ }
+}
+
+//
+// Form Validation
+// --------------------------------------------------
+
+[data-request][data-request-validate] [data-validate-for],
+[data-request][data-request-validate] [data-validate-error] {
+ &:not(.visible) {
+ display: none;
+ }
+}
+
+//
+// Element Loader
+// --------------------------------------------------
+
+a.oc-loading, button.oc-loading {
+ &:after {
+ content: '';
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: .4em;
+ height: 1em;
+ width: 1em;
+ animation: oc-rotate-loader 0.8s infinite linear;
+ border: .2em solid currentColor;
+ border-right-color: transparent;
+ border-radius: 50%;
+ .opacity(.5);
+ }
+}
+
+@-moz-keyframes oc-rotate-loader {
+ 0% { -moz-transform: rotate(0deg); }
+ 100% { -moz-transform: rotate(360deg); }
+}
+@-webkit-keyframes oc-rotate-loader {
+ 0% { -webkit-transform: rotate(0deg); }
+ 100% { -webkit-transform: rotate(360deg); }
+}
+@-o-keyframes oc-rotate-loader {
+ 0% { -o-transform: rotate(0deg); }
+ 100% { -o-transform: rotate(360deg); }
+}
+@-ms-keyframes oc-rotate-loader {
+ 0% { -ms-transform: rotate(0deg); }
+ 100% { -ms-transform: rotate(360deg); }
+}
+@keyframes oc-rotate-loader {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+}
+
//
// Infinite loading animation
// --------------------------------------------------
@@ -62,6 +195,7 @@ body.oc-loading, body.oc-loading * {
@startCount: 1;
@startVal: 28%;
@start: 0;
+
.infinite-class (@index, @val, @count) when (@index = 0) {
@tmpSelector: ~"@{index}%";
@{tmpSelector} { width: 0; }
@@ -73,18 +207,18 @@ body.oc-loading, body.oc-loading * {
.infinite-class(@index + 10, @val + (@val / @count), @count * 2);
}
-@-moz-keyframes infinite-loader {
+@-moz-keyframes oc-infinite-loader {
.infinite-class(@start, @startVal, @startCount);
}
-@-webkit-keyframes infinite-loader {
+@-webkit-keyframes oc-infinite-loader {
.infinite-class(@start, @startVal, @startCount);
}
-@-o-keyframes infinite-loader {
+@-o-keyframes oc-infinite-loader {
.infinite-class(@start, @startVal, @startCount);
}
-@-ms-keyframes infinite-loader {
+@-ms-keyframes oc-infinite-loader {
.infinite-class(@start, @startVal, @startCount);
}
-@keyframes infinite-loader {
+@keyframes oc-infinite-loader {
.infinite-class(@start, @startVal, @startCount);
}
diff --git a/modules/system/assets/less/updates/details.less b/modules/system/assets/less/updates/details.less
index 66ab40b..8c8127e 100644
--- a/modules/system/assets/less/updates/details.less
+++ b/modules/system/assets/less/updates/details.less
@@ -68,4 +68,21 @@
}
}
}
-}
\ No newline at end of file
+
+ dl {
+ dt, dd {
+ margin-bottom: (@padding-standard / 2);
+ }
+ dt {
+ width: 75px;
+ float: left;
+ text-align: right;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ dd {
+ margin-left: 85px;
+ }
+ }
+}
diff --git a/modules/system/assets/ui/docs/callout.md b/modules/system/assets/ui/docs/callout.md
index fa762a0..fbf8490 100644
--- a/modules/system/assets/ui/docs/callout.md
+++ b/modules/system/assets/ui/docs/callout.md
@@ -2,27 +2,65 @@
### Callout
-Allows the user to dismiss a callout message.
+Displays a detailed message to the user, also allowing it to be dismissed.
-
+
+
+
+
+
Warning warning
+
My arms are flailing wildly
+
-
Something good happened
+
Insert coin(s) to begin play
-### With header
+### No sub-header
-
+Include the `no-subheader` class to omit the sub heading.
+
+
-
Warning warning
+
+
Incoming unicorn
+
+
+
+### No icon
+
+Include the `no-icon` class to omit the icon.
+
+
+
+
There was a hull breach
+
+
Get to the chopper
+
+
+
+### No header
+
+
-
My arms are flailing wildly
+
Something good happened
+
+
You found a pony
+
+### Data attributes:
+
+- data-dismiss="callout" - when assigned to an element, the callout hides on click
+
## JavaScript API
### Events
-- close.oc.callout - triggered when a node on the tree is moved.
+- close.oc.callout - triggered when the callout is closed
diff --git a/modules/system/assets/ui/docs/chart.md b/modules/system/assets/ui/docs/chart.md
index 8e32176..cd576fe 100644
--- a/modules/system/assets/ui/docs/chart.md
+++ b/modules/system/assets/ui/docs/chart.md
@@ -19,6 +19,26 @@ The pie chart outputs information as a circle diagram, with optional label in th
 {.img-responsive .frame}
+
+## Line chart
+
+The next example shows a line chart markup. Data sets are defined with the SPAN elements inside the chart element.
+
+
+
+
+
+
+ {.img-responsive .frame}
+
## Bar chart
diff --git a/modules/system/assets/ui/docs/flashmessage.md b/modules/system/assets/ui/docs/flashmessage.md
index 514cd8f..3416e7c 100644
--- a/modules/system/assets/ui/docs/flashmessage.md
+++ b/modules/system/assets/ui/docs/flashmessage.md
@@ -4,36 +4,62 @@ Displays a floating flash message on the screen.
### Display onload
+```html
This message is created from a static element. It will go away in 5 seconds.
+```
+
+
+ This message is created from a static element. It will go away in 5 seconds.
+
-### Data attributes:
+
+### Display static
+
+A flash message can be rendered as a static element by attaching the `static` class. The `data-control` attribute is not needed.
+
+
+ Import completed successfully (success)
+
+
+
+ Informative info box is informational (info)
+
+
+
+ Phasers have been set to stun (warning)
+
+
+
+ We couldn't help you with that (error)
+
+
+### Data attributes
- data-control="flash-message" - enables the flash message plugin
- data-interval="2" - the interval to display the message in seconds, optional. Default: 2
-### JavaScript API:
+### JavaScript API
```js
$.oc.flashMsg({
diff --git a/modules/system/assets/ui/docs/icon.md b/modules/system/assets/ui/docs/icon.md
index f2e6796..b1a5dbc 100644
--- a/modules/system/assets/ui/docs/icon.md
+++ b/modules/system/assets/ui/docs/icon.md
@@ -22,11 +22,11 @@ Place icons just about anywhere with the `` tag or to an existing element usi
To increase icon sizes relative to their container, use the `icon-lg` (33% increase), `icon-2x`, `icon-3x`, `icon-4x`, or `icon-5x` classes.
- icon-5x
- icon-4x
- icon-3x
- icon-2x
- icon-lg
+ icon-5x
+ icon-4x
+ icon-3x
+ icon-2x
+ icon-lg
### Icon buttons
@@ -58,14 +58,17 @@ Feel free to use them alongside your buttons.
icon-adjust
+
icon-american-sign-language-interpreting
icon-anchor
icon-archive
icon-area-chart
icon-arrows
icon-arrows-h
icon-arrows-v
+
icon-assistive-listening-systems
icon-asterisk
icon-at
+
icon-audio-description
icon-balance-scale
icon-ban
icon-bar-chart
@@ -85,11 +88,15 @@ Feel free to use them alongside your buttons.
icon-bicycle
icon-binoculars
icon-birthday-cake
+
icon-blind
+
icon-bluetooth
+
icon-bluetooth-b
icon-bolt
icon-bomb
icon-book
icon-bookmark
icon-bookmark-o
+
icon-braille
icon-briefcase
icon-bug
icon-building
@@ -137,22 +144,24 @@ Feel free to use them alongside your buttons.
icon-cogs
icon-comment
icon-comment-o
-
icon-commenting
-
icon-commenting-o
+
icon-commenting
+
icon-commenting-o
icon-comments
icon-comments-o
icon-compass
icon-copyright
icon-creative-commons
icon-credit-card
+
icon-credit-card-alt
icon-crop
icon-crosshairs
icon-cube
icon-cubes
icon-cutlery
icon-database
+
icon-deaf
icon-desktop
icon-diamond
icon-dot-circle-o
@@ -211,6 +220,7 @@ Feel free to use them alongside your buttons.
icon-hand-rock-o
icon-hand-scissors-o
icon-hand-spock-o
+
icon-hashtag
icon-hdd-o
icon-headphones
icon-heart
@@ -243,6 +253,7 @@ Feel free to use them alongside your buttons.
icon-line-chart
icon-location-arrow
icon-lock
+
icon-low-vision
icon-magic
icon-magnet
icon-male
@@ -274,6 +285,7 @@ Feel free to use them alongside your buttons.
icon-pencil
icon-pencil-square
icon-pencil-square-o
+
icon-percent
icon-phone
icon-phone-square
icon-picture-o
@@ -290,6 +302,7 @@ Feel free to use them alongside your buttons.
icon-qrcode
icon-question
icon-question-circle
+
icon-question-circle-o
icon-quote-left
icon-quote-right
icon-random
@@ -307,17 +320,20 @@ Feel free to use them alongside your buttons.
icon-search-minus
icon-search-plus
icon-server
+
icon-share
-
icon-share
icon-share-alt
icon-share-alt-square
icon-share-square
icon-share-square-o
icon-shield
icon-ship
+
icon-shopping-bag
+
icon-shopping-basket
icon-shopping-cart
icon-sign-in
+
icon-sign-language
icon-sign-out
icon-signal
icon-sitemap
@@ -374,6 +390,7 @@ Feel free to use them alongside your buttons.
icon-truck
icon-tty
icon-umbrella
+
icon-universal-access
icon-university
icon-unlock
icon-unlock-alt
@@ -384,10 +401,12 @@ Feel free to use them alongside your buttons.
icon-user-times
icon-users
icon-video-camera
+
icon-volume-control-phone
icon-volume-down
icon-volume-off
icon-volume-up
icon-wheelchair
+
icon-wheelchair-alt
icon-wifi
icon-wrench
@@ -400,20 +419,21 @@ Feel free to use them alongside your buttons.
icon-ambulance
icon-h-square
icon-heart
+
icon-heart-o
-
icon-heart-o
icon-heartbeat
icon-hospital-o
+
icon-medkit
-
icon-medkit
icon-plus-square
icon-stethoscope
+
icon-user-md
-
icon-user-md
icon-wheelchair
+
icon-wheelchair-alt
@@ -584,23 +604,27 @@ Feel free to use them alongside your buttons.
icon-compress
icon-eject
icon-expand
+
icon-fast-backward
-
icon-fast-backward
icon-fast-forward
icon-forward
icon-pause
+
icon-pause-circle
+
icon-pause-circle-o
icon-play
icon-play-circle
icon-play-circle-o
icon-random
+
icon-step-backward
-
icon-step-backward
icon-step-forward
icon-stop
+
icon-stop-circle
+
icon-stop-circle-o
icon-youtube-play
@@ -637,23 +661,24 @@ Feel free to use them alongside your buttons.
icon-bicycle
icon-bus
icon-car
+
icon-fighter-jet
-
icon-fighter-jet
icon-motorcycle
icon-plane
icon-rocket
+
icon-ship
-
icon-ship
icon-space-shuttle
icon-subway
icon-taxi
+
icon-train
-
icon-train
icon-truck
icon-wheelchair
+
icon-wheelchair-alt
@@ -689,6 +714,8 @@ Feel free to use them alongside your buttons.
icon-bitbucket
icon-bitbucket-square
icon-black-tie
+
icon-bluetooth
+
icon-bluetooth-b
icon-btc
icon-buysellads
icon-cc-amex
@@ -701,6 +728,7 @@ Feel free to use them alongside your buttons.
icon-cc-visa
icon-chrome
icon-codepen
+
icon-codiepie
icon-connectdevelop
icon-contao
icon-css3
@@ -711,16 +739,21 @@ Feel free to use them alongside your buttons.
icon-dribbble
icon-dropbox
icon-drupal
+
icon-edge
icon-empire
+
icon-envira
icon-expeditedssl
-
-
icon-facebook
icon-facebook-official
+
+
icon-facebook-square
icon-firefox
+
icon-first-order
icon-flickr
+
icon-font-awesome
icon-fonticons
+
icon-fort-awesome
icon-forumbee
icon-foursquare
icon-get-pocket
@@ -731,8 +764,12 @@ Feel free to use them alongside your buttons.
icon-github
icon-github-alt
icon-github-square
+
icon-gitlab
+
icon-glide
+
icon-glide-g
icon-google
icon-google-plus
+
icon-google-plus-official
icon-google-plus-square
icon-google-wallet
icon-gratipay
@@ -749,12 +786,14 @@ Feel free to use them alongside your buttons.
icon-leanpub
icon-linkedin
icon-linkedin-square
-
-
icon-linux
icon-maxcdn
+
+
icon-meanpath
icon-medium
+
icon-mixcloud
+
icon-modx
icon-odnoklassniki
icon-odnoklassniki-square
icon-opencart
@@ -765,15 +804,19 @@ Feel free to use them alongside your buttons.
icon-paypal
icon-pied-piper
icon-pied-piper-alt
+
icon-pied-piper-pp
icon-pinterest
icon-pinterest-p
icon-pinterest-square
+
icon-product-hunt
icon-qq
icon-rebel
icon-reddit
+
icon-reddit-alien
icon-reddit-square
icon-renren
icon-safari
+
icon-scribd
icon-sellsy
icon-share-alt
icon-share-alt-square
@@ -783,6 +826,9 @@ Feel free to use them alongside your buttons.
icon-skype
icon-slack
icon-slideshare
+
icon-snapchat
+
icon-snapchat-ghost
+
icon-snapchat-square
icon-soundcloud
icon-spotify
@@ -794,6 +840,7 @@ Feel free to use them alongside your buttons.
icon-stumbleupon
icon-stumbleupon-circle
icon-tencent-weibo
+
icon-themeisle
icon-trello
icon-tripadvisor
icon-tumblr
@@ -801,7 +848,10 @@ Feel free to use them alongside your buttons.
icon-twitch
icon-twitter
icon-twitter-square
+
icon-usb
icon-viacoin
+
icon-viadeo
+
icon-viadeo-square
icon-vimeo
icon-vimeo-square
icon-vine
@@ -812,11 +862,14 @@ Feel free to use them alongside your buttons.
icon-wikipedia-w
icon-windows
icon-wordpress
+
icon-wpbeginner
+
icon-wpforms
icon-xing
icon-xing-square
icon-y-combinator
icon-yahoo
icon-yelp
+
icon-yoast
icon-youtube
icon-youtube-play
icon-youtube-square
@@ -858,16 +911,17 @@ Feel free to use them alongside your buttons.
icon-cc-amex
icon-cc-diners-club
icon-cc-discover
+
icon-cc-jcb
-
icon-cc-jcb
icon-cc-mastercard
icon-cc-paypal
+
icon-cc-stripe
-
icon-cc-stripe
icon-cc-visa
icon-credit-card
+
icon-credit-card-alt
icon-google-wallet
@@ -901,6 +955,34 @@ Feel free to use them alongside your buttons.
+### Accessibility Icons
+
+
+
+
icon-american-sign-language-interpreting
+
icon-assistive-listening-systems
+
icon-audio-description
+
icon-blind
+
+
+
icon-braille
+
icon-cc
+
icon-deaf
+
icon-low-vision
+
+
+
icon-question-circle-o
+
icon-sign-language
+
icon-tty
+
icon-universal-access
+
+
+
icon-volume-control-phone
+
icon-wheelchair
+
icon-wheelchair-alt
+
+
+
### Gender Icons
diff --git a/modules/system/assets/ui/docs/list.md b/modules/system/assets/ui/docs/list.md
index d2261a9..4386a25 100644
--- a/modules/system/assets/ui/docs/list.md
+++ b/modules/system/assets/ui/docs/list.md
@@ -213,7 +213,7 @@ It might be fun to include a status column!
- Pending
+ Approved
The sun is shining
@@ -230,6 +230,60 @@ It might be fun to include a status column!
+
+### Badge column
+
+You can also include an icon badge inside a column.
+
+
+
### Linking rows
You may link an entire row by adding the `data-control="rowlink"` attribute to the table element. The first table data (TD) column with an anchor will be used to link the entire row. To bypass this behavior, simply add the `nolink` class to the column.
diff --git a/modules/system/assets/ui/docs/popup.md b/modules/system/assets/ui/docs/popup.md
index d8e91df..b7ed709 100644
--- a/modules/system/assets/ui/docs/popup.md
+++ b/modules/system/assets/ui/docs/popup.md
@@ -103,7 +103,7 @@ Using the `data-ajax` attribute you can refer to an external file or URL directl
### Options:
- content: content HTML string or callback
-### Data attributes:
+### Data attributes
- data-control="popup" - enables the ajax popup plugin
- data-ajax="popup-content.htm" - ajax content to load
- data-handler="onLoadContent" - October ajax request name
@@ -111,7 +111,7 @@ Using the `data-ajax` attribute you can refer to an external file or URL directl
- data-extra-data="file_id: 1" - October ajax request data
- data-size="large" - Popup size, available sizes: giant, huge, large, small, tiny
-### JavaScript API:
+### JavaScript API
```js
$('a#someLink').popup({ ajax: 'popup-content.htm' })
diff --git a/modules/system/assets/ui/docs/tab.md b/modules/system/assets/ui/docs/tab.md
index 2575136..5caddb2 100644
--- a/modules/system/assets/ui/docs/tab.md
+++ b/modules/system/assets/ui/docs/tab.md
@@ -120,7 +120,7 @@ Example with data attributes (data-control="tab"):
-### JavaScript API:
+### JavaScript API
- $('#mytabs').ocTab({closable: true, closeConfirmation: 'Close this tab? Unsaved data will be lost.'})
- $('#mytabs').ocTab('addTab', 'Tab title', 'Tab content', identifier) - adds tab. The optional identifier parameter allows to associate a identifier with a tab. The identifier can be used with the goTo() method to find and open a tab by it's identifier.
diff --git a/modules/system/assets/ui/font/FontAwesome.otf b/modules/system/assets/ui/font/FontAwesome.otf
index 681bdd4..d4de13e 100644
Binary files a/modules/system/assets/ui/font/FontAwesome.otf and b/modules/system/assets/ui/font/FontAwesome.otf differ
diff --git a/modules/system/assets/ui/font/fontawesome-webfont.eot b/modules/system/assets/ui/font/fontawesome-webfont.eot
index a30335d..c7b00d2 100644
Binary files a/modules/system/assets/ui/font/fontawesome-webfont.eot and b/modules/system/assets/ui/font/fontawesome-webfont.eot differ
diff --git a/modules/system/assets/ui/font/fontawesome-webfont.svg b/modules/system/assets/ui/font/fontawesome-webfont.svg
index 6fd19ab..8b66187 100644
--- a/modules/system/assets/ui/font/fontawesome-webfont.svg
+++ b/modules/system/assets/ui/font/fontawesome-webfont.svg
@@ -1,6 +1,6 @@
-