\ No newline at end of file
diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm
index 62f852781..3000b0d79 100644
--- a/modules/backend/controllers/groups/create.htm
+++ b/modules/backend/controllers/groups/create.htm
@@ -2,7 +2,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -37,6 +37,6 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/groups/index.htm b/modules/backend/controllers/groups/index.htm
index c3dccaf27..ee75b8527 100644
--- a/modules/backend/controllers/groups/index.htm
+++ b/modules/backend/controllers/groups/index.htm
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/modules/backend/controllers/users/create.htm b/modules/backend/controllers/users/create.htm
index 828987baa..bbbb4c83b 100644
--- a/modules/backend/controllers/users/create.htm
+++ b/modules/backend/controllers/users/create.htm
@@ -1,7 +1,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -54,7 +54,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/myaccount.htm b/modules/backend/controllers/users/myaccount.htm
index 32578229e..fe9641d1d 100644
--- a/modules/backend/controllers/users/myaccount.htm
+++ b/modules/backend/controllers/users/myaccount.htm
@@ -44,7 +44,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm
index aa3a486a9..54bb51a6f 100644
--- a/modules/backend/controllers/users/update.htm
+++ b/modules/backend/controllers/users/update.htm
@@ -1,7 +1,7 @@
-
pageTitle) ?>
+
pageTitle)) ?>
@@ -62,7 +62,7 @@
-
fatalError) ?>
+
fatalError)) ?>
\ No newline at end of file
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
new file mode 100644
index 000000000..05b3a93f9
--- /dev/null
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -0,0 +1,81 @@
+availableColors = $this->getConfig('availableColors', $this->availableColors);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function render()
+ {
+ $this->prepareVars();
+ return $this->makePartial('colorpicker');
+ }
+
+ /**
+ * Prepares the list data
+ */
+ public function prepareVars()
+ {
+ $this->vars['name'] = $this->formField->getName();
+ $this->vars['value'] = $value = $this->getLoadData();
+ $this->vars['availableColors'] = $this->availableColors;
+ $this->vars['isCustomColor'] = !in_array($value, $this->availableColors);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function loadAssets()
+ {
+ $this->addCss('vendor/colpick/css/colpick.css', 'core');
+ $this->addJs('vendor/colpick/js/colpick.js', 'core');
+ $this->addCss('css/colorpicker.css', 'core');
+ $this->addJs('js/colorpicker.js', 'core');
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getSaveData($value)
+ {
+ return strlen($value) ? $value : null;
+ }
+}
\ No newline at end of file
diff --git a/modules/backend/formwidgets/Datepicker.php b/modules/backend/formwidgets/Datepicker.php
index dba596a5e..3993ce10b 100644
--- a/modules/backend/formwidgets/Datepicker.php
+++ b/modules/backend/formwidgets/Datepicker.php
@@ -9,7 +9,7 @@ use Backend\Classes\FormWidgetBase;
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
-class Datepicker extends FormWidgetBase
+class DatePicker extends FormWidgetBase
{
/**
* {@inheritDoc}
diff --git a/modules/backend/formwidgets/colorpicker/assets/css/colorpicker.css b/modules/backend/formwidgets/colorpicker/assets/css/colorpicker.css
new file mode 100644
index 000000000..3c70325a7
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/assets/css/colorpicker.css
@@ -0,0 +1,59 @@
+.field-colorpicker > ul {
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ margin-top: -8px;
+}
+.field-colorpicker > ul li {
+ float: left;
+ text-indent: -9999px;
+ padding: 3px;
+ margin: 14px 14px 0 0;
+ cursor: pointer;
+ border-radius: 2px;
+}
+.field-colorpicker > ul li span {
+ display: block;
+ width: 25px;
+ height: 25px;
+ border: 1px solid #cecece;
+}
+.field-colorpicker > ul li:hover,
+.field-colorpicker > ul li.active {
+ background-color: #cecece;
+}
+.field-colorpicker > ul li:hover span,
+.field-colorpicker > ul li.active span {
+ border: 1px solid #ffffff;
+}
+.field-colorpicker > ul li.custom-color {
+ position: relative;
+}
+.field-colorpicker > ul li.custom-color span {
+ border-style: dashed;
+}
+.field-colorpicker > ul li.custom-color:hover span,
+.field-colorpicker > ul li.custom-color.active span {
+ border-style: solid;
+}
+.field-colorpicker > ul li.custom-color:before {
+ text-indent: 0;
+ font-family: FontAwesome;
+ font-weight: normal;
+ font-style: normal;
+ text-decoration: inherit;
+ -webkit-font-smoothing: antialiased;
+ *margin-right: .3em;
+ content: "\f0d8";
+ display: block;
+ text-align: center;
+ color: #000;
+ background: #e0e0e0;
+ font-size: 9px;
+ height: 9px;
+ line-height: 9px;
+ width: 9px;
+ position: absolute;
+ bottom: 3px;
+ right: 3px;
+}
diff --git a/modules/backend/formwidgets/colorpicker/assets/js/colorpicker.js b/modules/backend/formwidgets/colorpicker/assets/js/colorpicker.js
new file mode 100644
index 000000000..e281c214e
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/assets/js/colorpicker.js
@@ -0,0 +1,114 @@
+/*
+ * ColorPicker plugin
+ *
+ * Data attributes:
+ * - data-control="colorpicker" - enables the plugin on an element
+ * - data-data-locker="input#locker" - Input element to store and restore the chosen color
+ *
+ * JavaScript API:
+ * $('div#someElement').colorPicker({ dataLocker: 'input#locker' })
+ *
+ * Dependences:
+ * - Some other plugin (filename.js)
+ */
+
++function ($) { "use strict";
+
+ // COLORPICKER CLASS DEFINITION
+ // ============================
+
+ var ColorPicker = function(element, options) {
+ this.options = options
+ this.$el = $(element)
+
+ // Init
+ this.init()
+ }
+
+ ColorPicker.DEFAULTS = {
+ dataLocker: null
+ }
+
+ ColorPicker.prototype.init = function() {
+ var self = this
+ this.$dataLocker = $(this.options.dataLocker, this.$el)
+ this.$colorList = $('>ul', this.$el)
+ this.$customColor = $('[data-custom-color]', this.$el)
+
+ this.$colorList.on('click', '>li', function(){
+ self.selectColor(this)
+ })
+
+ /*
+ * Custom color
+ */
+ if (this.$customColor.length) {
+ this.$customColor.colpick({
+ layout: 'hex',
+ submit: 0,
+ color: this.$customColor.data('hexColor'),
+ onShow: function(cal) {
+ var el = $(cal).data('colpick').el
+ self.selectColor(el)
+ },
+ onChange: function(hsb, hex, rgb, el, bySetColor) {
+ $('>span', el).css('background', '#'+hex)
+ $(el).data('hexColor', '#'+hex)
+ self.setColor('#'+hex)
+ }
+ })
+ }
+
+ }
+
+ ColorPicker.prototype.setColor = function(hexColor) {
+ this.$dataLocker.val(hexColor)
+ }
+
+ ColorPicker.prototype.selectColor = function(el) {
+ var $item = $(el)
+
+ $item
+ .addClass('active')
+ .siblings().removeClass('active')
+
+ this.setColor($item.data('hexColor'))
+ }
+
+ // COLORPICKER PLUGIN DEFINITION
+ // ============================
+
+ var old = $.fn.colorPicker
+
+ $.fn.colorPicker = function (option) {
+ var args = Array.prototype.slice.call(arguments, 1), result
+ this.each(function () {
+ var $this = $(this)
+ var data = $this.data('oc.colorpicker')
+ var options = $.extend({}, ColorPicker.DEFAULTS, $this.data(), typeof option == 'object' && option)
+ if (!data) $this.data('oc.colorpicker', (data = new ColorPicker(this, options)))
+ if (typeof option == 'string') result = data[option].apply(data, args)
+ if (typeof result != 'undefined') return false
+ })
+
+ return result ? result : this
+ }
+
+ $.fn.colorPicker.Constructor = ColorPicker
+
+ // COLORPICKER NO CONFLICT
+ // =================
+
+ $.fn.colorPicker.noConflict = function () {
+ $.fn.colorPicker = old
+ return this
+ }
+
+ // COLORPICKER DATA-API
+ // ===============
+
+ $(document).render(function() {
+ $('[data-control="colorpicker"]').colorPicker()
+ })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less b/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less
new file mode 100644
index 000000000..51a9a6233
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less
@@ -0,0 +1,72 @@
+@import "../../../../assets/less/core/boot.less";
+
+
+@color-colorpicker-border: #cecece;
+@color-colorpicker-active-border: #fff;
+@color-colorpicker-active: #5fb6f5;
+
+.field-colorpicker {
+
+ > ul {
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ margin-top: -8px;
+
+ li {
+ float: left;
+ text-indent: -9999px;
+ padding: 3px;
+ margin: 14px 14px 0 0;
+ cursor: pointer;
+ border-radius: @border-radius-base;
+
+ span {
+ display: block;
+ width: 25px;
+ height: 25px;
+ border: 1px solid @color-colorpicker-border;
+ }
+
+ &:hover,
+ &.active {
+ background-color: @color-colorpicker-border;
+ span {
+ border: 1px solid @color-colorpicker-active-border;
+ }
+ }
+
+ &.custom-color {
+ position: relative;
+ span {
+ border-style: dashed;
+ }
+ &:hover,
+ &.active {
+ span {
+ border-style: solid;
+ }
+ }
+
+ &:before {
+ text-indent: 0;
+ .icon-FontAutumn();
+ content: @caret-up;
+ display: block;
+ text-align: center;
+ color: #000;
+ background: #e0e0e0;
+ font-size: 9px;
+ height: 9px;
+ line-height: 9px;
+ width: 9px;
+ position: absolute;
+ bottom: 3px;
+ right: 3px;
+ }
+ }
+ }
+
+ }
+
+}
diff --git a/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/LICENSE b/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/LICENSE
new file mode 100644
index 000000000..70d53ac30
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/LICENSE
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ jQuery Color Picker with RGB, HSB and HEX fields, several skins and layouts
+ Copyright (C) 2013 Jose Vargas
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ {signature of Ty Coon}, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/README.md b/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/README.md
new file mode 100644
index 000000000..594e7c01d
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/assets/vendor/colpick/README.md
@@ -0,0 +1,36 @@
+colpick Color Picker
+====================
+
+colpick is a simple Photoshop-style color picker jQuery plugin. Its interface is familiar for most users and it's also very lightweight loading less than 30 KB to the browser.
+
+For instructions and examples see: http://colpick.com/plugin
+
+
',
+ defaults = {
+ showEvent: 'click',
+ onShow: function () {},
+ onBeforeShow: function(){},
+ onHide: function () {},
+ onChange: function () {},
+ onSubmit: function () {},
+ colorScheme: 'light',
+ color: '3289c7',
+ livePreview: true,
+ flat: false,
+ layout: 'full',
+ submit: 1,
+ submitText: 'OK',
+ height: 156
+ },
+ //Fill the inputs of the plugin
+ fillRGBFields = function (hsb, cal) {
+ var rgb = hsbToRgb(hsb);
+ $(cal).data('colpick').fields
+ .eq(1).val(rgb.r).end()
+ .eq(2).val(rgb.g).end()
+ .eq(3).val(rgb.b).end();
+ },
+ fillHSBFields = function (hsb, cal) {
+ $(cal).data('colpick').fields
+ .eq(4).val(Math.round(hsb.h)).end()
+ .eq(5).val(Math.round(hsb.s)).end()
+ .eq(6).val(Math.round(hsb.b)).end();
+ },
+ fillHexFields = function (hsb, cal) {
+ $(cal).data('colpick').fields.eq(0).val(hsbToHex(hsb));
+ },
+ //Set the round selector position
+ setSelector = function (hsb, cal) {
+ $(cal).data('colpick').selector.css('backgroundColor', '#' + hsbToHex({h: hsb.h, s: 100, b: 100}));
+ $(cal).data('colpick').selectorIndic.css({
+ left: parseInt($(cal).data('colpick').height * hsb.s/100, 10),
+ top: parseInt($(cal).data('colpick').height * (100-hsb.b)/100, 10)
+ });
+ },
+ //Set the hue selector position
+ setHue = function (hsb, cal) {
+ $(cal).data('colpick').hue.css('top', parseInt($(cal).data('colpick').height - $(cal).data('colpick').height * hsb.h/360, 10));
+ },
+ //Set current and new colors
+ setCurrentColor = function (hsb, cal) {
+ $(cal).data('colpick').currentColor.css('backgroundColor', '#' + hsbToHex(hsb));
+ },
+ setNewColor = function (hsb, cal) {
+ $(cal).data('colpick').newColor.css('backgroundColor', '#' + hsbToHex(hsb));
+ },
+ //Called when the new color is changed
+ change = function (ev) {
+ var cal = $(this).parent().parent(), col;
+ if (this.parentNode.className.indexOf('_hex') > 0) {
+ cal.data('colpick').color = col = hexToHsb(fixHex(this.value));
+ fillRGBFields(col, cal.get(0));
+ fillHSBFields(col, cal.get(0));
+ } else if (this.parentNode.className.indexOf('_hsb') > 0) {
+ cal.data('colpick').color = col = fixHSB({
+ h: parseInt(cal.data('colpick').fields.eq(4).val(), 10),
+ s: parseInt(cal.data('colpick').fields.eq(5).val(), 10),
+ b: parseInt(cal.data('colpick').fields.eq(6).val(), 10)
+ });
+ fillRGBFields(col, cal.get(0));
+ fillHexFields(col, cal.get(0));
+ } else {
+ cal.data('colpick').color = col = rgbToHsb(fixRGB({
+ r: parseInt(cal.data('colpick').fields.eq(1).val(), 10),
+ g: parseInt(cal.data('colpick').fields.eq(2).val(), 10),
+ b: parseInt(cal.data('colpick').fields.eq(3).val(), 10)
+ }));
+ fillHexFields(col, cal.get(0));
+ fillHSBFields(col, cal.get(0));
+ }
+ setSelector(col, cal.get(0));
+ setHue(col, cal.get(0));
+ setNewColor(col, cal.get(0));
+ cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 0]);
+ },
+ //Change style on blur and on focus of inputs
+ blur = function (ev) {
+ $(this).parent().removeClass('colpick_focus');
+ },
+ focus = function () {
+ $(this).parent().parent().data('colpick').fields.parent().removeClass('colpick_focus');
+ $(this).parent().addClass('colpick_focus');
+ },
+ //Increment/decrement arrows functions
+ downIncrement = function (ev) {
+ ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
+ var field = $(this).parent().find('input').focus();
+ var current = {
+ el: $(this).parent().addClass('colpick_slider'),
+ max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
+ y: ev.pageY,
+ field: field,
+ val: parseInt(field.val(), 10),
+ preview: $(this).parent().parent().data('colpick').livePreview
+ };
+ $(document).mouseup(current, upIncrement);
+ $(document).mousemove(current, moveIncrement);
+ },
+ moveIncrement = function (ev) {
+ ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val - ev.pageY + ev.data.y, 10))));
+ if (ev.data.preview) {
+ change.apply(ev.data.field.get(0), [true]);
+ }
+ return false;
+ },
+ upIncrement = function (ev) {
+ change.apply(ev.data.field.get(0), [true]);
+ ev.data.el.removeClass('colpick_slider').find('input').focus();
+ $(document).off('mouseup', upIncrement);
+ $(document).off('mousemove', moveIncrement);
+ return false;
+ },
+ //Hue slider functions
+ downHue = function (ev) {
+ ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
+ var current = {
+ cal: $(this).parent(),
+ y: $(this).offset().top
+ };
+ $(document).on('mouseup touchend',current,upHue);
+ $(document).on('mousemove touchmove',current,moveHue);
+
+ var pageY = ((ev.type == 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
+ change.apply(
+ current.cal.data('colpick')
+ .fields.eq(4).val(parseInt(360*(current.cal.data('colpick').height - (pageY - current.y))/current.cal.data('colpick').height, 10))
+ .get(0),
+ [current.cal.data('colpick').livePreview]
+ );
+ return false;
+ },
+ moveHue = function (ev) {
+ var pageY = ((ev.type == 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
+ change.apply(
+ ev.data.cal.data('colpick')
+ .fields.eq(4).val(parseInt(360*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.y))))/ev.data.cal.data('colpick').height, 10))
+ .get(0),
+ [ev.data.preview]
+ );
+ return false;
+ },
+ upHue = function (ev) {
+ fillRGBFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
+ fillHexFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
+ $(document).off('mouseup touchend',upHue);
+ $(document).off('mousemove touchmove',moveHue);
+ return false;
+ },
+ //Color selector functions
+ downSelector = function (ev) {
+ ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
+ var current = {
+ cal: $(this).parent(),
+ pos: $(this).offset()
+ };
+ current.preview = current.cal.data('colpick').livePreview;
+
+ $(document).on('mouseup touchend',current,upSelector);
+ $(document).on('mousemove touchmove',current,moveSelector);
+
+ var payeX,pageY;
+ if(ev.type == 'touchstart') {
+ pageX = ev.originalEvent.changedTouches[0].pageX,
+ pageY = ev.originalEvent.changedTouches[0].pageY;
+ } else {
+ pageX = ev.pageX;
+ pageY = ev.pageY;
+ }
+
+ change.apply(
+ current.cal.data('colpick').fields
+ .eq(6).val(parseInt(100*(current.cal.data('colpick').height - (pageY - current.pos.top))/current.cal.data('colpick').height, 10)).end()
+ .eq(5).val(parseInt(100*(pageX - current.pos.left)/current.cal.data('colpick').height, 10))
+ .get(0),
+ [current.preview]
+ );
+ return false;
+ },
+ moveSelector = function (ev) {
+ var payeX,pageY;
+ if(ev.type == 'touchmove') {
+ pageX = ev.originalEvent.changedTouches[0].pageX,
+ pageY = ev.originalEvent.changedTouches[0].pageY;
+ } else {
+ pageX = ev.pageX;
+ pageY = ev.pageY;
+ }
+
+ change.apply(
+ ev.data.cal.data('colpick').fields
+ .eq(6).val(parseInt(100*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.pos.top))))/ev.data.cal.data('colpick').height, 10)).end()
+ .eq(5).val(parseInt(100*(Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageX - ev.data.pos.left))))/ev.data.cal.data('colpick').height, 10))
+ .get(0),
+ [ev.data.preview]
+ );
+ return false;
+ },
+ upSelector = function (ev) {
+ fillRGBFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
+ fillHexFields(ev.data.cal.data('colpick').color, ev.data.cal.get(0));
+ $(document).off('mouseup touchend',upSelector);
+ $(document).off('mousemove touchmove',moveSelector);
+ return false;
+ },
+ //Submit button
+ clickSubmit = function (ev) {
+ var cal = $(this).parent();
+ var col = cal.data('colpick').color;
+ cal.data('colpick').origColor = col;
+ setCurrentColor(col, cal.get(0));
+ cal.data('colpick').onSubmit(col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el);
+ },
+ //Show/hide the color picker
+ show = function (ev) {
+ // Prevent the trigger of any direct parent
+ ev.stopPropagation();
+ var cal = $('#' + $(this).data('colpickId'));
+ cal.data('colpick').onBeforeShow.apply(this, [cal.get(0)]);
+ var pos = $(this).offset();
+ var top = pos.top + this.offsetHeight;
+ var left = pos.left;
+ var viewPort = getViewport();
+ var calW = cal.width();
+ if (left + calW > viewPort.l + viewPort.w) {
+ left -= calW;
+ }
+ cal.css({left: left + 'px', top: top + 'px'});
+ if (cal.data('colpick').onShow.apply(this, [cal.get(0)]) != false) {
+ cal.show();
+ }
+ //Hide when user clicks outside
+ $('html').mousedown({cal:cal}, hide);
+ cal.mousedown(function(ev){ev.stopPropagation();})
+ },
+ hide = function (ev) {
+ if (ev.data.cal.data('colpick').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
+ ev.data.cal.hide();
+ }
+ $('html').off('mousedown', hide);
+ },
+ getViewport = function () {
+ var m = document.compatMode == 'CSS1Compat';
+ return {
+ l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
+ w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth)
+ };
+ },
+ //Fix the values if the user enters a negative or high value
+ fixHSB = function (hsb) {
+ return {
+ h: Math.min(360, Math.max(0, hsb.h)),
+ s: Math.min(100, Math.max(0, hsb.s)),
+ b: Math.min(100, Math.max(0, hsb.b))
+ };
+ },
+ fixRGB = function (rgb) {
+ return {
+ r: Math.min(255, Math.max(0, rgb.r)),
+ g: Math.min(255, Math.max(0, rgb.g)),
+ b: Math.min(255, Math.max(0, rgb.b))
+ };
+ },
+ fixHex = function (hex) {
+ var len = 6 - hex.length;
+ if (len > 0) {
+ var o = [];
+ for (var i=0; i').attr('style','height:8.333333%; filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+')";');
+ huebar.append(div);
+ }
+ } else {
+ stopList = stops.join(',');
+ huebar.attr('style','background:-webkit-linear-gradient(top,'+stopList+'); background: -o-linear-gradient(top,'+stopList+'); background: -ms-linear-gradient(top,'+stopList+'); background:-moz-linear-gradient(top,'+stopList+'); -webkit-linear-gradient(top,'+stopList+'); background:linear-gradient(to bottom,'+stopList+'); ');
+ }
+ cal.find('div.colpick_hue').on('mousedown touchstart',downHue);
+ options.newColor = cal.find('div.colpick_new_color');
+ options.currentColor = cal.find('div.colpick_current_color');
+ //Store options and fill with default color
+ cal.data('colpick', options);
+ fillRGBFields(options.color, cal.get(0));
+ fillHSBFields(options.color, cal.get(0));
+ fillHexFields(options.color, cal.get(0));
+ setHue(options.color, cal.get(0));
+ setSelector(options.color, cal.get(0));
+ setCurrentColor(options.color, cal.get(0));
+ setNewColor(options.color, cal.get(0));
+ //Append to body if flat=false, else show in place
+ if (options.flat) {
+ cal.appendTo(this).show();
+ cal.css({
+ position: 'relative',
+ display: 'block'
+ });
+ } else {
+ cal.appendTo(document.body);
+ $(this).on(options.showEvent, show);
+ cal.css({
+ position:'absolute'
+ });
+ }
+ }
+ });
+ },
+ //Shows the picker
+ showPicker: function() {
+ return this.each( function () {
+ if ($(this).data('colpickId')) {
+ show.apply(this);
+ }
+ });
+ },
+ //Hides the picker
+ hidePicker: function() {
+ return this.each( function () {
+ if ($(this).data('colpickId')) {
+ $('#' + $(this).data('colpickId')).hide();
+ }
+ });
+ },
+ //Sets a color as new and current (default)
+ setColor: function(col, setCurrent) {
+ setCurrent = (typeof setCurrent === "undefined") ? 1 : setCurrent;
+ if (typeof col == 'string') {
+ col = hexToHsb(col);
+ } else if (col.r != undefined && col.g != undefined && col.b != undefined) {
+ col = rgbToHsb(col);
+ } else if (col.h != undefined && col.s != undefined && col.b != undefined) {
+ col = fixHSB(col);
+ } else {
+ return this;
+ }
+ return this.each(function(){
+ if ($(this).data('colpickId')) {
+ var cal = $('#' + $(this).data('colpickId'));
+ cal.data('colpick').color = col;
+ cal.data('colpick').origColor = col;
+ fillRGBFields(col, cal.get(0));
+ fillHSBFields(col, cal.get(0));
+ fillHexFields(col, cal.get(0));
+ setHue(col, cal.get(0));
+ setSelector(col, cal.get(0));
+
+ setNewColor(col, cal.get(0));
+ cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 1]);
+ if(setCurrent) {
+ setCurrentColor(col, cal.get(0));
+ }
+ }
+ });
+ }
+ };
+ }();
+ //Color space convertions
+ var hexToRgb = function (hex) {
+ var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
+ return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
+ };
+ var hexToHsb = function (hex) {
+ return rgbToHsb(hexToRgb(hex));
+ };
+ var rgbToHsb = function (rgb) {
+ var hsb = {h: 0, s: 0, b: 0};
+ var min = Math.min(rgb.r, rgb.g, rgb.b);
+ var max = Math.max(rgb.r, rgb.g, rgb.b);
+ var delta = max - min;
+ hsb.b = max;
+ hsb.s = max != 0 ? 255 * delta / max : 0;
+ if (hsb.s != 0) {
+ if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta;
+ else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta;
+ else hsb.h = 4 + (rgb.r - rgb.g) / delta;
+ } else hsb.h = -1;
+ hsb.h *= 60;
+ if (hsb.h < 0) hsb.h += 360;
+ hsb.s *= 100/255;
+ hsb.b *= 100/255;
+ return hsb;
+ };
+ var hsbToRgb = function (hsb) {
+ var rgb = {};
+ var h = hsb.h;
+ var s = hsb.s*255/100;
+ var v = hsb.b*255/100;
+ if(s == 0) {
+ rgb.r = rgb.g = rgb.b = v;
+ } else {
+ var t1 = v;
+ var t2 = (255-s)*v/255;
+ var t3 = (t1-t2)*(h%60)/60;
+ if(h==360) h = 0;
+ if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3}
+ else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3}
+ else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3}
+ else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3}
+ else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3}
+ else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3}
+ else {rgb.r=0; rgb.g=0; rgb.b=0}
+ }
+ return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
+ };
+ var rgbToHex = function (rgb) {
+ var hex = [
+ rgb.r.toString(16),
+ rgb.g.toString(16),
+ rgb.b.toString(16)
+ ];
+ $.each(hex, function (nr, val) {
+ if (val.length == 1) {
+ hex[nr] = '0' + val;
+ }
+ });
+ return hex.join('');
+ };
+ var hsbToHex = function (hsb) {
+ return rgbToHex(hsbToRgb(hsb));
+ };
+ $.fn.extend({
+ colpick: colpick.init,
+ colpickHide: colpick.hidePicker,
+ colpickShow: colpick.showPicker,
+ colpickSetColor: colpick.setColor
+ });
+ $.extend({
+ colpick:{
+ rgbToHex: rgbToHex,
+ rgbToHsb: rgbToHsb,
+ hsbToHex: hsbToHex,
+ hsbToRgb: hsbToRgb,
+ hexToHsb: hexToHsb,
+ hexToRgb: hexToRgb
+ }
+ });
+})(jQuery);
diff --git a/modules/backend/formwidgets/colorpicker/partials/_colorpicker.htm b/modules/backend/formwidgets/colorpicker/partials/_colorpicker.htm
new file mode 100644
index 000000000..18ad301bc
--- /dev/null
+++ b/modules/backend/formwidgets/colorpicker/partials/_colorpicker.htm
@@ -0,0 +1,34 @@
+previewMode): ?>
+
+
+
+
+
+ $color): ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 2243df5f3..b9e39b434 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -1,6 +1,9 @@
[
+ 'title' => 'Administration Area',
+ ],
'field' => [
'invalid_type' => 'Invalid field type used :type.',
'options_method_not_exists' => 'The model class :model must define a method :method() returning options for the ":field" form field.',
@@ -14,7 +17,7 @@ return [
'access_denied' => [
'label' => "Access denied",
'help' => "You don't have the required permissions to view this page.",
- 'cms_link' => "Return to the backend",
+ 'cms_link' => "Return to the back-end",
],
],
'partial' => [
@@ -211,8 +214,8 @@ return [
'extension' => 'The PHP extension :name is not installed. Please install this library and activate the extension.'
],
'editor' => [
- 'menu_label' => 'Code Editor Preferences',
- 'menu_description' => 'Customize the code editor preferences, such as font size and color scheme.',
+ 'menu_label' => 'Code editor preferences',
+ 'menu_description' => 'Customize your code editor preferences, such as font size and color scheme.',
'font_size' => 'Font size',
'tab_size' => 'Tab size',
'use_hard_tabs' => 'Indent using tabs',
@@ -231,19 +234,23 @@ return [
'menu_description' => 'Settings relate to your administration account',
],
'myaccount' => [
- 'menu_label' => 'My Account',
+ 'menu_label' => 'My account',
'menu_description' => 'Update your account details such as name, email address and password.',
'menu_keywords' => 'security login'
],
+ 'branding' => [
+ 'menu_label' => 'Customize back-end',
+ 'menu_description' => 'Customize the administration area such as name, colors and logo.',
+ ],
'backend_preferences' => [
- 'menu_label' => 'Backend Preferences',
- 'menu_description' => 'Manage language preference and the appearance of the backend.',
+ 'menu_label' => 'Back-end preferences',
+ 'menu_description' => 'Manage your account preferences such as desired language.',
'locale' => 'Language',
'locale_comment' => 'Select your desired locale for language use.',
],
'access_log' => [
'hint' => 'This log displays a list of successful sign in attempts by administrators. Records are kept for a total of :days days.',
- 'menu_label' => 'Access Log',
+ 'menu_label' => 'Access log',
'menu_description' => 'View a list of successful back-end user sign ins.',
'created_at' => 'Date & Time',
'login' => 'Login',
diff --git a/modules/backend/layouts/_custom_styles.htm b/modules/backend/layouts/_custom_styles.htm
new file mode 100644
index 000000000..643d16010
--- /dev/null
+++ b/modules/backend/layouts/_custom_styles.htm
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/modules/backend/layouts/_footer.htm b/modules/backend/layouts/_footer.htm
index 97a3a97e8..870fac32c 100644
--- a/modules/backend/layouts/_footer.htm
+++ b/modules/backend/layouts/_footer.htm
@@ -3,7 +3,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index e224d731e..21215f8c1 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -2,8 +2,8 @@
-
- <?= $this->pageTitle ?> | October CMS
+<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
+ <?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
@@ -80,4 +80,5 @@
// -->
makeAssets() ?>
-
\ No newline at end of file
+
+makeLayoutPartial('custom_styles') ?>
\ No newline at end of file
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index 331cb34de..57040a8bb 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -3,7 +3,7 @@
- Administration Area
+ <?= e(trans('backend::lang.auth.title')) ?>
@@ -12,7 +12,7 @@
-
+
makeAssets() ?>
+ makeLayoutPartial('custom_styles') ?>
\ No newline at end of file
diff --git a/modules/system/controllers/updates/_disable_form.htm b/modules/system/controllers/updates/_disable_form.htm
index 5f116dfda..1bb8fd4e1 100644
--- a/modules/system/controllers/updates/_disable_form.htm
+++ b/modules/system/controllers/updates/_disable_form.htm
@@ -41,7 +41,7 @@
type="submit"
class="btn btn-primary"
data-request="onDisablePlugins"
- data-request-confirm=""
+ data-request-confirm=""
data-stripe-load-indicator>
@@ -52,4 +52,4 @@
-
\ No newline at end of file
+
diff --git a/modules/system/controllers/updates/_execute.htm b/modules/system/controllers/updates/_execute.htm
index a1fa35d08..91a14471b 100644
--- a/modules/system/controllers/updates/_execute.htm
+++ b/modules/system/controllers/updates/_execute.htm
@@ -136,7 +136,7 @@
