UI update

web/js/app.js

@@ -710,14 +710,15 @@ var App = {
     Core: {},
     // CONSTANT VALUES
     Constants: {
-        UNLIM_VALUE: 'unlimited',
-        UNLIM_TRANSLATED_VALUE: 'unlimited'
+        UNLIM_VALUE: 'unlimited', // overritten in i18n.js.php
+        UNLIM_TRANSLATED_VALUE: 'unlimited' // overritten in i18n.js.php
     }, 
     // Actions. More widly used funcs
     Actions: {
         DB:      {},
         WEB:     {},
-        PACKAGE: {}
+        PACKAGE: {},
+        MAIL_ACC:{}
     },
     // Utilities
     Helpers: {},
@@ -732,7 +733,8 @@ var App = {
     Listeners: {
         DB:      {},
         WEB:     {},
-        PACKAGE: {}
+        PACKAGE: {},
+        MAIL_ACC:{}
     },
     View:{
         HTML: {

web/js/i18n.js.php

@@ -1 +1,48 @@
-App.i18n.ARE_YOU_SURE = '<?php echo __('Are you sure?') ?>';
+<?php
+session_start();
+if (empty($_SESSION['language'])) {
+    $_SESSION['language'] = 'en';
+}
+require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
+
+if (!function_exists('_translate')) {
+    function _translate() {
+        global $LANG;
+
+        $args = func_get_args();
+        $l = $args[0];
+
+        if (!$l) return 'NO LANGUAGE DEFINED';
+        $key = $args[1];
+
+        if (!isset($LANG[$l])) {
+            require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
+        }
+
+        if (!isset($LANG[$l][$key])) {
+            $text=$key;
+        } else {
+            $text=$LANG[$l][$key];
+        }
+
+        array_shift($args);
+        if (count($args)>1) {
+            $args[0] = $text;
+            return call_user_func_array("sprintf",$args);
+        } else {
+            return $text;
+        }
+    }
+}
+
+if (!function_exists('__')) {
+    function __() {
+        $args = func_get_args();
+        array_unshift($args,$_SESSION['language']);
+        return call_user_func_array("_translate",$args);
+    }
+}
+?>
+
+App.i18n.ARE_YOU_SURE     = '<?php echo __('Are you sure?') ?>';
+App.Constants.UNLIM_VALUE = '<?php echo __('unlimited') ?>';

web/js/jquery.arcticmodal.js

@@ -0,0 +1,429 @@
+/*
+
+ arcticModal — jQuery plugin
+ Version: 0.3
+ Author: Sergey Predvoditelev (sergey.predvoditelev@gmail.com)
+ Company: Arctic Laboratory (http://arcticlab.ru/)
+
+ Docs & Examples: http://arcticlab.ru/arcticmodal/
+
+ */
+(function($) {
+
+
+	var default_options = {
+
+		type: 'html', // ajax или html
+		content: '',
+		url: '',
+		ajax: {},
+		ajax_request: null,
+
+		closeOnEsc: true,
+		closeOnOverlayClick: true,
+
+		clone: false,
+
+		overlay: {
+			block: undefined,
+			tpl: '<div class="arcticmodal-overlay"></div>',
+			css: {
+				backgroundColor: '#000',
+				opacity: .6
+			}
+		},
+
+		container: {
+			block: undefined,
+			tpl: '<div class="arcticmodal-container"><table class="arcticmodal-container_i"><tr><td class="arcticmodal-container_i2"></td></tr></table></div>'
+		},
+
+		wrap: undefined,
+		body: undefined,
+
+		errors: {
+			tpl: '<div class="arcticmodal-error arcticmodal-close"></div>',
+			autoclose_delay: 2000,
+			ajax_unsuccessful_load: 'Error'
+		},
+
+		openEffect: {
+			type: 'fade',
+			speed: 400
+		},
+		closeEffect: {
+			type: 'fade',
+			speed: 400
+		},
+
+		beforeOpen: $.noop,
+		afterOpen: $.noop,
+		beforeClose: $.noop,
+		afterClose: $.noop,
+		afterLoading: $.noop,
+		afterLoadingOnShow: $.noop,
+		errorLoading: $.noop
+
+	};
+
+
+	var modalID = 0;
+	var modals = $([]);
+
+
+	var utils = {
+
+
+		// Определяет произошло ли событие e вне блока block
+		isEventOut: function(blocks, e) {
+			var r = true;
+			$(blocks).each(function() {
+				if ($(e.target).get(0)==$(this).get(0)) r = false;
+				if ($(e.target).closest('HTML', $(this).get(0)).length==0) r = false;
+			});
+			return r;
+		}
+
+
+	};
+
+
+	var modal = {
+
+
+		// Возвращает элемент, которым был вызван плагин
+		getParentEl: function(el) {
+			var r = $(el);
+			if (r.data('arcticmodal')) return r;
+			r = $(el).closest('.arcticmodal-container').data('arcticmodalParentEl');
+			if (r) return r;
+			return false;
+		},
+
+
+		// Переход
+		transition: function(el, action, options, callback) {
+			callback = callback==undefined ? $.noop : callback;
+			switch (options.type) {
+				case 'fade':
+					action=='show' ? el.fadeIn(options.speed, callback) : el.fadeOut(options.speed, callback);
+					break;
+				case 'none':
+					action=='show' ? el.show() : el.hide();
+					callback();
+					break;
+			}
+		},
+
+
+		// Подготвка содержимого окна
+		prepare_body: function(D, $this) {
+
+			// Обработчик закрытия
+			$('.arcticmodal-close', D.body).unbind('click.arcticmodal').bind('click.arcticmodal', function() {
+				$this.arcticmodal('close');
+				return false;
+			});
+
+		},
+
+
+		// Инициализация элемента
+		init_el: function($this, options) {
+			var D = $this.data('arcticmodal');
+			if (D) return;
+
+			D = options;
+			modalID++;
+			D.modalID = modalID;
+
+			// Overlay
+			D.overlay.block = $(D.overlay.tpl);
+			D.overlay.block.css(D.overlay.css);
+
+			// Container
+			D.container.block = $(D.container.tpl);
+
+			// BODY
+			D.body = $('.arcticmodal-container_i2', D.container.block);
+			if (options.clone) {
+				D.body.html($this.clone(true));
+			} else {
+				$this.before('<div id="arcticmodalReserve' + D.modalID + '" style="display: none" />');
+				D.body.html($this);
+			}
+
+			// Подготовка содержимого
+			modal.prepare_body(D, $this);
+
+			// Закрытие при клике на overlay
+			if (D.closeOnOverlayClick)
+				D.overlay.block.add(D.container.block).click(function(e) {
+					if (utils.isEventOut($('>*', D.body), e))
+						$this.arcticmodal('close');
+				});
+
+			// Запомним настройки
+			D.container.block.data('arcticmodalParentEl', $this);
+			$this.data('arcticmodal', D);
+			modals = $.merge(modals, $this);
+
+			// Показать
+			$.proxy(actions.show, $this)();
+			if (D.type=='html') return $this;
+
+			// Ajax-загрузка
+			if (D.ajax.beforeSend!=undefined) {
+				var fn_beforeSend = D.ajax.beforeSend;
+				delete D.ajax.beforeSend;
+			}
+			if (D.ajax.success!=undefined) {
+				var fn_success = D.ajax.success;
+				delete D.ajax.success;
+			}
+			if (D.ajax.error!=undefined) {
+				var fn_error = D.ajax.error;
+				delete D.ajax.error;
+			}
+			var o = $.extend(true, {
+				url: D.url,
+				beforeSend: function() {
+					if (fn_beforeSend==undefined) {
+						D.body.html('<div class="arcticmodal-loading" />');
+					} else {
+						fn_beforeSend(D, $this);
+					}
+				},
+				success: function(responce) {
+
+					// Событие после загрузки до показа содержимого
+					$this.trigger('afterLoading');
+					D.afterLoading(D, $this, responce);
+
+					if (fn_success==undefined) {
+						D.body.html(responce);
+					} else {
+						fn_success(D, $this, responce);
+					}
+					modal.prepare_body(D, $this);
+
+					// Событие после загрузки после отображения содержимого
+					$this.trigger('afterLoadingOnShow');
+					D.afterLoadingOnShow(D, $this, responce);
+
+				},
+				error: function() {
+
+					// Событие при ошибке загрузки
+					$this.trigger('errorLoading');
+					D.errorLoading(D, $this);
+
+					if (fn_error==undefined) {
+						D.body.html(D.errors.tpl);
+						$('.arcticmodal-error', D.body).html(D.errors.ajax_unsuccessful_load);
+						$('.arcticmodal-close', D.body).click(function() {
+							$this.arcticmodal('close');
+							return false;
+						});
+						if (D.errors.autoclose_delay)
+							setTimeout(function() {
+								$this.arcticmodal('close');
+							}, D.errors.autoclose_delay);
+					} else {
+						fn_error(D, $this);
+					}
+				}
+			}, D.ajax);
+			D.ajax_request = $.ajax(o);
+
+			// Запомнить настройки
+			$this.data('arcticmodal', D);
+
+		},
+
+
+		// Инициализация
+		init: function(options) {
+			options = $.extend(true, {}, default_options, options);
+			if ($.isFunction(this)) {
+				if (options==undefined) {
+					$.error('jquery.arcticmodal: Uncorrect parameters');
+					return;
+				}
+				if (options.type=='') {
+					$.error('jquery.arcticmodal: Don\'t set parameter "type"');
+					return;
+				}
+				switch (options.type) {
+					case 'html':
+						if (options.content=='') {
+							$.error('jquery.arcticmodal: Don\'t set parameter "content"');
+							return
+						}
+						var c = options.content;
+						options.content = '';
+
+						return modal.init_el($(c), options);
+						break;
+					case 'ajax':
+						if (options.url=='') {
+							$.error('jquery.arcticmodal: Don\'t set parameter "url"');
+							return;
+						}
+						return modal.init_el($('<div />'), options);
+						break;
+				}
+			} else {
+				return this.each(function() {
+					modal.init_el($(this), $.extend(true, {}, options));
+				});
+			}
+		}
+
+
+	};
+
+
+	var actions = {
+
+
+		// Показать
+		show: function() {
+			var $this = modal.getParentEl(this);
+			if ($this===false) {
+				$.error('jquery.arcticmodal: Uncorrect call');
+				return;
+			}
+			var D = $this.data('arcticmodal');
+
+			// Добавить overlay и container
+			D.overlay.block.hide();
+			D.container.block.hide();
+			$('BODY').append(D.overlay.block);
+			$('BODY').append(D.container.block);
+
+			// Событие
+			D.beforeOpen(D, $this);
+			$this.trigger('beforeOpen');
+
+			// Wrap
+			if (D.wrap.css('overflow')!='hidden') {
+				D.wrap.data('arcticmodalOverflow', D.wrap.css('overflow'));
+				var w1 = D.wrap.outerWidth(true);
+				D.wrap.css('overflow', 'hidden');
+				var w2 = D.wrap.outerWidth(true);
+				if (w2!=w1)
+					D.wrap.css('marginRight', (w2 - w1) + 'px');
+			}
+
+			// Скрыть предыдущие оверлеи
+			modals.not($this).each(function() {
+				var d = $(this).data('arcticmodal');
+				d.overlay.block.hide();
+			});
+
+			// Показать
+			modal.transition(D.overlay.block, 'show', modals.length>1 ? {type: 'none'} : D.openEffect);
+			modal.transition(D.container.block, 'show', modals.length>1 ? {type: 'none'} : D.openEffect, function() {
+				D.afterOpen(D, $this);
+				$this.trigger('afterOpen');
+			});
+
+			return $this;
+		},
+
+
+		// Закрыть
+		close: function() {
+			if ($.isFunction(this)) {
+				modals.each(function() {
+					$(this).arcticmodal('close');
+				});
+			} else {
+				return this.each(function() {
+					var $this = modal.getParentEl(this);
+					if ($this===false) {
+						$.error('jquery.arcticmodal: Uncorrect call');
+						return;
+					}
+					var D = $this.data('arcticmodal');
+
+					// Событие перед закрытием
+					if (D.beforeClose(D, $this)===false) return;
+					$this.trigger('beforeClose');
+
+					// Показать предыдущие оверлеи
+					modals.not($this).last().each(function() {
+						var d = $(this).data('arcticmodal');
+						d.overlay.block.show();
+					});
+
+					modal.transition(D.overlay.block, 'hide', modals.length>1 ? {type: 'none'} : D.closeEffect);
+					modal.transition(D.container.block, 'hide', modals.length>1 ? {type: 'none'} : D.closeEffect, function() {
+
+						// Событие после закрытия
+						D.afterClose(D, $this);
+						$this.trigger('afterClose');
+
+						// Если не клонировали - вернём на место
+						if (!D.clone)
+							$('#arcticmodalReserve' + D.modalID).replaceWith(D.body.find('>*'));
+
+						D.overlay.block.remove();
+						D.container.block.remove();
+						$this.data('arcticmodal', null);
+						if (!$('.arcticmodal-container').length) {
+							if (D.wrap.data('arcticmodalOverflow'))
+								D.wrap.css('overflow', D.wrap.data('arcticmodalOverflow'));
+							D.wrap.css('marginRight', 0);
+						}
+
+					});
+
+					if (D.type=='ajax')
+						D.ajax_request.abort();
+
+					modals = modals.not($this);
+				});
+			}
+		},
+
+
+		// Установить опции по-умолчанию
+		setDefault: function(options) {
+			$.extend(true, default_options, options);
+		}
+
+
+	};
+
+
+	$(function() {
+		default_options.wrap = $((document.all && !document.querySelector) ? 'html' : 'body');
+	});
+
+
+	// Закрытие при нажатии Escape
+	$(document).bind('keyup.arcticmodal', function(e) {
+		var m = modals.last();
+		if (!m.length) return;
+		var D = m.data('arcticmodal');
+		if (D.closeOnEsc && (e.keyCode===27))
+			m.arcticmodal('close');
+	});
+
+
+	$.arcticmodal = $.fn.arcticmodal = function(method) {
+
+		if (actions[method]) {
+			return actions[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method==='object' || !method) {
+			return modal.init.apply(this, arguments);
+		} else {
+			$.error('jquery.arcticmodal: Method ' + method + ' does not exist');
+		}
+
+	};
+
+
+})(jQuery);

web/js/jquery.finder.js

@@ -175,7 +175,7 @@
                         var c = f.get.clicks(p,o,$(this));
                         
                         var ref = $(e.target);
-                        if (ref.parents('.l-unit').hasClass('selected') && $('.l-unit.selected').length == 1) {
+                        if (ref.parents('.l-unit').hasClass('selected')/* && $('.l-unit.selected').length == 1*/) {
                             ref.parents('.l-unit').find('.ch-toggle').attr('checked', false);
                             ref.parents('.l-unit').removeClass('selected');
                             ref.parents('.l-unit').removeClass('selected-current');
@@ -481,7 +481,7 @@
         },
         singleClick: function(p,c,o) {
             var s = f.get.siblings(p,o);
-            f.h.off(s, o);
+            //f.h.off(s, o);
             f.h.on(c.current.v, o);
             f.set.clicks(c.current.v, null, null, p, o);
         },

web/js/pages/add.mail_acc.js

@@ -0,0 +1,76 @@
+App.Actions.MAIL_ACC.enable_unlimited = function(elm, source_elm) {
+    $(elm).data('checked', true);
+    $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
+    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).attr('disabled', true);
+    $(source_elm).css('opacity', '1');
+}
+
+App.Actions.MAIL_ACC.disable_unlimited = function(elm, source_elm) {
+    $(elm).data('checked', false);
+    if ($(elm).data('prev_value') && $(elm).data('prev_value').trim() != '') {
+        var prev_value = $(elm).data('prev_value').trim();
+        $(elm).val(prev_value);
+        if (App.Helpers.isUnlimitedValue(prev_value)) {
+            $(elm).val('0');
+        }
+    }
+    else {
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val('0');
+        }
+    }
+    $(elm).attr('disabled', false);
+    $(source_elm).css('opacity', '0.5');
+}
+
+// 
+App.Actions.MAIL_ACC.toggle_unlimited_feature = function(evt) {
+    var elm = $(evt.target);
+    var ref = elm.prev('.vst-input');
+    if (!$(ref).data('checked')) {
+        App.Actions.MAIL_ACC.enable_unlimited(ref, elm);
+    }
+    else {
+        App.Actions.MAIL_ACC.disable_unlimited(ref, elm);
+    }
+}
+
+App.Listeners.MAIL_ACC.checkbox_unlimited_feature = function() {
+    $('.unlim-trigger').on('click', App.Actions.MAIL_ACC.toggle_unlimited_feature);
+}
+
+App.Listeners.MAIL_ACC.init = function() {
+    $('.unlim-trigger').each(function(i, elm) {
+        var ref = $(elm).prev('.vst-input');
+        if (App.Helpers.isUnlimitedValue($(ref).val())) {
+            App.Actions.MAIL_ACC.enable_unlimited(ref, elm);
+        }
+        else {
+            $(ref).data('prev_value', $(ref).val());
+            App.Actions.MAIL_ACC.disable_unlimited(ref, elm);
+        }
+    });
+}
+
+App.Helpers.isUnlimitedValue = function(value) {
+    var value = value.trim();
+    if (value == App.Constants.UNLIM_VALUE || value == App.Constants.UNLIM_TRANSLATED_VALUE) {
+        return true;
+    }
+
+    return false;
+}
+
+//
+// Page entry point
+// Trigger listeners
+App.Listeners.MAIL_ACC.init();
+App.Listeners.MAIL_ACC.checkbox_unlimited_feature();
+$('form[name="v_quota"]').bind('submit', function(evt) {
+    $('input:disabled').each(function(i, elm) {
+        $(elm).attr('disabled', false);
+    });
+});
+
+

web/js/pages/edit.mail_acc.js

@@ -0,0 +1,76 @@
+App.Actions.MAIL_ACC.enable_unlimited = function(elm, source_elm) {
+    $(elm).data('checked', true);
+    $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
+    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).attr('disabled', true);
+    $(source_elm).css('opacity', '1');
+}
+
+App.Actions.MAIL_ACC.disable_unlimited = function(elm, source_elm) {
+    $(elm).data('checked', false);
+    if ($(elm).data('prev_value') && $(elm).data('prev_value').trim() != '') {
+        var prev_value = $(elm).data('prev_value').trim();
+        $(elm).val(prev_value);
+        if (App.Helpers.isUnlimitedValue(prev_value)) {
+            $(elm).val('0');
+        }
+    }
+    else {
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val('0');
+        }
+    }
+    $(elm).attr('disabled', false);
+    $(source_elm).css('opacity', '0.5');
+}
+
+// 
+App.Actions.MAIL_ACC.toggle_unlimited_feature = function(evt) {
+    var elm = $(evt.target);
+    var ref = elm.prev('.vst-input');
+    if (!$(ref).data('checked')) {
+        App.Actions.MAIL_ACC.enable_unlimited(ref, elm);
+    }
+    else {
+        App.Actions.MAIL_ACC.disable_unlimited(ref, elm);
+    }
+}
+
+App.Listeners.MAIL_ACC.checkbox_unlimited_feature = function() {
+    $('.unlim-trigger').on('click', App.Actions.MAIL_ACC.toggle_unlimited_feature);
+}
+
+App.Listeners.MAIL_ACC.init = function() {
+    $('.unlim-trigger').each(function(i, elm) {
+        var ref = $(elm).prev('.vst-input');
+        if (App.Helpers.isUnlimitedValue($(ref).val())) {
+            App.Actions.MAIL_ACC.enable_unlimited(ref, elm);
+        }
+        else {
+            $(ref).data('prev_value', $(ref).val());
+            App.Actions.MAIL_ACC.disable_unlimited(ref, elm);
+        }
+    });
+}
+
+App.Helpers.isUnlimitedValue = function(value) {
+    var value = value.trim();
+    if (value == App.Constants.UNLIM_VALUE || value == App.Constants.UNLIM_TRANSLATED_VALUE) {
+        return true;
+    }
+
+    return false;
+}
+
+//
+// Page entry point
+// Trigger listeners
+App.Listeners.MAIL_ACC.init();
+App.Listeners.MAIL_ACC.checkbox_unlimited_feature();
+$('form[name="v_quota"]').bind('submit', function(evt) {
+    $('input:disabled').each(function(i, elm) {
+        $(elm).attr('disabled', false);
+    });
+});
+
+