$/i, ''));
- }
-
- return;
- }
- else this.dblEnter++;
- }
- else this.dblEnter++;
- }
-
- // pre
- if (pre === true)
- {
- return this.buildEventKeydownPre(e, current);
- }
- else
- {
- if (!this.opts.linebreaks)
- {
- // lists exit
- if (block && block.tagName == 'LI')
- {
- var listCurrent = this.getBlock();
- if (listCurrent !== false || listCurrent.tagName === 'LI')
- {
- var listText = $.trim($(block).text());
- var listCurrentText = $.trim($(listCurrent).text());
- if (listText == ''
- && listCurrentText == ''
- && $(listCurrent).next('li').size() == 0
- && $(listCurrent).parents('li').size() == 0)
- {
- this.bufferSet();
-
- var $list = $(listCurrent).closest('ol, ul');
- $(listCurrent).remove();
- var node = $('' + this.opts.invisibleSpace + '
');
- $list.after(node);
- this.selectionStart(node);
-
- this.sync();
- this.callback('enter', e);
- return false;
- }
- }
-
- }
-
- // replace div to p
- if (block && this.opts.rBlockTest.test(block.tagName))
- {
- // hit enter
- this.bufferSet();
-
- setTimeout($.proxy(function()
- {
- var blockElem = this.getBlock();
- if (blockElem.tagName === 'DIV' && !$(blockElem).hasClass('redactor_editor'))
- {
- var node = $('' + this.opts.invisibleSpace + '
');
- $(blockElem).replaceWith(node);
- this.selectionStart(node);
- }
-
- }, this), 1);
- }
- else if (block === false)
- {
- // hit enter
- this.bufferSet();
- var node = $('' + this.opts.invisibleSpace + '
');
- this.insertNode(node[0]);
- this.selectionStart(node);
- this.callback('enter', e);
- return false;
- }
-
- }
-
- if (this.opts.linebreaks)
- {
- // replace div to br
- if (block && this.opts.rBlockTest.test(block.tagName))
- {
- // hit enter
- this.bufferSet();
-
- setTimeout($.proxy(function()
- {
- var blockElem = this.getBlock();
- if ((blockElem.tagName === 'DIV' || blockElem.tagName === 'P') && !$(blockElem).hasClass('redactor_editor'))
- {
- this.replaceLineBreak(blockElem);
- }
-
- }, this), 1);
- }
- else
- {
- return this.buildEventKeydownInsertLineBreak(e);
- }
- }
-
- // blockquote, figcaption
- if (block.tagName == 'BLOCKQUOTE' || block.tagName == 'FIGCAPTION')
- {
- return this.buildEventKeydownInsertLineBreak(e);
- }
-
- }
-
- this.callback('enter', e);
- }
- else if (key === this.keyCode.ENTER && (e.ctrlKey || e.shiftKey)) // Shift+Enter or Ctrl+Enter
- {
- this.bufferSet();
-
- e.preventDefault();
- this.insertLineBreak();
- }
-
- // tab (cmd + [)
- if ((key === this.keyCode.TAB || e.metaKey && key === 219) && this.opts.shortcuts)
- {
- return this.buildEventKeydownTab(e, pre, key);
- }
-
- // delete zero-width space before the removing
- if (key === this.keyCode.BACKSPACE) this.buildEventKeydownBackspace(e, current, parent);
-
- },
- buildEventKeydownPre: function(e, current)
- {
- e.preventDefault();
- this.bufferSet();
- var html = $(current).parent().text();
- this.insertNode(document.createTextNode('\n'));
- if (html.search(/\s$/) == -1)
- {
- this.insertNode(document.createTextNode('\n'));
- }
-
- this.sync();
- this.callback('enter', e);
- return false;
- },
- buildEventKeydownTab: function(e, pre, key)
- {
- if (!this.opts.tabFocus) return true;
- if (this.isEmpty(this.get()) && this.opts.tabSpaces === false) return true;
-
- e.preventDefault();
-
- if (pre === true && !e.shiftKey)
- {
- this.bufferSet();
- this.insertNode(document.createTextNode('\t'));
- this.sync();
- return false;
-
- }
- else if (this.opts.tabSpaces !== false)
- {
- this.bufferSet();
- this.insertNode(document.createTextNode(Array(this.opts.tabSpaces + 1).join('\u00a0')));
- this.sync();
- return false;
- }
- else
- {
- if (!e.shiftKey) this.indentingIndent();
- else this.indentingOutdent();
- }
-
- return false;
- },
- buildEventKeydownBackspace: function(e, current, parent)
- {
- // remove empty list in table
- if (parent && current && parent.parentNode.tagName == 'TD'
- && parent.tagName == 'UL' && current.tagName == 'LI' && $(parent).children('li').size() == 1)
- {
- var text = $(current).text().replace(/[\u200B-\u200D\uFEFF]/g, '');
- if (text == '')
- {
- var node = parent.parentNode;
- $(parent).remove();
- this.selectionStart(node);
- this.sync();
- return false;
- }
- }
-
- if (typeof current.tagName !== 'undefined' && /^(H[1-6])$/i.test(current.tagName))
- {
- var node;
- if (this.opts.linebreaks === false) node = $('' + this.opts.invisibleSpace + '
');
- else node = $('').append($(current).clone());
- $(current).replaceWith(node);
- var next = $(node).next();
- if (typeof(next[0]) !== 'undefined' && next[0].tagName == 'BR')
- {
- next.remove();
- }
-
- this.selectionEnd(node);
- }
-
- // convert links
- if ((this.opts.convertLinks || this.opts.convertImageLinks || this.opts.convertVideoLinks) && key === this.keyCode.ENTER)
- {
- this.buildEventKeyupConverters();
- }
-
- // if empty
- if (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE)
- {
- return this.formatEmpty(e);
- }
-
- this.callback('keyup', e);
- this.sync(e);
- },
- buildEventKeyupConverters: function()
- {
- this.formatLinkify(this.opts.linkProtocol, this.opts.convertLinks, this.opts.convertImageLinks, this.opts.convertVideoLinks, this.opts.linkSize);
-
- setTimeout($.proxy(function()
- {
- if (this.opts.convertImageLinks) this.observeImages();
- if (this.opts.observeLinks) this.observeLinks();
- }, this), 5);
- },
- buildPlugins: function()
- {
- if (!this.opts.plugins ) return;
-
- $.each(this.opts.plugins, $.proxy(function(i, s)
- {
- if (RedactorPlugins[s])
- {
- $.extend(this, RedactorPlugins[s]);
- if ($.isFunction( RedactorPlugins[ s ].init)) this.init();
- }
-
- }, this ));
- },
-
- // IFRAME
- iframeStart: function()
- {
- this.iframeCreate();
-
- if (this.opts.textareamode) this.iframeAppend(this.$source);
- else
- {
- this.$sourceOld = this.$source.hide();
- this.$source = this.buildCodearea(this.$sourceOld);
- this.iframeAppend(this.$sourceOld);
- }
- },
- iframeAppend: function(el)
- {
- this.$source.attr('dir', this.opts.direction).hide();
- this.$box.insertAfter(el).append(this.$frame).append(this.$source);
- },
- iframeCreate: function()
- {
- this.$frame = $('').one('load', $.proxy(function()
- {
- if (this.opts.fullpage)
- {
- this.iframePage();
-
- if (this.content === '') this.content = this.opts.invisibleSpace;
-
- this.$frame.contents()[0].write(this.content);
- this.$frame.contents()[0].close();
-
- var timer = setInterval($.proxy(function()
- {
- if (this.$frame.contents().find('body').html())
- {
- clearInterval(timer);
- this.iframeLoad();
- }
-
- }, this), 0);
- }
- else this.iframeLoad();
-
- }, this));
- },
- iframeDoc: function()
- {
- return this.$frame[0].contentWindow.document;
- },
- iframePage: function()
- {
- var doc = this.iframeDoc();
- if (doc.documentElement) doc.removeChild(doc.documentElement);
-
- return doc;
- },
- iframeAddCss: function(css)
- {
- css = css || this.opts.css;
-
- if (this.isString(css))
- {
- this.$frame.contents().find('head').append('').data('redactor', 'verified')
- .attr('contenteditable', false).text(this.placeholderText);
-
- if (this.opts.linebreaks === false)
- {
- return $('').append(ph);
- }
- else return ph;
- },
- placeholderBlur: function()
- {
- var html = this.get();
- if (this.isEmpty(html))
- {
- this.placeholderOnFocus();
- this.$editor.html(this.placeholderGet());
- }
- },
- placeholderFocus: function()
- {
- this.$editor.find('span.redactor_placeholder').remove();
-
- var html = '';
- if (this.opts.linebreaks === false)
- {
- html = this.opts.emptyHtml;
- }
-
- this.$editor.off('focus.redactor_placeholder');
- this.$editor.html(html);
-
- if (this.opts.linebreaks === false)
- {
- // place the cursor inside emptyHtml
- this.selectionStart(this.$editor.children()[0]);
- }
- else
- {
- this.focus();
- }
-
- this.sync();
- },
- placeholderRemoveFromEditor: function()
- {
- this.$editor.find('span.redactor_placeholder').remove();
- this.$editor.off('focus.redactor_placeholder');
- },
- placeholderRemoveFromCode: function(html)
- {
- return html.replace(/(.*?)<\/span>/i, '');
- },
-
- // SHORTCUTS
- shortcuts: function(e, key)
- {
-
- // disable browser's hot keys for bold and italic
- if (!this.opts.shortcuts)
- {
- if ((e.ctrlKey || e.metaKey) && (key === 66 || key === 73))
- {
- e.preventDefault();
- }
-
- return false;
- }
-
- $.each(this.opts.shortcuts, $.proxy(function(str, command)
- {
- var keys = str.split(',');
- for (var i in keys)
- {
- if (typeof keys[i] === 'string')
- {
- this.shortcutsHandler(e, $.trim(keys[i]), $.proxy(function()
- {
- eval(command);
- }, this));
- }
-
- }
-
- }, this));
-
-
- },
- shortcutsHandler: function(e, keys, origHandler)
- {
- // based on https://github.com/jeresig/jquery.hotkeys
- var hotkeysSpecialKeys =
- {
- 8: "backspace", 9: "tab", 10: "return", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
- 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
- 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 59: ";", 61: "=",
- 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
- 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
- 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
- 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=",
- 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 221: "]", 222: "'"
- };
-
-
- var hotkeysShiftNums =
- {
- "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
- "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
- ".": ">", "/": "?", "\\": "|"
- };
-
- keys = keys.toLowerCase().split(" ");
- var special = hotkeysSpecialKeys[e.keyCode],
- character = String.fromCharCode( e.which ).toLowerCase(),
- modif = "", possible = {};
-
- $.each([ "alt", "ctrl", "meta", "shift"], function(index, specialKey)
- {
- if (e[specialKey + 'Key'] && special !== specialKey)
- {
- modif += specialKey + '+';
- }
- });
-
-
- if (special)
- {
- possible[modif + special] = true;
- }
-
- if (character)
- {
- possible[modif + character] = true;
- possible[modif + hotkeysShiftNums[character]] = true;
-
- // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
- if (modif === "shift+")
- {
- possible[hotkeysShiftNums[character]] = true;
- }
- }
-
- for (var i = 0, l = keys.length; i < l; i++)
- {
- if (possible[keys[i]])
- {
- e.preventDefault();
- return origHandler.apply(this, arguments);
- }
- }
- },
-
- // FOCUS
- focus: function()
- {
- if (!this.browser('opera'))
- {
- this.window.setTimeout($.proxy(this.focusSet, this, true), 1);
- }
- else
- {
- this.$editor.focus();
- }
- },
- focusWithSaveScroll: function()
- {
- if (this.browser('msie'))
- {
- var top = this.document.documentElement.scrollTop;
- }
-
- this.$editor.focus();
-
- if (this.browser('msie'))
- {
- this.document.documentElement.scrollTop = top;
- }
- },
- focusEnd: function()
- {
- if (!this.browser('mozilla'))
- {
- this.focusSet();
- }
- else
- {
- if (this.opts.linebreaks === false)
- {
- var last = this.$editor.children().last();
-
- this.$editor.focus();
- this.selectionEnd(last);
- }
- else
- {
- this.focusSet();
- }
- }
- },
- focusSet: function(collapse, element)
- {
- this.$editor.focus();
-
- if (typeof element == 'undefined')
- {
- element = this.$editor[0];
- }
-
- var range = this.getRange();
- range.selectNodeContents(element);
-
- // collapse - controls the position of focus: the beginning (true), at the end (false).
- range.collapse(collapse || false);
-
- var sel = this.getSelection();
- sel.removeAllRanges();
- sel.addRange(range);
- },
-
- // TOGGLE
- toggle: function(direct)
- {
- if (this.opts.visual) this.toggleCode(direct);
- else this.toggleVisual();
- },
- toggleVisual: function()
- {
- var html = this.$source.hide().val();
- if (typeof this.modified !== 'undefined')
- {
- var modified = this.modified.replace(/\n/g, '');
-
- var thtml = html.replace(/\n/g, '');
- thtml = this.cleanRemoveSpaces(thtml, false);
-
- this.modified = this.cleanRemoveSpaces(modified, false) !== thtml;
- }
-
- if (this.modified)
- {
- // don't remove the iframe even if cleared all.
- if (this.opts.fullpage && html === '')
- {
- this.setFullpageOnInit(html);
- }
- else
- {
- this.set(html);
- if (this.opts.fullpage)
- {
- this.buildBindKeyboard();
- }
- }
-
- this.callback('change', false, html);
- }
-
- if (this.opts.iframe) this.$frame.show();
- else this.$editor.show();
-
- if (this.opts.fullpage) this.$editor.attr('contenteditable', true );
-
- this.$source.off('keydown.redactor-textarea-indenting');
-
- this.$editor.focus();
- this.selectionRestore();
-
- this.observeStart();
- this.buttonActiveVisual();
- this.buttonInactive('html');
- this.opts.visual = true;
-
-
- },
- toggleCode: function(direct)
- {
- if (direct !== false) this.selectionSave();
-
- var height = null;
- if (this.opts.iframe)
- {
- height = this.$frame.height();
- if (this.opts.fullpage) this.$editor.removeAttr('contenteditable');
- this.$frame.hide();
- }
- else
- {
- height = this.$editor.innerHeight();
- this.$editor.hide();
- }
-
- var html = this.$source.val();
-
- // tidy html
- if (html !== '' && this.opts.tidyHtml)
- {
- this.$source.val(this.cleanHtml(html));
- }
-
- this.modified = html;
-
- this.$source.height(height).show().focus();
-
- // textarea indenting
- this.$source.on('keydown.redactor-textarea-indenting', this.textareaIndenting);
-
- this.buttonInactiveVisual();
- this.buttonActive('html');
- this.opts.visual = false;
- },
- textareaIndenting: function(e)
- {
- if (e.keyCode === 9)
- {
- var $el = $(this);
- var start = $el.get(0).selectionStart;
- $el.val($el.val().substring(0, start) + "\t" + $el.val().substring($el.get(0).selectionEnd));
- $el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
- return false;
- }
- },
-
- // AUTOSAVE
- autosave: function()
- {
- var savedHtml = false;
- this.autosaveInterval = setInterval($.proxy(function()
- {
- var html = this.get();
- if (savedHtml !== html)
- {
- var name = this.$source.attr('name');
- $.ajax({
- url: this.opts.autosave,
- type: 'post',
- data: 'name=' + name + '&' + name + '=' + escape(encodeURIComponent(html)),
- success: $.proxy(function(data)
- {
- var json = $.parseJSON(data);
- if (typeof json.error == 'undefined')
- {
- // success
- this.callback('autosave', false, json);
- }
- else
- {
- // error
- this.callback('autosaveError', false, json);
- }
-
- savedHtml = html;
-
- }, this)
- });
- }
- }, this), this.opts.autosaveInterval*1000);
- },
-
- // TOOLBAR
- toolbarBuild: function()
- {
- // hide on mobile
- if (this.isMobile() && this.opts.buttonsHideOnMobile.length > 0)
- {
- $.each(this.opts.buttonsHideOnMobile, $.proxy(function(i, s)
- {
- var index = this.opts.buttons.indexOf(s);
- this.opts.buttons.splice(index, 1);
-
- }, this));
- }
-
- // extend buttons
- if (this.opts.air)
- {
- this.opts.buttons = this.opts.airButtons;
- }
- else
- {
- if (!this.opts.buttonSource)
- {
- var index = this.opts.buttons.indexOf('html');
- this.opts.buttons.splice(index, 1);
- }
- }
-
- // formatting tags
- if (this.opts.toolbar)
- {
- $.each(this.opts.toolbar.formatting.dropdown, $.proxy(function (i, s)
- {
- if ($.inArray(i, this.opts.formattingTags ) == '-1') delete this.opts.toolbar.formatting.dropdown[i];
-
- }, this));
- }
-
- // if no buttons don't create a toolbar
- if (this.opts.buttons.length === 0) return false;
-
- // air enable
- this.airEnable();
-
- // toolbar build
- this.$toolbar = $('').addClass('redactor_toolbar').attr('id', 'redactor_toolbar_' + this.uuid);
-
- if (this.opts.typewriter)
- {
- this.$toolbar.addClass('redactor-toolbar-typewriter');
- }
-
- if (this.opts.toolbarOverflow && this.isMobile())
- {
- this.$toolbar.addClass('redactor-toolbar-overflow');
- }
-
- if (this.opts.air)
- {
- // air box
- this.$air = $('').attr('id', 'redactor_air_' + this.uuid).hide();
- this.$air.append(this.$toolbar);
- $('body').append(this.$air);
- }
- else
- {
- if (this.opts.toolbarExternal)
- {
- this.$toolbar.addClass('redactor-toolbar-external');
- $(this.opts.toolbarExternal).html(this.$toolbar);
- }
- else this.$box.prepend(this.$toolbar);
- }
-
- $.each(this.opts.buttons, $.proxy(function(i, btnName)
- {
- if (this.opts.toolbar[btnName])
- {
- var btnObject = this.opts.toolbar[btnName];
- if (this.opts.fileUpload === false && btnName === 'file') return true;
- this.$toolbar.append( $('
').append(this.buttonBuild(btnName, btnObject)));
- }
-
- }, this));
-
- this.$toolbar.find('a').attr('tabindex', '-1');
-
- // fixed
- if (this.opts.toolbarFixed)
- {
- this.toolbarObserveScroll();
- $(this.opts.toolbarFixedTarget).on('scroll.redactor', $.proxy(this.toolbarObserveScroll, this));
- }
-
- // buttons response
- if (this.opts.activeButtons)
- {
- this.$editor.on('mouseup.redactor keyup.redactor', $.proxy(this.buttonActiveObserver, this));
- }
- },
- toolbarObserveScroll: function()
- {
- var scrollTop = $(this.opts.toolbarFixedTarget).scrollTop();
-
- var boxTop = 0;
- var left = 0;
- var end = 0;
-
- if (this.opts.toolbarFixedTarget === document)
- {
- boxTop = this.$box.offset().top;
- }
- else
- {
- boxTop = 1;
- }
-
- end = boxTop + this.$box.height() + 40;
-
- if (scrollTop > boxTop)
- {
- var width = '100%';
- if (this.opts.toolbarFixedBox)
- {
- left = this.$box.offset().left;
- width = this.$box.innerWidth();
- this.$toolbar.addClass('toolbar_fixed_box');
- }
-
- this.toolbarFixed = true;
-
- if (this.opts.toolbarFixedTarget === document)
- {
- this.$toolbar.css({
- position: 'fixed',
- width: width,
- zIndex: 10005,
- top: this.opts.toolbarFixedTopOffset + 'px',
- left: left
- });
- }
- else
- {
- this.$toolbar.css({
- position: 'absolute',
- width: width,
- zIndex: 10005,
- top: (this.opts.toolbarFixedTopOffset + scrollTop) + 'px',
- left: 0
- });
- }
-
- if (scrollTop < end) this.$toolbar.css('visibility', 'visible');
- else this.$toolbar.css('visibility', 'hidden');
- }
- else
- {
- this.toolbarFixed = false;
- this.$toolbar.css({
- position: 'relative',
- width: 'auto',
- top: 0,
- left: left
- });
-
- if (this.opts.toolbarFixedBox) this.$toolbar.removeClass('toolbar_fixed_box');
- }
- },
-
- // AIR
- airEnable: function()
- {
- if (!this.opts.air) return;
-
- this.$editor.on('mouseup.redactor keyup.redactor', this, $.proxy(function(e)
- {
- var text = this.getSelectionText();
-
- if (e.type === 'mouseup' && text != '') this.airShow(e);
- if (e.type === 'keyup' && e.shiftKey && text != '')
- {
- var $focusElem = $(this.getElement(this.getSelection().focusNode)), offset = $focusElem.offset();
- offset.height = $focusElem.height();
- this.airShow(offset, true);
- }
-
- }, this));
- },
- airShow: function (e, keyboard)
- {
- if (!this.opts.air) return;
-
- this.selectionSave();
-
- var left, top;
- $('.redactor_air').hide();
-
- if (keyboard)
- {
- left = e.left;
- top = e.top + e.height + 14;
-
- if (this.opts.iframe)
- {
- top += this.$box.position().top - $(this.document).scrollTop();
- left += this.$box.position().left;
- }
- }
- else
- {
- var width = this.$air.innerWidth();
-
- left = e.clientX;
- if ($(this.document).width() < (left + width)) left -= width;
-
- top = e.clientY + 14;
- if (this.opts.iframe)
- {
- top += this.$box.position().top;
- left += this.$box.position().left;
- }
- else top += $( this.document ).scrollTop();
- }
-
- this.$air.css({
- left: left + 'px',
- top: top + 'px'
- }).show();
-
- this.airBindHide();
- },
- airBindHide: function()
- {
- if (!this.opts.air) return;
-
- var hideHandler = $.proxy(function(doc)
- {
- $(doc).on('mousedown.redactor', $.proxy(function(e)
- {
- if ($( e.target ).closest(this.$toolbar).length === 0)
- {
- this.$air.fadeOut(100);
- this.selectionRemove();
- $(doc).off(e);
- }
-
- }, this)).on('keydown.redactor', $.proxy(function(e)
- {
- if (e.which === this.keyCode.ESC)
- {
- this.getSelection().collapseToStart();
- }
-
- this.$air.fadeOut(100);
- $(doc).off(e);
-
- }, this));
- }, this);
-
- // Hide the toolbar at events in all documents (iframe)
- hideHandler(document);
- if (this.opts.iframe) hideHandler(this.document);
- },
- airBindMousemoveHide: function()
- {
- if (!this.opts.air) return;
-
- var hideHandler = $.proxy(function(doc)
- {
- $(doc).on('mousemove.redactor', $.proxy(function(e)
- {
- if ($( e.target ).closest(this.$toolbar).length === 0)
- {
- this.$air.fadeOut(100);
- $(doc).off(e);
- }
-
- }, this));
- }, this);
-
- // Hide the toolbar at events in all documents (iframe)
- hideHandler(document);
- if (this.opts.iframe) hideHandler(this.document);
- },
-
- // DROPDOWNS
- dropdownBuild: function($dropdown, dropdownObject)
- {
- $.each(dropdownObject, $.proxy(function(btnName, btnObject)
- {
- if (!btnObject.className) btnObject.className = '';
-
- var $item;
- if (btnObject.name === 'separator') $item = $('');
- else
- {
- $item = $(' ' + btnObject.title + ' ');
- $item.on('click', $.proxy(function(e)
- {
- if (this.opts.air)
- {
- this.selectionRestore();
- }
-
- if (e.preventDefault) e.preventDefault();
- if (this.browser('msie')) e.returnValue = false;
-
- if (btnObject.callback) btnObject.callback.call(this, btnName, $item, btnObject, e);
- if (btnObject.exec) this.execCommand(btnObject.exec, btnName);
- if (btnObject.func) this[btnObject.func](btnName);
-
- this.buttonActiveObserver();
- if (this.opts.air) this.$air.fadeOut(100);
-
-
- }, this));
- }
-
- $dropdown.append($item);
-
- }, this));
- },
- dropdownShow: function(e, key)
- {
- if (!this.opts.visual)
- {
- e.preventDefault();
- return false;
- }
-
- var $button = this.buttonGet(key);
-
- // Always re-append it to the end of so it always has the highest sub-z-index.
- var $dropdown = $button.data('dropdown').appendTo(document.body);
-
- if ($button.hasClass('dropact')) this.dropdownHideAll();
- else
- {
- this.dropdownHideAll();
- this.callback('dropdownShow', { dropdown: $dropdown, key: key, button: $button });
-
- this.buttonActive(key);
- $button.addClass('dropact');
-
- var keyPosition = $button.offset();
-
- // fix right placement
- var dropdownWidth = $dropdown.width();
- if ((keyPosition.left + dropdownWidth) > $(document).width())
- {
- keyPosition.left -= dropdownWidth;
- }
-
- var left = keyPosition.left + 'px';
- var btnHeight = $button.innerHeight();
-
- var position = 'absolute';
- var top = (btnHeight + this.opts.toolbarFixedTopOffset) + 'px';
-
- if (this.opts.toolbarFixed && this.toolbarFixed) position = 'fixed';
- else top = keyPosition.top + btnHeight + 'px';
-
- $dropdown.css({ position: position, left: left, top: top }).show();
- this.callback('dropdownShown', { dropdown: $dropdown, key: key, button: $button });
- }
-
-
- var hdlHideDropDown = $.proxy(function(e)
- {
- this.dropdownHide(e, $dropdown);
-
- }, this);
-
- $(document).one('click', hdlHideDropDown);
- this.$editor.one('click', hdlHideDropDown);
- this.$editor.one('touchstart', hdlHideDropDown);
-
-
- e.stopPropagation();
- this.focusWithSaveScroll();
- },
- dropdownHideAll: function()
- {
- this.$toolbar.find('a.dropact').removeClass('redactor_act').removeClass('dropact');
- $('.redactor_dropdown').hide();
- this.callback('dropdownHide');
- },
- dropdownHide: function (e, $dropdown)
- {
- if (!$(e.target).hasClass('dropact'))
- {
- $dropdown.removeClass('dropact');
- this.dropdownHideAll();
- }
- },
-
- // BUTTONS
- buttonBuild: function(btnName, btnObject, buttonImage)
- {
- var $button = $('');
- $button.data('dropdown', $dropdown);
- this.dropdownBuild($dropdown, btnObject.dropdown);
- }
-
- return $button;
- },
- buttonGet: function(key)
- {
- if (!this.opts.toolbar) return false;
- return $(this.$toolbar.find('a.re-' + key));
- },
- buttonTagToActiveState: function(buttonName, tagName)
- {
- this.opts.activeButtons.push(buttonName);
- this.opts.activeButtonsStates[tagName] = buttonName;
- },
- buttonActiveToggle: function(key)
- {
- var btn = this.buttonGet(key);
-
- if (btn.hasClass('redactor_act'))
- {
- this.buttonInactive(key);
- }
- else
- {
- this.buttonActive(key);
- }
- },
- buttonActive: function(key)
- {
- var btn = this.buttonGet(key);
- btn.addClass('redactor_act');
- },
- buttonInactive: function(key)
- {
- var btn = this.buttonGet(key);
- btn.removeClass('redactor_act');
- },
- buttonInactiveAll: function(btnName)
- {
- this.$toolbar.find('a.re-icon').not('.re-' + btnName).removeClass('redactor_act');
- },
- buttonActiveVisual: function()
- {
- this.$toolbar.find('a.re-icon').not('a.re-html').removeClass('redactor_button_disabled');
- },
- buttonInactiveVisual: function()
- {
- this.$toolbar.find('a.re-icon').not('a.re-html').addClass('redactor_button_disabled');
- },
- buttonChangeIcon: function (key, classname)
- {
- this.buttonGet(key).addClass('re-' + classname);
- },
- buttonRemoveIcon: function(key, classname)
- {
- this.buttonGet(key).removeClass('re-' + classname);
- },
- buttonAwesome: function(key, name)
- {
- var button = this.buttonGet(key);
- button.removeClass('redactor-btn-image');
- button.addClass('fa-redactor-btn');
- button.html('
');
- },
- buttonAdd: function(key, title, callback, dropdown)
- {
- if (!this.opts.toolbar) return;
- var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown }, true);
-
- this.$toolbar.append($('
').append(btn));
-
- return btn;
- },
- buttonAddFirst: function(key, title, callback, dropdown)
- {
- if (!this.opts.toolbar) return;
- var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown }, true);
- this.$toolbar.prepend($(' ').append(btn));
- },
- buttonAddAfter: function(afterkey, key, title, callback, dropdown)
- {
- if (!this.opts.toolbar) return;
- var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown }, true);
- var $btn = this.buttonGet(afterkey);
-
- if ($btn.size() !== 0) $btn.parent().after($(' ').append(btn));
- else this.$toolbar.append($(' ').append(btn));
-
- return btn;
- },
- buttonAddBefore: function(beforekey, key, title, callback, dropdown)
- {
- if (!this.opts.toolbar) return;
- var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown }, true);
- var $btn = this.buttonGet(beforekey);
-
- if ($btn.size() !== 0) $btn.parent().before($(' ').append(btn));
- else this.$toolbar.append($(' ').append(btn));
-
- return btn;
- },
- buttonRemove: function (key)
- {
- var $btn = this.buttonGet(key);
- $btn.remove();
- },
- buttonActiveObserver: function(e, btnName)
- {
- var parent = this.getParent();
- this.buttonInactiveAll(btnName);
-
- if (e === false && btnName !== 'html')
- {
- if ($.inArray(btnName, this.opts.activeButtons) != -1)
- {
- this.buttonActiveToggle(btnName);
- }
- return;
- }
-
- if (parent && parent.tagName === 'A') this.$toolbar.find('a.redactor_dropdown_link').text(this.opts.curLang.link_edit);
- else this.$toolbar.find('a.redactor_dropdown_link').text(this.opts.curLang.link_insert);
-
- $.each(this.opts.activeButtonsStates, $.proxy(function(key, value)
- {
- if ($(parent).closest(key, this.$editor.get()[0]).length != 0)
- {
- this.buttonActive(value);
- }
-
- }, this));
-
- var $parent = $(parent).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
- if ($parent.length)
- {
- var align = $parent.css('text-align');
- if (align == '')
- {
- align = 'left';
- }
-
- this.buttonActive('align' + align);
- }
- },
-
- // EXEC
- execPasteFrag: function(html)
- {
- var sel = this.getSelection();
- if (sel.getRangeAt && sel.rangeCount)
- {
- var range = this.getRange();
- range.deleteContents();
-
- var el = this.document.createElement("div");
- el.innerHTML = html;
-
- var frag = this.document.createDocumentFragment(), node, lastNode;
- while ((node = el.firstChild))
- {
- lastNode = frag.appendChild(node);
- }
-
- var firstNode = frag.firstChild;
- range.insertNode(frag);
-
- if (lastNode)
- {
- range = range.cloneRange();
- range.setStartAfter(lastNode);
- range.collapse(true);
- }
- sel.removeAllRanges();
- sel.addRange(range);
- }
- },
- exec: function(cmd, param, sync)
- {
- if (cmd === 'formatblock' && this.browser('msie'))
- {
- param = '<' + param + '>';
- }
-
- if (cmd === 'inserthtml' && this.browser('msie'))
- {
- if (!this.isIe11())
- {
- this.focusWithSaveScroll();
- this.document.selection.createRange().pasteHTML(param);
- }
- else this.execPasteFrag(param);
- }
- else
- {
- this.document.execCommand(cmd, false, param);
- }
-
- if (sync !== false) this.sync();
- this.callback('execCommand', cmd, param);
- },
- execCommand: function(cmd, param, sync)
- {
- if (!this.opts.visual)
- {
- this.$source.focus();
- return false;
- }
-
- if ( cmd === 'bold'
- || cmd === 'italic'
- || cmd === 'underline'
- || cmd === 'strikethrough')
- {
- this.bufferSet();
- }
-
-
- if (cmd === 'superscript' || cmd === 'subscript')
- {
- var parent = this.getParent();
- if (parent.tagName === 'SUP' || parent.tagName === 'SUB')
- {
- this.inlineRemoveFormatReplace(parent);
- }
- }
-
- if (cmd === 'inserthtml')
- {
- this.insertHtml(param, sync);
- this.callback('execCommand', cmd, param);
- return;
- }
-
- // Stop formatting pre
- if (this.currentOrParentIs('PRE') && !this.opts.formattingPre) return false;
-
- // Lists
- if (cmd === 'insertunorderedlist' || cmd === 'insertorderedlist') return this.execLists(cmd, param);
-
- // Unlink
- if (cmd === 'unlink') return this.execUnlink(cmd, param);
-
- // Usual exec
- this.exec(cmd, param, sync);
-
- // Line
- if (cmd === 'inserthorizontalrule') this.$editor.find('hr').removeAttr('id');
-
- },
- execUnlink: function(cmd, param)
- {
- this.bufferSet();
-
- var link = this.currentOrParentIs('A');
- if (link)
- {
- $(link).replaceWith($(link).text());
-
- this.sync();
- this.callback('execCommand', cmd, param);
- return;
- }
- },
- execLists: function(cmd, param)
- {
- this.bufferSet();
-
- var parent = this.getParent();
- var $list = $(parent).closest('ol, ul');
-
- if (!this.isParentRedactor($list) && $list.size() != 0)
- {
- $list = false;
- }
-
- var remove = false;
-
- if ($list && $list.length)
- {
- remove = true;
- var listTag = $list[0].tagName;
- if ((cmd === 'insertunorderedlist' && listTag === 'OL')
- || (cmd === 'insertorderedlist' && listTag === 'UL'))
- {
- remove = false;
- }
- }
-
- this.selectionSave();
-
- // remove lists
- if (remove)
- {
-
- var nodes = this.getNodes();
- var elems = this.getBlocks(nodes);
-
- if (typeof nodes[0] != 'undefined' && nodes.length > 1 && nodes[0].nodeType == 3)
- {
- // fix the adding the first li to the array
- elems.unshift(this.getBlock());
- }
-
- var data = '', replaced = '';
- $.each(elems, $.proxy(function(i,s)
- {
- if (s.tagName == 'LI')
- {
- var $s = $(s);
- var cloned = $s.clone();
- cloned.find('ul', 'ol').remove();
-
- if (this.opts.linebreaks === false)
- {
- data += this.outerHtml($('').append(cloned.contents()));
- }
- else
- {
- var clonedHtml = cloned.html().replace(/$/i, '');
- data += clonedHtml + '');
- if (cmd == 'insertorderedlist')
- {
- tmpList = $('');
- }
-
- var tmpLi = $('');
-
- if ($.trim(wrapperHtml) == '')
- {
- tmpLi.append(wrapperHtml + '' + this.opts.invisibleSpace + ' ');
- tmpList.append(tmpLi);
- this.$editor.find('#selection-marker-1').replaceWith(tmpList);
- }
- else
- {
- tmpLi.append(wrapperHtml);
- tmpList.append(tmpLi);
- $(wrapper).replaceWith(tmpList);
- }
- }
- else
- {
- this.document.execCommand(cmd);
- }
-
- var parent = this.getParent();
- var $list = $(parent).closest('ol, ul');
-
- if (this.opts.linebreaks === false)
- {
- var listText = $.trim($list.text());
- if (listText == '')
- {
- $list.children('li').find('br').remove();
- $list.children('li').append('' + this.opts.invisibleSpace + ' ');
- }
- }
-
- if (firstParent.size() != 0)
- {
- $list.wrapAll('');
- }
-
- if ($list.length)
- {
- // remove block-element list wrapper
- var $listParent = $list.parent();
- if (this.isParentRedactor($listParent) && $listParent[0].tagName != 'LI' && this.nodeTestBlocks($listParent[0]))
- {
- $listParent.replaceWith($listParent.contents());
- }
- }
-
- if (this.browser('mozilla'))
- {
- this.$editor.focus();
- }
- }
-
- this.selectionRestore();
- this.$editor.find('#selection-marker-1').removeAttr('id');
- this.sync();
- this.callback('execCommand', cmd, param);
- return;
- },
-
- // INDENTING
- indentingIndent: function()
- {
- this.indentingStart('indent');
- },
- indentingOutdent: function()
- {
- this.indentingStart('outdent');
- },
- indentingStart: function(cmd)
- {
- this.bufferSet();
-
- if (cmd === 'indent')
- {
- var block = this.getBlock();
-
- this.selectionSave();
-
- if (block && block.tagName == 'LI')
- {
- // li
- var parent = this.getParent();
-
- var $list = $(parent).closest('ol, ul');
- var listTag = $list[0].tagName;
-
- var elems = this.getBlocks();
-
- $.each(elems, function(i,s)
- {
- if (s.tagName == 'LI')
- {
- var $prev = $(s).prev();
- if ($prev.size() != 0 && $prev[0].tagName == 'LI')
- {
- var $childList = $prev.children('ul, ol');
- if ($childList.size() == 0)
- {
- $prev.append($('<' + listTag + '>').append(s));
- }
- else $childList.append(s);
- }
- }
- });
- }
- // linebreaks
- else if (block === false && this.opts.linebreaks === true)
- {
- this.exec('formatBlock', 'blockquote');
- var newblock = this.getBlock();
- var block = $('').html($(newblock).html());
- $(newblock).replaceWith(block);
-
- var left = this.normalize($(block).css('margin-left')) + this.opts.indentValue;
- $(block).css('margin-left', left + 'px');
- }
- else
- {
- // all block tags
- var elements = this.getBlocks();
- $.each(elements, $.proxy(function(i, elem)
- {
- var $el = false;
-
- if (elem.tagName === 'TD') return;
-
- if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
- {
- $el = $(elem);
- }
- else
- {
- $el = $(elem).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
- }
-
- var left = this.normalize($el.css('margin-left')) + this.opts.indentValue;
- $el.css('margin-left', left + 'px');
-
- }, this));
- }
-
- this.selectionRestore();
-
- }
- // outdent
- else
- {
- this.selectionSave();
-
- var block = this.getBlock();
- if (block && block.tagName == 'LI')
- {
- // li
- var elems = this.getBlocks();
- var index = 0;
-
- this.insideOutdent(block, index, elems);
- }
- else
- {
- // all block tags
- var elements = this.getBlocks();
- $.each(elements, $.proxy(function(i, elem)
- {
- var $el = false;
-
- if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
- {
- $el = $(elem);
- }
- else
- {
- $el = $(elem).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
- }
-
- var left = this.normalize($el.css('margin-left')) - this.opts.indentValue;
- if (left <= 0)
- {
- // linebreaks
- if (this.opts.linebreaks === true && typeof($el.data('tagblock')) !== 'undefined')
- {
- $el.replaceWith($el.html() + '
');
- }
- // all block tags
- else
- {
- $el.css('margin-left', '');
- this.removeEmptyAttr($el, 'style');
- }
- }
- else
- {
- $el.css('margin-left', left + 'px');
- }
-
- }, this));
- }
-
-
- this.selectionRestore();
- }
-
- this.sync();
-
- },
- insideOutdent: function (li, index, elems)
- {
- if (li && li.tagName == 'LI')
- {
- var $parent = $(li).parent().parent();
- if ($parent.size() != 0 && $parent[0].tagName == 'LI')
- {
- $parent.after(li);
- }
- else
- {
- if (typeof elems[index] != 'undefined')
- {
- li = elems[index];
- index++;
-
- this.insideOutdent(li, index, elems);
- }
- else
- {
- this.execCommand('insertunorderedlist');
- }
- }
- }
- },
-
- // ALIGNMENT
- alignmentLeft: function()
- {
- this.alignmentSet('', 'JustifyLeft');
- },
- alignmentRight: function()
- {
- this.alignmentSet('right', 'JustifyRight');
- },
- alignmentCenter: function()
- {
- this.alignmentSet('center', 'JustifyCenter');
- },
- alignmentJustify: function()
- {
- this.alignmentSet('justify', 'JustifyFull');
- },
- alignmentSet: function(type, cmd)
- {
- this.bufferSet();
-
- if (this.oldIE())
- {
- this.document.execCommand(cmd, false, false);
- return true;
- }
-
- this.selectionSave();
-
- var block = this.getBlock();
- if (!block && this.opts.linebreaks)
- {
- // one element
- this.exec('formatblock', 'div');
-
- var newblock = this.getBlock();
- var block = $('
').html($(newblock).html());
- $(newblock).replaceWith(block);
-
- $(block).css('text-align', type);
- this.removeEmptyAttr(block, 'style');
-
- if (type == '' && typeof($(block).data('tagblock')) !== 'undefined')
- {
- $(block).replaceWith($(block).html());
- }
- }
- else
- {
- var elements = this.getBlocks();
- $.each(elements, $.proxy(function(i, elem)
- {
- var $el = false;
-
- if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
- {
- $el = $(elem);
- }
- else
- {
- $el = $(elem).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
- }
-
- if ($el)
- {
- $el.css('text-align', type);
- this.removeEmptyAttr($el, 'style');
- }
-
- }, this));
- }
-
- this.selectionRestore();
- this.sync();
- },
-
- // CLEAN
- cleanEmpty: function(html)
- {
- var ph = this.placeholderStart(html);
- if (ph !== false) return ph;
-
- if (this.opts.linebreaks === false)
- {
- if (html === '') html = this.opts.emptyHtml;
- else if (html.search(/^
$/gi) !== -1) html = '([\w\W]*?)<\/div>/gi, '$2');
- }
-
- if (this.opts.paragraphy) html = this.cleanParagraphy(html);
-
- return html;
- },
- cleanConvertProtected: function(html)
- {
- if (this.opts.templateVars)
- {
- html = html.replace(/\{\{(.*?)\}\}/gi, '');
- html = html.replace(/\{(.*?)\}/gi, '');
- }
-
- html = html.replace(/([\w\W]*?)<\/script>/gi, '$2 ');
- html = html.replace(/([\w\W]*?)<\/style>/gi, '$2');
- html = html.replace(/([\w\W]*?)<\/form>/gi, '$2');
-
- // php tags convertation
- if (this.opts.phpTags) html = html.replace(/<\?php([\w\W]*?)\?>/gi, '');
- else html = html.replace(/<\?php([\w\W]*?)\?>/gi, '');
-
- return html;
- },
- cleanReConvertProtected: function(html)
- {
- if (this.opts.templateVars)
- {
- html = html.replace(//gi, '{{$1}}');
- html = html.replace(//gi, '{$1}');
- }
-
- html = html.replace(/([\w\W]*?)<\/title>/gi, '<script$1 type="text/javascript">$2</script>');
- html = html.replace(/<section(.*?) style="display: none;" rel="redactor-style-tag">([\w\W]*?)<\/section>/gi, '<style$1>$2</style>');
- html = html.replace(/<section(.*?)rel="redactor-form-tag"(.*?)>([\w\W]*?)<\/section>/gi, '<form$1$2>$3</form>');
-
- // php tags convertation
- if (this.opts.phpTags) html = html.replace(/<section style="display: none;" rel="redactor-php-tag">([\w\W]*?)<\/section>/gi, '<?php\r\n$1\r\n?>');
-
- return html;
- },
- cleanRemoveSpaces: function(html, buffer)
- {
- if (buffer !== false)
- {
- var buffer = []
- var matches = html.match(/<(pre|style|script|title)(.*?)>([\w\W]*?)<\/(pre|style|script|title)>/gi);
- if (matches === null) matches = [];
-
- if (this.opts.phpTags)
- {
- var phpMatches = html.match(/<\?php([\w\W]*?)\?>/gi);
- if (phpMatches) matches = $.merge(matches, phpMatches);
- }
-
- if (matches)
- {
- $.each(matches, function(i, s)
- {
- html = html.replace(s, 'buffer_' + i);
- buffer.push(s);
- });
- }
- }
-
- html = html.replace(/\n/g, ' ');
- html = html.replace(/[\t]*/g, '');
- html = html.replace(/\n\s*\n/g, "\n");
- html = html.replace(/^[\s\n]*/g, ' ');
- html = html.replace(/[\s\n]*$/g, ' ');
- html = html.replace( />\s{2,}</g, '> <'); // between inline tags can be only one space
-
- html = this.cleanReplacer(html, buffer);
-
- html = html.replace(/\n\n/g, "\n");
-
- return html;
- },
- cleanReplacer: function(html, buffer)
- {
- if (buffer === false) return html;
-
- $.each(buffer, function(i,s)
- {
- html = html.replace('buffer_' + i, s);
- });
-
- return html;
- },
- cleanRemoveEmptyTags: function(html)
- {
- // remove zero width-space
- html = html.replace(/[\u200B-\u200D\uFEFF]/g, '');
-
- var etagsInline = ["<b>\\s*</b>", "<b> </b>", "<em>\\s*</em>"]
- var etags = ["<pre></pre>", "<blockquote>\\s*</blockquote>", "<dd></dd>", "<dt></dt>", "<ul></ul>", "<ol></ol>", "<li></li>", "<table></table>", "<tr></tr>", "<span>\\s*<span>", "<span> <span>", "<p>\\s*</p>", "<p></p>", "<p> </p>", "<p>\\s*<br>\\s*</p>", "<div>\\s*</div>", "<div>\\s*<br>\\s*</div>"];
-
- if (this.opts.removeEmptyTags)
- {
- etags = etags.concat(etagsInline);
- }
- else etags = etagsInline;
-
- var len = etags.length;
- for (var i = 0; i < len; ++i)
- {
- html = html.replace(new RegExp(etags[i], 'gi'), "");
- }
-
- return html;
- },
- cleanParagraphy: function(html)
- {
- html = $.trim(html);
-
- if (this.opts.linebreaks === true) return html;
- if (html === '' || html === '<p></p>') return this.opts.emptyHtml;
-
- html = html + "\n";
-
- if (this.opts.removeEmptyTags === false)
- {
- return html;
- }
-
- var safes = [];
- var matches = html.match(/<(table|div|pre|object)(.*?)>([\w\W]*?)<\/(table|div|pre|object)>/gi);
- if (!matches) matches = [];
-
- var commentsMatches = html.match(/<!--([\w\W]*?)-->/gi);
- if (commentsMatches) matches = $.merge(matches, commentsMatches);
-
- if (this.opts.phpTags)
- {
- var phpMatches = html.match(/<section(.*?)rel="redactor-php-tag">([\w\W]*?)<\/section>/gi);
- if (phpMatches) matches = $.merge(matches, phpMatches);
- }
-
- if (matches)
- {
- $.each(matches, function(i,s)
- {
- safes[i] = s;
- html = html.replace(s, '{replace' + i + '}\n');
- });
- }
-
- html = html.replace(/<br \/>\s*<br \/>/gi, "\n\n");
- html = html.replace(/<br><br>/gi, "\n\n");
-
- function R(str, mod, r)
- {
- return html.replace(new RegExp(str, mod), r);
- }
-
- var blocks = '(comment|html|body|head|title|meta|style|script|link|iframe|table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
-
- html = R('(<' + blocks + '[^>]*>)', 'gi', "\n$1");
- html = R('(</' + blocks + '>)', 'gi', "$1\n\n");
- html = R("\r\n", 'g', "\n");
- html = R("\r", 'g', "\n");
- html = R("/\n\n+/", 'g', "\n\n");
-
- var htmls = html.split(new RegExp('\n\s*\n', 'g'), -1);
-
- html = '';
- for (var i in htmls)
- {
- if (htmls.hasOwnProperty(i))
- {
- if (htmls[i].search('{replace') == -1)
- {
- htmls[i] = htmls[i].replace(/<p>\n\t?<\/p>/gi, '');
- htmls[i] = htmls[i].replace(/<p><\/p>/gi, '');
-
- if (htmls[i] != '')
- {
- html += '<p>' + htmls[i].replace(/^\n+|\n+$/g, "") + "</p>";
- }
- }
- else html += htmls[i];
- }
- }
-
- html = R('<p><p>', 'gi', '<p>');
- html = R('</p></p>', 'gi', '</p>');
-
- html = R('<p>\s?</p>', 'gi', '');
-
- html = R('<p>([^<]+)</(div|address|form)>', 'gi', "<p>$1</p></$2>");
-
- html = R('<p>(</?' + blocks + '[^>]*>)</p>', 'gi', "$1");
- html = R("<p>(<li.+?)</p>", 'gi', "$1");
- html = R('<p>\s?(</?' + blocks + '[^>]*>)', 'gi', "$1");
-
- html = R('(</?' + blocks + '[^>]*>)\s?</p>', 'gi', "$1");
- html = R('(</?' + blocks + '[^>]*>)\s?<br />', 'gi', "$1");
- html = R('<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', 'gi', '$1');
- html = R("\n</p>", 'gi', '</p>');
-
- html = R('<li><p>', 'gi', '<li>');
- html = R('</p></li>', 'gi', '</li>');
- html = R('</li><p>', 'gi', '</li>');
- //html = R('</ul><p>(.*?)</li>', 'gi', '</ul></li>');
- // html = R('</ol><p>', 'gi', '</ol>');
- html = R('<p>\t?\n?<p>', 'gi', '<p>');
- html = R('</dt><p>', 'gi', '</dt>');
- html = R('</dd><p>', 'gi', '</dd>');
- html = R('<br></p></blockquote>', 'gi', '</blockquote>');
- html = R('<p>\t*</p>', 'gi', '');
-
- // restore safes
- $.each(safes, function(i,s)
- {
- html = html.replace('{replace' + i + '}', s);
- });
-
- return $.trim(html);
- },
- cleanConvertInlineTags: function(html, set)
- {
- var boldTag = 'strong';
- if (this.opts.boldTag === 'b') boldTag = 'b';
-
- var italicTag = 'em';
- if (this.opts.italicTag === 'i') italicTag = 'i';
-
- html = html.replace(/<span style="font-style: italic;">([\w\W]*?)<\/span>/gi, '<' + italicTag + '>$1</' + italicTag + '>');
- html = html.replace(/<span style="font-weight: bold;">([\w\W]*?)<\/span>/gi, '<' + boldTag + '>$1</' + boldTag + '>');
-
- // bold, italic, del
- if (this.opts.boldTag === 'strong') html = html.replace(/<b>([\w\W]*?)<\/b>/gi, '<strong>$1</strong>');
- else html = html.replace(/<strong>([\w\W]*?)<\/strong>/gi, '<b>$1</b>');
-
- if (this.opts.italicTag === 'em') html = html.replace(/<i>([\w\W]*?)<\/i>/gi, '<em>$1</em>');
- else html = html.replace(/<em>([\w\W]*?)<\/em>/gi, '<i>$1</i>');
-
- html = html.replace(/<span style="text-decoration: underline;">([\w\W]*?)<\/span>/gi, '<u>$1</u>');
-
- if (set !== true) html = html.replace(/<strike>([\w\W]*?)<\/strike>/gi, '<del>$1</del>');
- else html = html.replace(/<del>([\w\W]*?)<\/del>/gi, '<strike>$1</strike>');
-
- return html;
- },
- cleanStripTags: function(html)
- {
- if (html == '' || typeof html == 'undefined') return html;
-
- var allowed = false;
- if (this.opts.allowedTags !== false) allowed = true;
-
- var arr = allowed === true ? this.opts.allowedTags : this.opts.deniedTags;
-
- var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi;
- html = html.replace(tags, function ($0, $1)
- {
- if (allowed === true) return $.inArray($1.toLowerCase(), arr) > '-1' ? $0 : '';
- else return $.inArray($1.toLowerCase(), arr) > '-1' ? '' : $0;
- });
-
- html = this.cleanConvertInlineTags(html);
-
- return html;
-
- },
- cleanSavePreCode: function(html, encode)
- {
- var pre = html.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/gi);
- if (pre !== null)
- {
- $.each(pre, $.proxy(function(i,s)
- {
- var arr = s.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/i);
-
- arr[3] = arr[3].replace(/ /g, ' ');
-
- if (encode !== false) arr[3] = this.cleanEncodeEntities(arr[3]);
-
- // $ fix
- arr[3] = arr[3].replace(/\$/g, '$');
-
- html = html.replace(s, '<' + arr[1] + arr[2] + '>' + arr[3] + '</' + arr[1] + '>');
-
- }, this));
- }
-
- return html;
- },
- cleanEncodeEntities: function(str)
- {
- str = String(str).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"');
- return str.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"');
- },
- cleanUnverified: function()
- {
- // label, abbr, mark, meter, code, q, dfn, ins, time, kbd, var
- var $elem = this.$editor.find('li, img, a, b, strong, sub, sup, i, em, u, small, strike, del, span, cite');
-
- $elem.filter('[style*="background-color: transparent;"][style*="line-height"]')
- .css('background-color', '')
- .css('line-height', '');
-
- $elem.filter('[style*="background-color: transparent;"]')
- .css('background-color', '');
-
- $elem.css('line-height', '');
-
- $.each($elem, $.proxy(function(i,s)
- {
- this.removeEmptyAttr(s, 'style');
- }, this));
-
- var $elem2 = this.$editor.find('b, strong, i, em, u, strike, del');
- $elem2.css('font-size', '');
-
- $.each($elem2, $.proxy(function(i,s)
- {
- this.removeEmptyAttr(s, 'style');
- }, this));
-
- // When we paste text in Safari is wrapping inserted div (remove it)
- this.$editor.find('div[style="text-align: -webkit-auto;"]').contents().unwrap();
-
- // Remove all styles in ul, ol, li
- this.$editor.find('ul, ol, li').removeAttr('style');
- },
-
-
- // TEXTAREA CODE FORMATTING
- cleanHtml: function(code)
- {
- var i = 0,
- codeLength = code.length,
- point = 0,
- start = null,
- end = null,
- tag = '',
- out = '',
- cont = '';
-
- this.cleanlevel = 0;
-
- for (; i < codeLength; i++)
- {
- point = i;
-
- // if no more tags, copy and exit
- if (-1 == code.substr(i).indexOf( '<' ))
- {
- out += code.substr(i);
-
- return this.cleanFinish(out);
- }
-
- // copy verbatim until a tag
- while (point < codeLength && code.charAt(point) != '<')
- {
- point++;
- }
-
- if (i != point)
- {
- cont = code.substr(i, point - i);
- if (!cont.match(/^\s{2,}$/g))
- {
- if ('\n' == out.charAt(out.length - 1)) out += this.cleanGetTabs();
- else if ('\n' == cont.charAt(0))
- {
- out += '\n' + this.cleanGetTabs();
- cont = cont.replace(/^\s+/, '');
- }
-
- out += cont;
- }
-
- if (cont.match(/\n/)) out += '\n' + this.cleanGetTabs();
- }
-
- start = point;
-
- // find the end of the tag
- while (point < codeLength && '>' != code.charAt(point))
- {
- point++;
- }
-
- tag = code.substr(start, point - start);
- i = point;
-
- var t;
-
- if ('!--' == tag.substr(1, 3))
- {
- if (!tag.match(/--$/))
- {
- while ('-->' != code.substr(point, 3))
- {
- point++;
- }
- point += 2;
- tag = code.substr(start, point - start);
- i = point;
- }
-
- if ('\n' != out.charAt(out.length - 1)) out += '\n';
-
- out += this.cleanGetTabs();
- out += tag + '>\n';
- }
- else if ('!' == tag[1])
- {
- out = this.placeTag(tag + '>', out);
- }
- else if ('?' == tag[1])
- {
- out += tag + '>\n';
- }
- else if (t = tag.match(/^<(script|style|pre)/i))
- {
- t[1] = t[1].toLowerCase();
- tag = this.cleanTag(tag);
- out = this.placeTag(tag, out);
- end = String(code.substr(i + 1)).toLowerCase().indexOf('</' + t[1]);
-
- if (end)
- {
- cont = code.substr(i + 1, end);
- i += end;
- out += cont;
- }
- }
- else
- {
- tag = this.cleanTag(tag);
- out = this.placeTag(tag, out);
- }
- }
-
- return this.cleanFinish(out);
- },
- cleanGetTabs: function()
- {
- var s = '';
- for ( var j = 0; j < this.cleanlevel; j++ )
- {
- s += '\t';
- }
-
- return s;
- },
- cleanFinish: function(code)
- {
- code = code.replace(/\n\s*\n/g, '\n');
- code = code.replace(/^[\s\n]*/, '');
- code = code.replace(/[\s\n]*$/, '');
- code = code.replace(/<script(.*?)>\n<\/script>/gi, '<script$1></script>');
-
- this.cleanlevel = 0;
-
- return code;
- },
- cleanTag: function (tag)
- {
- var tagout = '';
- tag = tag.replace(/\n/g, ' ');
- tag = tag.replace(/\s{2,}/g, ' ');
- tag = tag.replace(/^\s+|\s+$/g, ' ');
-
- var suffix = '';
- if (tag.match(/\/$/))
- {
- suffix = '/';
- tag = tag.replace(/\/+$/, '');
- }
-
- var m;
- while (m = /\s*([^= ]+)(?:=((['"']).*?\3|[^ ]+))?/.exec(tag))
- {
- if (m[2]) tagout += m[1].toLowerCase() + '=' + m[2];
- else if (m[1]) tagout += m[1].toLowerCase();
-
- tagout += ' ';
- tag = tag.substr(m[0].length);
- }
-
- return tagout.replace(/\s*$/, '') + suffix + '>';
- },
- placeTag: function (tag, out)
- {
- var nl = tag.match(this.cleannewLevel);
- if (tag.match(this.cleanlineBefore) || nl)
- {
- out = out.replace(/\s*$/, '');
- out += '\n';
- }
-
- if (nl && '/' == tag.charAt(1)) this.cleanlevel--;
- if ('\n' == out.charAt(out.length - 1)) out += this.cleanGetTabs();
- if (nl && '/' != tag.charAt(1)) this.cleanlevel++;
-
- out += tag;
-
- if (tag.match(this.cleanlineAfter) || tag.match(this.cleannewLevel))
- {
- out = out.replace(/ *$/, '');
- out += '\n';
- }
-
- return out;
- },
-
- // FORMAT
- formatEmpty: function(e)
- {
- var html = $.trim(this.$editor.html());
-
- if (this.opts.linebreaks)
- {
- if (html == '')
- {
- e.preventDefault();
- this.$editor.html('');
- this.focus();
- }
- }
- else
- {
- html = html.replace(/<br\s?\/?>/i, '');
- var thtml = html.replace(/<p>\s?<\/p>/gi, '');
-
- if (html === '' || thtml === '')
- {
- e.preventDefault();
-
- var node = $(this.opts.emptyHtml).get(0);
- this.$editor.html(node);
- this.focus();
- }
- }
-
- this.sync();
- },
- formatBlocks: function(tag)
- {
- if (this.browser('mozilla') && this.isFocused())
- {
- this.$editor.focus();
- }
-
- this.bufferSet();
-
- var nodes = this.getBlocks();
- this.selectionSave();
-
- $.each(nodes, $.proxy(function(i, node)
- {
- if (node.tagName !== 'LI')
- {
- var parent = $(node).parent();
-
- if (tag === 'p')
- {
- if ((node.tagName === 'P'
- && parent.size() != 0
- && parent[0].tagName === 'BLOCKQUOTE')
- ||
- node.tagName === 'BLOCKQUOTE')
- {
- this.formatQuote();
- return;
- }
- else if (this.opts.linebreaks)
- {
- if (node && node.tagName.search(/H[1-6]/) == 0)
- {
- $(node).replaceWith(node.innerHTML + '<br>');
- }
- else return;
- }
- else
- {
- this.formatBlock(tag, node);
- }
- }
- else
- {
- this.formatBlock(tag, node);
- }
- }
-
- }, this));
-
- this.selectionRestore();
- this.sync();
- },
- formatBlock: function(tag, block)
- {
- if (block === false) block = this.getBlock();
- if (block === false && this.opts.linebreaks === true)
- {
- this.execCommand('formatblock', tag);
- return true;
- }
-
- var contents = '';
- if (tag !== 'pre')
- {
- contents = $(block).contents();
- }
- else
- {
- //contents = this.cleanEncodeEntities($(block).text());
- contents = $(block).html();
- if ($.trim(contents) === '')
- {
- contents = '<span id="selection-marker-1"></span>';
- }
- }
-
- if (block.tagName === 'PRE') tag = 'p';
-
- if (this.opts.linebreaks === true && tag === 'p')
- {
- $(block).replaceWith($('<div>').append(contents).html() + '<br>');
- }
- else
- {
- var parent = this.getParent();
-
- var node = $('<' + tag + '>').append(contents);
- $(block).replaceWith(node);
-
- if (parent && parent.tagName == 'TD')
- {
- $(node).wrapAll('<td>');
- }
- }
- },
- formatChangeTag: function(fromElement, toTagName, save)
- {
- if (save !== false) this.selectionSave();
-
- var newElement = $('<' + toTagName + '/>');
- $(fromElement).replaceWith(function() { return newElement.append($(this).contents()); });
-
- if (save !== false) this.selectionRestore();
-
- return newElement;
- },
-
- // QUOTE
- formatQuote: function()
- {
- if (this.browser('mozilla') && this.isFocused())
- {
- this.$editor.focus();
- }
-
- this.bufferSet();
-
- // paragraphy
- if (this.opts.linebreaks === false)
- {
- this.selectionSave();
-
- var blocks = this.getBlocks();
-
- var blockquote = false;
- var blocksLen = blocks.length;
- if (blocks)
- {
- var data = '';
- var replaced = '';
- var replace = false;
- var paragraphsOnly = true;
-
- $.each(blocks, function(i,s)
- {
- if (s.tagName !== 'P') paragraphsOnly = false;
- });
-
- $.each(blocks, $.proxy(function(i,s)
- {
- if (s.tagName === 'BLOCKQUOTE')
- {
- this.formatBlock('p', s, false);
- }
- else if (s.tagName === 'P')
- {
- blockquote = $(s).parent();
- // from blockquote
- if (blockquote[0].tagName == 'BLOCKQUOTE')
- {
- var count = $(blockquote).children('p').size();
-
- // one
- if (count == 1)
- {
- $(blockquote).replaceWith(s);
- }
- // all
- else if (count == blocksLen)
- {
- replace = 'blockquote';
- data += this.outerHtml(s);
- }
- // some
- else
- {
- replace = 'html';
- data += this.outerHtml(s);
-
- if (i == 0)
- {
- $(s).addClass('redactor-replaced').empty();
- replaced = this.outerHtml(s);
- }
- else $(s).remove();
- }
- }
- // to blockquote
- else
- {
- if (paragraphsOnly === false || blocks.length == 1)
- {
- this.formatBlock('blockquote', s, false);
- }
- else
- {
- replace = 'paragraphs';
- data += this.outerHtml(s);
- }
- }
-
- }
- else if (s.tagName !== 'LI')
- {
- this.formatBlock('blockquote', s, false);
- }
-
- }, this));
-
- if (replace)
- {
- if (replace == 'paragraphs')
- {
- $(blocks[0]).replaceWith('<blockquote>' + data + '</blockquote>');
- $(blocks).remove();
- }
- else if (replace == 'blockquote')
- {
- $(blockquote).replaceWith(data);
- }
- else if (replace == 'html')
- {
- var html = this.$editor.html().replace(replaced, '</blockquote>' + data + '<blockquote>');
-
- this.$editor.html(html);
- this.$editor.find('blockquote').each(function()
- {
- if ($.trim($(this).html()) == '') $(this).remove();
- })
- }
- }
- }
-
- this.selectionRestore();
- }
- // linebreaks
- else
- {
- var block = this.getBlock();
- if (block.tagName === 'BLOCKQUOTE')
- {
- this.selectionSave();
-
- var html = $.trim($(block).html());
- var selection = $.trim(this.getSelectionHtml());
-
- html = html.replace(/<span(.*?)id="selection-marker(.*?)<\/span>/gi, '');
-
- if (html == selection)
- {
- $(block).replaceWith($(block).html() + '<br>');
- }
- else
- {
- // replace
- this.inlineFormat('tmp');
- var tmp = this.$editor.find('tmp');
- tmp.empty();
-
- var newhtml = this.$editor.html().replace('<tmp></tmp>', '</blockquote><span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>' + selection + '<blockquote>');
-
- this.$editor.html(newhtml);
- tmp.remove();
- this.$editor.find('blockquote').each(function()
- {
- if ($.trim($(this).html()) == '') $(this).remove();
- })
- }
-
- this.selectionRestore();
- this.$editor.find('span#selection-marker-1').attr('id', false);
- }
- else
- {
- var wrapper = this.selectionWrap('blockquote');
- var html = $(wrapper).html();
-
- var blocksElemsRemove = ['ul', 'ol', 'table', 'tr', 'tbody', 'thead', 'tfoot', 'dl'];
- $.each(blocksElemsRemove, function(i,s)
- {
- html = html.replace(new RegExp('<' + s + '(.*?)>', 'gi'), '');
- html = html.replace(new RegExp('</' + s + '>', 'gi'), '');
- });
-
- var blocksElems = this.opts.blockLevelElements;
- $.each(blocksElems, function(i,s)
- {
- html = html.replace(new RegExp('<' + s + '(.*?)>', 'gi'), '');
- html = html.replace(new RegExp('</' + s + '>', 'gi'), '<br>');
- });
-
- $(wrapper).html(html);
- this.selectionElement(wrapper);
- var next = $(wrapper).next();
- if (next.size() != 0 && next[0].tagName === 'BR')
- {
- next.remove();
- }
- }
- }
-
- this.sync();
- },
-
- // BLOCK
- blockRemoveAttr: function(attr, value)
- {
- var nodes = this.getBlocks();
- $(nodes).removeAttr(attr);
-
- this.sync();
- },
- blockSetAttr: function(attr, value)
- {
- var nodes = this.getBlocks();
- $(nodes).attr(attr, value);
-
- this.sync();
- },
- blockRemoveStyle: function(rule)
- {
- var nodes = this.getBlocks();
- $(nodes).css(rule, '');
- this.removeEmptyAttr(nodes, 'style');
-
- this.sync();
- },
- blockSetStyle: function (rule, value)
- {
- var nodes = this.getBlocks();
- $(nodes).css(rule, value);
-
- this.sync();
- },
- blockRemoveClass: function(className)
- {
- var nodes = this.getBlocks();
- $(nodes).removeClass(className);
- this.removeEmptyAttr(nodes, 'class');
-
- this.sync();
- },
- blockSetClass: function(className)
- {
- var nodes = this.getBlocks();
- $(nodes).addClass(className);
-
- this.sync();
- },
-
- // INLINE
- inlineRemoveClass: function(className)
- {
- this.selectionSave();
-
- this.inlineEachNodes(function(node)
- {
- $(node).removeClass(className);
- this.removeEmptyAttr(node, 'class');
- });
-
- this.selectionRestore();
- this.sync();
- },
- inlineSetClass: function(className)
- {
- var current = this.getCurrent();
- if (!$(current).hasClass(className)) this.inlineMethods('addClass', className);
- },
- inlineRemoveStyle: function (rule)
- {
- this.selectionSave();
-
- this.inlineEachNodes(function(node)
- {
- $(node).css(rule, '');
- this.removeEmptyAttr(node, 'style');
- });
-
- this.selectionRestore();
- this.sync();
- },
- inlineSetStyle: function(rule, value)
- {
- this.inlineMethods('css', rule, value);
- },
- inlineRemoveAttr: function (attr)
- {
- this.selectionSave();
-
- var range = this.getRange(), node = this.getElement(), nodes = this.getNodes();
-
- if (range.collapsed || range.startContainer === range.endContainer && node)
- {
- nodes = $( node );
- }
-
- $(nodes).removeAttr(attr);
-
- this.inlineUnwrapSpan();
-
- this.selectionRestore();
- this.sync();
- },
- inlineSetAttr: function(attr, value)
- {
- this.inlineMethods('attr', attr, value );
- },
- inlineMethods: function(type, attr, value)
- {
- this.bufferSet();
- this.selectionSave();
-
- var range = this.getRange()
- var el = this.getElement();
-
- if ((range.collapsed || range.startContainer === range.endContainer) && el && !this.nodeTestBlocks(el))
- {
- $(el)[type](attr, value);
- }
- else
- {
- var cmd, arg = value;
- switch (attr)
- {
- case 'font-size':
- cmd = 'fontSize';
- arg = 4;
- break;
- case 'font-family':
- cmd = 'fontName';
- break;
- case 'color':
- cmd = 'foreColor';
- break;
- case 'background-color':
- cmd = 'backColor';
- break;
- }
-
- this.document.execCommand(cmd, false, arg);
-
- var fonts = this.$editor.find('font');
- $.each(fonts, $.proxy(function(i, s)
- {
- this.inlineSetMethods(type, s, attr, value);
-
- }, this));
-
- }
-
- this.selectionRestore();
- this.sync();
- },
- inlineSetMethods: function(type, s, attr, value)
- {
- var parent = $(s).parent(), el;
-
- var selectionHtml = this.getSelectionText();
- var parentHtml = $(parent).text();
- var selected = selectionHtml == parentHtml;
-
- if (selected && parent && parent[0].tagName === 'INLINE' && parent[0].attributes.length != 0)
- {
- el = parent;
- $(s).replaceWith($(s).html());
- }
- else
- {
- el = $('<inline>').append($(s).contents());
- $(s).replaceWith(el);
- }
-
-
- $(el)[type](attr, value);
-
- return el;
- },
- // Sort elements and execute callback
- inlineEachNodes: function(callback)
- {
- var range = this.getRange(),
- node = this.getElement(),
- nodes = this.getNodes(),
- collapsed;
-
- if (range.collapsed || range.startContainer === range.endContainer && node)
- {
- nodes = $(node);
- collapsed = true;
- }
-
- $.each(nodes, $.proxy(function(i, node)
- {
- if (!collapsed && node.tagName !== 'INLINE')
- {
- var selectionHtml = this.getSelectionText();
- var parentHtml = $(node).parent().text();
- var selected = selectionHtml == parentHtml;
-
- if (selected && node.parentNode.tagName === 'INLINE' && !$(node.parentNode).hasClass('redactor_editor'))
- {
- node = node.parentNode;
- }
- else return;
- }
- callback.call(this, node);
-
- }, this ) );
- },
- inlineUnwrapSpan: function()
- {
- var $spans = this.$editor.find('inline');
-
- $.each($spans, $.proxy(function(i, span)
- {
- var $span = $(span);
-
- if ($span.attr('class') === undefined && $span.attr('style') === undefined)
- {
- $span.contents().unwrap();
- }
-
- }, this));
- },
- inlineFormat: function(tag)
- {
- this.selectionSave();
-
- this.document.execCommand('fontSize', false, 4 );
-
- var fonts = this.$editor.find('font');
- var last;
- $.each(fonts, function(i, s)
- {
- var el = $('<' + tag + '/>').append($(s).contents());
- $(s).replaceWith(el);
- last = el;
- });
-
- this.selectionRestore();
-
- this.sync();
- },
- inlineRemoveFormat: function(tag)
- {
- this.selectionSave();
-
- var utag = tag.toUpperCase();
- var nodes = this.getNodes();
- var parent = $(this.getParent()).parent();
-
- $.each(nodes, function(i, s)
- {
- if (s.tagName === utag) this.inlineRemoveFormatReplace(s);
- });
-
- if (parent && parent[0].tagName === utag) this.inlineRemoveFormatReplace(parent);
-
- this.selectionRestore();
- this.sync();
- },
- inlineRemoveFormatReplace: function(el)
- {
- $(el).replaceWith($(el).contents());
- },
-
-
- // INSERT
- insertHtml: function (html, sync)
- {
- var current = this.getCurrent();
- var parent = current.parentNode;
-
- this.focusWithSaveScroll();
-
- this.bufferSet();
-
- var $html = $('<div>').append($.parseHTML(html));
- html = $html.html();
-
- html = this.cleanRemoveEmptyTags(html);
-
- // Update value
- $html = $('<div>').append($.parseHTML(html));
- var currBlock = this.getBlock();
-
- if ($html.contents().length == 1)
- {
- var htmlTagName = $html.contents()[0].tagName;
-
- // If the inserted and received text tags match
- if (htmlTagName != 'P' && htmlTagName == currBlock.tagName || htmlTagName == 'PRE')
- {
- //html = $html.html();
- $html = $('<div>').append(html);
- }
- }
-
- if (this.opts.linebreaks)
- {
- html = html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi, '$2<br>');
- }
-
- // add text in a paragraph
- if (!this.opts.linebreaks && $html.contents().length == 1 && $html.contents()[0].nodeType == 3
- && (this.getRangeSelectedNodes().length > 2 || (!current || current.tagName == 'BODY' && !parent || parent.tagName == 'HTML')))
- {
- html = '<p>' + html + '</p>';
- }
-
- html = this.setSpansVerifiedHtml(html);
-
- if ($html.contents().length > 1 && currBlock
- || $html.contents().is('p, :header, ul, ol, li, div, table, td, blockquote, pre, address, section, header, footer, aside, article'))
- {
- if (this.browser('msie'))
- {
- if (!this.isIe11())
- {
- this.document.selection.createRange().pasteHTML(html);
- }
- else
- {
- this.execPasteFrag(html);
- }
- }
- else
- {
- this.document.execCommand('inserthtml', false, html);
- }
- }
- else this.insertHtmlAdvanced(html, false);
-
- if (this.selectall)
- {
- this.window.setTimeout($.proxy(function()
- {
- if (!this.opts.linebreaks) this.selectionEnd(this.$editor.contents().last());
- else this.focusEnd();
-
- }, this), 1);
- }
-
- this.observeStart();
-
- // set no editable
- this.setNonEditable();
-
- if (sync !== false) this.sync();
- },
- insertHtmlAdvanced: function(html, sync)
- {
- html = this.setSpansVerifiedHtml(html);
-
- var sel = this.getSelection();
-
- if (sel.getRangeAt && sel.rangeCount)
- {
- var range = sel.getRangeAt(0);
- range.deleteContents();
-
- var el = document.createElement('div');
- el.innerHTML = html;
- var frag = document.createDocumentFragment(), node, lastNode;
- while ((node = el.firstChild))
- {
- lastNode = frag.appendChild(node);
- }
-
- range.insertNode(frag);
-
- if (lastNode)
- {
- range = range.cloneRange();
- range.setStartAfter(lastNode);
- range.collapse(true);
- sel.removeAllRanges();
- sel.addRange(range);
- }
- }
-
- if (sync !== false)
- {
- this.sync();
- }
-
- },
- insertBeforeCursor: function(html)
- {
- html = this.setSpansVerifiedHtml(html);
-
- var node = $(html);
-
- var space = document.createElement("span");
- space.innerHTML = "\u200B";
-
- var range = this.getRange();
- range.insertNode(space);
- range.insertNode(node[0]);
- range.collapse(false);
-
- var sel = this.getSelection();
- sel.removeAllRanges();
- sel.addRange(range);
-
- this.sync();
- },
- insertText: function(html)
- {
- var $html = $($.parseHTML(html));
-
- if ($html.length) html = $html.text();
-
- this.focusWithSaveScroll();
-
- if (this.browser('msie'))
- {
- if (!this.isIe11())
- {
- this.document.selection.createRange().pasteHTML(html);
- }
- else
- {
- this.execPasteFrag(html);
- }
- }
- else
- {
- this.document.execCommand('inserthtml', false, html);
- }
-
- this.sync();
- },
- insertNode: function(node)
- {
- node = node[0] || node;
-
- if (node.tagName == 'SPAN')
- {
- var replacementTag = 'inline';
-
- var outer = node.outerHTML;
-
- // Replace opening tag
- var regex = new RegExp('<' + node.tagName, 'i');
- var newTag = outer.replace(regex, '<' + replacementTag);
-
- // Replace closing tag
- regex = new RegExp('</' + node.tagName, 'i');
- newTag = newTag.replace(regex, '</' + replacementTag);
- node = $(newTag)[0];
- }
-
- var sel = this.getSelection();
- if (sel.getRangeAt && sel.rangeCount)
- {
- // with delete contents
- range = sel.getRangeAt(0);
- range.deleteContents();
- range.insertNode(node);
- range.setEndAfter(node);
- range.setStartAfter(node);
- sel.removeAllRanges();
- sel.addRange(range);
- }
-
- return node;
- },
- insertNodeToCaretPositionFromPoint: function(e, node)
- {
- var range;
- var x = e.clientX, y = e.clientY;
- if (this.document.caretPositionFromPoint)
- {
- var pos = this.document.caretPositionFromPoint(x, y);
- range = this.getRange();
- range.setStart(pos.offsetNode, pos.offset);
- range.collapse(true);
- range.insertNode(node);
- }
- else if (this.document.caretRangeFromPoint)
- {
- range = this.document.caretRangeFromPoint(x, y);
- range.insertNode(node);
- }
- else if (typeof document.body.createTextRange != "undefined")
- {
- range = this.document.body.createTextRange();
- range.moveToPoint(x, y);
- var endRange = range.duplicate();
- endRange.moveToPoint(x, y);
- range.setEndPoint("EndToEnd", endRange);
- range.select();
- }
-
- },
- insertAfterLastElement: function(element, parent)
- {
- if (typeof(parent) != 'undefined') element = parent;
-
- if (this.isEndOfElement())
- {
- if (this.opts.linebreaks)
- {
- var contents = $('<div>').append($.trim(this.$editor.html())).contents();
- var last = contents.last()[0];
- if (last.tagName == 'SPAN' && last.innerHTML == '')
- {
- last = contents.prev()[0];
- }
-
- if (this.outerHtml(last) != this.outerHtml(element))
- {
- return false;
- }
- }
- else
- {
- if (this.$editor.contents().last()[0] !== element)
- {
- return false;
- }
- }
-
- this.insertingAfterLastElement(element);
- }
- },
- insertingAfterLastElement: function(element)
- {
- this.bufferSet();
-
- if (this.opts.linebreaks === false)
- {
- var node = $(this.opts.emptyHtml);
- $(element).after(node);
- this.selectionStart(node);
- }
- else
- {
- var node = $('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>', this.document)[0];
- $(element).after(node);
- $(node).after(this.opts.invisibleSpace);
- this.selectionRestore();
- this.$editor.find('span#selection-marker-1').removeAttr('id');
- }
- },
- insertLineBreak: function(twice)
- {
- this.selectionSave();
-
- var br = '<br>';
- if (twice == true)
- {
- br = '<br><br>';
- }
-
- if (this.browser('mozilla'))
- {
- var span = $('<span>').html(this.opts.invisibleSpace);
- this.$editor.find('#selection-marker-1').before(br).before(span).before(this.opts.invisibleSpace);
-
- this.setCaretAfter(span[0]);
- span.remove();
-
- this.selectionRemoveMarkers();
- }
- else
- {
- var parent = this.getParent();
- if (parent && parent.tagName === 'A')
- {
- var offset = this.getCaretOffset(parent);
-
- var text = $.trim($(parent).text()).replace(/\n\r\n/g, '');
- var len = text.length;
-
- if (offset == len)
- {
- this.selectionRemoveMarkers();
-
- var node = $('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>', this.document)[0];
- $(parent).after(node);
- $(node).before(br + (this.browser('webkit') ? this.opts.invisibleSpace : ''));
- this.selectionRestore();
-
- return true;
- }
-
- }
-
- this.$editor.find('#selection-marker-1').before(br + (this.browser('webkit') ? this.opts.invisibleSpace : ''));
- this.selectionRestore();
- }
- },
- insertDoubleLineBreak: function()
- {
- this.insertLineBreak(true);
- },
- replaceLineBreak: function(element)
- {
- var node = $('<br>' + this.opts.invisibleSpace);
- $(element).replaceWith(node);
- this.selectionStart(node);
- },
-
- // PASTE
- pasteClean: function(html)
- {
- html = this.callback('pasteBefore', false, html);
-
- // ie10 fix paste links
- if (this.browser('msie'))
- {
- var tmp = $.trim(html);
- if (tmp.search(/^<a(.*?)>(.*?)<\/a>$/i) == 0)
- {
- html = html.replace(/^<a(.*?)>(.*?)<\/a>$/i, "$2");
- }
- }
-
- if (this.opts.pastePlainText)
- {
- var tmp = this.document.createElement('div');
-
- html = html.replace(/<br>|<\/H[1-6]>|<\/p>|<\/div>/gi, '\n');
-
- tmp.innerHTML = html;
- html = tmp.textContent || tmp.innerText;
-
- html = $.trim(html);
- html = html.replace('\n', '<br>');
- html = this.cleanParagraphy(html);
-
- this.pasteInsert(html);
- return false;
- }
-
- // clean up table
- var tablePaste = false;
- if (this.currentOrParentIs('TD'))
- {
- tablePaste = true;
- var blocksElems = this.opts.blockLevelElements;
- blocksElems.push('tr');
- blocksElems.push('table');
- $.each(blocksElems, function(i,s)
- {
- html = html.replace(new RegExp('<' + s + '(.*?)>', 'gi'), '');
- html = html.replace(new RegExp('</' + s + '>', 'gi'), '<br>');
- });
- }
-
- // clean up pre
- if (this.currentOrParentIs('PRE'))
- {
- html = this.pastePre(html);
- this.pasteInsert(html);
- return true;
- }
-
- // ms words shapes
- html = html.replace(/<img(.*?)v:shapes=(.*?)>/gi, '');
-
- // ms word list
- html = html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi, '<ul><li$2</li>');
- html = html.replace(/<p(.*?)class="MsoListParagraphCxSpMiddle"([\w\W]*?)<\/p>/gi, '<li$2</li>');
- html = html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi, '<li$2</li></ul>');
- // one line
- html = html.replace(/<p(.*?)class="MsoListParagraph"([\w\W]*?)<\/p>/gi, '<ul><li$2</li></ul>');
- // remove ms word's bullet
- html = html.replace(/·/g, '');
-
- // remove comments and php tags
- html = html.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, '');
-
- // remove nbsp
- if (this.opts.cleanSpaces === true)
- {
- html = html.replace(/( ){2,}/gi, ' ');
- html = html.replace(/ /gi, ' ');
- }
-
- // remove google docs marker
- html = html.replace(/<b\sid="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi, "$2");
- html = html.replace(/<b(.*?)id="docs-internal-guid(.*?)">([\w\W]*?)<\/b>/gi, "$3");
-
-
- html = html.replace(/<span[^>]*(font-style: italic; font-weight: bold|font-weight: bold; font-style: italic)[^>]*>/gi, '<span style="font-weight: bold;"><span style="font-style: italic;">');
- html = html.replace(/<span[^>]*font-style: italic[^>]*>/gi, '<span style="font-style: italic;">');
- html = html.replace(/<span[^>]*font-weight: bold[^>]*>/gi, '<span style="font-weight: bold;">');
- html = html.replace(/<span[^>]*text-decoration: underline[^>]*>/gi, '<span style="text-decoration: underline;">');
-
- // strip tags
- //html = this.cleanStripTags(html);
-
-
-
- // prevert
- html = html.replace(/<td>\u200b*<\/td>/gi, '[td]');
- html = html.replace(/<td> <\/td>/gi, '[td]');
- html = html.replace(/<td><br><\/td>/gi, '[td]');
- html = html.replace(/<td(.*?)colspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi, '[td colspan="$2"]$4[/td]');
- html = html.replace(/<td(.*?)rowspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi, '[td rowspan="$2"]$4[/td]');
- html = html.replace(/<a(.*?)href="(.*?)"(.*?)>([\w\W]*?)<\/a>/gi, '[a href="$2"]$4[/a]');
- html = html.replace(/<iframe(.*?)>([\w\W]*?)<\/iframe>/gi, '[iframe$1]$2[/iframe]');
- html = html.replace(/<video(.*?)>([\w\W]*?)<\/video>/gi, '[video$1]$2[/video]');
- html = html.replace(/<audio(.*?)>([\w\W]*?)<\/audio>/gi, '[audio$1]$2[/audio]');
- html = html.replace(/<embed(.*?)>([\w\W]*?)<\/embed>/gi, '[embed$1]$2[/embed]');
- html = html.replace(/<object(.*?)>([\w\W]*?)<\/object>/gi, '[object$1]$2[/object]');
- html = html.replace(/<param(.*?)>/gi, '[param$1]');
-
- html = html.replace(/<img(.*?)>/gi, '[img$1]');
-
- // remove classes
- html = html.replace(/ class="(.*?)"/gi, '');
-
- // remove all attributes
- html = html.replace(/<(\w+)([\w\W]*?)>/gi, '<$1>');
-
- // remove empty
- if (this.opts.linebreaks)
- {
- // prevent double linebreaks when an empty line in RTF has bold or underlined formatting associated with it
- html = html.replace(/<strong><\/strong>/gi, '');
- html = html.replace(/<u><\/u>/gi, '');
-
- if (this.opts.cleanFontTag)
- {
- html = html.replace(/<font(.*?)>([\w\W]*?)<\/font>/gi, '$2');
- }
-
- html = html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi, '<br>');
- }
- else
- {
- html = html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi, '');
- }
-
- html = html.replace(/<div>\s*?\t*?\n*?(<ul>|<ol>|<p>)/gi, '$1');
-
- // revert
- html = html.replace(/\[td colspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi, '<td colspan="$1">$2</td>');
- html = html.replace(/\[td rowspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi, '<td rowspan="$1">$2</td>');
- html = html.replace(/\[td\]/gi, '<td> </td>');
- html = html.replace(/\[a href="(.*?)"\]([\w\W]*?)\[\/a\]/gi, '<a href="$1">$2</a>');
- html = html.replace(/\[iframe(.*?)\]([\w\W]*?)\[\/iframe\]/gi, '<iframe$1>$2</iframe>');
- html = html.replace(/\[video(.*?)\]([\w\W]*?)\[\/video\]/gi, '<video$1>$2</video>');
- html = html.replace(/\[audio(.*?)\]([\w\W]*?)\[\/audio\]/gi, '<audio$1>$2</audio>');
- html = html.replace(/\[embed(.*?)\]([\w\W]*?)\[\/embed\]/gi, '<embed$1>$2</embed>');
- html = html.replace(/\[object(.*?)\]([\w\W]*?)\[\/object\]/gi, '<object$1>$2</object>');
- html = html.replace(/\[param(.*?)\]/gi, '<param$1>');
- html = html.replace(/\[img(.*?)\]/gi, '<img$1>');
-
- // convert div to p
- if (this.opts.convertDivs)
- {
- html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p>$2</p>');
- html = html.replace(/<\/div><p>/gi, '<p>');
- html = html.replace(/<\/p><\/div>/gi, '</p>');
- html = html.replace(/<p><\/p>/gi, '<br />');
- }
- else
- {
- html = html.replace(/<div><\/div>/gi, '<br />');
- }
-
- // strip tags
- html = this.cleanStripTags(html);
-
- if (this.currentOrParentIs('LI'))
- {
- html = html.replace(/<p>([\w\W]*?)<\/p>/gi, '$1<br>');
- }
- else if (tablePaste === false)
- {
- html = this.cleanParagraphy(html);
- }
-
- // remove span
- html = html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi, '$2');
-
- // remove empty
- html = html.replace(/<img>/gi, '');
- html = html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi, '');
-
- html = html.replace(/\n{3,}/gi, '\n');
-
- // remove dirty p
- html = html.replace(/<p><p>/gi, '<p>');
- html = html.replace(/<\/p><\/p>/gi, '</p>');
-
- html = html.replace(/<li>(\s*|\t*|\n*)<p>/gi, '<li>');
- html = html.replace(/<\/p>(\s*|\t*|\n*)<\/li>/gi, '</li>');
-
- if (this.opts.linebreaks === true)
- {
- html = html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi, '$2<br>');
- }
-
- // remove empty finally
- html = html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi, '');
-
- // remove safari local images
- html = html.replace(/<img src="webkit-fake-url\:\/\/(.*?)"(.*?)>/gi, '');
-
- // remove p in td
- html = html.replace(/<td(.*?)>(\s*|\t*|\n*)<p>([\w\W]*?)<\/p>(\s*|\t*|\n*)<\/td>/gi, '<td$1>$3</td>');
-
- // remove divs
- if (this.opts.convertDivs)
- {
- html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '$2');
- html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '$2');
- }
-
- // FF specific
- this.pasteClipboardMozilla = false;
- if (this.browser('mozilla'))
- {
- if (this.opts.clipboardUpload)
- {
- var matches = html.match(/<img src="data:image(.*?)"(.*?)>/gi);
- if (matches !== null)
- {
- this.pasteClipboardMozilla = matches;
- for (k in matches)
- {
- var img = matches[k].replace('<img', '<img data-mozilla-paste-image="' + k + '" ');
- html = html.replace(matches[k], img);
- }
- }
- }
-
- // FF fix
- while (/<br>$/gi.test(html))
- {
- html = html.replace(/<br>$/gi, '');
- }
- }
-
- // bullets again
- html = html.replace(/<p>•([\w\W]*?)<\/p>/gi, '<li>$1</li>');
-
- // ie inserts a blank font tags when pasting
- if (this.browser('msie'))
- {
- while (/<font>([\w\W]*?)<\/font>/gi.test(html))
- {
- html = html.replace(/<font>([\w\W]*?)<\/font>/gi, '$1');
- }
- }
-
- // remove table paragraphs
- if (tablePaste === false)
- {
- html = html.replace(/<td(.*?)>([\w\W]*?)<p(.*?)>([\w\W]*?)<\/td>/gi, '<td$1>$2$4</td>');
- html = html.replace(/<td(.*?)>([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi, '<td$1>$2$3</td>');
- html = html.replace(/<td(.*?)>([\w\W]*?)<p(.*?)>([\w\W]*?)<\/td>/gi, '<td$1>$2$4</td>');
- html = html.replace(/<td(.*?)>([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi, '<td$1>$2$3</td>');
- }
-
- // ms word break lines
- html = html.replace(/\n/g, ' ');
-
- // ms word lists break lines
- html = html.replace(/<p>\n?<li>/gi, '<li>');
-
- this.pasteInsert(html);
-
- },
- pastePre: function(s)
- {
- s = s.replace(/<br>|<\/H[1-6]>|<\/p>|<\/div>/gi, '\n');
-
- var tmp = this.document.createElement('div');
- tmp.innerHTML = s;
- return this.cleanEncodeEntities(tmp.textContent || tmp.innerText);
- },
- pasteInsert: function(html)
- {
- html = this.callback('pasteAfter', false, html);
-
- if (this.selectall)
- {
- this.$editor.html(html);
- this.selectionRemove();
- this.focusEnd();
- this.sync();
- }
- else
- {
- this.insertHtml(html);
- }
-
- this.selectall = false;
-
- setTimeout($.proxy(function()
- {
- this.rtePaste = false;
-
- // FF specific
- if (this.browser('mozilla'))
- {
- this.$editor.find('p:empty').remove()
- }
- if (this.pasteClipboardMozilla !== false)
- {
- this.pasteClipboardUploadMozilla();
- }
-
- }, this), 100);
-
- if (this.opts.autoresize && this.fullscreen !== true)
- {
- $(this.document.body).scrollTop(this.saveScroll);
- }
- else
- {
- this.$editor.scrollTop(this.saveScroll);
- }
- },
- pasteClipboardAppendFields: function(postData)
- {
- // append hidden fields
- if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
- {
- $.each(this.opts.uploadFields, $.proxy(function(k, v)
- {
- if (v != null && v.toString().indexOf('#') === 0) v = $(v).val();
- postData[k] = v;
-
- }, this));
- }
-
- return postData;
- },
- pasteClipboardUploadMozilla: function()
- {
- var imgs = this.$editor.find('img[data-mozilla-paste-image]');
- $.each(imgs, $.proxy(function(i,s)
- {
- var $s = $(s);
- var arr = s.src.split(",");
- var postData = {
- 'contentType': arr[0].split(";")[0].split(":")[1],
- 'data': arr[1] // raw base64
- };
-
- // append hidden fields
- postData = this.pasteClipboardAppendFields(postData);
-
- $.post(this.opts.clipboardUploadUrl, postData,
- $.proxy(function(data)
- {
- var json = (typeof data === 'string' ? $.parseJSON(data) : data);
- $s.attr('src', json.filelink);
- $s.removeAttr('data-mozilla-paste-image');
-
- this.sync();
-
- // upload callback
- this.callback('imageUpload', $s, json);
-
- }, this));
-
- }, this));
- },
- pasteClipboardUpload: function(e)
- {
- var result = e.target.result;
- var arr = result.split(",");
- var postData = {
- 'contentType': arr[0].split(";")[0].split(":")[1],
- 'data': arr[1] // raw base64
- };
-
-
- if (this.opts.clipboardUpload)
- {
- // append hidden fields
- postData = this.pasteClipboardAppendFields(postData);
-
- $.post(this.opts.clipboardUploadUrl, postData,
- $.proxy(function(data)
- {
- var json = (typeof data === 'string' ? $.parseJSON(data) : data);
-
- var html = '<img src="' + json.filelink + '" id="clipboard-image-marker" />';
- this.execCommand('inserthtml', html, false);
-
- var image = $(this.$editor.find('img#clipboard-image-marker'));
-
- if (image.length) image.removeAttr('id');
- else image = false;
-
- this.sync();
-
- // upload callback
- if (image)
- {
- this.callback('imageUpload', image, json);
- }
-
-
- }, this));
- }
- else
- {
- this.insertHtml('<img src="' + result + '" />');
- }
- },
-
- // BUFFER
- bufferSet: function(selectionSave)
- {
- if (selectionSave !== false)
- {
- this.selectionSave();
- }
-
- this.opts.buffer.push(this.$editor.html());
-
- if (selectionSave !== false)
- {
- this.selectionRemoveMarkers('buffer');
- }
-
- },
- bufferUndo: function()
- {
- if (this.opts.buffer.length === 0)
- {
- this.focusWithSaveScroll();
- return;
- }
-
- // rebuffer
- this.selectionSave();
- this.opts.rebuffer.push(this.$editor.html());
- this.selectionRestore(false, true);
-
- this.$editor.html(this.opts.buffer.pop());
-
- this.selectionRestore();
- setTimeout($.proxy(this.observeStart, this), 100);
- },
- bufferRedo: function()
- {
- if (this.opts.rebuffer.length === 0)
- {
- this.focusWithSaveScroll();
- return false;
- }
-
- // buffer
- this.selectionSave();
- this.opts.buffer.push(this.$editor.html());
- this.selectionRestore(false, true);
-
- this.$editor.html(this.opts.rebuffer.pop());
- this.selectionRestore(true);
- setTimeout($.proxy(this.observeStart, this), 4);
- },
-
- // OBSERVE
- observeStart: function()
- {
- this.observeImages();
-
- if (this.opts.observeLinks) this.observeLinks();
- },
- observeLinks: function()
- {
- this.$editor.find('a').on('click', $.proxy(this.linkObserver, this));
-
- this.$editor.on('click.redactor', $.proxy(function(e)
- {
- this.linkObserverTooltipClose(e);
-
- }, this));
-
- $(document).on('click.redactor', $.proxy(function(e)
- {
- this.linkObserverTooltipClose(e);
-
- }, this));
- },
- observeImages: function()
- {
- if (this.opts.observeImages === false) return false;
-
- this.$editor.find('img').each($.proxy(function(i, elem)
- {
- if (this.browser('msie')) $(elem).attr('unselectable', 'on');
-
- var parent = $(elem).parent();
- if (!parent.hasClass('royalSlider') && !parent.hasClass('fotorama'))
- {
- this.imageResize(elem);
- }
-
- }, this));
-
- // royalSlider and fotorama
- this.$editor.find('.fotorama, .royalSlider').on('click', $.proxy(this.editGallery, this));
-
- },
- linkObserver: function(e)
- {
- var $link = $(e.target);
-
- var parent = $(e.target).parent();
- if (parent.hasClass('royalSlider') || parent.hasClass('fotorama'))
- {
- return;
- }
-
- if ($link.size() == 0 || $link[0].tagName !== 'A') return;
-
- var pos = $link.offset();
- if (this.opts.iframe)
- {
- var posFrame = this.$frame.offset();
- pos.top = posFrame.top + (pos.top - $(this.document).scrollTop());
- pos.left += posFrame.left;
- }
-
- var tooltip = $('<span class="redactor-link-tooltip"></span>');
-
- var href = $link.attr('href');
- if (href === undefined)
- {
- href = '';
- }
-
- if (href.length > 24) href = href.substring(0, 24) + '...';
-
- var aLink = $('<a href="' + $link.attr('href') + '" target="_blank">' + href + '</a>').on('click', $.proxy(function(e)
- {
- this.linkObserverTooltipClose(false);
- }, this));
-
- var aEdit = $('<a href="#">' + this.opts.curLang.edit + '</a>').on('click', $.proxy(function(e)
- {
- e.preventDefault();
- this.linkShow();
- this.linkObserverTooltipClose(false);
-
- }, this));
-
- var aUnlink = $('<a href="#">' + this.opts.curLang.unlink + '</a>').on('click', $.proxy(function(e)
- {
- e.preventDefault();
- this.execCommand('unlink');
- this.linkObserverTooltipClose(false);
-
- }, this));
-
-
- tooltip.append(aLink);
- tooltip.append(' | ');
- tooltip.append(aEdit);
- tooltip.append(' | ');
- tooltip.append(aUnlink);
- tooltip.css({
- top: (pos.top + 20) + 'px',
- left: pos.left + 'px'
- });
-
- $('.redactor-link-tooltip').remove();
- $('body').append(tooltip);
- },
- linkObserverTooltipClose: function(e)
- {
- if (e !== false && e.target.tagName == 'A') return false;
- $('.redactor-link-tooltip').remove();
- },
-
- // SELECTION
- getSelection: function()
- {
- if (!this.opts.rangy) return this.document.getSelection();
- else // rangy
- {
- if (!this.opts.iframe) return rangy.getSelection();
- else return rangy.getSelection(this.$frame[0]);
- }
- },
- getRange: function()
- {
- if (!this.opts.rangy)
- {
- if (this.document.getSelection)
- {
- var sel = this.getSelection();
- if (sel.getRangeAt && sel.rangeCount) return sel.getRangeAt(0);
- }
-
- return this.document.createRange();
- }
- else // rangy
- {
- if (!this.opts.iframe) return rangy.createRange();
- else return rangy.createRange(this.iframeDoc());
- }
- },
- selectionElement: function(node)
- {
- this.setCaret(node);
- },
- selectionStart: function(node)
- {
- this.selectionSet(node[0] || node, 0, null, 0);
- },
- selectionEnd: function(node)
- {
- this.selectionSet(node[0] || node, 1, null, 1);
- },
- selectionSet: function(orgn, orgo, focn, foco)
- {
- if (focn == null) focn = orgn;
- if (foco == null) foco = orgo;
-
- var sel = this.getSelection();
- if (!sel) return;
-
- if (orgn.tagName == 'P' && orgn.innerHTML == '')
- {
- orgn.innerHTML = this.opts.invisibleSpace;
- }
-
- if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
- {
- var par = $(this.opts.emptyHtml)[0];
- $(orgn).replaceWith(par);
- orgn = par;
- focn = orgn;
- }
-
- var range = this.getRange();
- range.setStart(orgn, orgo);
- range.setEnd(focn, foco );
-
- try {
- sel.removeAllRanges();
- } catch (e) {}
-
- sel.addRange(range);
- },
- selectionWrap: function(tag)
- {
- tag = tag.toLowerCase();
-
- var block = this.getBlock();
- if (block)
- {
- var wrapper = this.formatChangeTag(block, tag);
- this.sync();
- return wrapper;
- }
-
- var sel = this.getSelection();
- var range = sel.getRangeAt(0);
- var wrapper = document.createElement(tag);
- wrapper.appendChild(range.extractContents());
- range.insertNode(wrapper);
-
- this.selectionElement(wrapper);
-
- return wrapper;
- },
- selectionAll: function()
- {
- var range = this.getRange();
- range.selectNodeContents(this.$editor[0]);
-
- var sel = this.getSelection();
- sel.removeAllRanges();
- sel.addRange(range);
- },
- selectionRemove: function()
- {
- this.getSelection().removeAllRanges();
- },
- getCaretOffset: function (element)
- {
- var caretOffset = 0;
-
- var range = this.getRange();
- var preCaretRange = range.cloneRange();
- preCaretRange.selectNodeContents(element);
- preCaretRange.setEnd(range.endContainer, range.endOffset);
- caretOffset = $.trim(preCaretRange.toString()).length;
-
- return caretOffset;
- },
- getCaretOffsetRange: function()
- {
- return new Range(this.getSelection().getRangeAt(0));
- },
- setCaret: function (el, start, end)
- {
- if (typeof end === 'undefined') end = start;
- el = el[0] || el;
-
- var range = this.getRange();
- range.selectNodeContents(el);
-
- var textNodes = this.getTextNodesIn(el);
- var foundStart = false;
- var charCount = 0, endCharCount;
-
- if (textNodes.length == 1 && start)
- {
- range.setStart(textNodes[0], start);
- range.setEnd(textNodes[0], end);
- }
- else
- {
- for (var i = 0, textNode; textNode = textNodes[i++];)
- {
- endCharCount = charCount + textNode.length;
- if (!foundStart && start >= charCount && (start < endCharCount || (start == endCharCount && i < textNodes.length)))
- {
- range.setStart(textNode, start - charCount);
- foundStart = true;
- }
-
- if (foundStart && end <= endCharCount)
- {
- range.setEnd( textNode, end - charCount );
- break;
- }
-
- charCount = endCharCount;
- }
- }
-
- var sel = this.getSelection();
- sel.removeAllRanges();
- sel.addRange( range );
- },
- setCaretAfter: function(node)
- {
- this.$editor.focus();
-
- node = node[0] || node;
-
- var range = this.document.createRange()
-
- var start = 1;
- var end = -1;
-
- range.setStart(node, start)
- range.setEnd(node, end + 2)
-
-
- var selection = this.window.getSelection()
- var cursorRange = this.document.createRange()
-
- var emptyElement = this.document.createTextNode('\u200B')
- $(node).after(emptyElement)
-
- cursorRange.setStartAfter(emptyElement)
-
- selection.removeAllRanges()
- selection.addRange(cursorRange)
- $(emptyElement).remove();
- },
- getTextNodesIn: function (node)
- {
- var textNodes = [];
-
- if (node.nodeType == 3) textNodes.push(node);
- else
- {
- var children = node.childNodes;
- for (var i = 0, len = children.length; i < len; ++i)
- {
- textNodes.push.apply(textNodes, this.getTextNodesIn(children[i]));
- }
- }
-
- return textNodes;
- },
-
- // GET ELEMENTS
- getCurrent: function()
- {
- var el = false;
- var sel = this.getSelection();
-
- if (sel && sel.rangeCount > 0)
- {
- el = sel.getRangeAt(0).startContainer;
- //el = sel.getRangeAt(0).commonAncestorContainer;
- }
-
- return this.isParentRedactor(el);
- },
- getParent: function(elem)
- {
- elem = elem || this.getCurrent();
- if (elem) return this.isParentRedactor( $( elem ).parent()[0] );
- else return false;
- },
- getBlock: function(node)
- {
- if (typeof node === 'undefined') node = this.getCurrent();
-
- while (node)
- {
- if (this.nodeTestBlocks(node))
- {
- if ($(node).hasClass('redactor_editor')) return false;
- return node;
- }
-
- node = node.parentNode;
- }
-
- return false;
- },
- getBlocks: function(nodes)
- {
- var newnodes = [];
- if (typeof nodes == 'undefined')
- {
- var range = this.getRange();
- if (range && range.collapsed === true) return [this.getBlock()];
- var nodes = this.getNodes(range);
- }
-
- $.each(nodes, $.proxy(function(i,node)
- {
- if (this.opts.iframe === false && $(node).parents('div.redactor_editor').size() == 0) return false;
- if (this.nodeTestBlocks(node)) newnodes.push(node);
-
- }, this));
-
- if (newnodes.length === 0) newnodes = [this.getBlock()];
-
- return newnodes;
- },
- isInlineNode: function(node)
- {
- if (node.nodeType != 1) return false;
-
- return !this.rTestBlock.test(node.nodeName);
- },
- nodeTestBlocks: function(node)
- {
- return node.nodeType == 1 && this.rTestBlock.test(node.nodeName);
- },
- tagTestBlock: function(tag)
- {
- return this.rTestBlock.test(tag);
- },
- getNodes: function(range, tag)
- {
- if (typeof range == 'undefined' || range == false) var range = this.getRange();
- if (range && range.collapsed === true)
- {
- if (typeof tag === 'undefined' && this.tagTestBlock(tag))
- {
- var block = this.getBlock();
- if (block.tagName == tag) return [block];
- else return [];
- }
- else
- {
- return [this.getCurrent()];
- }
- }
-
- var nodes = [], finalnodes = [];
-
- var sel = this.document.getSelection();
- if (!sel.isCollapsed) nodes = this.getRangeSelectedNodes(sel.getRangeAt(0));
-
- $.each(nodes, $.proxy(function(i,node)
- {
- if (this.opts.iframe === false && $(node).parents('div.redactor_editor').size() == 0) return false;
-
- if (typeof tag === 'undefined')
- {
- if ($.trim(node.textContent) != '')
- {
- finalnodes.push(node);
- }
- }
- else if (node.tagName == tag)
- {
- finalnodes.push(node);
- }
-
- }, this));
-
- if (finalnodes.length == 0)
- {
- if (typeof tag === 'undefined' && this.tagTestBlock(tag))
- {
- var block = this.getBlock();
- if (block.tagName == tag) return finalnodes.push(block);
- else return [];
- }
- else
- {
- finalnodes.push(this.getCurrent());
- }
- }
-
- // last element filtering
- var last = finalnodes[finalnodes.length-1];
- if (this.nodeTestBlocks(last))
- {
- finalnodes = finalnodes.slice(0, -1);
- }
-
- return finalnodes;
- },
- getElement: function(node)
- {
- if (!node) node = this.getCurrent();
- while (node)
- {
- if (node.nodeType == 1)
- {
- if ($(node).hasClass('redactor_editor')) return false;
- return node;
- }
-
- node = node.parentNode;
- }
-
- return false;
- },
- getRangeSelectedNodes: function(range)
- {
- range = range || this.getRange();
- var node = range.startContainer;
- var endNode = range.endContainer;
-
- if (node == endNode) return [node];
-
- var rangeNodes = [];
- while (node && node != endNode)
- {
- rangeNodes.push(node = this.nextNode(node));
- }
-
- node = range.startContainer;
- while (node && node != range.commonAncestorContainer)
- {
- rangeNodes.unshift(node);
- node = node.parentNode;
- }
-
- return rangeNodes;
- },
- nextNode: function(node)
- {
- if (node.hasChildNodes()) return node.firstChild;
- else
- {
- while (node && !node.nextSibling)
- {
- node = node.parentNode;
- }
-
- if (!node) return null;
- return node.nextSibling;
- }
- },
-
- // GET SELECTION HTML OR TEXT
- getSelectionText: function()
- {
- return this.getSelection().toString();
- },
- getSelectionHtml: function()
- {
- var html = '';
-
- var sel = this.getSelection();
- if (sel.rangeCount)
- {
- var container = this.document.createElement( "div" );
- var len = sel.rangeCount;
- for (var i = 0; i < len; ++i)
- {
- container.appendChild(sel.getRangeAt(i).cloneContents());
- }
-
- html = container.innerHTML;
- }
-
- return this.syncClean(html);
- },
-
- // SAVE & RESTORE
- selectionSave: function()
- {
- if (!this.isFocused())
- {
- this.focusWithSaveScroll();
- }
-
- if (!this.opts.rangy)
- {
- this.selectionCreateMarker(this.getRange());
- }
- // rangy
- else
- {
- this.savedSel = rangy.saveSelection();
- }
- },
- selectionCreateMarker: function(range, remove)
- {
- if (!range) return;
-
- var node1 = $('<span id="selection-marker-1" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
- var node2 = $('<span id="selection-marker-2" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
-
- if (range.collapsed === true)
- {
- this.selectionSetMarker(range, node1, true);
- }
- else
- {
- this.selectionSetMarker(range, node1, true);
- this.selectionSetMarker(range, node2, false);
- }
-
- this.savedSel = this.$editor.html();
-
- this.selectionRestore(false, false);
- },
- selectionSetMarker: function(range, node, type)
- {
- var boundaryRange = range.cloneRange();
-
- try {
- boundaryRange.collapse(type);
- boundaryRange.insertNode(node);
- boundaryRange.detach();
- }
- catch (e)
- {
- var html = this.opts.emptyHtml;
- if (this.opts.linebreaks) html = '<br>';
-
- this.$editor.prepend(html);
- this.focus();
- }
- },
- selectionRestore: function(replace, remove)
- {
- if (!this.opts.rangy)
- {
- if (replace === true && this.savedSel)
- {
- this.$editor.html(this.savedSel);
- }
-
- var node1 = this.$editor.find('span#selection-marker-1');
- var node2 = this.$editor.find('span#selection-marker-2');
-
- if (this.browser('mozilla'))
- {
- this.$editor.focus();
- }
- else if (!this.isFocused())
- {
- this.focusWithSaveScroll();
- }
-
- if (node1.length != 0 && node2.length != 0)
- {
-
- this.selectionSet(node1[0], 0, node2[0], 0);
- }
- else if (node1.length != 0)
- {
- this.selectionSet(node1[0], 0, null, 0);
- }
-
- if (remove !== false)
- {
- this.selectionRemoveMarkers();
- this.savedSel = false;
- }
- }
- // rangy
- else
- {
- rangy.restoreSelection(this.savedSel);
- }
- },
- selectionRemoveMarkers: function(type)
- {
- if (!this.opts.rangy)
- {
- $.each(this.$editor.find('span.redactor-selection-marker'), function()
- {
- var html = $.trim($(this).html().replace(/[^\u0000-\u1C7F]/g, ''));
- if (html == '')
- {
- $(this).remove();
- }
- else
- {
- $(this).removeAttr('class').removeAttr('id');
- }
- });
- }
- // rangy
- else
- {
- rangy.removeMarkers(this.savedSel);
- }
- },
-
- // TABLE
- tableShow: function()
- {
- this.selectionSave();
-
- this.modalInit(this.opts.curLang.table, this.opts.modal_table, 300, $.proxy(function()
- {
- $('#redactor_insert_table_btn').click($.proxy(this.tableInsert, this));
-
- setTimeout(function()
- {
- $('#redactor_table_rows').focus();
-
- }, 200);
-
- }, this));
- },
- tableInsert: function()
- {
- this.bufferSet(false);
-
- var rows = $('#redactor_table_rows').val(),
- columns = $('#redactor_table_columns').val(),
- $table_box = $('<div></div>'),
- tableId = Math.floor(Math.random() * 99999),
- $table = $('<table id="table' + tableId + '"><tbody></tbody></table>'),
- i, $row, z, $column;
-
- for (i = 0; i < rows; i++)
- {
- $row = $('<tr></tr>');
-
- for (z = 0; z < columns; z++)
- {
- $column = $('<td>' + this.opts.invisibleSpace + '</td>');
-
- // set the focus to the first td
- if (i === 0 && z === 0)
- {
- $column.append('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
- }
-
- $($row).append($column);
- }
-
- $table.append($row);
- }
-
- $table_box.append($table);
- var html = $table_box.html();
-
- if (this.opts.linebreaks === false && this.browser('mozilla'))
- {
- html += '<p>' + this.opts.invisibleSpace + '</p>';
- }
-
- this.modalClose();
- this.selectionRestore();
-
- var current = this.getBlock() || this.getCurrent();
-
- if (current && current.tagName != 'BODY')
- {
- if (current.tagName == 'LI')
- {
- var current = $(current).closest('ul, ol');
- }
-
- $(current).after(html)
- }
- else
- {
-
- this.insertHtmlAdvanced(html, false);
- }
-
- this.selectionRestore();
-
- var table = this.$editor.find('#table' + tableId);
- this.buttonActiveObserver();
-
- table.find('span#selection-marker-1, inline#selection-marker-1').remove();
- table.removeAttr('id');
-
- this.sync();
- },
- tableDeleteTable: function()
- {
- var $table = $(this.getParent()).closest('table');
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- $table.remove();
- this.sync();
- },
- tableDeleteRow: function()
- {
- var parent = this.getParent();
- var $table = $(parent).closest('table');
-
-
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- var $current_tr = $(parent).closest('tr');
- var $focus_tr = $current_tr.prev().length ? $current_tr.prev() : $current_tr.next();
- if ($focus_tr.length)
- {
- var $focus_td = $focus_tr.children('td' ).first();
- if ($focus_td.length)
- {
- $focus_td.prepend('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
- }
- }
-
- $current_tr.remove();
- this.selectionRestore();
- $table.find('span#selection-marker-1').remove();
- this.sync();
- },
- tableDeleteColumn: function()
- {
- var parent = this.getParent();
- var $table = $(parent).closest('table');
-
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- var $current_td = $(parent).closest('td');
- if (!($current_td.is('td')))
- {
- $current_td = $current_td.closest('td');
- }
-
- var index = $current_td.get(0).cellIndex;
-
- // Set the focus correctly
- $table.find('tr').each($.proxy(function(i, elem)
- {
- var focusIndex = index - 1 < 0 ? index + 1 : index - 1;
- if (i === 0)
- {
- $(elem).find('td').eq(focusIndex).prepend('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
- }
-
- $(elem).find('td').eq(index).remove();
-
- }, this));
-
- this.selectionRestore();
- $table.find('span#selection-marker-1').remove();
- this.sync();
- },
- tableAddHead: function()
- {
- var $table = $(this.getParent()).closest('table');
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- if ($table.find('thead').size() !== 0) this.tableDeleteHead();
- else
- {
- var tr = $table.find('tr').first().clone();
- tr.find('td').html(this.opts.invisibleSpace);
- $thead = $('<thead></thead>');
- $thead.append(tr);
- $table.prepend($thead);
-
- this.sync();
- }
- },
- tableDeleteHead: function()
- {
- var $table = $(this.getParent()).closest('table');
- if (!this.isParentRedactor($table)) return false;
- var $thead = $table.find('thead');
-
- if ($thead.size() == 0) return false;
-
- this.bufferSet();
-
- $thead.remove();
- this.sync();
- },
- tableAddRowAbove: function()
- {
- this.tableAddRow('before');
- },
- tableAddRowBelow: function()
- {
- this.tableAddRow('after');
- },
- tableAddColumnLeft: function()
- {
- this.tableAddColumn('before');
- },
- tableAddColumnRight: function()
- {
- this.tableAddColumn('after');
- },
- tableAddRow: function(type)
- {
- var $table = $(this.getParent()).closest('table');
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- var $current_tr = $(this.getParent()).closest('tr');
- var new_tr = $current_tr.clone();
- new_tr.find('td').html(this.opts.invisibleSpace);
-
- if (type === 'after') $current_tr.after(new_tr);
- else $current_tr.before(new_tr);
-
- this.sync();
- },
- tableAddColumn: function (type)
- {
- var parent = this.getParent();
- var $table = $(parent).closest('table');
-
- if (!this.isParentRedactor($table)) return false;
- if ($table.size() == 0) return false;
-
- this.bufferSet();
-
- var index = 0;
-
- var current = this.getCurrent();
- var $current_tr = $(current).closest('tr');
- var $current_td = $(current).closest('td');
-
- $current_tr.find('td').each($.proxy(function(i, elem)
- {
- if ($(elem)[0] === $current_td[0]) index = i;
-
- }, this));
-
- $table.find('tr').each($.proxy(function(i, elem)
- {
- var $current = $(elem).find('td').eq(index);
-
- var td = $current.clone();
- td.html(this.opts.invisibleSpace);
-
- type === 'after' ? $current.after(td) : $current.before(td);
-
- }, this));
-
- this.sync();
- },
-
- // VIDEO
- videoShow: function()
- {
- this.selectionSave();
-
- this.modalInit(this.opts.curLang.video, this.opts.modal_video, 600, $.proxy(function()
- {
- $('#redactor_insert_video_btn').click($.proxy(this.videoInsert, this));
-
- setTimeout(function()
- {
- $('#redactor_insert_video_area').focus();
-
- }, 200);
-
- }, this));
- },
- videoInsert: function ()
- {
- var data = $('#redactor_insert_video_area').val();
- data = this.cleanStripTags(data);
-
- // parse if it is link on youtube & vimeo
- var iframeStart = '<iframe width="500" height="281" src="',
- iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
-
- if (data.match(reUrlYoutube))
- {
- data = data.replace(reUrlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
- }
- else if (data.match(reUrlVimeo))
- {
- data = data.replace(reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
- }
-
- this.selectionRestore();
-
- var current = this.getBlock() || this.getCurrent();
-
- if (current) $(current).after(data)
- else this.insertHtmlAdvanced(data, false);
-
- this.sync();
- this.modalClose();
- },
-
-
- // LINK
- linkShow: function()
- {
- this.selectionSave();
-
- var callback = $.proxy(function()
- {
- // Predefined links
- if (this.opts.predefinedLinks !== false)
- {
- this.predefinedLinksStorage = {};
- var that = this;
- $.getJSON(this.opts.predefinedLinks, function(data)
- {
- var $select = $('#redactor-predefined-links');
- $select .html('');
- $.each(data, function(key, val)
- {
- that.predefinedLinksStorage[key] = val;
- $select.append($('<option>').val(key).html(val.name));
- });
-
- $select.on('change', function()
- {
- var key = $(this).val();
- var name = '', url = '';
- if (key != 0)
- {
- name = that.predefinedLinksStorage[key].name;
- url = that.predefinedLinksStorage[key].url;
- }
-
- $('#redactor_link_url').val(url);
- $('#redactor_link_url_text').val(name);
-
- });
-
- $select.show();
- });
- }
-
- this.insert_link_node = false;
-
- var sel = this.getSelection();
- var url = '', text = '', target = '';
-
- var elem = this.getParent();
- var par = $(elem).parent().get(0);
- if (par && par.tagName === 'A')
- {
- elem = par;
- }
-
- if (elem && elem.tagName === 'A')
- {
- url = elem.href;
- text = $(elem).text();
- target = elem.target;
-
- this.insert_link_node = elem;
- }
- else text = sel.toString();
-
- $('#redactor_link_url_text').val(text);
-
- var thref = self.location.href.replace(/\/$/i, '');
- url = url.replace(thref, '');
- url = url.replace(/^\/#/, '#');
- url = url.replace('mailto:', '');
-
- // remove host from href
- if (this.opts.linkProtocol === false)
- {
- var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
- url = url.replace(re, '');
- }
-
- // set url
- $('#redactor_link_url').val(url);
-
- if (target === '_blank')
- {
- $('#redactor_link_blank').prop('checked', true);
- }
-
- this.linkInsertPressed = false;
- $('#redactor_insert_link_btn').on('click', $.proxy(this.linkProcess, this));
-
-
- setTimeout(function()
- {
- $('#redactor_link_url').focus();
-
- }, 200);
-
- }, this);
-
- this.modalInit(this.opts.curLang.link, this.opts.modal_link, 460, callback);
-
- },
- linkProcess: function()
- {
- if (this.linkInsertPressed)
- {
- return;
- }
-
- this.linkInsertPressed = true;
- var target = '', targetBlank = '';
-
- var link = $('#redactor_link_url').val();
- var text = $('#redactor_link_url_text').val();
-
- // mailto
- if (link.search('@') != -1 && /(http|ftp|https):\/\//i.test(link) === false)
- {
- link = 'mailto:' + link;
- }
- // url, not anchor
- else if (link.search('#') != 0)
- {
- if ($('#redactor_link_blank').prop('checked'))
- {
- target = ' target="_blank"';
- targetBlank = '_blank';
- }
-
- // test url (add protocol)
- var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}';
- var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
- var re2 = new RegExp('^' + pattern, 'i');
-
- if (link.search(re) == -1 && link.search(re2) == 0 && this.opts.linkProtocol)
- {
- link = this.opts.linkProtocol + link;
- }
- }
-
- text = text.replace(/<|>/g, '');
- var extra = ' ';
- if (this.browser('mozilla'))
- {
- extra = ' ';
- }
-
- this.linkInsert('<a href="' + link + '"' + target + '>' + text + '</a>' + extra, $.trim(text), link, targetBlank);
-
- },
- linkInsert: function (a, text, link, target)
- {
- this.selectionRestore();
-
- if (text !== '')
- {
- if (this.insert_link_node)
- {
- this.bufferSet();
-
- $(this.insert_link_node).text(text).attr('href', link);
-
- if (target !== '')
- {
- $(this.insert_link_node).attr('target', target);
- }
- else
- {
- $(this.insert_link_node).removeAttr('target');
- }
- }
- else
- {
- var $a = $(a).addClass('redactor-added-link');
- this.exec('inserthtml', this.outerHtml($a), false);
-
- var link = this.$editor.find('a.redactor-added-link');
-
- link.removeAttr('style').removeClass('redactor-added-link').each(function()
- {
- if (this.className == '') $(this).removeAttr('class');
- });
-
- }
-
- this.sync();
- }
-
- // link tooltip
- setTimeout($.proxy(function()
- {
- if (this.opts.observeLinks) this.observeLinks();
-
- }, this), 5);
-
- this.modalClose();
- },
-
- // FILE
- fileShow: function ()
- {
-
- this.selectionSave();
-
- var callback = $.proxy(function()
- {
- var sel = this.getSelection();
-
- var text = '';
- if (this.oldIE()) text = sel.text;
- else text = sel.toString();
-
- $('#redactor_filename').val(text);
-
- // dragupload
- if (!this.isMobile() && !this.isIPad())
- {
- this.draguploadInit('#redactor_file', {
- url: this.opts.fileUpload,
- uploadFields: this.opts.uploadFields,
- success: $.proxy(this.fileCallback, this),
- error: $.proxy( function(obj, json)
- {
- this.callback('fileUploadError', json);
-
- }, this),
- uploadParam: this.opts.fileUploadParam
- });
- }
-
- this.uploadInit('redactor_file', {
- auto: true,
- url: this.opts.fileUpload,
- success: $.proxy(this.fileCallback, this),
- error: $.proxy(function(obj, json)
- {
- this.callback('fileUploadError', json);
-
- }, this)
- });
-
- }, this);
-
- this.modalInit(this.opts.curLang.file, this.opts.modal_file, 500, callback);
- },
- fileCallback: function(json)
- {
-
- this.selectionRestore();
-
- if (json !== false)
- {
-
- var text = $('#redactor_filename').val();
- if (text === '') text = json.filename;
-
- var link = '<a href="' + json.filelink + '" id="filelink-marker">' + text + '</a>';
-
- // chrome fix
- if (this.browser('webkit') && !!this.window.chrome)
- {
- link = link + ' ';
- }
-
- this.execCommand('inserthtml', link, false);
-
- var linkmarker = $(this.$editor.find('a#filelink-marker'));
- if (linkmarker.size() != 0) linkmarker.removeAttr('id');
- else linkmarker = false;
-
- this.sync();
-
- // file upload callback
- this.callback('fileUpload', linkmarker, json);
- }
-
- this.modalClose();
- },
-
- // IMAGE
- imageShow: function()
- {
-
- this.selectionSave();
-
- var callback = $.proxy(function()
- {
- // json
- if (this.opts.imageGetJson)
- {
-
- $.getJSON(this.opts.imageGetJson, $.proxy(function(data)
- {
- var folders = {}, count = 0;
-
- // folders
- $.each(data, $.proxy(function(key, val)
- {
- if (typeof val.folder !== 'undefined')
- {
- count++;
- folders[val.folder] = count;
- }
-
- }, this));
-
- var folderclass = false;
- $.each(data, $.proxy(function(key, val)
- {
- // title
- var thumbtitle = '';
- if (typeof val.title !== 'undefined') thumbtitle = val.title;
-
- var folderkey = 0;
- if (!$.isEmptyObject(folders) && typeof val.folder !== 'undefined')
- {
- folderkey = folders[val.folder];
- if (folderclass === false) folderclass = '.redactorfolder' + folderkey;
- }
-
- var img = $('<img src="' + val.thumb + '" class="redactorfolder redactorfolder' + folderkey + '" rel="' + val.image + '" title="' + thumbtitle + '" />');
- $('#redactor_image_box').append(img);
- $(img).click($.proxy(this.imageThumbClick, this));
-
- }, this));
-
- // folders
- if (!$.isEmptyObject(folders))
- {
- $('.redactorfolder').hide();
- $(folderclass).show();
-
- var onchangeFunc = function(e)
- {
- $('.redactorfolder').hide();
- $('.redactorfolder' + $(e.target).val()).show();
- };
-
- var select = $('<select id="redactor_image_box_select">');
- $.each( folders, function(k, v)
- {
- select.append( $('<option value="' + v + '">' + k + '</option>'));
- });
-
- $('#redactor_image_box').before(select);
- select.change(onchangeFunc);
- }
- }, this));
-
- }
- else
- {
- $('#redactor-tab-control-2').remove();
- }
-
- if (this.opts.imageUpload || this.opts.s3)
- {
- // dragupload
- if (!this.isMobile() && !this.isIPad() && this.opts.s3 === false)
- {
- if ($('#redactor_file' ).length)
- {
- this.draguploadInit('#redactor_file', {
- url: this.opts.imageUpload,
- uploadFields: this.opts.uploadFields,
- success: $.proxy(this.imageCallback, this),
- error: $.proxy(function(obj, json)
- {
- this.callback('imageUploadError', json);
-
- }, this),
- uploadParam: this.opts.imageUploadParam
- });
- }
- }
-
- if (this.opts.s3 === false)
- {
- // ajax upload
- this.uploadInit('redactor_file', {
- auto: true,
- url: this.opts.imageUpload,
- success: $.proxy(this.imageCallback, this),
- error: $.proxy(function(obj, json)
- {
- this.callback('imageUploadError', json);
-
- }, this)
- });
- }
- // s3 upload
- else
- {
- $('#redactor_file').on('change.redactor', $.proxy(this.s3handleFileSelect, this));
- }
-
- }
- else
- {
- $('.redactor_tab').hide();
- if (!this.opts.imageGetJson)
- {
- $('#redactor_tabs').remove();
- $('#redactor_tab3').show();
- }
- else
- {
- $('#redactor-tab-control-1').remove();
- $('#redactor-tab-control-2').addClass('redactor_tabs_act');
- $('#redactor_tab2').show();
- }
- }
-
- if (!this.opts.imageTabLink && (this.opts.imageUpload || this.opts.imageGetJson))
- {
- $('#redactor-tab-control-3').hide();
- }
-
- $('#redactor_upload_btn').click($.proxy(this.imageCallbackLink, this));
-
- if (!this.opts.imageUpload && !this.opts.imageGetJson)
- {
- setTimeout(function()
- {
- $('#redactor_file_link').focus();
-
- }, 200);
- }
-
- }, this);
-
- this.modalInit(this.opts.curLang.image, this.opts.modal_image, 610, callback);
-
- },
- imageEdit: function(image)
- {
- var $el = image;
- var parent = $el.parent().parent();
-
- var callback = $.proxy(function()
- {
- $('#redactor_file_alt').val($el.attr('alt'));
- $('#redactor_image_edit_src').attr('href', $el.attr('src'));
-
- if ($el.css('display') == 'block' && $el.css('float') == 'none')
- {
- $('#redactor_form_image_align').val('center');
- }
- else
- {
- $('#redactor_form_image_align').val($el.css('float'));
- }
-
- if ($(parent).get(0).tagName === 'A')
- {
- $('#redactor_file_link').val($(parent).attr('href'));
-
- if ($(parent).attr('target') == '_blank')
- {
- $('#redactor_link_blank').prop('checked', true);
- }
- }
-
- $('#redactor_image_delete_btn').click($.proxy(function()
- {
- this.imageRemove($el);
-
- }, this));
-
- $('#redactorSaveBtn').click($.proxy(function()
- {
- this.imageSave($el);
-
- }, this));
-
- }, this);
-
- this.modalInit(this.opts.curLang.edit, this.opts.modal_image_edit, 380, callback);
-
- },
- imageRemove: function(el)
- {
- var parentLink = $(el).parent().parent();
- var parent = $(el).parent();
- var parentEl = false;
-
- if (parentLink.length && parentLink[0].tagName === 'A')
- {
- parentEl = true;
- $(parentLink).remove();
- }
- else if (parent.length && parent[0].tagName === 'A')
- {
- parentEl = true;
- $(parent).remove();
- }
- else
- {
- $(el).remove();
- }
-
- if (parent.length && parent[0].tagName === 'P')
- {
- this.focusWithSaveScroll();
-
- if (parentEl === false) this.selectionStart(parent);
- }
-
- // delete callback
- this.callback('imageDelete', el);
-
- this.modalClose();
- this.sync();
- },
- imageSave: function(el)
- {
- this.imageResizeHide(false);
-
- var $el = $(el);
- var parent = $el.parent();
-
- $el.attr('alt', $('#redactor_file_alt').val());
-
- var floating = $('#redactor_form_image_align').val();
- var margin = '';
-
- if (floating === 'left')
- {
- margin = '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0';
- $el.css({ 'float': 'left', 'margin': margin });
- }
- else if (floating === 'right')
- {
- margin = '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + '';
- $el.css({ 'float': 'right', 'margin': margin });
- }
- else if (floating === 'center')
- {
- $el.css({ 'float': '', 'display': 'block', 'margin': 'auto' });
- }
- else
- {
- $el.css({ 'float': '', 'display': '', 'margin': '' });
- }
-
- // as link
- var link = $.trim($('#redactor_file_link').val());
- if (link !== '')
- {
- var target = false;
- if ($('#redactor_link_blank').prop('checked'))
- {
- target = true;
- }
-
- if (parent.get(0).tagName !== 'A')
- {
- var a = $('<a href="' + link + '">' + this.outerHtml(el) + '</a>');
-
- if (target)
- {
- a.attr('target', '_blank');
- }
-
- $el.replaceWith(a);
- }
- else
- {
- parent.attr('href', link);
- if (target)
- {
- parent.attr('target', '_blank');
- }
- else
- {
- parent.removeAttr('target');
- }
- }
- }
- else
- {
- if (parent.get(0).tagName === 'A')
- {
- parent.replaceWith(this.outerHtml(el));
- }
- }
-
- this.modalClose();
- this.observeImages();
- this.sync();
-
- },
- imageResizeHide: function(e)
- {
- if (e !== false && $(e.target).parent().size() != 0 && $(e.target).parent()[0].id === 'redactor-image-box')
- {
- return false;
- }
-
- var imageBox = this.$editor.find('#redactor-image-box');
- if (imageBox.size() == 0)
- {
- return false;
- }
-
- this.$editor.find('#redactor-image-editter, #redactor-image-resizer').remove();
-
- imageBox.find('img').css({
- marginTop: imageBox[0].style.marginTop,
- marginBottom: imageBox[0].style.marginBottom,
- marginLeft: imageBox[0].style.marginLeft,
- marginRight: imageBox[0].style.marginRight
- });
-
- imageBox.css('margin', '');
-
-
- imageBox.find('img').css('opacity', '');
- imageBox.replaceWith(function()
- {
- return $(this).contents();
- });
-
- $(document).off('click.redactor-image-resize-hide');
- this.$editor.off('click.redactor-image-resize-hide');
- this.$editor.off('keydown.redactor-image-delete');
-
- this.sync()
-
- },
- imageResize: function(image)
- {
- var $image = $(image);
-
- $image.on('mousedown', $.proxy(function()
- {
- this.imageResizeHide(false);
- }, this));
-
- $image.on('dragstart', $.proxy(function()
- {
- this.$editor.on('drop.redactor-image-inside-drop', $.proxy(function()
- {
- setTimeout($.proxy(function()
- {
- this.observeImages();
- this.$editor.off('drop.redactor-image-inside-drop');
- this.sync();
-
- }, this), 1);
-
- },this));
- }, this));
-
- $image.on('click', $.proxy(function(e)
- {
- if (this.$editor.find('#redactor-image-box').size() != 0)
- {
- return false;
- }
-
- var clicked = false,
- start_x,
- start_y,
- ratio = $image.width() / $image.height(),
- min_w = 20,
- min_h = 10;
-
- var imageResizer = this.imageResizeControls($image);
-
- // resize
- var isResizing = false;
- if (imageResizer !== false)
- {
- imageResizer.on('mousedown', function(e)
- {
- isResizing = true;
- e.preventDefault();
-
- ratio = $image.width() / $image.height();
-
- start_x = Math.round(e.pageX - $image.eq(0).offset().left);
- start_y = Math.round(e.pageY - $image.eq(0).offset().top);
-
- });
-
- $(this.document.body).on('mousemove', $.proxy(function(e)
- {
- if (isResizing)
- {
- var mouse_x = Math.round(e.pageX - $image.eq(0).offset().left) - start_x;
- var mouse_y = Math.round(e.pageY - $image.eq(0).offset().top) - start_y;
-
- var div_h = $image.height();
-
- var new_h = parseInt(div_h, 10) + mouse_y;
- var new_w = Math.round(new_h * ratio);
-
- if (new_w > min_w)
- {
- $image.width(new_w);
-
- if (new_w < 100)
- {
- this.imageEditter.css({
- marginTop: '-7px',
- marginLeft: '-13px',
- fontSize: '9px',
- padding: '3px 5px'
- });
- }
- else
- {
- this.imageEditter.css({
- marginTop: '-11px',
- marginLeft: '-18px',
- fontSize: '11px',
- padding: '7px 10px'
- });
- }
- }
-
- start_x = Math.round(e.pageX - $image.eq(0).offset().left);
- start_y = Math.round(e.pageY - $image.eq(0).offset().top);
-
- this.sync()
- }
- }, this)).on('mouseup', function()
- {
- isResizing = false;
- });
- }
-
-
- this.$editor.on('keydown.redactor-image-delete', $.proxy(function(e)
- {
- var key = e.which;
-
- if (this.keyCode.BACKSPACE == key || this.keyCode.DELETE == key)
- {
- this.bufferSet(false);
- this.imageResizeHide(false);
- this.imageRemove($image);
- }
-
- }, this));
-
- $(document).on('click.redactor-image-resize-hide', $.proxy(this.imageResizeHide, this));
- this.$editor.on('click.redactor-image-resize-hide', $.proxy(this.imageResizeHide, this));
-
-
- }, this));
- },
- imageResizeControls: function($image)
- {
- var imageBox = $('<span id="redactor-image-box" data-redactor="verified">');
- imageBox.css({
- position: 'relative',
- display: 'inline-block',
- lineHeight: 0,
- outline: '1px dashed rgba(0, 0, 0, .6)',
- 'float': $image.css('float')
- });
- imageBox.attr('contenteditable', false);
-
- if ($image[0].style.margin != 'auto')
- {
- imageBox.css({
- marginTop: $image[0].style.marginTop,
- marginBottom: $image[0].style.marginBottom,
- marginLeft: $image[0].style.marginLeft,
- marginRight: $image[0].style.marginRight
- });
-
- $image.css('margin', '');
- }
- else
- {
- imageBox.css({ 'display': 'block', 'margin': 'auto' });
- }
-
- $image.css('opacity', .5).after(imageBox);
-
- // editter
- this.imageEditter = $('<span id="redactor-image-editter" data-redactor="verified">' + this.opts.curLang.edit + '</span>');
- this.imageEditter.css({
- position: 'absolute',
- zIndex: 5,
- top: '50%',
- left: '50%',
- marginTop: '-11px',
- marginLeft: '-18px',
- lineHeight: 1,
- backgroundColor: '#000',
- color: '#fff',
- fontSize: '11px',
- padding: '7px 10px',
- cursor: 'pointer'
- });
- this.imageEditter.attr('contenteditable', false);
- this.imageEditter.on('click', $.proxy(function()
- {
- this.imageEdit($image);
- }, this));
- imageBox.append(this.imageEditter);
-
- // resizer
- if (this.opts.imageResizable)
- {
- var imageResizer = $('<span id="redactor-image-resizer" data-redactor="verified"></span>');
- imageResizer.css({
- position: 'absolute',
- zIndex: 2,
- lineHeight: 1,
- cursor: 'nw-resize',
- bottom: '-4px',
- right: '-5px',
- border: '1px solid #fff',
- backgroundColor: '#000',
- width: '8px',
- height: '8px'
- });
- imageResizer.attr('contenteditable', false);
- imageBox.append(imageResizer);
-
- imageBox.append($image);
-
- return imageResizer;
- }
- else
- {
- imageBox.append($image);
-
- return false;
- }
- },
- imageThumbClick: function(e)
- {
- var img = '<img id="image-marker" src="' + $(e.target).attr('rel') + '" alt="' + $(e.target).attr('title') + '" />';
-
- var parent = this.getParent();
- if (this.opts.paragraphy && $(parent).closest('li').size() == 0) img = '<p>' + img + '</p>';
-
- this.imageInsert(img, true);
- },
- imageCallbackLink: function()
- {
- var val = $('#redactor_file_link').val();
-
- if (val !== '')
- {
- var data = '<img id="image-marker" src="' + val + '" />';
- if (this.opts.linebreaks === false) data = '<p>' + data + '</p>';
-
- this.imageInsert(data, true);
-
- }
- else this.modalClose();
- },
- imageCallback: function(data)
- {
- this.imageInsert(data);
- },
- imageInsert: function(json, link)
- {
- this.selectionRestore();
-
- if (json !== false)
- {
- var html = '';
- if (link !== true)
- {
- html = '<img id="image-marker" src="' + json.filelink + '" />';
-
- var parent = this.getParent();
- if (this.opts.paragraphy && $(parent).closest('li').size() == 0)
- {
- html = '<p>' + html + '</p>';
- }
- }
- else
- {
- html = json;
- }
-
- this.execCommand('inserthtml', html, false);
-
- var image = $(this.$editor.find('img#image-marker'));
-
- if (image.length) image.removeAttr('id');
- else image = false;
-
- this.sync();
-
- // upload image callback
- link !== true && this.callback('imageUpload', image, json);
- }
-
- this.modalClose();
- this.observeImages();
- },
-
- // PROGRESS BAR
- buildProgressBar: function()
- {
- if ($('#redactor-progress').size() != 0) return;
-
- this.$progressBar = $('<div id="redactor-progress"><span></span></div>');
- $(document.body).append(this.$progressBar);
- },
- showProgressBar: function()
- {
- this.buildProgressBar();
- $('#redactor-progress').fadeIn();
- },
- hideProgressBar: function()
- {
- $('#redactor-progress').fadeOut(1500);
- },
-
- // MODAL
- modalTemplatesInit: function()
- {
- $.extend( this.opts,
- {
- modal_file: String()
- + '<section id="redactor-modal-file-insert">'
- + '<form id="redactorUploadFileForm" method="post" action="" enctype="multipart/form-data">'
- + '<label>' + this.opts.curLang.filename + '</label>'
- + '<input type="text" id="redactor_filename" class="redactor_input" />'
- + '<div style="margin-top: 7px;">'
- + '<input type="file" id="redactor_file" name="' + this.opts.fileUploadParam + '" />'
- + '</div>'
- + '</form>'
- + '</section>',
-
- modal_image_edit: String()
- + '<section id="redactor-modal-image-edit">'
- + '<label>' + this.opts.curLang.title + '</label>'
- + '<input type="text" id="redactor_file_alt" class="redactor_input" />'
- + '<label>' + this.opts.curLang.link + '</label>'
- + '<input type="text" id="redactor_file_link" class="redactor_input" />'
- + '<label><input type="checkbox" id="redactor_link_blank"> ' + this.opts.curLang.link_new_tab + '</label>'
- + '<label>' + this.opts.curLang.image_position + '</label>'
- + '<select id="redactor_form_image_align">'
- + '<option value="none">' + this.opts.curLang.none + '</option>'
- + '<option value="left">' + this.opts.curLang.left + '</option>'
- + '<option value="center">' + this.opts.curLang.center + '</option>'
- + '<option value="right">' + this.opts.curLang.right + '</option>'
- + '</select>'
- + '</section>'
- + '<footer>'
- + '<button id="redactor_image_delete_btn" class="redactor_modal_btn redactor_modal_delete_btn">' + this.opts.curLang._delete + '</button>'
- + '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
- + '<button id="redactorSaveBtn" class="redactor_modal_btn redactor_modal_action_btn">' + this.opts.curLang.save + '</button>'
- + '</footer>',
-
- modal_image: String()
- + '<section id="redactor-modal-image-insert">'
- + '<div id="redactor_tabs">'
- + '<a href="#" id="redactor-tab-control-1" class="redactor_tabs_act">' + this.opts.curLang.upload + '</a>'
- + '<a href="#" id="redactor-tab-control-2">' + this.opts.curLang.choose + '</a>'
- + '<a href="#" id="redactor-tab-control-3">' + this.opts.curLang.link + '</a>'
- + '</div>'
- + '<form id="redactorInsertImageForm" method="post" action="" enctype="multipart/form-data">'
- + '<div id="redactor_tab1" class="redactor_tab">'
- + '<input type="file" id="redactor_file" name="' + this.opts.imageUploadParam + '" />'
- + '</div>'
- + '<div id="redactor_tab2" class="redactor_tab" style="display: none;">'
- + '<div id="redactor_image_box"></div>'
- + '</div>'
- + '</form>'
- + '<div id="redactor_tab3" class="redactor_tab" style="display: none;">'
- + '<label>' + this.opts.curLang.image_web_link + '</label>'
- + '<input type="text" name="redactor_file_link" id="redactor_file_link" class="redactor_input" /><br><br>'
- + '</div>'
- + '</section>'
- + '<footer>'
- + '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
- + '<button class="redactor_modal_btn redactor_modal_action_btn" id="redactor_upload_btn">' + this.opts.curLang.insert + '</button>'
- + '</footer>',
-
- modal_link: String()
- + '<section id="redactor-modal-link-insert">'
- + '<select id="redactor-predefined-links" style="width: 99.5%; display: none;"></select>'
- + '<label>URL</label>'
- + '<input type="text" class="redactor_input" id="redactor_link_url" />'
- + '<label>' + this.opts.curLang.text + '</label>'
- + '<input type="text" class="redactor_input" id="redactor_link_url_text" />'
- + '<label><input type="checkbox" id="redactor_link_blank"> ' + this.opts.curLang.link_new_tab + '</label>'
- + '</section>'
- + '<footer>'
- + '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
- + '<button id="redactor_insert_link_btn" class="redactor_modal_btn redactor_modal_action_btn">' + this.opts.curLang.insert + '</button>'
- + '</footer>',
-
- modal_table: String()
- + '<section id="redactor-modal-table-insert">'
- + '<label>' + this.opts.curLang.rows + '</label>'
- + '<input type="text" size="5" value="2" id="redactor_table_rows" />'
- + '<label>' + this.opts.curLang.columns + '</label>'
- + '<input type="text" size="5" value="3" id="redactor_table_columns" />'
- + '</section>'
- + '<footer>'
- + '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
- + '<button id="redactor_insert_table_btn" class="redactor_modal_btn redactor_modal_action_btn">' + this.opts.curLang.insert + '</button>'
- + '</footer>',
-
- modal_video: String()
- + '<section id="redactor-modal-video-insert">'
- + '<form id="redactorInsertVideoForm">'
- + '<label>' + this.opts.curLang.video_html_code + '</label>'
- + '<textarea id="redactor_insert_video_area" style="width: 99%; height: 160px;"></textarea>'
- + '</form>'
- + '</section>'
- + '<footer>'
- + '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
- + '<button id="redactor_insert_video_btn" class="redactor_modal_btn redactor_modal_action_btn">' + this.opts.curLang.insert + '</button>'
- + '</footer>'
-
- });
- },
- modalInit: function(title, content, width, callback)
- {
- this.modalSetOverlay();
-
- this.$redactorModalWidth = width;
- this.$redactorModal = $('#redactor_modal');
-
- if (!this.$redactorModal.length)
- {
- this.$redactorModal = $('<div id="redactor_modal" style="display: none;" />');
- this.$redactorModal.append($('<div id="redactor_modal_close">×</div>'));
- this.$redactorModal.append($('<header id="redactor_modal_header" />'));
- this.$redactorModal.append($('<div id="redactor_modal_inner" />'));
- this.$redactorModal.appendTo(document.body);
- }
-
- $('#redactor_modal_close').on('click', $.proxy(this.modalClose, this));
- $(document).on('keyup', $.proxy(this.modalCloseHandler, this));
- this.$editor.on('keyup', $.proxy(this.modalCloseHandler, this));
-
- this.modalSetContent(content);
- this.modalSetTitle(title);
- this.modalSetDraggable();
- this.modalLoadTabs();
- this.modalOnCloseButton();
- this.modalSetButtonsWidth();
-
- this.saveModalScroll = this.document.body.scrollTop;
- if (this.opts.autoresize === false)
- {
- this.saveModalScroll = this.$editor.scrollTop();
- }
-
- if (this.isMobile() === false) this.modalShowOnDesktop();
- else this.modalShowOnMobile();
-
- // modal actions callback
- if (typeof callback === 'function')
- {
- callback();
- }
-
- // modal shown callback
- setTimeout($.proxy(function()
- {
- this.callback('modalOpened', this.$redactorModal);
-
- }, this), 11);
-
- // fix bootstrap modal focus
- $(document).off('focusin.modal');
-
- // enter
- this.$redactorModal.find('input[type=text]').on('keypress', $.proxy(function(e)
- {
- if (e.which === 13)
- {
- this.$redactorModal.find('.redactor_modal_action_btn').click();
- e.preventDefault();
- }
- }, this));
-
- return this.$redactorModal;
-
- },
- modalShowOnDesktop: function()
- {
- this.$redactorModal.css({
- position: 'fixed',
- top: '-2000px',
- left: '50%',
- width: this.$redactorModalWidth + 'px',
- marginLeft: '-' + (this.$redactorModalWidth / 2) + 'px'
- }).show();
-
- this.modalSaveBodyOveflow = $(document.body).css('overflow');
- $(document.body).css('overflow', 'hidden');
-
- setTimeout($.proxy(function()
- {
- var height = this.$redactorModal.outerHeight();
- this.$redactorModal.css({
- top: '50%',
- height: 'auto',
- minHeight: 'auto',
- marginTop: '-' + (height + 10) / 2 + 'px'
- });
- }, this), 15);
- },
- modalShowOnMobile: function()
- {
- this.$redactorModal.css({
- position: 'fixed',
- width: '100%',
- height: '100%',
- top: '0',
- left: '0',
- margin: '0',
- minHeight: '300px'
- }).show();
- },
- modalSetContent: function(content)
- {
- this.modalcontent = false;
- if (content.indexOf('#') == 0)
- {
- this.modalcontent = $(content);
- $('#redactor_modal_inner').empty().append(this.modalcontent.html());
- this.modalcontent.html('');
-
- }
- else
- {
- $('#redactor_modal_inner').empty().append(content);
- }
- },
- modalSetTitle: function(title)
- {
- this.$redactorModal.find('#redactor_modal_header').html(title);
- },
- modalSetButtonsWidth: function()
- {
- var buttons = this.$redactorModal.find('footer button').not('.redactor_modal_btn_hidden');
- var buttonsSize = buttons.size();
- if (buttonsSize > 0)
- {
- $(buttons).css('width', (this.$redactorModalWidth/buttonsSize) + 'px')
- }
- },
- modalOnCloseButton: function()
- {
- this.$redactorModal.find('.redactor_btn_modal_close').on('click', $.proxy(this.modalClose, this));
- },
- modalSetOverlay: function()
- {
- if (this.opts.modalOverlay)
- {
- this.$redactorModalOverlay = $('#redactor_modal_overlay');
- if (!this.$redactorModalOverlay.length)
- {
- this.$redactorModalOverlay = $('<div id="redactor_modal_overlay" style="display: none;"></div>');
- $('body').prepend(this.$redactorModalOverlay);
- }
-
- this.$redactorModalOverlay.show().on('click', $.proxy(this.modalClose, this));
- }
- },
- modalSetDraggable: function()
- {
- if (typeof $.fn.draggable !== 'undefined')
- {
- this.$redactorModal.draggable({ handle: '#redactor_modal_header' });
- this.$redactorModal.find('#redactor_modal_header').css('cursor', 'move');
- }
- },
- modalLoadTabs: function()
- {
- var $redactor_tabs = $('#redactor_tabs');
- if (!$redactor_tabs.length) return false;
-
- var that = this;
- $redactor_tabs.find('a').each(function(i, s)
- {
- i++;
- $(s).on('click', function(e)
- {
- e.preventDefault();
-
- $redactor_tabs.find('a').removeClass('redactor_tabs_act');
- $(this).addClass('redactor_tabs_act');
- $('.redactor_tab').hide();
- $('#redactor_tab' + i ).show();
- $('#redactor_tab_selected').val(i);
-
- if (that.isMobile() === false)
- {
- var height = that.$redactorModal.outerHeight();
- that.$redactorModal.css('margin-top', '-' + (height + 10) / 2 + 'px');
- }
- });
- });
-
- },
- modalCloseHandler: function(e)
- {
- if (e.keyCode === this.keyCode.ESC)
- {
- this.modalClose();
- return false;
- }
- },
- modalClose: function()
- {
- $('#redactor_modal_close').off('click', this.modalClose);
- $('#redactor_modal').fadeOut('fast', $.proxy(function()
- {
- var redactorModalInner = $('#redactor_modal_inner');
-
- if (this.modalcontent !== false)
- {
- this.modalcontent.html(redactorModalInner.html());
- this.modalcontent = false;
- }
-
- redactorModalInner.html('');
-
- if (this.opts.modalOverlay)
- {
- $('#redactor_modal_overlay').hide().off('click', this.modalClose);
- }
-
- $(document).off('keyup', this.modalCloseHandler);
- this.$editor.off('keyup', this.modalCloseHandler);
-
- this.selectionRestore();
-
- // restore scroll
- if (this.opts.autoresize && this.saveModalScroll)
- {
- $(this.document.body).scrollTop(this.saveModalScroll);
- }
- else if (this.opts.autoresize === false && this.saveModalScroll)
- {
- this.$editor.scrollTop(this.saveModalScroll);
- }
-
- this.callback('modalClosed');
-
- }, this));
-
-
- if (this.isMobile() === false)
- {
- $(document.body).css('overflow', this.modalSaveBodyOveflow ? this.modalSaveBodyOveflow : 'visible');
- }
-
- return false;
- },
- modalSetTab: function(num)
- {
- $('.redactor_tab').hide();
- $('#redactor_tabs').find('a').removeClass('redactor_tabs_act').eq(num - 1).addClass('redactor_tabs_act');
- $('#redactor_tab' + num).show();
- },
-
- // S3
- s3handleFileSelect: function(e)
- {
- var files = e.target.files;
-
- for (var i = 0, f; f = files[i]; i++)
- {
- this.s3uploadFile(f);
- }
- },
- s3uploadFile: function(file)
- {
- this.s3executeOnSignedUrl(file, $.proxy(function(signedURL)
- {
- this.s3uploadToS3(file, signedURL);
- }, this));
- },
- s3executeOnSignedUrl: function(file, callback)
- {
- var xhr = new XMLHttpRequest();
-
- var mark = '?';
- if (this.opts.s3.search(/\?/) != '-1') mark = '&';
-
- xhr.open('GET', this.opts.s3 + mark + 'name=' + file.name + '&type=' + file.type, true);
-
- // Hack to pass bytes through unprocessed.
- if (xhr.overrideMimeType) xhr.overrideMimeType('text/plain; charset=x-user-defined');
-
- var that = this;
- xhr.onreadystatechange = function(e)
- {
- if (this.readyState == 4 && this.status == 200)
- {
- that.showProgressBar();
- callback(decodeURIComponent(this.responseText));
- }
- else if(this.readyState == 4 && this.status != 200)
- {
- //setProgress(0, 'Could not contact signing script. Status = ' + this.status);
- }
- };
-
- xhr.send();
- },
- s3createCORSRequest: function(method, url)
- {
- var xhr = new XMLHttpRequest();
- if ("withCredentials" in xhr)
- {
- xhr.open(method, url, true);
- }
- else if (typeof XDomainRequest != "undefined")
- {
- xhr = new XDomainRequest();
- xhr.open(method, url);
- }
- else
- {
- xhr = null;
- }
-
- return xhr;
- },
- s3uploadToS3: function(file, url)
- {
- var xhr = this.s3createCORSRequest('PUT', url);
- if (!xhr)
- {
- //setProgress(0, 'CORS not supported');
- }
- else
- {
- xhr.onload = $.proxy(function()
- {
- if (xhr.status == 200)
- {
- //setProgress(100, 'Upload completed.');
-
- this.hideProgressBar();
-
- var s3image = url.split('?');
-
- if (!s3image[0])
- {
- // url parsing is fail
- return false;
- }
-
- this.selectionRestore();
-
- var html = '';
- html = '<img id="image-marker" src="' + s3image[0] + '" />';
- if (this.opts.paragraphy) html = '<p>' + html + '</p>';
-
- this.execCommand('inserthtml', html, false);
-
- var image = $(this.$editor.find('img#image-marker'));
-
- if (image.length) image.removeAttr('id');
- else image = false;
-
- this.sync();
-
- // upload image callback
- this.callback('imageUpload', image, false);
-
- this.modalClose();
- this.observeImages();
-
- }
- else
- {
- //setProgress(0, 'Upload error: ' + xhr.status);
- }
- }, this);
-
- xhr.onerror = function()
- {
- //setProgress(0, 'XHR error.');
- };
-
- xhr.upload.onprogress = function(e)
- {
- /*
- if (e.lengthComputable)
- {
- var percentLoaded = Math.round((e.loaded / e.total) * 100);
- setProgress(percentLoaded, percentLoaded == 100 ? 'Finalizing.' : 'Uploading.');
- }
- */
- };
-
- xhr.setRequestHeader('Content-Type', file.type);
- xhr.setRequestHeader('x-amz-acl', 'public-read');
-
- xhr.send(file);
- }
- },
-
- // UPLOAD
- uploadInit: function(el, options)
- {
- this.uploadOptions = {
- url: false,
- success: false,
- error: false,
- start: false,
- trigger: false,
- auto: false,
- input: false
- };
-
- $.extend(this.uploadOptions, options);
-
- var $el = $('#' + el);
-
- // Test input or form
- if ($el.length && $el[0].tagName === 'INPUT')
- {
- this.uploadOptions.input = $el;
- this.el = $($el[0].form);
- }
- else this.el = $el;
-
- this.element_action = this.el.attr('action');
-
- // Auto or trigger
- if (this.uploadOptions.auto)
- {
- $(this.uploadOptions.input).change($.proxy(function(e)
- {
- this.el.submit(function(e)
- {
- return false;
- });
-
- this.uploadSubmit(e);
-
- }, this));
-
- }
- else if (this.uploadOptions.trigger)
- {
- $('#' + this.uploadOptions.trigger).click($.proxy(this.uploadSubmit, this));
- }
- },
- uploadSubmit: function(e)
- {
- this.showProgressBar();
- this.uploadForm(this.element, this.uploadFrame());
- },
- uploadFrame: function()
- {
- this.id = 'f' + Math.floor(Math.random() * 99999);
-
- var d = this.document.createElement('div');
- var iframe = '<iframe style="display:none" id="' + this.id + '" name="' + this.id + '"></iframe>';
-
- d.innerHTML = iframe;
- $(d).appendTo("body");
-
- // Start
- if (this.uploadOptions.start) this.uploadOptions.start();
-
- $( '#' + this.id ).load($.proxy(this.uploadLoaded, this));
-
- return this.id;
- },
- uploadForm: function(f, name)
- {
- if (this.uploadOptions.input)
- {
- var formId = 'redactorUploadForm' + this.id,
- fileId = 'redactorUploadFile' + this.id;
-
- this.form = $('<form action="' + this.uploadOptions.url + '" method="POST" target="' + name + '" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data" />');
-
- // append hidden fields
- if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
- {
- $.each(this.opts.uploadFields, $.proxy(function(k, v)
- {
- if (v != null && v.toString().indexOf('#') === 0) v = $(v).val();
-
- var hidden = $('<input/>', {
- 'type': "hidden",
- 'name': k,
- 'value': v
- });
-
- $(this.form).append(hidden);
-
- }, this));
- }
-
- var oldElement = this.uploadOptions.input;
- var newElement = $(oldElement).clone();
-
- $(oldElement).attr('id', fileId).before(newElement).appendTo(this.form);
-
- $(this.form).css('position', 'absolute')
- .css('top', '-2000px')
- .css('left', '-2000px')
- .appendTo('body');
-
- this.form.submit();
-
- }
- else
- {
- f.attr('target', name)
- .attr('method', 'POST')
- .attr('enctype', 'multipart/form-data')
- .attr('action', this.uploadOptions.url);
-
- this.element.submit();
- }
- },
- uploadLoaded: function()
- {
- var i = $( '#' + this.id)[0], d;
-
- if (i.contentDocument) d = i.contentDocument;
- else if (i.contentWindow) d = i.contentWindow.document;
- else d = window.frames[this.id].document;
-
- // Success
- if (this.uploadOptions.success)
- {
- this.hideProgressBar();
-
- if (typeof d !== 'undefined')
- {
- // Remove bizarre <pre> tag wrappers around our json data:
- var rawString = d.body.innerHTML;
- var jsonString = rawString.match(/\{(.|\n)*\}/)[0];
-
- jsonString = jsonString.replace(/^\[/, '');
- jsonString = jsonString.replace(/\]$/, '');
-
- var json = $.parseJSON(jsonString);
-
- if (typeof json.error == 'undefined') this.uploadOptions.success(json);
- else
- {
- this.uploadOptions.error(this, json);
- this.modalClose();
- }
- }
- else
- {
- this.modalClose();
- alert('Upload failed!');
- }
- }
-
- this.el.attr('action', this.element_action);
- this.el.attr('target', '');
- },
-
- // DRAGUPLOAD
- draguploadInit: function (el, options)
- {
- this.draguploadOptions = $.extend({
- url: false,
- success: false,
- error: false,
- preview: false,
- uploadFields: false,
- text: this.opts.curLang.drop_file_here,
- atext: this.opts.curLang.or_choose,
- uploadParam: false
- }, options);
-
- if (window.FormData === undefined) return false;
-
- this.droparea = $('<div class="redactor_droparea"></div>');
- this.dropareabox = $('<div class="redactor_dropareabox">' + this.draguploadOptions.text + '</div>');
- this.dropalternative = $('<div class="redactor_dropalternative">' + this.draguploadOptions.atext + '</div>');
-
- this.droparea.append(this.dropareabox);
-
- $(el).before(this.droparea);
- $(el).before(this.dropalternative);
-
- // drag over
- this.dropareabox.on('dragover', $.proxy(function()
- {
- return this.draguploadOndrag();
-
- }, this));
-
- // drag leave
- this.dropareabox.on('dragleave', $.proxy(function()
- {
- return this.draguploadOndragleave();
-
- }, this));
-
- // drop
- this.dropareabox.get(0).ondrop = $.proxy(function(e)
- {
- e.preventDefault();
-
- this.dropareabox.removeClass('hover').addClass('drop');
- this.showProgressBar();
- this.dragUploadAjax(this.draguploadOptions.url, e.dataTransfer.files[0], false, e, this.draguploadOptions.uploadParam);
-
- }, this );
- },
- dragUploadAjax: function(url, file, directupload, e, uploadParam)
- {
- if (!directupload)
- {
- var xhr = $.ajaxSettings.xhr();
- if (xhr.upload)
- {
- xhr.upload.addEventListener('progress', $.proxy(this.uploadProgress, this), false);
- }
-
- $.ajaxSetup({
- xhr: function () { return xhr; }
- });
- }
-
- // drop callback
- this.callback('drop', e);
-
- var fd = new FormData();
-
- // append file data
- if (uploadParam !== false)
- {
- fd.append(uploadParam, file);
- }
- else
- {
- fd.append('file', file);
- }
-
- // append hidden fields
- if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
- {
- $.each(this.opts.uploadFields, $.proxy(function(k, v)
- {
- if (v != null && v.toString().indexOf('#') === 0) v = $(v).val();
- fd.append(k, v);
-
- }, this));
- }
-
- $.ajax({
- url: url,
- dataType: 'html',
- data: fd,
- cache: false,
- contentType: false,
- processData: false,
- type: 'POST',
- success: $.proxy(function(data)
- {
- data = data.replace(/^\[/, '');
- data = data.replace(/\]$/, '');
-
- var json = (typeof data === 'string' ? $.parseJSON(data) : data);
-
- this.hideProgressBar();
-
- if (directupload)
- {
- var $img = $('<img>');
- $img.attr('src', json.filelink).attr('id', 'drag-image-marker');
-
- this.insertNodeToCaretPositionFromPoint(e, $img[0]);
-
- var image = $(this.$editor.find('img#drag-image-marker'));
- if (image.length) image.removeAttr('id');
- else image = false;
-
- this.sync();
- this.observeImages();
-
- // upload callback
- if (image) this.callback('imageUpload', image, json);
-
- // error callback
- if (typeof json.error !== 'undefined') this.callback('imageUploadError', json);
- }
- else
- {
- if (typeof json.error == 'undefined')
- {
- this.draguploadOptions.success(json);
- }
- else
- {
- this.draguploadOptions.error(this, json);
- this.draguploadOptions.success(false);
- }
- }
-
- }, this)
- });
- },
- draguploadOndrag: function()
- {
- this.dropareabox.addClass('hover');
- return false;
- },
- draguploadOndragleave: function()
- {
- this.dropareabox.removeClass('hover');
- return false;
- },
- uploadProgress: function(e, text)
- {
- var percent = e.loaded ? parseInt(e.loaded / e.total * 100, 10) : e;
- this.dropareabox.text('Loading ' + percent + '% ' + (text || ''));
- },
-
- // UTILS
- isMobile: function()
- {
- return /(iPhone|iPod|BlackBerry|Android)/.test(navigator.userAgent);
- },
- isIPad: function()
- {
- return /iPad/.test(navigator.userAgent);
- },
- normalize: function(str)
- {
- if (typeof(str) === 'undefined') return 0;
- return parseInt(str.replace('px',''), 10);
- },
- outerHtml: function(el)
- {
- return $('<div>').append($(el).eq(0).clone()).html();
- },
- stripHtml: function(html)
- {
- var tmp = document.createElement("DIV");
- tmp.innerHTML = html;
- return tmp.textContent || tmp.innerText || "";
- },
- isString: function(obj)
- {
- return Object.prototype.toString.call(obj) == '[object String]';
- },
- isEmpty: function(html)
- {
- html = html.replace(/|<br>|<br\/>| /gi, '');
- html = html.replace(/\s/g, '');
- html = html.replace(/^<p>[^\W\w\D\d]*?<\/p>$/i, '');
-
- return html == '';
- },
- getInternetExplorerVersion: function()
- {
- var rv = false;
- if (navigator.appName == 'Microsoft Internet Explorer')
- {
- var ua = navigator.userAgent;
- var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
- if (re.exec(ua) != null)
- {
- rv = parseFloat(RegExp.$1);
- }
- }
-
- return rv;
- },
- isIe11: function()
- {
- return !!navigator.userAgent.match(/Trident\/7\./);
- },
- browser: function(browser)
- {
- var ua = navigator.userAgent.toLowerCase();
- var match = /(opr)[\/]([\w.]+)/.exec( ua ) ||
- /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
- /(webkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(ua) ||
- /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
- /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
- /(msie) ([\w.]+)/.exec( ua ) ||
- ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) ||
- ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
- [];
-
- if (browser == 'version') return match[2];
- if (browser == 'webkit') return (match[1] == 'chrome' || match[1] == 'webkit');
- if (match[1] == 'rv') return browser == 'msie';
- if (match[1] == 'opr') return browser == 'webkit';
-
- return browser == match[1];
-
- },
- oldIE: function()
- {
- if (this.browser('msie') && parseInt(this.browser('version'), 10) < 9) return true;
- return false;
- },
- getFragmentHtml: function (fragment)
- {
- var cloned = fragment.cloneNode(true);
- var div = this.document.createElement('div');
-
- div.appendChild(cloned);
- return div.innerHTML;
- },
- extractContent: function()
- {
- var node = this.$editor[0];
- var frag = this.document.createDocumentFragment();
- var child;
-
- while ((child = node.firstChild))
- {
- frag.appendChild(child);
- }
-
- return frag;
- },
- isParentRedactor: function(el)
- {
- if (!el) return false;
- if (this.opts.iframe) return el;
-
- if ($(el).parents('div.redactor_editor').length == 0 || $(el).hasClass('redactor_editor')) return false;
- else return el;
- },
- currentOrParentIs: function(tagName)
- {
- var parent = this.getParent(), current = this.getCurrent();
- return parent && parent.tagName === tagName ? parent : current && current.tagName === tagName ? current : false;
- },
- isEndOfElement: function()
- {
- var current = this.getBlock();
- var offset = this.getCaretOffset(current);
-
- var text = $.trim($(current).text()).replace(/\n\r\n/g, '');
-
- var len = text.length;
-
- if (offset == len) return true;
- else return false;
- },
- isFocused: function()
- {
- var el, sel = this.getSelection();
-
- if (sel && sel.rangeCount && sel.rangeCount > 0) el = sel.getRangeAt(0).startContainer;
- if (!el) return false;
- if (this.opts.iframe)
- {
- if (this.getCaretOffsetRange().equals()) return !this.$editor.is(el);
- else return true;
- }
-
- return $(el).closest('div.redactor_editor').length != 0;
- },
- removeEmptyAttr: function (el, attr)
- {
- if ($(el).attr(attr) == '') $(el).removeAttr(attr);
- },
- removeFromArrayByValue: function(array, value)
- {
- var index = null;
-
- while ((index = array.indexOf(value)) !== -1)
- {
- array.splice(index, 1);
- }
-
- return array;
- }
-
- };
-
- // constructor
- Redactor.prototype.init.prototype = Redactor.prototype;
-
- // LINKIFY
- $.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertImageLinks, convertVideoLinks, linkSize)
- {
- var url = /(((https?|ftps?):\/\/)|www[.][^\s])(.+?\..+?)([.),]?)(\s|\.\s+|\)|$)/gi,
- rProtocol = /(https?|ftp):\/\//i,
- urlImage = /(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/gi;
-
- var childNodes = (this.$editor ? this.$editor.get(0) : this).childNodes, i = childNodes.length;
- while (i--)
- {
- var n = childNodes[i];
- if (n.nodeType === 3)
- {
- var html = n.nodeValue;
-
- // youtube & vimeo
- if (convertVideoLinks && html)
- {
- var iframeStart = '<iframe width="500" height="281" src="',
- iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
-
- if (html.match(reUrlYoutube))
- {
- html = html.replace(reUrlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
- $(n).after(html).remove();
- }
- else if (html.match(reUrlVimeo))
- {
- html = html.replace(reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
- $(n).after(html).remove();
- }
- }
-
- // image
- if (convertImageLinks && html && html.match(urlImage))
- {
- html = html.replace(urlImage, '<img src="$1">');
-
- $(n).after(html).remove();
- }
-
- // link
- if (convertLinks && html && html.match(url))
- {
- var matches = html.match(url);
-
- for (var i in matches)
- {
- var href = matches[i];
- var text = href;
-
- var space = '';
- if (href.match(/\s$/) !== null) space = ' ';
-
- var addProtocol = protocol;
- if (href.match(rProtocol) !== null) addProtocol = '';
-
- if (text.length > linkSize) text = text.substring(0, linkSize) + '...';
-
- text = text.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
-
- /*
- To handle URLs which may have $ characters in them, need to escape $ -> $$ to prevent $1 from getting treated as a backreference.
- See http://gotofritz.net/blog/code-snippets/escaping-in-replace-strings-in-javascript/
- */
- var escapedBackReferences = text.replace('$', '$$$');
-
- html = html.replace(href, '<a href=\"' + addProtocol + $.trim(href) + '\">' + $.trim(escapedBackReferences) + '</a>' + space);
- }
-
- $(n).after(html).remove();
- }
- }
- else if (n.nodeType === 1 && !/^(a|button|textarea)$/i.test(n.tagName))
- {
- $.Redactor.fn.formatLinkify.call(n, protocol, convertLinks, convertImageLinks, convertVideoLinks, linkSize);
- }
- }
- };
-
-})(jQuery);
\ No newline at end of file
diff --git a/assets/redactor/redactor.min.css b/assets/redactor/redactor.min.css
deleted file mode 100644
index 4ce64bf..0000000
--- a/assets/redactor/redactor.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:'RedactorFont';src:url('redactor-font.eot')}@font-face{font-family:'RedactorFont';src:url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMggi/NUAAAC8AAAAYGNtYXAaVcx2AAABHAAAAExnYXNwAAAAEAAAAWgAAAAIZ2x5Zm8dIFkAAAFwAAATSGhlYWQACVb9AAAUuAAAADZoaGVhA+ECBQAAFPAAAAAkaG10eEEBA94AABUUAAAAkGxvY2FVlFE8AAAVpAAAAEptYXhwAC8AkgAAFfAAAAAgbmFtZRHEcG0AABYQAAABZnBvc3QAAwAAAAAXeAAAACAAAwIAAZAABQAAAUwBZgAAAEcBTAFmAAAA9QAZAIQAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADmHwHg/+D/4AHgACAAAAABAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEADgAAAAKAAgAAgACAAEAIOYf//3//wAAAAAAIOYA//3//wAB/+MaBAADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAwAAACUCAAGSAAQACQANAAA3EQURBQEFEQURATUXBwACAP4AAdv+SgG2/tySkiUBbgH+lAEBSgH+3AEBJv7/3G9sAAAGAAAASQIAAW4ABAAJAA4AEwAYAB0AABMhFSE1FSEVITUVIRUhNSczFSM1FTMVIzUVMxUjNZIBbv6SAW7+kgFu/pKSSUlJSUlJAW5JSW5JSW5JSdxJSW5JSW5JSQAAAAACAAAAJQH3AZIAFgAuAAAlLgMnBzIuAic+AyMXNh4CByUnMg4CBx4DIxcnHgMXNi4CBwH3Dik/XUABAR04Vjg+WDUYAQFNeEcZEv7MAQENHDMlHzIfEQEBASZUTDYHCSBIZj4lGCQaEARqFi5HLzJFKhJqDC1RZSzVPQoWIxkbJBQID0wCCQ4VDxo4KA8PAAACAG4AJQGSAZIABAAzAAA3IQchJzceAzMyPgI3PgMnNyMXDgMHDgMjIi4CJy4DNycjBx4DF24BJQH+3QFABRIUGg0QGBUQCAYKBgQBAUABAQEEBAQCCAgKBQYJCQcEAgUCAwEBPwEBAwcJCEkkJD8HCgYEBAYKBwcRFRkPtcMGCQkHAwMFAwEBAwUDAwcJCQbDtQ8ZFREHAAUAAP//AgABtwAGAA4AFgBHAF8AAAEzFTMVIzUfAQc1IzUzNS8BNxUzFSMVFx4DFRwBDgEHDgMHMh4CFx4DHwEjJzwBJjQjLgMrARUjNTMyHgIXBzMyPgI3PgM1NC4CJy4DKwEVAUkjS24mkZFvb96RkW9vDAMFAwECAwICBQUGBAECAgIBAQICAgEbIBMBAQIEBQUCCh0qCAwKCQM3DgMFBQMCAQIBAQEBAgECAwQGAw4BtpYgtv9cXEolSUhcXEklSlUDCAoNBwQJBwcCAwUDAgEBAQIBAQMEBANCLgEBAQIGBwYCSLYBAwUDRAECAgECBAQGAwQFBQQBAgIBATIAAAAAAwBtAAABkgGTAAMADAARAAAlIzcXBzM3MxczAyMDFyEVITUBI0YjI7ZKF2MXSmVbZQEBJP7c5nh4eUlJASb+2iRJSQAKAAAAJQIAAZIABAAJAA4AEwAYAB0AIgAnACwAMQAANxEFEQU3FzUHFTU3NScVJwcVFzUVJxU3NRUHFRc1NxUXNQclBxUXNRUnFTc1FQcVFzUAAgD+ALeSkpKSJW1tbW1tbSWSkgEkbW1tbW1tJQFuAf6UASUBSgFIbQFIAUq4AUgBSm8BSgFIbQFIAUrbSAFKAQEBSAFKbwFKAUhtAUgBSgAAAAIACQAlAgABkgAWAC4AACUOAxU1DgMHJj4CFzU0HgIXBT4DNxU1FD4CNy4DNRUmDgIXAgA5VTkcQVxAKA8RGEh3Thc2Vz/+PAY3S1UlECAxICYyHQw9Z0chCt8wRi8VAWsFDxsjGS1kUiwLaQETKUYxYBAUDwgDTRABCRMlGhoiFwkBPhAQJzkZAAAAAgBJAEkBtwFuAEcAjwAAAQ4DFRQeAhceAxc+Azc+AzU0LgInLgMHJg4CBwYiBiYHNAYmIicwLgE0NTQ+Ajc+Azc1DgMHJw4DFRQeAhceAxc+Azc+AzU0LgInLgMHJg4CBwYiBiYVJgYmIjUiJjQmNTQ+Ajc+Azc1DgMHATkJDQkEAwYKBgcOEBAJCA4NDAUGCAUDAwQHBQUKCgwGBQoICAMBAgIBAQEBAQEBAQMGCgYGDxITCxMhHBYJzQkNCQQDBwkHBg4QEQgIDg0MBgUIBQMCBQcFBAoLDAYFCQkIAwECAgEBAQEBAQEBAwcJBgcPERQLEyEcFwkBIgwYHBsQCxgUEgcICwgDAQECBggGBQ0MDwYIDA0KBgUIBAQBAQICBQECAgEBAQECAQQCBQEKEhQRCggQDAwDFwgQFBQNAQwYHBsQCxgUEgcICwgDAQECBggGBQ0MDwYIDA0KBgUIBAQBAQICBQECAgEBAQECAQQCBQEKEhQRCggQDAwDFwgQFBQNAAT//wBJAgABbgAEAAkADgASAAATIRUhNRchFSE1FSEVITUHNQcXAAIA/gC3AUn+twFJ/rclk5MBbklJbklJbklJSbdcWwAAAAUAAABJAgABbgAEAAkADgAaAG0AABMhFSE1FSEVITUVIRUhNSczNSM1IwcVNxUjFRc+Azc+Azc0PgE0NTQuAicuAyMiBioBByIOAiMVPgM3Mj4BMjM6AR4BFx4CFBUcAQYUBw4DBw4DDwEVMzUjPgM3MZIBbv6SAW7+kgFu/pKNRBgUFhYYIAUHBQMBAgICAQEBAQEDBAICBgcHBQEEAwQCAgMEBAICBAQDAgIDAwMCAgMDAwEBAgEBAQEBAgICAQQGCQULRC0BAwQEAgFuSUluSUluSUlrFF0GFAZJFJEFBwYEAQIDBAMBAgMDAwIDBwUFAgIEAgEBAQEBAhUBAgIBAQEBAQIBAQIDBAIBAgMCAQICAwMCAQUHCQYNExQBBAMFAgADAAAASQIAAW4ALAAxAGwAACUiLgInNTMeAzMyPgI1NC4CIyIOAgcjNT4DMzIeAhUUDgIjJzMVIzUnIg4CByMVDgMVFB4CFxUzHgMzMj4CNzMVDgMjIi4CNTQ+AjMyHgIXFSMuAyMBbgoUEhEIHgUKCwsGEyEZDg4ZIRMGCwsKBR4IERIUCh41KBcXKDUet5KSJQYLCwoFHgQHBQICBQcEHgUKCwsGBgsLCgUeCBESFAoeNSgXFyg1HgoUEhEIHgUKCwsGSQMGBwU0AgQDAQ0XHhESHhcNAQMEAjQFBwYDFyg1Hx41KBe3SUkvAQMEAhgFCw0OBwcNDQsGFwIEAwEBAwQCNAUHBgMXKDUeHzUoFwMGBwU0AgQDAQAAAAEAAAC3AgABAAAEAAATIRUhNQACAP4AAQBJSQABAJIASQGSAZIADAAAAQ8CFzcHNxc3DwEXAQcpQQvBC0ApQAvBC0EBWdYBOAE6AdgBOgE4AQAAAAQAAABJAgABbgAEAAkADgASAAATIRUhNRchFSE1FSEVITUHNRcHAAIA/gC3AUn+twFJ/re3k5MBbklJbklJbklJSbdcWwAAAAMAAAAlAgABkgAEAAkAEgAANxEFEQUBBREFEQc/ARcVJTU3FwACAP4AAdv+SgG2tiQwPv6Sbm4lAW4B/pQBAUoB/twBASa4AV5eSgFIk5MABAAlAAAB2wG3AAMAGgAeADUAAAEVJzMHHgIGDwEOAS4BJy4BNDY/AT4BHgEXARcnFTceATI2PwE+AS4BJy4CBg8BDgEeARcB29vbKgMDAQICcwIGBgYCAwMBAnQCBQYGAv5029sqAwYGBQJzAgEBAgMCBgYGAnICAgEDAgG33NwrAgYGBgJzAgEBAgMDBQYGAnMCAQECA/51AdvaKgMDAQJzAgUGBgMCAwECAnMCBQYGAgAABAAA/9sCAAHbAAMAGgAeADUAACU1Fwc3LgI2PwE+AR4BFx4BFAYPAQ4BIiYnBycXNQcuASIGDwEOAR4BFx4CNj8BPgEuAScBJdvbKgMDAQICcwIGBgYCAwMBAnQCBQYGAnTb2yoDBgYFAnMCAQECAwIGBgYCcgICAQMC/9zbASwCBgYGAnICAgEDAgMGBgUCcwIBAwN1AdzbKgMDAQJzAgUGBgMCAwECAnICBgYGAgABAG4AJQFuAZIAEgAAJREjESM1Ii4CNTQ+AjsBESMBSSRKFigeEREeKBaTJSUBSf63khEeKBcWKB4R/pMAAAAAAwAlAAEB3AG2AAoAVwB4AAAlMwcnMzUjNxcjFQcOAwcOAyMiLgInLgM1ND4CNz4DOwE1NC4CJy4DIyIOAgcOAwc1PgM3PgIyMzIeAhceAx0BIzU1IyIOAgcOAxUUHgIXHgMzMj4CNz4DPQEBkkpcXEpKXFxK6wIGBgcEAwgICQUIDw4LBQUHBQIDBQkGBQ8SFAwlAQMDAgMFBwgFBAoJCQQFCQkJBQQJCQkEBQkKCQUNFRENBQUIBQI0FQgMCggDAwUDAQECAwICBQUHAwUJCQcCAwUCApKRkZORkZMHBAYFBQECAwIBAgUHBQULDQ8JCRANCwQFBgUCCQMGBQQCAgICAQEBAgEBAwQFAy8CAwMCAQEBAQIFCAUGDhIXDXgYSwECAwICBgYIBQQGBgUCAgMCAQIEBgQECgsOBwQAAAAEACUASgHbAW4AAwAMAC0AegAANyM3FwczNzMXMwMjAyUVFA4CBw4DIyIuAicuAzU0PgI3PgM7ATcuAyMqAQ4BBw4DBxU+Azc+AzMyHgIXHgMdASMiDgIHDgMVFB4CFx4DMzI+Ajc+AzcVMzU0LgInrjUbGok4EUsSOE1ETQF/AQMFAwMHCQoFBAYGBQIDAwIBAgMEAwMJCw0IFiIFDhIWDQYKCgoFBAoJCgQFCgoJBQUJCgoFBAkHBgIDAwMBJg0WEw8GBgkGAwIFCAUFDA4QCQUJCQgEBAcHBgI3AgUIBsV1dXZHRwEf/uFlBAcOCwsEBAYEAwICAwICBQYHAwUJBwUCAgMCAWIFCAYCAQEBAQMCBAIwAwUEAwIBAgEBAQIDAQIEBgYDCQMEBwQFCw4QCgkPDgsFBQcFAgEBAwICBQUHAxh7DhcTDwUAAAIASQBJAbcBkwAEAIEAABMhFSE1Fx4DFx4DFRQOAgcOAyMiLgInLgMnFR4DFx4DMzI+Ajc+AzU0LgInLgMvAS4DJy4DNTQ+Ajc+AzMyHgIXHgMXNS4DJy4DIyIOAgcOAxUUHgIXHgMfAUkBbv6SvwQIBgYCAgMDAQIDBQQDCAkLBgYNDAwGBg0NDQYGCwwNBgYNDAwHDxoXEggHCwgDAgUHBAUMDxIKHAcNCQcDAgMDAQIDBQMDCAkKBgYLCgsGBQsLCgYGCwwLBgYLDAsGDBcUEQcICwcDAgQHBAUMERUNIAEAJSUxAgMFBAMDBgYHAwUICAYDAgQDAQECAwMCBQcIBEEDBAUDAgECAQEDBgkGBQ8SFQwJEA8NBgYKCggDCwIFBQQDAgUFBgMFBwcFAwIDAwEBAgMCAgQGBgM9AgUDBAEBAgEBAwcJBgYPERMLCA8ODAQFCgoJBQsAAAQAAABJAgABbgAEAAkADgATAAA/ARcHJxc3FwcnJScHFzcXJwcXNwAltiO4AbYluCMB/yO4JbYBuCO2Jdsdkh6TAZQekhwBHZIekwGUHpIcAAAAAAUAAP/bAgAB2wAEAAkADgATABgAABcRIREhASERIREHITUhFRUhNSEVFSE1IRUAAgD+AAHb/koBtkn+3AEk/twBJP7cASQlAgD+AAHc/kkBt5JJSW5JSW5JSQAAAwCTAEkBbQGSABcALwBbAAA3Mh4CFx4DFwYUDgEHDgMrATczNzIeAhceAhQXBhQOAQcOAysBNzMDMzI+Ajc+Ayc2LgInLgMnPgM3PgMnNi4CJy4DKwED+AcNCQkDBAMEAQEBBAQEAgkKDQcqASgBBQsIBwIDAwQBAQQCBAEICAsFKgEoZGQRGRgRCAYLBgQBAQMEBwQGCg8OCggMDQgFAwcDAwEBBAYLBgcQFBcOZAHeAQMEAwMICQwHBgsJCAIDBAMBYYECAgMDAgYHCQUFCQcGAgIEAgFN/uoDBQgGBQ4RFQsKEQ8NBgUJBgQBAQMFBwUECwwOCAsSDw0FBggFAv63AAADACUAAAHbAbcABAANABEAADcRIREhEyMDMzczFzMDBxcjNyUBtv5K/URMOBBLETdLIho0GgABt/5JAW7+20hIASU1eHgAAAACAEIAHwG8AZkAIQBLAAAlBycOAS4BJwcXBw4BIiYvAS4BNDY/AT4BMhYfAR4BFAYHJy4BIgYPAQ4BFBYXHgE+AT8BLgMnLgI2PwE+AhYXBxc3PgE0JicBvJQEBQsMCwYhHg8PJygnDw8PDw8P1w8nKCcPDw8QEA8lCxscHAvFCwwLCgsbHRsLJwMFBgUCCgwDBQhSBg8QEgl+JoYLCwoL9pQEAQECAwMgHg8PDw8PDxAmKCcP1w8QEA8PDycoJw9+CwoLC8YLGx0bCwoLAQsLJgIDBAUCChcXFQhSBgYBBAV9JYYLHBwbCwAAAAMAAABJAgABbgAEAAkADgAAEyEVITUXIRUhNRczFSM1AAIA/gCSAW7+kpPb2wFuSUluSUluSUkAAwAAAEkCAAFuAAQACQAOAAATIRUhNRUhFSE1FTMVIzUAAgD+AAFt/pPc3AFuSUluSUluSUkAAAADAAAASQIAAW4ABAAJAA4AABMhFSE1FSEVITUVIRUhNQAB//4BAf/+AQIA/gABbklJbklJbklJAAMAAABJAgABbgAEAAkADgAAEyEHIScHIRchNxchByEnbgElAf7dAW0B/wH9/wFtASUB/t0BAW5JSW5JSW5JSQAGAAAAJwIAAZUACAANABQAGAAdACEAADc1IxEhFTMRIQEhFSE1FyMVIRUhNQcjNxcXITUhFScXIzdJSQG3Sf5JAUn+kwFtSiX+twFu27hcXG3+2wElKSlJICdJASVK/twBSdzcSbcl3EltbSUlJW5JSQAAAAEAAAABAADCHXSvXw889QALAgAAAAAAz3WLJQAAAADPdYsl////2wIAAdsAAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgD//wAAAgAAAQAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAABAAAAAgAAAAIAAAACAAAAAgAAbgIAAAACAABtAgAAAAIAAAkCAABJAgD//wIAAAACAAAAAgAAAAIAAJICAAAAAgAAAAIAACUCAAAAAgAAbgIAACUCAAAlAgAASQIAAAACAAAAAgAAkwIAACUCAABCAgAAAAIAAAACAAAAAgAAAAIAAAAAAAAAAAoAFAAeAEAAcAC4AQQBhgGoAfoCQAMCAyYDuARGBFQEcASUBLwFFgVuBY4GLgbUB4IHrAfaCFwIgAj2CRIJLglKCWoJpAAAAAEAAAAkAJAACgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAYAAAAAQAAAAAAAgAOAGoAAQAAAAAAAwAYAC4AAQAAAAAABAAYAHgAAQAAAAAABQAWABgAAQAAAAAABgAMAEYAAQAAAAAACgAoAJAAAwABBAkAAQAYAAAAAwABBAkAAgAOAGoAAwABBAkAAwAYAC4AAwABBAkABAAYAHgAAwABBAkABQAWABgAAwABBAkABgAYAFIAAwABBAkACgAoAJAAUgBlAGQAYQBjAHQAbwByAEYAbwBuAHQAVgBlAHIAcwBpAG8AbgAgADEALgAwAFIAZQBkAGEAYwB0AG8AcgBGAG8AbgB0UmVkYWN0b3JGb250AFIAZQBkAGEAYwB0AG8AcgBGAG8AbgB0AFIAZQBnAHUAbABhAHIAUgBlAGQAYQBjAHQAbwByAEYAbwBuAHQARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('truetype'),url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AABIoAAoAAAAAEeAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAADgEAAA4Bg0Rie09TLzIAAA74AAAAYAAAAGAIIvzVY21hcAAAD1gAAABMAAAATBpVzHZnYXNwAAAPpAAAAAgAAAAIAAAAEGhlYWQAAA+sAAAANgAAADYACVb9aGhlYQAAD+QAAAAkAAAAJAPhAgVobXR4AAAQCAAAAJAAAACQQQED3m1heHAAABCYAAAABgAAAAYAJFAAbmFtZQAAEKAAAAFmAAABZhHEcG1wb3N0AAASCAAAACAAAAAgAAMAAAEABAQAAQEBDVJlZGFjdG9yRm9udAABAgABADr4HAL4GwP4GAQeCgAZU/+Lix4KABlT/4uLDAeKZviU+HQFHQAAAT8PHQAAAUQRHQAAAAkdAAAN+BIAJQEBDRkbHSAlKi80OT5DSE1SV1xhZmtwdXp/hImOk5idoqessba7wFJlZGFjdG9yRm9udFJlZGFjdG9yRm9udHUwdTF1MjB1RTYwMHVFNjAxdUU2MDJ1RTYwM3VFNjA0dUU2MDV1RTYwNnVFNjA3dUU2MDh1RTYwOXVFNjBBdUU2MEJ1RTYwQ3VFNjBEdUU2MEV1RTYwRnVFNjEwdUU2MTF1RTYxMnVFNjEzdUU2MTR1RTYxNXVFNjE2dUU2MTd1RTYxOHVFNjE5dUU2MUF1RTYxQnVFNjFDdUU2MUR1RTYxRXVFNjFGAAACAYkAIgAkAgABAAQABwAKAA0AQQCYAPEBSQH6Ai8CxwMhA98EGwTXBYEFkQW0BfEGLwagBxEHOgf0CLUJaQmsCfwKhAq5C0QLdAuiC9AMAQxo/JQO/JQO/JQO+5QOi7AVi/gB+JSLi/wB/JSLBfhv990V/EqLi/u5+EqLi/e5Bfu4+5QVi/dv9yb7Avsm+wEFDvcm+AIV+AKLi0L8AouL1AWL+wIV+AKLi0L8AouL1AWL+wIV+AKLi0L8AouL1AX7JvdwFdSLi0JCi4vUBYv7AhXUi4tCQouL1AWL+wIV1IuLQkKLi9QFDviLsBVky0yq+0KWCIshBYuLQMb7LPcT9z33GsW4i4sIiyEF92Wr9wT7QV77Cgj7yfdpFYvIBYuLb3ImSOFBtnqLiwiLfIvXBe6F9yJ7nGSl0PsO6Ps2YwgO9wLUFfe4i4tn+7iLi68FysoVnHmngrGLsounlJydnJ2Up4uyCIv3SUyLi/tXBYt8hoCDg4ODgId8i32Lf4+Dk4OTh5aLmgiL91dLi4v7SQWLZJRvnXkIDvfd+EoVrouL+yrWi4tr+wKLi/dKBbH7kxX3JS/7JS+L1fsDi4uw9wOLi9QF+3LTFfsl5/cl54tC9wOLi2b7A4uLQQWXNhWTg499i3iLf4mBhoSGg4SHgYmOio6KjYiNiI6GjoQIpklri3i5BYuMio2KjYaZhZKEiwiBi4tDbouL90q1iwWfi5mHk4MIVEcVmYsFk4uRjY+Pjo+NkYuUi5SJkoiOh4+FjYOLCH2Li1kFDve393oVRYuu9wyu+wwF+0r7DRXVi6LU7ouiQtWLJve6MIsm+7oFjGcV97iLi0L7uIuL1AUOi7AVi/gB+JSLi/wB/JSLBfdLrxX3JouL1Psmi4tCBYv3AhX3JouL1Psmi4tCBWb3SxX7AYuLQvcBi4vUBYv7AhX7AYuLQvcBi4vUBYv7AhX7AYuLQvcBi4vUBbD3cBWLQvcmi4vU+yaLBfe4ixX7AYuLQvcBi4vUBYv7AhX7AYuLQvcBi4vUBYv7AhX7AYuLQvcBi4vUBQ74lPdzFfss+xNAUIuLCIv1BftCgExsZEte9wr3BPdB92VrCIv1BYuLxV73PfsaCPxYLBWcsvcim+6RCIs/i5oFi4u2nOHVJs5vpIuLCItOBfs2s/sOLqVGCA73zfe2FXNsgGiLY4tpk3Ccd513n4Gji6CLnJKZmpqakpyLn4uehZt+mH+ZfJJ7i32LgIeChQiIiYmKiYuKi4mMioyKjoqPi5GLpJOknKOco6KcqJYIi6EFWXhlcnRrCPthixV0bH9oi2OLaZNwnXecd6CBoougi5ySmpqZmpKci5+LnoWbfph/mX2Seot+i3+IgoQIiImJioqLiYuKjIqMiY6Kj4uRi6SUpJujnKOinKmWCIuhBVh4ZnJzawgOi/gCFfiUi4tC/JSLi9QF90v7AhX33YuLQvvdi4vUBYv7AhX33YuLQvvdi4vUBWZCFYv3S/snL/cnMAUO9yb4AhX4AouLQvwCi4vUBYv7AhX4AouLQvwCi4vUBYv7AhX4AouLQvwCi4vUBfsh9hXPi4ufc4uL6HeLdYWLd6GRi0Jzi4t3Bav7JRWXl5KTjY6PkI2PjY+Mj4yPi5CLlIiThJCFkYKOf4uHi4aKhoqGioaKhokIi3YFkI6QjZCNkIyPjI+LkIuPio6IjoiMh4uGi4iLiImIiYeJh4eHiIiDgX18CIB+i3jPi4ufXosFjo+QkJGRCIuLBQ74AtQVcItyk3aYCIu/qYsFmIWZh5uLvYu0sIu5i7pisFmLe4t9h36FCG2Li78FoJikk6aL3IvMSYs6iztKSTqLCPtL90sV9yaLi0L7JouL1AVmuhV8i3yHfoUIbYuLcwWAfYR6i3iLeZJ5ln0Ii3SpiwWYhZqHmoubi5mPmJEIqYuLVwV2fnKDcIs6i0rNi9uL3MzN3Iumi6SDoH4Ii1dtiwV+kX2Pe4sIDov3lBX4lIuLQvyUi4vUBQ73m/ftFWL7a0qLgFL3VYuWxEuLtPdry4uWxPtVi4BSzIsFDov4AhX4lIuLQvyUi4vUBfdL+wIV992Li0L73YuL1AWL+wIV992Li0L73YuL1AX7S0IVi/dL9ycv+ycwBQ6LsBWL+AH4lIuL/AH8lIsF+G/33RX8SouL+7n4SouL97kF+0r7SxWvi7vqySyLQvwCi4vU9wL3JvcC+yYFDvhv+EsVi/tw+2/3cPdviwVhYBWShIyChoUI+wf7BwWFhoKMhJKEkoqUkJEI9wj3BwWQkJWKkYQI/CD8HxX3b4r7b/dvi/tuBbW1FZKElYqQkAj3B/cHBZCQipWEkoSRgo2FhQj7BvsHBYWGjYGRhQgO97n3kxWL93D3b/tv+2+KBbW3FYSSipSQkQj3B/cGBZGRlIqShJKEjIGGhgj7CPsHBYaGgYyFkgj7CPsJFftvjPdv+3CL928FYWEVhJKBjIaGCPsH+wcFhoaMgZKEkoSUipGRCPcG9wYFkZGJlIWSCA733bAVi/fdZ4uL+91Bi4v3JgVPi1q8i8iLx7y8x4sI9yeLi/wBZosFDvgm9yYV1Ysv+yUv9yXVi4v3J0GL5/cl5/slQYuL+ycF+3+EFYWCgoSBhoGGgIh/i3WLeZF+mH6XhZ2Looujkp2blpqXopGriwiwi4uUBYuUiJKFj4SQgo1/i3+Lf4l/iH+If4V+hAiLugWWkJeOl46XjZiMmIusi6KEmH6ZfZFyi2gIi/sMV4uLowWL1hV2iwV3i32IhIaDhoeCi36LgY6EkIWQhpOIlIuZi5aQkpaTlo+ai58Ii48FDvdC91kVVoum9wml+wkF+x37ChXDi5zS1oudRMOLPvezR4s++7MF+BPwFYuHBYt3h3uDgIOAf4V9i4GLg46GkYWRiJOLlIuYj5WTkJSQmY6giwihiwWt7RV9mXOSaYt8i36Kfol/iH6Hf4YIi1sFmJOYkJiPl46YjZmLl4uViJGHkoaOhIuCCIuCZYsFaYtyhXt/e3+DeItyi3SReZl+mH6ehaOLmIuXjZWQlpCTk5KUCItzwouL9w8Fi6+EpX2ZCA7U95QV+AKLi2b8AouLsAX3U1oVloeUhZGEkYSOgouCi36GgYKEgoR/iHuLe4t6jnuRepB6lHqXCItKBZqEm4Wch5yIm4mci7OLqZOfm5+alKOLq4ujhZ9/mn6bd5dwlAhvlgV3kX6ShZGFkIiTi5OLl4+UlJGTkZeOm4uai5mImoaZhpqEmYIIi8gFfJF8kHuPfI58jXuLaYtxg3h6d3uCdItui3WQeZd+l32hf61+CKuABQ6L928Vr6n3S/snZ277S/cmBYuLFfdL9yevbvtL+ydnqAX4lIsVZ6n7S/snr273S/cmBYuLFftL9ydnbvdL+yevqAUOi2YVi/iU+JSLi/yU/JSLBfhv+HAV/EqLi/xL+EqLi/hLBUL7JhX7uIuL1Pe4i4tCBYv7AhX7uIuL1Pe4i4tCBYv7AhX7uIuL1Pe4i4tCBQ73jPdyFZ6LmYiUg5ODj36LeYt6h3+DhIOEfYd3iwhii4vstIsFi/cVFZuLloiShJKFjoKLfYt+iIGEhYSFgIh7iwhii4vYtIsFJvuqFfCLBbWLqJKemp2ZlKKLqoulhZ9/mn+ZeZRzjZ+NmpKVl5aXkJuLoIungqB5mHqZcJJoiwgmi4v73QUOsIsVi/hL+EqLi/xL/EqLBfeR+AIVR4s/+7nDi5vT1oucQ8KLQPe5BWlWFaX7DFeLpfcMBQ74UPeKFfso+yiHjwV9h3uNfJMIamupbXx8BWJiSYtitAh8mgVitIvNtLQI92v3awW0tM2LtGIImnwFtGKLSWJiCGb3EhVuqFyKbm4I+1n7WgVtbotcp26ob7qLqKkIsrEFg4+EkIWScKaGsJ+gCN3dBZuapIyifwj7EvsRsWb3GvcaBaiojLpuqAgOi/gCFfiUi4tC/JSLi9QF9yb7AhX4AouLQvwCi4vUBfcn+wIV92+Li0L7b4uL1AUOi/gCFfiUi4tC/JSLi9QFi/sCFfgBi4tC/AGLi9QFi/sCFfdwi4tC+3CLi9QFDov4AhX4k4uLQvyTi4vUBYv7AhX4k4uLQvyTi4vUBYv7AhX4lIuLQvyUi4vUBQ73AvgCFfe4i4tC+7iLi9QF+wL7AhX4lIuLQvyUi4vUBfcC+wIV97iLi0L7uIuL1AUO1LIVi9RCi4v3ufhLi4tB1IuL+7j8S4sF99333RX8AYuL+3D4AYuL93AF1UIVZouL+0v73YuLZvgCi4v3cAX7b0IV+0yL5/cB5/sBBfcBZhX7uYuLsPe5i4tmBWL3AhW0QkKLq9QFDviUFPiUFYsMCgAAAAADAgABkAAFAAABTAFmAAAARwFMAWYAAAD1ABkAhAAAAAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAAAAAAEAAAOYfAeD/4P/gAeAAIAAAAAEAAAAAAAAAAAAAACAAAAAAAAIAAAADAAAAFAADAAEAAAAUAAQAOAAAAAoACAACAAIAAQAg5h///f//AAAAAAAg5gD//f//AAH/4xoEAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAQAAhlBJsl8PPPUACwIAAAAAAM91iyUAAAAAz3WLJf///9sCAAHbAAAACAACAAAAAAAAAAEAAAHg/+AAAAIA//8AAAIAAAEAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAQAAAAIAAAACAAAAAgAAAAIAAG4CAAAAAgAAbQIAAAACAAAJAgAASQIA//8CAAAAAgAAAAIAAAACAACSAgAAAAIAAAACAAAlAgAAAAIAAG4CAAAlAgAAJQIAAEkCAAAAAgAAAAIAAJMCAAAlAgAAQgIAAAACAAAAAgAAAAIAAAACAAAAAABQAAAkAAAAAAAOAK4AAQAAAAAAAQAYAAAAAQAAAAAAAgAOAGoAAQAAAAAAAwAYAC4AAQAAAAAABAAYAHgAAQAAAAAABQAWABgAAQAAAAAABgAMAEYAAQAAAAAACgAoAJAAAwABBAkAAQAYAAAAAwABBAkAAgAOAGoAAwABBAkAAwAYAC4AAwABBAkABAAYAHgAAwABBAkABQAWABgAAwABBAkABgAYAFIAAwABBAkACgAoAJAAUgBlAGQAYQBjAHQAbwByAEYAbwBuAHQAVgBlAHIAcwBpAG8AbgAgADEALgAwAFIAZQBkAGEAYwB0AG8AcgBGAG8AbgB0UmVkYWN0b3JGb250AFIAZQBkAGEAYwB0AG8AcgBGAG8AbgB0AFIAZQBnAHUAbABhAHIAUgBlAGQAYQBjAHQAbwByAEYAbwBuAHQARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff');font-weight:normal;font-style:normal}.redactor_box ::selection{background:#ffff9e}.redactor_box ::-moz-selection{background:#ffff9e}.redactor_box img::selection{background:transparent}.redactor_box img::-moz-selection{background:transparent}.redactor_box{position:relative;overflow:visible;background:#fff}.redactor_box iframe{display:block;margin:0;padding:0;border:1px solid #eee}.redactor_box textarea{position:relative;display:block;overflow:auto;margin:0;padding:0;width:100%;outline:0;border:0;background-color:#222;box-shadow:none;color:#ccc;font-size:13px;font-family:Menlo,Monaco,monospace,sans-serif;resize:none}.redactor_box textarea:focus{outline:0}.redactor_box,.redactor_box textarea{z-index:auto!important}.redactor_box_fullscreen{z-index:99!important}#redactor_modal_overlay,#redactor_modal,.redactor_dropdown{z-index:100!important}body .redactor_air{position:absolute;z-index:502}body .redactor_box_fullscreen{position:fixed;top:0;left:0;width:100%}.redactor-link-tooltip{position:absolute;z-index:49999;padding:10px;line-height:1;display:inline-block;background-color:#000;color:#555!important}.redactor-link-tooltip,.redactor-link-tooltip a{font-size:12px;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif}.redactor-link-tooltip a{color:#ccc;margin:0 5px;text-decoration:none}.redactor-link-tooltip a:hover{color:#fff}#redactor-image-box img{width:100%}.redactor_editor{position:relative;overflow:auto;margin:0!important;padding:10px 20px;padding-bottom:5px;outline:0;background:0;background:#fff;box-shadow:none!important;white-space:normal;border:1px solid #eee}.redactor_editor:focus{outline:0}.redactor_editor div,.redactor_editor p,.redactor_editor ul,.redactor_editor ol,.redactor_editor table,.redactor_editor dl,.redactor_editor blockquote,.redactor_editor pre,.redactor_editor h1,.redactor_editor h2,.redactor_editor h3,.redactor_editor h4,.redactor_editor h5,.redactor_editor h6{font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif}.redactor_editor code,.redactor_editor pre{font-family:Menlo,Monaco,monospace,sans-serif}.redactor_editor div,.redactor_editor p,.redactor_editor ul,.redactor_editor ol,.redactor_editor table,.redactor_editor dl,.redactor_editor blockquote,.redactor_editor pre{font-size:14px;line-height:1.6em}.redactor_editor a{color:#15c!important;text-decoration:underline!important}.redactor_editor .redactor_placeholder{color:#999!important;display:block!important}.redactor_editor object,.redactor_editor embed,.redactor_editor video,.redactor_editor img{max-width:100%;width:auto}.redactor_editor video,.redactor_editor img{height:auto}.redactor_editor div,.redactor_editor p,.redactor_editor ul,.redactor_editor ol,.redactor_editor table,.redactor_editor dl,.redactor_editor blockquote,.redactor_editor pre{margin:0;margin-bottom:10px!important;border:0;background:none!important;box-shadow:none!important}.redactor_editor iframe,.redactor_editor object,.redactor_editor hr{margin-bottom:15px!important}.redactor_editor blockquote{margin-left:1.5em!important;padding-left:0!important;color:#777;font-style:italic!important}.redactor_editor ul,.redactor_editor ol{padding-left:2em!important}.redactor_editor ul ul,.redactor_editor ol ol,.redactor_editor ul ol,.redactor_editor ol ul{margin:2px!important;padding:0!important;padding-left:2em!important;border:0}.redactor_editor dl dt{font-weight:bold}.redactor_editor dd{margin-left:1em}.redactor_editor table{border-collapse:collapse;font-size:1em!important}.redactor_editor table td{padding:5px!important;border:1px solid #ddd;vertical-align:top}.redactor_editor table thead td{border-bottom:2px solid #000!important;font-weight:bold!important}.redactor_editor code{background-color:#d8d7d7!important}.redactor_editor pre{overflow:auto;padding:1em!important;border:1px solid #ddd!important;border-radius:3px!important;background:#f8f8f8!important;white-space:pre;font-size:90%!important}.redactor_editor hr{display:block;height:1px;border:0;border-top:1px solid #ccc}.redactor_editor h1,.redactor_editor h2,.redactor_editor h3,.redactor_editor h4,.redactor_editor h5,.redactor_editor h6{margin-top:0!important;padding:0!important;background:0;color:#000;font-weight:bold}.redactor_editor h1{font-size:36px!important;line-height:1.111em!important;margin-bottom:.15em!important}.redactor_editor h2{font-size:30px!important;line-height:1.111em!important;margin-bottom:.25em!important}.redactor_editor h3{font-size:24px!important;line-height:1.333em!important;margin-bottom:.2em!important}.redactor_editor h4{font-size:18px!important;line-height:1.5em!important;margin-bottom:.2em!important}.redactor_editor h5{font-size:1em!important;line-height:1.6em!important;margin-bottom:.25em!important}.redactor_editor h6{font-size:.8em!important;line-height:1.6em!important;text-transform:uppercase;margin-bottom:.3em!important}.redactor_toolbar{position:relative;top:0;left:0;margin:0!important;padding:0!important;list-style:none!important;font-size:14px!important;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;line-height:1!important;background:#fff;border:0;box-shadow:0 1px 2px rgba(0,0,0,0.2);z-index:3}.redactor_toolbar:after{content:"";display:table;clear:both}.redactor_toolbar.redactor-toolbar-overflow{overflow-y:auto;height:29px;white-space:nowrap}.redactor_toolbar.redactor-toolbar-external{z-index:999;box-shadow:none;border:1px solid rgba(0,0,0,0.1)}body .redactor_air .redactor_toolbar{padding-right:2px!important}.redactor_toolbar li{vertical-align:top;display:inline-block;margin:0!important;padding:0!important;outline:0;list-style:none!important;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.redactor_toolbar li a{display:block;color:#333;text-align:center;padding:9px 10px;outline:0;border:0;text-decoration:none;cursor:pointer;zoom:1;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.redactor_toolbar li a:hover{outline:0;background-color:#1f78d8;color:#fff}.redactor_toolbar li a:hover i:before{color:#fff}.redactor_toolbar li a:active,.redactor_toolbar li a.redactor_act{outline:0;background-color:#ccc;color:#444}.redactor_toolbar li a.redactor-btn-image{width:14px;height:14px;background-position:center center;background-repeat:no-repeat}.redactor_button_disabled{filter:alpha(opacity=30);-moz-opacity:.3;opacity:.3}.redactor_button_disabled:hover{outline:0;background-color:transparent!important;cursor:default}.redactor_toolbar li a.fa-redactor-btn{display:inline-block;padding:9px 10px 8px 10px;line-height:1}.redactor_toolbar.redactor-toolbar-typewriter{box-shadow:none;background:rgba(240,240,240,0.9)}.redactor_toolbar.redactor-toolbar-typewriter li a:hover{outline:0;background-color:#1f78d8;color:#fff}.redactor_toolbar.redactor-toolbar-typewriter li a:active,.redactor_toolbar.redactor-toolbar-typewriter li a.redactor_act{outline:0;background-color:#ccc;color:#444}.re-icon{font-family:'RedactorFont';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.re-icon i:before{position:relative;font-size:14px}.re-video:before{content:"\e600"}.re-unorderedlist:before{content:"\e601"}.re-undo:before{content:"\e602"}.re-underline:before{content:"\e603"}.re-textdirection:before{content:"\e604"}.re-fontcolor:before{content:"\e605"}.re-table:before{content:"\e606"}.re-redo:before{content:"\e607"}.re-quote:before{content:"\e608"}.re-outdent:before{content:"\e609"}.re-orderedlist:before{content:"\e60a"}.re-link:before{content:"\e60b"}.re-horizontalrule:before{content:"\e60c"}.re-italic:before{content:"\e60d"}.re-indent:before{content:"\e60e"}.re-image:before{content:"\e60f"}.re-fullscreen:before{content:"\e610"}.re-normalscreen:before{content:"\e611"}.re-formatting:before{content:"\e612"}.re-fontsize:before{content:"\e613"}.re-fontfamily:before{content:"\e614"}.re-deleted:before{content:"\e615"}.re-html:before{content:"\e616"}.re-clips:before{content:"\e617"}.re-bold:before{content:"\e618"}.re-backcolor:before{content:"\e619"}.re-file:before{content:"\e61a"}.re-alignright:before{content:"\e61b"}.re-alignment:before,.re-alignleft:before{content:"\e61c"}.re-alignjustify:before{content:"\e61d"}.re-aligncenter:before{content:"\e61e"}.re-gallery:before{content:"\e61f"}.redactor_format_blockquote{padding-left:10px;color:#666!important;font-style:italic}.redactor_format_pre{font-family:monospace,sans-serif}.redactor_format_h1,.redactor_format_h2,.redactor_format_h3,.redactor_format_h4,.redactor_format_h5{font-weight:bold}.redactor_format_h1{font-size:30px;line-height:36px}.redactor_format_h2{font-size:24px;line-height:36px}.redactor_format_h3{font-size:20px;line-height:30px}.redactor_format_h4{font-size:16px;line-height:26px}.redactor_format_h5{font-size:14px;line-height:23px}.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h1,.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h2,.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h3,.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h4,.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h5{font-size:1em;line-height:1.6em;text-transform:uppercase}.redactor-toolbar-typewriter .redactor_dropdown .redactor_format_h2{font-size:.85em}.redactor_editor.redactor-editor-typewriter{background:#f5f5f5!important;padding:25px 50px!important}.redactor_editor.redactor-editor-typewriter div,.redactor_editor.redactor-editor-typewriter p,.redactor_editor.redactor-editor-typewriter ul,.redactor_editor.redactor-editor-typewriter ol,.redactor_editor.redactor-editor-typewriter table,.redactor_editor.redactor-editor-typewriter dl,.redactor_editor.redactor-editor-typewriter blockquote,.redactor_editor.redactor-editor-typewriter pre,.redactor_editor.redactor-editor-typewriter h1,.redactor_editor.redactor-editor-typewriter h2,.redactor_editor.redactor-editor-typewriter h3,.redactor_editor.redactor-editor-typewriter h4,.redactor_editor.redactor-editor-typewriter h5,.redactor_editor.redactor-editor-typewriter h6{font-family:'Courier New','Lucida Console',Consolas,Monaco,monospace,sans-serif;font-size:18px!important;line-height:1.5em!important;margin-bottom:1.5em!important}.redactor_editor.redactor-editor-typewriter h2{font-size:14px!important}.redactor_editor.redactor-editor-typewriter h1,.redactor_editor.redactor-editor-typewriter h2,.redactor_editor.redactor-editor-typewriter h3,.redactor_editor.redactor-editor-typewriter h4,.redactor_editor.redactor-editor-typewriter h5,.redactor_editor.redactor-editor-typewriter h6{text-transform:uppercase}.redactor_editor.redactor-editor-typewriter a{color:#000!important;text-decoration:underline!important}.redactor_editor.redactor_editor_wym{padding:10px 7px 0 7px!important;background:#f6f6f6!important}.redactor_editor.redactor_editor_wym div,.redactor_editor.redactor_editor_wym p,.redactor_editor.redactor_editor_wym ul,.redactor_editor.redactor_editor_wym ol,.redactor_editor.redactor_editor_wym table,.redactor_editor.redactor_editor_wym dl,.redactor_editor.redactor_editor_wym pre,.redactor_editor.redactor_editor_wym h1,.redactor_editor.redactor_editor_wym h2,.redactor_editor.redactor_editor_wym h3,.redactor_editor.redactor_editor_wym h4,.redactor_editor.redactor_editor_wym h5,.redactor_editor.redactor_editor_wym h6,.redactor_editor.redactor_editor_wym blockquote{margin-top:0;margin-bottom:5px!important;padding:10px!important;border:1px solid #e4e4e4!important;background-color:#fff!important;z-index:0}.redactor_editor.redactor_editor_wym blockquote:before{content:''}.redactor_editor.redactor_editor_wym img{position:relative;z-index:1}.redactor_editor.redactor_editor_wym div{border:1px dotted #aaa!important}.redactor_editor.redactor_editor_wym pre{border:2px dashed #e4e4e4!important;background-color:#f8f8f8!important}.redactor_editor.redactor_editor_wym ul,.redactor_editor.redactor_editor_wym ol{padding-left:2em!important}.redactor_editor.redactor_editor_wym ul li ul,.redactor_editor.redactor_editor_wym ol li ul,.redactor_editor.redactor_editor_wym ul li ol,.redactor_editor.redactor_editor_wym ol li ol{border:none!important}.redactor_dropdown{position:absolute;top:28px;left:0;padding:10px;width:200px;background-color:#fff;box-shadow:0 1px 5px #bbb;font-size:13px;font-family:Helvetica,Arial,Verdana,Tahoma,sans-serif;line-height:21px}.redactor-toolbar-typewriter .redactor_dropdown{font-family:'Courier New','Lucida Console',Consolas,Monaco,monospace,sans-serif;background-color:#f5f5f5}.redactor_separator_drop{padding:0!important;border-top:1px solid #ddd;font-size:0;line-height:0}.redactor_dropdown a{display:block;padding:3px 5px;color:#000;text-decoration:none}.redactor_dropdown a:hover{background-color:#dde4ef;color:#444!important;text-decoration:none}#redactor_modal_overlay{position:fixed;top:0;left:0;margin:auto;width:100%;height:100%;background-color:#000!important;filter:alpha(opacity=30);-moz-opacity:.3;opacity:.3}#redactor_modal{position:fixed;top:50%;left:50%;padding:0;background:#fff;color:#000;font-size:12px!important;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;box-shadow:0 1px 10px rgba(0,0,0,0.5)}#redactor_modal header{padding:20px 30px 5px 30px;font-size:16px}#redactor_modal section{padding:20px 30px}#redactor_modal label{display:block!important;float:none!important;margin:10px 0 3px 0!important;padding:0!important;font-size:12px!important}#redactor_modal footer:after{content:"";display:table;clear:both}#redactor_modal footer div{float:left}#redactor_modal input[type="radio"],#redactor_modal input[type="checkbox"]{position:relative;top:-1px}#redactor_modal input[type="text"],#redactor_modal input[type="password"],#redactor_modal input[type="email"],#redactor_modal textarea{position:relative;z-index:2;margin:0;padding:1px 2px;height:23px;border:1px solid #ccc;border-radius:1px;background-color:white;box-shadow:0 1px 2px rgba(0,0,0,0.2) inset;color:#333;font-size:13px;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;line-height:1;-moz-transition:border .3s ease-in;transition:border .3s ease-in}#redactor_modal textarea{display:block;margin-top:4px;line-height:1.4em}#redactor_modal input:focus,#redactor_modal textarea:focus{outline:0;border-color:#5ca9e4;box-shadow:0 0 0 2px rgba(70,161,231,0.3),0 1px 2px rgba(0,0,0,0.2) inset}#redactor_modal_close{position:absolute;top:5px;right:3px;width:20px;height:20px;color:#999;font-size:26px;cursor:pointer}#redactor_modal_close:hover{color:#000}.redactor_input{width:99%;font-size:14px}.redactor_modal_box{overflow:auto;margin-bottom:10px;height:350px}#redactor_image_box{overflow:auto;margin-bottom:10px;height:270px}#redactor_image_box_select{display:block;margin-bottom:15px!important;width:200px}#redactor_image_box img{margin-right:10px;margin-bottom:10px;max-width:100px;cursor:pointer}#redactor_tabs{margin-bottom:18px}#redactor_tabs a{display:inline-block;margin-right:2px;padding:4px 14px;border:1px solid #d2d2d2;border-radius:3px;background:#fff;color:#000;text-decoration:none;line-height:1}#redactor_tabs a:hover,#redactor_tabs a.redactor_tabs_act{border-color:#eee;color:#999!important;text-decoration:none!important}.redactor_modal_btn_hidden{display:none}#redactor_modal footer button{position:relative;width:100%;padding:10px 16px;margin:0;outline:0;border:0;background-color:#ddd;color:#000;text-align:center;text-decoration:none;font-weight:normal;font-size:12px;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;line-height:1;cursor:pointer}#redactor_modal footer button:hover{color:#777;background:0;background:#bbb;text-decoration:none}#redactor_modal footer button.redactor_modal_delete_btn{background:0;color:#fff;background-color:#b52525}#redactor_modal footer button.redactor_modal_delete_btn:hover{color:rgba(255,255,255,0.6);background-color:#881b1b}#redactor_modal footer button.redactor_modal_action_btn{background:0;color:#fff;background-color:#2461b5}#redactor_modal footer button.redactor_modal_action_btn:hover{color:rgba(255,255,255,0.6);background-color:#1a4580}.redactor_droparea{position:relative;margin:auto;margin-bottom:5px;width:100%}.redactor_droparea .redactor_dropareabox{position:relative;z-index:1;padding:60px 0;width:99%;border:1px dashed #ddd;background:#fff;text-align:center}.redactor_droparea .redactor_dropareabox,.redactor_dropalternative{color:#555;font-size:12px}.redactor_dropalternative{margin:4px 0 2px 0}.redactor_dropareabox.hover{border-color:#aaa;background:#efe3b8}.redactor_dropareabox.error{border-color:#dcc3c3;background:#f7e5e5}.redactor_dropareabox.drop{border-color:#e0e5d6;background:#f4f4ee}#redactor-progress{position:fixed;top:0;left:0;width:100%;z-index:1000000;height:10px}#redactor-progress span{display:block;width:100%;height:100%;background-color:#3d58a8;background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.2) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0.2) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.2) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0.2) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.2) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0.2) 75%,transparent 75%,transparent);-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;background-size:40px 40px}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}
\ No newline at end of file
diff --git a/assets/redactor/redactor.min.js b/assets/redactor/redactor.min.js
deleted file mode 100644
index 58f3816..0000000
--- a/assets/redactor/redactor.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function($){var uuid=0;"use strict";var Range=function(range){this[0]=range.startOffset;this[1]=range.endOffset;this.range=range;return this};Range.prototype.equals=function(){return this[0]===this[1]};var reUrlYoutube=/https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig;var reUrlVimeo=/https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/;$.fn.redactor=function(options){var val=[];var args=Array.prototype.slice.call(arguments,1);if(typeof options==="string"){this.each(function(){var instance=$.data(this,"redactor");if(typeof instance!=="undefined"&&$.isFunction(instance[options])){var methodVal=instance[options].apply(instance,args);if(methodVal!==undefined&&methodVal!==instance){val.push(methodVal)}}else{return $.error('No such method "'+options+'" for Redactor')}})}else{this.each(function(){if(!$.data(this,"redactor")){$.data(this,"redactor",Redactor(this,options))}})}if(val.length===0){return this}else{if(val.length===1){return val[0]}else{return val}}};function Redactor(el,options){return new Redactor.prototype.init(el,options)}$.Redactor=Redactor;$.Redactor.VERSION="9.2.6";$.Redactor.opts={rangy:false,iframe:false,fullpage:false,css:false,lang:"en",direction:"ltr",placeholder:false,typewriter:false,wym:false,mobile:true,cleanup:true,tidyHtml:true,pastePlainText:false,removeEmptyTags:true,cleanSpaces:true,cleanFontTag:true,templateVars:false,xhtml:false,visual:true,focus:false,tabindex:false,autoresize:true,minHeight:false,maxHeight:false,shortcuts:{"ctrl+m, meta+m":"this.execCommand('removeFormat', false)","ctrl+b, meta+b":"this.execCommand('bold', false)","ctrl+i, meta+i":"this.execCommand('italic', false)","ctrl+h, meta+h":"this.execCommand('superscript', false)","ctrl+l, meta+l":"this.execCommand('subscript', false)","ctrl+k, meta+k":"this.linkShow()","ctrl+shift+7":"this.execCommand('insertorderedlist', false)","ctrl+shift+8":"this.execCommand('insertunorderedlist', false)"},shortcutsAdd:false,autosave:false,autosaveInterval:60,plugins:false,linkProtocol:"http://",linkNofollow:false,linkSize:50,predefinedLinks:false,imageFloatMargin:"10px",imageGetJson:false,dragUpload:true,imageTabLink:true,imageUpload:false,imageUploadParam:"file",imageResizable:true,fileUpload:false,fileUploadParam:"file",clipboardUpload:true,clipboardUploadUrl:false,dnbImageTypes:["image/png","image/jpeg","image/gif"],s3:false,uploadFields:false,observeImages:true,observeLinks:true,modalOverlay:true,tabSpaces:false,tabFocus:true,air:false,airButtons:["formatting","bold","italic","deleted","unorderedlist","orderedlist","outdent","indent"],toolbar:true,toolbarFixed:false,toolbarFixedTarget:document,toolbarFixedTopOffset:0,toolbarFixedBox:false,toolbarExternal:false,toolbarOverflow:false,buttonSource:true,buttons:["html","formatting","bold","italic","deleted","unorderedlist","orderedlist","outdent","indent","image","video","file","table","link","alignment","|","horizontalrule"],buttonsHideOnMobile:[],activeButtons:["deleted","italic","bold","underline","unorderedlist","orderedlist","alignleft","aligncenter","alignright","justify","table"],activeButtonsStates:{b:"bold",strong:"bold",i:"italic",em:"italic",del:"deleted",strike:"deleted",ul:"unorderedlist",ol:"orderedlist",u:"underline",tr:"table",td:"table",table:"table"},formattingTags:["p","blockquote","pre","h1","h2","h3","h4","h5","h6"],linebreaks:false,paragraphy:true,convertDivs:true,convertLinks:true,convertImageLinks:false,convertVideoLinks:false,formattingPre:false,phpTags:false,allowedTags:false,deniedTags:["html","head","link","body","meta","script","style","applet"],boldTag:"strong",italicTag:"em",indentValue:20,buffer:[],rebuffer:[],textareamode:false,emptyHtml:"<p></p>",invisibleSpace:"",rBlockTest:/^(P|H[1-6]|LI|ADDRESS|SECTION|HEADER|FOOTER|ASIDE|ARTICLE)$/i,alignmentTags:["P","H1","H2","H3","H4","H5","H6","DD","DL","DT","DIV","TD","BLOCKQUOTE","OUTPUT","FIGCAPTION","ADDRESS","SECTION","HEADER","FOOTER","ASIDE","ARTICLE"],ownLine:["area","body","head","hr","i?frame","link","meta","noscript","style","script","table","tbody","thead","tfoot"],contOwnLine:["li","dt","dt","h[1-6]","option","script"],newLevel:["blockquote","div","dl","fieldset","form","frameset","map","ol","p","pre","select","td","th","tr","ul"],blockLevelElements:["P","H1","H2","H3","H4","H5","H6","DD","DL","DT","DIV","LI","BLOCKQUOTE","OUTPUT","FIGCAPTION","PRE","ADDRESS","SECTION","HEADER","FOOTER","ASIDE","ARTICLE","TD"],langs:{en:{html:"HTML",video:"Insert Video",image:"Insert Image",table:"Table",link:"Link",link_insert:"Insert link",link_edit:"Edit link",unlink:"Unlink",formatting:"Formatting",paragraph:"Normal text",quote:"Quote",code:"Code",header1:"Header 1",header2:"Header 2",header3:"Header 3",header4:"Header 4",header5:"Header 5",bold:"Bold",italic:"Italic",fontcolor:"Font Color",backcolor:"Back Color",unorderedlist:"Unordered List",orderedlist:"Ordered List",outdent:"Outdent",indent:"Indent",cancel:"Cancel",insert:"Insert",save:"Save",_delete:"Delete",insert_table:"Insert Table",insert_row_above:"Add Row Above",insert_row_below:"Add Row Below",insert_column_left:"Add Column Left",insert_column_right:"Add Column Right",delete_column:"Delete Column",delete_row:"Delete Row",delete_table:"Delete Table",rows:"Rows",columns:"Columns",add_head:"Add Head",delete_head:"Delete Head",title:"Title",image_position:"Position",none:"None",left:"Left",right:"Right",center:"Center",image_web_link:"Image Web Link",text:"Text",mailto:"Email",web:"URL",video_html_code:"Video Embed Code",file:"Insert File",upload:"Upload",download:"Download",choose:"Choose",or_choose:"Or choose",drop_file_here:"Drop file here",align_left:"Align text to the left",align_center:"Center text",align_right:"Align text to the right",align_justify:"Justify text",horizontalrule:"Insert Horizontal Rule",deleted:"Deleted",anchor:"Anchor",link_new_tab:"Open link in new tab",underline:"Underline",alignment:"Alignment",filename:"Name (optional)",edit:"Edit"}}};Redactor.fn=$.Redactor.prototype={keyCode:{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,TAB:9,CTRL:17,META:91,LEFT:37,LEFT_WIN:91},init:function(el,options){this.rtePaste=false;this.$element=this.$source=$(el);this.uuid=uuid++;var opts=$.extend(true,{},$.Redactor.opts);this.opts=$.extend({},opts,this.$element.data(),options);this.start=true;this.dropdowns=[];this.sourceHeight=this.$source.css("height");this.sourceWidth=this.$source.css("width");if(this.opts.fullpage){this.opts.iframe=true}if(this.opts.linebreaks){this.opts.paragraphy=false}if(this.opts.paragraphy){this.opts.linebreaks=false}if(this.opts.toolbarFixedBox){this.opts.toolbarFixed=true}this.document=document;this.window=window;this.savedSel=false;this.cleanlineBefore=new RegExp("^<(/?"+this.opts.ownLine.join("|/?")+"|"+this.opts.contOwnLine.join("|")+")[ >]");this.cleanlineAfter=new RegExp("^<(br|/?"+this.opts.ownLine.join("|/?")+"|/"+this.opts.contOwnLine.join("|/")+")[ >]");this.cleannewLevel=new RegExp("^</?("+this.opts.newLevel.join("|")+")[ >]");this.rTestBlock=new RegExp("^("+this.opts.blockLevelElements.join("|")+")$","i");if(this.opts.linebreaks===false){if(this.opts.allowedTags!==false){var arrSearch=["strong","em","del"];var arrAdd=["b","i","strike"];if($.inArray("p",this.opts.allowedTags)==="-1"){this.opts.allowedTags.push("p")}for(i in arrSearch){if($.inArray(arrSearch[i],this.opts.allowedTags)!="-1"){this.opts.allowedTags.push(arrAdd[i])}}}if(this.opts.deniedTags!==false){var pos=$.inArray("p",this.opts.deniedTags);if(pos!=="-1"){this.opts.deniedTags.splice(pos,pos)}}}if(this.browser("msie")||this.browser("opera")){this.opts.buttons=this.removeFromArrayByValue(this.opts.buttons,"horizontalrule")}this.opts.curLang=this.opts.langs[this.opts.lang];$.extend(this.opts.shortcuts,this.opts.shortcutsAdd);this.placeholderInit();this.buildStart()},toolbarInit:function(lang){return{html:{title:lang.html,func:"toggle"},formatting:{title:lang.formatting,func:"show",dropdown:{p:{title:lang.paragraph,func:"formatBlocks"},blockquote:{title:lang.quote,func:"formatQuote",className:"redactor_format_blockquote"},pre:{title:lang.code,func:"formatBlocks",className:"redactor_format_pre"},h1:{title:lang.header1,func:"formatBlocks",className:"redactor_format_h1"},h2:{title:lang.header2,func:"formatBlocks",className:"redactor_format_h2"},h3:{title:lang.header3,func:"formatBlocks",className:"redactor_format_h3"},h4:{title:lang.header4,func:"formatBlocks",className:"redactor_format_h4"},h5:{title:lang.header5,func:"formatBlocks",className:"redactor_format_h5"}}},bold:{title:lang.bold,exec:"bold"},italic:{title:lang.italic,exec:"italic"},deleted:{title:lang.deleted,exec:"strikethrough"},underline:{title:lang.underline,exec:"underline"},unorderedlist:{title:"• "+lang.unorderedlist,exec:"insertunorderedlist"},orderedlist:{title:"1. "+lang.orderedlist,exec:"insertorderedlist"},outdent:{title:"< "+lang.outdent,func:"indentingOutdent"},indent:{title:"> "+lang.indent,func:"indentingIndent"},image:{title:lang.image,func:"imageShow"},video:{title:lang.video,func:"videoShow"},file:{title:lang.file,func:"fileShow"},table:{title:lang.table,func:"show",dropdown:{insert_table:{title:lang.insert_table,func:"tableShow"},separator_drop1:{name:"separator"},insert_row_above:{title:lang.insert_row_above,func:"tableAddRowAbove"},insert_row_below:{title:lang.insert_row_below,func:"tableAddRowBelow"},insert_column_left:{title:lang.insert_column_left,func:"tableAddColumnLeft"},insert_column_right:{title:lang.insert_column_right,func:"tableAddColumnRight"},separator_drop2:{name:"separator"},add_head:{title:lang.add_head,func:"tableAddHead"},delete_head:{title:lang.delete_head,func:"tableDeleteHead"},separator_drop3:{name:"separator"},delete_column:{title:lang.delete_column,func:"tableDeleteColumn"},delete_row:{title:lang.delete_row,func:"tableDeleteRow"},delete_table:{title:lang.delete_table,func:"tableDeleteTable"}}},link:{title:lang.link,func:"show",dropdown:{link:{title:lang.link_insert,func:"linkShow"},unlink:{title:lang.unlink,exec:"unlink"}}},alignment:{title:lang.alignment,func:"show",dropdown:{alignleft:{title:lang.align_left,func:"alignmentLeft"},aligncenter:{title:lang.align_center,func:"alignmentCenter"},alignright:{title:lang.align_right,func:"alignmentRight"},justify:{title:lang.align_justify,func:"alignmentJustify"}}},alignleft:{title:lang.align_left,func:"alignmentLeft"},aligncenter:{title:lang.align_center,func:"alignmentCenter"},alignright:{title:lang.align_right,func:"alignmentRight"},alignjustify:{title:lang.align_justify,func:"alignmentJustify"},horizontalrule:{exec:"inserthorizontalrule",title:lang.horizontalrule}}},callback:function(type,event,data){var callback=this.opts[type+"Callback"];if($.isFunction(callback)){if(event===false){return callback.call(this,data)}else{return callback.call(this,event,data)}}else{return data}},destroy:function(){clearInterval(this.autosaveInterval);$(window).off(".redactor");this.$source.off("redactor-textarea");this.$element.off(".redactor").removeData("redactor");var html=this.get();if(this.opts.textareamode){this.$box.after(this.$source);this.$box.remove();this.$source.val(html).show()}else{var $elem=this.$editor;if(this.opts.iframe){$elem=this.$element}this.$box.after($elem);this.$box.remove();$elem.removeClass("redactor_editor").removeClass("redactor_editor_wym").removeAttr("contenteditable").html(html).show()}if(this.opts.toolbarExternal){$(this.opts.toolbarExternal).html("")}if(this.opts.air){$("#redactor_air_"+this.uuid).remove()}},getObject:function(){return $.extend({},this)},getEditor:function(){return this.$editor},getBox:function(){return this.$box},getIframe:function(){return(this.opts.iframe)?this.$frame:false},getToolbar:function(){return(this.$toolbar)?this.$toolbar:false},get:function(){return this.$source.val()},getCodeIframe:function(){this.$editor.removeAttr("contenteditable").removeAttr("dir");var html=this.outerHtml(this.$frame.contents().children());this.$editor.attr({contenteditable:true,dir:this.opts.direction});return html},set:function(html,strip,placeholderRemove){html=html.toString();html=html.replace(/\$/g,"$");if(this.opts.fullpage){this.setCodeIframe(html)}else{this.setEditor(html,strip)}if(html==""){placeholderRemove=false}if(placeholderRemove!==false){this.placeholderRemoveFromEditor()}},setEditor:function(html,strip){if(strip!==false){html=this.cleanSavePreCode(html);html=this.cleanStripTags(html);html=this.cleanConvertProtected(html);html=this.cleanConvertInlineTags(html,true);if(this.opts.linebreaks===false){html=this.cleanConverters(html)}else{html=html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi,"$2<br>")}}html=html.replace(/$/g,"$");html=this.cleanEmpty(html);this.$editor.html(html);this.setNonEditable();this.setSpansVerified();this.sync()},setCodeIframe:function(html){var doc=this.iframePage();this.$frame[0].src="about:blank";html=this.cleanConvertProtected(html);html=this.cleanConvertInlineTags(html);html=this.cleanRemoveSpaces(html);doc.open();doc.write(html);doc.close();if(this.opts.fullpage){this.$editor=this.$frame.contents().find("body").attr({contenteditable:true,dir:this.opts.direction})}this.setNonEditable();this.setSpansVerified();this.sync()},setFullpageOnInit:function(html){this.fullpageDoctype=html.match(/^<\!doctype[^>]*>/i);if(this.fullpageDoctype&&this.fullpageDoctype.length==1){html=html.replace(/^<\!doctype[^>]*>/i,"")}html=this.cleanSavePreCode(html,true);html=this.cleanConverters(html);html=this.cleanEmpty(html);this.$editor.html(html);this.setNonEditable();this.setSpansVerified();this.sync()},setFullpageDoctype:function(){if(this.fullpageDoctype&&this.fullpageDoctype.length==1){var source=this.fullpageDoctype[0]+"\n"+this.$source.val();this.$source.val(source)}},setSpansVerified:function(){var spans=this.$editor.find("span");var replacementTag="inline";$.each(spans,function(){var outer=this.outerHTML;var regex=new RegExp("<"+this.tagName,"gi");var newTag=outer.replace(regex,"<"+replacementTag);regex=new RegExp("</"+this.tagName,"gi");newTag=newTag.replace(regex,"</"+replacementTag);$(this).replaceWith(newTag)})},setSpansVerifiedHtml:function(html){html=html.replace(/<span(.*?)>/,"<inline$1>");return html.replace(/<\/span>/,"</inline>")},setNonEditable:function(){this.$editor.find(".noneditable").attr("contenteditable",false)},sync:function(e){var html="";this.cleanUnverified();if(this.opts.fullpage){html=this.getCodeIframe()}else{html=this.$editor.html()}html=this.syncClean(html);html=this.cleanRemoveEmptyTags(html);var source=this.cleanRemoveSpaces(this.$source.val(),false);var editor=this.cleanRemoveSpaces(html,false);if(source==editor){return false}html=html.replace(/<\/li><(ul|ol)>([\w\W]*?)<\/(ul|ol)>/gi,"<$1>$2</$1></li>");if($.trim(html)==="<br>"){html=""}if(this.opts.xhtml){var xhtmlTags=["br","hr","img","link","input","meta"];$.each(xhtmlTags,function(i,s){html=html.replace(new RegExp("<"+s+"(.*?[^/$]?)>","gi"),"<"+s+"$1 />")})}html=this.callback("syncBefore",false,html);this.$source.val(html);this.setFullpageDoctype();this.callback("syncAfter",false,html);if(this.start===false){if(typeof e!="undefined"){switch(e.which){case 37:break;case 38:break;case 39:break;case 40:break;default:this.callback("change",false,html)}}else{this.callback("change",false,html)}}},syncClean:function(html){if(!this.opts.fullpage){html=this.cleanStripTags(html)}html=$.trim(html);html=this.placeholderRemoveFromCode(html);html=html.replace(//gi,"");html=html.replace(//gi,"");html=html.replace(/<\/a> /gi,"</a> ");html=html.replace(/\u200B/g,"");if(html=="<p></p>"||html=="<p> </p>"||html=="<p> </p>"){html=""}if(this.opts.linkNofollow){html=html.replace(/<a(.*?)rel="nofollow"(.*?)>/gi,"<a$1$2>");html=html.replace(/<a(.*?)>/gi,'<a$1 rel="nofollow">')}html=html.replace("<!--?php","<?php");html=html.replace("?-->","?>");html=html.replace(/<(.*?)class="noeditable"(.*?) contenteditable="false"(.*?)>/gi,'<$1class="noeditable"$2$3>');html=html.replace(/ data-tagblock=""/gi,"");html=html.replace(/<br\s?\/?>\n?<\/(P|H[1-6]|LI|ADDRESS|SECTION|HEADER|FOOTER|ASIDE|ARTICLE)>/gi,"</$1>");html=html.replace(/<span(.*?)id="redactor-image-box"(.*?)>([\w\W]*?)<img(.*?)><\/span>/gi,"$3<img$4>");html=html.replace(/<span(.*?)id="redactor-image-resizer"(.*?)>(.*?)<\/span>/gi,"");html=html.replace(/<span(.*?)id="redactor-image-editter"(.*?)>(.*?)<\/span>/gi,"");html=html.replace(/<(ul|ol)>\s*\t*\n*<\/(ul|ol)>/gi,"");if(this.opts.cleanFontTag){html=html.replace(/<font(.*?)>([\w\W]*?)<\/font>/gi,"$2")}html=html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi,"$2");html=html.replace(/<inline>([\w\W]*?)<\/inline>/gi,"$1");html=html.replace(/<inline>/gi,"<span>");html=html.replace(/<inline /gi,"<span ");html=html.replace(/<\/inline>/gi,"</span>");if(this.opts.removeEmptyTags){html=html.replace(/<span>([\w\W]*?)<\/span>/gi,"$1")}html=html.replace(/<span(.*?)class="redactor_placeholder"(.*?)>([\w\W]*?)<\/span>/gi,"");html=html.replace(/<img(.*?)contenteditable="false"(.*?)>/gi,"<img$1$2>");html=html.replace(/&/gi,"&");html=html.replace(/\u2122/gi,"™");html=html.replace(/\u00a9/gi,"©");html=html.replace(/\u2026/gi,"…");html=html.replace(/\u2014/gi,"—");html=html.replace(/\u2010/gi,"‐");html=this.cleanReConvertProtected(html);return html},buildStart:function(){this.content="";this.$box=$('<div class="redactor_box" />');if(this.$source[0].tagName==="TEXTAREA"){this.opts.textareamode=true}if(this.opts.mobile===false&&this.isMobile()){this.buildMobile()}else{this.buildContent();if(this.opts.iframe){this.opts.autoresize=false;this.iframeStart()}else{if(this.opts.textareamode){this.buildFromTextarea()}else{this.buildFromElement()}}if(!this.opts.iframe){this.buildOptions();this.buildAfter()}}},buildMobile:function(){if(!this.opts.textareamode){this.$editor=this.$source;this.$editor.hide();this.$source=this.buildCodearea(this.$editor);this.$source.val(this.content)}this.$box.insertAfter(this.$source).append(this.$source)},buildContent:function(){if(this.opts.textareamode){this.content=$.trim(this.$source.val())}else{this.content=$.trim(this.$source.html())}},buildFromTextarea:function(){this.$editor=$("<div />");this.$box.insertAfter(this.$source).append(this.$editor).append(this.$source);this.buildAddClasses(this.$editor);this.buildEnable()},buildFromElement:function(){this.$editor=this.$source;this.$source=this.buildCodearea(this.$editor);this.$box.insertAfter(this.$editor).append(this.$editor).append(this.$source);this.buildEnable()},buildCodearea:function($source){return $("<textarea />").attr("name",$source.attr("id")).css("height",this.sourceHeight)},buildAddClasses:function(el){$.each(this.$source.get(0).className.split(/\s+/),function(i,s){el.addClass("redactor_"+s)})},buildEnable:function(){this.$editor.addClass("redactor_editor").attr({contenteditable:true,dir:this.opts.direction});this.$source.attr("dir",this.opts.direction).hide();this.set(this.content,true,false)},buildOptions:function(){var $source=this.$editor;if(this.opts.iframe){$source=this.$frame}if(this.opts.tabindex){$source.attr("tabindex",this.opts.tabindex)}if(this.opts.minHeight){$source.css("min-height",this.opts.minHeight+"px")}else{if(this.browser("mozilla")&&this.opts.linebreaks){this.$editor.css("min-height","45px")}}if(this.browser("mozilla")&&this.opts.linebreaks){this.$editor.css("padding-bottom","10px")}if(this.opts.maxHeight){this.opts.autoresize=false;this.sourceHeight=this.opts.maxHeight}if(this.opts.wym){this.$editor.addClass("redactor_editor_wym")}if(this.opts.typewriter){this.$editor.addClass("redactor-editor-typewriter")}if(!this.opts.autoresize){$source.css("height",this.sourceHeight)}},buildAfter:function(){this.start=false;if(this.opts.toolbar){this.opts.toolbar=this.toolbarInit(this.opts.curLang);this.toolbarBuild()}this.modalTemplatesInit();this.buildPlugins();this.buildBindKeyboard();if(this.opts.autosave){this.autosave()}setTimeout($.proxy(this.observeStart,this),4);if(this.browser("mozilla")){try{this.document.execCommand("enableObjectResizing",false,false);this.document.execCommand("enableInlineTableEditing",false,false)}catch(e){}}if(this.opts.focus){setTimeout($.proxy(this.focus,this),100)}if(!this.opts.visual){setTimeout($.proxy(function(){this.opts.visual=true;this.toggle(false)},this),200)}this.callback("init")},buildBindKeyboard:function(){this.dblEnter=0;if(this.opts.dragUpload&&(this.opts.imageUpload!==false||this.opts.s3!==false)){this.$editor.on("drop.redactor",$.proxy(this.buildEventDrop,this))}this.$editor.on("click.redactor",$.proxy(function(){this.selectall=false},this));this.$editor.on("input.redactor",$.proxy(this.sync,this));this.$editor.on("paste.redactor",$.proxy(this.buildEventPaste,this));this.$editor.on("keydown.redactor",$.proxy(this.buildEventKeydown,this));this.$editor.on("keyup.redactor",$.proxy(this.buildEventKeyup,this));if($.isFunction(this.opts.textareaKeydownCallback)){this.$source.on("keydown.redactor-textarea",$.proxy(this.opts.textareaKeydownCallback,this))}if($.isFunction(this.opts.focusCallback)){this.$editor.on("focus.redactor",$.proxy(this.opts.focusCallback,this))}var clickedElement;$(document).mousedown(function(e){clickedElement=$(e.target)});this.$editor.on("blur.redactor",$.proxy(function(e){if(!$(clickedElement).hasClass("redactor_toolbar")&&$(clickedElement).parents(".redactor_toolbar").size()==0){this.selectall=false;if($.isFunction(this.opts.blurCallback)){this.callback("blur",e)}}},this))},buildEventDrop:function(e){e=e.originalEvent||e;if(window.FormData===undefined||!e.dataTransfer){return true}var length=e.dataTransfer.files.length;if(length==0){return true}e.preventDefault();var file=e.dataTransfer.files[0];if(this.opts.dnbImageTypes!==false&&this.opts.dnbImageTypes.indexOf(file.type)==-1){return true}this.bufferSet();this.showProgressBar();if(this.opts.s3===false){this.dragUploadAjax(this.opts.imageUpload,file,true,e,this.opts.imageUploadParam)}else{this.s3uploadFile(file)}},buildEventPaste:function(e){var oldsafari=false;if(this.browser("webkit")&&navigator.userAgent.indexOf("Chrome")===-1){var arr=this.browser("version").split(".");if(arr[0]<536){oldsafari=true}}if(oldsafari){return true}if(this.browser("opera")){return true}if(this.opts.clipboardUpload&&this.buildEventClipboardUpload(e)){return true}if(this.opts.cleanup){this.rtePaste=true;this.selectionSave();if(!this.selectall){if(this.opts.autoresize===true&&this.fullscreen!==true){this.$editor.height(this.$editor.height());this.saveScroll=this.document.body.scrollTop}else{this.saveScroll=this.$editor.scrollTop()}}var frag=this.extractContent();setTimeout($.proxy(function(){var pastedFrag=this.extractContent();this.$editor.append(frag);this.selectionRestore();var html=this.getFragmentHtml(pastedFrag);this.pasteClean(html);if(this.opts.autoresize===true&&this.fullscreen!==true){this.$editor.css("height","auto")}},this),1)}},buildEventClipboardUpload:function(e){var event=e.originalEvent||e;this.clipboardFilePaste=false;if(typeof(event.clipboardData)==="undefined"){return false}if(event.clipboardData.items){var file=event.clipboardData.items[0].getAsFile();if(file!==null){this.bufferSet();this.clipboardFilePaste=true;var reader=new FileReader();reader.onload=$.proxy(this.pasteClipboardUpload,this);reader.readAsDataURL(file);return true}}return false},buildEventKeydown:function(e){if(this.rtePaste){return false}var key=e.which;var ctrl=e.ctrlKey||e.metaKey;var parent=this.getParent();var current=this.getCurrent();var block=this.getBlock();var pre=false;this.callback("keydown",e);if(this.browser("mozilla")&&"modify" in window.getSelection()){if((ctrl)&&(e.keyCode===37||e.keyCode===39)){var selection=this.getSelection();var lineOrWord=(e.metaKey?"line":"word");if(e.keyCode===37){selection.modify("extend","left",lineOrWord);if(!e.shiftKey){selection.collapseToStart()}}if(e.keyCode===39){selection.modify("extend","right",lineOrWord);if(!e.shiftKey){selection.collapseToEnd()}}e.preventDefault()}}this.imageResizeHide(false);if((parent&&$(parent).get(0).tagName==="PRE")||(current&&$(current).get(0).tagName==="PRE")){pre=true;if(key===this.keyCode.DOWN){this.insertAfterLastElement(block)}}if(key===this.keyCode.DOWN){if(parent&&$(parent)[0].tagName==="BLOCKQUOTE"){this.insertAfterLastElement(parent)}if(current&&$(current)[0].tagName==="BLOCKQUOTE"){this.insertAfterLastElement(current)}if(parent&&$(parent)[0].tagName==="P"&&$(parent).parent()[0].tagName=="BLOCKQUOTE"){this.insertAfterLastElement(parent,$(parent).parent()[0])}if(current&&$(current)[0].tagName==="P"&&parent&&$(parent)[0].tagName=="BLOCKQUOTE"){this.insertAfterLastElement(current,parent)}}this.shortcuts(e,key);if(ctrl&&key===90&&!e.shiftKey&&!e.altKey){e.preventDefault();if(this.opts.buffer.length){this.bufferUndo()}else{this.document.execCommand("undo",false,false)}return}else{if(ctrl&&key===90&&e.shiftKey&&!e.altKey){e.preventDefault();if(this.opts.rebuffer.length!=0){this.bufferRedo()}else{this.document.execCommand("redo",false,false)}return}}if(key==32){this.bufferSet()}if(ctrl&&key===65){this.bufferSet();this.selectall=true}else{if(key!=this.keyCode.LEFT_WIN&&!ctrl){this.selectall=false}}if(key==this.keyCode.ENTER&&!e.shiftKey&&!e.ctrlKey&&!e.metaKey){var range=this.getRange();if(range&&range.collapsed===false){sel=this.getSelection();if(sel.rangeCount){range.deleteContents()}}if(this.browser("msie")&&(parent.nodeType==1&&(parent.tagName=="TD"||parent.tagName=="TH"))){e.preventDefault();this.bufferSet();this.insertNode(document.createElement("br"));this.callback("enter",e);return false}if(block&&(block.tagName=="BLOCKQUOTE"||$(block).parent()[0].tagName=="BLOCKQUOTE")){if(this.isEndOfElement()){if(this.dblEnter==1){var element;var last;if(block.tagName=="BLOCKQUOTE"){last="br";element=block}else{last="p";element=$(block).parent()[0]}e.preventDefault();this.insertingAfterLastElement(element);this.dblEnter=0;if(last=="p"){$(block).parent().find("p").last().remove()}else{var tmp=$.trim($(block).html());$(block).html(tmp.replace(/<br\s?\/?>$/i,""))}return}else{this.dblEnter++}}else{this.dblEnter++}}if(pre===true){return this.buildEventKeydownPre(e,current)}else{if(!this.opts.linebreaks){if(block&&block.tagName=="LI"){var listCurrent=this.getBlock();if(listCurrent!==false||listCurrent.tagName==="LI"){var listText=$.trim($(block).text());var listCurrentText=$.trim($(listCurrent).text());if(listText==""&&listCurrentText==""&&$(listCurrent).next("li").size()==0&&$(listCurrent).parents("li").size()==0){this.bufferSet();var $list=$(listCurrent).closest("ol, ul");$(listCurrent).remove();var node=$("<p>"+this.opts.invisibleSpace+"</p>");$list.after(node);this.selectionStart(node);this.sync();this.callback("enter",e);return false}}}if(block&&this.opts.rBlockTest.test(block.tagName)){this.bufferSet();setTimeout($.proxy(function(){var blockElem=this.getBlock();if(blockElem.tagName==="DIV"&&!$(blockElem).hasClass("redactor_editor")){var node=$("<p>"+this.opts.invisibleSpace+"</p>");$(blockElem).replaceWith(node);this.selectionStart(node)}},this),1)}else{if(block===false){this.bufferSet();var node=$("<p>"+this.opts.invisibleSpace+"</p>");this.insertNode(node[0]);this.selectionStart(node);this.callback("enter",e);return false}}}if(this.opts.linebreaks){if(block&&this.opts.rBlockTest.test(block.tagName)){this.bufferSet();setTimeout($.proxy(function(){var blockElem=this.getBlock();if((blockElem.tagName==="DIV"||blockElem.tagName==="P")&&!$(blockElem).hasClass("redactor_editor")){this.replaceLineBreak(blockElem)}},this),1)}else{return this.buildEventKeydownInsertLineBreak(e)}}if(block.tagName=="BLOCKQUOTE"||block.tagName=="FIGCAPTION"){return this.buildEventKeydownInsertLineBreak(e)}}this.callback("enter",e)}else{if(key===this.keyCode.ENTER&&(e.ctrlKey||e.shiftKey)){this.bufferSet();e.preventDefault();this.insertLineBreak()}}if((key===this.keyCode.TAB||e.metaKey&&key===219)&&this.opts.shortcuts){return this.buildEventKeydownTab(e,pre,key)}if(key===this.keyCode.BACKSPACE){this.buildEventKeydownBackspace(e,current,parent)}},buildEventKeydownPre:function(e,current){e.preventDefault();this.bufferSet();var html=$(current).parent().text();this.insertNode(document.createTextNode("\n"));if(html.search(/\s$/)==-1){this.insertNode(document.createTextNode("\n"))}this.sync();this.callback("enter",e);return false},buildEventKeydownTab:function(e,pre,key){if(!this.opts.tabFocus){return true}if(this.isEmpty(this.get())&&this.opts.tabSpaces===false){return true}e.preventDefault();if(pre===true&&!e.shiftKey){this.bufferSet();this.insertNode(document.createTextNode("\t"));this.sync();return false}else{if(this.opts.tabSpaces!==false){this.bufferSet();this.insertNode(document.createTextNode(Array(this.opts.tabSpaces+1).join("\u00a0")));this.sync();return false}else{if(!e.shiftKey){this.indentingIndent()}else{this.indentingOutdent()}}}return false},buildEventKeydownBackspace:function(e,current,parent){if(parent&¤t&&parent.parentNode.tagName=="TD"&&parent.tagName=="UL"&¤t.tagName=="LI"&&$(parent).children("li").size()==1){var text=$(current).text().replace(/[\u200B-\u200D\uFEFF]/g,"");if(text==""){var node=parent.parentNode;$(parent).remove();this.selectionStart(node);this.sync();return false}}if(typeof current.tagName!=="undefined"&&/^(H[1-6])$/i.test(current.tagName)){var node;if(this.opts.linebreaks===false){node=$("<p>"+this.opts.invisibleSpace+"</p>")}else{node=$("<br>"+this.opts.invisibleSpace)}$(current).replaceWith(node);this.selectionStart(node);this.sync()}if(typeof current.nodeValue!=="undefined"&¤t.nodeValue!==null){if(current.remove&¤t.nodeType===3&¤t.nodeValue.match(/[^\u200B]/g)==null){$(current).prev().remove();this.sync()}}},buildEventKeydownInsertLineBreak:function(e){this.bufferSet();e.preventDefault();this.insertLineBreak();this.callback("enter",e);return},buildEventKeyup:function(e){if(this.rtePaste){return false}var key=e.which;var parent=this.getParent();var current=this.getCurrent();if(!this.opts.linebreaks&¤t.nodeType==3&&(parent==false||parent.tagName=="BODY")){var node=$("<p>").append($(current).clone());$(current).replaceWith(node);var next=$(node).next();if(typeof(next[0])!=="undefined"&&next[0].tagName=="BR"){next.remove()}this.selectionEnd(node)}if((this.opts.convertLinks||this.opts.convertImageLinks||this.opts.convertVideoLinks)&&key===this.keyCode.ENTER){this.buildEventKeyupConverters()}if(key===this.keyCode.DELETE||key===this.keyCode.BACKSPACE){return this.formatEmpty(e)}this.callback("keyup",e);this.sync(e)},buildEventKeyupConverters:function(){this.formatLinkify(this.opts.linkProtocol,this.opts.convertLinks,this.opts.convertImageLinks,this.opts.convertVideoLinks,this.opts.linkSize);setTimeout($.proxy(function(){if(this.opts.convertImageLinks){this.observeImages()}if(this.opts.observeLinks){this.observeLinks()}},this),5)},buildPlugins:function(){if(!this.opts.plugins){return}$.each(this.opts.plugins,$.proxy(function(i,s){if(RedactorPlugins[s]){$.extend(this,RedactorPlugins[s]);if($.isFunction(RedactorPlugins[s].init)){this.init()}}},this))},iframeStart:function(){this.iframeCreate();if(this.opts.textareamode){this.iframeAppend(this.$source)}else{this.$sourceOld=this.$source.hide();this.$source=this.buildCodearea(this.$sourceOld);this.iframeAppend(this.$sourceOld)}},iframeAppend:function(el){this.$source.attr("dir",this.opts.direction).hide();this.$box.insertAfter(el).append(this.$frame).append(this.$source)},iframeCreate:function(){this.$frame=$('<iframe style="width: 100%;" frameborder="0" />').one("load",$.proxy(function(){if(this.opts.fullpage){this.iframePage();if(this.content===""){this.content=this.opts.invisibleSpace}this.$frame.contents()[0].write(this.content);this.$frame.contents()[0].close();var timer=setInterval($.proxy(function(){if(this.$frame.contents().find("body").html()){clearInterval(timer);this.iframeLoad()}},this),0)}else{this.iframeLoad()}},this))},iframeDoc:function(){return this.$frame[0].contentWindow.document},iframePage:function(){var doc=this.iframeDoc();if(doc.documentElement){doc.removeChild(doc.documentElement)}return doc},iframeAddCss:function(css){css=css||this.opts.css;if(this.isString(css)){this.$frame.contents().find("head").append('<link rel="stylesheet" href="'+css+'" />')}if($.isArray(css)){$.each(css,$.proxy(function(i,url){this.iframeAddCss(url)},this))}},iframeLoad:function(){this.$editor=this.$frame.contents().find("body").attr({contenteditable:true,dir:this.opts.direction});if(this.$editor[0]){this.document=this.$editor[0].ownerDocument;this.window=this.document.defaultView||window}this.iframeAddCss();if(this.opts.fullpage){this.setFullpageOnInit(this.$source.val())}else{this.set(this.content,true,false)}this.buildOptions();this.buildAfter()},placeholderInit:function(){if(this.opts.placeholder!==false){this.placeholderText=this.opts.placeholder;this.opts.placeholder=true}else{if(typeof this.$element.attr("placeholder")=="undefined"||this.$element.attr("placeholder")==""){this.opts.placeholder=false}else{this.placeholderText=this.$element.attr("placeholder");this.opts.placeholder=true}}},placeholderStart:function(html){if(this.opts.placeholder===false){return false}if(this.isEmpty(html)){this.opts.focus=false;this.placeholderOnFocus();this.placeholderOnBlur();return this.placeholderGet()}else{this.placeholderOnBlur()}return false},placeholderOnFocus:function(){this.$editor.on("focus.redactor_placeholder",$.proxy(this.placeholderFocus,this))},placeholderOnBlur:function(){this.$editor.on("blur.redactor_placeholder",$.proxy(this.placeholderBlur,this))},placeholderGet:function(){var ph=$('<span class="redactor_placeholder">').data("redactor","verified").attr("contenteditable",false).text(this.placeholderText);if(this.opts.linebreaks===false){return $("<p>").append(ph)}else{return ph}},placeholderBlur:function(){var html=this.get();if(this.isEmpty(html)){this.placeholderOnFocus();this.$editor.html(this.placeholderGet())}},placeholderFocus:function(){this.$editor.find("span.redactor_placeholder").remove();var html="";if(this.opts.linebreaks===false){html=this.opts.emptyHtml}this.$editor.off("focus.redactor_placeholder");this.$editor.html(html);if(this.opts.linebreaks===false){this.selectionStart(this.$editor.children()[0])}else{this.focus()}this.sync()},placeholderRemoveFromEditor:function(){this.$editor.find("span.redactor_placeholder").remove();this.$editor.off("focus.redactor_placeholder")},placeholderRemoveFromCode:function(html){return html.replace(/<span class="redactor_placeholder"(.*?)>(.*?)<\/span>/i,"")},shortcuts:function(e,key){if(!this.opts.shortcuts){if((e.ctrlKey||e.metaKey)&&(key===66||key===73)){e.preventDefault()}return false}$.each(this.opts.shortcuts,$.proxy(function(str,command){var keys=str.split(",");for(var i in keys){if(typeof keys[i]==="string"){this.shortcutsHandler(e,$.trim(keys[i]),$.proxy(function(){eval(command)},this))}}},this))},shortcutsHandler:function(e,keys,origHandler){var hotkeysSpecialKeys={8:"backspace",9:"tab",10:"return",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"};var hotkeysShiftNums={"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"};keys=keys.toLowerCase().split(" ");var special=hotkeysSpecialKeys[e.keyCode],character=String.fromCharCode(e.which).toLowerCase(),modif="",possible={};$.each(["alt","ctrl","meta","shift"],function(index,specialKey){if(e[specialKey+"Key"]&&special!==specialKey){modif+=specialKey+"+"}});if(special){possible[modif+special]=true}if(character){possible[modif+character]=true;possible[modif+hotkeysShiftNums[character]]=true;if(modif==="shift+"){possible[hotkeysShiftNums[character]]=true}}for(var i=0,l=keys.length;i<l;i++){if(possible[keys[i]]){e.preventDefault();return origHandler.apply(this,arguments)}}},focus:function(){if(!this.browser("opera")){this.window.setTimeout($.proxy(this.focusSet,this,true),1)}else{this.$editor.focus()}},focusWithSaveScroll:function(){if(this.browser("msie")){var top=this.document.documentElement.scrollTop}this.$editor.focus();if(this.browser("msie")){this.document.documentElement.scrollTop=top}},focusEnd:function(){if(!this.browser("mozilla")){this.focusSet()}else{if(this.opts.linebreaks===false){var last=this.$editor.children().last();this.$editor.focus();this.selectionEnd(last)}else{this.focusSet()}}},focusSet:function(collapse,element){this.$editor.focus();if(typeof element=="undefined"){element=this.$editor[0]}var range=this.getRange();range.selectNodeContents(element);range.collapse(collapse||false);var sel=this.getSelection();sel.removeAllRanges();sel.addRange(range)},toggle:function(direct){if(this.opts.visual){this.toggleCode(direct)}else{this.toggleVisual()}},toggleVisual:function(){var html=this.$source.hide().val();if(typeof this.modified!=="undefined"){var modified=this.modified.replace(/\n/g,"");var thtml=html.replace(/\n/g,"");thtml=this.cleanRemoveSpaces(thtml,false);this.modified=this.cleanRemoveSpaces(modified,false)!==thtml}if(this.modified){if(this.opts.fullpage&&html===""){this.setFullpageOnInit(html)}else{this.set(html);if(this.opts.fullpage){this.buildBindKeyboard()}}this.callback("change",false,html)}if(this.opts.iframe){this.$frame.show()}else{this.$editor.show()}if(this.opts.fullpage){this.$editor.attr("contenteditable",true)}this.$source.off("keydown.redactor-textarea-indenting");this.$editor.focus();this.selectionRestore();this.observeStart();this.buttonActiveVisual();this.buttonInactive("html");this.opts.visual=true},toggleCode:function(direct){if(direct!==false){this.selectionSave()}var height=null;if(this.opts.iframe){height=this.$frame.height();if(this.opts.fullpage){this.$editor.removeAttr("contenteditable")}this.$frame.hide()}else{height=this.$editor.innerHeight();this.$editor.hide()}var html=this.$source.val();if(html!==""&&this.opts.tidyHtml){this.$source.val(this.cleanHtml(html))}this.modified=html;this.$source.height(height).show().focus();this.$source.on("keydown.redactor-textarea-indenting",this.textareaIndenting);this.buttonInactiveVisual();this.buttonActive("html");this.opts.visual=false},textareaIndenting:function(e){if(e.keyCode===9){var $el=$(this);var start=$el.get(0).selectionStart;$el.val($el.val().substring(0,start)+"\t"+$el.val().substring($el.get(0).selectionEnd));$el.get(0).selectionStart=$el.get(0).selectionEnd=start+1;return false}},autosave:function(){var savedHtml=false;this.autosaveInterval=setInterval($.proxy(function(){var html=this.get();if(savedHtml!==html){var name=this.$source.attr("name");$.ajax({url:this.opts.autosave,type:"post",data:"name="+name+"&"+name+"="+escape(encodeURIComponent(html)),success:$.proxy(function(data){var json=$.parseJSON(data);if(typeof json.error=="undefined"){this.callback("autosave",false,json)}else{this.callback("autosaveError",false,json)}savedHtml=html},this)})}},this),this.opts.autosaveInterval*1000)},toolbarBuild:function(){if(this.isMobile()&&this.opts.buttonsHideOnMobile.length>0){$.each(this.opts.buttonsHideOnMobile,$.proxy(function(i,s){var index=this.opts.buttons.indexOf(s);this.opts.buttons.splice(index,1)},this))}if(this.opts.air){this.opts.buttons=this.opts.airButtons}else{if(!this.opts.buttonSource){var index=this.opts.buttons.indexOf("html");this.opts.buttons.splice(index,1)}}if(this.opts.toolbar){$.each(this.opts.toolbar.formatting.dropdown,$.proxy(function(i,s){if($.inArray(i,this.opts.formattingTags)=="-1"){delete this.opts.toolbar.formatting.dropdown[i]}},this))}if(this.opts.buttons.length===0){return false}this.airEnable();this.$toolbar=$("<ul>").addClass("redactor_toolbar").attr("id","redactor_toolbar_"+this.uuid);if(this.opts.typewriter){this.$toolbar.addClass("redactor-toolbar-typewriter")}if(this.opts.toolbarOverflow&&this.isMobile()){this.$toolbar.addClass("redactor-toolbar-overflow")}if(this.opts.air){this.$air=$('<div class="redactor_air">').attr("id","redactor_air_"+this.uuid).hide();this.$air.append(this.$toolbar);$("body").append(this.$air)}else{if(this.opts.toolbarExternal){this.$toolbar.addClass("redactor-toolbar-external");$(this.opts.toolbarExternal).html(this.$toolbar)}else{this.$box.prepend(this.$toolbar)}}$.each(this.opts.buttons,$.proxy(function(i,btnName){if(this.opts.toolbar[btnName]){var btnObject=this.opts.toolbar[btnName];if(this.opts.fileUpload===false&&btnName==="file"){return true}this.$toolbar.append($("<li>").append(this.buttonBuild(btnName,btnObject)))}},this));this.$toolbar.find("a").attr("tabindex","-1");if(this.opts.toolbarFixed){this.toolbarObserveScroll();$(this.opts.toolbarFixedTarget).on("scroll.redactor",$.proxy(this.toolbarObserveScroll,this))}if(this.opts.activeButtons){this.$editor.on("mouseup.redactor keyup.redactor",$.proxy(this.buttonActiveObserver,this))}},toolbarObserveScroll:function(){var scrollTop=$(this.opts.toolbarFixedTarget).scrollTop();var boxTop=0;var left=0;var end=0;if(this.opts.toolbarFixedTarget===document){boxTop=this.$box.offset().top}else{boxTop=1}end=boxTop+this.$box.height()+40;if(scrollTop>boxTop){var width="100%";if(this.opts.toolbarFixedBox){left=this.$box.offset().left;width=this.$box.innerWidth();this.$toolbar.addClass("toolbar_fixed_box")}this.toolbarFixed=true;if(this.opts.toolbarFixedTarget===document){this.$toolbar.css({position:"fixed",width:width,zIndex:10005,top:this.opts.toolbarFixedTopOffset+"px",left:left})}else{this.$toolbar.css({position:"absolute",width:width,zIndex:10005,top:(this.opts.toolbarFixedTopOffset+scrollTop)+"px",left:0})}if(scrollTop<end){this.$toolbar.css("visibility","visible")}else{this.$toolbar.css("visibility","hidden")}}else{this.toolbarFixed=false;this.$toolbar.css({position:"relative",width:"auto",top:0,left:left});if(this.opts.toolbarFixedBox){this.$toolbar.removeClass("toolbar_fixed_box")}}},airEnable:function(){if(!this.opts.air){return}this.$editor.on("mouseup.redactor keyup.redactor",this,$.proxy(function(e){var text=this.getSelectionText();if(e.type==="mouseup"&&text!=""){this.airShow(e)}if(e.type==="keyup"&&e.shiftKey&&text!=""){var $focusElem=$(this.getElement(this.getSelection().focusNode)),offset=$focusElem.offset();offset.height=$focusElem.height();this.airShow(offset,true)}},this))},airShow:function(e,keyboard){if(!this.opts.air){return}this.selectionSave();var left,top;$(".redactor_air").hide();if(keyboard){left=e.left;top=e.top+e.height+14;if(this.opts.iframe){top+=this.$box.position().top-$(this.document).scrollTop();left+=this.$box.position().left}}else{var width=this.$air.innerWidth();left=e.clientX;if($(this.document).width()<(left+width)){left-=width}top=e.clientY+14;if(this.opts.iframe){top+=this.$box.position().top;left+=this.$box.position().left}else{top+=$(this.document).scrollTop()}}this.$air.css({left:left+"px",top:top+"px"}).show();this.airBindHide()},airBindHide:function(){if(!this.opts.air){return}var hideHandler=$.proxy(function(doc){$(doc).on("mousedown.redactor",$.proxy(function(e){if($(e.target).closest(this.$toolbar).length===0){this.$air.fadeOut(100);this.selectionRemove();$(doc).off(e)}},this)).on("keydown.redactor",$.proxy(function(e){if(e.which===this.keyCode.ESC){this.getSelection().collapseToStart()}this.$air.fadeOut(100);$(doc).off(e)},this))},this);hideHandler(document);if(this.opts.iframe){hideHandler(this.document)}},airBindMousemoveHide:function(){if(!this.opts.air){return}var hideHandler=$.proxy(function(doc){$(doc).on("mousemove.redactor",$.proxy(function(e){if($(e.target).closest(this.$toolbar).length===0){this.$air.fadeOut(100);$(doc).off(e)}},this))},this);hideHandler(document);if(this.opts.iframe){hideHandler(this.document)}},dropdownBuild:function($dropdown,dropdownObject){$.each(dropdownObject,$.proxy(function(btnName,btnObject){if(!btnObject.className){btnObject.className=""}var $item;if(btnObject.name==="separator"){$item=$('<a class="redactor_separator_drop">')}else{$item=$('<a href="#" class="'+btnObject.className+" redactor_dropdown_"+btnName+'">'+btnObject.title+"</a>");$item.on("click",$.proxy(function(e){if(this.opts.air){this.selectionRestore()}if(e.preventDefault){e.preventDefault()}if(this.browser("msie")){e.returnValue=false}if(btnObject.callback){btnObject.callback.call(this,btnName,$item,btnObject,e)}if(btnObject.exec){this.execCommand(btnObject.exec,btnName)}if(btnObject.func){this[btnObject.func](btnName)}this.buttonActiveObserver();if(this.opts.air){this.$air.fadeOut(100)}},this))}$dropdown.append($item)},this))},dropdownShow:function(e,key){if(!this.opts.visual){e.preventDefault();return false}var $button=this.buttonGet(key);var $dropdown=$button.data("dropdown").appendTo(document.body);if($button.hasClass("dropact")){this.dropdownHideAll()}else{this.dropdownHideAll();this.callback("dropdownShow",{dropdown:$dropdown,key:key,button:$button});this.buttonActive(key);$button.addClass("dropact");var keyPosition=$button.offset();var dropdownWidth=$dropdown.width();if((keyPosition.left+dropdownWidth)>$(document).width()){keyPosition.left-=dropdownWidth}var left=keyPosition.left+"px";var btnHeight=$button.innerHeight();var position="absolute";var top=(btnHeight+this.opts.toolbarFixedTopOffset)+"px";if(this.opts.toolbarFixed&&this.toolbarFixed){position="fixed"}else{top=keyPosition.top+btnHeight+"px"}$dropdown.css({position:position,left:left,top:top}).show();this.callback("dropdownShown",{dropdown:$dropdown,key:key,button:$button})}var hdlHideDropDown=$.proxy(function(e){this.dropdownHide(e,$dropdown)},this);$(document).one("click",hdlHideDropDown);this.$editor.one("click",hdlHideDropDown);this.$editor.one("touchstart",hdlHideDropDown);e.stopPropagation();this.focusWithSaveScroll()},dropdownHideAll:function(){this.$toolbar.find("a.dropact").removeClass("redactor_act").removeClass("dropact");$(".redactor_dropdown").hide();this.callback("dropdownHide")},dropdownHide:function(e,$dropdown){if(!$(e.target).hasClass("dropact")){$dropdown.removeClass("dropact");this.dropdownHideAll()}},buttonBuild:function(btnName,btnObject,buttonImage){var $button=$('<a href="javascript:;" title="'+btnObject.title+'" tabindex="-1" class="re-icon re-'+btnName+'"></a>');if(typeof buttonImage!="undefined"){$button.addClass("redactor-btn-image")}$button.on("click",$.proxy(function(e){if(e.preventDefault){e.preventDefault()}if(this.browser("msie")){e.returnValue=false}if($button.hasClass("redactor_button_disabled")){return false}if(this.isFocused()===false&&!btnObject.exec){this.focusWithSaveScroll()}if(btnObject.exec){this.focusWithSaveScroll();this.execCommand(btnObject.exec,btnName);this.airBindMousemoveHide()}else{if(btnObject.func&&btnObject.func!=="show"){this[btnObject.func](btnName);this.airBindMousemoveHide()}else{if(btnObject.callback){btnObject.callback.call(this,btnName,$button,btnObject,e);this.airBindMousemoveHide()}else{if(btnObject.dropdown){this.dropdownShow(e,btnName)}}}}this.buttonActiveObserver(false,btnName)},this));if(btnObject.dropdown){var $dropdown=$('<div class="redactor_dropdown redactor_dropdown_box_'+btnName+'" style="display: none;">');$button.data("dropdown",$dropdown);this.dropdownBuild($dropdown,btnObject.dropdown)}return $button},buttonGet:function(key){if(!this.opts.toolbar){return false}return $(this.$toolbar.find("a.re-"+key))},buttonTagToActiveState:function(buttonName,tagName){this.opts.activeButtons.push(buttonName);this.opts.activeButtonsStates[tagName]=buttonName},buttonActiveToggle:function(key){var btn=this.buttonGet(key);if(btn.hasClass("redactor_act")){this.buttonInactive(key)}else{this.buttonActive(key)}},buttonActive:function(key){var btn=this.buttonGet(key);btn.addClass("redactor_act")},buttonInactive:function(key){var btn=this.buttonGet(key);btn.removeClass("redactor_act")},buttonInactiveAll:function(btnName){this.$toolbar.find("a.re-icon").not(".re-"+btnName).removeClass("redactor_act")},buttonActiveVisual:function(){this.$toolbar.find("a.re-icon").not("a.re-html").removeClass("redactor_button_disabled")},buttonInactiveVisual:function(){this.$toolbar.find("a.re-icon").not("a.re-html").addClass("redactor_button_disabled")},buttonChangeIcon:function(key,classname){this.buttonGet(key).addClass("re-"+classname)},buttonRemoveIcon:function(key,classname){this.buttonGet(key).removeClass("re-"+classname)},buttonAwesome:function(key,name){var button=this.buttonGet(key);button.removeClass("redactor-btn-image");button.addClass("fa-redactor-btn");button.html('<i class="fa '+name+'"></i>')},buttonAdd:function(key,title,callback,dropdown){if(!this.opts.toolbar){return}var btn=this.buttonBuild(key,{title:title,callback:callback,dropdown:dropdown},true);this.$toolbar.append($("<li>").append(btn));return btn},buttonAddFirst:function(key,title,callback,dropdown){if(!this.opts.toolbar){return}var btn=this.buttonBuild(key,{title:title,callback:callback,dropdown:dropdown},true);this.$toolbar.prepend($("<li>").append(btn))},buttonAddAfter:function(afterkey,key,title,callback,dropdown){if(!this.opts.toolbar){return}var btn=this.buttonBuild(key,{title:title,callback:callback,dropdown:dropdown},true);var $btn=this.buttonGet(afterkey);if($btn.size()!==0){$btn.parent().after($("<li>").append(btn))}else{this.$toolbar.append($("<li>").append(btn))}return btn},buttonAddBefore:function(beforekey,key,title,callback,dropdown){if(!this.opts.toolbar){return}var btn=this.buttonBuild(key,{title:title,callback:callback,dropdown:dropdown},true);var $btn=this.buttonGet(beforekey);if($btn.size()!==0){$btn.parent().before($("<li>").append(btn))}else{this.$toolbar.append($("<li>").append(btn))}return btn},buttonRemove:function(key){var $btn=this.buttonGet(key);$btn.remove()},buttonActiveObserver:function(e,btnName){var parent=this.getParent();this.buttonInactiveAll(btnName);if(e===false&&btnName!=="html"){if($.inArray(btnName,this.opts.activeButtons)!=-1){this.buttonActiveToggle(btnName)}return}if(parent&&parent.tagName==="A"){this.$toolbar.find("a.redactor_dropdown_link").text(this.opts.curLang.link_edit)}else{this.$toolbar.find("a.redactor_dropdown_link").text(this.opts.curLang.link_insert)}$.each(this.opts.activeButtonsStates,$.proxy(function(key,value){if($(parent).closest(key,this.$editor.get()[0]).length!=0){this.buttonActive(value)}},this));var $parent=$(parent).closest(this.opts.alignmentTags.toString().toLowerCase(),this.$editor[0]);if($parent.length){var align=$parent.css("text-align");if(align==""){align="left"}this.buttonActive("align"+align)}},execPasteFrag:function(html){var sel=this.getSelection();if(sel.getRangeAt&&sel.rangeCount){var range=this.getRange();range.deleteContents();var el=this.document.createElement("div");el.innerHTML=html;var frag=this.document.createDocumentFragment(),node,lastNode;while((node=el.firstChild)){lastNode=frag.appendChild(node)}var firstNode=frag.firstChild;range.insertNode(frag);if(lastNode){range=range.cloneRange();range.setStartAfter(lastNode);range.collapse(true)}sel.removeAllRanges();sel.addRange(range)}},exec:function(cmd,param,sync){if(cmd==="formatblock"&&this.browser("msie")){param="<"+param+">"}if(cmd==="inserthtml"&&this.browser("msie")){if(!this.isIe11()){this.focusWithSaveScroll();this.document.selection.createRange().pasteHTML(param)}else{this.execPasteFrag(param)}}else{this.document.execCommand(cmd,false,param)}if(sync!==false){this.sync()}this.callback("execCommand",cmd,param)},execCommand:function(cmd,param,sync){if(!this.opts.visual){this.$source.focus();return false}if(cmd==="bold"||cmd==="italic"||cmd==="underline"||cmd==="strikethrough"){this.bufferSet()}if(cmd==="superscript"||cmd==="subscript"){var parent=this.getParent();if(parent.tagName==="SUP"||parent.tagName==="SUB"){this.inlineRemoveFormatReplace(parent)}}if(cmd==="inserthtml"){this.insertHtml(param,sync);this.callback("execCommand",cmd,param);return}if(this.currentOrParentIs("PRE")&&!this.opts.formattingPre){return false}if(cmd==="insertunorderedlist"||cmd==="insertorderedlist"){return this.execLists(cmd,param)}if(cmd==="unlink"){return this.execUnlink(cmd,param)}this.exec(cmd,param,sync);if(cmd==="inserthorizontalrule"){this.$editor.find("hr").removeAttr("id")}},execUnlink:function(cmd,param){this.bufferSet();var link=this.currentOrParentIs("A");if(link){$(link).replaceWith($(link).text());this.sync();this.callback("execCommand",cmd,param);return}},execLists:function(cmd,param){this.bufferSet();var parent=this.getParent();var $list=$(parent).closest("ol, ul");if(!this.isParentRedactor($list)&&$list.size()!=0){$list=false}var remove=false;if($list&&$list.length){remove=true;var listTag=$list[0].tagName;if((cmd==="insertunorderedlist"&&listTag==="OL")||(cmd==="insertorderedlist"&&listTag==="UL")){remove=false}}this.selectionSave();if(remove){var nodes=this.getNodes();var elems=this.getBlocks(nodes);if(typeof nodes[0]!="undefined"&&nodes.length>1&&nodes[0].nodeType==3){elems.unshift(this.getBlock())}var data="",replaced="";$.each(elems,$.proxy(function(i,s){if(s.tagName=="LI"){var $s=$(s);var cloned=$s.clone();cloned.find("ul","ol").remove();if(this.opts.linebreaks===false){data+=this.outerHtml($("<p>").append(cloned.contents()))}else{var clonedHtml=cloned.html().replace(/<br\s?\/?>$/i,"");data+=clonedHtml+"<br>"}if(i==0){$s.addClass("redactor-replaced").empty();replaced=this.outerHtml($s)}else{$s.remove()}}},this));html=this.$editor.html().replace(replaced,"</"+listTag+">"+data+"<"+listTag+">");this.$editor.html(html);this.$editor.find(listTag+":empty").remove()}else{var firstParent=$(this.getParent()).closest("td");if(this.browser("msie")&&!this.isIe11()&&this.opts.linebreaks){var wrapper=this.selectionWrap("div");var wrapperHtml=$(wrapper).html();var tmpList=$("<ul>");if(cmd=="insertorderedlist"){tmpList=$("<ol>")}var tmpLi=$("<li>");if($.trim(wrapperHtml)==""){tmpLi.append(wrapperHtml+'<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>");tmpList.append(tmpLi);this.$editor.find("#selection-marker-1").replaceWith(tmpList)}else{tmpLi.append(wrapperHtml);tmpList.append(tmpLi);$(wrapper).replaceWith(tmpList)}}else{this.document.execCommand(cmd)}var parent=this.getParent();var $list=$(parent).closest("ol, ul");if(this.opts.linebreaks===false){var listText=$.trim($list.text());if(listText==""){$list.children("li").find("br").remove();$list.children("li").append('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>")}}if(firstParent.size()!=0){$list.wrapAll("<td>")}if($list.length){var $listParent=$list.parent();if(this.isParentRedactor($listParent)&&$listParent[0].tagName!="LI"&&this.nodeTestBlocks($listParent[0])){$listParent.replaceWith($listParent.contents())}}if(this.browser("mozilla")){this.$editor.focus()}}this.selectionRestore();this.$editor.find("#selection-marker-1").removeAttr("id");this.sync();this.callback("execCommand",cmd,param);return},indentingIndent:function(){this.indentingStart("indent")},indentingOutdent:function(){this.indentingStart("outdent")},indentingStart:function(cmd){this.bufferSet();if(cmd==="indent"){var block=this.getBlock();this.selectionSave();if(block&&block.tagName=="LI"){var parent=this.getParent();var $list=$(parent).closest("ol, ul");var listTag=$list[0].tagName;var elems=this.getBlocks();$.each(elems,function(i,s){if(s.tagName=="LI"){var $prev=$(s).prev();if($prev.size()!=0&&$prev[0].tagName=="LI"){var $childList=$prev.children("ul, ol");if($childList.size()==0){$prev.append($("<"+listTag+">").append(s))}else{$childList.append(s)}}}})}else{if(block===false&&this.opts.linebreaks===true){this.exec("formatBlock","blockquote");var newblock=this.getBlock();var block=$('<div data-tagblock="">').html($(newblock).html());$(newblock).replaceWith(block);var left=this.normalize($(block).css("margin-left"))+this.opts.indentValue;$(block).css("margin-left",left+"px")}else{var elements=this.getBlocks();$.each(elements,$.proxy(function(i,elem){var $el=false;if(elem.tagName==="TD"){return}if($.inArray(elem.tagName,this.opts.alignmentTags)!==-1){$el=$(elem)}else{$el=$(elem).closest(this.opts.alignmentTags.toString().toLowerCase(),this.$editor[0])}var left=this.normalize($el.css("margin-left"))+this.opts.indentValue;$el.css("margin-left",left+"px")},this))}}this.selectionRestore()}else{this.selectionSave();var block=this.getBlock();if(block&&block.tagName=="LI"){var elems=this.getBlocks();var index=0;this.insideOutdent(block,index,elems)}else{var elements=this.getBlocks();$.each(elements,$.proxy(function(i,elem){var $el=false;if($.inArray(elem.tagName,this.opts.alignmentTags)!==-1){$el=$(elem)}else{$el=$(elem).closest(this.opts.alignmentTags.toString().toLowerCase(),this.$editor[0])}var left=this.normalize($el.css("margin-left"))-this.opts.indentValue;if(left<=0){if(this.opts.linebreaks===true&&typeof($el.data("tagblock"))!=="undefined"){$el.replaceWith($el.html()+"<br>")}else{$el.css("margin-left","");this.removeEmptyAttr($el,"style")}}else{$el.css("margin-left",left+"px")}},this))}this.selectionRestore()}this.sync()},insideOutdent:function(li,index,elems){if(li&&li.tagName=="LI"){var $parent=$(li).parent().parent();if($parent.size()!=0&&$parent[0].tagName=="LI"){$parent.after(li)}else{if(typeof elems[index]!="undefined"){li=elems[index];index++;this.insideOutdent(li,index,elems)}else{this.execCommand("insertunorderedlist")}}}},alignmentLeft:function(){this.alignmentSet("","JustifyLeft")},alignmentRight:function(){this.alignmentSet("right","JustifyRight")},alignmentCenter:function(){this.alignmentSet("center","JustifyCenter")},alignmentJustify:function(){this.alignmentSet("justify","JustifyFull")},alignmentSet:function(type,cmd){this.bufferSet();if(this.oldIE()){this.document.execCommand(cmd,false,false);return true}this.selectionSave();var block=this.getBlock();if(!block&&this.opts.linebreaks){this.exec("formatblock","div");var newblock=this.getBlock();var block=$('<div data-tagblock="">').html($(newblock).html());$(newblock).replaceWith(block);$(block).css("text-align",type);this.removeEmptyAttr(block,"style");if(type==""&&typeof($(block).data("tagblock"))!=="undefined"){$(block).replaceWith($(block).html())}}else{var elements=this.getBlocks();$.each(elements,$.proxy(function(i,elem){var $el=false;if($.inArray(elem.tagName,this.opts.alignmentTags)!==-1){$el=$(elem)}else{$el=$(elem).closest(this.opts.alignmentTags.toString().toLowerCase(),this.$editor[0])}if($el){$el.css("text-align",type);this.removeEmptyAttr($el,"style")}},this))}this.selectionRestore();this.sync()},cleanEmpty:function(html){var ph=this.placeholderStart(html);if(ph!==false){return ph}if(this.opts.linebreaks===false){if(html===""){html=this.opts.emptyHtml}else{if(html.search(/^<hr\s?\/?>$/gi)!==-1){html="<hr>"+this.opts.emptyHtml}}}return html},cleanConverters:function(html){if(this.opts.convertDivs&&!this.opts.gallery){html=html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi,"<p$1>$2</p>")}if(this.opts.paragraphy){html=this.cleanParagraphy(html)}return html},cleanConvertProtected:function(html){if(this.opts.templateVars){html=html.replace(/\{\{(.*?)\}\}/gi,"<!-- template double $1 -->");html=html.replace(/\{(.*?)\}/gi,"<!-- template $1 -->")}html=html.replace(/<script(.*?)>([\w\W]*?)<\/script>/gi,'<title type="text/javascript" style="display: none;" class="redactor-script-tag"$1>$2 ');html=html.replace(/([\w\W]*?)<\/style>/gi,'$2');html=html.replace(/([\w\W]*?)<\/form>/gi,'$2');if(this.opts.phpTags){html=html.replace(/<\?php([\w\W]*?)\?>/gi,'')}else{html=html.replace(/<\?php([\w\W]*?)\?>/gi,"")}return html},cleanReConvertProtected:function(html){if(this.opts.templateVars){html=html.replace(//gi,"{{$1}}");html=html.replace(//gi,"{$1}")}html=html.replace(/([\w\W]*?)<\/title>/gi,'<script$1 type="text/javascript">$2<\/script>');html=html.replace(/<section(.*?) style="display: none;" rel="redactor-style-tag">([\w\W]*?)<\/section>/gi,"<style$1>$2</style>");html=html.replace(/<section(.*?)rel="redactor-form-tag"(.*?)>([\w\W]*?)<\/section>/gi,"<form$1$2>$3</form>");if(this.opts.phpTags){html=html.replace(/<section style="display: none;" rel="redactor-php-tag">([\w\W]*?)<\/section>/gi,"<?php\r\n$1\r\n?>")}return html},cleanRemoveSpaces:function(html,buffer){if(buffer!==false){var buffer=[];var matches=html.match(/<(pre|style|script|title)(.*?)>([\w\W]*?)<\/(pre|style|script|title)>/gi);if(matches===null){matches=[]}if(this.opts.phpTags){var phpMatches=html.match(/<\?php([\w\W]*?)\?>/gi);if(phpMatches){matches=$.merge(matches,phpMatches)}}if(matches){$.each(matches,function(i,s){html=html.replace(s,"buffer_"+i);buffer.push(s)})}}html=html.replace(/\n/g," ");html=html.replace(/[\t]*/g,"");html=html.replace(/\n\s*\n/g,"\n");html=html.replace(/^[\s\n]*/g," ");html=html.replace(/[\s\n]*$/g," ");html=html.replace(/>\s{2,}</g,"> <");html=this.cleanReplacer(html,buffer);html=html.replace(/\n\n/g,"\n");return html},cleanReplacer:function(html,buffer){if(buffer===false){return html}$.each(buffer,function(i,s){html=html.replace("buffer_"+i,s)});return html},cleanRemoveEmptyTags:function(html){html=html.replace(/[\u200B-\u200D\uFEFF]/g,"");var etagsInline=["<b>\\s*</b>","<b> </b>","<em>\\s*</em>"];var etags=["<pre></pre>","<blockquote>\\s*</blockquote>","<dd></dd>","<dt></dt>","<ul></ul>","<ol></ol>","<li></li>","<table></table>","<tr></tr>","<span>\\s*<span>","<span> <span>","<p>\\s*</p>","<p></p>","<p> </p>","<p>\\s*<br>\\s*</p>","<div>\\s*</div>","<div>\\s*<br>\\s*</div>"];if(this.opts.removeEmptyTags){etags=etags.concat(etagsInline)}else{etags=etagsInline}var len=etags.length;for(var i=0;i<len;++i){html=html.replace(new RegExp(etags[i],"gi"),"")}return html},cleanParagraphy:function(html){html=$.trim(html);if(this.opts.linebreaks===true){return html}if(html===""||html==="<p></p>"){return this.opts.emptyHtml}html=html+"\n";if(this.opts.removeEmptyTags===false){return html}var safes=[];var matches=html.match(/<(table|div|pre|object)(.*?)>([\w\W]*?)<\/(table|div|pre|object)>/gi);if(!matches){matches=[]}var commentsMatches=html.match(/<!--([\w\W]*?)-->/gi);if(commentsMatches){matches=$.merge(matches,commentsMatches)}if(this.opts.phpTags){var phpMatches=html.match(/<section(.*?)rel="redactor-php-tag">([\w\W]*?)<\/section>/gi);if(phpMatches){matches=$.merge(matches,phpMatches)}}if(matches){$.each(matches,function(i,s){safes[i]=s;html=html.replace(s,"{replace"+i+"}\n")})}html=html.replace(/<br \/>\s*<br \/>/gi,"\n\n");html=html.replace(/<br><br>/gi,"\n\n");function R(str,mod,r){return html.replace(new RegExp(str,mod),r)}var blocks="(comment|html|body|head|title|meta|style|script|link|iframe|table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)";html=R("(<"+blocks+"[^>]*>)","gi","\n$1");html=R("(</"+blocks+">)","gi","$1\n\n");html=R("\r\n","g","\n");html=R("\r","g","\n");html=R("/\n\n+/","g","\n\n");var htmls=html.split(new RegExp("\ns*\n","g"),-1);html="";for(var i in htmls){if(htmls.hasOwnProperty(i)){if(htmls[i].search("{replace")==-1){htmls[i]=htmls[i].replace(/<p>\n\t?<\/p>/gi,"");htmls[i]=htmls[i].replace(/<p><\/p>/gi,"");if(htmls[i]!=""){html+="<p>"+htmls[i].replace(/^\n+|\n+$/g,"")+"</p>"}}else{html+=htmls[i]}}}html=R("<p><p>","gi","<p>");html=R("</p></p>","gi","</p>");html=R("<p>s?</p>","gi","");html=R("<p>([^<]+)</(div|address|form)>","gi","<p>$1</p></$2>");html=R("<p>(</?"+blocks+"[^>]*>)</p>","gi","$1");html=R("<p>(<li.+?)</p>","gi","$1");html=R("<p>s?(</?"+blocks+"[^>]*>)","gi","$1");html=R("(</?"+blocks+"[^>]*>)s?</p>","gi","$1");html=R("(</?"+blocks+"[^>]*>)s?<br />","gi","$1");html=R("<br />(s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)","gi","$1");html=R("\n</p>","gi","</p>");html=R("<li><p>","gi","<li>");html=R("</p></li>","gi","</li>");html=R("</li><p>","gi","</li>");html=R("<p>\t?\n?<p>","gi","<p>");html=R("</dt><p>","gi","</dt>");html=R("</dd><p>","gi","</dd>");html=R("<br></p></blockquote>","gi","</blockquote>");html=R("<p>\t*</p>","gi","");$.each(safes,function(i,s){html=html.replace("{replace"+i+"}",s)});return $.trim(html)},cleanConvertInlineTags:function(html,set){var boldTag="strong";if(this.opts.boldTag==="b"){boldTag="b"}var italicTag="em";if(this.opts.italicTag==="i"){italicTag="i"}html=html.replace(/<span style="font-style: italic;">([\w\W]*?)<\/span>/gi,"<"+italicTag+">$1</"+italicTag+">");html=html.replace(/<span style="font-weight: bold;">([\w\W]*?)<\/span>/gi,"<"+boldTag+">$1</"+boldTag+">");if(this.opts.boldTag==="strong"){html=html.replace(/<b>([\w\W]*?)<\/b>/gi,"<strong>$1</strong>")}else{html=html.replace(/<strong>([\w\W]*?)<\/strong>/gi,"<b>$1</b>")}if(this.opts.italicTag==="em"){html=html.replace(/<i>([\w\W]*?)<\/i>/gi,"<em>$1</em>")}else{html=html.replace(/<em>([\w\W]*?)<\/em>/gi,"<i>$1</i>")}html=html.replace(/<span style="text-decoration: underline;">([\w\W]*?)<\/span>/gi,"<u>$1</u>");if(set!==true){html=html.replace(/<strike>([\w\W]*?)<\/strike>/gi,"<del>$1</del>")}else{html=html.replace(/<del>([\w\W]*?)<\/del>/gi,"<strike>$1</strike>")}return html},cleanStripTags:function(html){if(html==""||typeof html=="undefined"){return html}var allowed=false;if(this.opts.allowedTags!==false){allowed=true}var arr=allowed===true?this.opts.allowedTags:this.opts.deniedTags;var tags=/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi;html=html.replace(tags,function($0,$1){if(allowed===true){return $.inArray($1.toLowerCase(),arr)>"-1"?$0:""}else{return $.inArray($1.toLowerCase(),arr)>"-1"?"":$0}});html=this.cleanConvertInlineTags(html);return html},cleanSavePreCode:function(html,encode){var pre=html.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/gi);if(pre!==null){$.each(pre,$.proxy(function(i,s){var arr=s.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/i);arr[3]=arr[3].replace(/ /g," ");if(encode!==false){arr[3]=this.cleanEncodeEntities(arr[3])}arr[3]=arr[3].replace(/\$/g,"$");html=html.replace(s,"<"+arr[1]+arr[2]+">"+arr[3]+"</"+arr[1]+">")},this))}return html},cleanEncodeEntities:function(str){str=String(str).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,'"');return str.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""")},cleanUnverified:function(){var $elem=this.$editor.find("li, img, a, b, strong, sub, sup, i, em, u, small, strike, del, span, cite");$elem.filter('[style*="background-color: transparent;"][style*="line-height"]').css("background-color","").css("line-height","");$elem.filter('[style*="background-color: transparent;"]').css("background-color","");$elem.css("line-height","");$.each($elem,$.proxy(function(i,s){this.removeEmptyAttr(s,"style")},this));var $elem2=this.$editor.find("b, strong, i, em, u, strike, del");$elem2.css("font-size","");$.each($elem2,$.proxy(function(i,s){this.removeEmptyAttr(s,"style")},this));this.$editor.find('div[style="text-align: -webkit-auto;"]').contents().unwrap();this.$editor.find("ul, ol, li").removeAttr("style")},cleanHtml:function(code){var i=0,codeLength=code.length,point=0,start=null,end=null,tag="",out="",cont="";this.cleanlevel=0;for(;i<codeLength;i++){point=i;if(-1==code.substr(i).indexOf("<")){out+=code.substr(i);return this.cleanFinish(out)}while(point<codeLength&&code.charAt(point)!="<"){point++}if(i!=point){cont=code.substr(i,point-i);if(!cont.match(/^\s{2,}$/g)){if("\n"==out.charAt(out.length-1)){out+=this.cleanGetTabs()}else{if("\n"==cont.charAt(0)){out+="\n"+this.cleanGetTabs();cont=cont.replace(/^\s+/,"")}}out+=cont}if(cont.match(/\n/)){out+="\n"+this.cleanGetTabs()}}start=point;while(point<codeLength&&">"!=code.charAt(point)){point++}tag=code.substr(start,point-start);i=point;var t;if("!--"==tag.substr(1,3)){if(!tag.match(/--$/)){while("-->"!=code.substr(point,3)){point++}point+=2;tag=code.substr(start,point-start);i=point}if("\n"!=out.charAt(out.length-1)){out+="\n"}out+=this.cleanGetTabs();out+=tag+">\n"}else{if("!"==tag[1]){out=this.placeTag(tag+">",out)}else{if("?"==tag[1]){out+=tag+">\n"}else{if(t=tag.match(/^<(script|style|pre)/i)){t[1]=t[1].toLowerCase();tag=this.cleanTag(tag);out=this.placeTag(tag,out);end=String(code.substr(i+1)).toLowerCase().indexOf("</"+t[1]);if(end){cont=code.substr(i+1,end);i+=end;out+=cont}}else{tag=this.cleanTag(tag);out=this.placeTag(tag,out)}}}}}return this.cleanFinish(out)},cleanGetTabs:function(){var s="";for(var j=0;j<this.cleanlevel;j++){s+="\t"}return s},cleanFinish:function(code){code=code.replace(/\n\s*\n/g,"\n");code=code.replace(/^[\s\n]*/,"");code=code.replace(/[\s\n]*$/,"");code=code.replace(/<script(.*?)>\n<\/script>/gi,"<script$1><\/script>");this.cleanlevel=0;return code},cleanTag:function(tag){var tagout="";tag=tag.replace(/\n/g," ");tag=tag.replace(/\s{2,}/g," ");tag=tag.replace(/^\s+|\s+$/g," ");var suffix="";if(tag.match(/\/$/)){suffix="/";tag=tag.replace(/\/+$/,"")}var m;while(m=/\s*([^= ]+)(?:=((['"']).*?\3|[^ ]+))?/.exec(tag)){if(m[2]){tagout+=m[1].toLowerCase()+"="+m[2]}else{if(m[1]){tagout+=m[1].toLowerCase()}}tagout+=" ";tag=tag.substr(m[0].length)}return tagout.replace(/\s*$/,"")+suffix+">"},placeTag:function(tag,out){var nl=tag.match(this.cleannewLevel);if(tag.match(this.cleanlineBefore)||nl){out=out.replace(/\s*$/,"");out+="\n"}if(nl&&"/"==tag.charAt(1)){this.cleanlevel--}if("\n"==out.charAt(out.length-1)){out+=this.cleanGetTabs()}if(nl&&"/"!=tag.charAt(1)){this.cleanlevel++}out+=tag;if(tag.match(this.cleanlineAfter)||tag.match(this.cleannewLevel)){out=out.replace(/ *$/,"");out+="\n"}return out},formatEmpty:function(e){var html=$.trim(this.$editor.html());if(this.opts.linebreaks){if(html==""){e.preventDefault();this.$editor.html("");this.focus()}}else{html=html.replace(/<br\s?\/?>/i,"");var thtml=html.replace(/<p>\s?<\/p>/gi,"");if(html===""||thtml===""){e.preventDefault();var node=$(this.opts.emptyHtml).get(0);this.$editor.html(node);this.focus()}}this.sync()},formatBlocks:function(tag){if(this.browser("mozilla")&&this.isFocused()){this.$editor.focus()}this.bufferSet();var nodes=this.getBlocks();this.selectionSave();$.each(nodes,$.proxy(function(i,node){if(node.tagName!=="LI"){var parent=$(node).parent();if(tag==="p"){if((node.tagName==="P"&&parent.size()!=0&&parent[0].tagName==="BLOCKQUOTE")||node.tagName==="BLOCKQUOTE"){this.formatQuote();return}else{if(this.opts.linebreaks){if(node&&node.tagName.search(/H[1-6]/)==0){$(node).replaceWith(node.innerHTML+"<br>")}else{return}}else{this.formatBlock(tag,node)}}}else{this.formatBlock(tag,node)}}},this));this.selectionRestore();this.sync()},formatBlock:function(tag,block){if(block===false){block=this.getBlock()}if(block===false&&this.opts.linebreaks===true){this.execCommand("formatblock",tag);return true}var contents="";if(tag!=="pre"){contents=$(block).contents()}else{contents=$(block).html();if($.trim(contents)===""){contents='<span id="selection-marker-1"></span>'}}if(block.tagName==="PRE"){tag="p"}if(this.opts.linebreaks===true&&tag==="p"){$(block).replaceWith($("<div>").append(contents).html()+"<br>")}else{var parent=this.getParent();var node=$("<"+tag+">").append(contents);$(block).replaceWith(node);if(parent&&parent.tagName=="TD"){$(node).wrapAll("<td>")}}},formatChangeTag:function(fromElement,toTagName,save){if(save!==false){this.selectionSave()}var newElement=$("<"+toTagName+"/>");$(fromElement).replaceWith(function(){return newElement.append($(this).contents())});if(save!==false){this.selectionRestore()}return newElement},formatQuote:function(){if(this.browser("mozilla")&&this.isFocused()){this.$editor.focus()}this.bufferSet();if(this.opts.linebreaks===false){this.selectionSave();var blocks=this.getBlocks();var blockquote=false;var blocksLen=blocks.length;if(blocks){var data="";var replaced="";var replace=false;var paragraphsOnly=true;$.each(blocks,function(i,s){if(s.tagName!=="P"){paragraphsOnly=false}});$.each(blocks,$.proxy(function(i,s){if(s.tagName==="BLOCKQUOTE"){this.formatBlock("p",s,false)}else{if(s.tagName==="P"){blockquote=$(s).parent();if(blockquote[0].tagName=="BLOCKQUOTE"){var count=$(blockquote).children("p").size();if(count==1){$(blockquote).replaceWith(s)}else{if(count==blocksLen){replace="blockquote";data+=this.outerHtml(s)}else{replace="html";data+=this.outerHtml(s);if(i==0){$(s).addClass("redactor-replaced").empty();replaced=this.outerHtml(s)}else{$(s).remove()}}}}else{if(paragraphsOnly===false||blocks.length==1){this.formatBlock("blockquote",s,false)}else{replace="paragraphs";data+=this.outerHtml(s)}}}else{if(s.tagName!=="LI"){this.formatBlock("blockquote",s,false)}}}},this));if(replace){if(replace=="paragraphs"){$(blocks[0]).replaceWith("<blockquote>"+data+"</blockquote>");$(blocks).remove()}else{if(replace=="blockquote"){$(blockquote).replaceWith(data)}else{if(replace=="html"){var html=this.$editor.html().replace(replaced,"</blockquote>"+data+"<blockquote>");this.$editor.html(html);this.$editor.find("blockquote").each(function(){if($.trim($(this).html())==""){$(this).remove()}})}}}}}this.selectionRestore()}else{var block=this.getBlock();if(block.tagName==="BLOCKQUOTE"){this.selectionSave();var html=$.trim($(block).html());var selection=$.trim(this.getSelectionHtml());html=html.replace(/<span(.*?)id="selection-marker(.*?)<\/span>/gi,"");if(html==selection){$(block).replaceWith($(block).html()+"<br>")}else{this.inlineFormat("tmp");var tmp=this.$editor.find("tmp");tmp.empty();var newhtml=this.$editor.html().replace("<tmp></tmp>",'</blockquote><span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>"+selection+"<blockquote>");this.$editor.html(newhtml);tmp.remove();this.$editor.find("blockquote").each(function(){if($.trim($(this).html())==""){$(this).remove()}})}this.selectionRestore();this.$editor.find("span#selection-marker-1").attr("id",false)}else{var wrapper=this.selectionWrap("blockquote");var html=$(wrapper).html();var blocksElemsRemove=["ul","ol","table","tr","tbody","thead","tfoot","dl"];$.each(blocksElemsRemove,function(i,s){html=html.replace(new RegExp("<"+s+"(.*?)>","gi"),"");html=html.replace(new RegExp("</"+s+">","gi"),"")});var blocksElems=this.opts.blockLevelElements;$.each(blocksElems,function(i,s){html=html.replace(new RegExp("<"+s+"(.*?)>","gi"),"");html=html.replace(new RegExp("</"+s+">","gi"),"<br>")});$(wrapper).html(html);this.selectionElement(wrapper);var next=$(wrapper).next();if(next.size()!=0&&next[0].tagName==="BR"){next.remove()}}}this.sync()},blockRemoveAttr:function(attr,value){var nodes=this.getBlocks();$(nodes).removeAttr(attr);this.sync()},blockSetAttr:function(attr,value){var nodes=this.getBlocks();$(nodes).attr(attr,value);this.sync()},blockRemoveStyle:function(rule){var nodes=this.getBlocks();$(nodes).css(rule,"");this.removeEmptyAttr(nodes,"style");this.sync()},blockSetStyle:function(rule,value){var nodes=this.getBlocks();$(nodes).css(rule,value);this.sync()},blockRemoveClass:function(className){var nodes=this.getBlocks();$(nodes).removeClass(className);this.removeEmptyAttr(nodes,"class");this.sync()},blockSetClass:function(className){var nodes=this.getBlocks();$(nodes).addClass(className);this.sync()},inlineRemoveClass:function(className){this.selectionSave();this.inlineEachNodes(function(node){$(node).removeClass(className);this.removeEmptyAttr(node,"class")});this.selectionRestore();this.sync()},inlineSetClass:function(className){var current=this.getCurrent();if(!$(current).hasClass(className)){this.inlineMethods("addClass",className)}},inlineRemoveStyle:function(rule){this.selectionSave();this.inlineEachNodes(function(node){$(node).css(rule,"");this.removeEmptyAttr(node,"style")});this.selectionRestore();this.sync()},inlineSetStyle:function(rule,value){this.inlineMethods("css",rule,value)},inlineRemoveAttr:function(attr){this.selectionSave();var range=this.getRange(),node=this.getElement(),nodes=this.getNodes();if(range.collapsed||range.startContainer===range.endContainer&&node){nodes=$(node)}$(nodes).removeAttr(attr);this.inlineUnwrapSpan();this.selectionRestore();this.sync()},inlineSetAttr:function(attr,value){this.inlineMethods("attr",attr,value)},inlineMethods:function(type,attr,value){this.bufferSet();this.selectionSave();var range=this.getRange();var el=this.getElement();if((range.collapsed||range.startContainer===range.endContainer)&&el&&!this.nodeTestBlocks(el)){$(el)[type](attr,value)}else{var cmd,arg=value;switch(attr){case"font-size":cmd="fontSize";arg=4;break;case"font-family":cmd="fontName";break;case"color":cmd="foreColor";break;case"background-color":cmd="backColor";break}this.document.execCommand(cmd,false,arg);var fonts=this.$editor.find("font");$.each(fonts,$.proxy(function(i,s){this.inlineSetMethods(type,s,attr,value)},this))}this.selectionRestore();this.sync()},inlineSetMethods:function(type,s,attr,value){var parent=$(s).parent(),el;var selectionHtml=this.getSelectionText();var parentHtml=$(parent).text();var selected=selectionHtml==parentHtml;if(selected&&parent&&parent[0].tagName==="INLINE"&&parent[0].attributes.length!=0){el=parent;$(s).replaceWith($(s).html())}else{el=$("<inline>").append($(s).contents());$(s).replaceWith(el)}$(el)[type](attr,value);return el},inlineEachNodes:function(callback){var range=this.getRange(),node=this.getElement(),nodes=this.getNodes(),collapsed;if(range.collapsed||range.startContainer===range.endContainer&&node){nodes=$(node);collapsed=true}$.each(nodes,$.proxy(function(i,node){if(!collapsed&&node.tagName!=="INLINE"){var selectionHtml=this.getSelectionText();var parentHtml=$(node).parent().text();var selected=selectionHtml==parentHtml;if(selected&&node.parentNode.tagName==="INLINE"&&!$(node.parentNode).hasClass("redactor_editor")){node=node.parentNode}else{return}}callback.call(this,node)},this))},inlineUnwrapSpan:function(){var $spans=this.$editor.find("inline");$.each($spans,$.proxy(function(i,span){var $span=$(span);if($span.attr("class")===undefined&&$span.attr("style")===undefined){$span.contents().unwrap()}},this))},inlineFormat:function(tag){this.selectionSave();this.document.execCommand("fontSize",false,4);var fonts=this.$editor.find("font");var last;$.each(fonts,function(i,s){var el=$("<"+tag+"/>").append($(s).contents());$(s).replaceWith(el);last=el});this.selectionRestore();this.sync()},inlineRemoveFormat:function(tag){this.selectionSave();var utag=tag.toUpperCase();var nodes=this.getNodes();var parent=$(this.getParent()).parent();$.each(nodes,function(i,s){if(s.tagName===utag){this.inlineRemoveFormatReplace(s)}});if(parent&&parent[0].tagName===utag){this.inlineRemoveFormatReplace(parent)}this.selectionRestore();this.sync()},inlineRemoveFormatReplace:function(el){$(el).replaceWith($(el).contents())},insertHtml:function(html,sync){var current=this.getCurrent();var parent=current.parentNode;this.focusWithSaveScroll();this.bufferSet();var $html=$("<div>").append($.parseHTML(html));html=$html.html();html=this.cleanRemoveEmptyTags(html);$html=$("<div>").append($.parseHTML(html));var currBlock=this.getBlock();if($html.contents().length==1){var htmlTagName=$html.contents()[0].tagName;if(htmlTagName!="P"&&htmlTagName==currBlock.tagName||htmlTagName=="PRE"){$html=$("<div>").append(html)}}if(this.opts.linebreaks){html=html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi,"$2<br>")}if(!this.opts.linebreaks&&$html.contents().length==1&&$html.contents()[0].nodeType==3&&(this.getRangeSelectedNodes().length>2||(!current||current.tagName=="BODY"&&!parent||parent.tagName=="HTML"))){html="<p>"+html+"</p>"}html=this.setSpansVerifiedHtml(html);if($html.contents().length>1&&currBlock||$html.contents().is("p, :header, ul, ol, li, div, table, td, blockquote, pre, address, section, header, footer, aside, article")){if(this.browser("msie")){if(!this.isIe11()){this.document.selection.createRange().pasteHTML(html)}else{this.execPasteFrag(html)}}else{this.document.execCommand("inserthtml",false,html)}}else{this.insertHtmlAdvanced(html,false)}if(this.selectall){this.window.setTimeout($.proxy(function(){if(!this.opts.linebreaks){this.selectionEnd(this.$editor.contents().last())}else{this.focusEnd()}},this),1)}this.observeStart();this.setNonEditable();if(sync!==false){this.sync()}},insertHtmlAdvanced:function(html,sync){html=this.setSpansVerifiedHtml(html);var sel=this.getSelection();if(sel.getRangeAt&&sel.rangeCount){var range=sel.getRangeAt(0);range.deleteContents();var el=document.createElement("div");el.innerHTML=html;var frag=document.createDocumentFragment(),node,lastNode;while((node=el.firstChild)){lastNode=frag.appendChild(node)}range.insertNode(frag);if(lastNode){range=range.cloneRange();range.setStartAfter(lastNode);range.collapse(true);sel.removeAllRanges();sel.addRange(range)}}if(sync!==false){this.sync()}},insertBeforeCursor:function(html){html=this.setSpansVerifiedHtml(html);var node=$(html);var space=document.createElement("span");space.innerHTML="\u200B";var range=this.getRange();range.insertNode(space);range.insertNode(node[0]);range.collapse(false);var sel=this.getSelection();sel.removeAllRanges();sel.addRange(range);this.sync()},insertText:function(html){var $html=$($.parseHTML(html));if($html.length){html=$html.text()}this.focusWithSaveScroll();if(this.browser("msie")){if(!this.isIe11()){this.document.selection.createRange().pasteHTML(html)}else{this.execPasteFrag(html)}}else{this.document.execCommand("inserthtml",false,html)}this.sync()},insertNode:function(node){node=node[0]||node;if(node.tagName=="SPAN"){var replacementTag="inline";var outer=node.outerHTML;var regex=new RegExp("<"+node.tagName,"i");var newTag=outer.replace(regex,"<"+replacementTag);regex=new RegExp("</"+node.tagName,"i");newTag=newTag.replace(regex,"</"+replacementTag);node=$(newTag)[0]}var sel=this.getSelection();if(sel.getRangeAt&&sel.rangeCount){range=sel.getRangeAt(0);range.deleteContents();range.insertNode(node);range.setEndAfter(node);range.setStartAfter(node);sel.removeAllRanges();sel.addRange(range)}return node},insertNodeToCaretPositionFromPoint:function(e,node){var range;var x=e.clientX,y=e.clientY;if(this.document.caretPositionFromPoint){var pos=this.document.caretPositionFromPoint(x,y);range=this.getRange();range.setStart(pos.offsetNode,pos.offset);range.collapse(true);range.insertNode(node)}else{if(this.document.caretRangeFromPoint){range=this.document.caretRangeFromPoint(x,y);range.insertNode(node)}else{if(typeof document.body.createTextRange!="undefined"){range=this.document.body.createTextRange();range.moveToPoint(x,y);var endRange=range.duplicate();endRange.moveToPoint(x,y);range.setEndPoint("EndToEnd",endRange);range.select()}}}},insertAfterLastElement:function(element,parent){if(typeof(parent)!="undefined"){element=parent}if(this.isEndOfElement()){if(this.opts.linebreaks){var contents=$("<div>").append($.trim(this.$editor.html())).contents();var last=contents.last()[0];if(last.tagName=="SPAN"&&last.innerHTML==""){last=contents.prev()[0]}if(this.outerHtml(last)!=this.outerHtml(element)){return false}}else{if(this.$editor.contents().last()[0]!==element){return false}}this.insertingAfterLastElement(element)}},insertingAfterLastElement:function(element){this.bufferSet();if(this.opts.linebreaks===false){var node=$(this.opts.emptyHtml);$(element).after(node);this.selectionStart(node)}else{var node=$('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>",this.document)[0];$(element).after(node);$(node).after(this.opts.invisibleSpace);this.selectionRestore();this.$editor.find("span#selection-marker-1").removeAttr("id")}},insertLineBreak:function(twice){this.selectionSave();var br="<br>";if(twice==true){br="<br><br>"}if(this.browser("mozilla")){var span=$("<span>").html(this.opts.invisibleSpace);this.$editor.find("#selection-marker-1").before(br).before(span).before(this.opts.invisibleSpace);this.setCaretAfter(span[0]);span.remove();this.selectionRemoveMarkers()}else{var parent=this.getParent();if(parent&&parent.tagName==="A"){var offset=this.getCaretOffset(parent);var text=$.trim($(parent).text()).replace(/\n\r\n/g,"");var len=text.length;if(offset==len){this.selectionRemoveMarkers();var node=$('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>",this.document)[0];$(parent).after(node);$(node).before(br+(this.browser("webkit")?this.opts.invisibleSpace:""));this.selectionRestore();return true}}this.$editor.find("#selection-marker-1").before(br+(this.browser("webkit")?this.opts.invisibleSpace:""));this.selectionRestore()}},insertDoubleLineBreak:function(){this.insertLineBreak(true)},replaceLineBreak:function(element){var node=$("<br>"+this.opts.invisibleSpace);$(element).replaceWith(node);this.selectionStart(node)},pasteClean:function(html){html=this.callback("pasteBefore",false,html);if(this.browser("msie")){var tmp=$.trim(html);if(tmp.search(/^<a(.*?)>(.*?)<\/a>$/i)==0){html=html.replace(/^<a(.*?)>(.*?)<\/a>$/i,"$2")}}if(this.opts.pastePlainText){var tmp=this.document.createElement("div");html=html.replace(/<br>|<\/H[1-6]>|<\/p>|<\/div>/gi,"\n");tmp.innerHTML=html;html=tmp.textContent||tmp.innerText;html=$.trim(html);html=html.replace("\n","<br>");html=this.cleanParagraphy(html);this.pasteInsert(html);return false}var tablePaste=false;if(this.currentOrParentIs("TD")){tablePaste=true;var blocksElems=this.opts.blockLevelElements;blocksElems.push("tr");blocksElems.push("table");$.each(blocksElems,function(i,s){html=html.replace(new RegExp("<"+s+"(.*?)>","gi"),"");html=html.replace(new RegExp("</"+s+">","gi"),"<br>")})}if(this.currentOrParentIs("PRE")){html=this.pastePre(html);this.pasteInsert(html);return true}html=html.replace(/<img(.*?)v:shapes=(.*?)>/gi,"");html=html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi,"<ul><li$2</li>");html=html.replace(/<p(.*?)class="MsoListParagraphCxSpMiddle"([\w\W]*?)<\/p>/gi,"<li$2</li>");html=html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi,"<li$2</li></ul>");html=html.replace(/<p(.*?)class="MsoListParagraph"([\w\W]*?)<\/p>/gi,"<ul><li$2</li></ul>");html=html.replace(/·/g,"");html=html.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi,"");if(this.opts.cleanSpaces===true){html=html.replace(/( ){2,}/gi," ");html=html.replace(/ /gi," ")}html=html.replace(/<b\sid="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi,"$2");html=html.replace(/<b(.*?)id="docs-internal-guid(.*?)">([\w\W]*?)<\/b>/gi,"$3");html=html.replace(/<span[^>]*(font-style: italic; font-weight: bold|font-weight: bold; font-style: italic)[^>]*>/gi,'<span style="font-weight: bold;"><span style="font-style: italic;">');html=html.replace(/<span[^>]*font-style: italic[^>]*>/gi,'<span style="font-style: italic;">');html=html.replace(/<span[^>]*font-weight: bold[^>]*>/gi,'<span style="font-weight: bold;">');html=html.replace(/<span[^>]*text-decoration: underline[^>]*>/gi,'<span style="text-decoration: underline;">');html=html.replace(/<td>\u200b*<\/td>/gi,"[td]");html=html.replace(/<td> <\/td>/gi,"[td]");html=html.replace(/<td><br><\/td>/gi,"[td]");html=html.replace(/<td(.*?)colspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi,'[td colspan="$2"]$4[/td]');html=html.replace(/<td(.*?)rowspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi,'[td rowspan="$2"]$4[/td]');html=html.replace(/<a(.*?)href="(.*?)"(.*?)>([\w\W]*?)<\/a>/gi,'[a href="$2"]$4[/a]');html=html.replace(/<iframe(.*?)>([\w\W]*?)<\/iframe>/gi,"[iframe$1]$2[/iframe]");html=html.replace(/<video(.*?)>([\w\W]*?)<\/video>/gi,"[video$1]$2[/video]");html=html.replace(/<audio(.*?)>([\w\W]*?)<\/audio>/gi,"[audio$1]$2[/audio]");html=html.replace(/<embed(.*?)>([\w\W]*?)<\/embed>/gi,"[embed$1]$2[/embed]");html=html.replace(/<object(.*?)>([\w\W]*?)<\/object>/gi,"[object$1]$2[/object]");html=html.replace(/<param(.*?)>/gi,"[param$1]");html=html.replace(/<img(.*?)>/gi,"[img$1]");html=html.replace(/ class="(.*?)"/gi,"");html=html.replace(/<(\w+)([\w\W]*?)>/gi,"<$1>");if(this.opts.linebreaks){html=html.replace(/<strong><\/strong>/gi,"");html=html.replace(/<u><\/u>/gi,"");if(this.opts.cleanFontTag){html=html.replace(/<font(.*?)>([\w\W]*?)<\/font>/gi,"$2")}html=html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi,"<br>")}else{html=html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi,"")}html=html.replace(/<div>\s*?\t*?\n*?(<ul>|<ol>|<p>)/gi,"$1");html=html.replace(/\[td colspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi,'<td colspan="$1">$2</td>');html=html.replace(/\[td rowspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi,'<td rowspan="$1">$2</td>');html=html.replace(/\[td\]/gi,"<td> </td>");html=html.replace(/\[a href="(.*?)"\]([\w\W]*?)\[\/a\]/gi,'<a href="$1">$2</a>');html=html.replace(/\[iframe(.*?)\]([\w\W]*?)\[\/iframe\]/gi,"<iframe$1>$2</iframe>");html=html.replace(/\[video(.*?)\]([\w\W]*?)\[\/video\]/gi,"<video$1>$2</video>");html=html.replace(/\[audio(.*?)\]([\w\W]*?)\[\/audio\]/gi,"<audio$1>$2</audio>");html=html.replace(/\[embed(.*?)\]([\w\W]*?)\[\/embed\]/gi,"<embed$1>$2</embed>");html=html.replace(/\[object(.*?)\]([\w\W]*?)\[\/object\]/gi,"<object$1>$2</object>");html=html.replace(/\[param(.*?)\]/gi,"<param$1>");html=html.replace(/\[img(.*?)\]/gi,"<img$1>");if(this.opts.convertDivs){html=html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi,"<p>$2</p>");html=html.replace(/<\/div><p>/gi,"<p>");html=html.replace(/<\/p><\/div>/gi,"</p>");html=html.replace(/<p><\/p>/gi,"<br />")}else{html=html.replace(/<div><\/div>/gi,"<br />")}html=this.cleanStripTags(html);if(this.currentOrParentIs("LI")){html=html.replace(/<p>([\w\W]*?)<\/p>/gi,"$1<br>")}else{if(tablePaste===false){html=this.cleanParagraphy(html)}}html=html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi,"$2");html=html.replace(/<img>/gi,"");html=html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi,"");html=html.replace(/\n{3,}/gi,"\n");html=html.replace(/<p><p>/gi,"<p>");html=html.replace(/<\/p><\/p>/gi,"</p>");html=html.replace(/<li>(\s*|\t*|\n*)<p>/gi,"<li>");html=html.replace(/<\/p>(\s*|\t*|\n*)<\/li>/gi,"</li>");if(this.opts.linebreaks===true){html=html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi,"$2<br>")}html=html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| |<br>)<\/[^>]+>/gi,"");html=html.replace(/<img src="webkit-fake-url\:\/\/(.*?)"(.*?)>/gi,"");html=html.replace(/<td(.*?)>(\s*|\t*|\n*)<p>([\w\W]*?)<\/p>(\s*|\t*|\n*)<\/td>/gi,"<td$1>$3</td>");if(this.opts.convertDivs){html=html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi,"$2");html=html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi,"$2")}this.pasteClipboardMozilla=false;if(this.browser("mozilla")){if(this.opts.clipboardUpload){var matches=html.match(/<img src="data:image(.*?)"(.*?)>/gi);if(matches!==null){this.pasteClipboardMozilla=matches;for(k in matches){var img=matches[k].replace("<img",'<img data-mozilla-paste-image="'+k+'" ');html=html.replace(matches[k],img)}}}while(/<br>$/gi.test(html)){html=html.replace(/<br>$/gi,"")}}html=html.replace(/<p>•([\w\W]*?)<\/p>/gi,"<li>$1</li>");if(this.browser("msie")){while(/<font>([\w\W]*?)<\/font>/gi.test(html)){html=html.replace(/<font>([\w\W]*?)<\/font>/gi,"$1")}}if(tablePaste===false){html=html.replace(/<td(.*?)>([\w\W]*?)<p(.*?)>([\w\W]*?)<\/td>/gi,"<td$1>$2$4</td>");html=html.replace(/<td(.*?)>([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi,"<td$1>$2$3</td>");html=html.replace(/<td(.*?)>([\w\W]*?)<p(.*?)>([\w\W]*?)<\/td>/gi,"<td$1>$2$4</td>");html=html.replace(/<td(.*?)>([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi,"<td$1>$2$3</td>")}html=html.replace(/\n/g," ");html=html.replace(/<p>\n?<li>/gi,"<li>");this.pasteInsert(html)},pastePre:function(s){s=s.replace(/<br>|<\/H[1-6]>|<\/p>|<\/div>/gi,"\n");var tmp=this.document.createElement("div");tmp.innerHTML=s;return this.cleanEncodeEntities(tmp.textContent||tmp.innerText)},pasteInsert:function(html){html=this.callback("pasteAfter",false,html);if(this.selectall){this.$editor.html(html);this.selectionRemove();this.focusEnd();this.sync()}else{this.insertHtml(html)}this.selectall=false;setTimeout($.proxy(function(){this.rtePaste=false;if(this.browser("mozilla")){this.$editor.find("p:empty").remove()}if(this.pasteClipboardMozilla!==false){this.pasteClipboardUploadMozilla()}},this),100);if(this.opts.autoresize&&this.fullscreen!==true){$(this.document.body).scrollTop(this.saveScroll)}else{this.$editor.scrollTop(this.saveScroll)}},pasteClipboardAppendFields:function(postData){if(this.opts.uploadFields!==false&&typeof this.opts.uploadFields==="object"){$.each(this.opts.uploadFields,$.proxy(function(k,v){if(v!=null&&v.toString().indexOf("#")===0){v=$(v).val()}postData[k]=v},this))}return postData},pasteClipboardUploadMozilla:function(){var imgs=this.$editor.find("img[data-mozilla-paste-image]");$.each(imgs,$.proxy(function(i,s){var $s=$(s);var arr=s.src.split(",");var postData={contentType:arr[0].split(";")[0].split(":")[1],data:arr[1]};postData=this.pasteClipboardAppendFields(postData);$.post(this.opts.clipboardUploadUrl,postData,$.proxy(function(data){var json=(typeof data==="string"?$.parseJSON(data):data);$s.attr("src",json.filelink);$s.removeAttr("data-mozilla-paste-image");this.sync();this.callback("imageUpload",$s,json)},this))},this))},pasteClipboardUpload:function(e){var result=e.target.result;var arr=result.split(",");var postData={contentType:arr[0].split(";")[0].split(":")[1],data:arr[1]};if(this.opts.clipboardUpload){postData=this.pasteClipboardAppendFields(postData);$.post(this.opts.clipboardUploadUrl,postData,$.proxy(function(data){var json=(typeof data==="string"?$.parseJSON(data):data);var html='<img src="'+json.filelink+'" id="clipboard-image-marker" />';this.execCommand("inserthtml",html,false);var image=$(this.$editor.find("img#clipboard-image-marker"));if(image.length){image.removeAttr("id")}else{image=false}this.sync();if(image){this.callback("imageUpload",image,json)}},this))}else{this.insertHtml('<img src="'+result+'" />')}},bufferSet:function(selectionSave){if(selectionSave!==false){this.selectionSave()}this.opts.buffer.push(this.$editor.html());if(selectionSave!==false){this.selectionRemoveMarkers("buffer")}},bufferUndo:function(){if(this.opts.buffer.length===0){this.focusWithSaveScroll();return}this.selectionSave();this.opts.rebuffer.push(this.$editor.html());this.selectionRestore(false,true);this.$editor.html(this.opts.buffer.pop());this.selectionRestore();setTimeout($.proxy(this.observeStart,this),100)},bufferRedo:function(){if(this.opts.rebuffer.length===0){this.focusWithSaveScroll();return false}this.selectionSave();this.opts.buffer.push(this.$editor.html());this.selectionRestore(false,true);this.$editor.html(this.opts.rebuffer.pop());this.selectionRestore(true);setTimeout($.proxy(this.observeStart,this),4)},observeStart:function(){this.observeImages();if(this.opts.observeLinks){this.observeLinks()}},observeLinks:function(){this.$editor.find("a").on("click",$.proxy(this.linkObserver,this));this.$editor.on("click.redactor",$.proxy(function(e){this.linkObserverTooltipClose(e)},this));$(document).on("click.redactor",$.proxy(function(e){this.linkObserverTooltipClose(e)},this))},observeImages:function(){if(this.opts.observeImages===false){return false}this.$editor.find("img").each($.proxy(function(i,elem){if(this.browser("msie")){$(elem).attr("unselectable","on")}var parent=$(elem).parent();if(!parent.hasClass("royalSlider")&&!parent.hasClass("fotorama")){this.imageResize(elem)}},this));this.$editor.find(".fotorama, .royalSlider").on("click",$.proxy(this.editGallery,this))},linkObserver:function(e){var $link=$(e.target);var parent=$(e.target).parent();if(parent.hasClass("royalSlider")||parent.hasClass("fotorama")){return}if($link.size()==0||$link[0].tagName!=="A"){return}var pos=$link.offset();if(this.opts.iframe){var posFrame=this.$frame.offset();pos.top=posFrame.top+(pos.top-$(this.document).scrollTop());pos.left+=posFrame.left}var tooltip=$('<span class="redactor-link-tooltip"></span>');var href=$link.attr("href");if(href===undefined){href=""}if(href.length>24){href=href.substring(0,24)+"..."}var aLink=$('<a href="'+$link.attr("href")+'" target="_blank">'+href+"</a>").on("click",$.proxy(function(e){this.linkObserverTooltipClose(false)},this));var aEdit=$('<a href="#">'+this.opts.curLang.edit+"</a>").on("click",$.proxy(function(e){e.preventDefault();this.linkShow();this.linkObserverTooltipClose(false)},this));var aUnlink=$('<a href="#">'+this.opts.curLang.unlink+"</a>").on("click",$.proxy(function(e){e.preventDefault();this.execCommand("unlink");this.linkObserverTooltipClose(false)},this));tooltip.append(aLink);tooltip.append(" | ");tooltip.append(aEdit);tooltip.append(" | ");tooltip.append(aUnlink);tooltip.css({top:(pos.top+20)+"px",left:pos.left+"px"});$(".redactor-link-tooltip").remove();$("body").append(tooltip)},linkObserverTooltipClose:function(e){if(e!==false&&e.target.tagName=="A"){return false}$(".redactor-link-tooltip").remove()},getSelection:function(){if(!this.opts.rangy){return this.document.getSelection()}else{if(!this.opts.iframe){return rangy.getSelection()}else{return rangy.getSelection(this.$frame[0])}}},getRange:function(){if(!this.opts.rangy){if(this.document.getSelection){var sel=this.getSelection();if(sel.getRangeAt&&sel.rangeCount){return sel.getRangeAt(0)}}return this.document.createRange()}else{if(!this.opts.iframe){return rangy.createRange()}else{return rangy.createRange(this.iframeDoc())}}},selectionElement:function(node){this.setCaret(node)},selectionStart:function(node){this.selectionSet(node[0]||node,0,null,0)},selectionEnd:function(node){this.selectionSet(node[0]||node,1,null,1)},selectionSet:function(orgn,orgo,focn,foco){if(focn==null){focn=orgn}if(foco==null){foco=orgo}var sel=this.getSelection();if(!sel){return}if(orgn.tagName=="P"&&orgn.innerHTML==""){orgn.innerHTML=this.opts.invisibleSpace}if(orgn.tagName=="BR"&&this.opts.linebreaks===false){var par=$(this.opts.emptyHtml)[0];$(orgn).replaceWith(par);orgn=par;focn=orgn}var range=this.getRange();range.setStart(orgn,orgo);range.setEnd(focn,foco);try{sel.removeAllRanges()}catch(e){}sel.addRange(range)},selectionWrap:function(tag){tag=tag.toLowerCase();var block=this.getBlock();if(block){var wrapper=this.formatChangeTag(block,tag);this.sync();return wrapper}var sel=this.getSelection();var range=sel.getRangeAt(0);var wrapper=document.createElement(tag);wrapper.appendChild(range.extractContents());range.insertNode(wrapper);this.selectionElement(wrapper);return wrapper},selectionAll:function(){var range=this.getRange();range.selectNodeContents(this.$editor[0]);var sel=this.getSelection();sel.removeAllRanges();sel.addRange(range)},selectionRemove:function(){this.getSelection().removeAllRanges()},getCaretOffset:function(element){var caretOffset=0;var range=this.getRange();var preCaretRange=range.cloneRange();preCaretRange.selectNodeContents(element);preCaretRange.setEnd(range.endContainer,range.endOffset);caretOffset=$.trim(preCaretRange.toString()).length;return caretOffset},getCaretOffsetRange:function(){return new Range(this.getSelection().getRangeAt(0))},setCaret:function(el,start,end){if(typeof end==="undefined"){end=start}el=el[0]||el;var range=this.getRange();range.selectNodeContents(el);var textNodes=this.getTextNodesIn(el);var foundStart=false;var charCount=0,endCharCount;if(textNodes.length==1&&start){range.setStart(textNodes[0],start);range.setEnd(textNodes[0],end)}else{for(var i=0,textNode;textNode=textNodes[i++];){endCharCount=charCount+textNode.length;if(!foundStart&&start>=charCount&&(start<endCharCount||(start==endCharCount&&i<textNodes.length))){range.setStart(textNode,start-charCount);foundStart=true}if(foundStart&&end<=endCharCount){range.setEnd(textNode,end-charCount);break}charCount=endCharCount}}var sel=this.getSelection();sel.removeAllRanges();sel.addRange(range)},setCaretAfter:function(node){this.$editor.focus();node=node[0]||node;var range=this.document.createRange();var start=1;var end=-1;range.setStart(node,start);range.setEnd(node,end+2);var selection=this.window.getSelection();var cursorRange=this.document.createRange();var emptyElement=this.document.createTextNode("\u200B");$(node).after(emptyElement);cursorRange.setStartAfter(emptyElement);selection.removeAllRanges();selection.addRange(cursorRange);$(emptyElement).remove()},getTextNodesIn:function(node){var textNodes=[];if(node.nodeType==3){textNodes.push(node)}else{var children=node.childNodes;for(var i=0,len=children.length;i<len;++i){textNodes.push.apply(textNodes,this.getTextNodesIn(children[i]))}}return textNodes},getCurrent:function(){var el=false;var sel=this.getSelection();if(sel&&sel.rangeCount>0){el=sel.getRangeAt(0).startContainer}return this.isParentRedactor(el)},getParent:function(elem){elem=elem||this.getCurrent();if(elem){return this.isParentRedactor($(elem).parent()[0])}else{return false}},getBlock:function(node){if(typeof node==="undefined"){node=this.getCurrent()}while(node){if(this.nodeTestBlocks(node)){if($(node).hasClass("redactor_editor")){return false}return node}node=node.parentNode}return false},getBlocks:function(nodes){var newnodes=[];if(typeof nodes=="undefined"){var range=this.getRange();if(range&&range.collapsed===true){return[this.getBlock()]}var nodes=this.getNodes(range)}$.each(nodes,$.proxy(function(i,node){if(this.opts.iframe===false&&$(node).parents("div.redactor_editor").size()==0){return false}if(this.nodeTestBlocks(node)){newnodes.push(node)}},this));if(newnodes.length===0){newnodes=[this.getBlock()]}return newnodes},isInlineNode:function(node){if(node.nodeType!=1){return false}return !this.rTestBlock.test(node.nodeName)},nodeTestBlocks:function(node){return node.nodeType==1&&this.rTestBlock.test(node.nodeName)},tagTestBlock:function(tag){return this.rTestBlock.test(tag)},getNodes:function(range,tag){if(typeof range=="undefined"||range==false){var range=this.getRange()}if(range&&range.collapsed===true){if(typeof tag==="undefined"&&this.tagTestBlock(tag)){var block=this.getBlock();if(block.tagName==tag){return[block]}else{return[]}}else{return[this.getCurrent()]}}var nodes=[],finalnodes=[];var sel=this.document.getSelection();if(!sel.isCollapsed){nodes=this.getRangeSelectedNodes(sel.getRangeAt(0))}$.each(nodes,$.proxy(function(i,node){if(this.opts.iframe===false&&$(node).parents("div.redactor_editor").size()==0){return false}if(typeof tag==="undefined"){if($.trim(node.textContent)!=""){finalnodes.push(node)}}else{if(node.tagName==tag){finalnodes.push(node)}}},this));if(finalnodes.length==0){if(typeof tag==="undefined"&&this.tagTestBlock(tag)){var block=this.getBlock();if(block.tagName==tag){return finalnodes.push(block)}else{return[]}}else{finalnodes.push(this.getCurrent())}}var last=finalnodes[finalnodes.length-1];if(this.nodeTestBlocks(last)){finalnodes=finalnodes.slice(0,-1)}return finalnodes},getElement:function(node){if(!node){node=this.getCurrent()}while(node){if(node.nodeType==1){if($(node).hasClass("redactor_editor")){return false}return node}node=node.parentNode}return false},getRangeSelectedNodes:function(range){range=range||this.getRange();var node=range.startContainer;var endNode=range.endContainer;if(node==endNode){return[node]}var rangeNodes=[];while(node&&node!=endNode){rangeNodes.push(node=this.nextNode(node))}node=range.startContainer;while(node&&node!=range.commonAncestorContainer){rangeNodes.unshift(node);node=node.parentNode}return rangeNodes},nextNode:function(node){if(node.hasChildNodes()){return node.firstChild}else{while(node&&!node.nextSibling){node=node.parentNode}if(!node){return null}return node.nextSibling}},getSelectionText:function(){return this.getSelection().toString()},getSelectionHtml:function(){var html="";var sel=this.getSelection();if(sel.rangeCount){var container=this.document.createElement("div");var len=sel.rangeCount;for(var i=0;i<len;++i){container.appendChild(sel.getRangeAt(i).cloneContents())}html=container.innerHTML}return this.syncClean(html)},selectionSave:function(){if(!this.isFocused()){this.focusWithSaveScroll()}if(!this.opts.rangy){this.selectionCreateMarker(this.getRange())}else{this.savedSel=rangy.saveSelection()}},selectionCreateMarker:function(range,remove){if(!range){return}var node1=$('<span id="selection-marker-1" class="redactor-selection-marker">'+this.opts.invisibleSpace+"</span>",this.document)[0];var node2=$('<span id="selection-marker-2" class="redactor-selection-marker">'+this.opts.invisibleSpace+"</span>",this.document)[0];if(range.collapsed===true){this.selectionSetMarker(range,node1,true)}else{this.selectionSetMarker(range,node1,true);this.selectionSetMarker(range,node2,false)}this.savedSel=this.$editor.html();this.selectionRestore(false,false)},selectionSetMarker:function(range,node,type){var boundaryRange=range.cloneRange();try{boundaryRange.collapse(type);boundaryRange.insertNode(node);boundaryRange.detach()}catch(e){var html=this.opts.emptyHtml;if(this.opts.linebreaks){html="<br>"}this.$editor.prepend(html);this.focus()}},selectionRestore:function(replace,remove){if(!this.opts.rangy){if(replace===true&&this.savedSel){this.$editor.html(this.savedSel)}var node1=this.$editor.find("span#selection-marker-1");var node2=this.$editor.find("span#selection-marker-2");if(this.browser("mozilla")){this.$editor.focus()}else{if(!this.isFocused()){this.focusWithSaveScroll()}}if(node1.length!=0&&node2.length!=0){this.selectionSet(node1[0],0,node2[0],0)}else{if(node1.length!=0){this.selectionSet(node1[0],0,null,0)}}if(remove!==false){this.selectionRemoveMarkers();this.savedSel=false}}else{rangy.restoreSelection(this.savedSel)}},selectionRemoveMarkers:function(type){if(!this.opts.rangy){$.each(this.$editor.find("span.redactor-selection-marker"),function(){var html=$.trim($(this).html().replace(/[^\u0000-\u1C7F]/g,""));if(html==""){$(this).remove()}else{$(this).removeAttr("class").removeAttr("id")}})}else{rangy.removeMarkers(this.savedSel)}},tableShow:function(){this.selectionSave();this.modalInit(this.opts.curLang.table,this.opts.modal_table,300,$.proxy(function(){$("#redactor_insert_table_btn").click($.proxy(this.tableInsert,this));setTimeout(function(){$("#redactor_table_rows").focus()},200)},this))},tableInsert:function(){this.bufferSet(false);var rows=$("#redactor_table_rows").val(),columns=$("#redactor_table_columns").val(),$table_box=$("<div></div>"),tableId=Math.floor(Math.random()*99999),$table=$('<table id="table'+tableId+'"><tbody></tbody></table>'),i,$row,z,$column;for(i=0;i<rows;i++){$row=$("<tr></tr>");for(z=0;z<columns;z++){$column=$("<td>"+this.opts.invisibleSpace+"</td>");if(i===0&&z===0){$column.append('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>")}$($row).append($column)}$table.append($row)}$table_box.append($table);var html=$table_box.html();if(this.opts.linebreaks===false&&this.browser("mozilla")){html+="<p>"+this.opts.invisibleSpace+"</p>"}this.modalClose();this.selectionRestore();var current=this.getBlock()||this.getCurrent();if(current&¤t.tagName!="BODY"){if(current.tagName=="LI"){var current=$(current).closest("ul, ol")}$(current).after(html)}else{this.insertHtmlAdvanced(html,false)}this.selectionRestore();var table=this.$editor.find("#table"+tableId);this.buttonActiveObserver();table.find("span#selection-marker-1, inline#selection-marker-1").remove();table.removeAttr("id");this.sync()},tableDeleteTable:function(){var $table=$(this.getParent()).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();$table.remove();this.sync()},tableDeleteRow:function(){var parent=this.getParent();var $table=$(parent).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();var $current_tr=$(parent).closest("tr");var $focus_tr=$current_tr.prev().length?$current_tr.prev():$current_tr.next();if($focus_tr.length){var $focus_td=$focus_tr.children("td").first();if($focus_td.length){$focus_td.prepend('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>")}}$current_tr.remove();this.selectionRestore();$table.find("span#selection-marker-1").remove();this.sync()},tableDeleteColumn:function(){var parent=this.getParent();var $table=$(parent).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();var $current_td=$(parent).closest("td");if(!($current_td.is("td"))){$current_td=$current_td.closest("td")}var index=$current_td.get(0).cellIndex;$table.find("tr").each($.proxy(function(i,elem){var focusIndex=index-1<0?index+1:index-1;if(i===0){$(elem).find("td").eq(focusIndex).prepend('<span id="selection-marker-1">'+this.opts.invisibleSpace+"</span>")}$(elem).find("td").eq(index).remove()},this));this.selectionRestore();$table.find("span#selection-marker-1").remove();this.sync()},tableAddHead:function(){var $table=$(this.getParent()).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();if($table.find("thead").size()!==0){this.tableDeleteHead()}else{var tr=$table.find("tr").first().clone();tr.find("td").html(this.opts.invisibleSpace);$thead=$("<thead></thead>");$thead.append(tr);$table.prepend($thead);this.sync()}},tableDeleteHead:function(){var $table=$(this.getParent()).closest("table");if(!this.isParentRedactor($table)){return false}var $thead=$table.find("thead");if($thead.size()==0){return false}this.bufferSet();$thead.remove();this.sync()},tableAddRowAbove:function(){this.tableAddRow("before")},tableAddRowBelow:function(){this.tableAddRow("after")},tableAddColumnLeft:function(){this.tableAddColumn("before")},tableAddColumnRight:function(){this.tableAddColumn("after")},tableAddRow:function(type){var $table=$(this.getParent()).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();var $current_tr=$(this.getParent()).closest("tr");var new_tr=$current_tr.clone();new_tr.find("td").html(this.opts.invisibleSpace);if(type==="after"){$current_tr.after(new_tr)}else{$current_tr.before(new_tr)}this.sync()},tableAddColumn:function(type){var parent=this.getParent();var $table=$(parent).closest("table");if(!this.isParentRedactor($table)){return false}if($table.size()==0){return false}this.bufferSet();var index=0;var current=this.getCurrent();var $current_tr=$(current).closest("tr");var $current_td=$(current).closest("td");$current_tr.find("td").each($.proxy(function(i,elem){if($(elem)[0]===$current_td[0]){index=i}},this));$table.find("tr").each($.proxy(function(i,elem){var $current=$(elem).find("td").eq(index);var td=$current.clone();td.html(this.opts.invisibleSpace);type==="after"?$current.after(td):$current.before(td)},this));this.sync()},videoShow:function(){this.selectionSave();this.modalInit(this.opts.curLang.video,this.opts.modal_video,600,$.proxy(function(){$("#redactor_insert_video_btn").click($.proxy(this.videoInsert,this));setTimeout(function(){$("#redactor_insert_video_area").focus()},200)},this))},videoInsert:function(){var data=$("#redactor_insert_video_area").val();data=this.cleanStripTags(data);var iframeStart='<iframe width="500" height="281" src="',iframeEnd='" frameborder="0" allowfullscreen></iframe>';if(data.match(reUrlYoutube)){data=data.replace(reUrlYoutube,iframeStart+"//www.youtube.com/embed/$1"+iframeEnd)}else{if(data.match(reUrlVimeo)){data=data.replace(reUrlVimeo,iframeStart+"//player.vimeo.com/video/$2"+iframeEnd)}}this.selectionRestore();var current=this.getBlock()||this.getCurrent();if(current){$(current).after(data)}else{this.insertHtmlAdvanced(data,false)}this.sync();this.modalClose()},linkShow:function(){this.selectionSave();var callback=$.proxy(function(){if(this.opts.predefinedLinks!==false){this.predefinedLinksStorage={};var that=this;$.getJSON(this.opts.predefinedLinks,function(data){var $select=$("#redactor-predefined-links");$select.html("");$.each(data,function(key,val){that.predefinedLinksStorage[key]=val;$select.append($("<option>").val(key).html(val.name))});$select.on("change",function(){var key=$(this).val();var name="",url="";if(key!=0){name=that.predefinedLinksStorage[key].name;url=that.predefinedLinksStorage[key].url}$("#redactor_link_url").val(url);$("#redactor_link_url_text").val(name)});$select.show()})}this.insert_link_node=false;var sel=this.getSelection();var url="",text="",target="";var elem=this.getParent();var par=$(elem).parent().get(0);if(par&&par.tagName==="A"){elem=par}if(elem&&elem.tagName==="A"){url=elem.href;text=$(elem).text();target=elem.target;this.insert_link_node=elem}else{text=sel.toString()}$("#redactor_link_url_text").val(text);var thref=self.location.href.replace(/\/$/i,"");url=url.replace(thref,"");url=url.replace(/^\/#/,"#");url=url.replace("mailto:","");if(this.opts.linkProtocol===false){var re=new RegExp("^(http|ftp|https)://"+self.location.host,"i");url=url.replace(re,"")}$("#redactor_link_url").val(url);if(target==="_blank"){$("#redactor_link_blank").prop("checked",true)}this.linkInsertPressed=false;$("#redactor_insert_link_btn").on("click",$.proxy(this.linkProcess,this));setTimeout(function(){$("#redactor_link_url").focus()},200)},this);this.modalInit(this.opts.curLang.link,this.opts.modal_link,460,callback)},linkProcess:function(){if(this.linkInsertPressed){return}this.linkInsertPressed=true;var target="",targetBlank="";var link=$("#redactor_link_url").val();var text=$("#redactor_link_url_text").val();if(link.search("@")!=-1&&/(http|ftp|https):\/\//i.test(link)===false){link="mailto:"+link}else{if(link.search("#")!=0){if($("#redactor_link_blank").prop("checked")){target=' target="_blank"';targetBlank="_blank"}var pattern="((xn--)?[a-z0-9]+(-[a-z0-9]+)*.)+[a-z]{2,}";var re=new RegExp("^(http|ftp|https)://"+pattern,"i");var re2=new RegExp("^"+pattern,"i");if(link.search(re)==-1&&link.search(re2)==0&&this.opts.linkProtocol){link=this.opts.linkProtocol+link}}}text=text.replace(/<|>/g,"");var extra=" ";if(this.browser("mozilla")){extra=" "}this.linkInsert('<a href="'+link+'"'+target+">"+text+"</a>"+extra,$.trim(text),link,targetBlank)},linkInsert:function(a,text,link,target){this.selectionRestore();if(text!==""){if(this.insert_link_node){this.bufferSet();$(this.insert_link_node).text(text).attr("href",link);if(target!==""){$(this.insert_link_node).attr("target",target)}else{$(this.insert_link_node).removeAttr("target")}}else{var $a=$(a).addClass("redactor-added-link");this.exec("inserthtml",this.outerHtml($a),false);var link=this.$editor.find("a.redactor-added-link");link.removeAttr("style").removeClass("redactor-added-link").each(function(){if(this.className==""){$(this).removeAttr("class")}})}this.sync()}setTimeout($.proxy(function(){if(this.opts.observeLinks){this.observeLinks()}},this),5);this.modalClose()},fileShow:function(){this.selectionSave();var callback=$.proxy(function(){var sel=this.getSelection();var text="";if(this.oldIE()){text=sel.text}else{text=sel.toString()}$("#redactor_filename").val(text);if(!this.isMobile()&&!this.isIPad()){this.draguploadInit("#redactor_file",{url:this.opts.fileUpload,uploadFields:this.opts.uploadFields,success:$.proxy(this.fileCallback,this),error:$.proxy(function(obj,json){this.callback("fileUploadError",json)},this),uploadParam:this.opts.fileUploadParam})}this.uploadInit("redactor_file",{auto:true,url:this.opts.fileUpload,success:$.proxy(this.fileCallback,this),error:$.proxy(function(obj,json){this.callback("fileUploadError",json)},this)})},this);this.modalInit(this.opts.curLang.file,this.opts.modal_file,500,callback)},fileCallback:function(json){this.selectionRestore();if(json!==false){var text=$("#redactor_filename").val();if(text===""){text=json.filename}var link='<a href="'+json.filelink+'" id="filelink-marker">'+text+"</a>";if(this.browser("webkit")&&!!this.window.chrome){link=link+" "}this.execCommand("inserthtml",link,false);var linkmarker=$(this.$editor.find("a#filelink-marker"));if(linkmarker.size()!=0){linkmarker.removeAttr("id")}else{linkmarker=false}this.sync();this.callback("fileUpload",linkmarker,json)}this.modalClose()},imageShow:function(){this.selectionSave();var callback=$.proxy(function(){if(this.opts.imageGetJson){$.getJSON(this.opts.imageGetJson,$.proxy(function(data){var folders={},count=0;$.each(data,$.proxy(function(key,val){if(typeof val.folder!=="undefined"){count++;folders[val.folder]=count}},this));var folderclass=false;$.each(data,$.proxy(function(key,val){var thumbtitle="";if(typeof val.title!=="undefined"){thumbtitle=val.title}var folderkey=0;if(!$.isEmptyObject(folders)&&typeof val.folder!=="undefined"){folderkey=folders[val.folder];if(folderclass===false){folderclass=".redactorfolder"+folderkey}}var img=$('<img src="'+val.thumb+'" class="redactorfolder redactorfolder'+folderkey+'" rel="'+val.image+'" title="'+thumbtitle+'" />');$("#redactor_image_box").append(img);$(img).click($.proxy(this.imageThumbClick,this))},this));if(!$.isEmptyObject(folders)){$(".redactorfolder").hide();$(folderclass).show();var onchangeFunc=function(e){$(".redactorfolder").hide();$(".redactorfolder"+$(e.target).val()).show()};var select=$('<select id="redactor_image_box_select">');$.each(folders,function(k,v){select.append($('<option value="'+v+'">'+k+"</option>"))});$("#redactor_image_box").before(select);select.change(onchangeFunc)}},this))}else{$("#redactor-tab-control-2").remove()}if(this.opts.imageUpload||this.opts.s3){if(!this.isMobile()&&!this.isIPad()&&this.opts.s3===false){if($("#redactor_file").length){this.draguploadInit("#redactor_file",{url:this.opts.imageUpload,uploadFields:this.opts.uploadFields,success:$.proxy(this.imageCallback,this),error:$.proxy(function(obj,json){this.callback("imageUploadError",json)},this),uploadParam:this.opts.imageUploadParam})}}if(this.opts.s3===false){this.uploadInit("redactor_file",{auto:true,url:this.opts.imageUpload,success:$.proxy(this.imageCallback,this),error:$.proxy(function(obj,json){this.callback("imageUploadError",json)},this)})}else{$("#redactor_file").on("change.redactor",$.proxy(this.s3handleFileSelect,this))}}else{$(".redactor_tab").hide();if(!this.opts.imageGetJson){$("#redactor_tabs").remove();$("#redactor_tab3").show()}else{$("#redactor-tab-control-1").remove();$("#redactor-tab-control-2").addClass("redactor_tabs_act");$("#redactor_tab2").show()}}if(!this.opts.imageTabLink&&(this.opts.imageUpload||this.opts.imageGetJson)){$("#redactor-tab-control-3").hide()}$("#redactor_upload_btn").click($.proxy(this.imageCallbackLink,this));if(!this.opts.imageUpload&&!this.opts.imageGetJson){setTimeout(function(){$("#redactor_file_link").focus()},200)}},this);this.modalInit(this.opts.curLang.image,this.opts.modal_image,610,callback)},imageEdit:function(image){var $el=image;var parent=$el.parent().parent();var callback=$.proxy(function(){$("#redactor_file_alt").val($el.attr("alt"));$("#redactor_image_edit_src").attr("href",$el.attr("src"));if($el.css("display")=="block"&&$el.css("float")=="none"){$("#redactor_form_image_align").val("center")}else{$("#redactor_form_image_align").val($el.css("float"))}if($(parent).get(0).tagName==="A"){$("#redactor_file_link").val($(parent).attr("href"));if($(parent).attr("target")=="_blank"){$("#redactor_link_blank").prop("checked",true)}}$("#redactor_image_delete_btn").click($.proxy(function(){this.imageRemove($el)},this));$("#redactorSaveBtn").click($.proxy(function(){this.imageSave($el)},this))},this);this.modalInit(this.opts.curLang.edit,this.opts.modal_image_edit,380,callback)},imageRemove:function(el){var parentLink=$(el).parent().parent();var parent=$(el).parent();var parentEl=false;if(parentLink.length&&parentLink[0].tagName==="A"){parentEl=true;$(parentLink).remove()}else{if(parent.length&&parent[0].tagName==="A"){parentEl=true;$(parent).remove()}else{$(el).remove()}}if(parent.length&&parent[0].tagName==="P"){this.focusWithSaveScroll();if(parentEl===false){this.selectionStart(parent)}}this.callback("imageDelete",el);this.modalClose();this.sync()},imageSave:function(el){this.imageResizeHide(false);var $el=$(el);var parent=$el.parent();$el.attr("alt",$("#redactor_file_alt").val());var floating=$("#redactor_form_image_align").val();var margin="";if(floating==="left"){margin="0 "+this.opts.imageFloatMargin+" "+this.opts.imageFloatMargin+" 0";$el.css({"float":"left",margin:margin})}else{if(floating==="right"){margin="0 0 "+this.opts.imageFloatMargin+" "+this.opts.imageFloatMargin+"";$el.css({"float":"right",margin:margin})}else{if(floating==="center"){$el.css({"float":"",display:"block",margin:"auto"})}else{$el.css({"float":"",display:"",margin:""})}}}var link=$.trim($("#redactor_file_link").val());if(link!==""){var target=false;if($("#redactor_link_blank").prop("checked")){target=true}if(parent.get(0).tagName!=="A"){var a=$('<a href="'+link+'">'+this.outerHtml(el)+"</a>");if(target){a.attr("target","_blank")}$el.replaceWith(a)}else{parent.attr("href",link);if(target){parent.attr("target","_blank")}else{parent.removeAttr("target")}}}else{if(parent.get(0).tagName==="A"){parent.replaceWith(this.outerHtml(el))}}this.modalClose();this.observeImages();this.sync()},imageResizeHide:function(e){if(e!==false&&$(e.target).parent().size()!=0&&$(e.target).parent()[0].id==="redactor-image-box"){return false}var imageBox=this.$editor.find("#redactor-image-box");if(imageBox.size()==0){return false}this.$editor.find("#redactor-image-editter, #redactor-image-resizer").remove();imageBox.find("img").css({marginTop:imageBox[0].style.marginTop,marginBottom:imageBox[0].style.marginBottom,marginLeft:imageBox[0].style.marginLeft,marginRight:imageBox[0].style.marginRight});imageBox.css("margin","");imageBox.find("img").css("opacity","");imageBox.replaceWith(function(){return $(this).contents()});$(document).off("click.redactor-image-resize-hide");this.$editor.off("click.redactor-image-resize-hide");this.$editor.off("keydown.redactor-image-delete");this.sync()},imageResize:function(image){var $image=$(image);$image.on("mousedown",$.proxy(function(){this.imageResizeHide(false)},this));$image.on("dragstart",$.proxy(function(){this.$editor.on("drop.redactor-image-inside-drop",$.proxy(function(){setTimeout($.proxy(function(){this.observeImages();this.$editor.off("drop.redactor-image-inside-drop");this.sync()},this),1)},this))},this));$image.on("click",$.proxy(function(e){if(this.$editor.find("#redactor-image-box").size()!=0){return false}var clicked=false,start_x,start_y,ratio=$image.width()/$image.height(),min_w=20,min_h=10;var imageResizer=this.imageResizeControls($image);var isResizing=false;if(imageResizer!==false){imageResizer.on("mousedown",function(e){isResizing=true;e.preventDefault();ratio=$image.width()/$image.height();start_x=Math.round(e.pageX-$image.eq(0).offset().left);start_y=Math.round(e.pageY-$image.eq(0).offset().top)});$(this.document.body).on("mousemove",$.proxy(function(e){if(isResizing){var mouse_x=Math.round(e.pageX-$image.eq(0).offset().left)-start_x;var mouse_y=Math.round(e.pageY-$image.eq(0).offset().top)-start_y;var div_h=$image.height();var new_h=parseInt(div_h,10)+mouse_y;var new_w=Math.round(new_h*ratio);if(new_w>min_w){$image.width(new_w);if(new_w<100){this.imageEditter.css({marginTop:"-7px",marginLeft:"-13px",fontSize:"9px",padding:"3px 5px"})}else{this.imageEditter.css({marginTop:"-11px",marginLeft:"-18px",fontSize:"11px",padding:"7px 10px"})}}start_x=Math.round(e.pageX-$image.eq(0).offset().left);start_y=Math.round(e.pageY-$image.eq(0).offset().top);this.sync()}},this)).on("mouseup",function(){isResizing=false})}this.$editor.on("keydown.redactor-image-delete",$.proxy(function(e){var key=e.which;if(this.keyCode.BACKSPACE==key||this.keyCode.DELETE==key){this.bufferSet(false);this.imageResizeHide(false);this.imageRemove($image)}},this));$(document).on("click.redactor-image-resize-hide",$.proxy(this.imageResizeHide,this));this.$editor.on("click.redactor-image-resize-hide",$.proxy(this.imageResizeHide,this))},this))},imageResizeControls:function($image){var imageBox=$('<span id="redactor-image-box" data-redactor="verified">');imageBox.css({position:"relative",display:"inline-block",lineHeight:0,outline:"1px dashed rgba(0, 0, 0, .6)","float":$image.css("float")});imageBox.attr("contenteditable",false);if($image[0].style.margin!="auto"){imageBox.css({marginTop:$image[0].style.marginTop,marginBottom:$image[0].style.marginBottom,marginLeft:$image[0].style.marginLeft,marginRight:$image[0].style.marginRight});$image.css("margin","")}else{imageBox.css({display:"block",margin:"auto"})}$image.css("opacity",0.5).after(imageBox);this.imageEditter=$('<span id="redactor-image-editter" data-redactor="verified">'+this.opts.curLang.edit+"</span>");this.imageEditter.css({position:"absolute",zIndex:5,top:"50%",left:"50%",marginTop:"-11px",marginLeft:"-18px",lineHeight:1,backgroundColor:"#000",color:"#fff",fontSize:"11px",padding:"7px 10px",cursor:"pointer"});this.imageEditter.attr("contenteditable",false);this.imageEditter.on("click",$.proxy(function(){this.imageEdit($image)},this));imageBox.append(this.imageEditter);if(this.opts.imageResizable){var imageResizer=$('<span id="redactor-image-resizer" data-redactor="verified"></span>');imageResizer.css({position:"absolute",zIndex:2,lineHeight:1,cursor:"nw-resize",bottom:"-4px",right:"-5px",border:"1px solid #fff",backgroundColor:"#000",width:"8px",height:"8px"});imageResizer.attr("contenteditable",false);imageBox.append(imageResizer);imageBox.append($image);return imageResizer}else{imageBox.append($image);return false}},imageThumbClick:function(e){var img='<img id="image-marker" src="'+$(e.target).attr("rel")+'" alt="'+$(e.target).attr("title")+'" />';var parent=this.getParent();if(this.opts.paragraphy&&$(parent).closest("li").size()==0){img="<p>"+img+"</p>"}this.imageInsert(img,true)},imageCallbackLink:function(){var val=$("#redactor_file_link").val();if(val!==""){var data='<img id="image-marker" src="'+val+'" />';if(this.opts.linebreaks===false){data="<p>"+data+"</p>"}this.imageInsert(data,true)}else{this.modalClose()}},imageCallback:function(data){this.imageInsert(data)},imageInsert:function(json,link){this.selectionRestore();if(json!==false){var html="";if(link!==true){html='<img id="image-marker" src="'+json.filelink+'" />';var parent=this.getParent();if(this.opts.paragraphy&&$(parent).closest("li").size()==0){html="<p>"+html+"</p>"}}else{html=json}this.execCommand("inserthtml",html,false);var image=$(this.$editor.find("img#image-marker"));if(image.length){image.removeAttr("id")}else{image=false}this.sync();link!==true&&this.callback("imageUpload",image,json)}this.modalClose();this.observeImages()},buildProgressBar:function(){if($("#redactor-progress").size()!=0){return}this.$progressBar=$('<div id="redactor-progress"><span></span></div>');$(document.body).append(this.$progressBar)},showProgressBar:function(){this.buildProgressBar();$("#redactor-progress").fadeIn()},hideProgressBar:function(){$("#redactor-progress").fadeOut(1500)},modalTemplatesInit:function(){$.extend(this.opts,{modal_file:String()+'<section id="redactor-modal-file-insert"><form id="redactorUploadFileForm" method="post" action="" enctype="multipart/form-data"><label>'+this.opts.curLang.filename+'</label><input type="text" id="redactor_filename" class="redactor_input" /><div style="margin-top: 7px;"><input type="file" id="redactor_file" name="'+this.opts.fileUploadParam+'" /></div></form></section>',modal_image_edit:String()+'<section id="redactor-modal-image-edit"><label>'+this.opts.curLang.title+'</label><input type="text" id="redactor_file_alt" class="redactor_input" /><label>'+this.opts.curLang.link+'</label><input type="text" id="redactor_file_link" class="redactor_input" /><label><input type="checkbox" id="redactor_link_blank"> '+this.opts.curLang.link_new_tab+"</label><label>"+this.opts.curLang.image_position+'</label><select id="redactor_form_image_align"><option value="none">'+this.opts.curLang.none+'</option><option value="left">'+this.opts.curLang.left+'</option><option value="center">'+this.opts.curLang.center+'</option><option value="right">'+this.opts.curLang.right+'</option></select></section><footer><button id="redactor_image_delete_btn" class="redactor_modal_btn redactor_modal_delete_btn">'+this.opts.curLang._delete+'</button><button class="redactor_modal_btn redactor_btn_modal_close">'+this.opts.curLang.cancel+'</button><button id="redactorSaveBtn" class="redactor_modal_btn redactor_modal_action_btn">'+this.opts.curLang.save+"</button></footer>",modal_image:String()+'<section id="redactor-modal-image-insert"><div id="redactor_tabs"><a href="#" id="redactor-tab-control-1" class="redactor_tabs_act">'+this.opts.curLang.upload+'</a><a href="#" id="redactor-tab-control-2">'+this.opts.curLang.choose+'</a><a href="#" id="redactor-tab-control-3">'+this.opts.curLang.link+'</a></div><form id="redactorInsertImageForm" method="post" action="" enctype="multipart/form-data"><div id="redactor_tab1" class="redactor_tab"><input type="file" id="redactor_file" name="'+this.opts.imageUploadParam+'" /></div><div id="redactor_tab2" class="redactor_tab" style="display: none;"><div id="redactor_image_box"></div></div></form><div id="redactor_tab3" class="redactor_tab" style="display: none;"><label>'+this.opts.curLang.image_web_link+'</label><input type="text" name="redactor_file_link" id="redactor_file_link" class="redactor_input" /><br><br></div></section><footer><button class="redactor_modal_btn redactor_btn_modal_close">'+this.opts.curLang.cancel+'</button><button class="redactor_modal_btn redactor_modal_action_btn" id="redactor_upload_btn">'+this.opts.curLang.insert+"</button></footer>",modal_link:String()+'<section id="redactor-modal-link-insert"><select id="redactor-predefined-links" style="width: 99.5%; display: none;"></select><label>URL</label><input type="text" class="redactor_input" id="redactor_link_url" /><label>'+this.opts.curLang.text+'</label><input type="text" class="redactor_input" id="redactor_link_url_text" /><label><input type="checkbox" id="redactor_link_blank"> '+this.opts.curLang.link_new_tab+'</label></section><footer><button class="redactor_modal_btn redactor_btn_modal_close">'+this.opts.curLang.cancel+'</button><button id="redactor_insert_link_btn" class="redactor_modal_btn redactor_modal_action_btn">'+this.opts.curLang.insert+"</button></footer>",modal_table:String()+'<section id="redactor-modal-table-insert"><label>'+this.opts.curLang.rows+'</label><input type="text" size="5" value="2" id="redactor_table_rows" /><label>'+this.opts.curLang.columns+'</label><input type="text" size="5" value="3" id="redactor_table_columns" /></section><footer><button class="redactor_modal_btn redactor_btn_modal_close">'+this.opts.curLang.cancel+'</button><button id="redactor_insert_table_btn" class="redactor_modal_btn redactor_modal_action_btn">'+this.opts.curLang.insert+"</button></footer>",modal_video:String()+'<section id="redactor-modal-video-insert"><form id="redactorInsertVideoForm"><label>'+this.opts.curLang.video_html_code+'</label><textarea id="redactor_insert_video_area" style="width: 99%; height: 160px;"></textarea></form></section><footer><button class="redactor_modal_btn redactor_btn_modal_close">'+this.opts.curLang.cancel+'</button><button id="redactor_insert_video_btn" class="redactor_modal_btn redactor_modal_action_btn">'+this.opts.curLang.insert+"</button></footer>"})},modalInit:function(title,content,width,callback){this.modalSetOverlay();this.$redactorModalWidth=width;this.$redactorModal=$("#redactor_modal");if(!this.$redactorModal.length){this.$redactorModal=$('<div id="redactor_modal" style="display: none;" />');this.$redactorModal.append($('<div id="redactor_modal_close">×</div>'));this.$redactorModal.append($('<header id="redactor_modal_header" />'));this.$redactorModal.append($('<div id="redactor_modal_inner" />'));this.$redactorModal.appendTo(document.body)}$("#redactor_modal_close").on("click",$.proxy(this.modalClose,this));$(document).on("keyup",$.proxy(this.modalCloseHandler,this));this.$editor.on("keyup",$.proxy(this.modalCloseHandler,this));this.modalSetContent(content);this.modalSetTitle(title);this.modalSetDraggable();this.modalLoadTabs();this.modalOnCloseButton();this.modalSetButtonsWidth();this.saveModalScroll=this.document.body.scrollTop;if(this.opts.autoresize===false){this.saveModalScroll=this.$editor.scrollTop()}if(this.isMobile()===false){this.modalShowOnDesktop()}else{this.modalShowOnMobile()}if(typeof callback==="function"){callback()}setTimeout($.proxy(function(){this.callback("modalOpened",this.$redactorModal)},this),11);$(document).off("focusin.modal");this.$redactorModal.find("input[type=text]").on("keypress",$.proxy(function(e){if(e.which===13){this.$redactorModal.find(".redactor_modal_action_btn").click();e.preventDefault()}},this));return this.$redactorModal},modalShowOnDesktop:function(){this.$redactorModal.css({position:"fixed",top:"-2000px",left:"50%",width:this.$redactorModalWidth+"px",marginLeft:"-"+(this.$redactorModalWidth/2)+"px"}).show();this.modalSaveBodyOveflow=$(document.body).css("overflow");$(document.body).css("overflow","hidden");setTimeout($.proxy(function(){var height=this.$redactorModal.outerHeight();this.$redactorModal.css({top:"50%",height:"auto",minHeight:"auto",marginTop:"-"+(height+10)/2+"px"})},this),15)},modalShowOnMobile:function(){this.$redactorModal.css({position:"fixed",width:"100%",height:"100%",top:"0",left:"0",margin:"0",minHeight:"300px"}).show()},modalSetContent:function(content){this.modalcontent=false;if(content.indexOf("#")==0){this.modalcontent=$(content);$("#redactor_modal_inner").empty().append(this.modalcontent.html());this.modalcontent.html("")}else{$("#redactor_modal_inner").empty().append(content)}},modalSetTitle:function(title){this.$redactorModal.find("#redactor_modal_header").html(title)},modalSetButtonsWidth:function(){var buttons=this.$redactorModal.find("footer button").not(".redactor_modal_btn_hidden");var buttonsSize=buttons.size();if(buttonsSize>0){$(buttons).css("width",(this.$redactorModalWidth/buttonsSize)+"px")}},modalOnCloseButton:function(){this.$redactorModal.find(".redactor_btn_modal_close").on("click",$.proxy(this.modalClose,this))},modalSetOverlay:function(){if(this.opts.modalOverlay){this.$redactorModalOverlay=$("#redactor_modal_overlay");if(!this.$redactorModalOverlay.length){this.$redactorModalOverlay=$('<div id="redactor_modal_overlay" style="display: none;"></div>');$("body").prepend(this.$redactorModalOverlay)}this.$redactorModalOverlay.show().on("click",$.proxy(this.modalClose,this))}},modalSetDraggable:function(){if(typeof $.fn.draggable!=="undefined"){this.$redactorModal.draggable({handle:"#redactor_modal_header"});this.$redactorModal.find("#redactor_modal_header").css("cursor","move")}},modalLoadTabs:function(){var $redactor_tabs=$("#redactor_tabs");if(!$redactor_tabs.length){return false}var that=this;$redactor_tabs.find("a").each(function(i,s){i++;$(s).on("click",function(e){e.preventDefault();$redactor_tabs.find("a").removeClass("redactor_tabs_act");$(this).addClass("redactor_tabs_act");$(".redactor_tab").hide();$("#redactor_tab"+i).show();$("#redactor_tab_selected").val(i);if(that.isMobile()===false){var height=that.$redactorModal.outerHeight();that.$redactorModal.css("margin-top","-"+(height+10)/2+"px")}})})},modalCloseHandler:function(e){if(e.keyCode===this.keyCode.ESC){this.modalClose();return false}},modalClose:function(){$("#redactor_modal_close").off("click",this.modalClose);$("#redactor_modal").fadeOut("fast",$.proxy(function(){var redactorModalInner=$("#redactor_modal_inner");if(this.modalcontent!==false){this.modalcontent.html(redactorModalInner.html());this.modalcontent=false}redactorModalInner.html("");if(this.opts.modalOverlay){$("#redactor_modal_overlay").hide().off("click",this.modalClose)}$(document).off("keyup",this.modalCloseHandler);this.$editor.off("keyup",this.modalCloseHandler);this.selectionRestore();if(this.opts.autoresize&&this.saveModalScroll){$(this.document.body).scrollTop(this.saveModalScroll)}else{if(this.opts.autoresize===false&&this.saveModalScroll){this.$editor.scrollTop(this.saveModalScroll)}}this.callback("modalClosed")},this));if(this.isMobile()===false){$(document.body).css("overflow",this.modalSaveBodyOveflow?this.modalSaveBodyOveflow:"visible")}return false},modalSetTab:function(num){$(".redactor_tab").hide();$("#redactor_tabs").find("a").removeClass("redactor_tabs_act").eq(num-1).addClass("redactor_tabs_act");$("#redactor_tab"+num).show()},s3handleFileSelect:function(e){var files=e.target.files;for(var i=0,f;f=files[i];i++){this.s3uploadFile(f)}},s3uploadFile:function(file){this.s3executeOnSignedUrl(file,$.proxy(function(signedURL){this.s3uploadToS3(file,signedURL)},this))},s3executeOnSignedUrl:function(file,callback){var xhr=new XMLHttpRequest();var mark="?";if(this.opts.s3.search(/\?/)!="-1"){mark="&"}xhr.open("GET",this.opts.s3+mark+"name="+file.name+"&type="+file.type,true);if(xhr.overrideMimeType){xhr.overrideMimeType("text/plain; charset=x-user-defined")}var that=this;xhr.onreadystatechange=function(e){if(this.readyState==4&&this.status==200){that.showProgressBar();callback(decodeURIComponent(this.responseText))}else{if(this.readyState==4&&this.status!=200){}}};xhr.send()},s3createCORSRequest:function(method,url){var xhr=new XMLHttpRequest();if("withCredentials" in xhr){xhr.open(method,url,true)}else{if(typeof XDomainRequest!="undefined"){xhr=new XDomainRequest();xhr.open(method,url)}else{xhr=null}}return xhr},s3uploadToS3:function(file,url){var xhr=this.s3createCORSRequest("PUT",url);if(!xhr){}else{xhr.onload=$.proxy(function(){if(xhr.status==200){this.hideProgressBar();var s3image=url.split("?");if(!s3image[0]){return false}this.selectionRestore();var html="";html='<img id="image-marker" src="'+s3image[0]+'" />';if(this.opts.paragraphy){html="<p>"+html+"</p>"}this.execCommand("inserthtml",html,false);var image=$(this.$editor.find("img#image-marker"));if(image.length){image.removeAttr("id")}else{image=false}this.sync();this.callback("imageUpload",image,false);this.modalClose();this.observeImages()}else{}},this);xhr.onerror=function(){};xhr.upload.onprogress=function(e){};xhr.setRequestHeader("Content-Type",file.type);xhr.setRequestHeader("x-amz-acl","public-read");xhr.send(file)}},uploadInit:function(el,options){this.uploadOptions={url:false,success:false,error:false,start:false,trigger:false,auto:false,input:false};$.extend(this.uploadOptions,options);var $el=$("#"+el);if($el.length&&$el[0].tagName==="INPUT"){this.uploadOptions.input=$el;this.el=$($el[0].form)}else{this.el=$el}this.element_action=this.el.attr("action");if(this.uploadOptions.auto){$(this.uploadOptions.input).change($.proxy(function(e){this.el.submit(function(e){return false});this.uploadSubmit(e)},this))}else{if(this.uploadOptions.trigger){$("#"+this.uploadOptions.trigger).click($.proxy(this.uploadSubmit,this))}}},uploadSubmit:function(e){this.showProgressBar();this.uploadForm(this.element,this.uploadFrame())},uploadFrame:function(){this.id="f"+Math.floor(Math.random()*99999);var d=this.document.createElement("div");var iframe='<iframe style="display:none" id="'+this.id+'" name="'+this.id+'"></iframe>';d.innerHTML=iframe;$(d).appendTo("body");if(this.uploadOptions.start){this.uploadOptions.start()}$("#"+this.id).load($.proxy(this.uploadLoaded,this));return this.id},uploadForm:function(f,name){if(this.uploadOptions.input){var formId="redactorUploadForm"+this.id,fileId="redactorUploadFile"+this.id;this.form=$('<form action="'+this.uploadOptions.url+'" method="POST" target="'+name+'" name="'+formId+'" id="'+formId+'" enctype="multipart/form-data" />');if(this.opts.uploadFields!==false&&typeof this.opts.uploadFields==="object"){$.each(this.opts.uploadFields,$.proxy(function(k,v){if(v!=null&&v.toString().indexOf("#")===0){v=$(v).val()}var hidden=$("<input/>",{type:"hidden",name:k,value:v});$(this.form).append(hidden)},this))}var oldElement=this.uploadOptions.input;var newElement=$(oldElement).clone();$(oldElement).attr("id",fileId).before(newElement).appendTo(this.form);$(this.form).css("position","absolute").css("top","-2000px").css("left","-2000px").appendTo("body");this.form.submit()}else{f.attr("target",name).attr("method","POST").attr("enctype","multipart/form-data").attr("action",this.uploadOptions.url);this.element.submit()}},uploadLoaded:function(){var i=$("#"+this.id)[0],d;if(i.contentDocument){d=i.contentDocument}else{if(i.contentWindow){d=i.contentWindow.document}else{d=window.frames[this.id].document}}if(this.uploadOptions.success){this.hideProgressBar();if(typeof d!=="undefined"){var rawString=d.body.innerHTML;var jsonString=rawString.match(/\{(.|\n)*\}/)[0];jsonString=jsonString.replace(/^\[/,"");jsonString=jsonString.replace(/\]$/,"");var json=$.parseJSON(jsonString);if(typeof json.error=="undefined"){this.uploadOptions.success(json)}else{this.uploadOptions.error(this,json);this.modalClose()}}else{this.modalClose();alert("Upload failed!")}}this.el.attr("action",this.element_action);this.el.attr("target","")},draguploadInit:function(el,options){this.draguploadOptions=$.extend({url:false,success:false,error:false,preview:false,uploadFields:false,text:this.opts.curLang.drop_file_here,atext:this.opts.curLang.or_choose,uploadParam:false},options);if(window.FormData===undefined){return false}this.droparea=$('<div class="redactor_droparea"></div>');this.dropareabox=$('<div class="redactor_dropareabox">'+this.draguploadOptions.text+"</div>");this.dropalternative=$('<div class="redactor_dropalternative">'+this.draguploadOptions.atext+"</div>");this.droparea.append(this.dropareabox);$(el).before(this.droparea);$(el).before(this.dropalternative);this.dropareabox.on("dragover",$.proxy(function(){return this.draguploadOndrag()},this));this.dropareabox.on("dragleave",$.proxy(function(){return this.draguploadOndragleave()},this));this.dropareabox.get(0).ondrop=$.proxy(function(e){e.preventDefault();this.dropareabox.removeClass("hover").addClass("drop");this.showProgressBar();this.dragUploadAjax(this.draguploadOptions.url,e.dataTransfer.files[0],false,e,this.draguploadOptions.uploadParam)},this)},dragUploadAjax:function(url,file,directupload,e,uploadParam){if(!directupload){var xhr=$.ajaxSettings.xhr();if(xhr.upload){xhr.upload.addEventListener("progress",$.proxy(this.uploadProgress,this),false)}$.ajaxSetup({xhr:function(){return xhr}})}this.callback("drop",e);var fd=new FormData();if(uploadParam!==false){fd.append(uploadParam,file)}else{fd.append("file",file)}if(this.opts.uploadFields!==false&&typeof this.opts.uploadFields==="object"){$.each(this.opts.uploadFields,$.proxy(function(k,v){if(v!=null&&v.toString().indexOf("#")===0){v=$(v).val()}fd.append(k,v)},this))}$.ajax({url:url,dataType:"html",data:fd,cache:false,contentType:false,processData:false,type:"POST",success:$.proxy(function(data){data=data.replace(/^\[/,"");data=data.replace(/\]$/,"");var json=(typeof data==="string"?$.parseJSON(data):data);this.hideProgressBar();if(directupload){var $img=$("<img>");$img.attr("src",json.filelink).attr("id","drag-image-marker");this.insertNodeToCaretPositionFromPoint(e,$img[0]);var image=$(this.$editor.find("img#drag-image-marker"));if(image.length){image.removeAttr("id")}else{image=false}this.sync();this.observeImages();if(image){this.callback("imageUpload",image,json)}if(typeof json.error!=="undefined"){this.callback("imageUploadError",json)}}else{if(typeof json.error=="undefined"){this.draguploadOptions.success(json)}else{this.draguploadOptions.error(this,json);this.draguploadOptions.success(false)}}},this)})},draguploadOndrag:function(){this.dropareabox.addClass("hover");return false},draguploadOndragleave:function(){this.dropareabox.removeClass("hover");return false},uploadProgress:function(e,text){var percent=e.loaded?parseInt(e.loaded/e.total*100,10):e;this.dropareabox.text("Loading "+percent+"% "+(text||""))},isMobile:function(){return/(iPhone|iPod|BlackBerry|Android)/.test(navigator.userAgent)},isIPad:function(){return/iPad/.test(navigator.userAgent)},normalize:function(str){if(typeof(str)==="undefined"){return 0}return parseInt(str.replace("px",""),10)},outerHtml:function(el){return $("<div>").append($(el).eq(0).clone()).html()},stripHtml:function(html){var tmp=document.createElement("DIV");tmp.innerHTML=html;return tmp.textContent||tmp.innerText||""},isString:function(obj){return Object.prototype.toString.call(obj)=="[object String]"},isEmpty:function(html){html=html.replace(/|<br>|<br\/>| /gi,"");html=html.replace(/\s/g,"");html=html.replace(/^<p>[^\W\w\D\d]*?<\/p>$/i,"");return html==""},getInternetExplorerVersion:function(){var rv=false;if(navigator.appName=="Microsoft Internet Explorer"){var ua=navigator.userAgent;var re=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})");if(re.exec(ua)!=null){rv=parseFloat(RegExp.$1)}}return rv},isIe11:function(){return !!navigator.userAgent.match(/Trident\/7\./)},browser:function(browser){var ua=navigator.userAgent.toLowerCase();var match=/(opr)[\/]([\w.]+)/.exec(ua)||/(chrome)[ \/]([\w.]+)/.exec(ua)||/(webkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(ua)||/(webkit)[ \/]([\w.]+)/.exec(ua)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua)||/(msie) ([\w.]+)/.exec(ua)||ua.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(ua)||ua.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)||[];if(browser=="version"){return match[2]}if(browser=="webkit"){return(match[1]=="chrome"||match[1]=="webkit")}if(match[1]=="rv"){return browser=="msie"}if(match[1]=="opr"){return browser=="webkit"}return browser==match[1]},oldIE:function(){if(this.browser("msie")&&parseInt(this.browser("version"),10)<9){return true}return false},getFragmentHtml:function(fragment){var cloned=fragment.cloneNode(true);var div=this.document.createElement("div");div.appendChild(cloned);return div.innerHTML},extractContent:function(){var node=this.$editor[0];var frag=this.document.createDocumentFragment();var child;while((child=node.firstChild)){frag.appendChild(child)}return frag},isParentRedactor:function(el){if(!el){return false}if(this.opts.iframe){return el}if($(el).parents("div.redactor_editor").length==0||$(el).hasClass("redactor_editor")){return false}else{return el}},currentOrParentIs:function(tagName){var parent=this.getParent(),current=this.getCurrent();return parent&&parent.tagName===tagName?parent:current&¤t.tagName===tagName?current:false},isEndOfElement:function(){var current=this.getBlock();var offset=this.getCaretOffset(current);var text=$.trim($(current).text()).replace(/\n\r\n/g,"");var len=text.length;if(offset==len){return true}else{return false}},isFocused:function(){var el,sel=this.getSelection();if(sel&&sel.rangeCount&&sel.rangeCount>0){el=sel.getRangeAt(0).startContainer}if(!el){return false}if(this.opts.iframe){if(this.getCaretOffsetRange().equals()){return !this.$editor.is(el)}else{return true}}return $(el).closest("div.redactor_editor").length!=0},removeEmptyAttr:function(el,attr){if($(el).attr(attr)==""){$(el).removeAttr(attr)}},removeFromArrayByValue:function(array,value){var index=null;while((index=array.indexOf(value))!==-1){array.splice(index,1)}return array}};Redactor.prototype.init.prototype=Redactor.prototype;$.Redactor.fn.formatLinkify=function(protocol,convertLinks,convertImageLinks,convertVideoLinks,linkSize){var url=/(((https?|ftps?):\/\/)|www[.][^\s])(.+?\..+?)([.),]?)(\s|\.\s+|\)|$)/gi,rProtocol=/(https?|ftp):\/\//i,urlImage=/(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/gi;var childNodes=(this.$editor?this.$editor.get(0):this).childNodes,i=childNodes.length;while(i--){var n=childNodes[i];if(n.nodeType===3){var html=n.nodeValue;if(convertVideoLinks&&html){var iframeStart='<iframe width="500" height="281" src="',iframeEnd='" frameborder="0" allowfullscreen></iframe>';if(html.match(reUrlYoutube)){html=html.replace(reUrlYoutube,iframeStart+"//www.youtube.com/embed/$1"+iframeEnd);$(n).after(html).remove()}else{if(html.match(reUrlVimeo)){html=html.replace(reUrlVimeo,iframeStart+"//player.vimeo.com/video/$2"+iframeEnd);$(n).after(html).remove()}}}if(convertImageLinks&&html&&html.match(urlImage)){html=html.replace(urlImage,'<img src="$1">');$(n).after(html).remove()}if(convertLinks&&html&&html.match(url)){var matches=html.match(url);for(var i in matches){var href=matches[i];var text=href;var space="";if(href.match(/\s$/)!==null){space=" "}var addProtocol=protocol;if(href.match(rProtocol)!==null){addProtocol=""}if(text.length>linkSize){text=text.substring(0,linkSize)+"..."}text=text.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">");var escapedBackReferences=text.replace("$","$$$");html=html.replace(href,'<a href="'+addProtocol+$.trim(href)+'">'+$.trim(escapedBackReferences)+"</a>"+space)}$(n).after(html).remove()}}else{if(n.nodeType===1&&!/^(a|button|textarea)$/i.test(n.tagName)){$.Redactor.fn.formatLinkify.call(n,protocol,convertLinks,convertImageLinks,convertVideoLinks,linkSize)}}}}})(jQuery);
\ No newline at end of file
diff --git a/behaviors/Fields.php b/behaviors/Fields.php
new file mode 100644
index 0000000..e1d8643
--- /dev/null
+++ b/behaviors/Fields.php
@@ -0,0 +1,115 @@
+<?php
+namespace yii\easyii\behaviors;
+
+use yii\base\Behavior;
+use yii\easyii\components\CategoryWithFieldsModel;
+use yii\easyii\helpers\Image;
+use yii\easyii\helpers\Upload;
+use yii\easyii\widgets\DateTimePicker;
+use yii\easyii\widgets\GooglePlacesAutoComplete;
+use yii\helpers\Html;
+use yii\validators\FileValidator;
+use yii\web\UploadedFile;
+
+class Fields extends Behavior
+{
+ public function generateForm($fields, $data = null)
+ {
+ $result = '';
+ foreach($fields as $field)
+ {
+ $value = !empty($data->{$field->name}) ? $data->{$field->name} : null;
+ if ($field->type === CategoryWithFieldsModel::FIELD_TYPE_STRING) {
+ $result .= '<div class="form-group"><label>'. $field->title .'</label>'. Html::input('text', "Data[{$field->name}]", $value, ['class' => 'form-control']) .'</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_TEXT) {
+ $result .= '<div class="form-group"><label>'. $field->title .'</label>'. Html::textarea("Data[{$field->name}]", $value, ['class' => 'form-control']) .'</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_HTML) {
+ $result .= '<div class="form-group"><label>'. $field->title .'</label>';
+ $result .= \yii\easyii\widgets\Redactor::widget([
+ 'name' => "Data[{$field->name}]",
+ 'value' => $value,
+ ]);
+ $result .= '</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_BOOLEAN) {
+ $result .= '<div class="checkbox"><label>'. Html::checkbox("Data[{$field->name}]", $value, ['uncheck' => 0]) .' '. $field->title .'</label></div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_SELECT) {
+ $options = ['' => \Yii::t('easyii', 'Select')];
+ foreach($field->options as $option){
+ $options[$option] = $option;
+ }
+ $result .= '<div class="form-group"><label>'. $field->title .'</label><select name="Data['.$field->name.']" class="form-control">'. Html::renderSelectOptions($value, $options) .'</select></div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_CHECKBOX) {
+ $options = '';
+ foreach($field->options as $option){
+ $checked = $value && in_array($option, $value);
+ $options .= '<br><label>'. Html::checkbox("Data[{$field->name}][]", $checked, ['value' => $option]) .' '. $option .'</label>';
+ }
+ $result .= '<div class="checkbox well well-sm"><b>'. $field->title .'</b>'. $options .'</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_FILE) {
+ $result .= '<div class="form-group"><label>'. $field->title .'</label><p>';
+ if($value != ''){
+ $basename = basename($value);
+ $isImage = preg_match('/\.(jpg|jpeg|png|gif|bmp)$/', $basename);
+
+ if($isImage) {
+ $result .= Html::a(Html::img(Image::thumb($value, 240, 180)), Upload::getFileUrl($value), ['class' => 'fancybox']);
+ } else {
+ $result .= Html::a($basename, [$value], ['target' => 'blank']);
+ }
+ $result .= ' ' . Html::a($isImage ? \Yii::t('easyii', 'Delete') : '<i class="glyphicon glyphicon-remove"></i>', ['/admin/' . $this->owner->module->id . '/a/delete-data-file', 'file' => $basename], ['class' => 'confirm-delete', 'data-reload' => 1, 'title' => \Yii::t('easyii', 'Delete')]);
+ }
+ $result .= '</p>' . Html::fileInput("Data[{$field->name}]"). '</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_DATE) {
+ $result .= '<div class="form-group"><label>'. $field->title .'</label>';
+ $result .= DateTimePicker::widget(['name' => "Data[{$field->name}]", 'value' => $value]);
+ $result .= '</div>';
+ }
+ elseif ($field->type === CategoryWithFieldsModel::FIELD_TYPE_ADDRESS) {
+ $autocompleteOptions = [];
+ if($field->options) {
+ $autocompleteOptions['componentRestrictions'] = ['country' => $field->options];
+ }
+ $result .= '<div class="form-group"><label>'. $field->title .'</label>';
+ $result .= GooglePlacesAutoComplete::widget([
+ 'name' => "Data[{$field->name}]",
+ 'value' => $value,
+ 'options' => ['class' => 'form-control'],
+ 'autocompleteOptions' => $autocompleteOptions
+ ]);
+ $result .= '</div>';
+ }
+ }
+ return $result;
+ }
+
+ public function parseData($model)
+ {
+ $data = \Yii::$app->request->post('Data');
+
+ if(isset($_FILES['Data']))
+ {
+ foreach($_FILES['Data']['name'] as $fieldName => $sourceName){
+ $field = $model->category->getFieldByName($fieldName);
+ $validator = new FileValidator(['extensions' => $field->options ? $field->options : null]);
+ $uploadInstance = UploadedFile::getInstanceByName('Data['.$fieldName.']');
+ if($uploadInstance && $validator->validate($uploadInstance) && ($result = Upload::file($uploadInstance, 'entity', false))) {
+ if(!empty($model->data->{$fieldName})){
+ Upload::delete($model->data->{$fieldName});
+ }
+ $data[$fieldName] = $result;
+ } else {
+ $data[$fieldName] = !empty($model->data->{$fieldName}) ? $model->data->{$fieldName} : '';
+ }
+ }
+ }
+
+ return $data;
+ }
+}
\ No newline at end of file
diff --git a/behaviors/ImageFile.php b/behaviors/ImageFile.php
new file mode 100644
index 0000000..3bfae44
--- /dev/null
+++ b/behaviors/ImageFile.php
@@ -0,0 +1,89 @@
+<?php
+namespace yii\easyii\behaviors;
+
+use Yii;
+use yii\db\ActiveRecord;
+use yii\easyii\components\Module;
+use yii\easyii\helpers\Image;
+use yii\easyii\helpers\Upload;
+use yii\easyii\models\SeoText;
+use yii\web\UploadedFile;
+
+class ImageFile extends \yii\base\Behavior
+{
+ private $_model;
+
+ public function events()
+ {
+ return [
+ ActiveRecord::EVENT_BEFORE_VALIDATE => 'beforeValidate',
+ ActiveRecord::EVENT_BEFORE_UPDATE => 'beforeUpdate',
+ ActiveRecord::EVENT_BEFORE_INSERT => 'beforeInsert',
+ ActiveRecord::EVENT_AFTER_DELETE => 'afterDelete',
+ ];
+ }
+
+ public function beforeValidate()
+ {
+ if(!empty($_FILES)){
+ $this->owner->image_file = UploadedFile::getInstance($this->owner, 'image_file');
+ }
+ }
+
+ public function beforeInsert()
+ {
+ $model = $this->owner;
+ if ($model->image_file instanceof UploadedFile) {
+ $model->image_file = Image::upload($model->image_file, Module::getModuleName(get_class($model)));
+ if(!$model->image_file) {
+ $model->image_file = !$model->isNewRecord ? '' : $model->oldAttributes['image_file'];
+ }
+ }
+ }
+
+ public function beforeUpdate()
+ {
+ if(!empty($_FILES)){
+ $model = $this->owner;
+
+ $model->image_file = UploadedFile::getInstance($model, 'image_file');
+ if($model->image_file && $model->validate(['image_file'])){
+ $model->image_file = Image::upload($model->image_file, Module::getModuleName(get_class($model)));
+ if($model->oldAttributes['image_file']){
+ Upload::delete($model->oldAttributes['image_file']);
+ }
+ }
+ else{
+ $model->image_file = $model->oldAttributes['image_file'];
+ }
+ }
+ }
+
+ public function afterDelete()
+ {
+ if($this->owner->image_file){
+ Upload::delete($this->owner->image_file);
+ }
+ }
+
+ public function getImage()
+ {
+ return Upload::getFileUrl($this->owner->image_file);
+ }
+
+ public function getSeoText()
+ {
+ if(!$this->_model)
+ {
+ $this->_model = $this->owner->seo;
+ if(!$this->_model){
+ $this->_model = new SeoText([
+ 'class' => get_class($this->owner),
+ 'item_id' => $this->owner->primaryKey
+ ]);
+ }
+ }
+
+ return $this->_model;
+ }
+}
\ No newline at end of file
diff --git a/behaviors/JsonColumns.php b/behaviors/JsonColumns.php
new file mode 100644
index 0000000..3e713df
--- /dev/null
+++ b/behaviors/JsonColumns.php
@@ -0,0 +1,53 @@
+<?php
+namespace yii\easyii\behaviors;
+
+use Yii;
+use yii\db\ActiveRecord;
+
+/**
+ * JsonColumns behavior
+ * @package yii\easyii\behaviors
+ * @inheritdoc
+ */
+class JsonColumns extends \yii\base\Behavior
+{
+ /** @var array */
+ public $columns = [];
+
+ public function events()
+ {
+ return [
+ ActiveRecord::EVENT_BEFORE_INSERT => 'encodeJson',
+ ActiveRecord::EVENT_BEFORE_UPDATE => 'encodeJson',
+ ActiveRecord::EVENT_AFTER_INSERT => 'decodeJson',
+ ActiveRecord::EVENT_AFTER_UPDATE => 'decodeJson',
+ ActiveRecord::EVENT_AFTER_FIND => 'decodeJson',
+ ];
+ }
+
+ public function encodeJson()
+ {
+ foreach($this->columns as $attribute) {
+ if(array_key_exists($attribute, $this->owner->attributes)) {
+ $data = $this->owner->{$attribute};
+ if (!$data || (!is_array($data) && !is_object($data))) {
+ $data = new \stdClass();
+ }
+ $this->owner->{$attribute} = json_encode($data);
+ }
+ }
+ }
+
+ public function decodeJson()
+ {
+ foreach($this->columns as $attribute) {
+ if(array_key_exists($attribute, $this->owner->attributes)) {
+ $data = $this->owner->{$attribute};
+ if($data && is_string($data)) {
+ $data = json_decode($data);
+ }
+ $this->owner->{$attribute} = ($data && (is_array($data) || is_object($data))) ? $data : new \stdClass();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/behaviors/SlugBehavior.php b/behaviors/SlugBehavior.php
new file mode 100644
index 0000000..d5687e4
--- /dev/null
+++ b/behaviors/SlugBehavior.php
@@ -0,0 +1,41 @@
+<?php
+namespace yii\easyii\behaviors;
+
+use yii\behaviors\SluggableBehavior;
+use yii\db\BaseActiveRecord;
+use yii\easyii\components\ActiveRecord;
+
+class SlugBehavior extends SluggableBehavior
+{
+ public $attributes = [BaseActiveRecord::EVENT_BEFORE_VALIDATE => 'slug'];
+ public $attribute = 'title';
+ public $ensureUnique = true;
+
+ /**
+ * @inheritdoc
+ */
+ protected function getValue($event)
+ {
+ if($this->isEnteredManually()) {
+ $slug = $this->owner->{$this->slugAttribute};
+ if(!$this->validateSlug($slug)) {
+ $this->owner->addError($this->slugAttribute, \Yii::t('yii', '{attribute} "{value}" has already been taken.', ['attribute' => \Yii::t('easyii', 'Slug'), 'value' => $slug]));
+ return null;
+ }
+ return $slug;
+ } else {
+ return parent::getValue($event);
+ }
+ }
+
+ protected function isEnteredManually()
+ {
+ if($this->owner->isNewRecord && !empty($this->owner->{$this->slugAttribute})) {
+ return true;
+ }
+ if(!$this->owner->isNewRecord && $this->owner->isAttributeChanged($this->slugAttribute) && !$this->immutable) {
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/behaviors/SortableController.php b/behaviors/SortableController.php
deleted file mode 100644
index 5e50024..0000000
--- a/behaviors/SortableController.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-namespace yii\easyii\behaviors;
-
-use Yii;
-
-class SortableController extends \yii\base\Behavior
-{
- public $model;
-
- public function move($id, $direction, $condition = [])
- {
- $modelClass = $this->model;
- $success = '';
- if (($model = $modelClass::findOne($id))) {
- if ($direction === 'up') {
- $eq = '>';
- $orderDir = 'ASC';
- } else {
- $eq = '<';
- $orderDir = 'DESC';
- }
-
- $query = $modelClass::find()->orderBy('order_num ' . $orderDir)->limit(1);
-
- $where = [$eq, 'order_num', $model->order_num];
- if (count($condition)) {
- $where = ['and', $where];
- foreach ($condition as $key => $value) {
- $where[] = [$key => $value];
- }
- }
- $modelSwap = $query->where($where)->one();
-
- if (!empty($modelSwap)) {
- $newOrderNum = $modelSwap->order_num;
-
- $modelSwap->order_num = $model->order_num;
- $modelSwap->update();
-
- $model->order_num = $newOrderNum;
- $model->update();
-
- $success = ['swap_id' => $modelSwap->primaryKey];
- }
- } else {
- $this->owner->error = Yii::t('easyii', 'Not found');
- }
-
- return $this->owner->formatResponse($success);
- }
-}
\ No newline at end of file
diff --git a/behaviors/SortableDateController.php b/behaviors/SortableDateController.php
deleted file mode 100644
index 0d681f5..0000000
--- a/behaviors/SortableDateController.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-namespace yii\easyii\behaviors;
-
-use Yii;
-
-class SortableDateController extends \yii\base\Behavior
-{
- public $model;
-
- public function move($id, $direction, $condition = [])
- {
- $modelClass = $this->model;
- $success = '';
- if(($model = $modelClass::findOne($id))){
- if($direction === 'up'){
- $eq = '>';
- $orderDir = 'ASC';
- } else {
- $eq = '<';
- $orderDir = 'DESC';
- }
-
- $query = $modelClass::find()->orderBy('time '.$orderDir)->limit(1);
-
- $where = [$eq, 'time', $model->time];
- if(count($condition)){
- $where = ['and', $where];
- foreach($condition as $key => $value){
- $where[] = [$key => $value];
- }
- }
- $modelSwap = $query->where($where)->one();
-
- if(!empty($modelSwap))
- {
- $newOrderNum = $modelSwap->time;
-
- $modelSwap->time = $model->time;
- $modelSwap->update();
-
- $model->time = $newOrderNum;
- $model->update();
-
- $success = ['swap_id' => $modelSwap->primaryKey];
- }
- }
- else{
- $this->owner->error = Yii::t('easyii', 'Not found');
- }
-
- return $this->owner->formatResponse($success);
- }
-}
\ No newline at end of file
diff --git a/behaviors/StatusController.php b/behaviors/StatusController.php
deleted file mode 100644
index 0d4f1c4..0000000
--- a/behaviors/StatusController.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-namespace yii\easyii\behaviors;
-
-use Yii;
-
-/**
- * Status behavior. Adds statuses to models
- * @package yii\easyii\behaviors
- */
-class StatusController extends \yii\base\Behavior
-{
- public $model;
-
- public function changeStatus($id, $status)
- {
- $modelClass = $this->model;
-
- if(($model = $modelClass::findOne($id))){
- $model->status = $status;
- $model->update();
- }
- else{
- $this->error = Yii::t('easyii', 'Not found');
- }
-
- return $this->owner->formatResponse(Yii::t('easyii', 'Status successfully changed'));
- }
-}
\ No newline at end of file
diff --git a/behaviors/Taggable.php b/behaviors/Taggable.php
index 6d9363f..3ad7099 100644
--- a/behaviors/Taggable.php
+++ b/behaviors/Taggable.php
@@ -26,7 +26,7 @@ public function getTagAssigns()
public function getTags()
{
- return $this->owner->hasMany(Tag::className(), ['tag_id' => 'tag_id'])->via('tagAssigns');
+ return $this->owner->hasMany(Tag::className(), ['id' => 'tag_id'])->via('tagAssigns');
}
public function getTagNames()
@@ -67,7 +67,7 @@ public function afterSave()
$tag->frequency++;
if ($tag->save()) {
$updatedTags[] = $tag;
- $tagAssigns[] = [$modelClass, $this->owner->primaryKey, $tag->tag_id];
+ $tagAssigns[] = [$modelClass, $this->owner->primaryKey, $tag->id];
}
}
@@ -87,7 +87,7 @@ public function beforeDelete()
}
if (count($pks)) {
- Tag::updateAllCounters(['frequency' => -1], ['in', 'tag_id', $pks]);
+ Tag::updateAllCounters(['frequency' => -1], ['in', 'id', $pks]);
}
Tag::deleteAll(['frequency' => 0]);
TagAssign::deleteAll(['class' => get_class($this->owner), 'item_id' => $this->owner->primaryKey]);
diff --git a/components/API.php b/components/API.php
index 9e1ae2f..1cfa965 100644
--- a/components/API.php
+++ b/components/API.php
@@ -24,11 +24,11 @@ public function init()
public static function __callStatic($method, $params)
{
- $name = (new \ReflectionClass(self::className()))->getShortName();
- if (!isset(self::$classes[$name])) {
- self::$classes[$name] = new static();
+ $name = static::className();
+ if (!isset(static::$classes[$name])) {
+ static::$classes[$name] = new static();
}
- return call_user_func_array([self::$classes[$name], 'api_' . $method], $params);
+ return call_user_func_array([static::$classes[$name], 'api_' . $method], $params);
}
/**
diff --git a/components/ActiveQueryNS.php b/components/ActiveQueryNS.php
index cad69e5..1dee7b7 100644
--- a/components/ActiveQueryNS.php
+++ b/components/ActiveQueryNS.php
@@ -14,7 +14,7 @@ public function behaviors()
public function sort()
{
- $this->orderBy('order_num DESC, lft ASC');
+ $this->orderBy('order_num ASC, lft ASC');
return $this;
}
}
\ No newline at end of file
diff --git a/components/ApiObject.php b/components/ApiObject.php
index 0359372..d44c256 100644
--- a/components/ApiObject.php
+++ b/components/ApiObject.php
@@ -7,6 +7,8 @@
/**
* Class ApiObject
* @package yii\easyii\components
+ * @var integer $id
+ * @var string $image
*/
class ApiObject extends \yii\base\Object
{
@@ -18,14 +20,17 @@ class ApiObject extends \yii\base\Object
* @param \yii\base\Model $model
*/
public function __construct($model){
- $this->model = $model;
+ if($model) {
+ $this->model = $model;
- foreach($model->attributes as $attribute => $value){
- if($this->canSetProperty($attribute)){
- $this->{$attribute} = $value;
+ foreach ($model->attributes as $attribute => $value) {
+ if ($this->canSetProperty($attribute)) {
+ $this->{$attribute} = $value;
+ }
}
+ } else {
+ $this->model = new \stdClass();
}
-
$this->init();
}
@@ -38,7 +43,8 @@ public function init(){}
* Returns object id
* @return int
*/
- public function getId(){
+ public function getId($debug = false){
+
return $this->model->primaryKey;
}
@@ -49,12 +55,18 @@ public function getId(){
* @param bool $crop if false image will be resize instead of cropping
* @return string
*/
- public function thumb($width = null, $height = null, $crop = true)
+ public function thumb($width = null, $height = null)
{
- if($this->image && ($width || $height)){
- return Image::thumb($this->image, $width, $height, $crop);
- }
- return '';
+ return !empty($this->model->image_file) ? Image::thumb($this->model->image_file, $width, $height) : '';
+ }
+
+ /**
+ * Returns web path to image.
+ * @return string
+ */
+ public function getImage()
+ {
+ return !empty($this->model->image_file) ? $this->model->image : '';
}
/**
diff --git a/components/CategoryController.php b/components/CategoryController.php
index 79d0107..92d32c3 100644
--- a/components/CategoryController.php
+++ b/components/CategoryController.php
@@ -2,10 +2,11 @@
namespace yii\easyii\components;
use Yii;
-use yii\easyii\behaviors\SortableModel;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\ClearImageAction;
+use yii\easyii\actions\FieldsAction;
+use yii\easyii\helpers\Upload;
use yii\widgets\ActiveForm;
-use yii\web\UploadedFile;
-use yii\easyii\helpers\Image;
/**
* Category controller component
@@ -13,15 +14,37 @@
*/
class CategoryController extends Controller
{
- /** @var string */
- public $categoryClass;
-
/** @var string */
public $moduleName;
- /** @var string */
+ /** @var string */
public $viewRoute = '/items';
+ public $rootActions = ['fields'];
+
+ public function actions()
+ {
+ $className = $this->categoryClass;
+ return [
+ 'fields' => [
+ 'class' => FieldsAction::className(),
+ 'model' => $className
+ ],
+ 'clear-image' => [
+ 'class' => ClearImageAction::className(),
+ 'model' => $className
+ ],
+ 'on' => [
+ 'class' => ChangeStatusAction::className(),
+ 'model' => $className,
+ ],
+ 'off' => [
+ 'class' => ChangeStatusAction::className(),
+ 'model' => $className,
+ ],
+ ];
+ }
+
/**
* Categories list
*
@@ -44,46 +67,26 @@ public function actionIndex()
*/
public function actionCreate($parent = null)
{
+ /** @var CategoryModel $model */
$class = $this->categoryClass;
$model = new $class;
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if(isset($_FILES) && $this->module->settings['categoryThumb']){
- $model->image = UploadedFile::getInstance($model, 'image');
- if($model->image && $model->validate(['image'])){
- $model->image = Image::upload($model->image, $this->moduleName);
- } else {
- $model->image = '';
- }
- }
-
+ } else {
$model->status = $class::STATUS_ON;
- $parent = (int)Yii::$app->request->post('parent', null);
- if($parent > 0 && ($parentCategory = $class::findOne($parent))){
- $model->order_num = $parentCategory->order_num;
- $model->appendTo($parentCategory);
- } else {
- $model->attachBehavior('sortable', SortableModel::className());
- $model->makeRoot();
- }
-
- if(!$model->hasErrors()){
+ if ($model->create(Yii::$app->request->post('parent', null))) {
$this->flash('success', Yii::t('easyii', 'Category created'));
- return $this->redirect(['/admin/'.$this->moduleName, 'id' => $model->primaryKey]);
- }
- else{
+ return $this->redirect(['/admin/' . $this->moduleName, 'id' => $model->primaryKey]);
+ } else {
$this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
return $this->refresh();
}
}
- }
- else {
+ } else {
return $this->render('@easyii/views/category/create', [
'model' => $model,
'parent' => $parent
@@ -100,36 +103,21 @@ public function actionCreate($parent = null)
*/
public function actionEdit($id)
{
- $class = $this->categoryClass;
-
- if(!($model = $class::findOne($id))){
- return $this->redirect(['/admin/' . $this->moduleName]);
- }
+ $model = $this->findCategory($id);
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if(isset($_FILES) && $this->module->settings['categoryThumb']){
- $model->image = UploadedFile::getInstance($model, 'image');
- if($model->image && $model->validate(['image'])){
- $model->image = Image::upload($model->image, $this->moduleName);
- }else{
- $model->image = $model->oldAttributes['image'];
- }
- }
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Category updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
- }
- else {
+ } else {
return $this->render('@easyii/views/category/edit', [
'model' => $model
]);
@@ -137,49 +125,37 @@ public function actionEdit($id)
}
/**
- * Remove category image
+ * Delete the category by ID
*
* @param $id
- * @return \yii\web\Response
+ * @return mixed
*/
- public function actionClearImage($id)
+ public function actionDelete($id)
{
- $class = $this->categoryClass;
- $model = $class::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- elseif($model->image){
- $model->image = '';
- if($model->update()){
- $this->flash('success', Yii::t('easyii', 'Image cleared'));
- } else {
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- }
+ $model = $this->findCategory($id);
+ $children = $model->children()->all();
+ $model->deleteWithChildren();
+ foreach ($children as $child) {
+ $child->afterDelete();
}
- return $this->back();
+
+ return $this->formatResponse(Yii::t('easyii', 'Category deleted'));
}
- /**
- * Delete the category by ID
- *
- * @param $id
- * @return mixed
- */
- public function actionDelete($id)
+ public function actionDeleteDataFile($file)
{
- $class = $this->categoryClass;
- if(($model = $class::findOne($id))){
- $children = $model->children()->all();
- $model->deleteWithChildren();
- foreach($children as $child) {
- $child->afterDelete();
+ $itemClass = $this->modelClass;
+ foreach($itemClass::find()->where(['like', 'data', $file])->all() as $model) {
+
+ foreach ($model->data as $name => $value) {
+ if (!is_array($value) && strpos($value, '/' . $file) !== false) {
+ Upload::delete($value);
+ $model->data->{$name} = '';
+ }
}
- } else {
- $this->error = Yii::t('easyii', 'Not found');
+ $model->update();
}
- return $this->formatResponse(Yii::t('easyii', 'Category deleted'));
+ return $this->formatResponse(Yii::t('easyii', 'Deleted'));
}
/**
@@ -204,30 +180,6 @@ public function actionDown($id)
return $this->move($id, 'down');
}
- /**
- * Activate category action
- *
- * @param $id
- * @return mixed
- */
- public function actionOn($id)
- {
- $class = $this->categoryClass;
- return $this->changeStatus($id, $class::STATUS_ON);
- }
-
- /**
- * Activate category action
- *
- * @param $id
- * @return mixed
- */
- public function actionOff($id)
- {
- $class = $this->categoryClass;
- return $this->changeStatus($id, $class::STATUS_OFF);
- }
-
/**
* Move category up/down
*
@@ -238,48 +190,41 @@ public function actionOff($id)
*/
private function move($id, $direction)
{
+ $model = $this->findCategory($id);
$modelClass = $this->categoryClass;
- if(($model = $modelClass::findOne($id)))
- {
- $up = $direction == 'up';
- $orderDir = $up ? SORT_ASC : SORT_DESC;
+ $up = $direction == 'up';
+ $orderDir = $up ? SORT_DESC : SORT_ASC;
- if($model->depth == 0){
+ if ($model->depth == 0) {
- $swapCat = $modelClass::find()->where([$up ? '>' : '<', 'order_num', $model->order_num])->orderBy(['order_num' => $orderDir])->one();
- if($swapCat)
- {
- $modelClass::updateAll(['order_num' => '-1'], ['order_num' => $swapCat->order_num]);
- $modelClass::updateAll(['order_num' => $swapCat->order_num], ['order_num' => $model->order_num]);
- $modelClass::updateAll(['order_num' => $model->order_num], ['order_num' => '-1']);
- $model->trigger(\yii\db\ActiveRecord::EVENT_AFTER_UPDATE);
+ $swapCat = $modelClass::find()->where([$up ? '<' : '>', 'order_num', $model->order_num])->orderBy(['order_num' => $orderDir])->one();
+ if ($swapCat) {
+ $modelClass::updateAll(['order_num' => '-1'], ['order_num' => $swapCat->order_num]);
+ $modelClass::updateAll(['order_num' => $swapCat->order_num], ['order_num' => $model->order_num]);
+ $modelClass::updateAll(['order_num' => $model->order_num], ['order_num' => '-1']);
+ $model->trigger(\yii\db\ActiveRecord::EVENT_AFTER_UPDATE);
+ }
+ } else {
+ $where = [
+ 'and',
+ ['tree' => $model->tree],
+ ['depth' => $model->depth],
+ [($up ? '<' : '>'), 'lft', $model->lft]
+ ];
+
+ $swapCat = $modelClass::find()->where($where)->orderBy(['lft' => ($up ? SORT_DESC : SORT_ASC)])->one();
+ if ($swapCat) {
+ if ($up) {
+ $model->insertBefore($swapCat);
+ } else {
+ $model->insertAfter($swapCat);
}
- } else {
- $where = [
- 'and',
- ['tree' => $model->tree],
- ['depth' => $model->depth],
- [($up ? '<' : '>'), 'lft', $model->lft]
- ];
-
- $swapCat = $modelClass::find()->where($where)->orderBy(['lft' => ($up ? SORT_DESC : SORT_ASC)])->one();
- if($swapCat)
- {
- if($up) {
- $model->insertBefore($swapCat);
- } else {
- $model->insertAfter($swapCat);
- }
- $swapCat->update();
- $model->update();
- }
+ $swapCat->update();
+ $model->update();
}
}
- else {
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
return $this->back();
}
@@ -292,20 +237,15 @@ private function move($id, $direction)
*/
public function changeStatus($id, $status)
{
+ $model = $this->findCategory($id);
$modelClass = $this->categoryClass;
- $ids = [];
+ $ids = [$model->primaryKey];
- if(($model = $modelClass::findOne($id))){
- $ids[] = $model->primaryKey;
- foreach($model->children()->all() as $child){
- $ids[] = $child->primaryKey;
- }
- $modelClass::updateAll(['status' => $status], ['in', 'category_id', $ids]);
- $model->trigger(\yii\db\ActiveRecord::EVENT_AFTER_UPDATE);
- }
- else{
- $this->error = Yii::t('easyii', 'Not found');
+ foreach ($model->children()->all() as $child) {
+ $ids[] = $child->primaryKey;
}
+ $modelClass::updateAll(['status' => $status], ['in', 'id', $ids]);
+ $model->trigger(\yii\db\ActiveRecord::EVENT_AFTER_UPDATE);
return $this->formatResponse(Yii::t('easyii', 'Status successfully changed'));
}
diff --git a/components/CategoryModel.php b/components/CategoryModel.php
index 25f3725..e45497b 100644
--- a/components/CategoryModel.php
+++ b/components/CategoryModel.php
@@ -2,10 +2,15 @@
namespace yii\easyii\components;
use Yii;
-use yii\behaviors\SluggableBehavior;
use yii\easyii\behaviors\CacheFlush;
+use yii\easyii\behaviors\ImageFile;
use yii\easyii\behaviors\SeoBehavior;
use creocoder\nestedsets\NestedSetsBehavior;
+use yii\easyii\behaviors\SortableModel;
+use yii\easyii\behaviors\SlugBehavior;
+use yii\easyii\behaviors\Taggable;
+use yii\easyii\models\SeoText;
+use yii\web\NotFoundHttpException;
/**
* Base CategoryModel. Shared by categories
@@ -17,15 +22,24 @@ class CategoryModel extends \yii\easyii\components\ActiveRecord
const STATUS_OFF = 0;
const STATUS_ON = 1;
+ static $FLAT = [];
+ static $TREE = [];
+ static $RELATIONS = ['seo'];
+
+ public $parent;
+ public $children = [];
+
public function rules()
{
return [
['title', 'required'],
['title', 'trim'],
- ['title', 'string', 'max' => 128],
- ['image', 'image'],
- ['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
+ [['title', 'slug'], 'string', 'max' => 128],
+ ['description', 'string', 'max' => 1024],
+ ['image_file', 'image'],
+ ['slug', 'match', 'pattern' => static::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
['slug', 'default', 'value' => null],
+ ['tagNames', 'safe'],
['status', 'integer'],
['status', 'default', 'value' => self::STATUS_ON]
];
@@ -35,50 +49,38 @@ public function attributeLabels()
{
return [
'title' => Yii::t('easyii', 'Title'),
- 'image' => Yii::t('easyii', 'Image'),
+ 'description' => Yii::t('easyii', 'Description'),
+ 'image_file' => Yii::t('easyii', 'Image'),
'slug' => Yii::t('easyii', 'Slug'),
+ 'tagNames' => Yii::t('easyii', 'Tags'),
];
}
public function behaviors()
{
- return [
+ $moduleSettings = Yii::$app->getModule('admin')->activeModules[Module::getModuleName(static::className())]->settings;
+ $behaviors = [
'cacheflush' => [
'class' => CacheFlush::className(),
'key' => [static::tableName().'_tree', static::tableName().'_flat']
],
'seoBehavior' => SeoBehavior::className(),
+ 'taggabble' => Taggable::className(),
'sluggable' => [
- 'class' => SluggableBehavior::className(),
- 'attribute' => 'title',
- 'ensureUnique' => true
+ 'class' => SlugBehavior::className(),
+ 'immutable' => !empty($moduleSettings['categorySlugImmutable']) ? $moduleSettings['categorySlugImmutable'] : false
],
- 'tree' => [
+ 'nestedSets' => [
'class' => NestedSetsBehavior::className(),
'treeAttribute' => 'tree'
- ]
+ ],
];
- }
- public function beforeSave($insert)
- {
- if (parent::beforeSave($insert)) {
- if(!$insert && $this->image != $this->oldAttributes['image'] && $this->oldAttributes['image']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['image']);
- }
- return true;
- } else {
- return false;
+ if(isset($moduleSettings['categoryThumb']) && $moduleSettings['categoryThumb']){
+ $behaviors['imageFileBehavior'] = ImageFile::className();
}
- }
- public function afterDelete()
- {
- parent::afterDelete();
-
- if($this->image) {
- @unlink(Yii::getAlias('@webroot') . $this->image);
- }
+ return $behaviors;
}
/**
@@ -98,12 +100,22 @@ public static function tree()
$cache = Yii::$app->cache;
$key = static::tableName().'_tree';
- $tree = $cache->get($key);
- if(!$tree){
- $tree = static::generateTree();
- $cache->set($key, $tree, 3600);
+ if(empty(static::$TREE[$key])) {
+
+ $tree = $cache->get($key);
+ if (!$tree) {
+ $tree = static::generateTree();
+ $cache->set($key, $tree, 3600);
+ }
+ if(count($tree)) {
+ foreach ($tree as $cat) {
+ static::$TREE[$key][] = self::buildCategoryModel($cat);
+ }
+ } else {
+ static::$TREE[$key] = [];
+ }
}
- return $tree;
+ return static::$TREE[$key];
}
/**
@@ -115,12 +127,68 @@ public static function cats()
$cache = Yii::$app->cache;
$key = static::tableName().'_flat';
- $flat = $cache->get($key);
- if(!$flat){
- $flat = static::generateFlat();
- $cache->set($key, $flat, 3600);
+ if(empty(static::$FLAT[$key])) {
+
+ $flat = $cache->get($key);
+ if (!$flat) {
+ $flat = static::generateFlat();
+ $cache->set($key, $flat, 3600);
+ }
+ if(count($flat)) {
+ foreach ($flat as $cat) {
+ static::$FLAT[$key][] = self::buildCategoryModel($cat);
+ }
+ } else {
+ static::$FLAT[$key] = [];
+ }
}
- return $flat;
+ return static::$FLAT[$key];
+ }
+
+ private static function buildCategoryModel($data)
+ {
+ $model = new static([
+ 'id' => $data->id,
+ 'parent' => $data->parent,
+ 'depth' => $data->depth,
+ ]);
+
+ $model->load((array)$data, '');
+ if(in_array('seo', static::$RELATIONS)) {
+ $model->populateRelation('seo', new SeoText($data->seo));
+ }
+ if(in_array('tags', static::$RELATIONS)) {
+ $model->setTagNames($data->tags);
+ }
+ $model->afterFind();
+
+ if(!empty($data->children) && is_array($data->children)){
+ if(is_object($data->children[0])) {
+ $model->children = [];
+ foreach($data->children as $child) {
+ $model->children[] = self::buildCategoryModel($child);
+ }
+ } else {
+ $model->children = $data->children;
+ }
+ }
+
+ return $model;
+ }
+
+ /**
+ * @param $id_slug
+ * @return CategoryModel
+ * @throws NotFoundHttpException
+ */
+ public static function get($id_slug)
+ {
+ foreach(static::cats() as $cat){
+ if($cat->id == $id_slug || $cat->slug == $id_slug){
+ return $cat;
+ }
+ }
+ throw new NotFoundHttpException(Yii::t('easyii', 'Category not found'));
}
/**
@@ -129,7 +197,7 @@ public static function cats()
*/
public static function generateTree()
{
- $collection = static::find()->with('seo')->sort()->asArray()->all();
+ $collection = static::find()->with(static::$RELATIONS)->sort()->asArray()->all();
$trees = array();
$l = 0;
@@ -139,8 +207,8 @@ public static function generateTree()
foreach ($collection as $node) {
$item = $node;
- unset($item['lft'], $item['rgt'], $item['order_num']);
- $item['children'] = array();
+ $item['parent'] = '';
+ $item['children'] = [];
// Number of stack items
$l = count($stack);
@@ -160,7 +228,7 @@ public static function generateTree()
} else {
// Add node to parent
- $item['parent'] = $stack[$l - 1]->category_id;
+ $item['parent'] = $stack[$l - 1]->id;
$i = count($stack[$l - 1]->children);
$stack[$l - 1]->children[$i] = (object)$item;
$stack[] = & $stack[$l - 1]->children[$i];
@@ -177,7 +245,7 @@ public static function generateTree()
*/
public static function generateFlat()
{
- $collection = static::find()->with('seo')->sort()->asArray()->all();
+ $collection = static::find()->with(static::$RELATIONS)->sort()->asArray()->all();
$flat = [];
if (count($collection) > 0) {
@@ -185,11 +253,11 @@ public static function generateFlat()
$lastId = 0;
foreach ($collection as $node) {
$node = (object)$node;
- $id = $node->category_id;
+ $id = $node->id;
$node->parent = '';
if($node->depth > $depth){
- $node->parent = $flat[$lastId]->category_id;
+ $node->parent = $flat[$lastId]->id;
$depth = $node->depth;
} elseif($node->depth == 0){
$depth = 0;
@@ -215,12 +283,32 @@ public static function generateFlat()
foreach($flat as &$node){
$node->children = [];
foreach($flat as $temp){
- if($temp->parent == $node->category_id){
- $node->children[] = $temp->category_id;
+ if($temp->parent == $node->id){
+ $node->children[] = $temp->id;
}
}
+ if(!empty($node->tags) && is_array($node->tags) && count($node->tags)){
+ $tags = [];
+ foreach($node->tags as $tag){
+ $tags[] = $tag['name'];
+ }
+ $node->tags = $tags;
+ }
}
return $flat;
}
+
+ public function create($parent_id = null)
+ {
+ if ($parent_id && ($parentCategory = static::findOne($parent_id))) {
+ $this->order_num = $parentCategory->order_num;
+ $this->appendTo($parentCategory);
+ } else {
+ $this->attachBehavior('sortable', SortableModel::className());
+ $this->makeRoot();
+ }
+
+ return $this->hasErrors() ? false : true;
+ }
}
\ No newline at end of file
diff --git a/components/CategoryWithFieldsModel.php b/components/CategoryWithFieldsModel.php
new file mode 100644
index 0000000..cf413df
--- /dev/null
+++ b/components/CategoryWithFieldsModel.php
@@ -0,0 +1,83 @@
+<?php
+namespace yii\easyii\components;
+use yii\easyii\behaviors\JsonColumns;
+use yii\easyii\behaviors\SortableModel;
+
+/**
+ * Extended CategoryModel with fields. Shared by categories
+ * @package yii\easyii\components
+ * @inheritdoc
+ */
+class CategoryWithFieldsModel extends CategoryModel
+{
+ const FIELD_TYPE_STRING = 'string';
+ const FIELD_TYPE_TEXT = 'text';
+ const FIELD_TYPE_HTML = 'html';
+ const FIELD_TYPE_BOOLEAN = 'boolean';
+ const FIELD_TYPE_SELECT = 'select';
+ const FIELD_TYPE_CHECKBOX = 'checkbox';
+ const FIELD_TYPE_FILE = 'file';
+ const FIELD_TYPE_DATE = 'date';
+ const FIELD_TYPE_ADDRESS = 'address';
+
+ public static $FIELD_TYPES = [
+ self::FIELD_TYPE_STRING => 'String',
+ self::FIELD_TYPE_TEXT => 'Text',
+ self::FIELD_TYPE_HTML => 'Html',
+ self::FIELD_TYPE_BOOLEAN => 'Boolean',
+ self::FIELD_TYPE_SELECT => 'Select',
+ self::FIELD_TYPE_CHECKBOX => 'Checkbox',
+ self::FIELD_TYPE_FILE => 'File',
+ self::FIELD_TYPE_DATE => 'Date',
+ self::FIELD_TYPE_ADDRESS => 'Address'
+ ];
+
+ public static $FIELDS_WITH_OPTIONS = [
+ self::FIELD_TYPE_SELECT,
+ self::FIELD_TYPE_CHECKBOX,
+ self::FIELD_TYPE_FILE,
+ self::FIELD_TYPE_ADDRESS
+ ];
+
+ public $parent_id;
+
+ public function rules()
+ {
+ return array_merge([
+ ['fields', 'safe'],
+ ], parent::rules());
+ }
+
+ public function behaviors()
+ {
+ return array_merge(parent::behaviors(), [
+ 'jsonColumns' => [
+ 'class' => JsonColumns::className(),
+ 'columns' => ['fields']
+ ]
+ ]);
+ }
+
+ public function getFieldByName($name)
+ {
+ foreach($this->fields as $field){
+ if($field->name == $name){
+ return $field;
+ }
+ }
+ return null;
+ }
+
+ public function create($parent_id = null)
+ {
+ if ($parent_id && ($parentCategory = static::findOne($parent_id))) {
+ $this->fields = $parentCategory->fields;
+ $this->order_num = $parentCategory->order_num;
+ $this->appendTo($parentCategory);
+ } else {
+ $this->attachBehavior('sortable', SortableModel::className());
+ $this->makeRoot();
+ }
+ return $this->hasErrors() ? false : true;
+ }
+}
\ No newline at end of file
diff --git a/components/Controller.php b/components/Controller.php
index 1dadc76..5ae824a 100644
--- a/components/Controller.php
+++ b/components/Controller.php
@@ -2,8 +2,10 @@
namespace yii\easyii\components;
use Yii;
+use yii\base\InvalidParamException;
use yii\easyii\models;
use yii\helpers\Url;
+use yii\web\NotFoundHttpException;
/**
* Base easyii controller component
@@ -11,10 +13,12 @@
*/
class Controller extends \yii\web\Controller
{
+ public $modelClass;
+ public $categoryClass;
public $enableCsrfValidation = false;
public $rootActions = [];
public $error = null;
-
+
public function init()
{
parent::init();
@@ -30,20 +34,19 @@ public function init()
*/
public function beforeAction($action)
{
- if(!parent::beforeAction($action))
+ if (!parent::beforeAction($action))
return false;
- if(Yii::$app->user->isGuest){
+ if (Yii::$app->user->isGuest) {
Yii::$app->user->setReturnUrl(Yii::$app->request->url);
Yii::$app->getResponse()->redirect(['/admin/sign/in'])->send();
return false;
- }
- else{
- if(!IS_ROOT && ($this->rootActions == 'all' || in_array($action->id, $this->rootActions))){
+ } else {
+ if (!IS_ROOT && ($this->rootActions == 'all' || in_array($action->id, $this->rootActions))) {
throw new \yii\web\ForbiddenHttpException('You cannot access this action');
}
- if($action->id === 'index'){
+ if ($action->id === 'index') {
$this->setReturnUrl();
}
@@ -58,7 +61,7 @@ public function beforeAction($action)
*/
public function flash($type, $message)
{
- Yii::$app->getSession()->setFlash($type=='error'?'danger':$type, $message);
+ Yii::$app->getSession()->setFlash($type == 'error' ? 'danger' : $type, $message);
}
public function back()
@@ -72,7 +75,7 @@ public function back()
*/
public function setReturnUrl($url = null)
{
- Yii::$app->getSession()->set($this->module->id.'_return', $url ? Url::to($url) : Url::current());
+ Yii::$app->getSession()->set($this->module->id . '_return', $url ? Url::to($url) : Url::current());
}
/**
@@ -82,7 +85,7 @@ public function setReturnUrl($url = null)
*/
public function getReturnUrl($defaultUrl = null)
{
- return Yii::$app->getSession()->get($this->module->id.'_return', $defaultUrl ? Url::to($defaultUrl) : Url::to('/admin/'.$this->module->id));
+ return Yii::$app->getSession()->get($this->module->id . '_return', $defaultUrl ? Url::to($defaultUrl) : Url::to('/admin/' . $this->module->id));
}
/**
@@ -93,14 +96,14 @@ public function getReturnUrl($defaultUrl = null)
*/
public function formatResponse($success = '', $back = true)
{
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
- if($this->error){
+ if ($this->error) {
return ['result' => 'error', 'error' => $this->error];
} else {
$response = ['result' => 'success'];
- if($success) {
- if(is_array($success)){
+ if ($success) {
+ if (is_array($success)) {
$response = array_merge(['result' => 'success'], $success);
} else {
$response = array_merge(['result' => 'success'], ['message' => $success]);
@@ -108,19 +111,49 @@ public function formatResponse($success = '', $back = true)
}
return $response;
}
- }
- else{
- if($this->error){
+ } else {
+ if ($this->error) {
$this->flash('error', $this->error);
} else {
- if(is_array($success) && isset($success['message'])){
+ if (is_array($success) && isset($success['message'])) {
$this->flash('success', $success['message']);
- }
- elseif(is_string($success)){
+ } elseif (is_string($success)) {
$this->flash('success', $success);
}
}
return $back ? $this->back() : $this->refresh();
}
}
+
+ /**
+ * @param integer $id
+ * @return ActiveRecord
+ * @throws NotFoundHttpException
+ */
+ public function findModel($id)
+ {
+ if(!($modelClass = $this->modelClass)){
+ throw new InvalidParamException('Controller `modelClass` is not set');
+ }
+ if(!($model = $modelClass::findOne($id))){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return $model;
+ }
+
+ /**
+ * @param integer $id
+ * @return CategoryModel
+ * @throws NotFoundHttpException
+ */
+ public function findCategory($id)
+ {
+ if(!($categoryClass = $this->categoryClass)){
+ throw new InvalidParamException('Controller `categoryClass` is not set');
+ }
+ if(!($model = $categoryClass::findOne($id))){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return $model;
+ }
}
diff --git a/components/Module.php b/components/Module.php
index 802c14b..b021455 100644
--- a/components/Module.php
+++ b/components/Module.php
@@ -19,6 +19,8 @@ class Module extends \yii\base\Module
/** @var @todo */
public $i18n;
+ private static $NAMES = [];
+
/**
* Configuration for installation
* @var array
@@ -34,9 +36,16 @@ class Module extends \yii\base\Module
public function init()
{
parent::init();
+ static::registerTranslations(static::getSelfName());
+ }
- $moduleName = self::getModuleName(self::className());
- self::registerTranslations($moduleName);
+ public static function getSelfName()
+ {
+ $className = static::className();
+ if(!isset(self::$NAMES[$className])){
+ self::$NAMES[$className] = self::getModuleName($className);
+ }
+ return self::$NAMES[$className];
}
/**
@@ -83,4 +92,10 @@ public static function getModuleName($namespace)
}
return false;
}
+
+ public static function setting($name)
+ {
+ $settings = Yii::$app->getModule('admin')->activeModules[static::getSelfName()]->settings;
+ return isset($settings[$name]) ? $settings[$name] : null;
+ }
}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index af37ae9..b8b4074 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,17 @@
],
"require": {
"php": ">=5.4.0",
- "yiisoft/yii2": "*",
+ "yiisoft/yii2": ">=2.0.6",
"yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*",
"creocoder/yii2-nested-sets": "0.9.*",
"bower-asset/fancybox": "*",
"bower-asset/jquery.switcher": "*",
- "bower-asset/eonasdan-bootstrap-datetimepicker": "^4.7@dev",
- "2amigos/yii2-selectize-widget": "~1.0"
+ "bower-asset/eonasdan-bootstrap-datetimepicker": "4.7.14",
+ "2amigos/yii2-selectize-widget": "~1.0",
+ "vova07/yii2-imperavi-widget": "*",
+ "stojg/crop": "*",
+ "google/apiclient": "1.0.*@beta"
},
"autoload": {
"psr-4": {
diff --git a/controllers/AdminsController.php b/controllers/AdminsController.php
index d8b6e6f..f1be01e 100644
--- a/controllers/AdminsController.php
+++ b/controllers/AdminsController.php
@@ -3,12 +3,24 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\DeleteAction;
use yii\widgets\ActiveForm;
use yii\easyii\models\Admin;
class AdminsController extends \yii\easyii\components\Controller
{
public $rootActions = 'all';
+ public $modelClass = 'yii\easyii\models\Admin';
+
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii', 'Admin deleted')
+ ]
+ ];
+ }
public function actionIndex()
{
@@ -28,22 +40,19 @@ public function actionCreate()
$model->scenario = 'create';
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Admin created'));
return $this->redirect(['/admin/admins']);
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
return $this->refresh();
}
}
- }
- else {
+ } else {
return $this->render('create', [
'model' => $model
]);
@@ -52,42 +61,24 @@ public function actionCreate()
public function actionEdit($id)
{
- $model = Admin::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/admins']);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Admin updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
- }
- else {
+ } else {
return $this->render('edit', [
'model' => $model
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Admin::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii', 'Admin deleted'));
- }
}
\ No newline at end of file
diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php
index 28a4fb2..22a1e10 100644
--- a/controllers/DefaultController.php
+++ b/controllers/DefaultController.php
@@ -1,10 +1,22 @@
<?php
namespace yii\easyii\controllers;
+use yii\easyii\models\Module;
+
class DefaultController extends \yii\easyii\components\Controller
{
public function actionIndex()
{
- return $this->render('index');
+ $notifications = Module::find()->where(['and', ['>', 'notice', 0], ['status' => Module::STATUS_ON]])->sort()->limit(4)->all();
+
+ return $this->render('index', [
+ 'notifications' => $notifications
+ ]);
+ }
+
+ public function actionLiveEdit($id)
+ {
+ \Yii::$app->session->set('easyii_live_edit', $id);
+ $this->back();
}
}
\ No newline at end of file
diff --git a/controllers/InstallController.php b/controllers/InstallController.php
index 3e04f08..3fdfe4f 100644
--- a/controllers/InstallController.php
+++ b/controllers/InstallController.php
@@ -28,7 +28,7 @@ public function beforeAction($action)
public function actionIndex()
{
if(!$this->checkDbConnection()){
- $configFile = str_replace(Yii::getAlias('@webroot'), '', Yii::getAlias('@app')).'/config/db.php';
+ $configFile = str_replace(Yii::getAlias('@webroot'), '', Yii::getAlias('@app')) . '/config/db.php';
return $this->showError(Yii::t('easyii/install', 'Cannot connect to database. Please configure `{0}`.', $configFile));
}
if($this->module->installed){
@@ -37,7 +37,7 @@ public function actionIndex()
$installForm = new InstallForm();
- if ($installForm->load(Yii::$app->request->post())) {
+ if ($installForm->load(Yii::$app->request->post()) && $installForm->validate()) {
$this->createUploadsDir();
WebConsole::migrate();
@@ -51,8 +51,6 @@ public function actionIndex()
return $this->redirect(['/admin/install/finish']);
}
else {
- $installForm->robot_email = 'noreply@'.Yii::$app->request->serverName;
-
return $this->render('index', [
'model' => $installForm
]);
@@ -108,7 +106,7 @@ private function showError($text)
private function createUploadsDir()
{
- $uploadsDir = Yii::getAlias('@webroot') . DIRECTORY_SEPARATOR . 'uploads';
+ $uploadsDir = Yii::getAlias('@uploads');
$uploadsDirExists = file_exists($uploadsDir);
if(($uploadsDirExists && !is_writable($uploadsDir)) || (!$uploadsDirExists && !mkdir($uploadsDir, 0777))){
throw new ServerErrorHttpException('Cannot create uploads folder at `'.$uploadsDir.'` Please check write permissions.');
diff --git a/controllers/LogsController.php b/controllers/LogsController.php
deleted file mode 100644
index 7072048..0000000
--- a/controllers/LogsController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace yii\easyii\controllers;
-
-use yii\data\ActiveDataProvider;
-
-use yii\easyii\models\LoginForm;
-
-class LogsController extends \yii\easyii\components\Controller
-{
- public $rootActions = 'all';
-
- public function actionIndex()
- {
- $data = new ActiveDataProvider([
- 'query' => LoginForm::find()->desc(),
- ]);
-
- return $this->render('index', [
- 'data' => $data
- ]);
- }
-}
\ No newline at end of file
diff --git a/controllers/ModulesController.php b/controllers/ModulesController.php
index 2ec3109..3ce1a39 100644
--- a/controllers/ModulesController.php
+++ b/controllers/ModulesController.php
@@ -3,29 +3,30 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
use yii\easyii\models\CopyModuleForm;
use yii\helpers\FileHelper;
use yii\widgets\ActiveForm;
-
use yii\easyii\models\Module;
-use yii\easyii\behaviors\SortableController;
-use yii\easyii\behaviors\StatusController;
class ModulesController extends \yii\easyii\components\Controller
{
public $rootActions = 'all';
+ public $modelClass = 'yii\easyii\models\Module';
- public function behaviors()
+ public function actions()
{
return [
- [
- 'class' => SortableController::className(),
- 'model' => Module::className()
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii', 'Module deleted')
],
- [
- 'class' => StatusController::className(),
- 'model' => Module::className()
- ]
+ 'up' => SortByNumAction::className(),
+ 'down' => SortByNumAction::className(),
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
@@ -46,22 +47,19 @@ public function actionCreate()
$model = new Module;
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Module created'));
return $this->redirect(['/admin/modules']);
- }
- else{
+ } else {
$this->flash('error', Yii::t('Create error. {0}', $model->formatErrors()));
return $this->refresh();
}
}
- }
- else {
+ } else {
return $this->render('create', [
'model' => $model
]);
@@ -70,29 +68,21 @@ public function actionCreate()
public function actionEdit($id)
{
- $model = Module::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/modules']);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Module updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
- }
- else {
+ } else {
return $this->render('edit', [
'model' => $model
]);
@@ -101,24 +91,17 @@ public function actionEdit($id)
public function actionSettings($id)
{
- $model = Module::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/modules']);
- }
+ $model = $this->findModel($id);
if (Yii::$app->request->post('Settings')) {
$model->setSettings(Yii::$app->request->post('Settings'));
- if($model->save()){
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii', 'Module settings updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', Yii::t('easyii', 'Update error. {0}', $model->formatErrors())));
}
return $this->refresh();
- }
- else {
+ } else {
return $this->render('settings', [
'model' => $model
@@ -128,13 +111,11 @@ public function actionSettings($id)
public function actionRestoreSettings($id)
{
- if(($model = Module::findOne($id))){
- $model->settings = '';
- $model->save();
- $this->flash('success', Yii::t('easyii', 'Module default settings was restored'));
- } else {
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
+ $model = $this->findModel($id);
+ $model->settings = '';
+ $model->save();
+ $this->flash('success', Yii::t('easyii', 'Module default settings was restored'));
+
return $this->back();
}
@@ -143,16 +124,15 @@ public function actionCopy($id)
$module = Module::findOne($id);
$formModel = new CopyModuleForm();
- if($module === null){
+ if ($module === null) {
$this->flash('error', Yii::t('easyii', 'Not found'));
return $this->redirect('/admin/modules');
}
- if ($formModel->load(Yii::$app->request->post())){
- if(Yii::$app->request->isAjax){
+ if ($formModel->load(Yii::$app->request->post())) {
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($formModel);
- }
- else{
+ } else {
$reflector = new \ReflectionClass($module->class);
$oldModuleFolder = dirname($reflector->getFileName());
$oldNameSpace = $reflector->getNamespaceName();
@@ -160,33 +140,33 @@ public function actionCopy($id)
$newModulesFolder = Yii::getAlias('@app') . DIRECTORY_SEPARATOR . 'modules';
$newModuleFolder = Yii::getAlias('@app') . DIRECTORY_SEPARATOR . 'modules' . DIRECTORY_SEPARATOR . $formModel->name;
- $newNameSpace = 'app\modules\\'.$formModel->name;
+ $newNameSpace = 'app\modules\\' . $formModel->name;
$newModuleClass = ucfirst($formModel->name) . 'Module';
- if(!FileHelper::createDirectory($newModulesFolder, 0755)){
- $this->flash('error', 'Cannot create `'.$newModulesFolder.'`. Please check write permissions.');
+ if (!FileHelper::createDirectory($newModulesFolder, 0755)) {
+ $this->flash('error', 'Cannot create `' . $newModulesFolder . '`. Please check write permissions.');
return $this->refresh();
}
- if(file_exists($newModuleFolder)){
- $this->flash('error', 'New module folder `'.$newModulesFolder.'` already exists.');
+ if (file_exists($newModuleFolder)) {
+ $this->flash('error', 'New module folder `' . $newModulesFolder . '` already exists.');
return $this->refresh();
}
//Copying module folder
- try{
+ try {
FileHelper::copyDirectory($oldModuleFolder, $newModuleFolder);
- } catch(\Exception $e) {
- $this->flash('error', 'Cannot copy `'.$oldModuleFolder.'` to `'.$newModuleFolder.'`. Please check write permissions.');
+ } catch (\Exception $e) {
+ $this->flash('error', 'Cannot copy `' . $oldModuleFolder . '` to `' . $newModuleFolder . '`. Please check write permissions.');
return $this->refresh();
}
//Renaming module file name
- $newModuleFile = $newModuleFolder . DIRECTORY_SEPARATOR .$newModuleClass . '.php';
+ $newModuleFile = $newModuleFolder . DIRECTORY_SEPARATOR . $newModuleClass . '.php';
$oldModuleFile = $newModuleFolder . DIRECTORY_SEPARATOR . $reflector->getShortName() . '.php';
- if(!rename($oldModuleFile, $newModuleFile)){
- $this->flash('error', 'Cannot rename `'.$newModulesFolder.'`.');
+ if (!rename($oldModuleFile, $newModuleFile)) {
+ $this->flash('error', 'Cannot rename `' . $newModulesFolder . '`.');
return $this->refresh();
}
@@ -194,25 +174,27 @@ public function actionCopy($id)
$moduleFileContent = file_get_contents($newModuleFile);
$moduleFileContent = str_replace($oldModuleClass, $newModuleClass, $moduleFileContent);
$moduleFileContent = str_replace('@easyii', '@app', $moduleFileContent);
- $moduleFileContent = str_replace('/'.$module->name, '/'.$formModel->name, $moduleFileContent);
+ $moduleFileContent = str_replace('/' . $module->name, '/' . $formModel->name, $moduleFileContent);
file_put_contents($newModuleFile, $moduleFileContent);
//Replacing namespace
- foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($newModuleFolder)) as $file => $object){
- if(!$object->isDir()){
+ foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($newModuleFolder)) as $file => $object) {
+ if (!$object->isDir()) {
$fileContent = file_get_contents($file);
$fileContent = str_replace($oldNameSpace, $newNameSpace, $fileContent);
- $fileContent = str_replace("Yii::t('easyii/".$module->name, "Yii::t('easyii/".$formModel->name, $fileContent);
- $fileContent = str_replace("'".$module->name."'", "'".$formModel->name."'", $fileContent);
+ $fileContent = str_replace($oldModuleClass, $newModuleClass, $fileContent);
+ $fileContent = str_replace("Yii::t('easyii/" . $module->name, "Yii::t('easyii/" . $formModel->name, $fileContent);
+ $fileContent = str_replace("'" . $module->name . "'", "'" . $formModel->name . "'", $fileContent);
+ $fileContent = str_replace('/' . $module->name . '/', '/' . $formModel->name . '/', $fileContent);
file_put_contents($file, $fileContent);
}
}
//Copying module tables
- foreach(glob($newModuleFolder . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . '*.php') as $modelFile){
+ foreach (glob($newModuleFolder . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . '*.php') as $modelFile) {
$baseName = basename($modelFile, '.php');
- $modelClass = $newNameSpace.'\models\\'.$baseName;
+ $modelClass = $newNameSpace . '\models\\' . $baseName;
$oldTableName = $modelClass::tableName();
$newTableName = str_replace($module->name, $formModel->name, $oldTableName);
@@ -224,8 +206,8 @@ public function actionCopy($id)
//Copy new table
Yii::$app->db->createCommand("CREATE TABLE `$newTableName` LIKE `$oldTableName`;")->execute();
- } catch(\yii\db\Exception $e) {
- $this->flash('error', 'Copy table error. '.$e);
+ } catch (\yii\db\Exception $e) {
+ $this->flash('error', 'Copy table error. ' . $e);
FileHelper::removeDirectory($newModuleFolder);
return $this->refresh();
}
@@ -242,7 +224,7 @@ public function actionCopy($id)
'status' => Module::STATUS_ON,
]);
- if($newModule->save()){
+ if ($newModule->save()) {
$this->flash('success', 'New module created');
return $this->redirect(['/admin/modules/edit', 'id' => $newModule->primaryKey]);
} else {
@@ -253,40 +235,9 @@ public function actionCopy($id)
}
}
-
return $this->render('copy', [
'model' => $module,
'formModel' => $formModel
]);
}
-
- public function actionDelete($id)
- {
- if(($model = Module::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii', 'Module deleted'));
- }
-
- public function actionUp($id)
- {
- return $this->move($id, 'up');
- }
-
- public function actionDown($id)
- {
- return $this->move($id, 'down');
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, Module::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, Module::STATUS_OFF);
- }
}
\ No newline at end of file
diff --git a/controllers/PhotosController.php b/controllers/PhotosController.php
index 27f0a9d..00bf336 100644
--- a/controllers/PhotosController.php
+++ b/controllers/PhotosController.php
@@ -2,17 +2,20 @@
namespace yii\easyii\controllers;
use Yii;
-use yii\helpers\Url;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
+use yii\easyii\components\Module;
+use yii\easyii\helpers\Upload;
use yii\web\UploadedFile;
use yii\web\Response;
-
use yii\easyii\helpers\Image;
use yii\easyii\components\Controller;
use yii\easyii\models\Photo;
-use yii\easyii\behaviors\SortableController;
class PhotosController extends Controller
{
+ public $modelClass = 'yii\easyii\models\Photo';
+
public function behaviors()
{
return [
@@ -22,10 +25,24 @@ public function behaviors()
'application/json' => Response::FORMAT_JSON
],
],
- [
- 'class' => SortableController::className(),
- 'model' => Photo::className(),
- ]
+ ];
+ }
+
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii', 'Photo deleted')
+ ],
+ 'up' => [
+ 'class' => SortByNumAction::className(),
+ 'addititonalEquality' => ['class', 'item_id']
+ ],
+ 'down' => [
+ 'class' => SortByNumAction::className(),
+ 'addititonalEquality' => ['class', 'item_id']
+ ],
];
}
@@ -36,33 +53,30 @@ public function actionUpload($class, $item_id)
$photo = new Photo;
$photo->class = $class;
$photo->item_id = $item_id;
- $photo->image = UploadedFile::getInstance($photo, 'image');
+ $photo->image_file = UploadedFile::getInstance($photo, 'image_file');
- if($photo->image && $photo->validate(['image'])){
- $photo->image = Image::upload($photo->image, 'photos', Photo::PHOTO_MAX_WIDTH);
+ if ($photo->image_file && $photo->validate(['image_file'])) {
+ $photo->image_file = Image::upload($photo->image_file, Module::getModuleName($class));
- if($photo->image){
- if($photo->save()){
+ if ($photo->image_file) {
+ if ($photo->save()) {
$success = [
'message' => Yii::t('easyii', 'Photo uploaded'),
'photo' => [
'id' => $photo->primaryKey,
'image' => $photo->image,
- 'thumb' => Image::thumb($photo->image, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT),
+ 'thumb' => Image::thumb($photo->image_file, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT),
'description' => ''
]
];
- }
- else{
- @unlink(Yii::getAlias('@webroot') . str_replace(Url::base(true), '', $photo->image));
+ } else {
+ Upload::delete($photo->image_file);
$this->error = Yii::t('easyii', 'Create error. {0}', $photo->formatErrors());
}
- }
- else{
+ } else {
$this->error = Yii::t('easyii', 'File upload error. Check uploads folder for write permissions');
}
- }
- else{
+ } else {
$this->error = Yii::t('easyii', 'File is incorrect');
}
@@ -71,21 +85,15 @@ public function actionUpload($class, $item_id)
public function actionDescription($id)
{
- if(($model = Photo::findOne($id)))
- {
- if(Yii::$app->request->post('description'))
- {
- $model->description = Yii::$app->request->post('description');
- if(!$model->update()) {
- $this->error = Yii::t('easyii', 'Update error. {0}', $model->formatErrors());
- }
- }
- else{
- $this->error = Yii::t('easyii', 'Bad response');
+ $model = $this->findModel($id);
+
+ if (Yii::$app->request->post('description')) {
+ $model->description = Yii::$app->request->post('description');
+ if (!$model->update()) {
+ $this->error = Yii::t('easyii', 'Update error. {0}', $model->formatErrors());
}
- }
- else{
- $this->error = Yii::t('easyii', 'Not found');
+ } else {
+ $this->error = Yii::t('easyii', 'Bad response');
}
return $this->formatResponse(Yii::t('easyii', 'Photo description saved'));
@@ -94,66 +102,36 @@ public function actionDescription($id)
public function actionImage($id)
{
$success = null;
+ $photo = $this->findModel($id);
- if(($photo = Photo::findOne($id)))
- {
- $oldImage = $photo->image;
-
- $photo->image = UploadedFile::getInstance($photo, 'image');
-
- if($photo->image && $photo->validate(['image'])){
- $photo->image = Image::upload($photo->image, 'photos', Photo::PHOTO_MAX_WIDTH);
- if($photo->image){
- if($photo->save()){
- @unlink(Yii::getAlias('@webroot').$oldImage);
-
- $success = [
- 'message' => Yii::t('easyii', 'Photo uploaded'),
- 'photo' => [
- 'image' => $photo->image,
- 'thumb' => Image::thumb($photo->image, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT)
- ]
- ];
- }
- else{
- @unlink(Yii::getAlias('@webroot').$photo->image);
-
- $this->error = Yii::t('easyii', 'Update error. {0}', $photo->formatErrors());
- }
- }
- else{
- $this->error = Yii::t('easyii', 'File upload error. Check uploads folder for write permissions');
- }
- }
- else{
- $this->error = Yii::t('easyii', 'File is incorrect');
- }
+ $oldImage = $photo->image_file;
+ $photo->image_file = UploadedFile::getInstance($photo, 'image_file');
- }
- else{
- $this->error = Yii::t('easyii', 'Not found');
- }
+ if ($photo->image_file && $photo->validate(['image_file'])) {
+ $photo->image_file = Image::upload($photo->image_file, 'photos');
+ if ($photo->image_file) {
+ if ($photo->save()) {
+ Upload::delete($oldImage);
- return $this->formatResponse($success);
- }
+ $success = [
+ 'message' => Yii::t('easyii', 'Photo uploaded'),
+ 'photo' => [
+ 'image' => $photo->image,
+ 'thumb' => Image::thumb($photo->image_file, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT)
+ ]
+ ];
+ } else {
+ Upload::delete($photo->image_file);
- public function actionDelete($id)
- {
- if(($model = Photo::findOne($id))){
- $model->delete();
+ $this->error = Yii::t('easyii', 'Update error. {0}', $photo->formatErrors());
+ }
+ } else {
+ $this->error = Yii::t('easyii', 'File upload error. Check uploads folder for write permissions');
+ }
} else {
- $this->error = Yii::t('easyii', 'Not found');
+ $this->error = Yii::t('easyii', 'File is incorrect');
}
- return $this->formatResponse(Yii::t('easyii', 'Photo deleted'));
- }
- public function actionUp($id, $class, $item_id)
- {
- return $this->move($id, 'up', ['class' => $class, 'item_id' => $item_id]);
- }
-
- public function actionDown($id, $class, $item_id)
- {
- return $this->move($id, 'down', ['class' => $class, 'item_id' => $item_id]);
+ return $this->formatResponse($success);
}
}
\ No newline at end of file
diff --git a/controllers/RedactorController.php b/controllers/RedactorController.php
index 2e425c1..1c72f6b 100644
--- a/controllers/RedactorController.php
+++ b/controllers/RedactorController.php
@@ -1,123 +1,40 @@
<?php
namespace yii\easyii\controllers;
+use vova07\imperavi\actions\GetAction;
use Yii;
-use yii\web\HttpException;
-use yii\helpers\FileHelper;
-use yii\helpers\Url;
-use yii\web\UploadedFile;
-use yii\web\Response;
-
-use yii\easyii\helpers\Image;
+use yii\easyii\helpers\Upload;
use yii\easyii\models;
+use yii\helpers\Url;
class RedactorController extends \yii\easyii\components\Controller
{
- public $controllerNamespace = 'yii\redactor\controllers';
- public $defaultRoute = 'upload';
- public $uploadDir = '@webroot/uploads';
- public $uploadUrl = '/uploads';
-
- public function behaviors()
+ public function actions()
{
+ $uploadsUrl = Url::to(Upload::getPathUrl('redactor'), true);
return [
- [
- 'class' => 'yii\filters\ContentNegotiator',
- 'formats' => [
- 'application/json' => Response::FORMAT_JSON
- ],
+ 'image-upload' => [
+ 'class' => 'vova07\imperavi\actions\UploadAction',
+ 'url' => $uploadsUrl, // Directory URL address, where files are stored.
+ 'path' => '@uploads/redactor' // Or absolute path to directory where files are stored.
+ ],
+ 'file-upload' => [
+ 'class' => 'vova07\imperavi\actions\UploadAction',
+ 'url' => $uploadsUrl, // Directory URL address, where files are stored.
+ 'path' => '@uploads/redactor' // Or absolute path to directory where files are stored.
+ ],
+ 'images-get' => [
+ 'class' => 'vova07\imperavi\actions\GetAction',
+ 'url' => $uploadsUrl, // Directory URL address, where files are stored.
+ 'path' => '@uploads/redactor', // Or absolute path to directory where files are stored.
+ 'type' => GetAction::TYPE_IMAGES,
+ ],
+ 'files-get' => [
+ 'class' => 'vova07\imperavi\actions\GetAction',
+ 'url' => $uploadsUrl, // Directory URL address, where files are stored.
+ 'path' => '@uploads/redactor', // Or absolute path to directory where files are stored.
+ 'type' => GetAction::TYPE_FILES,
]
];
}
-
- public function actionUpload($dir = '')
- {
- $fileInstance = UploadedFile::getInstanceByName('file');
- if ($fileInstance) {
- $file = Image::upload($fileInstance, $dir);
- if($file) {
- return $this->getResponse($file);
- }
- }
- return ['error' => 'Unable to save image file'];
- }
-
-// public function actionClipboard()
-// {
-// if (!Yii::$app->request->isAjax) {
-// throw new HttpException(403, 'This action allow only ajaxRequest');
-// }
-// $contentType = Yii::$app->request->post('contentType');
-// $data = Yii::$app->request->post('data');
-//
-// $mimeTypes = require(Yii::getAlias('@yii/helpers/mimeTypes.php'));
-// $filename = substr(uniqid(md5(rand()), true), 0, 10) . '.' . (array_search($contentType, $mimeTypes) !== false) ? array_search($contentType, $mimeTypes) : 'png';
-//
-// if ($contentType && $data) {
-// if (file_put_contents($this->getFilePath($filename), base64_decode($data))) {
-// return [
-// 'filelink' => $this->getUrl($filename),
-// 'filename' => $filename
-// ];
-// } else {
-// return ['error' => 'Unable to save file'];
-// }
-// }
-// }
-//
-// public function actionImageGetJson()
-// {
-// if (!Yii::$app->request->isAjax) {
-// throw new HttpException(403, 'This action allow only ajaxRequest');
-// }
-//
-// $filesPath = FileHelper::findFiles($this->getSaveDir(), [
-// 'recursive' => true,
-// 'only' => ['*.jpg', '*.jpeg', '*.jpe', '*.png', '*.gif']
-// ]);
-// if (is_array($filesPath) && count($filesPath)) {
-// $result = [];
-// foreach ($filesPath as $filePath) {
-// $url = $this->getUrl(pathinfo($filePath, PATHINFO_BASENAME));
-// $result[] = ['thumb' => $url, 'image' => $url];
-// }
-// return $result;
-// }
-// }
-//
-// public function getOwnerPath()
-// {
-// return Yii::$app->user->isGuest ? 'guest' : Yii::$app->user->id;
-// }
-//
-// public function getSaveDir()
-// {
-// if (preg_match('/^\@/', $this->uploadDir)) {
-// $path = Yii::getAlias($this->uploadDir);
-// } else {
-// $path = $this->uploadDir;
-// }
-// if (FileHelper::createDirectory($path . DIRECTORY_SEPARATOR . $this->getOwnerPath())) {
-// return $path . DIRECTORY_SEPARATOR . $this->getOwnerPath();
-// }
-// return '';
-// }
-//
-// public function getFilePath($fileName)
-// {
-// return $this->getSaveDir() . DIRECTORY_SEPARATOR . $fileName;
-// }
-//
-// public function getUrl($fileName)
-// {
-// return $this->uploadUrl . '/' . $this->getOwnerPath() . '/' . $fileName;
-// }
-
- private function getResponse($fileName)
- {
- return [
- 'filelink' => $fileName,
- 'filename' => basename($fileName)
- ];
- }
}
\ No newline at end of file
diff --git a/controllers/SettingsController.php b/controllers/SettingsController.php
index 4faf0ed..cf7b4b6 100644
--- a/controllers/SettingsController.php
+++ b/controllers/SettingsController.php
@@ -3,12 +3,27 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\components\Controller;
+use yii\web\ForbiddenHttpException;
+use yii\web\NotFoundHttpException;
use yii\widgets\ActiveForm;
use yii\easyii\models\Setting;
-class SettingsController extends \yii\easyii\components\Controller
+class SettingsController extends Controller
{
public $rootActions = ['create', 'delete'];
+ public $modelClass = 'yii\easyii\models\Setting';
+
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii', 'Setting deleted')
+ ]
+ ];
+ }
public function actionIndex()
{
@@ -51,11 +66,10 @@ public function actionCreate()
public function actionEdit($id)
{
- $model = Setting::findOne($id);
+ $model = $this->findModel($id);
- if($model === null || ($model->visibility < (IS_ROOT ? Setting::VISIBLE_ROOT : Setting::VISIBLE_ALL))){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/settings']);
+ if($model->visibility < (IS_ROOT ? Setting::VISIBLE_ROOT : Setting::VISIBLE_ALL)){
+ throw new ForbiddenHttpException();
}
if ($model->load(Yii::$app->request->post())) {
@@ -79,14 +93,4 @@ public function actionEdit($id)
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Setting::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii', 'Setting deleted'));
- }
}
\ No newline at end of file
diff --git a/controllers/SystemController.php b/controllers/SystemController.php
index 8afe59e..4dce4f7 100644
--- a/controllers/SystemController.php
+++ b/controllers/SystemController.php
@@ -2,12 +2,15 @@
namespace yii\easyii\controllers;
use Yii;
+use yii\data\ActiveDataProvider;
use yii\easyii\helpers\WebConsole;
+use yii\easyii\models\LoginForm;
use yii\easyii\models\Setting;
+use yii\helpers\FileHelper;
class SystemController extends \yii\easyii\components\Controller
{
- public $rootActions = ['*'];
+ public $rootActions = ['all'];
public function actionIndex()
{
@@ -46,10 +49,15 @@ public function actionClearAssets()
return $this->back();
}
- public function actionLiveEdit($id)
+ public function actionLogs()
{
- Yii::$app->session->set('easyii_live_edit', $id);
- $this->back();
+ $data = new ActiveDataProvider([
+ 'query' => LoginForm::find()->desc(),
+ ]);
+
+ return $this->render('logs', [
+ 'data' => $data
+ ]);
}
private function deleteDir($directory)
diff --git a/helpers/Data.php b/helpers/Data.php
index 1d054f3..7656c91 100644
--- a/helpers/Data.php
+++ b/helpers/Data.php
@@ -2,8 +2,6 @@
namespace yii\easyii\helpers;
use Yii;
-use yii\helpers\Inflector;
-use yii\helpers\StringHelper;
class Data
{
diff --git a/helpers/Image.php b/helpers/Image.php
index 36fe11a..e573db4 100644
--- a/helpers/Image.php
+++ b/helpers/Image.php
@@ -2,6 +2,7 @@
namespace yii\easyii\helpers;
use Yii;
+use yii\easyii\models\Setting;
use yii\web\UploadedFile;
use yii\web\HttpException;
use yii\helpers\FileHelper;
@@ -10,75 +11,89 @@
class Image
{
- public static function upload(UploadedFile $fileInstance, $dir = '', $resizeWidth = null, $resizeHeight = null, $resizeCrop = false)
+ public static function upload(UploadedFile $fileInstance, $dir = '')
{
$fileName = Upload::getUploadPath($dir) . DIRECTORY_SEPARATOR . Upload::getFileName($fileInstance);
- $uploaded = $resizeWidth
- ? self::copyResizedImage($fileInstance->tempName, $fileName, $resizeWidth, $resizeHeight, $resizeCrop)
- : $fileInstance->saveAs($fileName);
+ $imageInfo = getimagesize($fileInstance->tempName);
+
+ $maxWidth = (int)Setting::get('image_max_width');
+ if($maxWidth > 0 && $imageInfo[0] > $maxWidth){
+ $uploaded = self::resize($fileInstance->tempName, $fileName, Setting::get('image_max_width'));
+ } else {
+ $uploaded = $fileInstance->saveAs($fileName);
+ }
if(!$uploaded){
- throw new HttpException(500, 'Cannot upload file "'.$fileName.'". Please check write permissions.');
+ throw new HttpException(500, 'Cannot upload file "'.$fileName.'". Please check write permissions. Also check GD and Imagick extensions.');
}
- return Upload::getLink($fileName);
+ return $dir ? $dir . '/' . basename($fileName) : basename($fileName);
}
- static function thumb($filename, $width = null, $height = null, $crop = true)
+ static function thumb($filename, $width = null, $height = null)
{
- if($filename && is_file(($filename = Yii::getAlias('@webroot') . $filename)))
- {
- $info = pathinfo($filename);
- $thumbName = $info['filename'] . '-' . md5( filemtime($filename) . (int)$width . (int)$height . (int)$crop ) . '.' . $info['extension'];
- $thumbFile = Yii::getAlias('@webroot') . DIRECTORY_SEPARATOR . Upload::$UPLOADS_DIR . DIRECTORY_SEPARATOR . 'thumbs' . DIRECTORY_SEPARATOR . $thumbName;
- $thumbWebFile = '/' . Upload::$UPLOADS_DIR . '/thumbs/' . $thumbName;
- if(file_exists($thumbFile)){
- return $thumbWebFile;
- }
- elseif(FileHelper::createDirectory(dirname($thumbFile), 0777) && self::copyResizedImage($filename, $thumbFile, $width, $height, $crop)){
- return $thumbWebFile;
- }
+ $filename = Upload::getAbsolutePath($filename);
+ if(!is_file($filename)) {
+ return '';
}
- return '';
+
+ $info = pathinfo($filename);
+ $thumbName = $info['filename'] . '-' . md5( filemtime($filename) . (int)$width . (int)$height) . '.' . $info['extension'];
+ $thumbFile = Upload::getUploadPath('thumbs') . DIRECTORY_SEPARATOR . $thumbName;
+ $thumbWebFile = Upload::getFileUrl('thumbs/' . $thumbName);
+ if(file_exists($thumbFile)){
+ return $thumbWebFile;
+ }
+ if($width && $height){
+ $success = self::crop($filename, $thumbFile, $width, $height);
+ } else {
+ $success = self::resize($filename, $thumbFile, $width, $height);
+ }
+ return $success ? $thumbWebFile : '';
}
- static function copyResizedImage($inputFile, $outputFile, $width, $height = null, $crop = true)
+ static function crop($inputFile, $outputFile, $width, $height)
{
- if (extension_loaded('gd'))
+ if(extension_loaded('imagick'))
{
- $image = new GD($inputFile);
+ $center = new \stojg\crop\CropBalanced($inputFile);
+ $croppedImage = $center->resizeAndCrop($width, $height);
- if($height) {
- if($width && $crop){
- $image->cropThumbnail($width, $height);
- } else {
- $image->resize($width, $height);
- }
- } else {
- $image->resize($width);
- }
- return $image->save($outputFile);
+ return $croppedImage->writeimage($outputFile);
}
- elseif(extension_loaded('imagick'))
+ elseif (extension_loaded('gd'))
{
- $image = new \Imagick($inputFile);
-
- if($height && !$crop) {
- $image->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 1, true);
- }
- else{
- $image->resizeImage($width, null, \Imagick::FILTER_LANCZOS, 1);
- }
+ $image = new GD($inputFile);
+ $image->cropThumbnail($width, $height);
+ return $image->save($outputFile);
+ }
+ else {
+ return false;
+ }
+ }
- if($height && $crop){
- $image->cropThumbnailImage($width, $height);
- }
+ static function resize($inputFile, $outputFile, $width = null, $height = null)
+ {
+ if(!$width && !$height){
+ throw new HttpException(500, 'Width or Height must be set on resizing.');
+ }
+ if(extension_loaded('imagick'))
+ {
+ $image = new \Imagick($inputFile);
+ $image->resizeImage($width, $height, \Imagick::FILTER_CUBIC, 0.5, ($width && $height));
return $image->writeImage($outputFile);
}
+ elseif (extension_loaded('gd'))
+ {
+ $image = new GD($inputFile);
+ $image->resize($width, $height);
+
+ return $image->save($outputFile);
+ }
else {
- throw new HttpException(500, 'Please install GD or Imagick extension');
+ return false;
}
}
}
\ No newline at end of file
diff --git a/helpers/Mail.php b/helpers/Mail.php
index 411e5a3..a0bd040 100644
--- a/helpers/Mail.php
+++ b/helpers/Mail.php
@@ -2,18 +2,39 @@
namespace yii\easyii\helpers;
use Yii;
+use yii\base\InvalidConfigException;
use yii\easyii\models\Setting;
class Mail
{
+ /**
+ * @param string $toEmail
+ * @param string $subject
+ * @param mixed $template
+ * @param array $data
+ * @param array $options
+ * @return bool
+ * @throws InvalidConfigException
+ */
public static function send($toEmail, $subject, $template, $data = [], $options = [])
{
+ if(empty(Yii::$app->mailer) || !Yii::$app->mailer instanceof \yii\mail\BaseMailer) {
+ throw new InvalidConfigException('EasyiiCMS required `mailer` component.');
+ }
+ /** @var \yii\mail\BaseMailer $mailer */
+ $mailer = Yii::$app->mailer;
+ if($mailer->htmlLayout) {
+ $htmlLayoutFile = (strpos($mailer->htmlLayout, '@') !== false ? Yii::getAlias($mailer->htmlLayout) : Yii::getAlias('@app') . DIRECTORY_SEPARATOR . 'mail' . DIRECTORY_SEPARATOR . $mailer->htmlLayout) . '.php';
+ if(!file_exists($htmlLayoutFile)) {
+ throw new InvalidConfigException('Cannot find html layout for mails. Please create it at `' . $htmlLayoutFile . '`');
+ }
+ }
if(!filter_var($toEmail, FILTER_VALIDATE_EMAIL) || !$subject || !$template){
return false;
}
$data['subject'] = trim($subject);
- $message = Yii::$app->mailer->compose($template, $data)
+ $message = $mailer->compose($template, $data)
->setTo($toEmail)
->setSubject($data['subject']);
diff --git a/helpers/MigrationHelper.php b/helpers/MigrationHelper.php
new file mode 100644
index 0000000..85a2c40
--- /dev/null
+++ b/helpers/MigrationHelper.php
@@ -0,0 +1,17 @@
+<?php
+namespace yii\easyii\helpers;
+
+use Yii;
+use yii\easyii\models\Module;
+
+class MigrationHelper
+{
+ public static function appendModuleSettings($moduleName, $settings)
+ {
+ if(($module = Module::findOne(['name' => $moduleName])))
+ {
+ $module->settings = array_merge($module->settings, $settings);
+ $module->save();
+ }
+ }
+}
\ No newline at end of file
diff --git a/helpers/Upload.php b/helpers/Upload.php
index 0fa1367..b9e2a84 100644
--- a/helpers/Upload.php
+++ b/helpers/Upload.php
@@ -2,6 +2,7 @@
namespace yii\easyii\helpers;
use Yii;
+use yii\web\ServerErrorHttpException;
use yii\web\UploadedFile;
use \yii\web\HttpException;
use yii\helpers\Inflector;
@@ -11,40 +12,75 @@
class Upload
{
- public static $UPLOADS_DIR = 'uploads';
+ static $RESTRICTED_EXTENSIONS = ['php', 'phtml', 'php5', 'htm', 'html', 'js', 'jsp', 'sh', 'exe', 'bat', 'com'];
public static function file(UploadedFile $fileInstance, $dir = '', $namePostfix = true)
{
+ if(in_array($fileInstance->extension, self::$RESTRICTED_EXTENSIONS)){
+ return false;
+ }
$fileName = Upload::getUploadPath($dir) . DIRECTORY_SEPARATOR . Upload::getFileName($fileInstance, $namePostfix);
if(!$fileInstance->saveAs($fileName)){
throw new HttpException(500, 'Cannot upload file "'.$fileName.'". Please check write permissions.');
}
- return Upload::getLink($fileName);
+ return $dir ? $dir . '/' . basename($fileName) : basename($fileName);
}
- static function getUploadPath($dir)
+ static function getUploadPath($dir = null)
{
- $uploadPath = Yii::getAlias('@webroot').DIRECTORY_SEPARATOR.self::$UPLOADS_DIR.($dir ? DIRECTORY_SEPARATOR.$dir : '');
+ $uploadPath = Yii::getAlias('@uploads');
+ if(!$uploadPath){
+ throw new ServerErrorHttpException('Alias `@uploads` is not set.');
+ }
+ if($dir){
+ $uploadPath .= DIRECTORY_SEPARATOR . $dir;
+ }
if(!FileHelper::createDirectory($uploadPath)){
throw new HttpException(500, 'Cannot create "'.$uploadPath.'". Please check write permissions.');
}
return $uploadPath;
}
- static function getLink($fileName)
+ static function getFileUrl($fileName)
+ {
+ return $fileName ? self::getPathUrl() . '/' . $fileName : '';
+ }
+
+ static function getPathUrl($dir = '')
{
- return str_replace('\\', '/', str_replace(Yii::getAlias('@webroot'), '', $fileName));
+ return Yii::getAlias('@web') . str_replace(Yii::getAlias('@webroot'), '', str_replace('\\', '/', Yii::getAlias('@uploads'))) . ($dir ? '/' . $dir : '');
+ }
+
+ static function getAbsolutePath($fileName)
+ {
+ if(!$fileName){
+ return '';
+ }
+ if(strpos($fileName, Yii::getAlias('@uploads')) !== false ){
+ return $fileName;
+ } else {
+ return Yii::getAlias('@uploads') . DIRECTORY_SEPARATOR . $fileName;
+ }
+ }
+
+ static function delete($fileName)
+ {
+ if($fileName) {
+ $filePath = self::getAbsolutePath($fileName);
+ if(is_file($filePath)){
+ @unlink($filePath);
+ }
+ }
}
- static function getFileName($fileInstanse, $namePostfix = true)
+ static function getFileName(UploadedFile $fileInstance, $namePostfix = true)
{
- $baseName = str_ireplace('.'.$fileInstanse->extension, '', $fileInstanse->name);
- $fileName = StringHelper::truncate(Inflector::slug($baseName), 32, '');
+ $fileName = StringHelper::truncate(Inflector::slug($fileInstance->baseName), 32, '');
if($namePostfix || !$fileName) {
$fileName .= ($fileName ? '-' : '') . substr(uniqid(md5(rand()), true), 0, 10);
}
- $fileName .= '.' . $fileInstanse->extension;
+ $fileName .= '.' . strtolower($fileInstance->extension);
return $fileName;
}
diff --git a/media/css/admin.css b/media/css/admin.css
index 544ae28..c3714c4 100644
--- a/media/css/admin.css
+++ b/media/css/admin.css
@@ -24,10 +24,15 @@ html{
width: 220px;
text-align: center;
font-size: 18px;
+ color: #F1F1F1;
+}
+#admin-body .header .logo:hover, #admin-body .header .logo:active{
+ text-decoration: none;
color: #FFF;
}
#admin-body .header .logo img{
vertical-align: baseline;
+ margin-right: 5px;
}
#admin-body .header .nav{
margin-left: 220px;
@@ -101,9 +106,8 @@ html{
#admin-body .main .container-fluid{
padding: 20px;
}
-#admin-body .main a, #admin-body .main .btn, #admin-body .main .form-control, .input-group-addon{
+#admin-body .main a, #admin-body .main .btn, #admin-body .main .form-control, .input-group-addon, .selectize-input{
border-radius: 0 !important;
- text-align: left;
}
#admin-body .table {
@@ -163,8 +167,69 @@ html{
color: #337ab7;
}
+.welcome-notifications .col-md-3{
+ padding: 15px;
+}
+.welcome-notifications .module-link{
+ display: block;
+ padding: 15px;
+ color: #fff;
+}
+
+.welcome-notifications a.module-link-color1{background: #1ab394;}
+.welcome-notifications a.module-link-color1:hover{background: #189177;}
+.welcome-notifications a.module-link-color2{background: #23c6c8;}
+.welcome-notifications a.module-link-color2:hover{background: #1a8f91;}
+.welcome-notifications a.module-link-color3{background: #f8ac59;}
+.welcome-notifications a.module-link-color3:hover{background: #b98141;}
+.welcome-notifications a.module-link-color4{background: #f88e59;}
+.welcome-notifications a.module-link-color4:hover{background: #b96646;}
+
+.welcome-notifications .module-link .glyphicon {
+ font-size: 40px;
+}
+.welcome-notifications .module-link .module-title{
+ font-size: 12px;
+ line-height: 12px;
+}
+.welcome-notifications .module-link .module-notices{
+ font-size: 28px;
+ font-weight: bold;
+ line-height: 30px;
+}
+
+.online-circle {
+ width: 10px;
+ height: 10px;
+ background: #27b6af;
+ margin: 5px 5px 0 0;
+}
+
+.chart-table {
+ width: 100%;
+}
+.chart-table th{
+ border: 1px solid #ccc;
+ padding: 10px;
+}
+.chart-table td{
+ border: 1px solid #ccc;
+ padding: 0 10px;
+ height: 300px;
+ vertical-align: top;
+}
+
/*--------------- HELPERS ---------------*/
+h2{
+ text-transform: uppercase;
+ font-weight: 300;
+ margin-top: 10px;
+ font-size: 30px;
+}
+h2 .btn-group a{
+ text-transform: none;
+}
h4{
text-transform: uppercase;
font-size: 24px;
@@ -175,6 +240,9 @@ h4 b{
font-weight: 400;
}
+hr.margin-30{
+ margin: 30px 0;
+}
.confirm-delete{
color: #a94442 !important;
}
@@ -201,6 +269,9 @@ h4 b{
.smooth {
color: #aaa;
}
+.cursor-pointer {
+ cursor: pointer;
+}
.dashed-link:before{
font-family: 'Glyphicons Halflings';
content: "\e252";
@@ -216,4 +287,4 @@ h4 b{
}
.glyphicon-menu-hamburger:before {
content: "\e055";
-}
\ No newline at end of file
+}
diff --git a/media/css/frontend.css b/media/css/frontend.css
index 543cc42..f69a1c4 100644
--- a/media/css/frontend.css
+++ b/media/css/frontend.css
@@ -1,13 +1,97 @@
#easyii-navbar {
- font-family: 'Open Sans', sans-serif !important;
- background: #1d212a;
- color: #B3B8C3;
+ background: #1d212a none repeat scroll 0 0;
+ border-color: #080808;
+ border-width: 0 0 1px;
+ border-radius: 0;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 1030;
+ margin-bottom: 20px;
+ height: 50px;
+ display: block;
+ font-size: 14px;
+ color: #b3b8c3;
+ font-family: "Open Sans",sans-serif !important;
+ box-sizing: border-box;
}
-#easyii-navbar .navbar-left li:first-child {
- border-right: 1px solid #111;
+#easyii-navbar::before, #easyii-navbar::after{
+ content: " ";
+ display: table;
+ box-sizing: border-box;
}
-#easyii-navbar .navbar-text{
- color: #B3B8C3;
+#easyii-navbar::after{
+ clear: both;
+}
+#easyii-navbar .easyii-container {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto;
+ line-height: 50px;
+ box-sizing: border-box;
+}
+@media (min-width: 768px) {
+ #easyii-navbar .easyii-container {
+ width: 750px;
+ }
+}
+@media (min-width: 992px) {
+ #easyii-navbar .easyii-container {
+ width: 970px;
+ }
+}
+@media (min-width: 1200px) {
+ #easyii-navbar .easyii-container {
+ width: 1170px;
+ }
+}
+#easyii-navbar a {
+ color: #9d9d9d;
+ text-decoration: none;
+}
+#easyii-navbar a:hover,#easyii-navbar a:active {
+ color: #fff;
+}
+#easyii-navbar .live-edit-label {
+ margin: 0 10px 0 20px;
+ cursor: pointer;
+ font-weight: normal;
+}
+#easyii-navbar .live-edit-label:hover {
+ color: #fff;
+}
+#easyii-navbar .pull-left {
+ float: left;
+}
+#easyii-navbar .pull-right {
+ float: right;
+}
+@font-face {
+ font-family: 'Glyphicons Halflings';
+ src: url('../fonts/glyphicons-halflings-regular.eot');
+ src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+#easyii-navbar .glyphicon {
+ position: relative;
+ top: 1px;
+ display: inline-block;
+ font-family: 'Glyphicons Halflings';
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.glyphicon-arrow-left:before {
+ content: "\e091";
+}
+.glyphicon-pencil:before {
+ content: "\270f";
+}
+.glyphicon-log-out:before {
+ content: "\e163";
}
#easyii-navbar .switcher{
margin-top: 15px;
@@ -19,6 +103,7 @@
font-size: 11px;
border-radius: 10px;
padding: 1px;
+ box-sizing: border-box;
}
#easyii-navbar .switcher .slider{
background: #f0f3f3;
diff --git a/media/fonts/OpenSans-Bold.ttf b/media/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000..fd79d43
Binary files /dev/null and b/media/fonts/OpenSans-Bold.ttf differ
diff --git a/media/fonts/OpenSans-ExtraBold.ttf b/media/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 0000000..21f6f84
Binary files /dev/null and b/media/fonts/OpenSans-ExtraBold.ttf differ
diff --git a/media/fonts/OpenSans-Light.ttf b/media/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000..0d38189
Binary files /dev/null and b/media/fonts/OpenSans-Light.ttf differ
diff --git a/media/fonts/OpenSans-Regular.ttf b/media/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..db43334
Binary files /dev/null and b/media/fonts/OpenSans-Regular.ttf differ
diff --git a/media/fonts/OpenSans-Semibold.ttf b/media/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 0000000..1a7679e
Binary files /dev/null and b/media/fonts/OpenSans-Semibold.ttf differ
diff --git a/media/fonts/glyphicons-halflings-regular.eot b/media/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
Binary files /dev/null and b/media/fonts/glyphicons-halflings-regular.eot differ
diff --git a/media/fonts/glyphicons-halflings-regular.svg b/media/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..94fb549
--- /dev/null
+++ b/media/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode=" " />
+<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="433" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="162" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="72" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
+<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
+<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
+<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
+<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
+<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
+<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
+<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
+<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
+<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
+<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
+<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
+<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
+<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
+<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
+<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
+<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
+<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/media/fonts/glyphicons-halflings-regular.ttf b/media/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..1413fc6
Binary files /dev/null and b/media/fonts/glyphicons-halflings-regular.ttf differ
diff --git a/media/fonts/glyphicons-halflings-regular.woff b/media/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..9e61285
Binary files /dev/null and b/media/fonts/glyphicons-halflings-regular.woff differ
diff --git a/media/fonts/glyphicons-halflings-regular.woff2 b/media/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
Binary files /dev/null and b/media/fonts/glyphicons-halflings-regular.woff2 differ
diff --git a/media/js/admin.js b/media/js/admin.js
index fec0169..1ec93df 100644
--- a/media/js/admin.js
+++ b/media/js/admin.js
@@ -50,8 +50,8 @@ $(function(){
return false;
});
- $('.switch').switcher({copy: {en: {yes: '', no: ''}}}).on('change', function(){
- var checkbox = $(this);
+ $($('.switch').switcher({copy: {en: {yes: '', no: ''}}}).parent('.switcher')).on('click', function(){
+ var checkbox = $(this).find(':checkbox');
checkbox.switcher('setDisabled', true);
$.getJSON(checkbox.data('link') + '/' + (checkbox.is(':checked') ? 'on' : 'off') + '/' + checkbox.data('id'), function(response){
@@ -75,6 +75,7 @@ $(function(){
});
window.notify = new Notify();
+ $('.fancybox').fancybox();
});
var Notify = function() {
diff --git a/media/js/frontend.js b/media/js/frontend.js
index 3dc43a8..fbfb8b1 100644
--- a/media/js/frontend.js
+++ b/media/js/frontend.js
@@ -7,5 +7,8 @@ $(function(){
var checkbox = $(this);
checkbox.switcher('setDisabled', true);
location.href = checkbox.attr('data-link') + '/' + (checkbox.is(':checked') ? 1 : 0);
- });;
+ });
+ $('#easyii-navbar .live-edit-label').on('click', function(){
+ $('#easyii-navbar .switcher').trigger('click');
+ });
});
\ No newline at end of file
diff --git a/messages/ru/admin.php b/messages/ru/admin.php
index 5aeebb0..f2e4d3a 100644
--- a/messages/ru/admin.php
+++ b/messages/ru/admin.php
@@ -32,6 +32,7 @@
'File' => 'Файл',
'Views' => 'Просмотры',
'Description' => 'Описание',
+ 'Create item' => 'Добавить запись',
'Delete item' => 'Удалить запись',
'No records found' => 'Здесь пока пусто',
'Save' => 'Сохранить',
@@ -58,6 +59,7 @@
'Add subcategory' => 'Добавить подкатегорию',
'Anti-spam check' => 'Проверка на спам',
'Actions' => 'Действия',
+ 'Category' => 'Категория',
'Not found' => 'Не найдено',
'Create error. {0}' => 'Ошибка при создании. {0}',
@@ -111,6 +113,7 @@
'Assets cleared' => 'Assets очищены',
'Cache flushed' => 'Кэш успешно сброшен',
'Logs' => 'Логи',
+ 'Tools' => 'Инструменты',
'Seo texts' => 'Seo тексты',
'Categories' => 'Категории',
@@ -120,9 +123,31 @@
'Category updated' => 'Категория обновлена',
'Category deleted' => 'Категория удалена',
'Category image cleared' => 'Изображение очищено',
+ 'Category not found' => 'Категория не найдена',
+ 'Parent category' => 'Родительская категория',
'Clear image' => 'Очистить изображение',
'Image cleared' => 'Изображение очищено',
+ 'Fields' => 'Дополнительные поля',
+ 'Manage fields' => 'Редактировать поля',
+ 'Add field' => 'Добавить поле',
+ 'Save fields' => 'Сохранить поля',
+ 'Type options with `comma` as delimiter' => 'Элементы списка через запятую',
+ 'Type' => 'Тип поля',
+ 'Options' => 'Опции',
+ 'Select' => 'Выбрать',
+
+ 'New on website' => 'Новое на сайте',
+ 'Statistics' => 'Статистика',
+ 'Month' => 'Месяц',
+ 'Week' => 'Неделя',
+ 'Today' => 'Сегодня',
+ 'Active users' => 'На сайте',
+ 'Sessions and views' => 'Сессии и просмотры',
+ 'Countries' => 'Страны',
+ 'Sources' => 'Источники',
+ 'chart is loading' => 'график загружается',
+ 'Show on map' => 'На карте'
];
\ No newline at end of file
diff --git a/messages/ru/install.php b/messages/ru/install.php
index ec42653..f00e54a 100644
--- a/messages/ru/install.php
+++ b/messages/ru/install.php
@@ -17,5 +17,11 @@
'Installation completed' => 'Установка завершена',
'Installation error' => 'Ошибка установки',
'Cannot connect to database. Please configure `{0}`.' => 'Ошибка при подключении к базе данных. Пожалуйста проверьте настройки `{0}`.',
- 'EasyiiCMS is already installed. If you want to reinstall easyiiCMS, please drop all tables with prefix `easyii_` from your database manually.' => 'EasyiiCMS уже установлена. Если вы хотите произвести переустановку, удалите все таблицы с префиксом `easyii_` в вашей базе данных.'
+ 'EasyiiCMS is already installed. If you want to reinstall easyiiCMS, please drop all tables with prefix `easyii_` from your database manually.' => 'EasyiiCMS уже установлена. Если вы хотите произвести переустановку, удалите все таблицы с префиксом `easyii_` в вашей базе данных.',
+ 'Max image width on upload which will not resize' => 'Максимальная ширина загружаемых изображений, которые автоматически не сжимаются',
+ 'List of Redactor Widget plugins separated with comma' => 'Список плагинов редактора Redactor через запятую',
+ 'Google analytics service account email' => 'E-mail сервис аккаунта Google Analytics',
+ 'Google analytics profile id' => 'Номер профиля Google Analytics',
+ 'Path to Google analytics service account p12 key file' => 'Путь к файлу ключей p12 сервис аккаунта Google Analytics',
+ 'Google Maps API key' => 'Google Maps API ключ',
];
\ No newline at end of file
diff --git a/migrations/m000000_000000_install.php b/migrations/m000000_000000_install.php
index 6ee1bbc..1f9e442 100644
--- a/migrations/m000000_000000_install.php
+++ b/migrations/m000000_000000_install.php
@@ -27,305 +27,305 @@ public function up()
{
//ADMINS
$this->createTable(models\Admin::tableName(), [
- 'admin_id' => 'pk',
- 'username' => Schema::TYPE_STRING . '(32) NOT NULL',
- 'password' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'auth_key' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'access_token' => Schema::TYPE_STRING . '(128) DEFAULT NULL'
+ 'id' => $this->primaryKey(),
+ 'username' => $this->string(32)->notNull(),
+ 'password' => $this->string(64)->notNull(),
+ 'auth_key' => $this->string(128),
+ 'access_token' => $this->string(128),
], $this->engine);
$this->createIndex('access_token', models\Admin::tableName(), 'access_token', true);
//LOGINFORM
$this->createTable(models\LoginForm::tableName(), [
- 'log_id' => 'pk',
- 'username' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'password' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'ip' => Schema::TYPE_STRING . '(16) NOT NULL',
- 'user_agent' => Schema::TYPE_STRING . '(1024) NOT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'success' => Schema::TYPE_BOOLEAN . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'username' => $this->string(128),
+ 'password' => $this->string(128),
+ 'ip' => $this->string(16),
+ 'user_agent' => $this->string(1024),
+ 'time' => $this->integer()->defaultValue(0),
+ 'success' => $this->boolean()->defaultValue(0)
], $this->engine);
//MODULES
$this->createTable(models\Module::tableName(), [
- 'module_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'class' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'icon' => Schema::TYPE_STRING . '(32) NOT NULL',
- 'settings' => Schema::TYPE_TEXT . ' NOT NULL',
- 'notice' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'order_num' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'name' => $this->string(64)->notNull(),
+ 'class' => $this->string(128)->notNull(),
+ 'title' => $this->string(128)->notNull(),
+ 'icon' => $this->string(32),
+ 'settings' => $this->text(),
+ 'notice' => $this->integer()->defaultValue(0),
+ 'order_num' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(0)
], $this->engine);
$this->createIndex('name', models\Module::tableName(), 'name', true);
//PHOTOS
$this->createTable(models\Photo::tableName(), [
- 'photo_id' => 'pk',
- 'class' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'item_id' => Schema::TYPE_INTEGER . " NOT NULL",
- 'image' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'description' => Schema::TYPE_STRING . '(1024) NOT NULL',
- 'order_num' => Schema::TYPE_INTEGER . " NOT NULL",
+ 'id' => $this->primaryKey(),
+ 'class' => $this->string(128)->notNull(),
+ 'item_id' => $this->integer()->notNull(),
+ 'image' => $this->string(128)->notNull(),
+ 'description' => $this->string(1024),
+ 'order_num' => $this->integer()->defaultValue(0),
], $this->engine);
$this->createIndex('model_item', models\Photo::tableName(), ['class', 'item_id']);
//SEOTEXT
$this->createTable(models\SeoText::tableName(), [
- 'seotext_id' => 'pk',
- 'class' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'item_id' => Schema::TYPE_INTEGER . " NOT NULL",
- 'h1' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'title' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'keywords' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'description' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
+ 'id' => $this->primaryKey(),
+ 'class' => $this->string(128)->notNull(),
+ 'item_id' => $this->integer()->notNull(),
+ 'h1' => $this->string(255),
+ 'title' => $this->string(255),
+ 'keywords' => $this->string(255),
+ 'description' => $this->string(255),
], $this->engine);
$this->createIndex('model_item', models\SeoText::tableName(), ['class', 'item_id'], true);
//SETTINGS
$this->createTable(models\Setting::tableName(), [
- 'setting_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'value' => Schema::TYPE_STRING . '(1024) NOT NULL',
- 'visibility' => Schema::TYPE_BOOLEAN . " DEFAULT '0'",
+ 'id' => $this->primaryKey(),
+ 'name' => $this->string(64)->notNull(),
+ 'title' => $this->string(128)->notNull(),
+ 'value' => $this->string(1024),
+ 'visibility' => $this->boolean()->defaultValue(0),
], $this->engine);
$this->createIndex('name', models\Setting::tableName(), 'name', true);
//CAROUSEL MODULE
$this->createTable(Carousel::tableName(), [
- 'carousel_id' => 'pk',
- 'image' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'link' => Schema::TYPE_STRING . '(255) NOT NULL',
- 'title' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'text' => Schema::TYPE_TEXT . ' DEFAULT NULL',
- 'order_num' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'image' => $this->string(128)->notNull(),
+ 'link' => $this->string(255),
+ 'title' => $this->string(255),
+ 'text' => $this->string(1024),
+ 'order_num' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1),
], $this->engine);
//CATALOG MODULE
$this->createTable(catalog\models\Category::tableName(), [
- 'category_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'fields' => Schema::TYPE_TEXT . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'tree' => Schema::TYPE_INTEGER,
- 'lft' => Schema::TYPE_INTEGER,
- 'rgt' => Schema::TYPE_INTEGER,
- 'depth' => Schema::TYPE_INTEGER,
- 'order_num' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'image' => $this->string(128),
+ 'fields' => $this->text(),
+ 'slug' => $this->string(128),
+ 'tree' => $this->integer(),
+ 'lft' => $this->integer(),
+ 'rgt' => $this->integer(),
+ 'depth' => $this->integer(),
+ 'order_num' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', catalog\models\Category::tableName(), 'slug', true);
$this->createTable(catalog\models\Item::tableName(), [
- 'item_id' => 'pk',
- 'category_id' => Schema::TYPE_INTEGER,
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'description' => Schema::TYPE_TEXT . ' DEFAULT NULL',
- 'available' => Schema::TYPE_INTEGER . " DEFAULT '1'",
- 'price' => Schema::TYPE_FLOAT . " DEFAULT '0'",
- 'discount' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'data' => Schema::TYPE_TEXT . ' NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'category_id' => $this->integer(),
+ 'title' => $this->string(128)->notNull(),
+ 'description' => $this->text(),
+ 'available' => $this->integer()->defaultValue(1),
+ 'price' => $this->float()->defaultValue(0),
+ 'discount' => $this->integer()->defaultValue(0),
+ 'data' => $this->text(),
+ 'image' => $this->string(128),
+ 'slug' => $this->string(128),
+ 'time' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', catalog\models\Item::tableName(), 'slug', true);
$this->createTable(catalog\models\ItemData::tableName(), [
- 'data_id' => 'pk',
- 'item_id' => Schema::TYPE_INTEGER,
- 'name' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'value' => Schema::TYPE_STRING . '(1024) DEFAULT NULL',
+ 'id' => $this->primaryKey(),
+ 'item_id' => $this->integer(),
+ 'name' => $this->string(128)->notNull(),
+ 'value' => $this->string(1024),
], $this->engine);
$this->createIndex('item_id_name', catalog\models\ItemData::tableName(), ['item_id', 'name']);
$this->createIndex('value', catalog\models\ItemData::tableName(), 'value(300)');
//SHOPCART MODULE
$this->createTable(shopcart\models\Order::tableName(), [
- 'order_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'address' => Schema::TYPE_STRING . '(255) NOT NULL',
- 'phone' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'email' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'comment' => Schema::TYPE_STRING . '(1024) NOT NULL',
- 'remark' => Schema::TYPE_STRING . '(1024) NOT NULL',
- 'access_token' => Schema::TYPE_STRING . '(32) NOT NULL',
- 'ip' => Schema::TYPE_STRING . '(16) NOT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'new' => Schema::TYPE_BOOLEAN . " DEFAULT '0'",
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'name' => $this->string(64),
+ 'address' => $this->string(1024),
+ 'phone' => $this->string(64),
+ 'email' => $this->string(128),
+ 'comment' => $this->string(1024),
+ 'remark' => $this->string(1024),
+ 'access_token' => $this->string(32),
+ 'ip' => $this->string(16),
+ 'time' => $this->integer()->defaultValue(0),
+ 'new' => $this->boolean()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(0)
], $this->engine);
$this->createTable(shopcart\models\Good::tableName(), [
- 'good_id' => 'pk',
- 'order_id' => Schema::TYPE_INTEGER,
- 'item_id' => Schema::TYPE_INTEGER,
- 'count' => Schema::TYPE_INTEGER,
- 'options' => Schema::TYPE_STRING . '(255) NOT NULL',
- 'price' => Schema::TYPE_FLOAT . " DEFAULT '0'",
- 'discount' => Schema::TYPE_INTEGER . " DEFAULT '0'",
+ 'id' => $this->primaryKey(),
+ 'order_id' => $this->integer(),
+ 'item_id' => $this->integer(),
+ 'count' => $this->integer(),
+ 'options' => $this->string(255),
+ 'price' => $this->float()->defaultValue(0),
+ 'discount' => $this->integer()->defaultValue(0),
], $this->engine);
//FEEDBACK MODULE
$this->createTable(Feedback::tableName(), [
- 'feedback_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(64) NOT NULL',
- 'email' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'phone' => Schema::TYPE_STRING . '(64) DEFAULT NULL',
- 'title' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'answer_subject' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'answer_text' => Schema::TYPE_TEXT . ' DEFAULT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'ip' => Schema::TYPE_STRING . '(16) NOT NULL',
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'name' => Schema::TYPE_STRING,
+ 'email' => $this->string(128)->notNull(),
+ 'phone' => $this->string(64),
+ 'title' => $this->string(128),
+ 'text' => $this->text()->notNull(),
+ 'answer_subject' => $this->string(128),
+ 'answer_text' => $this->text(),
+ 'time' => $this->integer()->defaultValue(0),
+ 'ip' => $this->string(16),
+ 'status' => $this->boolean()->defaultValue(0)
], $this->engine);
//FILE MODULE
$this->createTable(File::tableName(), [
- 'file_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'file' => Schema::TYPE_STRING . '(255) NOT NULL',
- 'size' => Schema::TYPE_INTEGER . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'downloads' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'order_num' => Schema::TYPE_INTEGER,
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'file' => $this->string(255)->notNull(),
+ 'size' => $this->integer()->defaultValue(0),
+ 'slug' => $this->string(128),
+ 'downloads' => $this->integer()->defaultValue(0),
+ 'time' => $this->integer()->defaultValue(0),
+ 'order_num' => $this->integer(),
], $this->engine);
$this->createIndex('slug', File::tableName(), 'slug', true);
//GALLERY MODULE
$this->createTable(gallery\models\Category::tableName(), [
- 'category_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'tree' => Schema::TYPE_INTEGER,
- 'lft' => Schema::TYPE_INTEGER,
- 'rgt' => Schema::TYPE_INTEGER,
- 'depth' => Schema::TYPE_INTEGER,
- 'order_num' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'image' => $this->string(128),
+ 'slug' => $this->string(128),
+ 'tree' => $this->integer(),
+ 'lft' => $this->integer(),
+ 'rgt' => $this->integer(),
+ 'depth' => $this->integer(),
+ 'order_num' => $this->integer(),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', gallery\models\Category::tableName(), 'slug', true);
//GUESTBOOK MODULE
$this->createTable(Guestbook::tableName(), [
- 'guestbook_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'title' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'answer' => Schema::TYPE_TEXT . ' DEFAULT NULL',
- 'email' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'ip' => Schema::TYPE_STRING . '(16) NOT NULL',
- 'new' => Schema::TYPE_BOOLEAN . " DEFAULT '0'",
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'name' => $this->string(128)->notNull(),
+ 'title' => $this->string(128),
+ 'text' => $this->text()->notNull(),
+ 'answer' => $this->text(),
+ 'email' => $this->string(128),
+ 'time' => $this->integer()->defaultValue(0),
+ 'ip' => $this->string(16),
+ 'new' => $this->boolean()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(0)
], $this->engine);
//NEWS MODULE
$this->createTable(News::tableName(), [
- 'news_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'short' => Schema::TYPE_STRING . '(1024) DEFAULT NULL',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'views' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'image' => $this->string(128),
+ 'short' => $this->string(1024),
+ 'text' => $this->text(),
+ 'slug' => $this->string(128),
+ 'time' => $this->integer()->defaultValue(0),
+ 'views' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', News::tableName(), 'slug', true);
//ARTICLE MODULE
$this->createTable(article\models\Category::tableName(), [
- 'category_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'order_num' => Schema::TYPE_INTEGER,
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'tree' => Schema::TYPE_INTEGER,
- 'lft' => Schema::TYPE_INTEGER,
- 'rgt' => Schema::TYPE_INTEGER,
- 'depth' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'image' => $this->string(128),
+ 'order_num' => $this->integer(),
+ 'slug' => $this->string(128),
+ 'tree' => $this->integer(),
+ 'lft' => $this->integer(),
+ 'rgt' => $this->integer(),
+ 'depth' => $this->integer(),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', article\models\Category::tableName(), 'slug', true);
$this->createTable(article\models\Item::tableName(), [
- 'item_id' => 'pk',
- 'category_id' => Schema::TYPE_INTEGER,
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'image' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'short' => Schema::TYPE_STRING . '(1024) DEFAULT NULL',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'views' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'category_id' => $this->integer(),
+ 'title' => $this->string(128)->notNull(),
+ 'image' => $this->string(128),
+ 'short' => $this->string(1024),
+ 'text' => $this->text(),
+ 'slug' => $this->string(128),
+ 'time' => $this->integer()->defaultValue(0),
+ 'views' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
$this->createIndex('slug', article\models\Item::tableName(), 'slug', true);
//PAGE MODULE
$this->createTable(Page::tableName(), [
- 'page_id' => 'pk',
- 'title' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL'
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'text' => $this->text(),
+ 'slug' => $this->string(128)
], $this->engine);
$this->createIndex('slug', Page::tableName(), 'slug', true);
//FAQ MODULE
$this->createTable(Faq::tableName(), [
- 'faq_id' => 'pk',
- 'question' => Schema::TYPE_TEXT . ' NOT NULL',
- 'answer' => Schema::TYPE_TEXT . ' NOT NULL',
- 'order_num' => Schema::TYPE_INTEGER,
- 'status' => Schema::TYPE_BOOLEAN . " DEFAULT '1'"
+ 'id' => $this->primaryKey(),
+ 'question' => $this->text()->notNull(),
+ 'answer' => $this->text()->notNull(),
+ 'order_num' => $this->integer()->defaultValue(0),
+ 'status' => $this->boolean()->defaultValue(1)
], $this->engine);
//SUBSCRIBE MODULE
$this->createTable(Subscriber::tableName(), [
- 'subscriber_id' => 'pk',
- 'email' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'ip' => Schema::TYPE_STRING . '(16) NOT NULL',
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'email' => $this->string(128)->notNull(),
+ 'ip' => $this->string(16),
+ 'time' => $this->integer()->defaultValue(0)
], $this->engine);
$this->createIndex('email', Subscriber::tableName(), 'email', true);
$this->createTable(History::tableName(), [
- 'history_id' => 'pk',
- 'subject' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'body' => Schema::TYPE_TEXT . ' NOT NULL',
- 'sent' => Schema::TYPE_INTEGER . " DEFAULT '0'",
- 'time' => Schema::TYPE_INTEGER . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'subject' => $this->string(128)->notNull(),
+ 'body' => $this->text(),
+ 'sent' => $this->integer()->defaultValue(0),
+ 'time' => $this->integer()->defaultValue(0)
], $this->engine);
//TEXT MODULE
$this->createTable(Text::tableName(), [
- 'text_id' => 'pk',
- 'text' => Schema::TYPE_TEXT . ' NOT NULL',
- 'slug' => Schema::TYPE_STRING . '(128) DEFAULT NULL'
+ 'id' => $this->primaryKey(),
+ 'text' => $this->text()->notNull(),
+ 'slug' => $this->string(128)
], $this->engine);
$this->createIndex('slug', Text::tableName(), 'slug', true);
//Tags
$this->createTable(models\Tag::tableName(), [
- 'tag_id' => 'pk',
- 'name' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'frequency' => Schema::TYPE_INTEGER . " DEFAULT '0'"
+ 'id' => $this->primaryKey(),
+ 'name' => $this->string(128)->notNull(),
+ 'frequency' => $this->integer()->defaultValue(0)
], $this->engine);
$this->createIndex('name', models\Tag::tableName(), 'name', true);
$this->createTable(models\TagAssign::tableName(), [
- 'class' => Schema::TYPE_STRING . '(128) NOT NULL',
- 'item_id' => Schema::TYPE_INTEGER . " NOT NULL",
- 'tag_id' => Schema::TYPE_INTEGER . " NOT NULL",
+ 'class' => $this->string(128)->notNull(),
+ 'item_id' => $this->integer()->notNull(),
+ 'tag_id' => $this->integer()->notNull(),
], $this->engine);
$this->createIndex('class', models\TagAssign::tableName(), 'class');
$this->createIndex('item_tag', models\TagAssign::tableName(), ['item_id', 'tag_id']);
diff --git a/migrations/m000009_100000_update.php b/migrations/m000009_100000_update.php
new file mode 100644
index 0000000..ce0a22c
--- /dev/null
+++ b/migrations/m000009_100000_update.php
@@ -0,0 +1,214 @@
+<?php
+use yii\easyii\helpers\Data;
+use yii\easyii\helpers\MigrationHelper;
+use yii\easyii\models;
+use yii\easyii\models\Setting;
+use yii\easyii\modules\entity;
+use yii\easyii\modules\catalog;
+use yii\easyii\modules\shopcart;
+use yii\easyii\modules\file;
+use yii\easyii\modules\article;
+use yii\easyii\modules\carousel\models\Carousel;
+use yii\easyii\modules\gallery;
+use yii\easyii\modules\news\models\News;
+use yii\easyii\modules\entity\EntityModule;
+
+class m000009_100000_update extends \yii\db\Migration
+{
+ const VERSION = 0.91;
+
+ public $engine = 'ENGINE=MyISAM DEFAULT CHARSET=utf8';
+
+ public function up()
+ {
+ //ENTITY MODULE
+ $this->createTable(entity\models\Category::tableName(), [
+ 'id' => $this->primaryKey(),
+ 'title' => $this->string(128)->notNull(),
+ 'description' => $this->string(1024),
+ 'image_file' => $this->string(128),
+ 'fields' => $this->text()->notNull(),
+ 'slug' => $this->string(128),
+ 'cache' => $this->boolean()->notNull()->defaultValue(1),
+ 'tree' => $this->integer(),
+ 'lft' => $this->integer(),
+ 'rgt' => $this->integer(),
+ 'depth' => $this->integer(),
+ 'order_num' => $this->integer(),
+ 'status' => $this->boolean()->defaultValue(1)
+ ], $this->engine);
+ $this->createIndex('slug', entity\models\Category::tableName(), 'slug', true);
+
+ $this->createTable(entity\models\Item::tableName(), [
+ 'id' => $this->primaryKey(),
+ 'category_id' => $this->integer()->notNull(),
+ 'title' => $this->string(128)->notNull(),
+ 'data' => $this->text()->notNull(),
+ 'order_num' => $this->integer(),
+ 'status' => $this->boolean()->defaultValue(1)
+ ], $this->engine);
+
+ $language = Data::getLocale();
+
+ $this->insert(models\Module::tableName(), [
+ 'name' => 'entity',
+ 'title' => (!empty(EntityModule::$installConfig['title'][$language]) ? EntityModule::$installConfig['title'][$language] : EntityModule::$installConfig['title']['en']),
+ 'class' => EntityModule::className(),
+ 'icon' => 'asterisk',
+ 'settings' => json_encode((new EntityModule(100))->settings),
+ 'order_num' => 95,
+ 'status' => models\Module::STATUS_ON
+ ]);
+
+ $this->addColumn(yii\easyii\modules\catalog\models\Category::tableName(), 'description', $this->string(1024) . ' AFTER title');
+ $this->addColumn(yii\easyii\modules\article\models\Category::tableName(), 'description', $this->string(1024) . ' AFTER title');
+ $this->addColumn(yii\easyii\modules\gallery\models\Category::tableName(), 'description', $this->string(1024) . ' AFTER title');
+
+ $this->renameColumn(catalog\models\Category::tableName(), 'image', 'image_file');
+ $this->renameColumn(catalog\models\Item::tableName(), 'image', 'image_file');
+ $this->renameColumn(article\models\Category::tableName(), 'image', 'image_file');
+ $this->renameColumn(article\models\Item::tableName(), 'image', 'image_file');
+ $this->renameColumn(gallery\models\Category::tableName(), 'image', 'image_file');
+ $this->renameColumn(News::tableName(), 'image', 'image_file');
+ $this->renameColumn(Carousel::tableName(), 'image', 'image_file');
+ $this->renameColumn(models\Photo::tableName(), 'image', 'image_file');
+
+ $this->updateFilePath(catalog\models\Category::className());
+ $this->updateFilePath(catalog\models\Item::className());
+ $this->updateFilePath(article\models\Category::className());
+ $this->updateFilePath(article\models\Item::className());
+ $this->updateFilePath(News::className());
+ $this->updateFilePath(Carousel::className());
+ $this->updateFilePath(models\Photo::className());
+ $this->updateFilePath(file\models\File::className(), 'file');
+
+
+ $this->registerI18n();
+ $this->insert(Setting::tableName(), [
+ 'name' => 'image_max_width',
+ 'value' => 1900,
+ 'title' => Yii::t('easyii/install', 'Max image width on upload which will not resize'),
+ 'visibility' => Setting::VISIBLE_ALL
+ ]);
+
+ $this->insert(Setting::tableName(), [
+ 'name' => 'redactor_plugins',
+ 'value' => 'imagemanager, filemanager, table, fullscreen',
+ 'title' => Yii::t('easyii/install', 'List of Redactor Widget plugins separated with comma'),
+ 'visibility' => Setting::VISIBLE_ROOT
+ ]);
+
+ $this->insert(Setting::tableName(), [
+ 'name' => 'ga_service_email',
+ 'value' => '',
+ 'title' => Yii::t('easyii/install', 'Google analytics service account email'),
+ 'visibility' => Setting::VISIBLE_ROOT
+ ]);
+
+ $this->insert(Setting::tableName(), [
+ 'name' => 'ga_profile_id',
+ 'value' => '',
+ 'title' => Yii::t('easyii/install', 'Google analytics profile id'),
+ 'visibility' => Setting::VISIBLE_ROOT
+ ]);
+
+ $this->insert(Setting::tableName(), [
+ 'name' => 'ga_p12_file',
+ 'value' => '',
+ 'title' => Yii::t('easyii/install', 'Path to Google analytics service account p12 key file'),
+ 'visibility' => Setting::VISIBLE_ROOT
+ ]);
+
+ $this->insert(Setting::tableName(), [
+ 'name' => 'gm_api_key',
+ 'value' => '',
+ 'title' => Yii::t('easyii/install', 'Google Maps API key'),
+ 'visibility' => Setting::VISIBLE_ROOT
+ ]);
+
+ MigrationHelper::appendModuleSettings('article', [
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+ 'itemSlugImmutable' => false
+ ]);
+ MigrationHelper::appendModuleSettings('catalog', [
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+ 'itemSlugImmutable' => false
+ ]);
+ MigrationHelper::appendModuleSettings('faq', [
+ 'questionHtmlEditor' => true
+ ]);
+ MigrationHelper::appendModuleSettings('faq', [
+ 'answerHtmlEditor' => true
+ ]);
+ MigrationHelper::appendModuleSettings('faq', [
+ 'enableTags' => true
+ ]);
+ MigrationHelper::appendModuleSettings('file', [
+ 'slugImmutable' => false
+ ]);
+ MigrationHelper::appendModuleSettings('gallery', [
+ 'categoryTags' => true,
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+ ]);
+ MigrationHelper::appendModuleSettings('news', [
+ 'slugImmutable' => false,
+ ]);
+ MigrationHelper::appendModuleSettings('feedback', [
+ 'enableEmail' => true,
+ 'enableText' => true,
+ ]);
+
+ //UPDATE VERSION
+ $this->update(models\Setting::tableName(), ['value' => self::VERSION], ['name' => 'easyii_version']);
+ }
+
+ public function down()
+ {
+ $this->dropTable(entity\models\Category::tableName());
+ $this->dropTable(entity\models\Item::tableName());
+
+ $this->renameColumn(catalog\models\Category::tableName(), 'image_file', 'image');
+ $this->renameColumn(catalog\models\Item::tableName(), 'image_file', 'image');
+ $this->renameColumn(article\models\Category::tableName(), 'image_file', 'image');
+ $this->renameColumn(article\models\Item::tableName(), 'image_file', 'image');
+ $this->renameColumn(gallery\models\Category::tableName(), 'image_file', 'image');
+ $this->renameColumn(models\Photo::tableName(), 'image_file', 'image');
+ $this->renameColumn(Carousel::tableName(), 'image_file', 'image');
+ $this->renameColumn(News::tableName(), 'image_file', 'image');
+
+ $this->delete(Setting::tableName(), ['name' => 'image_max_width']);
+ $this->delete(Setting::tableName(), ['name' => 'redactor_plugins']);
+
+ //UPDATE VERSION
+ $this->update(models\Setting::tableName(), ['value' => 0.9], ['name' => 'easyii_version']);
+
+ echo 'New image and file paths cannot be reverted.';
+ }
+
+ private function updateFilePath($class, $attribute = 'image_file')
+ {
+ foreach($class::find()->all() as $model){
+ $pieces = explode('/', $model->{$attribute});
+ $count = count($pieces);
+ if($count > 2){
+ $newPath = $pieces[$count - 2] . '/' . $pieces[$count - 1];
+ $class::updateAll([$attribute => $newPath], [$model->primaryKey()[0] => $model->primaryKey]);
+ }
+ }
+ }
+
+ private function registerI18n()
+ {
+ Yii::$app->i18n->translations['easyii/install'] = [
+ 'class' => 'yii\i18n\PhpMessageSource',
+ 'sourceLanguage' => 'en-US',
+ 'basePath' => '@vendor/noumo/easyii/messages',
+ 'fileMap' => [
+ 'easyii/install' => 'install.php',
+ ]
+ ];
+ }
+}
diff --git a/migrations/m000009_200000_update.php b/migrations/m000009_200000_update.php
new file mode 100644
index 0000000..a2e99ab
--- /dev/null
+++ b/migrations/m000009_200000_update.php
@@ -0,0 +1,63 @@
+<?php
+use yii\easyii\helpers\Data;
+use yii\easyii\helpers\MigrationHelper;
+use yii\easyii\models;
+use yii\easyii\models\Setting;
+use yii\easyii\modules\entity;
+use yii\easyii\modules\catalog;
+use yii\easyii\modules\page\models\Page;
+use yii\easyii\modules\shopcart;
+use yii\easyii\modules\file;
+use yii\easyii\modules\article;
+use yii\easyii\modules\carousel\models\Carousel;
+use yii\easyii\modules\gallery;
+use yii\easyii\modules\news\models\News;
+use yii\easyii\modules\entity\EntityModule;
+
+class m000009_200000_update extends \yii\db\Migration
+{
+ const VERSION = 0.92;
+
+ public $engine = 'ENGINE=MyISAM DEFAULT CHARSET=utf8';
+
+ public function up()
+ {
+ $this->addColumn(Page::tableName(), 'show_in_menu', $this->boolean()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'fields', $this->text());
+ $this->addColumn(Page::tableName(), 'data', $this->text());
+ $this->addColumn(Page::tableName(), 'tree', $this->integer()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'lft', $this->integer()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'rgt', $this->integer()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'depth', $this->integer()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'order_num', $this->integer()->defaultValue(0));
+ $this->addColumn(Page::tableName(), 'status', $this->boolean()->defaultValue(1));
+
+ $i = 1;
+ foreach(Page::find()->all() as $page) {
+ $page->tree = $i;
+ $page->lft = 1;
+ $page->rgt = 2;
+ $page->order_num = $i++;
+ $page->update(false, ['tree', 'lft', 'rgt', 'order_num']);
+ }
+
+ MigrationHelper::appendModuleSettings('page', [
+ 'slugImmutable' => true,
+ ]);
+ MigrationHelper::appendModuleSettings('page', [
+ 'defaultFields' => '[]',
+ ]);
+ }
+
+ public function down()
+ {
+ $this->dropColumn(Page::tableName(), 'fields');
+ $this->dropColumn(Page::tableName(), 'data');
+ $this->dropColumn(Page::tableName(), 'tree');
+ $this->dropColumn(Page::tableName(), 'lft');
+ $this->dropColumn(Page::tableName(), 'rgt');
+ $this->dropColumn(Page::tableName(), 'depth');
+ $this->dropColumn(Page::tableName(), 'order_num');
+ $this->dropColumn(Page::tableName(), 'status');
+ }
+}
diff --git a/models/Admin.php b/models/Admin.php
index 9e7f81f..1cb0d94 100644
--- a/models/Admin.php
+++ b/models/Admin.php
@@ -6,7 +6,7 @@
class Admin extends \yii\easyii\components\ActiveRecord implements \yii\web\IdentityInterface
{
static $rootUser = [
- 'admin_id' => 0,
+ 'id' => 0,
'username' => 'root',
'password' => '',
'auth_key' => '',
@@ -56,7 +56,7 @@ public static function findIdentity($id)
{
$result = null;
try {
- $result = $id == self::$rootUser['admin_id']
+ $result = $id == self::$rootUser['id']
? static::createRootUser()
: static::findOne($id);
} catch (\yii\base\InvalidConfigException $e) {
@@ -79,7 +79,7 @@ public static function findByUsername($username)
public function getId()
{
- return $this->admin_id;
+ return $this->id;
}
public function getAuthKey()
diff --git a/models/InstallForm.php b/models/InstallForm.php
index 7a08eb9..d1647c3 100644
--- a/models/InstallForm.php
+++ b/models/InstallForm.php
@@ -10,21 +10,22 @@ class InstallForm extends Model
const ROOT_PASSWORD_KEY = 'easyii_install_success_return';
public $root_password;
- public $recaptcha_key;
- public $recaptcha_secret;
- public $robot_email;
- public $admin_email;
+ public $recaptcha_key = '';
+ public $recaptcha_secret = '';
+ public $robot_email = '';
+ public $admin_email = '';
public function rules()
{
return [
- ['root_password', 'required'],
+ [['root_password', 'admin_email'], 'required'],
['root_password', 'string', 'min' => 6],
[['recaptcha_key', 'recaptcha_secret'], 'string'],
[['robot_email', 'admin_email'], 'email'],
[['root_password', 'recaptcha_key', 'recaptcha_secret', 'robot_email', 'admin_email'], 'trim'],
];
}
+
public function attributeLabels()
{
return [
@@ -33,4 +34,12 @@ public function attributeLabels()
'robot_email' => Yii::t('easyii/install', 'Robot E-mail')
];
}
+
+ public function init()
+ {
+ $this->robot_email = 'noreply@' . Yii::$app->request->serverName;
+ if(strpos($this->robot_email, '.') === false){
+ $this->robot_email .= '.com';
+ }
+ }
}
\ No newline at end of file
diff --git a/models/Photo.php b/models/Photo.php
index f7d980f..832910e 100644
--- a/models/Photo.php
+++ b/models/Photo.php
@@ -3,10 +3,19 @@
use Yii;
use yii\easyii\behaviors\SortableModel;
+use yii\easyii\helpers\Upload;
+/**
+ * @property integer $id
+ * @property integer $item_id
+ * @property string $image_file
+ * @property string $description
+ * @property string $class
+ *
+ * @property string $image
+*/
class Photo extends \yii\easyii\components\ActiveRecord
{
- const PHOTO_MAX_WIDTH = 1900;
const PHOTO_THUMB_WIDTH = 120;
const PHOTO_THUMB_HEIGHT = 90;
@@ -20,7 +29,7 @@ public function rules()
return [
[['class', 'item_id'], 'required'],
['item_id', 'integer'],
- ['image', 'image'],
+ ['image_file', 'image'],
['description', 'trim']
];
}
@@ -36,6 +45,11 @@ public function afterDelete()
{
parent::afterDelete();
- @unlink(Yii::getAlias('@webroot').$this->image);
+ Upload::delete($this->image_file);
+ }
+
+ public function getImage()
+ {
+ return Upload::getFileUrl($this->image_file);
}
}
\ No newline at end of file
diff --git a/models/Setting.php b/models/Setting.php
index 6921763..8486ce5 100644
--- a/models/Setting.php
+++ b/models/Setting.php
@@ -65,6 +65,19 @@ public static function get($name)
return isset(self::$_data[$name]) ? self::$_data[$name] : null;
}
+ public static function getAsArray($name)
+ {
+ $result = [];
+ $value = self::get($name);
+ if($value) {
+ foreach(explode(',', $value) as $item){
+ $result[] = trim($item);
+ }
+ $result = array_filter($result);
+ }
+ return $result;
+ }
+
public static function set($name, $value)
{
if(self::get($name)){
diff --git a/modules/article/ArticleModule.php b/modules/article/ArticleModule.php
index 2fa3509..73f412d 100644
--- a/modules/article/ArticleModule.php
+++ b/modules/article/ArticleModule.php
@@ -5,14 +5,17 @@ class ArticleModule extends \yii\easyii\components\Module
{
public $settings = [
'categoryThumb' => true,
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+
'articleThumb' => true,
'enablePhotos' => true,
-
+ 'enableTags' => true,
'enableShort' => true,
'shortMaxLength' => 255,
- 'enableTags' => true,
'itemsInFolder' => false,
+ 'itemSlugImmutable' => false
];
public static $installConfig = [
diff --git a/modules/article/api/Article.php b/modules/article/api/Article.php
index 59ed9b2..4c7345f 100644
--- a/modules/article/api/Article.php
+++ b/modules/article/api/Article.php
@@ -5,9 +5,11 @@
use yii\data\ActiveDataProvider;
use yii\easyii\models\Tag;
+use yii\easyii\modules\article\ArticleModule;
use yii\easyii\modules\article\models\Category;
use yii\easyii\modules\article\models\Item;
use yii\easyii\widgets\Fancybox;
+use yii\web\NotFoundHttpException;
use yii\widgets\LinkPager;
/**
@@ -28,15 +30,13 @@
class Article extends \yii\easyii\components\API
{
private $_cats;
- private $_items;
private $_adp;
private $_item = [];
- private $_last;
public function api_cat($id_slug)
{
if(!isset($this->_cats[$id_slug])) {
- $this->_cats[$id_slug] = $this->findCategory($id_slug);
+ $this->_cats[$id_slug] = new CategoryObject(Category::get($id_slug));
}
return $this->_cats[$id_slug];
}
@@ -46,59 +46,65 @@ public function api_tree()
return Category::tree();
}
- public function api_cats()
+ public function api_cats($options = [])
{
- return Category::cats();
+ $result = [];
+ foreach(Category::cats() as $model){
+ $result[] = new CategoryObject($model);
+ }
+ if(!empty($options['tags'])){
+ foreach($result as $i => $item){
+ if(!in_array($options['tags'], $item->tags)){
+ unset($result[$i]);
+ }
+ }
+ }
+
+ return $result;
}
public function api_items($options = [])
{
- if(!$this->_items){
- $this->_items = [];
+ $result = [];
- $with = ['seo', 'category'];
- if(Yii::$app->getModule('admin')->activeModules['article']->settings['enableTags']){
- $with[] = 'tags';
- }
- $query = Item::find()->with($with)->status(Item::STATUS_ON);
+ $with = ['seo', 'category'];
+ if(ArticleModule::setting('enableTags')){
+ $with[] = 'tags';
+ }
+ $query = Item::find()->with($with)->status(Item::STATUS_ON);
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
- if(!empty($options['tags'])){
- $query
- ->innerJoinWith('tags', false)
- ->andWhere([Tag::tableName() . '.name' => (new Item())->filterTagValues($options['tags'])])
- ->addGroupBy('item_id');
- }
- if(!empty($options['orderBy'])){
- $query->orderBy($options['orderBy']);
- } else {
- $query->sortDate();
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ if(!empty($options['tags'])){
+ $query
+ ->innerJoinWith('tags', false)
+ ->andWhere([Tag::tableName() . '.name' => (new Item())->filterTagValues($options['tags'])])
+ ->addGroupBy('id');
+ }
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sortDate();
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
- foreach($this->_adp->models as $model){
- $this->_items[] = new ArticleObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new ArticleObject($model);
}
- return $this->_items;
+ return $result;
}
public function api_last($limit = 1, $where = null)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
- }
-
$result = [];
$with = ['seo'];
- if(Yii::$app->getModule('admin')->activeModules['article']->settings['enableTags']){
+ if(ArticleModule::setting('enableTags')){
$with[] = 'tags';
}
$query = Item::find()->with($with)->status(Item::STATUS_ON)->sortDate()->limit($limit);
@@ -109,13 +115,7 @@ public function api_last($limit = 1, $where = null)
foreach($query->all() as $item){
$result[] = new ArticleObject($item);
}
-
- if($limit > 1){
- return $result;
- }else{
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_get($id_slug)
@@ -144,21 +144,17 @@ public function api_pages()
return $this->_adp ? LinkPager::widget(['pagination' => $this->_adp->pagination]) : '';
}
- private function findCategory($id_slug)
- {
- $category = Category::find()->where(['or', 'category_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one();
-
- return $category ? new CategoryObject($category) : null;
- }
-
private function findItem($id_slug)
{
- $article = Item::find()->where(['or', 'item_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one();
- if($article) {
- $article->updateCounters(['views' => 1]);
- return new ArticleObject($article);
+ if(is_numeric($id_slug)) {
+ $condition = ['or', 'id=:id_slug', 'slug=:id_slug'];
} else {
- return null;
+ $condition = 'slug=:id_slug';
+ }
+ if(!($article = Item::find()->where($condition, [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one())) {
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
}
+ $article->updateCounters(['views' => 1]);
+ return new ArticleObject($article);
}
}
\ No newline at end of file
diff --git a/modules/article/api/ArticleObject.php b/modules/article/api/ArticleObject.php
index 1414aa6..084f7ac 100644
--- a/modules/article/api/ArticleObject.php
+++ b/modules/article/api/ArticleObject.php
@@ -23,20 +23,20 @@ class ArticleObject extends \yii\easyii\components\ApiObject
private $_photos;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
public function getShort(){
- return LIVE_EDIT ? API::liveEdit($this->model->short, $this->editLink) : $this->model->short;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->short, $this->getEditLink()) : $this->model->short;
}
public function getText(){
- return LIVE_EDIT ? API::liveEdit($this->model->text, $this->editLink, 'div') : $this->model->text;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->text, $this->getEditLink(), 'div') : $this->model->text;
}
public function getCat(){
- return Article::cats()[$this->category_id];
+ return Article::cat($this->category_id);
}
public function getTags(){
diff --git a/modules/article/api/CategoryObject.php b/modules/article/api/CategoryObject.php
index 05a9e8f..4c4f951 100644
--- a/modules/article/api/CategoryObject.php
+++ b/modules/article/api/CategoryObject.php
@@ -5,6 +5,7 @@
use yii\data\ActiveDataProvider;
use yii\easyii\components\API;
use yii\easyii\models\Tag;
+use yii\easyii\modules\article\ArticleModule;
use yii\easyii\modules\article\models\Item;
use yii\helpers\Url;
use yii\widgets\LinkPager;
@@ -12,57 +13,72 @@
class CategoryObject extends \yii\easyii\components\ApiObject
{
public $slug;
+ public $description;
public $image;
public $tree;
public $depth;
private $_adp;
- private $_items;
+ private $_children;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
- public function pages($options = []){
+ public function getPages($options = []){
return $this->_adp ? LinkPager::widget(array_merge($options, ['pagination' => $this->_adp->pagination])) : '';
}
- public function pagination(){
+ public function getPagination(){
return $this->_adp ? $this->_adp->pagination : null;
}
- public function items($options = [])
+ public function getChildren()
{
- if(!$this->_items){
- $this->_items = [];
-
- $with = ['seo'];
- if(Yii::$app->getModule('admin')->activeModules['article']->settings['enableTags']){
- $with[] = 'tags';
+ if($this->_children === null) {
+ $this->_children = [];
+ foreach ($this->model->children as $child) {
+ $this->_children[] = Article::cat($child);
}
+ }
+ return $this->_children;
+ }
- $query = Item::find()->with('seo')->where(['category_id' => $this->id])->status(Item::STATUS_ON)->sortDate();
+ public function getItems($options = [])
+ {
+ $result = [];
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
- if(!empty($options['tags'])){
- $query
- ->innerJoinWith('tags', false)
- ->andWhere([Tag::tableName() . '.name' => (new Item())->filterTagValues($options['tags'])])
- ->addGroupBy('item_id');
- }
+ $with = ['seo'];
+ if(ArticleModule::setting('enableTags')){
+ $with[] = 'tags';
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $query = Item::find()->with(['seo'])->where(['category_id' => $this->id])->status(Item::STATUS_ON)->sortDate();
- foreach($this->_adp->models as $model){
- $this->_items[] = new ArticleObject($model);
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ if(!empty($options['tags'])){
+ $query
+ ->innerJoinWith('tags', false)
+ ->andWhere([Tag::tableName() . '.name' => (new Item())->filterTagValues($options['tags'])])
+ ->addGroupBy('id');
+ }
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sortDate();
+ }
+
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
+
+ foreach($this->_adp->models as $model){
+ $result[] = new ArticleObject($model);
}
- return $this->_items;
+ return $result;
}
public function getEditLink(){
diff --git a/modules/article/api/PhotoObject.php b/modules/article/api/PhotoObject.php
index 08a6cc7..363e4df 100644
--- a/modules/article/api/PhotoObject.php
+++ b/modules/article/api/PhotoObject.php
@@ -8,7 +8,6 @@
class PhotoObject extends \yii\easyii\components\ApiObject
{
- public $image;
public $description;
public function box($width, $height){
@@ -18,7 +17,7 @@ public function box($width, $height){
'rel' => 'article-'.$this->model->item_id,
'title' => $this->description
]);
- return LIVE_EDIT ? API::liveEdit($a, $this->editLink) : $a;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($a, $this->editLink) : $a;
}
public function getEditLink(){
diff --git a/modules/article/controllers/ItemsController.php b/modules/article/controllers/ItemsController.php
index 6c6f9f0..3d3c32f 100644
--- a/modules/article/controllers/ItemsController.php
+++ b/modules/article/controllers/ItemsController.php
@@ -2,51 +2,57 @@
namespace yii\easyii\modules\article\controllers;
use Yii;
-use yii\easyii\behaviors\SortableDateController;
-use yii\easyii\behaviors\StatusController;
-use yii\web\UploadedFile;
-
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\ClearImageAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByDateAction;
use yii\easyii\components\Controller;
+use yii\easyii\modules\article\ArticleModule;
use yii\easyii\modules\article\models\Category;
use yii\easyii\modules\article\models\Item;
-use yii\easyii\helpers\Image;
use yii\widgets\ActiveForm;
class ItemsController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\article\models\Item';
+ public $categoryClass = 'yii\easyii\modules\article\models\Category';
+
+ public function actions()
{
return [
- [
- 'class' => SortableDateController::className(),
- 'model' => Item::className(),
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/article', 'Article deleted')
+ ],
+ 'clear-image' => ClearImageAction::className(),
+ 'up' => [
+ 'class' => SortByDateAction::className(),
+ 'addititonalEquality' => ['category_id']
],
- [
- 'class' => StatusController::className(),
- 'model' => Item::className()
- ]
+ 'down' => [
+ 'class' => SortByDateAction::className(),
+ 'addititonalEquality' => ['category_id']
+ ],
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
public function actionIndex($id)
{
- if(!($model = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
return $this->render('index', [
- 'model' => $model
+ 'category' => $this->findCategory($id)
]);
}
-
public function actionCreate($id)
{
- if(!($category = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $category = $this->findCategory($id);
- $model = new Item;
+ $model = new Item([
+ 'category_id' => $id,
+ 'time' => time()
+ ]);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -54,17 +60,6 @@ public function actionCreate($id)
return ActiveForm::validate($model);
}
else {
- $model->category_id = $category->primaryKey;
-
- if (isset($_FILES) && $this->module->settings['articleThumb']) {
- $model->image = UploadedFile::getInstance($model, 'image');
- if ($model->image && $model->validate(['image'])) {
- $model->image = Image::upload($model->image, 'article');
- } else {
- $model->image = '';
- }
- }
-
if ($model->save()) {
$this->flash('success', Yii::t('easyii/article', 'Article created'));
return $this->redirect(['/admin/'.$this->module->id.'/items/edit', 'id' => $model->primaryKey]);
@@ -78,15 +73,14 @@ public function actionCreate($id)
return $this->render('create', [
'model' => $model,
'category' => $category,
+ 'cats' => $this->getCats()
]);
}
}
public function actionEdit($id)
{
- if(!($model = Item::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -94,15 +88,6 @@ public function actionEdit($id)
return ActiveForm::validate($model);
}
else {
- if (isset($_FILES) && $this->module->settings['articleThumb']) {
- $model->image = UploadedFile::getInstance($model, 'image');
- if ($model->image && $model->validate(['image'])) {
- $model->image = Image::upload($model->image, 'article');
- } else {
- $model->image = $model->oldAttributes['image'];
- }
- }
-
if ($model->save()) {
$this->flash('success', Yii::t('easyii/article', 'Article updated'));
return $this->redirect(['/admin/'.$this->module->id.'/items/edit', 'id' => $model->primaryKey]);
@@ -115,66 +100,28 @@ public function actionEdit($id)
else {
return $this->render('edit', [
'model' => $model,
+ 'cats' => $this->getCats()
]);
}
}
public function actionPhotos($id)
{
- if(!($model = Item::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
return $this->render('photos', [
- 'model' => $model,
+ 'model' => $this->findModel($id),
]);
}
- public function actionClearImage($id)
+ private function getCats()
{
- $model = Item::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- elseif($model->image){
- $model->image = '';
- if($model->update()){
- $this->flash('success', Yii::t('easyii', 'Image cleared'));
- } else {
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
+ $result = [];
+ foreach(Category::cats() as $cat){
+ if(!count($cat->children) || ArticleModule::setting('itemsInFolder')) {
+ $result[$cat->id] = $cat->title;
}
}
- return $this->back();
- }
-
- public function actionDelete($id)
- {
- if(($model = Item::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/article', 'Article deleted'));
- }
-
- public function actionUp($id, $category_id)
- {
- return $this->move($id, 'up', ['category_id' => $category_id]);
- }
-
- public function actionDown($id, $category_id)
- {
- return $this->move($id, 'down', ['category_id' => $category_id]);
+ return $result;
}
- public function actionOn($id)
- {
- return $this->changeStatus($id, Item::STATUS_ON);
- }
- public function actionOff($id)
- {
- return $this->changeStatus($id, Item::STATUS_OFF);
- }
}
\ No newline at end of file
diff --git a/modules/article/messages/ru/api.php b/modules/article/messages/ru/api.php
deleted file mode 100644
index 3f79001..0000000
--- a/modules/article/messages/ru/api.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return [
- 'Create category' => 'Создать категорию',
-];
\ No newline at end of file
diff --git a/modules/article/models/Category.php b/modules/article/models/Category.php
index 157b534..3b5c809 100644
--- a/modules/article/models/Category.php
+++ b/modules/article/models/Category.php
@@ -10,7 +10,7 @@ public static function tableName()
public function getItems()
{
- return $this->hasMany(Item::className(), ['category_id' => 'category_id'])->sortDate();
+ return $this->hasMany(Item::className(), ['category_id' => 'id'])->sortDate();
}
public function afterDelete()
diff --git a/modules/article/models/Item.php b/modules/article/models/Item.php
index 9cffaaf..84b3695 100644
--- a/modules/article/models/Item.php
+++ b/modules/article/models/Item.php
@@ -3,9 +3,12 @@
use Yii;
use yii\behaviors\SluggableBehavior;
+use yii\easyii\behaviors\ImageFile;
use yii\easyii\behaviors\SeoBehavior;
+use yii\easyii\behaviors\SlugBehavior;
use yii\easyii\behaviors\Taggable;
use yii\easyii\models\Photo;
+use yii\easyii\modules\article\ArticleModule;
use yii\helpers\StringHelper;
class Item extends \yii\easyii\components\ActiveRecord
@@ -24,7 +27,7 @@ public function rules()
[['text', 'title'], 'required'],
[['title', 'short', 'text'], 'trim'],
['title', 'string', 'max' => 128],
- ['image', 'image'],
+ ['image_file', 'image'],
[['category_id', 'views', 'time', 'status'], 'integer'],
['time', 'default', 'value' => time()],
['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
@@ -38,9 +41,10 @@ public function attributeLabels()
{
return [
'title' => Yii::t('easyii', 'Title'),
+ 'category_id' => Yii::t('easyii', 'Category'),
'text' => Yii::t('easyii', 'Text'),
'short' => Yii::t('easyii/article', 'Short'),
- 'image' => Yii::t('easyii', 'Image'),
+ 'image_file' => Yii::t('easyii', 'Image'),
'time' => Yii::t('easyii', 'Date'),
'slug' => Yii::t('easyii', 'Slug'),
'tagNames' => Yii::t('easyii', 'Tags'),
@@ -49,36 +53,35 @@ public function attributeLabels()
public function behaviors()
{
- return [
+ $behaviors = [
'seoBehavior' => SeoBehavior::className(),
'taggabble' => Taggable::className(),
'sluggable' => [
- 'class' => SluggableBehavior::className(),
- 'attribute' => 'title',
- 'ensureUnique' => true
- ]
+ 'class' => SlugBehavior::className(),
+ 'immutable' => ArticleModule::setting('itemSlugImmutable')
+ ],
];
+ if(ArticleModule::setting('articleThumb')){
+ $behaviors['imageFileBehavior'] = ImageFile::className();
+ }
+
+ return $behaviors;
}
public function getCategory()
{
- return $this->hasOne(Category::className(), ['category_id' => 'category_id']);
+ return Category::get($this->category_id);
}
public function getPhotos()
{
- return $this->hasMany(Photo::className(), ['item_id' => 'item_id'])->where(['class' => self::className()])->sort();
+ return $this->hasMany(Photo::className(), ['item_id' => 'id'])->where(['class' => self::className()])->sort();
}
public function beforeSave($insert)
{
if (parent::beforeSave($insert)) {
- $settings = Yii::$app->getModule('admin')->activeModules['article']->settings;
- $this->short = StringHelper::truncate($settings['enableShort'] ? $this->short : strip_tags($this->text), $settings['shortMaxLength']);
-
- if(!$insert && $this->image != $this->oldAttributes['image'] && $this->oldAttributes['image']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['image']);
- }
+ $this->short = StringHelper::truncate(ArticleModule::setting('enableShort') ? $this->short : strip_tags($this->text), ArticleModule::setting('shortMaxLength'));
return true;
} else {
@@ -90,10 +93,6 @@ public function afterDelete()
{
parent::afterDelete();
- if($this->image){
- @unlink(Yii::getAlias('@webroot').$this->image);
- }
-
foreach($this->getPhotos()->all() as $photo){
$photo->delete();
}
diff --git a/modules/article/views/items/_form.php b/modules/article/views/items/_form.php
index 1450d59..7694d19 100644
--- a/modules/article/views/items/_form.php
+++ b/modules/article/views/items/_form.php
@@ -1,11 +1,11 @@
<?php
use yii\easyii\helpers\Image;
+use yii\easyii\modules\article\models\Category;
use yii\easyii\widgets\DateTimePicker;
use yii\easyii\widgets\TagsInput;
use yii\helpers\Html;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
use yii\easyii\widgets\SeoForm;
$module = $this->context->module->id;
@@ -15,27 +15,21 @@
'options' => ['enctype' => 'multipart/form-data', 'class' => 'model-form']
]); ?>
<?= $form->field($model, 'title') ?>
+<?= $form->field($model, 'category_id')->dropDownList($cats) ?>
<?php if($this->context->module->settings['articleThumb']) : ?>
- <?php if($model->image) : ?>
- <img src="<?= Image::thumb($model->image, 240) ?>">
+ <?php if($model->image_file) : ?>
+ <a href="<?= $model->image ?>" class="fancybox"><img src="<?= Image::thumb($model->image_file, 240, 180) ?>"></a>
<a href="<?= Url::to(['/admin/'.$module.'/items/clear-image', 'id' => $model->primaryKey]) ?>" class="text-danger confirm-delete" title="<?= Yii::t('easyii', 'Clear image')?>"><?= Yii::t('easyii', 'Clear image')?></a>
<?php endif; ?>
- <?= $form->field($model, 'image')->fileInput() ?>
+ <?= $form->field($model, 'image_file')->fileInput() ?>
<?php endif; ?>
<?php if($this->context->module->settings['enableShort']) : ?>
<?= $form->field($model, 'short')->textarea() ?>
<?php endif; ?>
-<?= $form->field($model, 'text')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 400,
- 'imageUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'article'], true),
- 'fileUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'article'], true),
- 'plugins' => ['fullscreen']
- ]
-]) ?>
+<?= $form->field($model, 'text')->widget(\yii\easyii\widgets\Redactor::className()) ?>
<?= $form->field($model, 'time')->widget(DateTimePicker::className()); ?>
diff --git a/modules/article/views/items/_submenu.php b/modules/article/views/items/_submenu.php
index 7334850..4463267 100644
--- a/modules/article/views/items/_submenu.php
+++ b/modules/article/views/items/_submenu.php
@@ -1,4 +1,5 @@
<?php
+use yii\easyii\modules\article\ArticleModule;
use yii\helpers\Url;
$action = $this->context->action->id;
@@ -7,6 +8,8 @@
<ul class="nav nav-tabs">
<li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii/article', 'Edit article') ?></a></li>
- <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php if(ArticleModule::setting('enablePhotos')) : ?>
+ <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php endif; ?>
</ul>
<br>
\ No newline at end of file
diff --git a/modules/article/views/items/create.php b/modules/article/views/items/create.php
index b662617..95ab038 100644
--- a/modules/article/views/items/create.php
+++ b/modules/article/views/items/create.php
@@ -2,4 +2,4 @@
$this->title = Yii::t('easyii/article', 'Create article');
?>
<?= $this->render('_menu', ['category' => $category]) ?>
-<?= $this->render('_form', ['model' => $model]) ?>
\ No newline at end of file
+<?= $this->render('_form', ['model' => $model, 'cats' => $cats]) ?>
\ No newline at end of file
diff --git a/modules/article/views/items/edit.php b/modules/article/views/items/edit.php
index d6ed6ae..5076ad4 100644
--- a/modules/article/views/items/edit.php
+++ b/modules/article/views/items/edit.php
@@ -5,4 +5,4 @@
<?php if($this->context->module->settings['enablePhotos']) echo $this->render('_submenu', ['model' => $model]) ?>
-<?= $this->render('_form', ['model' => $model]) ?>
+<?= $this->render('_form', ['model' => $model, 'cats' => $cats]) ?>
diff --git a/modules/article/views/items/index.php b/modules/article/views/items/index.php
index 2ed7728..ab071d4 100644
--- a/modules/article/views/items/index.php
+++ b/modules/article/views/items/index.php
@@ -7,15 +7,13 @@
$module = $this->context->module->id;
?>
-<?= $this->render('_menu', ['category' => $model]) ?>
+<?= $this->render('_menu', ['category' => $category]) ?>
-<?php if(count($model->items)) : ?>
+<?php if(count($category->items)) : ?>
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Title') ?></th>
<th width="120"><?= Yii::t('easyii', 'Views') ?></th>
<th width="100"><?= Yii::t('easyii', 'Status') ?></th>
@@ -23,11 +21,9 @@
</tr>
</thead>
<tbody>
- <?php foreach($model->items as $item) : ?>
+ <?php foreach($category->items as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
<td><?= $item->views ?></td>
<td class="status">
@@ -39,8 +35,8 @@
</td>
<td class="text-right">
<div class="btn-group btn-group-sm" role="group">
- <a href="<?= Url::to(['/admin/'.$module.'/items/up', 'id' => $item->primaryKey, 'category_id' => $model->primaryKey]) ?>" class="btn btn-default move-up" title="<?= Yii::t('easyii', 'Move up') ?>"><span class="glyphicon glyphicon-arrow-up"></span></a>
- <a href="<?= Url::to(['/admin/'.$module.'/items/down', 'id' => $item->primaryKey, 'category_id' => $model->primaryKey]) ?>" class="btn btn-default move-down" title="<?= Yii::t('easyii', 'Move down') ?>"><span class="glyphicon glyphicon-arrow-down"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/up', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-up" title="<?= Yii::t('easyii', 'Move up') ?>"><span class="glyphicon glyphicon-arrow-up"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/down', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-down" title="<?= Yii::t('easyii', 'Move down') ?>"><span class="glyphicon glyphicon-arrow-down"></span></a>
<a href="<?= Url::to(['/admin/'.$module.'/items/delete', 'id' => $item->primaryKey]) ?>" class="btn btn-default confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"><span class="glyphicon glyphicon-remove"></span></a>
</div>
</td>
diff --git a/modules/carousel/api/Carousel.php b/modules/carousel/api/Carousel.php
index 7f8c940..4a0b039 100644
--- a/modules/carousel/api/Carousel.php
+++ b/modules/carousel/api/Carousel.php
@@ -37,7 +37,7 @@ public function init()
public function api_widget($width, $height, $clientOptions = [])
{
if(!count($this->_items)){
- return LIVE_EDIT ? Html::a(Yii::t('easyii/carousel/api', 'Create carousel'), ['/admin/carousel/a/create'], ['target' => '_blank']) : '';
+ return LIVE_EDIT_ENABLED ? Html::a(Yii::t('easyii/carousel/api', 'Create carousel'), ['/admin/carousel/a/create'], ['target' => '_blank']) : '';
}
if(count($clientOptions)){
$this->clientOptions = array_merge($this->clientOptions, $clientOptions);
@@ -67,7 +67,7 @@ public function api_widget($width, $height, $clientOptions = [])
'items' => $items
]);
- return LIVE_EDIT ? API::liveEdit($widget, Url::to(['/admin/carousel']), 'div') : $widget;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($widget, Url::to(['/admin/carousel']), 'div') : $widget;
}
public function api_items()
diff --git a/modules/carousel/api/CarouselObject.php b/modules/carousel/api/CarouselObject.php
index 12534ee..7d89bd7 100644
--- a/modules/carousel/api/CarouselObject.php
+++ b/modules/carousel/api/CarouselObject.php
@@ -3,7 +3,6 @@
class CarouselObject extends \yii\easyii\components\ApiObject
{
- public $image;
public $link;
public $title;
public $text;
diff --git a/modules/carousel/controllers/AController.php b/modules/carousel/controllers/AController.php
index 770b924..5fcf911 100644
--- a/modules/carousel/controllers/AController.php
+++ b/modules/carousel/controllers/AController.php
@@ -3,29 +3,28 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
use yii\widgets\ActiveForm;
-use yii\web\UploadedFile;
-
use yii\easyii\components\Controller;
use yii\easyii\modules\carousel\models\Carousel;
-use yii\easyii\helpers\Image;
-use yii\easyii\behaviors\SortableController;
-use yii\easyii\behaviors\StatusController;
-
class AController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\carousel\models\Carousel';
+
+ public function actions()
{
return [
- [
- 'class' => SortableController::className(),
- 'model' => Carousel::className()
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/carousel', 'Carousel item deleted')
],
- [
- 'class' => StatusController::className(),
- 'model' => Carousel::className()
- ]
+ 'up' => SortByNumAction::className(),
+ 'down' => SortByNumAction::className(),
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
@@ -42,6 +41,7 @@ public function actionIndex()
public function actionCreate()
{
$model = new Carousel;
+ $model->scenario = 'create';
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -49,27 +49,13 @@ public function actionCreate()
return ActiveForm::validate($model);
}
else{
- if(($fileInstanse = UploadedFile::getInstance($model, 'image')))
- {
- $model->image = $fileInstanse;
- if($model->validate(['image'])){
- $model->image = Image::upload($model->image, 'carousel');
- $model->status = Carousel::STATUS_ON;
-
- if($model->save()){
- $this->flash('success', Yii::t('easyii/carousel', 'Carousel created'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
- else{
- $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
- }
- }
- else {
- $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
- }
+ $model->status = Carousel::STATUS_ON;
+ if($model->save()){
+ $this->flash('success', Yii::t('easyii/carousel', 'Carousel created'));
+ return $this->redirect(['/admin/'.$this->module->id]);
}
- else {
- $this->flash('error', Yii::t('yii', '{attribute} cannot be blank.', ['attribute' => $model->getAttributeLabel('image')]));
+ else{
+ $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
@@ -83,12 +69,7 @@ public function actionCreate()
public function actionEdit($id)
{
- $model = Carousel::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -96,21 +77,6 @@ public function actionEdit($id)
return ActiveForm::validate($model);
}
else{
- if(($fileInstanse = UploadedFile::getInstance($model, 'image')))
- {
- $model->image = $fileInstanse;
- if($model->validate(['image'])){
- $model->image = Image::upload($model->image, 'carousel');
- }
- else {
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- return $this->refresh();
- }
- }
- else{
- $model->image = $model->oldAttributes['image'];
- }
-
if($model->save()){
$this->flash('success', Yii::t('easyii/carousel', 'Carousel updated'));
}
@@ -126,34 +92,4 @@ public function actionEdit($id)
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Carousel::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/carousel', 'Carousel item deleted'));
- }
-
- public function actionUp($id)
- {
- return $this->move($id, 'up');
- }
-
- public function actionDown($id)
- {
- return $this->move($id, 'down');
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, Carousel::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, Carousel::STATUS_OFF);
- }
}
\ No newline at end of file
diff --git a/modules/carousel/models/Carousel.php b/modules/carousel/models/Carousel.php
index 840cf89..c5de285 100644
--- a/modules/carousel/models/Carousel.php
+++ b/modules/carousel/models/Carousel.php
@@ -3,6 +3,7 @@
use Yii;
use yii\easyii\behaviors\CacheFlush;
+use yii\easyii\behaviors\ImageFile;
use yii\easyii\behaviors\SortableModel;
class Carousel extends \yii\easyii\components\ActiveRecord
@@ -19,7 +20,8 @@ public static function tableName()
public function rules()
{
return [
- ['image', 'image'],
+ ['image_file', 'required', 'on' => 'create'],
+ ['image_file', 'image'],
[['title', 'text', 'link'], 'trim'],
['status', 'integer'],
['status', 'default', 'value' => self::STATUS_ON],
@@ -29,7 +31,7 @@ public function rules()
public function attributeLabels()
{
return [
- 'image' => Yii::t('easyii', 'Image'),
+ 'image_file' => Yii::t('easyii', 'Image'),
'link' => Yii::t('easyii', 'Link'),
'title' => Yii::t('easyii', 'Title'),
'text' => Yii::t('easyii', 'Text'),
@@ -40,26 +42,8 @@ public function behaviors()
{
return [
CacheFlush::className(),
- SortableModel::className()
+ SortableModel::className(),
+ ImageFile::className()
];
}
-
- public function beforeSave($insert)
- {
- if (parent::beforeSave($insert)) {
- if(!$insert && $this->image != $this->oldAttributes['image'] && $this->oldAttributes['image']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['image']);
- }
- return true;
- } else {
- return false;
- }
- }
-
- public function afterDelete()
- {
- parent::afterDelete();
-
- @unlink(Yii::getAlias('@webroot').$this->image);
- }
}
\ No newline at end of file
diff --git a/modules/carousel/views/a/_form.php b/modules/carousel/views/a/_form.php
index 9df55e0..18bf438 100644
--- a/modules/carousel/views/a/_form.php
+++ b/modules/carousel/views/a/_form.php
@@ -6,10 +6,10 @@
'enableClientValidation' => true,
'options' => ['enctype' => 'multipart/form-data', 'class' => 'model-form']
]); ?>
-<?php if($model->image) : ?>
- <img src="<?= $model->image ?>" style="width: 848px">
+<?php if($model->image_file) : ?>
+ <img src="<?= $model->image ?>" style="max-width: 848px">
<?php endif; ?>
-<?= $form->field($model, 'image')->fileInput() ?>
+<?= $form->field($model, 'image_file')->fileInput() ?>
<?= $form->field($model, 'link') ?>
<?php if($this->context->module->settings['enableTitle']) : ?>
<?= $form->field($model, 'title')->textarea() ?>
diff --git a/modules/carousel/views/a/index.php b/modules/carousel/views/a/index.php
index a972204..09c2d52 100644
--- a/modules/carousel/views/a/index.php
+++ b/modules/carousel/views/a/index.php
@@ -14,9 +14,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Image') ?></th>
<th width="100"><?= Yii::t('easyii', 'Status') ?></th>
<th width="120"></th>
@@ -25,9 +23,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><img src="<?= $item->image ?>" style="width: 550px;"></a></td>
<td class="status vtop">
<?= Html::checkbox('', $item->status == Carousel::STATUS_ON, [
diff --git a/modules/catalog/CatalogModule.php b/modules/catalog/CatalogModule.php
index 85eb52a..8a43f52 100644
--- a/modules/catalog/CatalogModule.php
+++ b/modules/catalog/CatalogModule.php
@@ -5,12 +5,14 @@ class CatalogModule extends \yii\easyii\components\Module
{
public $settings = [
'categoryThumb' => true,
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+
'itemsInFolder' => false,
-
'itemThumb' => true,
'itemPhotos' => true,
'itemDescription' => true,
- 'itemSale' => true,
+ 'itemSlugImmutable' => false
];
public static $installConfig = [
diff --git a/modules/catalog/api/Catalog.php b/modules/catalog/api/Catalog.php
index 43295d9..42c44c8 100644
--- a/modules/catalog/api/Catalog.php
+++ b/modules/catalog/api/Catalog.php
@@ -8,6 +8,7 @@
use yii\easyii\widgets\Fancybox;
use yii\easyii\modules\catalog\models\Category;
use yii\easyii\modules\catalog\models\Item;
+use yii\web\NotFoundHttpException;
use yii\widgets\LinkPager;
/**
@@ -28,15 +29,13 @@
class Catalog extends \yii\easyii\components\API
{
private $_cats;
- private $_items;
private $_adp;
private $_item = [];
- private $_last;
public function api_cat($id_slug)
{
if(!isset($this->_cats[$id_slug])) {
- $this->_cats[$id_slug] = $this->findCategory($id_slug);
+ $this->_cats[$id_slug] = new CategoryObject(Category::get($id_slug));
}
return $this->_cats[$id_slug];
}
@@ -46,48 +45,54 @@ public function api_tree()
return Category::tree();
}
- public function api_cats()
+ public function api_cats($options = [])
{
- return Category::cats();
+ $result = [];
+ foreach(Category::cats() as $model){
+ $result[] = new CategoryObject($model);
+ }
+ if(!empty($options['tags'])){
+ foreach($result as $i => $item){
+ if(!in_array($options['tags'], $item->tags)){
+ unset($result[$i]);
+ }
+ }
+ }
+
+ return $result;
}
public function api_items($options = [])
{
- if(!$this->_items){
- $this->_items = [];
+ $result = [];
- $query = Item::find()->with(['seo', 'category'])->status(Item::STATUS_ON);
+ $query = Item::find()->with(['seo'])->status(Item::STATUS_ON);
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
- if(!empty($options['orderBy'])){
- $query->orderBy($options['orderBy']);
- } else {
- $query->sortDate();
- }
- if(!empty($options['filters'])){
- $query = self::applyFilters($options['filters'], $query);
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sortDate();
+ }
+ if(!empty($options['filters'])){
+ $query = self::applyFilters($options['filters'], $query);
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
- foreach($this->_adp->models as $model){
- $this->_items[] = new ItemObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new ItemObject($model);
}
- return $this->_items;
+ return $result;
}
public function api_last($limit = 1, $where = null)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
- }
-
$result = [];
$query = Item::find()->with('seo')->sortDate()->status(Item::STATUS_ON)->limit($limit);
@@ -98,13 +103,7 @@ public function api_last($limit = 1, $where = null)
foreach($query->all() as $item){
$result[] = new ItemObject($item);
}
-
- if($limit > 1){
- return $result;
- }else{
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_get($id_slug)
@@ -132,22 +131,26 @@ public function api_plugin($options = [])
'options' => $options
]);
}
+
+ private function findItem($id_slug)
+ {
+ if(is_numeric($id_slug)) {
+ $condition = ['or', 'id=:id_slug', 'slug=:id_slug'];
+ } else {
+ $condition = 'slug=:id_slug';
+ }
+ if(!($item = Item::find()->where($condition, [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one())){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return new ItemObject($item);
+ }
public static function applyFilters($filters, $query)
{
if(is_array($filters)){
- if(!empty($filters['price'])){
- $price = $filters['price'];
- if(is_array($price) && count($price) == 2) {
- if(!$price[0]){
- $query->andFilterWhere(['<=', 'price', (int)$price[1]]);
- } elseif(!$price[1]) {
- $query->andFilterWhere(['>=', 'price', (int)$price[0]]);
- } else {
- $query->andFilterWhere(['between', 'price', (int)$price[0], (int)$price[1]]);
- }
- }
+ if(!empty($filters['price']) && ($priceCondition = self::buildConditionArray($filters['price'], 'price * ( 1 - discount / 100 )'))){
+ $query->andFilterWhere($priceCondition);
unset($filters['price']);
}
if(count($filters)){
@@ -157,42 +160,33 @@ public static function applyFilters($filters, $query)
if(!is_array($value)) {
$subQuery->orFilterWhere(['and', ['name' => $field], ['value' => $value]]);
$filtersApplied++;
- } elseif(count($value) == 2){
- if(!$value[0]){
- $additionalCondition = ['<=', 'value', (int)$value[1]];
- } elseif(!$value[1]) {
- $additionalCondition = ['>=', 'value', (int)$value[0]];
- } else {
- $additionalCondition = ['between', 'value', (int)$value[0], (int)$value[1]];
- }
+ } elseif(($additionalCondition = self::buildConditionArray($value, 'value'))){
$subQuery->orFilterWhere(['and', ['name' => $field], $additionalCondition]);
-
$filtersApplied++;
}
}
if($filtersApplied) {
- $query->join('LEFT JOIN', ['f' => $subQuery], 'f.item_id = '.Item::tableName().'.item_id');
+ $query->join('LEFT JOIN', ['f' => $subQuery], 'f.item_id = ' . Item::tableName() . '.id');
$query->andFilterWhere(['f.filter_matched' => $filtersApplied]);
}
}
}
return $query;
}
-
- private function findCategory($id_slug)
+ private static function buildConditionArray($data, $fieldName)
{
- $category = Category::find()->where(['or', 'category_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one();
-
- return $category ? new CategoryObject($category) : null;
- }
-
- private function findItem($id_slug)
- {
- if(!($item = Item::find()->where(['or', 'item_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(Item::STATUS_ON)->one())){
+ if(empty($data) || !is_array($data) || count($data) < 2 || !in_array($data[0], ['>', '>=', '<', '<=', '!=', '<>', 'between', 'in', 'not in'])) {
return null;
}
-
- return new ItemObject($item);
+ $result = [
+ $data[0],
+ $fieldName,
+ $data[1]
+ ];
+ if(!empty($data[2])) {
+ $result[] = $data[2];
+ }
+ return $result;
}
}
\ No newline at end of file
diff --git a/modules/catalog/api/CategoryObject.php b/modules/catalog/api/CategoryObject.php
index a4255ce..25b8568 100644
--- a/modules/catalog/api/CategoryObject.php
+++ b/modules/catalog/api/CategoryObject.php
@@ -10,55 +10,64 @@
class CategoryObject extends \yii\easyii\components\ApiObject
{
public $slug;
+ public $description;
public $image;
public $tree;
public $fields;
public $depth;
private $_adp;
- private $_items;
+ private $_children;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
- public function pages($options = []){
+ public function getPages($options = []){
return $this->_adp ? LinkPager::widget(array_merge($options, ['pagination' => $this->_adp->pagination])) : '';
}
- public function pagination(){
+ public function getPagination(){
return $this->_adp ? $this->_adp->pagination : null;
}
- public function items($options = [])
+ public function getChildren()
{
- if(!$this->_items){
- $this->_items = [];
+ if($this->_children === null) {
+ $this->_children = [];
+ foreach ($this->model->children as $child) {
+ $this->_children[] = Catalog::cat($child);
+ }
+ }
+ return $this->_children;
+ }
- $query = Item::find()->with('seo')->where(['category_id' => $this->id])->status(Item::STATUS_ON);
+ public function getItems($options = [])
+ {
+ $result = [];
+ $query = Item::find()->with('seo')->where(['category_id' => $this->id])->status(Item::STATUS_ON);
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
- if(!empty($options['orderBy'])){
- $query->orderBy($options['orderBy']);
- } else {
- $query->sortDate();
- }
- if(!empty($options['filters'])){
- $query = Catalog::applyFilters($options['filters'], $query);
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sortDate();
+ }
+ if(!empty($options['filters'])){
+ $query = Catalog::applyFilters($options['filters'], $query);
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
- foreach($this->_adp->models as $model){
- $this->_items[] = new ItemObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new ItemObject($model);
}
- return $this->_items;
+ return $result;
}
public function fieldOptions($name, $firstOption = '')
diff --git a/modules/catalog/api/ItemObject.php b/modules/catalog/api/ItemObject.php
index 70056b6..825a5e9 100644
--- a/modules/catalog/api/ItemObject.php
+++ b/modules/catalog/api/ItemObject.php
@@ -10,7 +10,6 @@
class ItemObject extends \yii\easyii\components\ApiObject
{
public $slug;
- public $image;
public $data;
public $category_id;
public $available;
@@ -19,16 +18,16 @@ class ItemObject extends \yii\easyii\components\ApiObject
private $_photos;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
public function getDescription(){
- return LIVE_EDIT ? API::liveEdit($this->model->description, $this->editLink, 'div') : $this->model->description;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->description, $this->getEditLink(), 'div') : $this->model->description;
}
public function getCat(){
- return Catalog::cats()[$this->category_id];
+ return Catalog::cat($this->category_id);
}
public function getPrice(){
@@ -58,4 +57,20 @@ public function getPhotos()
public function getEditLink(){
return Url::to(['/admin/catalog/items/edit/', 'id' => $this->id]);
}
+
+ public function __get($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return $this->data->{$name};
+ }
+ return parent::__get($name);
+ }
+
+ public function __isset($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return true;
+ }
+ return parent::__isset($name);
+ }
}
\ No newline at end of file
diff --git a/modules/catalog/api/PhotoObject.php b/modules/catalog/api/PhotoObject.php
index b2e4405..fdb9c82 100644
--- a/modules/catalog/api/PhotoObject.php
+++ b/modules/catalog/api/PhotoObject.php
@@ -8,7 +8,6 @@
class PhotoObject extends \yii\easyii\components\ApiObject
{
- public $image;
public $description;
public function box($width, $height){
@@ -18,7 +17,7 @@ public function box($width, $height){
'rel' => 'catalog-'.$this->model->item_id,
'title' => $this->description
]);
- return LIVE_EDIT ? API::liveEdit($a, $this->editLink) : $a;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($a, $this->editLink) : $a;
}
public function getEditLink(){
diff --git a/modules/catalog/assets/FieldsAsset.php b/modules/catalog/assets/FieldsAsset.php
deleted file mode 100644
index 2f43b60..0000000
--- a/modules/catalog/assets/FieldsAsset.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace yii\easyii\modules\catalog\assets;
-
-class FieldsAsset extends \yii\web\AssetBundle
-{
- public $sourcePath = '@easyii/modules/catalog/media';
- public $css = [
- 'css/fields.css',
- ];
- public $js = [
- 'js/fields.js'
- ];
- public $depends = [
- 'yii\web\JqueryAsset',
- ];
-}
diff --git a/modules/catalog/controllers/AController.php b/modules/catalog/controllers/AController.php
index b37284b..9d16cb9 100644
--- a/modules/catalog/controllers/AController.php
+++ b/modules/catalog/controllers/AController.php
@@ -1,90 +1,11 @@
<?php
namespace yii\easyii\modules\catalog\controllers;
-use Yii;
use yii\easyii\components\CategoryController;
-use yii\easyii\modules\catalog\models\Category;
-
class AController extends CategoryController
{
public $categoryClass = 'yii\easyii\modules\catalog\models\Category';
+ public $modelClass = 'yii\easyii\modules\catalog\models\Item';
public $moduleName = 'catalog';
-
- public $rootActions = ['fields'];
-
- public function actionFields($id)
- {
- if(!($model = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
- if (Yii::$app->request->post('save'))
- {
- $fields = Yii::$app->request->post('Field') ?: [];
- $result = [];
-
- foreach($fields as $field){
- $temp = json_decode($field);
-
- if( $temp === null && json_last_error() !== JSON_ERROR_NONE ||
- empty($temp->name) ||
- empty($temp->title) ||
- empty($temp->type) ||
- !($temp->name = trim($temp->name)) ||
- !($temp->title = trim($temp->title)) ||
- !array_key_exists($temp->type, Category::$fieldTypes)
- ){
- continue;
- }
- $options = '';
- if($temp->type == 'select' || $temp->type == 'checkbox'){
- if(empty($temp->options) || !($temp->options = trim($temp->options))){
- continue;
- }
- $options = [];
- foreach(explode(',', $temp->options) as $option){
- $options[] = trim($option);
- }
- }
-
- $result[] = [
- 'name' => \yii\helpers\Inflector::slug($temp->name),
- 'title' => $temp->title,
- 'type' => $temp->type,
- 'options' => $options
- ];
- }
-
- $model->fields = $result;
-
- if($model->save()){
- $ids = [];
- foreach($model->children()->all() as $child){
- $ids[] = $child->primaryKey;
- }
- if(count($ids)){
- Category::updateAll(['fields' => json_encode($model->fields)], ['in', 'category_id', $ids]);
- }
-
- $this->flash('success', Yii::t('easyii/catalog', 'Category updated'));
- }
- else{
- $this->flash('error', Yii::t('easyii','Update error. {0}', $model->formatErrors()));
- }
- return $this->refresh();
- }
- else {
- return $this->render('fields', [
- 'model' => $model
- ]);
- }
- }
-
- public function actionEdit($id)
- {
- $this->view->params['submenu'] = true;
-
- return parent::actionEdit($id);
- }
}
\ No newline at end of file
diff --git a/modules/catalog/controllers/ItemsController.php b/modules/catalog/controllers/ItemsController.php
index d8b9b1d..e067960 100644
--- a/modules/catalog/controllers/ItemsController.php
+++ b/modules/catalog/controllers/ItemsController.php
@@ -2,52 +2,68 @@
namespace yii\easyii\modules\catalog\controllers;
use Yii;
-use yii\easyii\behaviors\StatusController;
-use yii\web\UploadedFile;
-use yii\helpers\Html;
-
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\ClearImageAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByDateAction;
+use yii\easyii\behaviors\Fields;
use yii\easyii\components\Controller;
+use yii\easyii\modules\catalog\CatalogModule;
use yii\easyii\modules\catalog\models\Category;
use yii\easyii\modules\catalog\models\Item;
-use yii\easyii\helpers\Image;
-use yii\easyii\behaviors\SortableDateController;
use yii\widgets\ActiveForm;
class ItemsController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\catalog\models\Item';
+ public $categoryClass = 'yii\easyii\modules\catalog\models\Category';
+
+ public function actions()
{
+ $className = Item::className();
return [
- [
- 'class' => SortableDateController::className(),
- 'model' => Item::className(),
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'model' => $className,
+ 'successMessage' => Yii::t('easyii/catalog', 'Item deleted')
+ ],
+ 'clear-image' => ClearImageAction::className(),
+ 'up' => [
+ 'class' => SortByDateAction::className(),
+ 'addititonalEquality' => ['category_id']
],
- [
- 'class' => StatusController::className(),
- 'model' => Item::className()
- ]
+ 'down' => [
+ 'class' => SortByDateAction::className(),
+ 'addititonalEquality' => ['category_id']
+ ],
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
- public function actionIndex($id)
+ public function behaviors()
{
- if(!($model = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ return [
+ 'fields' => Fields::className()
+ ];
+ }
+ public function actionIndex($id)
+ {
return $this->render('index', [
- 'model' => $model
+ 'category' => $this->findCategory($id)
]);
}
-
public function actionCreate($id)
{
- if(!($category = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $category = $this->findCategory($id);
- $model = new Item;
+ $model = new Item([
+ 'category_id' => $id,
+ 'time' => time(),
+ 'available' => 1
+ ]);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -55,17 +71,8 @@ public function actionCreate($id)
return ActiveForm::validate($model);
}
else {
- $model->category_id = $category->primaryKey;
- $model->data = Yii::$app->request->post('Data');
+ $model->data = $this->parseData($model);
- if (isset($_FILES) && $this->module->settings['itemThumb']) {
- $model->image = UploadedFile::getInstance($model, 'image');
- if ($model->image && $model->validate(['image'])) {
- $model->image = Image::upload($model->image, 'catalog');
- } else {
- $model->image = '';
- }
- }
if ($model->save()) {
$this->flash('success', Yii::t('easyii/catalog', 'Item created'));
return $this->redirect(['/admin/'.$this->module->id.'/items/edit/', 'id' => $model->primaryKey]);
@@ -79,16 +86,15 @@ public function actionCreate($id)
return $this->render('create', [
'model' => $model,
'category' => $category,
- 'dataForm' => $this->generateForm($category->fields)
+ 'dataForm' => $this->generateForm($category->fields),
+ 'cats' => $this->getSameCats($category)
]);
}
}
public function actionEdit($id)
{
- if(!($model = Item::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -96,17 +102,8 @@ public function actionEdit($id)
return ActiveForm::validate($model);
}
else {
- $model->data = Yii::$app->request->post('Data');
-
- if (isset($_FILES) && $this->module->settings['itemThumb']) {
- $model->image = UploadedFile::getInstance($model, 'image');
- if ($model->image && $model->validate(['image'])) {
- $model->image = Image::upload($model->image, 'catalog');
- } else {
- $model->image = $model->oldAttributes['image'];
- }
- }
-
+ $model->data = $this->parseData($model);
+
if ($model->save()) {
$this->flash('success', Yii::t('easyii/catalog', 'Item updated'));
return $this->redirect(['/admin/'.$this->module->id.'/items/edit', 'id' => $model->primaryKey]);
@@ -119,100 +116,26 @@ public function actionEdit($id)
else {
return $this->render('edit', [
'model' => $model,
- 'dataForm' => $this->generateForm($model->category->fields, $model->data)
+ 'dataForm' => $this->generateForm($model->category->fields, $model->data),
+ 'cats' => $this->getSameCats($model->category)
]);
}
}
public function actionPhotos($id)
{
- if(!($model = Item::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
return $this->render('photos', [
- 'model' => $model,
+ 'model' => $this->findModel($id),
]);
}
- public function actionClearImage($id)
- {
- $model = Item::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- elseif($model->image){
- $model->image = '';
- if($model->update()){
- @unlink(Yii::getAlias('@webroot').$model->image);
- $this->flash('success', Yii::t('easyii', 'Image cleared'));
- } else {
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- }
- }
- return $this->back();
- }
-
- public function actionDelete($id)
- {
- if(($model = Item::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/catalog', 'Item deleted'));
- }
-
- public function actionUp($id, $category_id)
- {
- return $this->move($id, 'up', ['category_id' => $category_id]);
- }
-
- public function actionDown($id, $category_id)
- {
- return $this->move($id, 'down', ['category_id' => $category_id]);
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, Item::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, Item::STATUS_OFF);
- }
-
- private function generateForm($fields, $data = null)
+ public function getSameCats($cat)
{
- $result = '';
- foreach($fields as $field)
- {
- $value = !empty($data->{$field->name}) ? $data->{$field->name} : null;
- if ($field->type === 'string') {
- $result .= '<div class="form-group"><label>'. $field->title .'</label>'. Html::input('text', "Data[{$field->name}]", $value, ['class' => 'form-control']) .'</div>';
- }
- elseif ($field->type === 'text') {
- $result .= '<div class="form-group"><label>'. $field->title .'</label>'. Html::textarea("Data[{$field->name}]", $value, ['class' => 'form-control']) .'</div>';
- }
- elseif ($field->type === 'boolean') {
- $result .= '<div class="checkbox"><label>'. Html::checkbox("Data[{$field->name}]", $value, ['uncheck' => 0]) .' '. $field->title .'</label></div>';
- }
- elseif ($field->type === 'select') {
- $options = ['' => Yii::t('easyii/catalog', 'Select')];
- foreach($field->options as $option){
- $options[$option] = $option;
- }
- $result .= '<div class="form-group"><label>'. $field->title .'</label><select name="Data['.$field->name.']" class="form-control">'. Html::renderSelectOptions($value, $options) .'</select></div>';
- }
- elseif ($field->type === 'checkbox') {
- $options = '';
- foreach($field->options as $option){
- $checked = $value && in_array($option, $value);
- $options .= '<br><label>'. Html::checkbox("Data[{$field->name}][]", $checked, ['value' => $option]) .' '. $option .'</label>';
- }
- $result .= '<div class="checkbox well well-sm"><b>'. $field->title .'</b>'. $options .'</div>';
+ $result = [];
+ $fieldsHash = md5(json_encode($cat->fields));
+ foreach(Category::cats() as $cat){
+ if(md5(json_encode($cat->fields)) == $fieldsHash && (!count($cat->children) || CatalogModule::setting('itemsInFolder'))) {
+ $result[$cat->id] = $cat->title;
}
}
return $result;
diff --git a/modules/catalog/messages/ru/admin.php b/modules/catalog/messages/ru/admin.php
index c9abe53..b3d10fe 100644
--- a/modules/catalog/messages/ru/admin.php
+++ b/modules/catalog/messages/ru/admin.php
@@ -1,23 +1,14 @@
<?php
return [
'Catalog' => 'Каталог',
- 'Category fields' => 'Поля категории',
- 'Manage fields' => 'Редактировать поля',
-
- 'Add field' => 'Добавить поле',
- 'Save fields' => 'Сохранить поля',
- 'Type options with `comma` as delimiter' => 'Элементы списка через запятую',
- 'Fields' => 'Поля',
'Item created' => 'Новая запись успешно создана',
'Item updated' => 'Запись обновлена',
'Item deleted' => 'Запись удалена',
'Title' => 'Название',
- 'Type' => 'Тип поля',
'Options' => 'Опции',
'Available' => 'Доступно',
'Price' => 'Цена',
'Discount' => 'Скидка',
- 'Select' => 'Выбрать',
];
\ No newline at end of file
diff --git a/modules/catalog/messages/ru/api.php b/modules/catalog/messages/ru/api.php
deleted file mode 100644
index 3f79001..0000000
--- a/modules/catalog/messages/ru/api.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return [
- 'Create category' => 'Создать категорию',
-];
\ No newline at end of file
diff --git a/modules/catalog/models/Category.php b/modules/catalog/models/Category.php
index d096e58..89a3aaa 100644
--- a/modules/catalog/models/Category.php
+++ b/modules/catalog/models/Category.php
@@ -1,54 +1,18 @@
<?php
namespace yii\easyii\modules\catalog\models;
-class Category extends \yii\easyii\components\CategoryModel
-{
- static $fieldTypes = [
- 'string' => 'String',
- 'text' => 'Text',
- 'boolean' => 'Boolean',
- 'select' => 'Select',
- 'checkbox' => 'Checkbox'
- ];
+use yii\easyii\components\CategoryWithFieldsModel;
+class Category extends CategoryWithFieldsModel
+{
public static function tableName()
{
return 'easyii_catalog_categories';
}
- public function beforeSave($insert)
- {
- if (parent::beforeSave($insert)) {
- if($insert && ($parent = $this->parents(1)->one())){
- $this->fields = $parent->fields;
- }
-
- if(!$this->fields || !is_array($this->fields)){
- $this->fields = [];
- }
- $this->fields = json_encode($this->fields);
-
- return true;
- } else {
- return false;
- }
- }
-
- public function afterSave($insert, $attributes)
- {
- parent::afterSave($insert, $attributes);
- $this->parseFields();
- }
-
- public function afterFind()
- {
- parent::afterFind();
- $this->parseFields();
- }
-
public function getItems()
{
- return $this->hasMany(Item::className(), ['category_id' => 'category_id'])->sortDate();
+ return $this->hasMany(Item::className(), ['category_id' => 'id'])->sortDate();
}
public function afterDelete()
@@ -59,8 +23,4 @@ public function afterDelete()
$item->delete();
}
}
-
- private function parseFields(){
- $this->fields = $this->fields !== '' ? json_decode($this->fields) : [];
- }
}
\ No newline at end of file
diff --git a/modules/catalog/models/Item.php b/modules/catalog/models/Item.php
index d550008..66f1477 100644
--- a/modules/catalog/models/Item.php
+++ b/modules/catalog/models/Item.php
@@ -2,9 +2,12 @@
namespace yii\easyii\modules\catalog\models;
use Yii;
-use yii\behaviors\SluggableBehavior;
+use yii\easyii\behaviors\ImageFile;
+use yii\easyii\behaviors\JsonColumns;
use yii\easyii\behaviors\SeoBehavior;
+use yii\easyii\behaviors\SlugBehavior;
use yii\easyii\models\Photo;
+use yii\easyii\modules\catalog\CatalogModule;
class Item extends \yii\easyii\components\ActiveRecord
{
@@ -22,7 +25,7 @@ public function rules()
['title', 'required'],
['title', 'trim'],
['title', 'string', 'max' => 128],
- ['image', 'image'],
+ ['image_file', 'image'],
['description', 'safe'],
['price', 'number'],
['discount', 'integer', 'max' => 99],
@@ -30,6 +33,7 @@ public function rules()
['time', 'default', 'value' => time()],
['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
['slug', 'default', 'value' => null],
+ ['available', 'default', 'value' => 1],
['status', 'default', 'value' => self::STATUS_ON],
];
}
@@ -38,7 +42,8 @@ public function attributeLabels()
{
return [
'title' => Yii::t('easyii', 'Title'),
- 'image' => Yii::t('easyii', 'Image'),
+ 'category_id' => Yii::t('easyii', 'Category'),
+ 'image_file' => Yii::t('easyii', 'Image'),
'description' => Yii::t('easyii', 'Description'),
'available' => Yii::t('easyii/catalog', 'Available'),
'price' => Yii::t('easyii/catalog', 'Price'),
@@ -50,40 +55,26 @@ public function attributeLabels()
public function behaviors()
{
- return [
+ $behaviors = [
'seoBehavior' => SeoBehavior::className(),
'sluggable' => [
- 'class' => SluggableBehavior::className(),
- 'attribute' => 'title',
- 'ensureUnique' => true
- ]
+ 'class' => SlugBehavior::className(),
+ 'immutable' => CatalogModule::setting('itemSlugImmutable')
+ ],
+ 'jsonColumns' => [
+ 'class' => JsonColumns::className(),
+ 'columns' => ['fields', 'data']
+ ],
];
- }
-
- public function beforeSave($insert)
- {
- if (parent::beforeSave($insert)) {
- if(!$this->data || (!is_object($this->data) && !is_array($this->data))){
- $this->data = new \stdClass();
- }
-
- $this->data = json_encode($this->data);
-
- if(!$insert && $this->image != $this->oldAttributes['image'] && $this->oldAttributes['image']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['image']);
- }
-
- return true;
- } else {
- return false;
+ if(CatalogModule::setting('itemThumb')){
+ $behaviors['imageFileBehavior'] = ImageFile::className();
}
+ return $behaviors;
}
public function afterSave($insert, $attributes){
parent::afterSave($insert, $attributes);
- $this->parseData();
-
ItemData::deleteAll(['item_id' => $this->primaryKey]);
foreach($this->data as $name => $value){
@@ -105,20 +96,14 @@ private function insertDataValue($name, $value){
])->execute();
}
- public function afterFind()
- {
- parent::afterFind();
- $this->parseData();
- }
-
public function getPhotos()
{
- return $this->hasMany(Photo::className(), ['item_id' => 'item_id'])->where(['class' => self::className()])->sort();
+ return $this->hasMany(Photo::className(), ['item_id' => 'id'])->where(['class' => self::className()])->sort();
}
public function getCategory()
{
- return $this->hasOne(Category::className(), ['category_id' => 'category_id']);
+ return Category::get($this->category_id);
}
public function afterDelete()
@@ -129,14 +114,7 @@ public function afterDelete()
$photo->delete();
}
- if($this->image) {
- @unlink(Yii::getAlias('@webroot') . $this->image);
- }
-
ItemData::deleteAll(['item_id' => $this->primaryKey]);
}
- private function parseData(){
- $this->data = $this->data !== '' ? json_decode($this->data) : [];
- }
}
\ No newline at end of file
diff --git a/modules/catalog/views/items/_form.php b/modules/catalog/views/items/_form.php
index f4a3102..2e6a3f2 100644
--- a/modules/catalog/views/items/_form.php
+++ b/modules/catalog/views/items/_form.php
@@ -4,7 +4,6 @@
use yii\helpers\Html;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
use yii\easyii\widgets\SeoForm;
$settings = $this->context->module->settings;
@@ -15,23 +14,23 @@
'options' => ['enctype' => 'multipart/form-data', 'class' => 'model-form']
]); ?>
<?= $form->field($model, 'title') ?>
+
+<?php if(!empty($cats) && count($cats)) : ?>
+ <?= $form->field($model, 'category_id')->dropDownList($cats) ?>
+<?php endif; ?>
+
<?php if($settings['itemThumb']) : ?>
- <?php if($model->image) : ?>
- <img src="<?= Image::thumb($model->image, 240) ?>">
+ <?php if($model->image_file) : ?>
+ <a href="<?= $model->image ?>" class="fancybox"><img src="<?= Image::thumb($model->image_file, 240, 180) ?>"></a>
<a href="<?= Url::to(['/admin/'.$module.'/items/clear-image', 'id' => $model->primaryKey]) ?>" class="text-danger confirm-delete" title="<?= Yii::t('easyii', 'Clear image')?>"><?= Yii::t('easyii', 'Clear image')?></a>
<?php endif; ?>
- <?= $form->field($model, 'image')->fileInput() ?>
+ <?= $form->field($model, 'image_file')->fileInput() ?>
<?php endif; ?>
+
<?= $dataForm ?>
+
<?php if($settings['itemDescription']) : ?>
- <?= $form->field($model, 'description')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 400,
- 'imageUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'catalog'], true),
- 'fileUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'catalog'], true),
- 'plugins' => ['fullscreen']
- ]
- ]) ?>
+ <?= $form->field($model, 'description')->widget(\yii\easyii\widgets\Redactor::className()) ?>
<?php endif; ?>
<?= $form->field($model, 'available') ?>
diff --git a/modules/catalog/views/items/_submenu.php b/modules/catalog/views/items/_submenu.php
index e2a5203..0becf34 100644
--- a/modules/catalog/views/items/_submenu.php
+++ b/modules/catalog/views/items/_submenu.php
@@ -1,4 +1,5 @@
<?php
+use yii\easyii\modules\catalog\CatalogModule;
use yii\helpers\Url;
$action = $this->context->action->id;
@@ -7,6 +8,8 @@
<ul class="nav nav-tabs">
<li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii', 'Edit') ?></a></li>
- <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php if(CatalogModule::setting('itemPhotos')) : ?>
+ <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php endif; ?>
</ul>
<br>
\ No newline at end of file
diff --git a/modules/catalog/views/items/create.php b/modules/catalog/views/items/create.php
index ed41566..e580b35 100644
--- a/modules/catalog/views/items/create.php
+++ b/modules/catalog/views/items/create.php
@@ -1,5 +1,5 @@
<?php
-$this->title = Yii::t('easyii/catalog', 'Create item');
+$this->title = Yii::t('easyii', 'Create item');
?>
<?= $this->render('_menu', ['category' => $category]) ?>
-<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm]) ?>
\ No newline at end of file
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm, 'cats' => $cats]) ?>
\ No newline at end of file
diff --git a/modules/catalog/views/items/edit.php b/modules/catalog/views/items/edit.php
index 091d3ae..4be478d 100644
--- a/modules/catalog/views/items/edit.php
+++ b/modules/catalog/views/items/edit.php
@@ -4,4 +4,4 @@
<?= $this->render('_menu', ['category' => $model->category]) ?>
<?= $this->render('_submenu', ['model' => $model]) ?>
-<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm]) ?>
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm, 'cats' => $cats]) ?>
diff --git a/modules/catalog/views/items/index.php b/modules/catalog/views/items/index.php
index 50443c7..f06869f 100644
--- a/modules/catalog/views/items/index.php
+++ b/modules/catalog/views/items/index.php
@@ -7,26 +7,22 @@
$module = $this->context->module->id;
?>
-<?= $this->render('_menu', ['category' => $model]) ?>
+<?= $this->render('_menu', ['category' => $category]) ?>
-<?php if(count($model->items)) : ?>
+<?php if(count($category->items)) : ?>
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Name') ?></th>
<th width="100"><?= Yii::t('easyii', 'Status') ?></th>
<th width="120"></th>
</tr>
</thead>
<tbody>
- <?php foreach($model->items as $item) : ?>
+ <?php foreach($category->items as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
<td class="status">
<?= Html::checkbox('', $item->status == Item::STATUS_ON, [
@@ -37,8 +33,8 @@
</td>
<td class="text-right">
<div class="btn-group btn-group-sm" role="group">
- <a href="<?= Url::to(['/admin/'.$module.'/items/up', 'id' => $item->primaryKey, 'category_id' => $model->primaryKey]) ?>" class="btn btn-default move-up" title="<?= Yii::t('easyii', 'Move up') ?>"><span class="glyphicon glyphicon-arrow-up"></span></a>
- <a href="<?= Url::to(['/admin/'.$module.'/items/down', 'id' => $item->primaryKey, 'category_id' => $model->primaryKey]) ?>" class="btn btn-default move-down" title="<?= Yii::t('easyii', 'Move down') ?>"><span class="glyphicon glyphicon-arrow-down"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/up', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-up" title="<?= Yii::t('easyii', 'Move up') ?>"><span class="glyphicon glyphicon-arrow-up"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/down', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-down" title="<?= Yii::t('easyii', 'Move down') ?>"><span class="glyphicon glyphicon-arrow-down"></span></a>
<a href="<?= Url::to(['/admin/'.$module.'/items/delete', 'id' => $item->primaryKey]) ?>" class="btn btn-default confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"><span class="glyphicon glyphicon-remove"></span></a>
</div>
</td>
diff --git a/modules/entity/EntityModule.php b/modules/entity/EntityModule.php
new file mode 100644
index 0000000..39dbcea
--- /dev/null
+++ b/modules/entity/EntityModule.php
@@ -0,0 +1,21 @@
+<?php
+namespace yii\easyii\modules\entity;
+
+class EntityModule extends \yii\easyii\components\Module
+{
+ public $settings = [
+ 'categoryThumb' => true,
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
+ 'itemsInFolder' => false,
+ ];
+
+ public static $installConfig = [
+ 'title' => [
+ 'en' => 'Entities',
+ 'ru' => 'Объекты',
+ ],
+ 'icon' => 'list-asterisk',
+ 'order_num' => 95,
+ ];
+}
\ No newline at end of file
diff --git a/modules/entity/api/CategoryObject.php b/modules/entity/api/CategoryObject.php
new file mode 100644
index 0000000..a45886c
--- /dev/null
+++ b/modules/entity/api/CategoryObject.php
@@ -0,0 +1,105 @@
+<?php
+namespace yii\easyii\modules\entity\api;
+
+use yii\data\ActiveDataProvider;
+use yii\easyii\components\API;
+use yii\easyii\helpers\Data;
+use yii\easyii\modules\entity\models\Category;
+use yii\easyii\modules\entity\models\Item;
+use yii\helpers\Url;
+use yii\widgets\LinkPager;
+
+class CategoryObject extends \yii\easyii\components\ApiObject
+{
+ public $slug;
+ public $description;
+ public $image;
+ public $tree;
+ public $fields;
+ public $depth;
+ public $cache;
+
+ private $_adp;
+ private $_children ;
+
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
+ }
+
+ public function getPages($options = []){
+ return $this->_adp ? LinkPager::widget(array_merge($options, ['pagination' => $this->_adp->pagination])) : '';
+ }
+
+ public function getPagination(){
+ return $this->_adp ? $this->_adp->pagination : null;
+ }
+
+ public function getChildren()
+ {
+ if($this->_children === null) {
+ $this->_children = [];
+ foreach ($this->model->children as $child) {
+ $this->_children[] = Entity::cat($child);
+ }
+ }
+ return $this->_children;
+ }
+
+ public function getItems($options = [])
+ {
+ $result = [];
+
+ if($this->cache)
+ {
+ $result = Data::cache(Category::getCacheName($this->id), 3600, function(){
+ $items = [];
+ $query = Item::find()->where(['category_id' => $this->id])->status(Item::STATUS_ON)->sort();
+ foreach($query->all() as $item){
+ $items[] = new ItemObject($item);
+ }
+ return $items;
+ });
+ }
+ else
+ {
+ $query = Item::find()->where(['category_id' => $this->id])->status(Item::STATUS_ON);
+
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ $query->sort();
+
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
+
+ foreach($this->_adp->models as $model){
+ $result[] = new ItemObject($model);
+ }
+ }
+ return $result;
+ }
+
+ public function fieldOptions($name, $firstOption = '')
+ {
+ $options = [];
+ if($firstOption) {
+ $options[''] = $firstOption;
+ }
+
+ foreach($this->fields as $field){
+ if($field->name == $name){
+ foreach($field->options as $option){
+ $options[$option] = $option;
+ }
+ break;
+ }
+ }
+ return $options;
+ }
+
+ public function getEditLink(){
+ return Url::to(['/admin/entity/a/edit/', 'id' => $this->id]);
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/api/Entity.php b/modules/entity/api/Entity.php
new file mode 100644
index 0000000..5dcdfcf
--- /dev/null
+++ b/modules/entity/api/Entity.php
@@ -0,0 +1,135 @@
+<?php
+namespace yii\easyii\modules\entity\api;
+
+use Yii;
+
+use yii\data\ActiveDataProvider;
+use yii\easyii\widgets\Fancybox;
+use yii\easyii\modules\entity\models\Category;
+use yii\easyii\modules\entity\models\Item;
+use yii\web\NotFoundHttpException;
+use yii\widgets\LinkPager;
+
+/**
+ * Catalog module API
+ * @package yii\easyii\modules\entity\api
+ *
+ * @method static CategoryObject cat(mixed $id_slug) Get catalog category by id or slug
+ * @method static array tree() Get catalog categories as tree
+ * @method static array cats() Get catalog categories as flat array
+ * @method static array items(array $options = []) Get list of items as ItemObject objects
+ * @method static ItemObject get(mixed $id_slug) Get item object by id or slug
+ * @method static mixed last(int $limit = 1, mixed $where = null) Get last items, use $where option for fetching items from special category
+ * @method static void plugin() Applies FancyBox widget on photos called by box() function
+ * @method static string pages() returns pagination html generated by yii\widgets\LinkPager widget.
+ * @method static \stdClass pagination() returns yii\data\Pagination object.
+ */
+
+class Entity extends \yii\easyii\components\API
+{
+ private $_cats;
+ private $_adp;
+ private $_item = [];
+
+ public function api_cat($id_slug)
+ {
+ if(!isset($this->_cats[$id_slug])) {
+ $this->_cats[$id_slug] = new CategoryObject(Category::get($id_slug));
+ }
+ return $this->_cats[$id_slug];
+ }
+
+ public function api_tree()
+ {
+ return Category::tree();
+ }
+
+ public function api_cats($options = [])
+ {
+ $result = [];
+ foreach(Category::cats() as $model){
+ $result[] = new CategoryObject($model);
+ }
+ if(!empty($options['tags'])){
+ foreach($result as $i => $item){
+ if(!in_array($options['tags'], $item->tags)){
+ unset($result[$i]);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ public function api_items($options = [])
+ {
+ $result = [];
+
+ $query = Item::find()->with('category')->status(Item::STATUS_ON);
+
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ $query->sort();
+
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
+
+ foreach($this->_adp->models as $model){
+ $result[] = new ItemObject($model);
+ }
+ return $result;
+ }
+
+ public function api_last($limit = 1, $where = null)
+ {
+ $result = [];
+
+ $query = Item::find()->sort()->status(Item::STATUS_ON)->limit($limit);
+ if($where){
+ $query->andFilterWhere($where);
+ }
+
+ foreach($query->all() as $item){
+ $result[] = new ItemObject($item);
+ }
+ return $result;
+ }
+
+ public function api_get($id)
+ {
+ if(!isset($this->_item[$id])) {
+ $this->_item[$id] = $this->findItem($id);
+ }
+ return $this->_item[$id];
+ }
+
+ public function api_pagination()
+ {
+ return $this->_adp ? $this->_adp->pagination : null;
+ }
+
+ public function api_pages()
+ {
+ return $this->_adp ? LinkPager::widget(['pagination' => $this->_adp->pagination]) : '';
+ }
+
+ public function api_plugin($options = [])
+ {
+ Fancybox::widget([
+ 'selector' => '.easyii-box',
+ 'options' => $options
+ ]);
+ }
+
+ private function findItem($id)
+ {
+ if(!($item = Item::find()->where(['id' => ':id'], [':id' => $id])->status(Item::STATUS_ON)->one())){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+
+ return new ItemObject($item);
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/api/ItemObject.php b/modules/entity/api/ItemObject.php
new file mode 100644
index 0000000..19208db
--- /dev/null
+++ b/modules/entity/api/ItemObject.php
@@ -0,0 +1,56 @@
+<?php
+namespace yii\easyii\modules\entity\api;
+
+use Yii;
+use yii\easyii\components\API;
+use yii\easyii\models\Photo;
+use yii\easyii\modules\entity\models\Item;
+use yii\helpers\Url;
+
+class ItemObject extends \yii\easyii\components\ApiObject
+{
+ public $data;
+ public $category_id;
+
+ private $_photos;
+
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
+ }
+
+ public function getCat(){
+ return Entity::cat($this->category_id);
+ }
+
+ public function getPhotos()
+ {
+ if(!$this->_photos){
+ $this->_photos = [];
+
+ foreach(Photo::find()->where(['class' => Item::className(), 'item_id' => $this->id])->sort()->all() as $model){
+ $this->_photos[] = new PhotoObject($model);
+ }
+ }
+ return $this->_photos;
+ }
+
+ public function getEditLink(){
+ return Url::to(['/admin/entity/items/edit/', 'id' => $this->id]);
+ }
+
+ public function __get($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return $this->data->{$name};
+ }
+ return parent::__get($name);
+ }
+
+ public function __isset($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return true;
+ }
+ return parent::__isset($name);
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/api/PhotoObject.php b/modules/entity/api/PhotoObject.php
new file mode 100644
index 0000000..e691b8e
--- /dev/null
+++ b/modules/entity/api/PhotoObject.php
@@ -0,0 +1,26 @@
+<?php
+namespace yii\easyii\modules\entity\api;
+
+use Yii;
+use yii\easyii\components\API;
+use yii\helpers\Html;
+use yii\helpers\Url;
+
+class PhotoObject extends \yii\easyii\components\ApiObject
+{
+ public $description;
+
+ public function box($width, $height){
+ $img = Html::img($this->thumb($width, $height));
+ $a = Html::a($img, $this->image, [
+ 'class' => 'easyii-box',
+ 'rel' => 'entity-'.$this->model->item_id,
+ 'title' => $this->description
+ ]);
+ return LIVE_EDIT_ENABLED ? API::liveEdit($a, $this->editLink) : $a;
+ }
+
+ public function getEditLink(){
+ return Url::to(['/admin/entity/items/photos', 'id' => $this->model->item_id]).'#photo-'.$this->id;
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/controllers/AController.php b/modules/entity/controllers/AController.php
new file mode 100644
index 0000000..1045dd9
--- /dev/null
+++ b/modules/entity/controllers/AController.php
@@ -0,0 +1,25 @@
+<?php
+namespace yii\easyii\modules\entity\controllers;
+
+use yii\easyii\components\CategoryController;
+use yii\easyii\modules\entity\EntityModule;
+use yii\easyii\modules\entity\models\Category;
+
+class AController extends CategoryController
+{
+ public $categoryClass = 'yii\easyii\modules\entity\models\Category';
+ public $modelClass = 'yii\easyii\modules\entity\models\Item';
+ public $moduleName = 'entity';
+
+ public function getSameCats($cat)
+ {
+ $result = [];
+ $fieldsHash = md5(json_encode($cat->fields));
+ foreach(Category::cats() as $cat){
+ if(md5(json_encode($cat->fields)) == $fieldsHash && (!count($cat->children) || EntityModule::setting('itemsInFolder'))) {
+ $result[$cat->id] = $cat->title;
+ }
+ }
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/controllers/ItemsController.php b/modules/entity/controllers/ItemsController.php
new file mode 100644
index 0000000..c79b2eb
--- /dev/null
+++ b/modules/entity/controllers/ItemsController.php
@@ -0,0 +1,135 @@
+<?php
+namespace yii\easyii\modules\entity\controllers;
+
+use Yii;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
+use yii\easyii\behaviors\Fields;
+use yii\easyii\components\Controller;
+use yii\easyii\modules\entity\EntityModule;
+use yii\easyii\modules\entity\models\Category;
+use yii\easyii\modules\entity\models\Item;
+use yii\widgets\ActiveForm;
+
+class ItemsController extends Controller
+{
+ public $modelClass = 'yii\easyii\modules\entity\models\Item';
+ public $categoryClass = 'yii\easyii\modules\entity\models\Category';
+
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/entity', 'Item deleted')
+ ],
+ 'up' => [
+ 'class' => SortByNumAction::className(),
+ 'addititonalEquality' => ['category_id']
+ ],
+ 'down' => [
+ 'class' => SortByNumAction::className(),
+ 'addititonalEquality' => ['category_id']
+ ],
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
+ ];
+ }
+
+ public function behaviors()
+ {
+ return [
+ 'fields' => Fields::className()
+ ];
+ }
+
+ public function actionIndex($id)
+ {
+ return $this->render('index', [
+ 'category' => $this->findCategory($id)
+ ]);
+ }
+
+ public function actionCreate($id)
+ {
+ $category = $this->findCategory($id);
+
+ $model = new Item(['category_id' => $id]);
+
+ if ($model->load(Yii::$app->request->post())) {
+ if(Yii::$app->request->isAjax){
+ Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+ return ActiveForm::validate($model);
+ }
+ else {
+ $model->data = $this->parseData($model);
+
+ if ($model->save()) {
+ $this->flash('success', Yii::t('easyii/entity', 'Item created'));
+ return $this->redirect(['/admin/'.$this->module->id.'/items/edit/', 'id' => $model->primaryKey]);
+ } else {
+ $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
+ return $this->refresh();
+ }
+ }
+ }
+ else {
+ return $this->render('create', [
+ 'model' => $model,
+ 'category' => $category,
+ 'dataForm' => $this->generateForm($category->fields),
+ 'cats' => $this->getSameCats($category)
+ ]);
+ }
+ }
+
+ public function actionEdit($id)
+ {
+ $model = $this->findModel($id);
+
+ if ($model->load(Yii::$app->request->post())) {
+ if(Yii::$app->request->isAjax){
+ Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+ return ActiveForm::validate($model);
+ }
+ else {
+ $model->data = $this->parseData($model);
+
+ if ($model->save()) {
+ $this->flash('success', Yii::t('easyii/entity', 'Item updated'));
+ return $this->redirect(['/admin/'.$this->module->id.'/items/edit', 'id' => $model->primaryKey]);
+ } else {
+ $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
+ return $this->refresh();
+ }
+ }
+ }
+ else {
+ return $this->render('edit', [
+ 'model' => $model,
+ 'dataForm' => $this->generateForm($model->category->fields, $model->data),
+ 'cats' => $this->getSameCats($model->category)
+ ]);
+ }
+ }
+
+ public function actionPhotos($id)
+ {
+ return $this->render('photos', [
+ 'model' => $this->findModel($id),
+ ]);
+ }
+
+ public function getSameCats($cat)
+ {
+ $result = [];
+ $fieldsHash = md5(json_encode($cat->fields));
+ foreach(Category::cats() as $cat){
+ if(md5(json_encode($cat->fields)) == $fieldsHash && (!count($cat->children) || EntityModule::setting('itemsInFolder'))) {
+ $result[$cat->id] = $cat->title;
+ }
+ }
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/messages/ru/admin.php b/modules/entity/messages/ru/admin.php
new file mode 100644
index 0000000..b2aafb1
--- /dev/null
+++ b/modules/entity/messages/ru/admin.php
@@ -0,0 +1,12 @@
+<?php
+return [
+ 'Entity' => 'Объект',
+ 'Entities' => 'Объекты',
+
+ 'Create item' => 'Создать объект',
+ 'Item created' => 'Новый объект успешно создан',
+ 'Item updated' => 'Объект обновлен',
+ 'Item deleted' => 'Объект удален',
+
+ 'Title' => 'Название',
+];
\ No newline at end of file
diff --git a/modules/entity/models/Category.php b/modules/entity/models/Category.php
new file mode 100644
index 0000000..5b11490
--- /dev/null
+++ b/modules/entity/models/Category.php
@@ -0,0 +1,43 @@
+<?php
+namespace yii\easyii\modules\entity\models;
+
+use yii\easyii\components\CategoryWithFieldsModel;
+
+class Category extends CategoryWithFieldsModel
+{
+ public static function tableName()
+ {
+ return 'easyii_entity_categories';
+ }
+
+ public function rules()
+ {
+ return array_merge([
+ ['cache', 'integer'],
+ ], parent::rules());
+ }
+
+ public function attributeLabels()
+ {
+ return array_merge(['cache' => \Yii::t('easyii', 'Cache')], parent::attributeLabels());
+ }
+
+ public function getItems()
+ {
+ return $this->hasMany(Item::className(), ['category_id' => 'id'])->sort();
+ }
+
+ public function afterDelete()
+ {
+ parent::afterDelete();
+
+ foreach($this->getItems()->all() as $item){
+ $item->delete();
+ }
+ }
+
+ public static function getCacheName($category_id)
+ {
+ return 'entity' . $category_id;
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/models/Item.php b/modules/entity/models/Item.php
new file mode 100644
index 0000000..0b7fdc7
--- /dev/null
+++ b/modules/entity/models/Item.php
@@ -0,0 +1,79 @@
+<?php
+namespace yii\easyii\modules\entity\models;
+
+use Yii;
+use yii\easyii\behaviors\JsonColumns;
+use yii\easyii\behaviors\SortableModel;
+use yii\easyii\models\Photo;
+
+class Item extends \yii\easyii\components\ActiveRecord
+{
+ const STATUS_OFF = 0;
+ const STATUS_ON = 1;
+
+ public static function tableName()
+ {
+ return 'easyii_entity_items';
+ }
+
+ public function rules()
+ {
+ return [
+ ['title', 'required'],
+ ['title', 'trim'],
+ ['title', 'string', 'max' => 128],
+ [['status', 'category_id'], 'integer'],
+ ['status', 'default', 'value' => self::STATUS_ON],
+ ];
+ }
+
+ public function attributeLabels()
+ {
+ return [
+ 'title' => Yii::t('easyii', 'Title'),
+ 'category_id' => Yii::t('easyii', 'Category'),
+ ];
+ }
+
+ public function behaviors()
+ {
+ return [
+ SortableModel::className(),
+ 'jsonColumns' => [
+ 'class' => JsonColumns::className(),
+ 'columns' => ['fields', 'data']
+ ],
+ ];
+ }
+
+ public function afterSave($insert, $attributes){
+ parent::afterSave($insert, $attributes);
+
+ if($this->category && !empty($this->category->cache)) {
+ Yii::$app->cache->delete(Category::getCacheName($this->category_id));
+ }
+ }
+
+ public function getPhotos()
+ {
+ return $this->hasMany(Photo::className(), ['item_id' => 'id'])->where(['class' => self::className()])->sort();
+ }
+
+ public function getCategory()
+ {
+ return Category::get($this->category_id);
+ }
+
+ public function afterDelete()
+ {
+ parent::afterDelete();
+
+ if($this->category && !empty($this->category->cache)) {
+ Yii::$app->cache->delete(Category::getCacheName($this->category_id));
+ }
+
+ foreach($this->getPhotos()->all() as $photo){
+ $photo->delete();
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/entity/views/items/_form.php b/modules/entity/views/items/_form.php
new file mode 100644
index 0000000..2e76bd5
--- /dev/null
+++ b/modules/entity/views/items/_form.php
@@ -0,0 +1,23 @@
+<?php
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+$settings = $this->context->module->settings;
+$module = $this->context->module->id;
+?>
+
+<?php $form = ActiveForm::begin([
+ 'options' => ['enctype' => 'multipart/form-data', 'class' => 'model-form']
+]); ?>
+
+<?= $form->field($model, 'title') ?>
+
+<?php if(!empty($cats) && count($cats)) : ?>
+ <?= $form->field($model, 'category_id')->dropDownList($cats) ?>
+<?php endif; ?>
+
+<?= $dataForm ?>
+
+<?= Html::submitButton(Yii::t('easyii', 'Save'), ['class' => 'btn btn-primary']) ?>
+
+<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/modules/entity/views/items/_menu.php b/modules/entity/views/items/_menu.php
new file mode 100644
index 0000000..a0f46fa
--- /dev/null
+++ b/modules/entity/views/items/_menu.php
@@ -0,0 +1,14 @@
+<?php
+use yii\helpers\Url;
+
+$action = $this->context->action->id;
+$module = $this->context->module->id;
+?>
+<ul class="nav nav-pills">
+ <?php if($action === 'index') : ?>
+ <li><a href="<?= Url::to(['/admin/'.$module]) ?>"><i class="glyphicon glyphicon-chevron-left font-12"></i> <?= Yii::t('easyii', 'Categories') ?></a></li>
+ <?php endif; ?>
+ <li <?= ($action === 'index') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items', 'id' => $category->primaryKey]) ?>"><?php if($action !== 'index') echo '<i class="glyphicon glyphicon-chevron-left font-12"></i> ' ?><?= $category->title ?></a></li>
+ <li <?= ($action === 'create') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/create', 'id' => $category->primaryKey]) ?>"><?= Yii::t('easyii', 'Add') ?></a></li>
+</ul>
+<br/>
\ No newline at end of file
diff --git a/modules/entity/views/items/_submenu.php b/modules/entity/views/items/_submenu.php
new file mode 100644
index 0000000..c8dba95
--- /dev/null
+++ b/modules/entity/views/items/_submenu.php
@@ -0,0 +1,15 @@
+<?php
+use yii\easyii\modules\entity\EntityModule;
+use yii\helpers\Url;
+
+$action = $this->context->action->id;
+$module = $this->context->module->id;
+?>
+
+<ul class="nav nav-tabs">
+ <li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii', 'Edit') ?></a></li>
+ <?php if(EntityModule::setting('itemPhotos')) : ?>
+ <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/items/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php endif; ?>
+</ul>
+<br>
\ No newline at end of file
diff --git a/modules/entity/views/items/create.php b/modules/entity/views/items/create.php
new file mode 100644
index 0000000..d82685b
--- /dev/null
+++ b/modules/entity/views/items/create.php
@@ -0,0 +1,5 @@
+<?php
+$this->title = Yii::t('easyii/entity', 'Create item');
+?>
+<?= $this->render('_menu', ['category' => $category]) ?>
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm, 'cats' => $cats]) ?>
\ No newline at end of file
diff --git a/modules/entity/views/items/edit.php b/modules/entity/views/items/edit.php
new file mode 100644
index 0000000..4be478d
--- /dev/null
+++ b/modules/entity/views/items/edit.php
@@ -0,0 +1,7 @@
+<?php
+$this->title = Yii::t('easyii', 'Edit'). ' ' .$model->title;
+?>
+<?= $this->render('_menu', ['category' => $model->category]) ?>
+<?= $this->render('_submenu', ['model' => $model]) ?>
+
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm, 'cats' => $cats]) ?>
diff --git a/modules/entity/views/items/index.php b/modules/entity/views/items/index.php
new file mode 100644
index 0000000..35633c7
--- /dev/null
+++ b/modules/entity/views/items/index.php
@@ -0,0 +1,47 @@
+<?php
+use yii\easyii\modules\entity\models\Item;
+use yii\helpers\Html;
+use yii\helpers\Url;
+
+$this->title = Yii::t('easyii/entity', 'Entity');
+
+$module = $this->context->module->id;
+?>
+<?= $this->render('_menu', ['category' => $category]) ?>
+
+<?php if(count($category->items)) : ?>
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th width="50">#</th>
+ <th><?= Yii::t('easyii', 'Name') ?></th>
+ <th width="100"><?= Yii::t('easyii', 'Status') ?></th>
+ <th width="120"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($category->items as $item) : ?>
+ <tr data-id="<?= $item->primaryKey ?>">
+ <td><?= $item->primaryKey ?></td>
+ <td><a href="<?= Url::to(['/admin/'.$module.'/items/edit', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
+ <td class="status">
+ <?= Html::checkbox('', $item->status == Item::STATUS_ON, [
+ 'class' => 'switch',
+ 'data-id' => $item->primaryKey,
+ 'data-link' => Url::to(['/admin/'.$module.'/items']),
+ ]) ?>
+ </td>
+ <td class="text-right">
+ <div class="btn-group btn-group-sm" role="group">
+ <a href="<?= Url::to(['/admin/'.$module.'/items/up', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-up" title="<?= Yii::t('easyii', 'Move up') ?>"><span class="glyphicon glyphicon-arrow-up"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/down', 'id' => $item->primaryKey, 'category_id' => $category->primaryKey]) ?>" class="btn btn-default move-down" title="<?= Yii::t('easyii', 'Move down') ?>"><span class="glyphicon glyphicon-arrow-down"></span></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/items/delete', 'id' => $item->primaryKey]) ?>" class="btn btn-default confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"><span class="glyphicon glyphicon-remove"></span></a>
+ </div>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+<?php else : ?>
+ <p><?= Yii::t('easyii', 'No records found') ?></p>
+<?php endif; ?>
\ No newline at end of file
diff --git a/modules/entity/views/items/photos.php b/modules/entity/views/items/photos.php
new file mode 100644
index 0000000..d0d0464
--- /dev/null
+++ b/modules/entity/views/items/photos.php
@@ -0,0 +1,10 @@
+<?php
+use yii\easyii\widgets\Photos;
+
+$this->title = Yii::t('easyii', 'Photos') . ' ' . $model->title;
+?>
+
+<?= $this->render('_menu', ['category' => $model->category]) ?>
+<?= $this->render('_submenu', ['model' => $model]) ?>
+
+<?= Photos::widget(['model' => $model])?>
\ No newline at end of file
diff --git a/modules/faq/FaqModule.php b/modules/faq/FaqModule.php
index 2b91dea..57e3510 100644
--- a/modules/faq/FaqModule.php
+++ b/modules/faq/FaqModule.php
@@ -5,6 +5,12 @@
class FaqModule extends \yii\easyii\components\Module
{
+ public $settings = [
+ 'questionHtmlEditor' => true,
+ 'answerHtmlEditor' => true,
+ 'enableTags' => true
+ ];
+
public static $installConfig = [
'title' => [
'en' => 'FAQ',
diff --git a/modules/faq/api/Faq.php b/modules/faq/api/Faq.php
index 8a25d11..6dfaa0d 100644
--- a/modules/faq/api/Faq.php
+++ b/modules/faq/api/Faq.php
@@ -3,6 +3,7 @@
use Yii;
use yii\easyii\helpers\Data;
+use yii\easyii\modules\faq\FaqModule;
use yii\easyii\modules\faq\models\Faq as FaqModel;
@@ -15,14 +16,30 @@
class Faq extends \yii\easyii\components\API
{
- public function api_items()
+ public function api_items($options = [])
{
- return Data::cache(FaqModel::CACHE_KEY, 3600, function(){
+ $items = Data::cache(FaqModel::CACHE_KEY, 3600, function(){
$items = [];
- foreach(FaqModel::find()->select(['faq_id', 'question', 'answer'])->status(FaqModel::STATUS_ON)->sort()->all() as $item){
+
+ $query = FaqModel::find()->select(['id', 'question', 'answer'])->status(FaqModel::STATUS_ON)->sort();
+ if(FaqModule::setting('enableTags')){
+ $query->with('tags');
+ }
+
+ foreach($query->all() as $item){
$items[] = new FaqObject($item);
}
return $items;
});
+
+ if(!empty($options['tags'])){
+ foreach($items as $i => $item){
+ if(!in_array($options['tags'], $item->tags)){
+ unset($items[$i]);
+ }
+ }
+ }
+
+ return $items;
}
}
\ No newline at end of file
diff --git a/modules/faq/api/FaqObject.php b/modules/faq/api/FaqObject.php
index 86fd46a..14b38a5 100644
--- a/modules/faq/api/FaqObject.php
+++ b/modules/faq/api/FaqObject.php
@@ -7,11 +7,15 @@
class FaqObject extends \yii\easyii\components\ApiObject
{
public function getQuestion(){
- return LIVE_EDIT ? API::liveEdit($this->model->question, $this->editLink) : $this->model->question;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->question, $this->editLink) : $this->model->question;
}
public function getAnswer(){
- return LIVE_EDIT ? API::liveEdit($this->model->answer, $this->editLink) : $this->model->answer;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->answer, $this->editLink) : $this->model->answer;
+ }
+
+ public function getTags(){
+ return $this->model->tagsArray;
}
public function getEditLink(){
diff --git a/modules/faq/controllers/AController.php b/modules/faq/controllers/AController.php
index 278fafa..877cfea 100644
--- a/modules/faq/controllers/AController.php
+++ b/modules/faq/controllers/AController.php
@@ -3,26 +3,28 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
use yii\widgets\ActiveForm;
-
use yii\easyii\components\Controller;
use yii\easyii\modules\faq\models\Faq;
-use yii\easyii\behaviors\SortableController;
-use yii\easyii\behaviors\StatusController;
class AController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\faq\models\Faq';
+
+ public function actions()
{
return [
- [
- 'class' => SortableController::className(),
- 'model' => Faq::className()
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/faq', 'Entry deleted')
],
- [
- 'class' => StatusController::className(),
- 'model' => Faq::className()
- ]
+ 'up' => SortByNumAction::className(),
+ 'down' => SortByNumAction::className(),
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
@@ -67,12 +69,7 @@ public function actionCreate($slug = null)
public function actionEdit($id)
{
- $model = Faq::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -95,34 +92,4 @@ public function actionEdit($id)
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Faq::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/faq', 'Entry deleted'));
- }
-
- public function actionUp($id)
- {
- return $this->move($id, 'up');
- }
-
- public function actionDown($id)
- {
- return $this->move($id, 'down');
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, Faq::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, Faq::STATUS_OFF);
- }
}
\ No newline at end of file
diff --git a/modules/faq/models/Faq.php b/modules/faq/models/Faq.php
index af70b42..48b72b0 100644
--- a/modules/faq/models/Faq.php
+++ b/modules/faq/models/Faq.php
@@ -4,6 +4,7 @@
use Yii;
use yii\easyii\behaviors\CacheFlush;
use yii\easyii\behaviors\SortableModel;
+use yii\easyii\behaviors\Taggable;
class Faq extends \yii\easyii\components\ActiveRecord
{
@@ -22,6 +23,7 @@ public function rules()
return [
[['question','answer'], 'required'],
[['question', 'answer'], 'trim'],
+ ['tagNames', 'safe'],
['status', 'integer'],
['status', 'default', 'value' => self::STATUS_ON],
];
@@ -32,6 +34,7 @@ public function attributeLabels()
return [
'question' => Yii::t('easyii/faq', 'Question'),
'answer' => Yii::t('easyii/faq', 'Answer'),
+ 'tagNames' => Yii::t('easyii', 'Tags'),
];
}
@@ -39,7 +42,8 @@ public function behaviors()
{
return [
CacheFlush::className(),
- SortableModel::className()
+ SortableModel::className(),
+ 'taggabble' => Taggable::className(),
];
}
}
\ No newline at end of file
diff --git a/modules/faq/views/a/_form.php b/modules/faq/views/a/_form.php
index bb1fbfd..82d7f05 100644
--- a/modules/faq/views/a/_form.php
+++ b/modules/faq/views/a/_form.php
@@ -1,25 +1,27 @@
<?php
+use yii\easyii\modules\faq\FaqModule;
+use yii\easyii\widgets\TagsInput;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
?>
<?php $form = ActiveForm::begin([
'options' => ['class' => 'model-form']
]); ?>
-<?= $form->field($model, 'question')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 300,
- 'buttons' => ['bold', 'italic', 'unorderedlist', 'link'],
- 'linebreaks' => true
- ]
-]) ?>
-<?= $form->field($model, 'answer')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 300,
- 'buttons' => ['bold', 'italic', 'unorderedlist', 'link'],
- 'linebreaks' => true
- ]
-]) ?>
+<?php if(FaqModule::setting('questionHtmlEditor')) : ?>
+ <?= $form->field($model, 'question')->widget(\yii\easyii\widgets\Redactor::className()) ?>
+<?php else : ?>
+ <?= $form->field($model, 'question')->textarea(['rows' => 4]) ?>
+<?php endif; ?>
+
+<?php if(FaqModule::setting('answerHtmlEditor')) : ?>
+ <?= $form->field($model, 'answer')->widget(\yii\easyii\widgets\Redactor::className()) ?>
+<?php else : ?>
+ <?= $form->field($model, 'answer')->textarea(['rows' => 4]) ?>
+<?php endif; ?>
+
+<?php if(FaqModule::setting('enableTags')) : ?>
+ <?= $form->field($model, 'tagNames')->widget(TagsInput::className()) ?>
+<?php endif; ?>
<?= Html::submitButton(Yii::t('easyii','Save'), ['class' => 'btn btn-primary']) ?>
<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/modules/faq/views/a/index.php b/modules/faq/views/a/index.php
index 7a9da46..4a1793f 100644
--- a/modules/faq/views/a/index.php
+++ b/modules/faq/views/a/index.php
@@ -14,9 +14,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii/faq', 'Question')?></th>
<th width="100"><?= Yii::t('easyii', 'Status') ?></th>
<th width="120"></th>
@@ -25,9 +23,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><?= StringHelper::truncate(strip_tags($item->question), 128) ?></a></td>
<td class="status vtop">
<?= Html::checkbox('', $item->status == Faq::STATUS_ON, [
diff --git a/modules/feedback/FeedbackModule.php b/modules/feedback/FeedbackModule.php
index 9438021..649d3a8 100644
--- a/modules/feedback/FeedbackModule.php
+++ b/modules/feedback/FeedbackModule.php
@@ -14,7 +14,9 @@ class FeedbackModule extends \yii\easyii\components\Module
'answerFooter' => 'Best regards.',
'enableTitle' => false,
+ 'enableEmail' => true,
'enablePhone' => true,
+ 'enableText' => true,
'enableCaptcha' => false,
];
diff --git a/modules/feedback/api/Feedback.php b/modules/feedback/api/Feedback.php
index 46f0330..b44000c 100644
--- a/modules/feedback/api/Feedback.php
+++ b/modules/feedback/api/Feedback.php
@@ -2,6 +2,7 @@
namespace yii\easyii\modules\feedback\api;
use Yii;
+use yii\easyii\modules\feedback\FeedbackModule;
use yii\easyii\modules\feedback\models\Feedback as FeedbackModel;
use yii\helpers\Html;
@@ -30,7 +31,6 @@ class Feedback extends \yii\easyii\components\API
public function api_form($options = [])
{
$model = new FeedbackModel;
- $settings = Yii::$app->getModule('admin')->activeModules['feedback']->settings;
$options = array_merge($this->_defaultFormOptions, $options);
ob_start();
@@ -43,14 +43,14 @@ public function api_form($options = [])
echo Html::hiddenInput('successUrl', $options['successUrl'] ? $options['successUrl'] : Url::current([self::SENT_VAR => 1]));
echo $form->field($model, 'name');
- echo $form->field($model, 'email')->input('email');
- if($settings['enablePhone']) echo $form->field($model, 'phone');
- if($settings['enableTitle']) echo $form->field($model, 'title');
+ if(FeedbackModule::setting('enableEmail')) echo $form->field($model, 'email')->input('email');
+ if(FeedbackModule::setting('enablePhone')) echo $form->field($model, 'phone');
+ if(FeedbackModule::setting('enableTitle')) echo $form->field($model, 'title');
- echo $form->field($model, 'text')->textarea();
+ if(FeedbackModule::setting('enableText')) echo $form->field($model, 'text')->textarea();
- if($settings['enableCaptcha']) echo $form->field($model, 'reCaptcha')->widget(ReCaptcha::className());
+ if(FeedbackModule::setting('enableCaptcha')) echo $form->field($model, 'reCaptcha')->widget(ReCaptcha::className());
echo Html::submitButton(Yii::t('easyii', 'Send'), ['class' => 'btn btn-primary']);
ActiveForm::end();
diff --git a/modules/feedback/controllers/AController.php b/modules/feedback/controllers/AController.php
index 1c19a9e..8f12008 100644
--- a/modules/feedback/controllers/AController.php
+++ b/modules/feedback/controllers/AController.php
@@ -3,16 +3,27 @@
use Yii;
use yii\data\ActiveDataProvider;
-
+use yii\easyii\actions\DeleteAction;
use yii\easyii\components\Controller;
use yii\easyii\models\Setting;
use yii\easyii\modules\feedback\models\Feedback;
class AController extends Controller
{
+ public $modelClass = 'yii\easyii\modules\feedback\models\Feedback';
public $new = 0;
public $noAnswer = 0;
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/feedback', 'Feedback deleted')
+ ]
+ ];
+ }
+
public function init()
{
parent::init();
@@ -57,41 +68,32 @@ public function actionAll()
public function actionView($id)
{
- $model = Feedback::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
- if($model->status == Feedback::STATUS_NEW){
+ if ($model->status == Feedback::STATUS_NEW) {
$model->status = Feedback::STATUS_VIEW;
$model->update();
}
$postData = Yii::$app->request->post('Feedback');
- if($postData) {
- if(filter_var(Setting::get('admin_email'), FILTER_VALIDATE_EMAIL))
- {
+ if ($postData) {
+ if (filter_var(Setting::get('admin_email'), FILTER_VALIDATE_EMAIL)) {
$model->answer_subject = filter_var($postData['answer_subject'], FILTER_SANITIZE_STRING);
$model->answer_text = filter_var($postData['answer_text'], FILTER_SANITIZE_STRING);
- if($model->sendAnswer()){
+ if ($model->sendAnswer()) {
$model->status = Feedback::STATUS_ANSWERED;
$model->save();
$this->flash('success', Yii::t('easyii/feedback', 'Answer successfully sent'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii/feedback', 'An error has occurred while sending mail'));
}
- }
- else {
+ } else {
$this->flash('error', Yii::t('easyii/feedback', 'Please fill correct `Admin E-mail` in Settings'));
}
return $this->refresh();
- }
- else {
- if(!$model->answer_text) {
+ } else {
+ if (!$model->answer_text) {
$model->answer_subject = Yii::t('easyii/feedback', $this->module->settings['answerSubject']);
if ($this->module->settings['answerHeader']) $model->answer_text = Yii::t('easyii/feedback', $this->module->settings['answerHeader']) . " " . $model->name . ".\n";
if ($this->module->settings['answerFooter']) $model->answer_text .= "\n\n" . Yii::t('easyii/feedback', $this->module->settings['answerFooter']);
@@ -105,30 +107,14 @@ public function actionView($id)
public function actionSetAnswer($id)
{
- $model = Feedback::findOne($id);
+ $model = $this->findModel($id);
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- else{
- $model->status = Feedback::STATUS_ANSWERED;
- if($model->update()) {
- $this->flash('success', Yii::t('easyii/feedback', 'Feedback updated'));
- }
- else{
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- }
- }
- return $this->back();
- }
-
- public function actionDelete($id)
- {
- if(($model = Feedback::findOne($id))){
- $model->delete();
+ $model->status = Feedback::STATUS_ANSWERED;
+ if ($model->update()) {
+ $this->flash('success', Yii::t('easyii/feedback', 'Feedback updated'));
} else {
- $this->error = Yii::t('easyii', 'Not found');
+ $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
- return $this->formatResponse(Yii::t('easyii/feedback', 'Feedback deleted'));
+ return $this->back();
}
}
\ No newline at end of file
diff --git a/modules/feedback/models/Feedback.php b/modules/feedback/models/Feedback.php
index 07cfe5c..eee724e 100644
--- a/modules/feedback/models/Feedback.php
+++ b/modules/feedback/models/Feedback.php
@@ -5,6 +5,7 @@
use yii\easyii\behaviors\CalculateNotice;
use yii\easyii\helpers\Mail;
use yii\easyii\models\Setting;
+use yii\easyii\modules\feedback\FeedbackModule;
use yii\easyii\validators\ReCaptchaValidator;
use yii\easyii\validators\EscapeValidator;
use yii\helpers\Url;
@@ -27,14 +28,17 @@ public static function tableName()
public function rules()
{
return [
- [['name', 'email', 'text'], 'required'],
+ ['name', 'required'],
+ ['email', 'required', 'when' => function($model) { return (!FeedbackModule::setting('enablePhone') || !$model->phone); }],
+ ['phone', 'required', 'when' => function($model) { return (!FeedbackModule::setting('enableEmail') || !$model->email); }],
+ ['text', 'required', 'when' => function($model) { return FeedbackModule::setting('enableText'); }],
[['name', 'email', 'phone', 'title', 'text'], 'trim'],
[['name','title', 'text'], EscapeValidator::className()],
['title', 'string', 'max' => 128],
['email', 'email'],
['phone', 'match', 'pattern' => '/^[\d\s-\+\(\)]+$/'],
['reCaptcha', ReCaptchaValidator::className(), 'when' => function($model){
- return $model->isNewRecord && Yii::$app->getModule('admin')->activeModules['feedback']->settings['enableCaptcha'];
+ return $model->isNewRecord && FeedbackModule::setting('enableCaptcha');
}],
];
}
@@ -90,27 +94,23 @@ public function behaviors()
public function mailAdmin()
{
- $settings = Yii::$app->getModule('admin')->activeModules['feedback']->settings;
-
- if(!$settings['mailAdminOnNewFeedback']){
+ if(!FeedbackModule::setting('mailAdminOnNewFeedback')){
return false;
}
return Mail::send(
Setting::get('admin_email'),
- $settings['subjectOnNewFeedback'],
- $settings['templateOnNewFeedback'],
+ FeedbackModule::setting('subjectOnNewFeedback'),
+ FeedbackModule::setting('templateOnNewFeedback'),
['feedback' => $this, 'link' => Url::to(['/admin/feedback/a/view', 'id' => $this->primaryKey], true)]
);
}
public function sendAnswer()
{
- $settings = Yii::$app->getModule('admin')->activeModules['feedback']->settings;
-
return Mail::send(
$this->email,
$this->answer_subject,
- $settings['answerTemplate'],
+ FeedbackModule::setting('answerTemplate'),
['feedback' => $this],
['replyTo' => Setting::get('admin_email')]
);
diff --git a/modules/feedback/views/a/index.php b/modules/feedback/views/a/index.php
index 0572210..c1f9873 100644
--- a/modules/feedback/views/a/index.php
+++ b/modules/feedback/views/a/index.php
@@ -13,9 +13,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', $this->context->module->settings['enableTitle'] ? 'Title' : 'Text') ?></th>
<th width="150"><?= Yii::t('easyii', 'Date') ?></th>
<th width="100"><?= Yii::t('easyii/feedback', 'Answer') ?></th>
@@ -23,12 +21,10 @@
</tr>
</thead>
<tbody>
- <?php foreach($data->models as $item) : ?>
+ <?php foreach($data->models as $item) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
- <td><a href="<?= Url::to(['/admin/'.$module.'/a/view', 'id' => $item->primaryKey]) ?>"><?= ($this->context->module->settings['enableTitle'] && $item->title != '') ? $item->title : StringHelper::truncate($item->text, 64, '...')?></a></td>
+ <td><?= $item->primaryKey ?></td>
+ <td><a href="<?= Url::to(['/admin/'.$module.'/a/view', 'id' => $item->primaryKey]) ?>"><?= $item->name . ' ' . ($item->phone ? $item->phone : $item->email) ?></a></td>
<td><?= Yii::$app->formatter->asDatetime($item->time, 'short') ?></td>
<td>
<?php if($item->status == Feedback::STATUS_ANSWERED) : ?>
@@ -39,7 +35,7 @@
</td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/delete', 'id' => $item->primaryKey]) ?>" class="glyphicon glyphicon-remove confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"></a></td>
</tr>
- <?php endforeach; ?>
+ <?php endforeach; ?>
</tbody>
</table>
<?= yii\widgets\LinkPager::widget([
diff --git a/modules/feedback/views/a/view.php b/modules/feedback/views/a/view.php
index ae27567..e66e001 100644
--- a/modules/feedback/views/a/view.php
+++ b/modules/feedback/views/a/view.php
@@ -39,11 +39,13 @@
<dd><?= nl2br($model->text) ?></dd>
</dl>
-<hr>
-<h2><small><?= Yii::t('easyii/feedback', 'Answer') ?></small></h2>
-
-<?php $form = ActiveForm::begin() ?>
- <?= $form->field($model, 'answer_subject') ?>
- <?= $form->field($model, 'answer_text')->textarea(['style' => 'height: 250px']) ?>
- <?= Html::submitButton(Yii::t('easyii', 'Send'), ['class' => 'btn btn-success send-answer']) ?>
-<?php ActiveForm::end() ?>
\ No newline at end of file
+<?php if($model->email) : ?>
+ <hr>
+ <h2><small><?= Yii::t('easyii/feedback', 'Answer') ?></small></h2>
+
+ <?php $form = ActiveForm::begin() ?>
+ <?= $form->field($model, 'answer_subject') ?>
+ <?= $form->field($model, 'answer_text')->textarea(['style' => 'height: 250px']) ?>
+ <?= Html::submitButton(Yii::t('easyii', 'Send'), ['class' => 'btn btn-success send-answer']) ?>
+ <?php ActiveForm::end() ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/modules/file/FileModule.php b/modules/file/FileModule.php
index 72bc269..7dc4691 100644
--- a/modules/file/FileModule.php
+++ b/modules/file/FileModule.php
@@ -3,6 +3,10 @@
class FileModule extends \yii\easyii\components\Module
{
+ public $settings = [
+ 'slugImmutable' => false
+ ];
+
public static $installConfig = [
'title' => [
'en' => 'Files',
diff --git a/modules/file/api/File.php b/modules/file/api/File.php
index 06f3635..dbf495f 100644
--- a/modules/file/api/File.php
+++ b/modules/file/api/File.php
@@ -4,6 +4,7 @@
use Yii;
use yii\data\ActiveDataProvider;
use yii\easyii\modules\file\models\File as FileModel;
+use yii\web\NotFoundHttpException;
use yii\widgets\LinkPager;
/**
@@ -20,31 +21,32 @@
class File extends \yii\easyii\components\API
{
private $_adp;
- private $_last;
- private $_items;
private $_item = [];
public function api_items($options = [])
{
- if(!$this->_items){
- $this->_items = [];
+ $result = [];
- $query = FileModel::find()->with('seo')->sort();
+ $query = FileModel::find()->with('seo');
- if(!empty($options['where'])){
- $query->where($options['where']);
- }
+ if(!empty($options['where'])){
+ $query->where($options['where']);
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sort();
+ }
- foreach($this->_adp->models as $model){
- $this->_items[] = new FileObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new FileObject($model);
}
- return $this->_items;
+ return $result;
}
public function api_get($id_slug)
@@ -57,10 +59,6 @@ public function api_get($id_slug)
public function api_last($limit = 1, $where = null)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
- }
-
$result = [];
$query = FileModel::find()->with('seo')->sort()->limit($limit);
@@ -70,13 +68,7 @@ public function api_last($limit = 1, $where = null)
foreach($query->all() as $item){
$result[] = new FileObject($item);
}
-
- if($limit > 1){
- return $result;
- } else {
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_pagination()
@@ -91,8 +83,14 @@ public function api_pages()
private function findFile($id_slug)
{
- $file = FileModel::find()->where(['or', 'file_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->one();
-
- return $file ? new FileObject($file) : null;
+ if(is_numeric($id_slug)) {
+ $condition = ['or', 'id=:id_slug', 'slug=:id_slug'];
+ } else {
+ $condition = 'slug=:id_slug';
+ }
+ if(!($file = FileModel::find()->where($condition, [':id_slug' => $id_slug])->one())){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return new FileObject($file);
}
}
\ No newline at end of file
diff --git a/modules/file/api/FileObject.php b/modules/file/api/FileObject.php
index cfe8039..ae1cbc9 100644
--- a/modules/file/api/FileObject.php
+++ b/modules/file/api/FileObject.php
@@ -12,8 +12,8 @@ class FileObject extends \yii\easyii\components\ApiObject
public $downloads;
public $time;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
public function getFile(){
diff --git a/modules/file/controllers/AController.php b/modules/file/controllers/AController.php
index fb7cbea..bf624b8 100644
--- a/modules/file/controllers/AController.php
+++ b/modules/file/controllers/AController.php
@@ -3,23 +3,27 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByNumAction;
use yii\widgets\ActiveForm;
use yii\web\UploadedFile;
-
use yii\easyii\components\Controller;
use yii\easyii\modules\file\models\File;
use yii\easyii\helpers\Upload;
-use yii\easyii\behaviors\SortableController;
class AController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\file\models\File';
+
+ public function actions()
{
return [
- [
- 'class' => SortableController::className(),
- 'model' => File::className()
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/file', 'File deleted')
],
+ 'up' => SortByNumAction::className(),
+ 'down' => SortByNumAction::className(),
];
}
@@ -47,7 +51,7 @@ public function actionCreate($slug = null)
{
$model->file = $fileInstanse;
if($model->validate(['file'])){
- $model->file = Upload::file($fileInstanse, 'files', false);
+ $model->file = Upload::file($fileInstanse, 'file', false);
$model->size = $fileInstanse->size;
if($model->save()){
@@ -79,12 +83,7 @@ public function actionCreate($slug = null)
public function actionEdit($id)
{
- $model = File::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -96,7 +95,7 @@ public function actionEdit($id)
{
$model->file = $fileInstanse;
if($model->validate(['file'])){
- $model->file = Upload::file($fileInstanse, 'files', false);
+ $model->file = Upload::file($fileInstanse, 'file', false);
$model->size = $fileInstanse->size;
$model->time = time();
}
@@ -124,24 +123,4 @@ public function actionEdit($id)
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = File::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/file', 'File deleted'));
- }
-
- public function actionUp($id)
- {
- return $this->move($id, 'up');
- }
-
- public function actionDown($id)
- {
- return $this->move($id, 'down');
- }
}
\ No newline at end of file
diff --git a/modules/file/controllers/DownloadController.php b/modules/file/controllers/DownloadController.php
index 8372277..2e18994 100644
--- a/modules/file/controllers/DownloadController.php
+++ b/modules/file/controllers/DownloadController.php
@@ -2,6 +2,7 @@
namespace yii\easyii\modules\file\controllers;
use Yii;
+use yii\easyii\helpers\Upload;
use yii\easyii\modules\file\models\File;
class DownloadController extends \yii\web\Controller
@@ -11,7 +12,7 @@ public function actionIndex($id)
$model = File::findOne($id);
if($model){
$model->updateCounters(['downloads' => 1]);
- Yii::$app->response->sendFile(Yii::getAlias('@webroot'). DIRECTORY_SEPARATOR .$model->file);
+ Yii::$app->response->sendFile(Upload::getAbsolutePath($model->file));
}
else{
throw new \yii\web\NotFoundHttpException(Yii::t('easyii/file/api', 'File not found'));
diff --git a/modules/file/messages/ru/api.php b/modules/file/messages/ru/api.php
deleted file mode 100644
index c81c626..0000000
--- a/modules/file/messages/ru/api.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
- 'Create file' => 'Создать файл',
- 'File not found' => 'Файл не найден'
-];
\ No newline at end of file
diff --git a/modules/file/models/File.php b/modules/file/models/File.php
index 332bf86..8a9c2a9 100644
--- a/modules/file/models/File.php
+++ b/modules/file/models/File.php
@@ -2,9 +2,11 @@
namespace yii\easyii\modules\file\models;
use Yii;
-use yii\behaviors\SluggableBehavior;
use yii\easyii\behaviors\SeoBehavior;
+use yii\easyii\behaviors\SlugBehavior;
use yii\easyii\behaviors\SortableModel;
+use yii\easyii\helpers\Upload;
+use yii\easyii\modules\file\FileModule;
class File extends \yii\easyii\components\ActiveRecord
{
@@ -42,18 +44,22 @@ public function behaviors()
SortableModel::className(),
'seoBehavior' => SeoBehavior::className(),
'sluggable' => [
- 'class' => SluggableBehavior::className(),
- 'attribute' => 'title',
- 'ensureUnique' => true
+ 'class' => SlugBehavior::className(),
+ 'immutable' => FileModule::setting('slugImmutable')
]
];
}
+ public function getLink()
+ {
+ return Upload::getFileUrl($this->file);
+ }
+
public function beforeSave($insert)
{
if (parent::beforeSave($insert)) {
if(!$insert && $this->file !== $this->oldAttributes['file']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['file']);
+ Upload::delete($this->oldAttributes['file']);
}
return true;
} else {
@@ -65,6 +71,6 @@ public function afterDelete()
{
parent::afterDelete();
- @unlink(Yii::getAlias('@webroot').$this->file);
+ Upload::delete($this->file);
}
}
\ No newline at end of file
diff --git a/modules/file/views/a/_form.php b/modules/file/views/a/_form.php
index f5f4268..5c4ca94 100644
--- a/modules/file/views/a/_form.php
+++ b/modules/file/views/a/_form.php
@@ -10,7 +10,7 @@
<?= $form->field($model, 'title') ?>
<?= $form->field($model, 'file')->fileInput() ?>
<?php if(!$model->isNewRecord) : ?>
- <div><a href="<?= $model->file ?>" target="_blank"><?= basename($model->file) ?></a> (<?= Yii::$app->formatter->asShortSize($model->size, 2) ?>)</div>
+ <div><a href="<?= $model->link ?>" target="_blank"><?= basename($model->file) ?></a> (<?= Yii::$app->formatter->asShortSize($model->size, 2) ?>)</div>
<br>
<?php endif; ?>
diff --git a/modules/file/views/a/index.php b/modules/file/views/a/index.php
index 420fe90..096b200 100644
--- a/modules/file/views/a/index.php
+++ b/modules/file/views/a/index.php
@@ -12,9 +12,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Title') ?></th>
<th width="100"><?= Yii::t('easyii/file', 'Size') ?></th>
<th width="130"><?= Yii::t('easyii/file', 'Downloads') ?></th>
@@ -25,9 +23,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
<td><?= Yii::$app->formatter->asShortSize($item->size, 2) ?></td>
<td><?= $item->downloads ?></td>
diff --git a/modules/gallery/GalleryModule.php b/modules/gallery/GalleryModule.php
index 58025ba..ab29744 100644
--- a/modules/gallery/GalleryModule.php
+++ b/modules/gallery/GalleryModule.php
@@ -6,6 +6,9 @@ class GalleryModule extends \yii\easyii\components\Module
public $settings = [
'categoryThumb' => true,
'itemsInFolder' => false,
+ 'categoryTags' => true,
+ 'categorySlugImmutable' => false,
+ 'categoryDescription' => true,
];
public static $installConfig = [
diff --git a/modules/gallery/api/CategoryObject.php b/modules/gallery/api/CategoryObject.php
index b7dc90f..522f574 100644
--- a/modules/gallery/api/CategoryObject.php
+++ b/modules/gallery/api/CategoryObject.php
@@ -11,18 +11,23 @@
class CategoryObject extends \yii\easyii\components\ApiObject
{
public $slug;
- public $image;
+ public $description;
public $tree;
public $depth;
+ public $parent;
private $_adp;
- private $_photos;
+ private $_children;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
- public function pages($options = []){
+ public function getTags(){
+ return $this->model->tagsArray;
+ }
+
+ public function getPages($options = []){
return $this->_adp ? LinkPager::widget(array_merge($options, ['pagination' => $this->_adp->pagination])) : '';
}
@@ -30,27 +35,36 @@ public function getPagination(){
return $this->_adp ? $this->_adp->pagination : null;
}
- public function photos($options = [])
+ public function getChildren()
+ {
+ if($this->_children === null) {
+ $this->_children = [];
+ foreach ($this->model->children as $child) {
+ $this->_children[] = Gallery::cat($child);
+ }
+ }
+ return $this->_children;
+ }
+
+ public function getPhotos($options = [])
{
- if(!$this->_photos){
- $this->_photos = [];
+ $result = [];
- $query = Photo::find()->where(['class' => Category::className(), 'item_id' => $this->id])->sort();
+ $query = Photo::find()->where(['class' => Category::className(), 'item_id' => $this->id])->sort();
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
- foreach($this->_adp->models as $model){
- $this->_photos[] = new PhotoObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new PhotoObject($model);
}
- return $this->_photos;
+ return $result;
}
public function getEditLink(){
diff --git a/modules/gallery/api/Gallery.php b/modules/gallery/api/Gallery.php
index 3d4404d..93372ec 100644
--- a/modules/gallery/api/Gallery.php
+++ b/modules/gallery/api/Gallery.php
@@ -6,6 +6,7 @@
use yii\easyii\models\Photo;
use yii\easyii\modules\gallery\models\Category;
use yii\easyii\widgets\Fancybox;
+use yii\web\NotFoundHttpException;
/**
* Gallery module API
@@ -25,12 +26,11 @@ class Gallery extends \yii\easyii\components\API
{
private $_cats;
private $_photos;
- private $_last;
public function api_cat($id_slug)
{
if(!isset($this->_cats[$id_slug])) {
- $this->_cats[$id_slug] = $this->findCategory($id_slug);
+ $this->_cats[$id_slug] = new CategoryObject(Category::get($id_slug));
}
return $this->_cats[$id_slug];
}
@@ -40,18 +40,25 @@ public function api_tree()
return Category::tree();
}
- public function api_cats()
+ public function api_cats($options = [])
{
- return Category::cats();
- }
+ $result = [];
+ foreach(Category::cats() as $model){
+ $result[] = new CategoryObject($model);
+ }
+ if(!empty($options['tags'])){
+ foreach($result as $i => $item){
+ if(!in_array($options['tags'], $item->tags)){
+ unset($result[$i]);
+ }
+ }
+ }
+ return $result;
+ }
public function api_last($limit = 1, $where = null)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
- }
-
$result = [];
$query = Photo::find()->where(['class' => Category::className()])->sort()->limit($limit);
@@ -64,13 +71,7 @@ public function api_last($limit = 1, $where = null)
$photoObject->rel = 'last';
$result[] = $photoObject;
}
-
- if($limit > 1){
- return $result;
- }else{
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_get($id)
@@ -89,15 +90,11 @@ public function api_plugin($options = [])
]);
}
- private function findCategory($id_slug)
- {
- $category = Category::find()->where(['or', 'category_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(Category::STATUS_ON)->one();
-
- return $category ? new CategoryObject($category) : null;
- }
-
private function findPhoto($id)
{
- return Photo::findOne($id);
+ if(!($photo = Photo::findOne($id))) {
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return new PhotoObject($photo);
}
}
\ No newline at end of file
diff --git a/modules/gallery/api/PhotoObject.php b/modules/gallery/api/PhotoObject.php
index 94b34c2..3868e3c 100644
--- a/modules/gallery/api/PhotoObject.php
+++ b/modules/gallery/api/PhotoObject.php
@@ -8,7 +8,6 @@
class PhotoObject extends \yii\easyii\components\ApiObject
{
- public $image;
public $description;
public $rel;
@@ -19,7 +18,7 @@ public function box($width, $height){
'rel' => 'album-' . ($this->rel ? $this->rel : $this->model->item_id),
'title' => $this->description
]);
- return LIVE_EDIT ? API::liveEdit($a, $this->editLink) : $a;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($a, $this->editLink) : $a;
}
public function getEditLink(){
diff --git a/modules/gallery/controllers/AController.php b/modules/gallery/controllers/AController.php
index 4f2017c..f5845eb 100644
--- a/modules/gallery/controllers/AController.php
+++ b/modules/gallery/controllers/AController.php
@@ -2,7 +2,6 @@
namespace yii\easyii\modules\gallery\controllers;
use yii\easyii\components\CategoryController;
-use yii\easyii\modules\gallery\models\Category;
class AController extends CategoryController
{
@@ -12,12 +11,8 @@ class AController extends CategoryController
public function actionPhotos($id)
{
- if(!($model = Category::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
return $this->render('photos', [
- 'model' => $model,
+ 'model' => $this->findCategory($id),
]);
}
}
\ No newline at end of file
diff --git a/modules/gallery/messages/ru/api.php b/modules/gallery/messages/ru/api.php
deleted file mode 100644
index a4ff7fc..0000000
--- a/modules/gallery/messages/ru/api.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return [
- 'Create album' => 'Создать альбом',
-];
\ No newline at end of file
diff --git a/modules/gallery/models/Category.php b/modules/gallery/models/Category.php
index 10544ce..910a342 100644
--- a/modules/gallery/models/Category.php
+++ b/modules/gallery/models/Category.php
@@ -12,7 +12,7 @@ public static function tableName()
public function getPhotos()
{
- return $this->hasMany(Photo::className(), ['item_id' => 'category_id'])->where(['class' => self::className()])->sort();
+ return $this->hasMany(Photo::className(), ['item_id' => 'id'])->where(['class' => self::className()])->sort();
}
public function afterDelete()
diff --git a/modules/guestbook/api/Guestbook.php b/modules/guestbook/api/Guestbook.php
index 399383b..1322663 100644
--- a/modules/guestbook/api/Guestbook.php
+++ b/modules/guestbook/api/Guestbook.php
@@ -3,7 +3,9 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\modules\guestbook\GuestbookModule;
use yii\helpers\Url;
+use yii\web\NotFoundHttpException;
use yii\widgets\LinkPager;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
@@ -27,8 +29,7 @@ class Guestbook extends \yii\easyii\components\API
const SENT_VAR = 'guestbook_sent';
private $_adp;
- private $_last;
- private $_items;
+ private $_item = [];
private $_defaultFormOptions = [
'errorUrl' => '',
@@ -37,50 +38,45 @@ class Guestbook extends \yii\easyii\components\API
public function api_items($options = [])
{
- if(!$this->_items){
- $this->_items = [];
+ $result = [];
- $query = GuestbookModel::find()->status(GuestbookModel::STATUS_ON)->sortDate();
+ $query = GuestbookModel::find()->status(GuestbookModel::STATUS_ON)->sortDate();
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
- foreach($this->_adp->models as $model){
- $this->_items[] = new PostObject($model);
- }
+ foreach($this->_adp->models as $model){
+ $result[] = new PostObject($model);
}
- return $this->_items;
+ return $result;
}
- public function api_last($limit = 1)
+ public function api_get($id)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
+ if(!isset($this->_item[$id])) {
+ $this->_item[$id] = $this->findPost($id);
}
+ return $this->_item[$id];
+ }
+ public function api_last($limit = 1)
+ {
$result = [];
foreach(GuestbookModel::find()->status(GuestbookModel::STATUS_ON)->sortDate()->limit($limit)->all() as $item){
$result[] = new PostObject($item);
}
-
- if($limit > 1){
- return $result;
- } else {
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_form($options = [])
{
$model = new GuestbookModel;
- $settings = Yii::$app->getModule('admin')->activeModules['guestbook']->settings;
$options = array_merge($this->_defaultFormOptions, $options);
ob_start();
@@ -94,12 +90,12 @@ public function api_form($options = [])
echo $form->field($model, 'name');
- if($settings['enableTitle']) echo $form->field($model, 'title');
- if($settings['enableEmail']) echo $form->field($model, 'email');
+ if(GuestbookModule::setting('enableTitle')) echo $form->field($model, 'title');
+ if(GuestbookModule::setting('enableEmail')) echo $form->field($model, 'email');
echo $form->field($model, 'text')->textarea();
- if($settings['enableCaptcha']) echo $form->field($model, 'reCaptcha')->widget(ReCaptcha::className());
+ if(GuestbookModule::setting('enableCaptcha')) echo $form->field($model, 'reCaptcha')->widget(ReCaptcha::className());
echo Html::submitButton(Yii::t('easyii', 'Send'), ['class' => 'btn btn-primary']);
ActiveForm::end();
@@ -127,4 +123,12 @@ public function api_pages()
{
return $this->_adp ? LinkPager::widget(['pagination' => $this->_adp->pagination]) : '';
}
+
+ private function findPost($id)
+ {
+ if(!($file = GuestbookModel::find()->where(['id' => ':id'], [':id' => $id])->status(GuestbookModel::STATUS_ON)->one())){
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
+ }
+ return new PostObject($file);
+ }
}
\ No newline at end of file
diff --git a/modules/guestbook/api/PostObject.php b/modules/guestbook/api/PostObject.php
index c61eeb3..a6824dc 100644
--- a/modules/guestbook/api/PostObject.php
+++ b/modules/guestbook/api/PostObject.php
@@ -10,20 +10,20 @@ class PostObject extends \yii\easyii\components\ApiObject
public $image;
public $time;
- public function getName(){
- return LIVE_EDIT ? API::liveEdit($this->model->name, $this->editLink) : $this->model->name;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getName(){
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->name, $this->getEditLink()) : $this->model->name;
}
public function getText(){
- return LIVE_EDIT ? API::liveEdit($this->model->text, $this->editLink, 'div') : $this->model->text;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->text, $this->getEditLink(), 'div') : $this->model->text;
}
public function getAnswer(){
- return LIVE_EDIT ? API::liveEdit($this->model->answer, $this->editLink, 'div') : $this->model->answer;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->answer, $this->getEditLink(), 'div') : $this->model->answer;
}
public function getDate(){
diff --git a/modules/guestbook/controllers/AController.php b/modules/guestbook/controllers/AController.php
index def22d1..9d88f49 100644
--- a/modules/guestbook/controllers/AController.php
+++ b/modules/guestbook/controllers/AController.php
@@ -3,23 +3,27 @@
use Yii;
use yii\data\ActiveDataProvider;
-
-use yii\easyii\behaviors\StatusController;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\DeleteAction;
use yii\easyii\components\Controller;
+use yii\easyii\models\Module;
use yii\easyii\modules\guestbook\models\Guestbook;
class AController extends Controller
{
+ public $modelClass = 'yii\easyii\modules\guestbook\models\Guestbook';
public $new = 0;
public $noAnswer = 0;
- public function behaviors()
+ public function actions()
{
return [
- [
- 'class' => StatusController::className(),
- 'model' => Guestbook::className()
- ]
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/guestbook', 'Entry deleted')
+ ],
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
@@ -56,52 +60,35 @@ public function actionNoanswer()
public function actionView($id)
{
- $model = Guestbook::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
- if($model->new > 0){
+ if ($model->new > 0) {
$model->new = 0;
$model->update();
}
if (Yii::$app->request->post('Guestbook')) {
$model->answer = trim(Yii::$app->request->post('Guestbook')['answer']);
- if($model->save($model)){
- if(Yii::$app->request->post('mailUser')){
+ if ($model->save($model)) {
+ if (Yii::$app->request->post('mailUser')) {
$model->notifyUser();
}
$this->flash('success', Yii::t('easyii/guestbook', 'Answer successfully saved'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
- }
- else {
+ } else {
return $this->render('view', [
'model' => $model
]);
}
}
- public function actionDelete($id)
- {
- if(($model = Guestbook::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/guestbook', 'Entry deleted'));
- }
-
public function actionViewall()
{
Guestbook::updateAll(['new' => 0]);
- $module = \yii\easyii\models\Module::findOne(['name' => 'guestbook']);
+ $module = Module::findOne(['name' => 'guestbook']);
$module->notice = 0;
$module->save();
@@ -112,30 +99,14 @@ public function actionViewall()
public function actionSetnew($id)
{
- $model = Guestbook::findOne($id);
+ $model = $this->findModel($id);
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- else{
- $model->new = 1;
- if($model->update()) {
- $this->flash('success', Yii::t('easyii/guestbook', 'Guestbook updated'));
- }
- else{
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- }
+ $model->new = 1;
+ if ($model->update()) {
+ $this->flash('success', Yii::t('easyii/guestbook', 'Guestbook updated'));
+ } else {
+ $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
- return $this->redirect($this->getReturnUrl(['/admin/'.$this->module->id]));
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, Guestbook::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, Guestbook::STATUS_OFF);
+ return $this->redirect($this->getReturnUrl(['/admin/' . $this->module->id]));
}
}
\ No newline at end of file
diff --git a/modules/guestbook/models/Guestbook.php b/modules/guestbook/models/Guestbook.php
index cc4010e..c8e719e 100644
--- a/modules/guestbook/models/Guestbook.php
+++ b/modules/guestbook/models/Guestbook.php
@@ -5,6 +5,7 @@
use yii\easyii\behaviors\CalculateNotice;
use yii\easyii\helpers\Mail;
use yii\easyii\models\Setting;
+use yii\easyii\modules\guestbook\GuestbookModule;
use yii\easyii\validators\ReCaptchaValidator;
use yii\easyii\validators\EscapeValidator;
use yii\helpers\Url;
@@ -31,7 +32,7 @@ public function rules()
['email', 'email'],
['title', 'string', 'max' => 128],
['reCaptcha', ReCaptchaValidator::className(), 'on' => 'send', 'when' => function(){
- return Yii::$app->getModule('admin')->activeModules['guestbook']->settings['enableCaptcha'];
+ return GuestbookModule::setting('enableCaptcha');
}],
];
}
@@ -43,7 +44,7 @@ public function beforeSave($insert)
$this->ip = Yii::$app->request->userIP;
$this->time = time();
$this->new = 1;
- $this->status = Yii::$app->getModule('admin')->activeModules['guestbook']->settings['preModerate'] ? self::STATUS_OFF : self::STATUS_ON;
+ $this->status = GuestbookModule::setting('preModerate') ? self::STATUS_OFF : self::STATUS_ON;
}
return true;
} else {
@@ -86,15 +87,13 @@ public function behaviors()
public function mailAdmin()
{
- $settings = Yii::$app->getModule('admin')->activeModules['guestbook']->settings;
-
- if(!$settings['mailAdminOnNewPost']){
+ if(!GuestbookModule::setting('mailAdminOnNewPost')){
return false;
}
return Mail::send(
Setting::get('admin_email'),
- $settings['subjectOnNewPost'],
- $settings['templateOnNewPost'],
+ GuestbookModule::setting('subjectOnNewPost'),
+ GuestbookModule::setting('templateOnNewPost'),
[
'post' => $this,
'link' => Url::to(['/admin/guestbook/a/view', 'id' => $this->primaryKey], true)
@@ -104,15 +103,13 @@ public function mailAdmin()
public function notifyUser()
{
- $settings = Yii::$app->getModule('admin')->activeModules['guestbook']->settings;
-
return Mail::send(
$this->email,
- $settings['subjectNotifyUser'],
- $settings['templateNotifyUser'],
+ GuestbookModule::setting('subjectNotifyUser'),
+ GuestbookModule::setting('templateNotifyUser'),
[
'post' => $this,
- 'link' => Url::to([$settings['frontendGuestbookRoute']], true)
+ 'link' => Url::to([GuestbookModule::setting('frontendGuestbookRoute')], true)
]
);
}
diff --git a/modules/guestbook/views/a/index.php b/modules/guestbook/views/a/index.php
index 3a810d5..ef01152 100644
--- a/modules/guestbook/views/a/index.php
+++ b/modules/guestbook/views/a/index.php
@@ -15,9 +15,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', $this->context->module->settings['enableTitle'] ? 'Title' : 'Text') ?></th>
<th width="150"><?= Yii::t('easyii', 'Date') ?></th>
<th width="100"><?= Yii::t('easyii/guestbook', 'Answer') ?></th>
@@ -28,9 +26,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td>
<?php if($item->new) : ?>
<span class="label label-warning">NEW</span>
diff --git a/modules/news/NewsModule.php b/modules/news/NewsModule.php
index d99df78..fc04595 100644
--- a/modules/news/NewsModule.php
+++ b/modules/news/NewsModule.php
@@ -8,7 +8,8 @@ class NewsModule extends \yii\easyii\components\Module
'enablePhotos' => true,
'enableShort' => true,
'shortMaxLength' => 256,
- 'enableTags' => true
+ 'enableTags' => true,
+ 'slugImmutable' => false
];
public static $installConfig = [
diff --git a/modules/news/api/News.php b/modules/news/api/News.php
index df81738..a2cdc78 100644
--- a/modules/news/api/News.php
+++ b/modules/news/api/News.php
@@ -4,7 +4,9 @@
use Yii;
use yii\data\ActiveDataProvider;
use yii\easyii\models\Tag;
+use yii\easyii\modules\news\NewsModule;
use yii\easyii\widgets\Fancybox;
+use yii\web\NotFoundHttpException;
use yii\widgets\LinkPager;
use yii\easyii\modules\news\models\News as NewsModel;
@@ -24,46 +26,42 @@
class News extends \yii\easyii\components\API
{
private $_adp;
- private $_last;
- private $_items;
private $_item = [];
public function api_items($options = [])
{
- if(!$this->_items){
- $this->_items = [];
-
- $with = ['seo'];
- if(Yii::$app->getModule('admin')->activeModules['news']->settings['enableTags']){
- $with[] = 'tags';
- }
- $query = NewsModel::find()->with($with)->status(NewsModel::STATUS_ON);
-
- if(!empty($options['where'])){
- $query->andFilterWhere($options['where']);
- }
- if(!empty($options['tags'])){
- $query
- ->innerJoinWith('tags', false)
- ->andWhere([Tag::tableName() . '.name' => (new NewsModel)->filterTagValues($options['tags'])])
- ->addGroupBy('news_id');
- }
- if(!empty($options['orderBy'])){
- $query->orderBy($options['orderBy']);
- } else {
- $query->sortDate();
- }
-
- $this->_adp = new ActiveDataProvider([
- 'query' => $query,
- 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
- ]);
-
- foreach($this->_adp->models as $model){
- $this->_items[] = new NewsObject($model);
- }
+ $result = [];
+
+ $with = ['seo'];
+ if(NewsModule::setting('enableTags')){
+ $with[] = 'tags';
+ }
+ $query = NewsModel::find()->with($with)->status(NewsModel::STATUS_ON);
+
+ if(!empty($options['where'])){
+ $query->andFilterWhere($options['where']);
+ }
+ if(!empty($options['tags'])){
+ $query
+ ->innerJoinWith('tags', false)
+ ->andWhere([Tag::tableName() . '.name' => (new NewsModel)->filterTagValues($options['tags'])])
+ ->addGroupBy('id');
}
- return $this->_items;
+ if(!empty($options['orderBy'])){
+ $query->orderBy($options['orderBy']);
+ } else {
+ $query->sortDate();
+ }
+
+ $this->_adp = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => !empty($options['pagination']) ? $options['pagination'] : []
+ ]);
+
+ foreach($this->_adp->models as $model){
+ $result[] = new NewsObject($model);
+ }
+ return $result;
}
public function api_get($id_slug)
@@ -76,12 +74,8 @@ public function api_get($id_slug)
public function api_last($limit = 1)
{
- if($limit === 1 && $this->_last){
- return $this->_last;
- }
-
$with = ['seo'];
- if(Yii::$app->getModule('admin')->activeModules['news']->settings['enableTags']){
+ if(NewsModule::setting('enableTags')){
$with[] = 'tags';
}
@@ -89,13 +83,7 @@ public function api_last($limit = 1)
foreach(NewsModel::find()->with($with)->status(NewsModel::STATUS_ON)->sortDate()->limit($limit)->all() as $item){
$result[] = new NewsObject($item);
}
-
- if($limit > 1){
- return $result;
- } else {
- $this->_last = count($result) ? $result[0] : null;
- return $this->_last;
- }
+ return $result;
}
public function api_plugin($options = [])
@@ -118,12 +106,15 @@ public function api_pages()
private function findNews($id_slug)
{
- $news = NewsModel::find()->where(['or', 'news_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->status(NewsModel::STATUS_ON)->one();
- if($news) {
- $news->updateCounters(['views' => 1]);
- return new NewsObject($news);
+ if(is_numeric($id_slug)) {
+ $condition = ['or', 'id=:id_slug', 'slug=:id_slug'];
} else {
- return null;
+ $condition = 'slug=:id_slug';
+ }
+ if(!($news = NewsModel::find()->where($condition, [':id_slug' => $id_slug])->status(NewsModel::STATUS_ON)->one())) {
+ throw new NotFoundHttpException(Yii::t('easyii', 'Not found'));
}
+ $news->updateCounters(['views' => 1]);
+ return new NewsObject($news);
}
}
\ No newline at end of file
diff --git a/modules/news/api/NewsObject.php b/modules/news/api/NewsObject.php
index c84e998..67b944a 100644
--- a/modules/news/api/NewsObject.php
+++ b/modules/news/api/NewsObject.php
@@ -10,22 +10,21 @@
class NewsObject extends \yii\easyii\components\ApiObject
{
public $slug;
- public $image;
public $views;
public $time;
private $_photos;
- public function getTitle(){
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
public function getShort(){
- return LIVE_EDIT ? API::liveEdit($this->model->short, $this->editLink) : $this->model->short;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->short, $this->getEditLink()) : $this->model->short;
}
public function getText(){
- return LIVE_EDIT ? API::liveEdit($this->model->text, $this->editLink, 'div') : $this->model->text;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->text, $this->getEditLink(), 'div') : $this->model->text;
}
public function getTags(){
diff --git a/modules/news/api/PhotoObject.php b/modules/news/api/PhotoObject.php
index eb4a696..74319bf 100644
--- a/modules/news/api/PhotoObject.php
+++ b/modules/news/api/PhotoObject.php
@@ -8,7 +8,6 @@
class PhotoObject extends \yii\easyii\components\ApiObject
{
- public $image;
public $description;
public function box($width, $height){
@@ -18,7 +17,7 @@ public function box($width, $height){
'rel' => 'news-'.$this->model->item_id,
'title' => $this->description
]);
- return LIVE_EDIT ? API::liveEdit($a, $this->editLink) : $a;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($a, $this->editLink) : $a;
}
public function getEditLink(){
diff --git a/modules/news/controllers/AController.php b/modules/news/controllers/AController.php
index 033ae24..add5153 100644
--- a/modules/news/controllers/AController.php
+++ b/modules/news/controllers/AController.php
@@ -3,28 +3,30 @@
use Yii;
use yii\data\ActiveDataProvider;
-use yii\easyii\behaviors\SortableDateController;
+use yii\easyii\actions\ChangeStatusAction;
+use yii\easyii\actions\ClearImageAction;
+use yii\easyii\actions\DeleteAction;
+use yii\easyii\actions\SortByDateAction;
use yii\widgets\ActiveForm;
-use yii\web\UploadedFile;
-
use yii\easyii\components\Controller;
use yii\easyii\modules\news\models\News;
-use yii\easyii\helpers\Image;
-use yii\easyii\behaviors\StatusController;
class AController extends Controller
{
- public function behaviors()
+ public $modelClass = 'yii\easyii\modules\news\models\News';
+
+ public function actions()
{
return [
- [
- 'class' => SortableDateController::className(),
- 'model' => News::className(),
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/news', 'News deleted')
],
- [
- 'class' => StatusController::className(),
- 'model' => News::className()
- ]
+ 'clear-image' => ClearImageAction::className(),
+ 'up' => SortByDateAction::className(),
+ 'down' => SortByDateAction::className(),
+ 'on' => ChangeStatusAction::className(),
+ 'off' => ChangeStatusAction::className(),
];
}
@@ -50,15 +52,6 @@ public function actionCreate()
return ActiveForm::validate($model);
}
else{
- if(isset($_FILES) && $this->module->settings['enableThumb']){
- $model->image = UploadedFile::getInstance($model, 'image');
- if($model->image && $model->validate(['image'])){
- $model->image = Image::upload($model->image, 'news');
- }
- else{
- $model->image = '';
- }
- }
if($model->save()){
$this->flash('success', Yii::t('easyii/news', 'News created'));
return $this->redirect(['/admin/'.$this->module->id]);
@@ -78,12 +71,7 @@ public function actionCreate()
public function actionEdit($id)
{
- $model = News::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
if(Yii::$app->request->isAjax){
@@ -91,16 +79,6 @@ public function actionEdit($id)
return ActiveForm::validate($model);
}
else{
- if(isset($_FILES) && $this->module->settings['enableThumb']){
- $model->image = UploadedFile::getInstance($model, 'image');
- if($model->image && $model->validate(['image'])){
- $model->image = Image::upload($model->image, 'news');
- }
- else{
- $model->image = $model->oldAttributes['image'];
- }
- }
-
if($model->save()){
$this->flash('success', Yii::t('easyii/news', 'News updated'));
}
@@ -119,61 +97,8 @@ public function actionEdit($id)
public function actionPhotos($id)
{
- if(!($model = News::findOne($id))){
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
return $this->render('photos', [
- 'model' => $model,
+ 'model' => $this->findModel($id),
]);
}
-
- public function actionDelete($id)
- {
- if(($model = News::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/news', 'News deleted'));
- }
-
- public function actionClearImage($id)
- {
- $model = News::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- }
- else{
- $model->image = '';
- if($model->update()){
- @unlink(Yii::getAlias('@webroot').$model->image);
- $this->flash('success', Yii::t('easyii', 'Image cleared'));
- } else {
- $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
- }
- }
- return $this->back();
- }
-
- public function actionUp($id)
- {
- return $this->move($id, 'up');
- }
-
- public function actionDown($id)
- {
- return $this->move($id, 'down');
- }
-
- public function actionOn($id)
- {
- return $this->changeStatus($id, News::STATUS_ON);
- }
-
- public function actionOff($id)
- {
- return $this->changeStatus($id, News::STATUS_OFF);
- }
}
\ No newline at end of file
diff --git a/modules/news/models/News.php b/modules/news/models/News.php
index 54978f2..f7391c9 100644
--- a/modules/news/models/News.php
+++ b/modules/news/models/News.php
@@ -2,12 +2,28 @@
namespace yii\easyii\modules\news\models;
use Yii;
-use yii\behaviors\SluggableBehavior;
+use yii\easyii\behaviors\ImageFile;
use yii\easyii\behaviors\SeoBehavior;
+use yii\easyii\behaviors\SlugBehavior;
use yii\easyii\behaviors\Taggable;
use yii\easyii\models\Photo;
+use yii\easyii\modules\news\NewsModule;
use yii\helpers\StringHelper;
+/**
+ * @property integer $id
+ * @property string $title
+ * @property string $short
+ * @property string $text
+ * @property string $image_file
+ * @property string $slug
+ * @property integer $time
+ * @property integer $views
+ * @property integer $status
+ *
+ * @property string $image
+ */
+
class News extends \yii\easyii\components\ActiveRecord
{
const STATUS_OFF = 0;
@@ -24,7 +40,7 @@ public function rules()
[['text', 'title'], 'required'],
[['title', 'short', 'text'], 'trim'],
['title', 'string', 'max' => 128],
- ['image', 'image'],
+ ['image_file', 'image'],
[['views', 'time', 'status'], 'integer'],
['time', 'default', 'value' => time()],
['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
@@ -40,7 +56,7 @@ public function attributeLabels()
'title' => Yii::t('easyii', 'Title'),
'text' => Yii::t('easyii', 'Text'),
'short' => Yii::t('easyii/news', 'Short'),
- 'image' => Yii::t('easyii', 'Image'),
+ 'image_file' => Yii::t('easyii', 'Image'),
'time' => Yii::t('easyii', 'Date'),
'slug' => Yii::t('easyii', 'Slug'),
'tagNames' => Yii::t('easyii', 'Tags'),
@@ -49,33 +65,32 @@ public function attributeLabels()
public function behaviors()
{
- return [
+ $behaviors = [
'seoBehavior' => SeoBehavior::className(),
'taggabble' => Taggable::className(),
'sluggable' => [
- 'class' => SluggableBehavior::className(),
- 'attribute' => 'title',
- 'ensureUnique' => true
+ 'class' => SlugBehavior::className(),
+ 'immutable' => NewsModule::setting('slugImmutable')
],
];
+
+ if(NewsModule::setting('enableThumb')){
+ $behaviors['imageFileBehavior'] = ImageFile::className();
+ }
+
+ return $behaviors;
}
public function getPhotos()
{
- return $this->hasMany(Photo::className(), ['item_id' => 'news_id'])->where(['class' => self::className()])->sort();
+ return $this->hasMany(Photo::className(), ['item_id' => 'id'])->where(['class' => self::className()])->sort();
}
-
-
public function beforeSave($insert)
{
if (parent::beforeSave($insert)) {
- $settings = Yii::$app->getModule('admin')->activeModules['news']->settings;
- $this->short = StringHelper::truncate($settings['enableShort'] ? $this->short : strip_tags($this->text), $settings['shortMaxLength']);
+ $this->short = StringHelper::truncate(NewsModule::setting('enableShort') ? $this->short : strip_tags($this->text), NewsModule::setting('shortMaxLength'));
- if(!$insert && $this->image != $this->oldAttributes['image'] && $this->oldAttributes['image']){
- @unlink(Yii::getAlias('@webroot').$this->oldAttributes['image']);
- }
return true;
} else {
return false;
@@ -86,10 +101,6 @@ public function afterDelete()
{
parent::afterDelete();
- if($this->image){
- @unlink(Yii::getAlias('@webroot').$this->image);
- }
-
foreach($this->getPhotos()->all() as $photo){
$photo->delete();
}
diff --git a/modules/news/views/a/_form.php b/modules/news/views/a/_form.php
index 22963de..c1fe322 100644
--- a/modules/news/views/a/_form.php
+++ b/modules/news/views/a/_form.php
@@ -5,7 +5,6 @@
use yii\helpers\Html;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
use yii\easyii\widgets\SeoForm;
$module = $this->context->module->id;
@@ -16,24 +15,17 @@
]); ?>
<?= $form->field($model, 'title') ?>
<?php if($this->context->module->settings['enableThumb']) : ?>
- <?php if($model->image) : ?>
- <img src="<?= Image::thumb($model->image, 240) ?>">
- <a href="<?= Url::to(['/admin/'.$module.'/a/clear-image', 'id' => $model->news_id]) ?>" class="text-danger confirm-delete" title="<?= Yii::t('easyii', 'Clear image')?>"><?= Yii::t('easyii', 'Clear image')?></a>
+ <?php if($model->image_file) : ?>
+ <a href="<?= $model->image ?>" class="fancybox"><img src="<?= Image::thumb($model->image_file, 240, 180) ?>"></a>
+ <a href="<?= Url::to(['/admin/'.$module.'/a/clear-image', 'id' => $model->id]) ?>" class="text-danger confirm-delete" title="<?= Yii::t('easyii', 'Clear image')?>"><?= Yii::t('easyii', 'Clear image')?></a>
<?php endif; ?>
- <?= $form->field($model, 'image')->fileInput() ?>
+ <?= $form->field($model, 'image_file')->fileInput() ?>
<?php endif; ?>
<?php if($this->context->module->settings['enableShort']) : ?>
<?= $form->field($model, 'short')->textarea() ?>
<?php endif; ?>
-<?= $form->field($model, 'text')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 400,
- 'imageUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'news']),
- 'fileUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'news']),
- 'plugins' => ['fullscreen']
- ]
-]) ?>
+<?= $form->field($model, 'text')->widget(\yii\easyii\widgets\Redactor::className()) ?>
<?= $form->field($model, 'time')->widget(DateTimePicker::className()); ?>
<?php if($this->context->module->settings['enableTags']) : ?>
diff --git a/modules/news/views/a/_submenu.php b/modules/news/views/a/_submenu.php
index c080edc..050bc35 100644
--- a/modules/news/views/a/_submenu.php
+++ b/modules/news/views/a/_submenu.php
@@ -1,4 +1,5 @@
<?php
+use yii\easyii\modules\news\NewsModule;
use yii\helpers\Url;
$action = $this->context->action->id;
@@ -7,6 +8,8 @@
<ul class="nav nav-tabs">
<li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii/news', 'Edit news') ?></a></li>
- <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php if(NewsModule::setting('enablePhotos')) : ?>
+ <li <?= ($action === 'photos') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/photos', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-camera"></span> <?= Yii::t('easyii', 'Photos') ?></a></li>
+ <?php endif; ?>
</ul>
<br>
\ No newline at end of file
diff --git a/modules/news/views/a/index.php b/modules/news/views/a/index.php
index 7165a29..02faefd 100644
--- a/modules/news/views/a/index.php
+++ b/modules/news/views/a/index.php
@@ -14,9 +14,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Title') ?></th>
<th width="120"><?= Yii::t('easyii', 'Views') ?></th>
<th width="100"><?= Yii::t('easyii', 'Status') ?></th>
@@ -26,9 +24,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr data-id="<?= $item->primaryKey ?>">
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/edit/', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
<td><?= $item->views ?></td>
<td class="status">
diff --git a/modules/page/PageModule.php b/modules/page/PageModule.php
index 93f9dea..a487cc4 100644
--- a/modules/page/PageModule.php
+++ b/modules/page/PageModule.php
@@ -5,6 +5,11 @@
class PageModule extends \yii\easyii\components\Module
{
+ public $settings = [
+ 'slugImmutable' => true,
+ 'defaultFields' => '[]'
+ ];
+
public static $installConfig = [
'title' => [
'en' => 'Pages',
diff --git a/modules/page/api/Page.php b/modules/page/api/Page.php
index 8522dae..9ef53d2 100644
--- a/modules/page/api/Page.php
+++ b/modules/page/api/Page.php
@@ -4,6 +4,7 @@
use Yii;
use yii\easyii\modules\page\models\Page as PageModel;
use yii\helpers\Html;
+use yii\web\NotFoundHttpException;
/**
* Page module API
@@ -24,18 +25,72 @@ public function api_get($id_slug)
return $this->_pages[$id_slug];
}
+ public function api_menu()
+ {
+ $result = [];
+ foreach(PageModel::tree() as $page) {
+ if($page->show_in_menu)
+ {
+ $temp = $this->buildMenuItem($page);
+ $temp['children'] = [];
+ if (!empty($page->children)) {
+ foreach ($page->children as $child) {
+ if($child->show_in_menu) {
+ $temp['children'][] = $this->buildMenuItem($child);
+ }
+ }
+ }
+ $result[] = $temp;
+ }
+ }
+ return $result;
+ }
+
private function findPage($id_slug)
{
- $page = PageModel::find()->where(['or', 'page_id=:id_slug', 'slug=:id_slug'], [':id_slug' => $id_slug])->one();
+ try {
+ $result = new PageObject(PageModel::get($id_slug));
+ } catch (NotFoundHttpException $e) {
+ $result = $this->notFound($id_slug);
+ }
- return $page ? new PageObject($page) : $this->notFound($id_slug);
+ return $result;
}
private function notFound($id_slug)
{
- $page = new PageModel([
- 'slug' => $id_slug
- ]);
- return new PageObject($page);
+ $config = ['slug' => $id_slug];
+ if(IS_ROOT && preg_match(PageModel::$SLUG_PATTERN, $id_slug)){
+ $config['title'] = $config['text'] = Html::a(Yii::t('easyii/page/api', 'Create page'), ['/admin/page/a/create', 'slug' => $id_slug], ['target' => '_blank']);
+ } else {
+ throw new NotFoundHttpException(Yii::t('easyii', 'Page not found'));
+ }
+ return new PageObject(new PageModel($config));
+ }
+
+ private function buildMenuItem($page)
+ {
+ $result = [
+ 'label' => $page->title,
+ 'active' => false
+ ];
+ $controller = Yii::$app->controller;
+
+ if($page->slug == 'index') {
+ $result['url'] = \yii\helpers\Url::home();
+ if($controller->id == 'site' && $controller->action->id == 'index') {
+ $result['active'] = true;
+ }
+ } else {
+ if($page->depth == 0) {
+ $result['url'] = \yii\helpers\Url::to(['/' . $page->slug]);
+ if($controller->id == $page->slug) {
+ $result['active'] = true;
+ }
+ } else {
+ $result['url'] = \yii\helpers\Url::to(['/' . PageModel::get($page->parent)->slug . '/' . $page->slug]);
+ }
+ }
+ return $result;
}
}
\ No newline at end of file
diff --git a/modules/page/api/PageObject.php b/modules/page/api/PageObject.php
index ea5a054..ed759fd 100644
--- a/modules/page/api/PageObject.php
+++ b/modules/page/api/PageObject.php
@@ -1,36 +1,60 @@
<?php
namespace yii\easyii\modules\page\api;
-use Yii;
use yii\easyii\components\API;
-use yii\helpers\Html;
use yii\helpers\Url;
class PageObject extends \yii\easyii\components\ApiObject
{
+ public $data;
public $slug;
+ private $_children;
+ private $_parent;
- public function getTitle(){
- if($this->model->isNewRecord){
- return $this->createLink;
- } else {
- return LIVE_EDIT ? API::liveEdit($this->model->title, $this->editLink) : $this->model->title;
- }
+ public function getTitle($liveEditable = true){
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($this->model->title, $this->getEditLink()) : $this->model->title;
}
public function getText(){
- if($this->model->isNewRecord){
- return $this->createLink;
- } else {
- return LIVE_EDIT ? API::liveEdit($this->model->text, $this->editLink, 'div') : $this->model->text;
+ return LIVE_EDIT_ENABLED ? API::liveEdit($this->model->text, $this->getEditLink(), 'div') : $this->model->text;
+ }
+
+ public function getParent()
+ {
+ if($this->_parent === null) {
+ $this->_parent = $this->model->parent ? Page::get($this->model->parent) : false;
+ }
+ return $this->_parent;
+ }
+
+ public function getChildren()
+ {
+ if($this->_children === null) {
+ $this->_children = [];
+ foreach ($this->model->children as $child) {
+ $this->_children[] = Page::get($child);
+ }
}
+ return $this->_children;
}
public function getEditLink(){
return Url::to(['/admin/page/a/edit/', 'id' => $this->id]);
}
- public function getCreateLink(){
- return Html::a(Yii::t('easyii/page/api', 'Create page'), ['/admin/page/a/create', 'slug' => $this->slug], ['target' => '_blank']);
+ public function __get($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return $this->data->{$name};
+ }
+ return parent::__get($name);
+ }
+
+ public function __isset($name)
+ {
+ if(is_object($this->data) && property_exists($this->data, $name)){
+ return true;
+ }
+ return parent::__isset($name);
}
}
\ No newline at end of file
diff --git a/modules/page/controllers/AController.php b/modules/page/controllers/AController.php
index abf30ad..e39e6f8 100644
--- a/modules/page/controllers/AController.php
+++ b/modules/page/controllers/AController.php
@@ -2,93 +2,150 @@
namespace yii\easyii\modules\page\controllers;
use Yii;
-use yii\data\ActiveDataProvider;
+use yii\easyii\behaviors\Fields;
+use yii\easyii\behaviors\SortableModel;
+use yii\easyii\components\CategoryController;
+use yii\easyii\modules\page\PageModule;
use yii\widgets\ActiveForm;
-
-use yii\easyii\components\Controller;
use yii\easyii\modules\page\models\Page;
-class AController extends Controller
+class AController extends CategoryController
{
- public $rootActions = ['create', 'delete'];
+ public $categoryClass = 'yii\easyii\modules\page\models\Page';
+ public $modelClass = 'yii\easyii\modules\page\models\Page';
+
+ public function behaviors()
+ {
+ return [
+ 'fields' => Fields::className()
+ ];
+ }
public function actionIndex()
{
- $data = new ActiveDataProvider([
- 'query' => Page::find()->desc()
- ]);
return $this->render('index', [
- 'data' => $data
+ 'pages' => Page::cats()
]);
}
- public function actionCreate($slug = null)
+ /**
+ * Create form
+ *
+ * @param null $parent
+ * @return array|string|\yii\web\Response
+ * @throws \yii\web\HttpException
+ */
+ public function actionCreate($slug = null, $parent = null)
{
$model = new Page;
+ $fields = [];
+ if($parent && ($parentPage = Page::findOne($parent))) {
+ $fields = $parentPage->fields;
+ } elseif(PageModule::setting('defaultFields')) {
+ $settingFields = json_decode(PageModule::setting('defaultFields'));
+ if(!json_last_error() && $settingFields && is_array($settingFields) && count($settingFields)){
+ $fields = $settingFields;
+ }
+ }
+ $model->fields = $fields;
+ $model->slug = $slug;
+
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ $model->status = Page::STATUS_ON;
+ $model->data = $this->parseData($model);
+
+ if ($model->create(Yii::$app->request->post('parent', null))) {
$this->flash('success', Yii::t('easyii/page', 'Page created'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
- else{
+ return $this->redirect(['/admin/page', 'id' => $model->primaryKey]);
+ } else {
$this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
return $this->refresh();
}
}
- }
- else {
- if($slug) $model->slug = $slug;
-
+ } else {
return $this->render('create', [
- 'model' => $model
+ 'model' => $model,
+ 'dataForm' => $this->generateForm($model->fields),
+ 'parent' => $parent
]);
}
}
+ /**
+ * Edit form
+ *
+ * @param $id
+ * @return array|string|\yii\web\Response
+ * @throws \yii\web\HttpException
+ */
public function actionEdit($id)
{
- $model = Page::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ $model->data = $this->parseData($model);
+
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii/page', 'Page updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
- }
- else {
+ } else {
return $this->render('edit', [
- 'model' => $model
+ 'model' => $model,
+ 'dataForm' => $this->generateForm($model->fields, $model->data),
]);
}
}
- public function actionDelete($id)
+ /**
+ * Copy page
+ *
+ * @param $id
+ * @return array|string|\yii\web\Response
+ * @throws \yii\web\HttpException
+ */
+ public function actionCopy($id)
{
- if(($model = Page::findOne($id))){
- $model->delete();
+ $model = new Page();
+ $model->load($this->findModel($id)->attributes, '');
+ $model->slug = null;
+
+ if ($model->create()) {
+ $this->flash('success', Yii::t('easyii/page', 'Page copied'));
} else {
- $this->error = Yii::t('easyii', 'Not found');
+ $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
}
+ return $this->back();
+ }
+
+ /**
+ * Delete the category by ID
+ *
+ * @param $id
+ * @return mixed
+ */
+ public function actionDelete($id)
+ {
+ $model = $this->findModel($id);
+
+ $children = $model->children()->all();
+ $model->deleteWithChildren();
+ foreach ($children as $child) {
+ $child->afterDelete();
+ }
+
return $this->formatResponse(Yii::t('easyii/page', 'Page deleted'));
}
}
\ No newline at end of file
diff --git a/modules/page/messages/ru/admin.php b/modules/page/messages/ru/admin.php
index 7ee5a71..8091096 100644
--- a/modules/page/messages/ru/admin.php
+++ b/modules/page/messages/ru/admin.php
@@ -4,6 +4,11 @@
'Create page' => 'Создать страницу',
'Edit page' => 'Редактировать страницу',
'Page created' => 'Страница успешно создана',
+ 'Page copied' => 'Страница успешно скопирована',
'Page updated' => 'Страница обновлена',
- 'Page deleted' => 'Страница удалена'
+ 'Page deleted' => 'Страница удалена',
+ 'Add subpage' => 'Добавить подстраницу',
+ 'Copy page' => 'Копировать страницу',
+ 'Parent page' => 'Родительская страница',
+ 'Show in menu' => 'Показывать в меню'
];
\ No newline at end of file
diff --git a/modules/page/messages/ru/api.php b/modules/page/messages/ru/api.php
index ed7ff33..8ed42db 100644
--- a/modules/page/messages/ru/api.php
+++ b/modules/page/messages/ru/api.php
@@ -1,4 +1,5 @@
<?php
return [
'Create page' => 'Создать страницу',
+ 'Page not found' => 'Страница не найдена',
];
\ No newline at end of file
diff --git a/modules/page/models/Page.php b/modules/page/models/Page.php
index d8e8396..9822c58 100644
--- a/modules/page/models/Page.php
+++ b/modules/page/models/Page.php
@@ -2,9 +2,15 @@
namespace yii\easyii\modules\page\models;
use Yii;
+use yii\easyii\behaviors\CacheFlush;
+use yii\easyii\behaviors\JsonColumns;
use yii\easyii\behaviors\SeoBehavior;
+use yii\easyii\behaviors\SlugBehavior;
+use yii\easyii\components\CategoryWithFieldsModel;
+use creocoder\nestedsets\NestedSetsBehavior;
+use yii\easyii\modules\page\PageModule;
-class Page extends \yii\easyii\components\ActiveRecord
+class Page extends CategoryWithFieldsModel
{
public static function tableName()
{
@@ -19,7 +25,10 @@ public function rules()
['title', 'string', 'max' => 128],
['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
['slug', 'default', 'value' => null],
- ['slug', 'unique'],
+ [['status', 'show_in_menu'], 'integer'],
+ ['status', 'default', 'value' => self::STATUS_ON],
+ [['fields', 'data'], 'safe'],
+ ['show_in_menu', 'default', 'value' => 0],
];
}
@@ -29,13 +38,30 @@ public function attributeLabels()
'title' => Yii::t('easyii', 'Title'),
'text' => Yii::t('easyii', 'Text'),
'slug' => Yii::t('easyii', 'Slug'),
+ 'show_in_menu' => Yii::t('easyii/page', 'Show in menu'),
];
}
public function behaviors()
{
return [
+ 'cacheflush' => [
+ 'class' => CacheFlush::className(),
+ 'key' => [static::tableName().'_tree', static::tableName().'_flat']
+ ],
'seoBehavior' => SeoBehavior::className(),
+ 'sluggable' => [
+ 'class' => SlugBehavior::className(),
+ 'immutable' => PageModule::setting('slugImmutable')
+ ],
+ 'nestedSets' => [
+ 'class' => NestedSetsBehavior::className(),
+ 'treeAttribute' => 'tree'
+ ],
+ 'jsonColumns' => [
+ 'class' => JsonColumns::className(),
+ 'columns' => ['fields', 'data']
+ ],
];
}
}
\ No newline at end of file
diff --git a/modules/page/views/a/_form.php b/modules/page/views/a/_form.php
index 36b7b9b..01e65a0 100644
--- a/modules/page/views/a/_form.php
+++ b/modules/page/views/a/_form.php
@@ -1,8 +1,7 @@
<?php
+use yii\easyii\modules\page\models\Page;
use yii\helpers\Html;
-use yii\helpers\Url;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
use yii\easyii\widgets\SeoForm;
?>
<?php $form = ActiveForm::begin([
@@ -10,14 +9,28 @@
'options' => ['class' => 'model-form']
]); ?>
<?= $form->field($model, 'title') ?>
-<?= $form->field($model, 'text')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 400,
- 'imageUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'pages']),
- 'fileUpload' => Url::to(['/admin/redactor/upload', 'dir' => 'pages']),
- 'plugins' => ['fullscreen']
- ]
-]) ?>
+
+<?php if(!empty($parent)) : ?>
+ <div class="form-group field-category-title required">
+ <label for="category-parent" class="control-label"><?= Yii::t('easyii/page', 'Parent page') ?></label>
+ <select class="form-control" id="category-parent" name="parent">
+ <option value="" class="smooth"><?= Yii::t('easyii', 'No') ?></option>
+ <?php foreach(Page::cats() as $node) : ?>
+ <option
+ value="<?= $node->id ?>"
+ <?php if($parent == $node->id) echo 'SELECTED' ?>
+ style="padding-left: <?= $node['depth'] * 20 ?>px;"
+ ><?= $node->title ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+<?php endif; ?>
+
+<?= $form->field($model, 'text')->widget(\yii\easyii\widgets\Redactor::className()) ?>
+
+<?= $dataForm ?>
+
+<?= $form->field($model, 'show_in_menu')->checkbox() ?>
<?php if(IS_ROOT) : ?>
<?= $form->field($model, 'slug') ?>
diff --git a/modules/catalog/views/a/_submenu.php b/modules/page/views/a/_submenu.php
similarity index 90%
rename from modules/catalog/views/a/_submenu.php
rename to modules/page/views/a/_submenu.php
index 673c9e1..19aff42 100644
--- a/modules/catalog/views/a/_submenu.php
+++ b/modules/page/views/a/_submenu.php
@@ -7,7 +7,7 @@
<?php if(IS_ROOT) : ?>
<ul class="nav nav-tabs">
<li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii', 'Edit') ?></a></li>
- <li <?= ($action === 'fields') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/fields', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-cog"></span> <?= Yii::t('easyii/catalog', 'Fields') ?></a></li>
+ <li <?= ($action === 'fields') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/fields', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-cog"></span> <?= Yii::t('easyii', 'Fields') ?></a></li>
</ul>
<br>
<?php endif;?>
\ No newline at end of file
diff --git a/modules/page/views/a/create.php b/modules/page/views/a/create.php
index 27cae30..134ed4c 100644
--- a/modules/page/views/a/create.php
+++ b/modules/page/views/a/create.php
@@ -2,4 +2,4 @@
$this->title = Yii::t('easyii/page', 'Create page');
?>
<?= $this->render('_menu') ?>
-<?= $this->render('_form', ['model' => $model]) ?>
\ No newline at end of file
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm, 'parent' => $parent]) ?>
\ No newline at end of file
diff --git a/modules/page/views/a/edit.php b/modules/page/views/a/edit.php
index c20b668..d3c6fa5 100644
--- a/modules/page/views/a/edit.php
+++ b/modules/page/views/a/edit.php
@@ -2,4 +2,5 @@
$this->title = Yii::t('easyii/page', 'Edit page');
?>
<?= $this->render('_menu') ?>
-<?= $this->render('_form', ['model' => $model]) ?>
\ No newline at end of file
+<?= $this->render('_submenu', ['model' => $model]); ?>
+<?= $this->render('_form', ['model' => $model, 'dataForm' => $dataForm]) ?>
\ No newline at end of file
diff --git a/modules/page/views/a/index.php b/modules/page/views/a/index.php
index c71fd6b..65d2831 100644
--- a/modules/page/views/a/index.php
+++ b/modules/page/views/a/index.php
@@ -1,45 +1,52 @@
<?php
+use yii\easyii\components\CategoryModel;
use yii\helpers\Url;
+\yii\bootstrap\BootstrapPluginAsset::register($this);
+
$this->title = Yii::t('easyii/page', 'Pages');
$module = $this->context->module->id;
+$baseUrl = '/admin/' . $module;
?>
<?= $this->render('_menu') ?>
-<?php if($data->count > 0) : ?>
+<?php if(sizeof($pages) > 0) : ?>
<table class="table table-hover">
- <thead>
- <tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
- <th><?= Yii::t('easyii', 'Title')?></th>
- <?php if(IS_ROOT) : ?>
- <th><?= Yii::t('easyii', 'Slug')?></th>
- <th width="30"></th>
- <?php endif; ?>
- </tr>
- </thead>
<tbody>
- <?php foreach($data->models as $item) : ?>
+ <?php foreach($pages as $page) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
- <td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><?= $item->title ?></a></td>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->slug ?></td>
- <td><a href="<?= Url::to(['/admin/'.$module.'/a/delete', 'id' => $item->primaryKey]) ?>" class="glyphicon glyphicon-remove confirm-delete" title="<?= Yii::t('easyii', 'Delete item')?>"></a></td>
- <?php endif; ?>
+ <td width="50"><?= $page->id ?></td>
+ <td style="padding-left: <?= $page->depth * 20 ?>px;">
+ <?php if(count($page->children)) : ?>
+ <i class="caret"></i>
+ <?php endif; ?>
+ <a href="<?= Url::to(['/admin/page/a/edit', 'id' => $page->id]) ?>" <?= ($page->status == CategoryModel::STATUS_OFF ? 'class="smooth"' : '') ?>><?= $page->title ?></a>
+ </td>
+ <td width="120" class="text-right">
+ <div class="dropdown actions">
+ <i id="dropdownMenu<?= $page->id ?>" data-toggle="dropdown" aria-expanded="true" title="<?= Yii::t('easyii', 'Actions') ?>" class="glyphicon glyphicon-menu-hamburger"></i>
+ <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenu<?= $page->id ?>">
+ <li><a href="<?= Url::to(['/admin/page/a/create', 'parent' => $page->id]) ?>"><i class="glyphicon glyphicon-plus font-12"></i> <?= Yii::t('easyii/page', 'Add subpage') ?></a></li>
+ <li><a href="<?= Url::to(['/admin/page/a/copy', 'id' => $page->id]) ?>"><i class="glyphicon glyphicon-duplicate font-12"></i> <?= Yii::t('easyii/page', 'Copy page') ?></a></li>
+ <li role="presentation" class="divider"></li>
+ <li><a href="<?= Url::to(['/admin/page/a/up', 'id' => $page->id]) ?>"><i class="glyphicon glyphicon-arrow-up font-12"></i> <?= Yii::t('easyii', 'Move up') ?></a></li>
+ <li><a href="<?= Url::to(['/admin/page/a/down', 'id' => $page->id]) ?>"><i class="glyphicon glyphicon-arrow-down font-12"></i> <?= Yii::t('easyii', 'Move down') ?></a></li>
+ <li role="presentation" class="divider"></li>
+ <?php if($page->status == CategoryModel::STATUS_ON) :?>
+ <li><a href="<?= Url::to(['/admin/page/a/off', 'id' => $page->id]) ?>" title="<?= Yii::t('easyii', 'Turn Off') ?>'"><i class="glyphicon glyphicon-eye-close font-12"></i> <?= Yii::t('easyii', 'Turn Off') ?></a></li>
+ <?php else : ?>
+ <li><a href="<?= Url::to(['/admin/page/a/on', 'id' => $page->id]) ?>" title="<?= Yii::t('easyii', 'Turn On') ?>"><i class="glyphicon glyphicon-eye-open font-12"></i> <?= Yii::t('easyii', 'Turn On') ?></a></li>
+ <?php endif; ?>
+ <li><a href="<?= Url::to(['/admin/page/a/delete', 'id' => $page->id]) ?>" class="confirm-delete" data-reload="1" title="<?= Yii::t('easyii', 'Delete item') ?>"><i class="glyphicon glyphicon-remove font-12"></i> <?= Yii::t('easyii', 'Delete') ?></a></li>
+ </ul>
+ </div>
+ </td>
</tr>
- <?php endforeach; ?>
+ <?php endforeach;?>
</tbody>
</table>
- <?= yii\widgets\LinkPager::widget([
- 'pagination' => $data->pagination
- ]) ?>
<?php else : ?>
<p><?= Yii::t('easyii', 'No records found') ?></p>
<?php endif; ?>
\ No newline at end of file
diff --git a/modules/shopcart/api/Shopcart.php b/modules/shopcart/api/Shopcart.php
index 334c9b2..2ba2f44 100644
--- a/modules/shopcart/api/Shopcart.php
+++ b/modules/shopcart/api/Shopcart.php
@@ -5,6 +5,7 @@
use yii\easyii\modules\catalog\models\Item;
use yii\easyii\modules\shopcart\models\Good;
use yii\easyii\modules\shopcart\models\Order;
+use yii\easyii\modules\shopcart\ShopcartModule;
use yii\helpers\Html;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
@@ -57,7 +58,6 @@ public function api_form($options = [])
{
$model = new Order;
$model->scenario = 'confirm';
- $settings = Yii::$app->getModule('admin')->activeModules['shopcart']->settings;
$options = array_merge($this->_defaultFormOptions, $options);
ob_start();
@@ -71,8 +71,8 @@ public function api_form($options = [])
echo $form->field($model, 'name');
echo $form->field($model, 'address');
- if($settings['enableEmail']) echo $form->field($model, 'email');
- if($settings['enablePhone']) echo $form->field($model, 'phone');
+ if(ShopcartModule::setting('enableEmail')) echo $form->field($model, 'email');
+ if(ShopcartModule::setting('enablePhone')) echo $form->field($model, 'phone');
echo $form->field($model, 'comment')->textarea();
diff --git a/modules/shopcart/controllers/AController.php b/modules/shopcart/controllers/AController.php
index a854834..f445465 100644
--- a/modules/shopcart/controllers/AController.php
+++ b/modules/shopcart/controllers/AController.php
@@ -3,17 +3,28 @@
use Yii;
use yii\data\ActiveDataProvider;
-
+use yii\easyii\actions\DeleteAction;
use yii\easyii\components\Controller;
use yii\easyii\modules\shopcart\models\Good;
use yii\easyii\modules\shopcart\models\Order;
class AController extends Controller
{
+ public $modelClass = 'yii\easyii\modules\shopcart\models\Order';
public $pending = 0;
public $processed = 0;
public $sent = 0;
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/shopcart', 'Order deleted')
+ ]
+ ];
+ }
+
public function init()
{
parent::init();
@@ -87,14 +98,8 @@ public function actionBlank()
public function actionView($id)
{
+ $order = $this->findModel($id);
$request = Yii::$app->request;
- $order = Order::findOne($id);
-
- if($order === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
-
if($request->post('status')){
$newStatus = $request->post('status');
@@ -128,14 +133,4 @@ public function actionView($id)
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Order::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/shopcart', 'Order deleted'));
- }
}
\ No newline at end of file
diff --git a/modules/shopcart/controllers/GoodsController.php b/modules/shopcart/controllers/GoodsController.php
index df03dec..cb53ead 100644
--- a/modules/shopcart/controllers/GoodsController.php
+++ b/modules/shopcart/controllers/GoodsController.php
@@ -2,19 +2,20 @@
namespace yii\easyii\modules\shopcart\controllers;
use Yii;
-
+use yii\easyii\actions\DeleteAction;
use yii\easyii\components\Controller;
use yii\easyii\modules\shopcart\models\Good;
class GoodsController extends Controller
{
- public function actionDelete($id)
+ public function actions()
{
- if(($model = Good::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/shopcart', 'Order deleted'));
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'model' => Good::className(),
+ 'successMessage' => Yii::t('easyii/shopcart', 'Item deleted')
+ ]
+ ];
}
}
\ No newline at end of file
diff --git a/modules/shopcart/mail/en/new_order.php b/modules/shopcart/mail/en/new_order.php
index bc315d1..6b06ae9 100644
--- a/modules/shopcart/mail/en/new_order.php
+++ b/modules/shopcart/mail/en/new_order.php
@@ -4,5 +4,5 @@
$this->title = $subject;
?>
-<p>New order created <b>#<?= $order->order_id ?></b>.</p>
+<p>New order created <b>#<?= $order->id ?></b>.</p>
<p>You can view it <?= Html::a('here', $link) ?>.</p>
\ No newline at end of file
diff --git a/modules/shopcart/mail/ru/new_order.php b/modules/shopcart/mail/ru/new_order.php
index 4c12229..9ac56c4 100644
--- a/modules/shopcart/mail/ru/new_order.php
+++ b/modules/shopcart/mail/ru/new_order.php
@@ -4,7 +4,7 @@
$this->title = $subject;
?>
-<p>Создан новый заказ <b>#<?= $order->order_id ?></b>.</p>
+<p>Создан новый заказ <b>#<?= $order->id ?></b>.</p>
<p>Просмотреть его вы можете <?= Html::a('здесь', $link) ?>.</p>
<hr>
<p>Это автоматическое сообщение и на него не нужно отвечать.</p>
\ No newline at end of file
diff --git a/modules/shopcart/messages/ru/admin.php b/modules/shopcart/messages/ru/admin.php
index 3fbc4b0..a08f933 100644
--- a/modules/shopcart/messages/ru/admin.php
+++ b/modules/shopcart/messages/ru/admin.php
@@ -3,6 +3,8 @@
'Orders' => 'Заказы',
'Order' => 'Заказ',
'Order updated' => 'Заказ обновлен',
+ 'Order deleted' => 'Заказ удален',
+ 'Item deleted' => 'Вложение удалено',
'Blank' => 'Незаполнен',
'Pending' => 'Ожидает',
'Processed' => 'В обработке',
diff --git a/modules/shopcart/models/Good.php b/modules/shopcart/models/Good.php
index 3843400..4f1c5d3 100644
--- a/modules/shopcart/models/Good.php
+++ b/modules/shopcart/models/Good.php
@@ -33,12 +33,12 @@ public function attributeLabels()
public function getItem()
{
- return $this->hasOne(Item::className(), ['item_id' => 'item_id']);
+ return $this->hasOne(Item::className(), ['id' => 'item_id']);
}
public function getOrder()
{
- return $this->hasOne(Order::className(), ['order_id' => 'order_id']);
+ return $this->hasOne(Order::className(), ['id' => 'order_id']);
}
public function beforeSave($insert)
diff --git a/modules/shopcart/models/Order.php b/modules/shopcart/models/Order.php
index ffb98d1..03e00ff 100644
--- a/modules/shopcart/models/Order.php
+++ b/modules/shopcart/models/Order.php
@@ -5,6 +5,7 @@
use yii\easyii\behaviors\CalculateNotice;
use yii\easyii\helpers\Mail;
use yii\easyii\models\Setting;
+use yii\easyii\modules\shopcart\ShopcartModule;
use yii\easyii\validators\EscapeValidator;
use yii\helpers\Url;
@@ -30,8 +31,8 @@ public function rules()
{
return [
[['name', 'address'], 'required', 'on' => 'confirm'],
- ['email', 'required', 'when' => function($model){ return $model->scenario == 'confirm' && Yii::$app->getModule('admin')->activeModules['shopcart']->settings['enableEmail']; }],
- ['phone', 'required', 'when' => function($model){ return $model->scenario == 'confirm' && Yii::$app->getModule('admin')->activeModules['shopcart']->settings['enablePhone']; }],
+ ['email', 'required', 'when' => function($model){ return $model->scenario == 'confirm' && ShopcartModule::setting('enableEmail'); }],
+ ['phone', 'required', 'when' => function($model){ return $model->scenario == 'confirm' && ShopcartModule::setting('enablePhone'); }],
[['name', 'address', 'phone', 'comment'], 'trim'],
['email', 'email'],
['name', 'string', 'max' => 32],
@@ -95,7 +96,7 @@ public function getStatusName()
public function getGoods()
{
- return $this->hasMany(Good::className(), ['order_id' => 'order_id']);
+ return $this->hasMany(Good::className(), ['order_id' => 'id']);
}
public function getCost()
@@ -138,15 +139,13 @@ public function afterDelete()
public function mailAdmin()
{
- $settings = Yii::$app->getModule('admin')->activeModules['shopcart']->settings;
-
- if(!$settings['mailAdminOnNewOrder']){
+ if(!ShopcartModule::setting('mailAdminOnNewOrder')){
return false;
}
return Mail::send(
Setting::get('admin_email'),
- $settings['subjectOnNewOrder'],
- $settings['templateOnNewOrder'],
+ ShopcartModule::setting('subjectOnNewOrder'),
+ ShopcartModule::setting('templateOnNewOrder'),
[
'order' => $this,
'link' => Url::to(['/admin/shopcart/a/view', 'id' => $this->primaryKey], true)
@@ -156,15 +155,13 @@ public function mailAdmin()
public function notifyUser()
{
- $settings = Yii::$app->getModule('admin')->activeModules['shopcart']->settings;
-
return Mail::send(
$this->email,
- $settings['subjectNotifyUser'],
- $settings['templateNotifyUser'],
+ ShopcartModule::setting('subjectNotifyUser'),
+ ShopcartModule::setting('templateNotifyUser'),
[
'order' => $this,
- 'link' => Url::to([$settings['frontendShopcartRoute'], 'id' => $this->primaryKey, 'token' => $this->access_token], true)
+ 'link' => Url::to([ShopcartModule::setting('frontendShopcartRoute'), 'id' => $this->primaryKey, 'token' => $this->access_token], true)
]
);
}
diff --git a/modules/subscribe/controllers/AController.php b/modules/subscribe/controllers/AController.php
index aa14dd1..1938e24 100644
--- a/modules/subscribe/controllers/AController.php
+++ b/modules/subscribe/controllers/AController.php
@@ -3,9 +3,9 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\DeleteAction;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
-
use yii\easyii\components\Controller;
use yii\easyii\models\Setting;
use yii\easyii\modules\subscribe\models\Subscriber;
@@ -13,6 +13,19 @@
class AController extends Controller
{
+ public $modelClass = 'yii\easyii\modules\subscribe\models\History';
+
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'model' => Subscriber::className(),
+ 'successMessage' => Yii::t('easyii/subscribe', 'Subscriber deleted')
+ ]
+ ];
+ }
+
public function actionIndex()
{
$data = new ActiveDataProvider([
@@ -37,12 +50,7 @@ public function actionHistory()
public function actionView($id)
{
- $model = History::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id.'/history']);
- }
+ $model = $this->findModel($id);
return $this->render('view', [
'model' => $model
@@ -77,16 +85,6 @@ public function actionCreate()
}
}
- public function actionDelete($id)
- {
- if(($model = Subscriber::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/subscribe', 'Subscriber deleted'));
- }
-
private function send($model)
{
$text = $model->body.
diff --git a/modules/subscribe/views/a/_form.php b/modules/subscribe/views/a/_form.php
index 6ac84cb..dda772f 100644
--- a/modules/subscribe/views/a/_form.php
+++ b/modules/subscribe/views/a/_form.php
@@ -1,16 +1,11 @@
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
-use yii\easyii\widgets\Redactor;
?>
<?php $form = ActiveForm::begin([
'enableClientValidation' => true
]); ?>
<?= $form->field($model, 'subject') ?>
-<?= $form->field($model, 'body')->widget(Redactor::className(),[
- 'options' => [
- 'minHeight' => 400,
- ]
-]) ?>
+<?= $form->field($model, 'body')->widget(\yii\easyii\widgets\Redactor::className()) ?>
<?= Html::submitButton(Yii::t('easyii', 'Send'), ['class' => 'btn btn-primary']) ?>
<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/modules/subscribe/views/a/history.php b/modules/subscribe/views/a/history.php
index 58ee8d9..92ab809 100644
--- a/modules/subscribe/views/a/history.php
+++ b/modules/subscribe/views/a/history.php
@@ -12,9 +12,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii/subscribe', 'Subject') ?></th>
<th width="150"><?= Yii::t('easyii', 'Date') ?></th>
<th width="120"><?= Yii::t('easyii/subscribe', 'Sent') ?></th>
@@ -23,9 +21,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/view', 'id' => $item->primaryKey]) ?>"><?= $item->subject ?></a></td>
<td><?= Yii::$app->formatter->asDatetime($item->time, 'short') ?></td>
<td><?= $item->sent ?></td>
diff --git a/modules/subscribe/views/a/index.php b/modules/subscribe/views/a/index.php
index efbdb96..cf4b360 100644
--- a/modules/subscribe/views/a/index.php
+++ b/modules/subscribe/views/a/index.php
@@ -12,9 +12,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th>E-mail</th>
<th width="150">IP</th>
<th width="150"><?= Yii::t('easyii', 'Date') ?></th>
@@ -24,9 +22,7 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
- <td><?= $item->primaryKey ?></td>
- <?php endif; ?>
+ <td><?= $item->primaryKey ?></td>
<td><?= $item->email ?></td>
<td><a href="//freegeoip.net/?q=<?= $item->ip ?>" target="_blank"><?= $item->ip ?></a></td>
<td><?= Yii::$app->formatter->asDatetime($item->time, 'short') ?></td>
diff --git a/modules/text/api/Text.php b/modules/text/api/Text.php
index 69dfd67..87f4c7b 100644
--- a/modules/text/api/Text.php
+++ b/modules/text/api/Text.php
@@ -27,18 +27,19 @@ public function init()
});
}
- public function api_get($id_slug)
+ public function api_get($id_slug, $liveEditable = true)
{
if(($text = $this->findText($id_slug)) === null){
return $this->notFound($id_slug);
}
- return LIVE_EDIT ? API::liveEdit($text['text'], Url::to(['/admin/text/a/edit/', 'id' => $text['text_id']])) : $text['text'];
+ $textContent = nl2br($text['text']);
+ return ($liveEditable && LIVE_EDIT_ENABLED) ? API::liveEdit($textContent ? $textContent : '[' . Yii::t('easyii/text/api', 'Empty text') . ']', Url::to(['/admin/text/a/edit/', 'id' => $text['id']])) : $textContent;
}
private function findText($id_slug)
{
foreach ($this->_texts as $item) {
- if($item['slug'] == $id_slug || $item['text_id'] == $id_slug){
+ if($item['slug'] == $id_slug || $item['id'] == $id_slug){
return $item;
}
}
@@ -49,7 +50,7 @@ private function notFound($id_slug)
{
$text = '';
- if(!Yii::$app->user->isGuest && preg_match(TextModel::$SLUG_PATTERN, $id_slug)){
+ if(IS_ROOT && preg_match(TextModel::$SLUG_PATTERN, $id_slug)){
$text = Html::a(Yii::t('easyii/text/api', 'Create text'), ['/admin/text/a/create', 'slug' => $id_slug], ['target' => '_blank']);
}
diff --git a/modules/text/controllers/AController.php b/modules/text/controllers/AController.php
index 6572aec..8f815f5 100644
--- a/modules/text/controllers/AController.php
+++ b/modules/text/controllers/AController.php
@@ -3,15 +3,26 @@
use Yii;
use yii\data\ActiveDataProvider;
+use yii\easyii\actions\DeleteAction;
use yii\widgets\ActiveForm;
-
use yii\easyii\components\Controller;
use yii\easyii\modules\text\models\Text;
class AController extends Controller
{
+ public $modelClass = 'yii\easyii\modules\text\models\Text';
public $rootActions = ['create', 'delete'];
+ public function actions()
+ {
+ return [
+ 'delete' => [
+ 'class' => DeleteAction::className(),
+ 'successMessage' => Yii::t('easyii/text', 'Text deleted')
+ ]
+ ];
+ }
+
public function actionIndex()
{
$data = new ActiveDataProvider([
@@ -27,23 +38,20 @@ public function actionCreate($slug = null)
$model = new Text;
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii/text', 'Text created'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
- else{
+ return $this->redirect(['/admin/' . $this->module->id]);
+ } else {
$this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
return $this->refresh();
}
}
- }
- else {
- if($slug){
+ } else {
+ if ($slug) {
$model->slug = $slug;
}
return $this->render('create', [
@@ -54,42 +62,24 @@ public function actionCreate($slug = null)
public function actionEdit($id)
{
- $model = Text::findOne($id);
-
- if($model === null){
- $this->flash('error', Yii::t('easyii', 'Not found'));
- return $this->redirect(['/admin/'.$this->module->id]);
- }
+ $model = $this->findModel($id);
if ($model->load(Yii::$app->request->post())) {
- if(Yii::$app->request->isAjax){
+ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
return ActiveForm::validate($model);
- }
- else{
- if($model->save()){
+ } else {
+ if ($model->save()) {
$this->flash('success', Yii::t('easyii/text', 'Text updated'));
- }
- else{
+ } else {
$this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
}
return $this->refresh();
}
- }
- else {
+ } else {
return $this->render('edit', [
'model' => $model
]);
}
}
-
- public function actionDelete($id)
- {
- if(($model = Text::findOne($id))){
- $model->delete();
- } else {
- $this->error = Yii::t('easyii', 'Not found');
- }
- return $this->formatResponse(Yii::t('easyii/text', 'Text deleted'));
- }
}
\ No newline at end of file
diff --git a/modules/text/messages/ru/admin.php b/modules/text/messages/ru/admin.php
index 06a3a70..adf44ed 100644
--- a/modules/text/messages/ru/admin.php
+++ b/modules/text/messages/ru/admin.php
@@ -5,5 +5,6 @@
'Edit text' => 'Редактировать текст',
'Text created' => 'Текст успешно создан',
'Text updated' => 'Текст обновлен',
- 'Text deleted' => 'Текст удален'
+ 'Text deleted' => 'Текст удален',
+ 'Empty text' => 'Пустой текст'
];
\ No newline at end of file
diff --git a/modules/text/messages/ru/api.php b/modules/text/messages/ru/api.php
index 3b7945a..86cb009 100644
--- a/modules/text/messages/ru/api.php
+++ b/modules/text/messages/ru/api.php
@@ -1,4 +1,5 @@
<?php
return [
'Create text' => 'Создать текст',
+ 'Empty text' => 'Пустой текст'
];
\ No newline at end of file
diff --git a/modules/text/models/Text.php b/modules/text/models/Text.php
index 11e17ab..99bae2a 100644
--- a/modules/text/models/Text.php
+++ b/modules/text/models/Text.php
@@ -16,8 +16,6 @@ public static function tableName()
public function rules()
{
return [
- ['text_id', 'number', 'integerOnly' => true],
- ['text', 'required'],
['text', 'trim'],
['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
['slug', 'default', 'value' => null],
diff --git a/modules/text/views/a/index.php b/modules/text/views/a/index.php
index 7ef5132..8cf5e5a 100644
--- a/modules/text/views/a/index.php
+++ b/modules/text/views/a/index.php
@@ -12,9 +12,7 @@
<table class="table table-hover">
<thead>
<tr>
- <?php if(IS_ROOT) : ?>
- <th width="50">#</th>
- <?php endif; ?>
+ <th width="50">#</th>
<th><?= Yii::t('easyii', 'Text') ?></th>
<?php if(IS_ROOT) : ?>
<th><?= Yii::t('easyii', 'Slug') ?></th>
@@ -25,10 +23,8 @@
<tbody>
<?php foreach($data->models as $item) : ?>
<tr>
- <?php if(IS_ROOT) : ?>
<td><?= $item->primaryKey ?></td>
- <?php endif; ?>
- <td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><?= $item->text ?></a></td>
+ <td><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $item->primaryKey]) ?>"><?= ($item->text ? $item->text : '[' . Yii::t('easyii/text', 'Empty text') . ']') ?></a></td>
<?php if(IS_ROOT) : ?>
<td><?= $item->slug ?></td>
<td><a href="<?= Url::to(['/admin/'.$module.'/a/delete', 'id' => $item->primaryKey]) ?>" class="glyphicon glyphicon-remove confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"></a></td>
diff --git a/views/admins/index.php b/views/admins/index.php
index eb4ab76..0d303f2 100644
--- a/views/admins/index.php
+++ b/views/admins/index.php
@@ -18,9 +18,9 @@
<tbody>
<?php foreach($data->models as $admin) : ?>
<tr>
- <td><?= $admin->admin_id ?></td>
- <td><a href="<?= Url::to(['/admin/admins/edit', 'id' => $admin->admin_id]) ?>"><?= $admin->username ?></a></td>
- <td><a href="<?= Url::to(['/admin/admins/delete', 'id' => $admin->admin_id]) ?>" class="glyphicon glyphicon-remove confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"></a></td>
+ <td><?= $admin->id ?></td>
+ <td><a href="<?= Url::to(['/admin/admins/edit', 'id' => $admin->id]) ?>"><?= $admin->username ?></a></td>
+ <td><a href="<?= Url::to(['/admin/admins/delete', 'id' => $admin->id]) ?>" class="glyphicon glyphicon-remove confirm-delete" title="<?= Yii::t('easyii', 'Delete item') ?>"></a></td>
</tr>
<?php endforeach; ?>
</tbody>
diff --git a/views/category/_form.php b/views/category/_form.php
index 3e4cb4a..8f61fd7 100644
--- a/views/category/_form.php
+++ b/views/category/_form.php
@@ -1,5 +1,6 @@
<?php
use yii\easyii\helpers\Image;
+use yii\easyii\widgets\TagsInput;
use yii\helpers\Html;
use yii\helpers\Url;
use yii\widgets\ActiveForm;
@@ -21,25 +22,36 @@
<option value="" class="smooth"><?= Yii::t('easyii', 'No') ?></option>
<?php foreach($class::find()->sort()->asArray()->all() as $node) : ?>
<option
- value="<?= $node['category_id'] ?>"
- <?php if($parent == $node['category_id']) echo 'SELECTED' ?>
- style="padding-left: <?= $node['depth']*20 ?>px;"
+ value="<?= $node['id'] ?>"
+ <?php if($parent == $node['id']) echo 'SELECTED' ?>
+ style="padding-left: <?= $node['depth'] * 20 ?>px;"
><?= $node['title'] ?></option>
<?php endforeach; ?>
</select>
</div>
<?php endif; ?>
-<?php if($settings['categoryThumb']) : ?>
- <?php if($model->image) : ?>
- <img src="<?= Image::thumb($model->image, 240) ?>">
+<?php if(!empty($settings['categoryDescription'])) : ?>
+ <?= $form->field($model, 'description')->textarea(['rows' => 3]) ?>
+<?php endif; ?>
+
+<?php if(!empty($settings['categoryThumb'])) : ?>
+ <?php if($model->image_file) : ?>
+ <a href="<?= $model->image ?>" class="fancybox"><img src="<?= Image::thumb($model->image_file, 240, 180) ?>"></a>
<a href="<?= Url::to(['/admin/'.$this->context->moduleName.'/a/clear-image', 'id' => $model->primaryKey]) ?>" class="text-danger confirm-delete" title="<?= Yii::t('easyii', 'Clear image')?>"><?= Yii::t('easyii', 'Clear image')?></a>
<?php endif; ?>
- <?= $form->field($model, 'image')->fileInput() ?>
+ <?= $form->field($model, 'image_file')->fileInput() ?>
+<?php endif; ?>
+
+<?php if(!empty($settings['categoryTags'])) : ?>
+ <?= $form->field($model, 'tagNames')->widget(TagsInput::className()) ?>
<?php endif; ?>
<?php if(IS_ROOT) : ?>
<?= $form->field($model, 'slug') ?>
+ <?php if(isset($model->attributes['cache'])) : ?>
+ <?= $form->field($model, 'cache')->checkbox() ?>
+ <?php endif; ?>
<?= SeoForm::widget(['model' => $model]) ?>
<?php endif; ?>
diff --git a/views/category/_submenu.php b/views/category/_submenu.php
new file mode 100644
index 0000000..19aff42
--- /dev/null
+++ b/views/category/_submenu.php
@@ -0,0 +1,13 @@
+<?php
+use yii\helpers\Url;
+
+$action = $this->context->action->id;
+$module = $this->context->module->id;
+?>
+<?php if(IS_ROOT) : ?>
+ <ul class="nav nav-tabs">
+ <li <?= ($action === 'edit') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/edit', 'id' => $model->primaryKey]) ?>"><?= Yii::t('easyii', 'Edit') ?></a></li>
+ <li <?= ($action === 'fields') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/'.$module.'/a/fields', 'id' => $model->primaryKey]) ?>"><span class="glyphicon glyphicon-cog"></span> <?= Yii::t('easyii', 'Fields') ?></a></li>
+ </ul>
+ <br>
+<?php endif;?>
\ No newline at end of file
diff --git a/views/category/edit.php b/views/category/edit.php
index 7a2abbb..a1f8a44 100644
--- a/views/category/edit.php
+++ b/views/category/edit.php
@@ -3,5 +3,5 @@
?>
<?= $this->render('_menu') ?>
-<?php if(!empty($this->params['submenu'])) echo $this->render('_submenu', ['model' => $model], $this->context); ?>
+<?php if($model instanceof \yii\easyii\components\CategoryWithFieldsModel) echo $this->render('_submenu', ['model' => $model]); ?>
<?= $this->render('_form', ['model' => $model]) ?>
\ No newline at end of file
diff --git a/views/category/fields.php b/views/category/fields.php
new file mode 100644
index 0000000..c09b64e
--- /dev/null
+++ b/views/category/fields.php
@@ -0,0 +1,7 @@
+<?php
+$this->title = Yii::t('easyii', 'Fields');
+?>
+<?= $this->render('_menu') ?>
+<?= $this->render('_submenu', ['model' => $model]); ?>
+<br>
+<?= \yii\easyii\widgets\FieldsTable::widget(['model' => $model]) ?>
\ No newline at end of file
diff --git a/views/category/index.php b/views/category/index.php
index df190ab..bfc0cde 100644
--- a/views/category/index.php
+++ b/views/category/index.php
@@ -16,33 +16,33 @@
<tbody>
<?php foreach($cats as $cat) : ?>
<tr>
- <td width="50"><?= $cat->category_id ?></td>
+ <td width="50"><?= $cat->id ?></td>
<td style="padding-left: <?= $cat->depth * 20 ?>px;">
<?php if(count($cat->children)) : ?>
<i class="caret"></i>
<?php endif; ?>
<?php if(!count($cat->children) || !empty(Yii::$app->controller->module->settings['itemsInFolder'])) : ?>
- <a href="<?= Url::to([$baseUrl . $this->context->viewRoute, 'id' => $cat->category_id]) ?>" <?= ($cat->status == CategoryModel::STATUS_OFF ? 'class="smooth"' : '') ?>><?= $cat->title ?></a>
+ <a href="<?= Url::to([$baseUrl . $this->context->viewRoute, 'id' => $cat->id]) ?>" <?= ($cat->status == CategoryModel::STATUS_OFF ? 'class="smooth"' : '') ?>><?= $cat->title ?></a>
<?php else : ?>
<span <?= ($cat->status == CategoryModel::STATUS_OFF ? 'class="smooth"' : '') ?>><?= $cat->title ?></span>
<?php endif; ?>
</td>
<td width="120" class="text-right">
<div class="dropdown actions">
- <i id="dropdownMenu<?= $cat->category_id ?>" data-toggle="dropdown" aria-expanded="true" title="<?= Yii::t('easyii', 'Actions') ?>" class="glyphicon glyphicon-menu-hamburger"></i>
- <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenu<?= $cat->category_id ?>">
- <li><a href="<?= Url::to([$baseUrl.'/a/edit', 'id' => $cat->category_id]) ?>"><i class="glyphicon glyphicon-pencil font-12"></i> <?= Yii::t('easyii', 'Edit') ?></a></li>
- <li><a href="<?= Url::to([$baseUrl.'/a/create', 'parent' => $cat->category_id]) ?>"><i class="glyphicon glyphicon-plus font-12"></i> <?= Yii::t('easyii', 'Add subcategory') ?></a></li>
+ <i id="dropdownMenu<?= $cat->id ?>" data-toggle="dropdown" aria-expanded="true" title="<?= Yii::t('easyii', 'Actions') ?>" class="glyphicon glyphicon-menu-hamburger"></i>
+ <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenu<?= $cat->id ?>">
+ <li><a href="<?= Url::to([$baseUrl.'/a/edit', 'id' => $cat->id]) ?>"><i class="glyphicon glyphicon-pencil font-12"></i> <?= Yii::t('easyii', 'Edit') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/create', 'parent' => $cat->id]) ?>"><i class="glyphicon glyphicon-plus font-12"></i> <?= Yii::t('easyii', 'Add subcategory') ?></a></li>
<li role="presentation" class="divider"></li>
- <li><a href="<?= Url::to([$baseUrl.'/a/up', 'id' => $cat->category_id]) ?>"><i class="glyphicon glyphicon-arrow-up font-12"></i> <?= Yii::t('easyii', 'Move up') ?></a></li>
- <li><a href="<?= Url::to([$baseUrl.'/a/down', 'id' => $cat->category_id]) ?>"><i class="glyphicon glyphicon-arrow-down font-12"></i> <?= Yii::t('easyii', 'Move down') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/up', 'id' => $cat->id]) ?>"><i class="glyphicon glyphicon-arrow-up font-12"></i> <?= Yii::t('easyii', 'Move up') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/down', 'id' => $cat->id]) ?>"><i class="glyphicon glyphicon-arrow-down font-12"></i> <?= Yii::t('easyii', 'Move down') ?></a></li>
<li role="presentation" class="divider"></li>
<?php if($cat->status == CategoryModel::STATUS_ON) :?>
- <li><a href="<?= Url::to([$baseUrl.'/a/off', 'id' => $cat->category_id]) ?>" title="<?= Yii::t('easyii', 'Turn Off') ?>'"><i class="glyphicon glyphicon-eye-close font-12"></i> <?= Yii::t('easyii', 'Turn Off') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/off', 'id' => $cat->id]) ?>" title="<?= Yii::t('easyii', 'Turn Off') ?>'"><i class="glyphicon glyphicon-eye-close font-12"></i> <?= Yii::t('easyii', 'Turn Off') ?></a></li>
<?php else : ?>
- <li><a href="<?= Url::to([$baseUrl.'/a/on', 'id' => $cat->category_id]) ?>" title="<?= Yii::t('easyii', 'Turn On') ?>"><i class="glyphicon glyphicon-eye-open font-12"></i> <?= Yii::t('easyii', 'Turn On') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/on', 'id' => $cat->id]) ?>" title="<?= Yii::t('easyii', 'Turn On') ?>"><i class="glyphicon glyphicon-eye-open font-12"></i> <?= Yii::t('easyii', 'Turn On') ?></a></li>
<?php endif; ?>
- <li><a href="<?= Url::to([$baseUrl.'/a/delete', 'id' => $cat->category_id]) ?>" class="confirm-delete" data-reload="1" title="<?= Yii::t('easyii', 'Delete item') ?>"><i class="glyphicon glyphicon-remove font-12"></i> <?= Yii::t('easyii', 'Delete') ?></a></li>
+ <li><a href="<?= Url::to([$baseUrl.'/a/delete', 'id' => $cat->id]) ?>" class="confirm-delete" data-reload="1" title="<?= Yii::t('easyii', 'Delete item') ?>"><i class="glyphicon glyphicon-remove font-12"></i> <?= Yii::t('easyii', 'Delete') ?></a></li>
</ul>
</div>
</td>
diff --git a/views/default/index.php b/views/default/index.php
index 2433612..bda36ca 100644
--- a/views/default/index.php
+++ b/views/default/index.php
@@ -1,4 +1,32 @@
<?php
+use yii\easyii\models\Setting;
+use yii\helpers\Url;
+
$this->title = Yii::t('easyii', 'Welcome');
?>
-<p><?= Yii::t('easyii', 'Welcome to control panel, choose which section you want to manage in left menu.') ?></p>
\ No newline at end of file
+<?php if(count($notifications)) : ?>
+ <h2><?= Yii::t('easyii', 'New on website') ?></h2>
+ <div class="row welcome-notifications">
+ <?php foreach($notifications as $i => $module) : ?>
+ <div class="col-md-3">
+ <a href="<?= Url::to(['/admin/' . $module->name]) ?>" class="module-link module-link-color<?= ++$i ?>">
+ <i class="glyphicon glyphicon-<?= $module->icon ?>"></i>
+ <div class="pull-right text-right">
+ <div class="module-title"><?= $module->title ?></div>
+ <div class="module-notices"><?= $module->notice ?></div>
+ </div>
+ </a>
+ </div>
+ <?php endforeach; ?>
+ </div>
+ <hr class="margin-30"/>
+<?php endif; ?>
+<?php if(Setting::get('ga_service_email') && Setting::get('ga_profile_id') && Setting::get('ga_p12_file')) : ?>
+ <?= \yii\easyii\widgets\GoogleCharts::widget([
+ 'email' => Setting::get('ga_service_email'),
+ 'ids' => Setting::get('ga_profile_id'),
+ 'p12' => Setting::get('ga_p12_file')
+ ]) ?>
+<?php else : ?>
+ <p><?= Yii::t('easyii', 'Welcome to control panel, choose which section you want to manage in left menu.') ?></p>
+<?php endif; ?>
diff --git a/views/install/_form.php b/views/install/_form.php
index 73c4786..a93d62c 100644
--- a/views/install/_form.php
+++ b/views/install/_form.php
@@ -6,9 +6,5 @@
<?php $form = ActiveForm::begin(['action' => Url::to(['/admin/install'])]); ?>
<?= $form->field($model, 'root_password', ['inputOptions' => ['title' => Yii::t('easyii/install','Password to login as root')]]) ?>
<?= $form->field($model, 'admin_email', ['inputOptions' => ['title' => Yii::t('easyii/install','Used as "ReplyTo" in mail messages')]]) ?>
-<?= $form->field($model, 'robot_email', ['inputOptions' => ['title' => Yii::t('easyii/install','Used as "From" in mail messages')]]) ?>
-<?= $form->field($model, 'recaptcha_key', ['inputOptions' => ['title' => Yii::t('easyii/install','Required for using captcha in forms (guestbook, feedback)')]]) ?>
-<?= $form->field($model, 'recaptcha_secret') ?>
-<p class="recaptcha-tip"><?= Yii::t('easyii/install', 'You easily can get keys on') ?> <a href="https://www.google.com/recaptcha/intro/index.html" target="_blank"><?= Yii::t('easyii/install', 'ReCaptcha website') ?></a></p>
<?= Html::submitButton(Yii::t('easyii/install', 'Install'), ['class' => 'btn btn-lg btn-primary btn-block']) ?>
<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/views/layouts/frontend-toolbar.php b/views/layouts/frontend-toolbar.php
index 1cadb54..6314d9d 100644
--- a/views/layouts/frontend-toolbar.php
+++ b/views/layouts/frontend-toolbar.php
@@ -9,16 +9,16 @@
$this->registerCss('body {padding-'.$position.': 50px;}');
?>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
-<nav id="easyii-navbar" class="navbar navbar-inverse navbar-fixed-<?= $position ?>">
- <div class="container">
- <ul class="nav navbar-nav navbar-left">
- <li><a href="<?= Url::to(['/admin']) ?>"><span class="glyphicon glyphicon-arrow-left"></span> <?= Yii::t('easyii', 'Control Panel') ?></a></li>
- </ul>
- <p class="navbar-text"><i class="glyphicon glyphicon-pencil"></i> <?= Yii::t('easyii', 'Live edit') ?></p>
- <?= Html::checkbox('', LIVE_EDIT, ['data-link' => Url::to(['/admin/system/live-edit'])]) ?>
-
- <ul class="nav navbar-nav navbar-right">
- <li><a href="<?= Url::to(['/admin/sign/out']) ?>"><span class="glyphicon glyphicon-log-out"></span> <?= Yii::t('easyii', 'Logout') ?></a></li>
- </ul>
+<nav id="easyii-navbar">
+ <div class="easyii-container">
+ <a href="<?= Url::to(['/admin']) ?>" class="pull-left"><span class="glyphicon glyphicon-arrow-left"></span> <?= Yii::t('easyii', 'Control Panel') ?></a>
+ <div class="live-edit-label pull-left">
+ <i class="glyphicon glyphicon-pencil"></i>
+ <?= Yii::t('easyii', 'Live edit') ?>
+ </div>
+ <div class="live-edit-checkbox pull-left">
+ <?= Html::checkbox('', LIVE_EDIT_ENABLED, ['data-link' => Url::to(['/admin/default/live-edit'])]) ?>
+ </div>
+ <a href="<?= Url::to(['/admin/sign/out']) ?>" class="pull-right"><span class="glyphicon glyphicon-log-out"></span> <?= Yii::t('easyii', 'Logout') ?></a></li>
</div>
</nav>
\ No newline at end of file
diff --git a/views/layouts/main.php b/views/layouts/main.php
index a83a5cd..257e23a 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -23,10 +23,9 @@
<div class="container">
<div class="wrapper">
<div class="header">
- <div class="logo">
- <img src="<?= $asset->baseUrl ?>/img/logo_20.png">
- EasyiiCMS
- </div>
+ <a href="<?= Url::to(['/admin']) ?>" class="logo">
+ <img src="<?= $asset->baseUrl ?>/img/logo_20.png">EasyiiCMS
+ </a>
<div class="nav">
<a href="<?= Url::to(['/']) ?>" class="pull-left"><i class="glyphicon glyphicon-home"></i> <?= Yii::t('easyii', 'Open site') ?></a>
<a href="<?= Url::to(['/admin/sign/out']) ?>" class="pull-right"><i class="glyphicon glyphicon-log-out"></i> <?= Yii::t('easyii', 'Logout') ?></a>
@@ -62,10 +61,6 @@
<i class="glyphicon glyphicon-hdd"></i>
<?= Yii::t('easyii', 'System') ?>
</a>
- <a href="<?= Url::to(['/admin/logs']) ?>" class="menu-item <?= ($moduleName == 'admin' && $this->context->id == 'logs') ? 'active' :'' ?>">
- <i class="glyphicon glyphicon-align-justify"></i>
- <?= Yii::t('easyii', 'Logs') ?>
- </a>
<?php endif; ?>
</div>
<div class="box content">
diff --git a/views/logs/_menu.php b/views/logs/_menu.php
deleted file mode 100644
index 7c3f44b..0000000
--- a/views/logs/_menu.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-use yii\helpers\Url;
-
-$action = $this->context->action->id;
-?>
-<ul class="nav nav-pills">
- <li <?= ($action==='index') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/logs']) ?>"><?= Yii::t('easyii', 'Sign in') ?></a></li>
-</ul>
-<br/>
diff --git a/views/modules/settings.php b/views/modules/settings.php
index 7722c3c..486cfc1 100644
--- a/views/modules/settings.php
+++ b/views/modules/settings.php
@@ -28,4 +28,4 @@
<?php else : ?>
<?= $model->title ?> <?= Yii::t('easyii', 'module doesn`t have any settings.') ?>
<?php endif; ?>
-<a href="<?= Url::to(['/admin/modules/restore-settings', 'id' => $model->module_id]) ?>" class="pull-right text-warning"><i class="glyphicon glyphicon-flash"></i> <?= Yii::t('easyii', 'Restore default settings') ?></a>
\ No newline at end of file
+<a href="<?= Url::to(['/admin/modules/restore-settings', 'id' => $model->id]) ?>" class="pull-right text-warning"><i class="glyphicon glyphicon-flash"></i> <?= Yii::t('easyii', 'Restore default settings') ?></a>
\ No newline at end of file
diff --git a/views/system/_menu.php b/views/system/_menu.php
new file mode 100644
index 0000000..9a10d80
--- /dev/null
+++ b/views/system/_menu.php
@@ -0,0 +1,10 @@
+<?php
+use yii\helpers\Url;
+
+$action = $this->context->action->id;
+?>
+<ul class="nav nav-pills">
+ <li <?= ($action === 'index') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/system']) ?>"><?= Yii::t('easyii', 'Tools') ?></a></li>
+ <li <?= ($action === 'logs') ? 'class="active"' : '' ?>><a href="<?= Url::to(['/admin/system/logs']) ?>"><?= Yii::t('easyii', 'Logs') ?></a></li>
+</ul>
+<br/>
\ No newline at end of file
diff --git a/views/system/index.php b/views/system/index.php
index 29f86f5..63e6276 100644
--- a/views/system/index.php
+++ b/views/system/index.php
@@ -4,6 +4,7 @@
$this->title = Yii::t('easyii', 'System');
?>
+<?= $this->render('_menu') ?>
<h4><?= Yii::t('easyii', 'Current version') ?>: <b><?= Setting::get('easyii_version') ?></b>
<?php if(\yii\easyii\AdminModule::VERSION > floatval(Setting::get('easyii_version'))) : ?>
diff --git a/views/logs/index.php b/views/system/logs.php
similarity index 100%
rename from views/logs/index.php
rename to views/system/logs.php
diff --git a/widgets/DateTimePicker.php b/widgets/DateTimePicker.php
index df6cb1f..93b2204 100644
--- a/widgets/DateTimePicker.php
+++ b/widgets/DateTimePicker.php
@@ -2,28 +2,44 @@
namespace yii\easyii\widgets;
use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\Model;
use yii\easyii\assets\DateTimePickerAsset;
use yii\easyii\helpers\Data;
-use yii\widgets\InputWidget;
use yii\helpers\Html;
use yii\helpers\Json;
use yii\web\AssetBundle;
-class DateTimePicker extends InputWidget
+class DateTimePicker extends \yii\base\Widget
{
- public $widgetId;
+ public $model;
+ public $attribute;
public $options = [];
+ public $name;
+ public $value;
+ public $widgetId;
+ public $inputId;
private $_assetBundle;
private $_defaultOptions = [
- 'showTodayButton' => true
+ 'showTodayButton' => true,
+ 'widgetPositioning' => ['vertical' => 'top']
];
public function init()
{
+ if ($this->name === null && !$this->hasModel()) {
+ throw new InvalidConfigException("Either 'name', or 'model' and 'attribute' properties must be specified.");
+ }
+ if (empty($this->options['locale'])) {
+ $this->options['locale'] = substr(Yii::$app->language, 0, 2);
+ }
+
$this->options = array_merge($this->_defaultOptions, $this->options);
- $this->widgetId = 'dtp-'.Html::getInputId($this->model, $this->attribute);
+ $this->inputId = $this->hasModel() ? Html::getInputId($this->model, $this->attribute) : $this->getId();
+ $this->widgetId = 'dtp-' . $this->inputId;
+
$this->registerAssetBundle();
$this->registerScript();
}
@@ -33,7 +49,7 @@ public function run()
echo '
<div class="input-group date" id="'.$this->widgetId.'">
'.Html::textInput('', '', ['class' => 'form-control']).'
- '.Html::activeHiddenInput($this->model, $this->attribute).'
+ '.($this->hasModel() ? Html::activeHiddenInput($this->model, $this->attribute, ['id' => $this->inputId]) : Html::hiddenInput($this->name, $this->value, ['id' => $this->inputId])).'
<span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
</div>
';
@@ -45,18 +61,18 @@ public function registerScript()
$this->options['locale'] = Data::getLocale();
}
$clientOptions = (count($this->options)) ? Json::encode($this->options) : '';
- $time = $this->model->{$this->attribute} ? $this->model->{$this->attribute} : time();
+ $time = $this->hasModel() ? $this->model->{$this->attribute} : $this->value;
$this->getView()->registerJs('
- (function(){
+ (function(){
var dtpContainer = $("#'.$this->widgetId.'");
-
+
dtpContainer.datetimepicker('.$clientOptions.')
.on("dp.change", function (e) {
- $("#'.Html::getInputId($this->model, $this->attribute).'").val(e.date.unix());
+ $("#'.$this->inputId.'").val(e.date.unix());
})
.data("DateTimePicker")
.date(moment('.($time * 1000).'));
-
+
$("[type=text]", dtpContainer).focus(function(e){
dtpContainer.data("DateTimePicker").show();
});
@@ -77,4 +93,11 @@ public function getAssetBundle()
return $this->_assetBundle;
}
+ /**
+ * @return boolean whether this widget is associated with a data model.
+ */
+ protected function hasModel()
+ {
+ return $this->model instanceof Model && $this->attribute !== null;
+ }
}
diff --git a/widgets/FieldsTable.php b/widgets/FieldsTable.php
new file mode 100644
index 0000000..3f30c6e
--- /dev/null
+++ b/widgets/FieldsTable.php
@@ -0,0 +1,23 @@
+<?php
+namespace yii\easyii\widgets;
+
+use yii\base\Widget;
+use yii\base\InvalidConfigException;
+
+class FieldsTable extends Widget
+{
+ public $model;
+ public function init()
+ {
+ parent::init();
+ if (empty($this->model)) {
+ throw new InvalidConfigException('Required `model` param isn\'t set.');
+ }
+ }
+ public function run()
+ {
+ echo $this->render('fields_table', [
+ 'model' => $this->model
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/widgets/GoogleCharts.php b/widgets/GoogleCharts.php
new file mode 100644
index 0000000..2546ae7
--- /dev/null
+++ b/widgets/GoogleCharts.php
@@ -0,0 +1,64 @@
+<?php
+namespace yii\easyii\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\base\InvalidConfigException;
+
+class GoogleCharts extends Widget
+{
+ public $email;
+ public $ids;
+ public $p12;
+
+ public function init()
+ {
+ parent::init();
+
+ if (empty($this->email)) {
+ throw new InvalidConfigException('Required `email` param isn\'t set.');
+ }
+ if (empty($this->ids)) {
+ throw new InvalidConfigException('Required `ids` param isn\'t set.');
+ }
+ if (empty($this->p12) || !file_exists(Yii::getAlias($this->p12))) {
+ throw new InvalidConfigException('Required `p12` file path isn\'t set or file not exists.');
+ }
+ }
+
+ public function run()
+ {
+ $client = new \Google_Client();
+ $client->setClassConfig('Google_Cache_File', ['directory' => Yii::getAlias('@runtime')]);
+ $client->setAssertionCredentials(new \Google_Auth_AssertionCredentials($this->email, ['https://www.googleapis.com/auth/analytics.readonly'], file_get_contents(Yii::getAlias($this->p12))));
+ if($client->getAuth()->isAccessTokenExpired()) {
+ try{
+ $client->getAuth()->refreshTokenWithAssertion();
+ } catch(\Exception $e){
+ if(IS_ROOT){
+ echo $e->getMessage();
+ }
+ return;
+ }
+ }
+ $decodedTokenObject = json_decode($client->getAccessToken());
+
+ if(!json_last_error() && !empty($decodedTokenObject->access_token)) {
+ $this->view->registerJs("
+ (function(w,d,s,g,js,fs){
+ g=w.gapi||(w.gapi={});g.analytics={q:[],ready:function(f){this.q.push(f);}};
+ js=d.createElement(s);fs=d.getElementsByTagName(s)[0];
+ js.src='https://apis.google.com/js/platform.js';
+ fs.parentNode.insertBefore(js,fs);js.onload=function(){g.load('analytics');};
+ }(window,document,'script'));
+ ", \yii\web\View::POS_HEAD);
+
+ $period = (int)Yii::$app->request->get('period');
+
+ echo $this->render('google_charts', [
+ 'access_token' => $decodedTokenObject->access_token,
+ 'period' => $period
+ ]);
+ }
+ }
+}
\ No newline at end of file
diff --git a/widgets/GooglePlacesAutoComplete.php b/widgets/GooglePlacesAutoComplete.php
new file mode 100644
index 0000000..c416458
--- /dev/null
+++ b/widgets/GooglePlacesAutoComplete.php
@@ -0,0 +1,115 @@
+<?php
+namespace yii\easyii\widgets;
+
+use yii\base\InvalidConfigException;
+use yii\easyii\models\Setting;
+use yii\web\JsExpression;
+use yii\widgets\InputWidget;
+use yii\helpers\Html;
+
+class GooglePlacesAutoComplete extends InputWidget {
+ const API_URL = '//maps.googleapis.com/maps/api/js?';
+
+ public $libraries = 'places';
+ public $sensor = true;
+ public $key;
+
+ public $language;
+ public $autocompleteOptions = [];
+ public $inputId;
+ public $hiddenId;
+
+ public function init()
+ {
+ if ($this->name === null && !$this->hasModel()) {
+ throw new InvalidConfigException("Either 'name', or 'model' and 'attribute' properties must be specified.");
+ }
+ if(!$this->key && !($this->key = Setting::get('gm_api_key'))) {
+ throw new InvalidConfigException("You cannot use Google places autocomplete. Setting 'gm_api_key' empty or not found.");
+ }
+ $this->language = $this->language ? $this->language : \Yii::$app->language;
+
+ $this->inputId = $this->hasModel() ? Html::getInputId($this->model, $this->attribute) : $this->getId();
+ $this->hiddenId = 'hidden-' . $this->inputId;
+
+ $this->registerClientScript();
+ }
+
+ /**
+ * Renders the widget.
+ */
+ public function run()
+ {
+ $visibleValue = '';
+ if($this->value) {
+ $parts = explode('#', $this->value);
+ if(count($parts) == 4) {
+ $visibleValue = $parts[0];
+ }
+ }
+
+ echo '
+ <div class="input-group">
+ '.Html::textInput('', $visibleValue, ['class' => 'form-control gmaps-autocomplete', 'id' => $this->inputId]).'
+ '.($this->hasModel() ? Html::activeHiddenInput($this->model, $this->attribute, ['id' => $this->hiddenId]) : Html::hiddenInput($this->name, $this->value, ['id' => $this->hiddenId])).'
+ <span class="input-group-btn">
+ <button class="btn btn-default show-on-map ' . (empty($parts[1]) ? 'disabled' : '') . '" type="button"><i class="glyphicon glyphicon-map-marker"></i> ' . \Yii::t('easyii', 'Show on map') . '</button>
+ </span>
+ </div>
+ ';
+ }
+ /**
+ * Registers the needed JavaScript.
+ */
+ public function registerClientScript(){
+ $scriptOptions = json_encode($this->autocompleteOptions);
+ $view = $this->getView();
+ $view->registerJsFile(self::API_URL . http_build_query([
+ 'key' => Setting::get('gm_api_key'),
+ 'libraries' => $this->libraries,
+ 'sensor' => $this->sensor ? 'true' : 'false',
+ 'language' => $this->language
+ ]));
+ $view->registerJs(new JsExpression('
+ (function(){
+ var input = $("#' . $this->inputId . '");
+ var hiddenInput = $("#' . $this->hiddenId . '");
+ var autoComplete = new google.maps.places.Autocomplete(input.get(0), ' . $scriptOptions . ');
+
+ google.maps.event.addListener(autoComplete, "place_changed", function () {
+ var place = autoComplete.getPlace();
+ var addressString = [place.formatted_address, place.place_id, place.geometry.location.lat(), place.geometry.location.lng()].join("#");
+ hiddenInput.val(addressString);
+ input.parent().find(".show-on-map").removeClass("disabled");
+ });
+ })();
+ '), \yii\web\View::POS_READY);
+
+ $view->registerJs(new JsExpression('
+ $(".gmaps-autocomplete").on("change", function(e){
+ var $this = $(this);
+
+ if($this.val() == "") {
+ $this.siblings("input[type=hidden]").val("");
+ $this.parent().find(".show-on-map").addClass("disabled");
+ }
+ }).on("keyup keypress", function(e) {
+ var keyCode = e.keyCode || e.which;
+ if (keyCode === 13) {
+ e.preventDefault();
+ return false;
+ }
+ });
+
+ $(".show-on-map").click(function(){
+ var addressString = $(this).closest(".input-group").find("input[type=hidden]").val();
+ if(addressString) {
+ var parts = addressString.split("#");
+ if(parts.length == 4) {
+ $.fancybox(\'<iframe width="640" height="480" frameborder="0" style="border:0" src="https://www.google.com/maps/embed/v1/place?q=place_id:\' + parts[1] + \'&key=' . Setting::get('gm_api_key') . '&language=' . $this->language . '" allowfullscreen></iframe>\');
+ }
+ }
+ });
+ '), \yii\web\View::POS_READY, 'showonmap');
+ }
+}
\ No newline at end of file
diff --git a/widgets/Photos.php b/widgets/Photos.php
index 156f0fc..fe086cb 100644
--- a/widgets/Photos.php
+++ b/widgets/Photos.php
@@ -1,7 +1,6 @@
<?php
namespace yii\easyii\widgets;
-use Yii;
use yii\base\Widget;
use yii\base\InvalidConfigException;
use yii\easyii\models\Photo;
diff --git a/widgets/Redactor.php b/widgets/Redactor.php
index dbc8dde..c36c58e 100644
--- a/widgets/Redactor.php
+++ b/widgets/Redactor.php
@@ -2,91 +2,29 @@
namespace yii\easyii\widgets;
use Yii;
-use yii\easyii\helpers\Data;
-use yii\widgets\InputWidget;
-use yii\helpers\Html;
-use yii\helpers\Json;
-use yii\web\JsExpression;
-use yii\web\AssetBundle;
+use yii\easyii\models\Setting;
+use yii\helpers\Url;
-use yii\easyii\assets\RedactorAsset;
-
-class Redactor extends InputWidget
+class Redactor extends \vova07\imperavi\Widget
{
- public $options = [];
-
- private $_defaultOptions = [
- 'imageUpload' => '/admin/redactor/upload',
- 'fileUpload' => '/admin/redactor/upload'
- ];
- private $_assetBundle;
-
public function init()
{
- $this->options = array_merge($this->_defaultOptions, $this->options);
-
- if (isset($this->options['imageUpload'])) {
- $this->options['imageUploadErrorCallback'] = new JsExpression("function(json){alert(json.error);}");
- }
- if (isset($this->options['fileUpload'])) {
- $this->options['fileUploadErrorCallback'] = new JsExpression("function(json){alert(json.error);}");
- }
- $this->registerAssetBundle();
- $this->registerRegional();
- $this->registerPlugins();
- $this->registerScript();
- }
-
- public function run()
- {
- echo Html::activeTextarea($this->model, $this->attribute);
- }
-
- public function registerRegional()
- {
- $lang = Data::getLocale();
- if ($lang != 'en') {
- $langAsset = 'lang/' . $lang . '.js';
- if (file_exists(Yii::getAlias($this->assetBundle->sourcePath . '/' . $langAsset))) {
- $this->assetBundle->js[] = $langAsset;
- $this->options['lang'] = $lang;
- }
- }
- }
-
- public function registerPlugins()
- {
- if (isset($this->options['plugins']) && count($this->options['plugins'])) {
- foreach ($this->options['plugins'] as $plugin) {
- $js = 'plugins/' . $plugin . '/' . $plugin . '.js';
- if (file_exists(Yii::getAlias($this->assetBundle->sourcePath . DIRECTORY_SEPARATOR . $js))) {
- $this->assetBundle->js[] = $js;
- }
- $css = 'plugins/' . $plugin . '/' . $plugin . '.css';
- if (file_exists(Yii::getAlias($this->assetBundle->sourcePath . '/' . $css))) {
- $this->assetBundle->css[] = $css;
- }
+ $this->defaultSettings = [
+ 'minHeight' => 400,
+ 'imageUpload' => Url::to(['/admin/redactor/image-upload']),
+ 'fileUpload' => Url::to(['/admin/redactor/file-upload']),
+ 'imageManagerJson' => Url::to(['/admin/redactor/images-get']),
+ 'fileManagerJson' => Url::to(['/admin/redactor/files-get']),
+ 'plugins' => Setting::getAsArray('redactor_plugins')
+ ];
+ if(Yii::$app->language !== 'en-US') {
+ if(Yii::$app->language === 'zh-CN'){
+ $lang = 'zh_cn';
+ } else {
+ $lang = substr(Yii::$app->language, 0, 2);
}
+ $this->defaultSettings['lang'] = $lang;
}
+ parent::init();
}
-
- public function registerScript()
- {
- $clientOptions = (count($this->options)) ? Json::encode($this->options) : '';
- $this->getView()->registerJs("jQuery('#".Html::getInputId($this->model, $this->attribute)."').redactor({$clientOptions});");
- }
-
- public function registerAssetBundle()
- {
- $this->_assetBundle = RedactorAsset::register($this->getView());
- }
-
- public function getAssetBundle()
- {
- if (!($this->_assetBundle instanceof AssetBundle)) {
- $this->registerAssetBundle();
- }
- return $this->_assetBundle;
- }
-
-}
+}
\ No newline at end of file
diff --git a/modules/catalog/views/a/fields.php b/widgets/views/fields_table.php
similarity index 68%
rename from modules/catalog/views/a/fields.php
rename to widgets/views/fields_table.php
index 885753a..2d1bdbf 100644
--- a/modules/catalog/views/a/fields.php
+++ b/widgets/views/fields_table.php
@@ -1,21 +1,18 @@
<?php
+use yii\easyii\assets\FieldsTableAsset;
+use yii\easyii\components\CategoryWithFieldsModel;
use yii\helpers\Html;
-use yii\easyii\modules\catalog\assets\FieldsAsset;
-use yii\easyii\modules\catalog\models\Category;
-
-$this->title = Yii::t('easyii/catalog', 'Category fields');
-
-$this->registerAssetBundle(FieldsAsset::className());
+$this->registerAssetBundle(FieldsTableAsset::className());
$this->registerJs('
var fieldTemplate = \'\
<tr>\
<td>'. Html::input('text', null, null, ['class' => 'form-control field-name']) .'</td>\
<td>'. Html::input('text', null, null, ['class' => 'form-control field-title']) .'</td>\
<td>\
- <select class="form-control field-type">'.str_replace("\n", "", Html::renderSelectOptions('', Category::$fieldTypes)).'</select>\
+ <select class="form-control field-type">'.str_replace("\n", "", Html::renderSelectOptions('', CategoryWithFieldsModel::$FIELD_TYPES)).'</select>\
</td>\
- <td><textarea class="form-control field-options" placeholder="'.Yii::t('easyii/catalog', 'Type options with `comma` as delimiter').'" style="display: none;"></textarea></td>\
+ <td><textarea class="form-control field-options" placeholder="'.Yii::t('easyii', 'Type options with `comma` as delimiter').'" style="display: none;"></textarea></td>\
<td class="text-right">\
<div class="btn-group btn-group-sm" role="group">\
<a href="#" class="btn btn-default move-up" title="'. Yii::t('easyii', 'Move up') .'"><span class="glyphicon glyphicon-arrow-up"></span></a>\
@@ -24,22 +21,19 @@
</div>\
</td>\
</tr>\';
+var fieldsWithOptions = ["' . implode('","', CategoryWithFieldsModel::$FIELDS_WITH_OPTIONS) . '"];
', \yii\web\View::POS_HEAD);
?>
-<?= $this->render('@easyii/views/category/_menu') ?>
-<?= $this->render('_submenu', ['model' => $model]) ?>
-<br>
-
-<?= Html::button('<i class="glyphicon glyphicon-plus font-12"></i> '.Yii::t('easyii/catalog', 'Add field'), ['class' => 'btn btn-default', 'id' => 'addField']) ?>
+<?= Html::button('<i class="glyphicon glyphicon-plus font-12"></i> '.Yii::t('easyii', 'Add field'), ['class' => 'btn btn-default', 'id' => 'addField']) ?>
<table id="categoryFields" class="table table-hover">
<thead>
- <th>Name</th>
- <th><?= Yii::t('easyii', 'Title') ?></th>
- <th><?= Yii::t('easyii/catalog', 'Type') ?></th>
- <th><?= Yii::t('easyii/catalog', 'Options') ?></th>
- <th width="120"></th>
+ <th>Name</th>
+ <th><?= Yii::t('easyii', 'Title') ?></th>
+ <th><?= Yii::t('easyii', 'Type') ?></th>
+ <th><?= Yii::t('easyii', 'Options') ?></th>
+ <th width="120"></th>
</thead>
<tbody>
<?php foreach($model->fields as $field) : ?>
@@ -48,11 +42,11 @@
<td><?= Html::input('text', null, $field->title, ['class' => 'form-control field-title']) ?></td>
<td>
<select class="form-control field-type">
- <?= Html::renderSelectOptions($field->type, Category::$fieldTypes) ?>
+ <?= Html::renderSelectOptions($field->type, CategoryWithFieldsModel::$FIELD_TYPES) ?>
</select>
</td>
<td>
- <textarea class="form-control field-options" placeholder="<?= Yii::t('easyii/catalog', 'Type options with `comma` as delimiter') ?>" <?= !$field->options ? 'style="display: none;"' : '' ?> ><?= is_array($field->options) ? implode(',', $field->options) : '' ?></textarea>
+ <textarea class="form-control field-options" placeholder="<?= Yii::t('easyii', 'Type options with `comma` as delimiter') ?>" <?= (!in_array($field->type, CategoryWithFieldsModel::$FIELDS_WITH_OPTIONS)) ? 'style="display: none;"' : '' ?> ><?= is_array($field->options) ? implode(',', $field->options) : $field->options ?></textarea>
</td>
<td class="text-right">
<div class="btn-group btn-group-sm" role="group">
@@ -65,4 +59,4 @@
<?php endforeach; ?>
</tbody>
</table>
-<?= Html::button('<i class="glyphicon glyphicon-ok"></i> '.Yii::t('easyii/catalog', 'Save fields'), ['class' => 'btn btn-primary', 'id' => 'saveCategoryBtn']) ?>
+<?= Html::button('<i class="glyphicon glyphicon-ok"></i> '.Yii::t('easyii', 'Save fields'), ['class' => 'btn btn-primary', 'id' => 'saveCategoryBtn']) ?>
\ No newline at end of file
diff --git a/widgets/views/google_charts.php b/widgets/views/google_charts.php
new file mode 100644
index 0000000..59021bc
--- /dev/null
+++ b/widgets/views/google_charts.php
@@ -0,0 +1,169 @@
+<?php
+use yii\helpers\Url;
+?>
+<h2>
+ <?= Yii::t('easyii', 'Statistics') ?>
+ <div class="btn-group pull-right" role="group">
+ <a href="<?= Url::current(['period' => 30]) ?>" type="button" class="btn btn-<?= ($period == 30 ? 'primary' : 'default') ?>"><?= Yii::t('easyii', 'Month') ?></a>
+ <a href="<?= Url::current(['period' => 7]) ?>" type="button" class="btn btn-<?= ($period == 7 ? 'primary' : 'default') ?>"><?= Yii::t('easyii', 'Week') ?></a>
+ <a href="<?= Url::current(['period' => '']) ?>" type="button" class="btn btn-<?= ($period ? 'default' : 'primary') ?>"><?= Yii::t('easyii', 'Today') ?></a>
+ </div>
+</h2>
+
+<div class="active-users">
+ <span class="pull-left img-circle online-circle"></span>
+ <?= Yii::t('easyii', 'Active users') ?>:
+ <b id="active-users-count"></b>
+</div>
+
+<br />
+
+<table class="chart-table">
+ <tr><th><?= Yii::t('easyii', 'Sessions and views') ?></th></tr>
+ <tr><td><div id="chart-1-container"><br/><span class="small smooth"><?= Yii::t('easyii', 'chart is loading') ?>...</span></div></td></tr>
+</table>
+
+<br />
+
+<div class="row">
+ <div class="col-md-6">
+ <table class="chart-table">
+ <tr><th><?= Yii::t('easyii', 'Countries') ?></th></tr>
+ <tr><td><div id="chart-2-container"><br/><span class="small smooth"><?= Yii::t('easyii', 'chart is loading') ?>...</span></div></td></tr>
+ </table>
+ </div>
+ <div class="col-md-6">
+ <table class="chart-table">
+ <tr><th><?= Yii::t('easyii', 'Sources') ?></th></tr>
+ <tr><td><div id="chart-3-container"><br/><span class="small smooth"><?= Yii::t('easyii', 'chart is loading') ?>...</span></div></td></tr>
+ </table>
+ </div>
+</div>
+
+<script>
+ gapi.analytics.ready(function() {
+ gapi.analytics.createComponent("ActiveUsers", {
+ initialize: function() {
+ this.activeUsers = 0
+ },
+ execute: function() {
+ this.polling_ && this.stop(), this.render_(), gapi.analytics.auth.isAuthorized() ? this.getActiveUsers_() : gapi.analytics.auth.once("success", this.getActiveUsers_.bind(this))
+ },
+ stop: function() {
+ clearTimeout(this.timeout_), this.polling_ = !1, this.emit("stop", {
+ activeUsers: this.activeUsers
+ })
+ },
+ render_: function() {
+ var t = this.get();
+ this.container = "string" == typeof t.container ? document.getElementById(t.container) : t.container, this.container.innerHTML = this.activeUsers
+ },
+ getActiveUsers_: function() {
+ var t = this.get(),
+ e = 1e3 * (t.pollingInterval || 5);
+ if (isNaN(e) || 5e3 > e) throw new Error("Frequency must be 5 seconds or more.");
+ this.polling_ = !0, gapi.client.analytics.data.realtime.get({
+ ids: t.ids,
+ metrics: "rt:activeUsers"
+ }).execute(function(t) {
+ var i = t.totalResults ? +t.rows[0][0] : 0,
+ s = this.activeUsers;
+ this.emit("success", {
+ activeUsers: this.activeUsers
+ }), i != s && (this.activeUsers = i, this.onChange_(i - s)), (this.polling_ = !0) && (this.timeout_ = setTimeout(this.getActiveUsers_.bind(this), e))
+ }.bind(this))
+ },
+ onChange_: function(t) {
+ var e = this.container;
+ e && (e.innerHTML = this.activeUsers), this.emit("change", {
+ activeUsers: this.activeUsers,
+ delta: t
+ }), t > 0 ? this.emit("increase", {
+ activeUsers: this.activeUsers,
+ delta: t
+ }) : this.emit("decrease", {
+ activeUsers: this.activeUsers,
+ delta: t
+ })
+ }
+ });
+
+ /**
+ * Authorize the user with an access token obtained server side.
+ */
+ gapi.analytics.auth.authorize({
+ 'serverAuth': {
+ 'access_token': '<?= $access_token ?>'
+ }
+ });
+
+ var activeUsers = new gapi.analytics.ext.ActiveUsers({
+ ids: 'ga:<?= $this->context->ids ?>',
+ container: 'active-users-count',
+ pollingInterval: 10
+ });
+
+ var dataChart1 = new gapi.analytics.googleCharts.DataChart({
+ query: {
+ 'ids': 'ga:<?= $this->context->ids ?>',
+ 'start-date': '<?= ($period ? $period . 'daysAgo' : 'today') ?>',
+ 'end-date': 'today',
+ 'metrics': 'ga:pageviews,ga:sessions',
+ 'dimensions': 'ga:<?= ($period ? 'date' : 'hour') ?>'
+ },
+ chart: {
+ 'container': 'chart-1-container',
+ 'type': 'LINE',
+ 'options': {
+ 'width': '100%'
+ }
+ }
+ });
+
+ var dataChart2 = new gapi.analytics.googleCharts.DataChart({
+ query: {
+ 'ids': 'ga:<?= $this->context->ids ?>',
+ 'start-date': '<?= ($period ? $period . 'daysAgo' : 'today') ?>',
+ 'end-date': 'today',
+ 'metrics': 'ga:sessions',
+ 'dimensions': 'ga:country',
+ 'sort': '-ga:sessions',
+ 'max-results': 7
+ },
+ chart: {
+ 'container': 'chart-2-container',
+ 'type': 'PIE',
+ 'options': {
+ 'width': '50%',
+ 'pieHole': 4/9
+ }
+ }
+ });
+
+ var dataChart3 = new gapi.analytics.googleCharts.DataChart({
+ query: {
+ 'ids': 'ga:<?= $this->context->ids ?>',
+ 'start-date': '<?= ($period ? $period . 'daysAgo' : 'today') ?>',
+ 'end-date': 'today',
+ 'metrics': 'ga:sessions',
+ 'dimensions': 'ga:source',
+ 'sort': '-ga:sessions',
+ 'max-results': 7
+ },
+ chart: {
+ 'container': 'chart-3-container',
+ 'type': 'PIE',
+ 'options': {
+ 'width': '50%',
+ 'pieHole': 4/9
+ }
+ }
+ });
+
+ activeUsers.execute();
+ dataChart1.execute();
+ dataChart2.execute();
+ dataChart3.execute();
+
+ });
+</script>
\ No newline at end of file
diff --git a/widgets/views/photos.php b/widgets/views/photos.php
index 53a7179..69b7fd1 100644
--- a/widgets/views/photos.php
+++ b/widgets/views/photos.php
@@ -12,23 +12,18 @@
$class = get_class($this->context->model);
$item_id = $this->context->model->primaryKey;
-$linkParams = [
- 'class' => $class,
- 'item_id' => $item_id,
-];
-
-$photoTemplate = '<tr data-id="{{photo_id}}">'.(IS_ROOT ? '<td>{{photo_id}}</td>' : '').'\
- <td><a href="{{photo_image}}" class="plugin-box" title="{{photo_description}}" rel="easyii-photos"><img class="photo-thumb" id="photo-{{photo_id}}" src="{{photo_thumb}}"></a></td>\
+$photoTemplate = '<tr data-id="{{id}}">'.(IS_ROOT ? '<td>{{id}}</td>' : '').'\
+ <td><a href="{{photo_image}}" class="plugin-box" title="{{photo_description}}" rel="easyii-photos"><img class="photo-thumb" id="photo-{{id}}" src="{{photo_thumb}}"></a></td>\
<td>\
<textarea class="form-control photo-description">{{photo_description}}</textarea>\
- <a href="' . Url::to(['/admin/photos/description/{{photo_id}}']) . '" class="btn btn-sm btn-primary disabled save-photo-description">'. Yii::t('easyii', 'Save') .'</a>\
+ <a href="' . Url::to(['/admin/photos/description/{{id}}']) . '" class="btn btn-sm btn-primary disabled save-photo-description">'. Yii::t('easyii', 'Save') .'</a>\
</td>\
<td class="control vtop">\
<div class="btn-group btn-group-sm" role="group">\
- <a href="' . Url::to(['/admin/photos/up/{{photo_id}}'] + $linkParams) . '" class="btn btn-default move-up" title="'. Yii::t('easyii', 'Move up') .'"><span class="glyphicon glyphicon-arrow-up"></span></a>\
- <a href="' . Url::to(['/admin/photos/down/{{photo_id}}'] + $linkParams) . '" class="btn btn-default move-down" title="'. Yii::t('easyii', 'Move down') .'"><span class="glyphicon glyphicon-arrow-down"></span></a>\
- <a href="' . Url::to(['/admin/photos/image/{{photo_id}}'] + $linkParams) . '" class="btn btn-default change-image-button" title="'. Yii::t('easyii', 'Change image') .'"><span class="glyphicon glyphicon-floppy-disk"></span></a>\
- <a href="' . Url::to(['/admin/photos/delete/{{photo_id}}']) . '" class="btn btn-default color-red delete-photo" title="'. Yii::t('easyii', 'Delete item') .'"><span class="glyphicon glyphicon-remove"></span></a>\
+ <a href="' . Url::to(['/admin/photos/up/{{id}}']) . '" class="btn btn-default move-up" title="'. Yii::t('easyii', 'Move up') .'"><span class="glyphicon glyphicon-arrow-up"></span></a>\
+ <a href="' . Url::to(['/admin/photos/down/{{id}}']) . '" class="btn btn-default move-down" title="'. Yii::t('easyii', 'Move down') .'"><span class="glyphicon glyphicon-arrow-down"></span></a>\
+ <a href="' . Url::to(['/admin/photos/image/{{id}}']) . '" class="btn btn-default change-image-button" title="'. Yii::t('easyii', 'Change image') .'"><span class="glyphicon glyphicon-floppy-disk"></span></a>\
+ <a href="' . Url::to(['/admin/photos/delete/{{id}}']) . '" class="btn btn-default color-red delete-photo" title="'. Yii::t('easyii', 'Delete item') .'"><span class="glyphicon glyphicon-remove"></span></a>\
<input type="file" name="Photo[image]" class="change-image-input hidden">\
</div>\
</td>\
@@ -55,8 +50,8 @@
<tbody>
<?php foreach($photos as $photo) : ?>
<?= str_replace(
- ['{{photo_id}}', '{{photo_thumb}}', '{{photo_image}}', '{{photo_description}}'],
- [$photo->primaryKey, Image::thumb($photo->image, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT), $photo->image, $photo->description],
+ ['{{id}}', '{{photo_thumb}}', '{{photo_image}}', '{{photo_description}}'],
+ [$photo->primaryKey, Image::thumb($photo->image_file, Photo::PHOTO_THUMB_WIDTH, Photo::PHOTO_THUMB_HEIGHT), $photo->image, $photo->description],
$photoTemplate)
?>
<?php endforeach; ?>
@@ -64,7 +59,7 @@
</table>
<p class="empty" style="display: <?= count($photos) ? 'none' : 'block' ?>;"><?= Yii::t('easyii', 'No photos uploaded yet') ?>.</p>
-<?= Html::beginForm(Url::to(['/admin/photos/upload'] + $linkParams), 'post', ['enctype' => 'multipart/form-data']) ?>
+<?= Html::beginForm(Url::to(['/admin/photos/upload', 'class' => $class, 'item_id' => $item_id]), 'post', ['enctype' => 'multipart/form-data']) ?>
<?= Html::fileInput('', null, [
'id' => 'photo-file',
'class' => 'hidden',