diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..e3eb586 --- /dev/null +++ b/composer.json @@ -0,0 +1,42 @@ +{ + "name": "roundcube/roundcubemail", + "description": "The Roundcube Webmail suite", + "license": "GPL-3.0-or-later", + "repositories": [ + { + "type": "composer", + "url": "https://plugins.roundcube.net" + } + ], + "require": { + "php": ">=7.3.0", + "pear/pear-core-minimal": "~1.10.1", + "pear/auth_sasl": "~1.1.0", + "pear/mail_mime": "~1.10.0", + "pear/net_smtp": "~1.10.0", + "pear/crypt_gpg": "~1.6.3", + "pear/net_sieve": "~1.4.5", + "roundcube/plugin-installer": "~0.3.1", + "roundcube/rtf-html-php": "~2.1", + "masterminds/html5": "~2.7.0", + "bacon/bacon-qr-code": "^2.0.0", + "guzzlehttp/guzzle": "^7.3.0", + "kolab/net_ldap3": "^1.1", + "johndoh/contextmenu": "3.3.1", + "sblaisot/automatic_addressbook": "v0.4.3", + "roundcube/carddav": "5.1.0", + "toteph42/identity_switch": "^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^9" + }, + "suggest": { + "kolab/net_ldap3": "~1.1.4 required for connecting to LDAP", + "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver" + }, + "config": { + "allow-plugins": { + "roundcube/plugin-installer": true + } + } +} diff --git a/plugins/identity_switch/assets/identity_switch.min.css b/plugins/identity_switch/assets/identity_switch.min.css index 435cdbb..2ef5af6 100644 --- a/plugins/identity_switch/assets/identity_switch.min.css +++ b/plugins/identity_switch/assets/identity_switch.min.css @@ -7,14 +7,16 @@ padding-left: 2rem; text-align: left; width: 240px; - height: 21px; - border: 1px solid #ccc !important; - border-radius: .4em; + height: 20px; + border: 1px solid #6DA1D3 !important; + border-radius: 5px 5px 0px 0px !important; background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat left .75rem center/8px 10px; - top: -65px; + top: -70px; left: 240px; position: relative; - float: inline-start + float: inline-start; + min-height: 22px; + box-shadow: 0px 0px 4px 0px #414141a1 !important; } #identity_switch_dropdown { @@ -22,23 +24,21 @@ z-index: 1; padding: 0 .5rem 0 0; /* min-width: 250px; */ - max-width: 260px; - width: 260px; + max-width: 261px; + width: 261px; will-change: transform; - top: 14px; - left: 178px; + top: 10px; + left: 177px; margin-left: 0; margin-top: 0; transform: translate3d(63px, 49px, 0); - border-bottom-color: #78b3cc; - box-shadow: 0px 3px 5px #414141a1 !important; + box-shadow: 0px 2px 4px 0px #414141a1 !important; max-height: 150px; overflow-x: hidden; color: #212529; display: none; - border-color: #d4dbde; - border-radius: .4rem; - border-bottom: 1px solid #f7f7f7; + border-radius: 0px 0px 10px 10px !important; + border: 1px solid #6DA1D3; background-color: rgba(255, 255, 255); font-weight: 400; line-height: 35px diff --git a/plugins/message_highlight/CHANGELOG b/plugins/message_highlight/CHANGELOG new file mode 100644 index 0000000..e2d6cd5 --- /dev/null +++ b/plugins/message_highlight/CHANGELOG @@ -0,0 +1,67 @@ +CHANGELOG message_highlight +=========================== + +RELEASE 4.4 + +- allow shorthand colors and better error handling, thanks to PR from Andreas Pakulat + +RELEASE 4.3 + +- polish and czech translations + +RELEASE 4.2 + +- support config file + +RELEASE 4.1 + +- support darker colors + +RELEASE 4.0 + +- support elastic skin + +RELEASE 3.1 + +- fix some 1.3 deprecated functions + +RELEASE 2.6 + +- some text changes + +RELEASE 2.5.2 + +- fix composer.json + +RELEASE 2.5 + +- js bug fix, dont respond to insertrow except for message view + +RELEASE 2.4 + +- live() jquery call replaced with on() + +RELEASE 2.3 + +- bugfix: initial row was malformed. + +RELEASE 2.2 + +- bugfix: removed a td in javascript + +RELEASE 2.1 + +- bugfix: minor fix for table layout +- icon for larry theme +- fixes for larry theme + +RELEASE 2.0.1 + +- minor version bump for composer test + +RELEASE 2.0 +----------- + +- bugfix: change insertrow code to work with larry skin +- move to github + diff --git a/plugins/message_highlight/LICENSE b/plugins/message_highlight/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/plugins/message_highlight/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. + + + Copyright (C) + + 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. + + , 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/plugins/message_highlight/README.md b/plugins/message_highlight/README.md new file mode 100644 index 0000000..4955b83 --- /dev/null +++ b/plugins/message_highlight/README.md @@ -0,0 +1,41 @@ +## message_highlight + +With this plugin you can colorize the message index rows based on specific criteria like sender, recipient and subject. This repository is a fork and continuation of the orginal work by [Cor Bosman](https://github.com/corbosman/message_highlight). + +## Features + +Go to your Roundcube settings area and select rules to highlight emails in your mailview. + +## Install + +Use composer from the Roundcube root directory: + +```sh +composer require melroy89/message_highlight:dev-master +``` + +_NOTE:_ Answer **N** when composer ask you about plugin activation. + +Activate the plugin by editing the `HOME_RC/config/config.inc.php` file: + +```php +$config['plugins'] = [ + // Other plugins... + 'message_highlight', +]; +``` + +And see the available config options in [config.inc.php-dist](./config.inc.php-dist) file. However, you should also be able to set these configs via the Roundcube -> `Settings` -> `Message Highlights`. + +## Contact + +- Author: Melroy van den Berg (melroy@melroy.org) +- 2nd Author: Gene Hawkins (texxasrulez@yahoo.com) +- Original Author: Cor Bosman (cor@roundcu.be) + +Bug reports through [GitHub Issues](https://github.com/melroy89/message_highlight/issues). + +## License + +This plugin is distributed under the GNU General Public License Version 2. +Please read through the file LICENSE for more information about this license. See [LICENSE](./LICENSE). diff --git a/plugins/message_highlight/colorpicker/images/color.png b/plugins/message_highlight/colorpicker/images/color.png new file mode 100644 index 0000000..809fb00 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/color.png differ diff --git a/plugins/message_highlight/colorpicker/images/colorpicker.png b/plugins/message_highlight/colorpicker/images/colorpicker.png new file mode 100644 index 0000000..3701eb1 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/colorpicker.png differ diff --git a/plugins/message_highlight/colorpicker/images/graybar.jpg b/plugins/message_highlight/colorpicker/images/graybar.jpg new file mode 100644 index 0000000..f807d24 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/graybar.jpg differ diff --git a/plugins/message_highlight/colorpicker/images/grid.gif b/plugins/message_highlight/colorpicker/images/grid.gif new file mode 100644 index 0000000..78b54c0 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/grid.gif differ diff --git a/plugins/message_highlight/colorpicker/images/meta100.png b/plugins/message_highlight/colorpicker/images/meta100.png new file mode 100644 index 0000000..72bea40 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/meta100.png differ diff --git a/plugins/message_highlight/colorpicker/images/transparentpixel.gif b/plugins/message_highlight/colorpicker/images/transparentpixel.gif new file mode 100644 index 0000000..b740647 Binary files /dev/null and b/plugins/message_highlight/colorpicker/images/transparentpixel.gif differ diff --git a/plugins/message_highlight/colorpicker/mColorPicker.js b/plugins/message_highlight/colorpicker/mColorPicker.js new file mode 100644 index 0000000..48c0cb6 --- /dev/null +++ b/plugins/message_highlight/colorpicker/mColorPicker.js @@ -0,0 +1,574 @@ +/* + mColorPicker + Version: 1.0 r34 + + Copyright (c) 2010 Meta100 LLC. + http://www.meta100.com/ + + Licensed under the MIT license + http://www.opensource.org/licenses/mit-license.php +*/ + +// After this script loads set: +// $.fn.mColorPicker.init.replace = '.myclass' +// to have this script apply to input.myclass, +// instead of the default input[type=color] +// To turn of automatic operation and run manually set: +// $.fn.mColorPicker.init.replace = false +// To use manually call like any other jQuery plugin +// $('input.foo').mColorPicker({options}) +// options: +// imageFolder - Change to move image location. +// swatches - Initial colors in the swatch, must an array of 10 colors. +// init: +// $.fn.mColorPicker.init.enhancedSwatches - Turn of saving and loading of swatch to cookies. +// $.fn.mColorPicker.init.allowTransparency - Turn off transperancy as a color option. +// $.fn.mColorPicker.init.showLogo - Turn on/off the meta100 logo (You don't really want to turn it off, do you?). + +(function($){ + + var $o; + + $.fn.mColorPicker = function(options) { + + $o = $.extend($.fn.mColorPicker.defaults, options); + + if ($o.swatches.length < 10) $o.swatches = $.fn.mColorPicker.defaults.swatches + if ($("div#mColorPicker").length < 1) $.fn.mColorPicker.drawPicker(); + + if ($('#css_disabled_color_picker').length < 1) $('head').prepend(''); + + $('body').on('keyup', '.mColorPicker', function () { + + try { + + $(this).css({ + 'background-color': $(this).val() + }).css({ + 'color': $.fn.mColorPicker.textColor($(this).css('background-color')) + }).trigger('change'); + } catch (r) {} + }); + + $('body').on('click', '.mColorPickerTrigger', function () { + + $.fn.mColorPicker.colorShow($(this).attr('id').replace('icp_', '')); + }); + + this.each(function () { + + $.fn.mColorPicker.drawPickerTriggers($(this)); + }); + + return this; + }; + + $.fn.mColorPicker.currentColor = false; + $.fn.mColorPicker.currentValue = false; + $.fn.mColorPicker.color = false; + + $.fn.mColorPicker.init = { + replace: '[type=color]', + index: 0, + enhancedSwatches: true, + allowTransparency: true, + checkRedraw: 'DOMUpdated', // Change to 'ajaxSuccess' for ajax only or false if not needed + liveEvents: false, + showLogo: false + }; + + $.fn.mColorPicker.defaults = { + imageFolder: 'images/', + swatches: [ + "#ffffff", + "#ffff00", + "#00ff00", + "#00ffff", + "#0000ff", + "#ff00ff", + "#ff0000", + "#4c2b11", + "#3b3b3b", + "#000000" + ] + }; + + $.fn.mColorPicker.liveEvents = function() { + + $.fn.mColorPicker.init.liveEvents = true; + + if ($.fn.mColorPicker.init.checkRedraw && $.fn.mColorPicker.init.replace) { + + $(document).bind($.fn.mColorPicker.init.checkRedraw + '.mColorPicker', function () { + + $('input[data-mcolorpicker!="true"]').filter(function() { + + return ($.fn.mColorPicker.init.replace == '[type=color]')? this.getAttribute("type") == 'color': $(this).is($.fn.mColorPicker.init.replace); + }).mColorPicker(); + }); + } + }; + + $.fn.mColorPicker.drawPickerTriggers = function ($t) { + + if ($t[0].nodeName.toLowerCase() != 'input') return false; + + var id = $t.attr('id') || 'color_' + $.fn.mColorPicker.init.index++, + hidden = false; + + $t.attr('id', id); + + if ($t.attr('text') == 'hidden' || $t.attr('data-text') == 'hidden') hidden = true; + + var color = $t.val(), + width = 75, + height = 25, + flt = $t.css('float'), + image = (color == 'transparent')? "url('" + $o.imageFolder + "/grid.gif')": '', + colorPicker = ''; + + $('body').append(''); + $('span#color_work_area').append($t.clone(true)); + colorPicker = $('span#color_work_area').html().replace(/type="color"/gi, '').replace(/input /gi, (hidden)? 'input type="hidden"': 'input type="text"'); + $('span#color_work_area').html('').remove(); + $t.after( + (hidden)? ' ': '' + ).after(colorPicker).remove(); + + if (hidden) { + + $('#icp_' + id).css({ + 'background-color': color, + 'background-image': image, + 'display': 'inline-block' + }).attr( + 'class', $('#' + id).attr('class') + ).addClass( + 'mColorPickerTrigger' + ); + } else { + + $('#' + id).css({ + 'background-color': color, + 'background-image': image + }).css({ + 'color': $.fn.mColorPicker.textColor($('#' + id).css('background-color')) + }).after( + '' + ).addClass('mColorPickerInput'); + } + + $('#icp_' + id).attr('data-mcolorpicker', 'true'); + + $('#' + id).addClass('mColorPicker'); + + return $('#' + id); + }; + + $.fn.mColorPicker.drawPicker = function () { + + $(document.createElement("div")).attr( + "id","mColorPicker" + ).css( + 'display','none' + ).html( + '
' + ).appendTo("body"); + + $(document.createElement("div")).attr("id","mColorPickerBg").css({ + 'display': 'none' + }).appendTo("body"); + + for (n = 9; n > -1; n--) { + + $(document.createElement("div")).attr({ + 'id': 'cell' + n, + 'class': "mPastColor" + ((n > 0)? ' mNoLeftBorder': '') + }).html( + ' ' + ).prependTo("#mColorPickerSwatches"); + } + + $('#mColorPicker').css({ + 'border':'1px solid #ccc', + 'color':'#fff', + 'z-index':999998, + 'width':'199px', + 'height':'184px', + 'font-size':'12px', + 'font-family':'times' + }); + + $('.mPastColor').css({ + 'height':'18px', + 'width':'18px', + 'border':'1px solid #000', + 'float':'left' + }); + + $('#colorPreview').css({ + 'height':'50px' + }); + + $('.mNoLeftBorder').css({ + 'border-left':0 + }); + + $('.mClear').css({ + 'clear':'both' + }); + + $('#mColorPickerWrapper').css({ + 'position':'relative', + 'border':'solid 1px gray', + 'z-index':999999 + }); + + $('#mColorPickerImg').css({ + 'height':'128px', + 'width':'192px', + 'border':0, + 'cursor':'crosshair', + 'background-image':"url('" + $o.imageFolder + "colorpicker.png')" + }); + + $('#mColorPickerImgGray').css({ + 'height':'8px', + 'width':'192px', + 'border':0, + 'cursor':'crosshair', + 'background-image':"url('" + $o.imageFolder + "graybar.jpg')" + }); + + $('#mColorPickerInput').css({ + 'border':'solid 1px gray', + 'font-size':'10pt', + 'margin':'3px', + 'width':'80px' + }); + + $('#mColorPickerImgGrid').css({ + 'border':0, + 'height':'20px', + 'width':'20px', + 'vertical-align':'text-bottom' + }); + + $('#mColorPickerSwatches').css({ + 'border-right':'1px solid #000' + }); + + + if ($.fn.mColorPicker.init.allowTransparency) $('#mColorPickerFooter').prepend('transparent'); + if ($.fn.mColorPicker.init.showLogo) $('#mColorPickerFooter').prepend('Meta100 - Designing Fun'); + + $("#mColorPickerBg").click($.fn.mColorPicker.closePicker); + + var swatch = $.fn.mColorPicker.getCookie('swatches'), + i = 0; + + if (typeof swatch == 'string') swatch = swatch.split('||'); + if (swatch == null || $.fn.mColorPicker.init.enhancedSwatches || swatch.length < 10) swatch = $o.swatches; + + $(".mPastColor").each(function() { + + $(this).css('background-color', swatch[i++].toLowerCase()); + }); + }; + + $.fn.mColorPicker.closePicker = function () { + + $(".mColor, .mPastColor, #mColorPickerInput, #mColorPickerWrapper").unbind(); + $("#mColorPickerBg").hide(); + $("#mColorPicker").fadeOut() + }; + + $.fn.mColorPicker.colorShow = function (id) { + + var $e = $("#icp_" + id); + pos = $e.offset(), + $i = $("#" + id); + hex = $i.attr('data-hex') || $i.attr('hex'), + pickerTop = pos.top + $e.outerHeight(), + pickerLeft = pos.left, + $d = $(document), + $m = $("#mColorPicker"); + + if ($i.attr('disabled')) return false; + + // KEEP COLOR PICKER IN VIEWPORT + if (pickerTop + $m.height() > $d.height()) pickerTop = pos.top - $m.height(); + if (pickerLeft + $m.width() > $d.width()) pickerLeft = pos.left - $m.width() + $e.outerWidth(); + + $m.css({ + 'top':(pickerTop) + "px", + 'left':(pickerLeft) + "px", + 'position':'absolute' + }).fadeIn("fast"); + + $("#mColorPickerBg").css({ + 'z-index':999990, + 'background':'black', + 'opacity': .01, + 'position':'absolute', + 'top':0, + 'left':0, + 'width': parseInt($d.width(), 10) + 'px', + 'height': parseInt($d.height(), 10) + 'px' + }).show(); + + var def = $i.val(); + + $('#colorPreview span').text(def); + $('#colorPreview').css('background', def); + $('#color').val(def); + + if ($('#' + id).attr('data-text')) $.fn.mColorPicker.currentColor = $e.css('background-color'); + else $.fn.mColorPicker.currentColor = $i.css('background-color'); + + if (hex == 'true') $.fn.mColorPicker.currentColor = $.fn.mColorPicker.RGBtoHex($.fn.mColorPicker.currentColor); + + $("#mColorPickerInput").val($.fn.mColorPicker.currentColor); + + $('.mColor, .mPastColor').bind('mousemove', function(e) { + + var offset = $(this).offset(); + + $.fn.mColorPicker.color = $(this).css("background-color"); + + if ($(this).hasClass('mPastColor') && hex == 'true') $.fn.mColorPicker.color = $.fn.mColorPicker.RGBtoHex($.fn.mColorPicker.color); + else if ($(this).hasClass('mPastColor') && hex != 'true') $.fn.mColorPicker.color = $.fn.mColorPicker.hexToRGB($.fn.mColorPicker.color); + else if ($(this).attr('id') == 'mColorPickerTransparent') $.fn.mColorPicker.color = 'transparent'; + else if (!$(this).hasClass('mPastColor')) $.fn.mColorPicker.color = $.fn.mColorPicker.whichColor(e.pageX - offset.left, e.pageY - offset.top + (($(this).attr('id') == 'mColorPickerImgGray')? 128: 0), hex); + + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color); + }).click(function() { + + $.fn.mColorPicker.colorPicked(id); + }); + + $('#mColorPickerInput').bind('keyup', function (e) { + + try { + + $.fn.mColorPicker.color = $('#mColorPickerInput').val(); + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.color); + + if (e.which == 13) $.fn.mColorPicker.colorPicked(id); + } catch (r) {} + + }).bind('blur', function () { + + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor); + }); + + $('#mColorPickerWrapper').bind('mouseleave', function () { + + $.fn.mColorPicker.setInputColor(id, $.fn.mColorPicker.currentColor); + }); + }; + + $.fn.mColorPicker.setInputColor = function (id, color) { + + var image = (color == 'transparent')? "url('" + $o.imageFolder + "grid.gif')": '', + textColor = $.fn.mColorPicker.textColor(color); + + if ($('#' + id).attr('data-text') || $('#' + id).attr('text')) $("#icp_" + id).css({'background-color': color, 'background-image': image}); + $("#" + id).val(color).css({'background-color': color, 'background-image': image, 'color' : textColor}).trigger('change'); + $("#mColorPickerInput").val(color); + }; + + $.fn.mColorPicker.textColor = function (val) { + + if (typeof val == 'undefined' || val == 'transparent') return "black"; + val = $.fn.mColorPicker.RGBtoHex(val); + return (parseInt(val.substr(1, 2), 16) + parseInt(val.substr(3, 2), 16) + parseInt(val.substr(5, 2), 16) < 400)? 'white': 'black'; + }; + + $.fn.mColorPicker.setCookie = function (name, value, days) { + + var cookie_string = name + "=" + escape(value), + expires = new Date(); + expires.setDate(expires.getDate() + days); + cookie_string += "; expires=" + expires.toGMTString(); + + document.cookie = cookie_string; + }; + + $.fn.mColorPicker.getCookie = function (name) { + + var results = document.cookie.match ( '(^|;) ?' + name + '=([^;]*)(;|$)' ); + + if (results) return (unescape(results[2])); + else return null; + }; + + $.fn.mColorPicker.colorPicked = function (id) { + + $.fn.mColorPicker.closePicker(); + + if ($.fn.mColorPicker.init.enhancedSwatches) $.fn.mColorPicker.addToSwatch(); + + $("#" + id).trigger('colorpicked'); + }; + + $.fn.mColorPicker.addToSwatch = function (color) { + + var swatch = [] + i = 0; + + if (typeof color == 'string') $.fn.mColorPicker.color = color.toLowerCase(); + + $.fn.mColorPicker.currentValue = $.fn.mColorPicker.currentColor = $.fn.mColorPicker.color; + + if ($.fn.mColorPicker.color != 'transparent') swatch[0] = $.fn.mColorPicker.color.toLowerCase(); + + $('.mPastColor').each(function() { + + $.fn.mColorPicker.color = $(this).css('background-color').toLowerCase(); + + if ($.fn.mColorPicker.color != swatch[0] && $.fn.mColorPicker.RGBtoHex($.fn.mColorPicker.color) != swatch[0] && $.fn.mColorPicker.hexToRGB($.fn.mColorPicker.color) != swatch[0] && swatch.length < 10) swatch[swatch.length] = $.fn.mColorPicker.color; + + $(this).css('background-color', swatch[i++]) + }); + + if ($.fn.mColorPicker.init.enhancedSwatches) $.fn.mColorPicker.setCookie('swatches', swatch.join('||'), 365); + }; + + $.fn.mColorPicker.whichColor = function (x, y, hex) { + + var colorR = colorG = colorB = 255; + + if (x < 32) { + + colorG = x * 8; + colorB = 0; + } else if (x < 64) { + + colorR = 256 - (x - 32 ) * 8; + colorB = 0; + } else if (x < 96) { + + colorR = 0; + colorB = (x - 64) * 8; + } else if (x < 128) { + + colorR = 0; + colorG = 256 - (x - 96) * 8; + } else if (x < 160) { + + colorR = (x - 128) * 8; + colorG = 0; + } else { + + colorG = 0; + colorB = 256 - (x - 160) * 8; + } + + if (y < 64) { + + colorR += (256 - colorR) * (64 - y) / 64; + colorG += (256 - colorG) * (64 - y) / 64; + colorB += (256 - colorB) * (64 - y) / 64; + } else if (y <= 128) { + + colorR -= colorR * (y - 64) / 64; + colorG -= colorG * (y - 64) / 64; + colorB -= colorB * (y - 64) / 64; + } else if (y > 128) { + + colorR = colorG = colorB = 256 - ( x / 192 * 256 ); + } + + colorR = Math.round(Math.min(colorR, 255)); + colorG = Math.round(Math.min(colorG, 255)); + colorB = Math.round(Math.min(colorB, 255)); + + if (hex == 'true') { + + colorR = colorR.toString(16); + colorG = colorG.toString(16); + colorB = colorB.toString(16); + + if (colorR.length < 2) colorR = 0 + colorR; + if (colorG.length < 2) colorG = 0 + colorG; + if (colorB.length < 2) colorB = 0 + colorB; + + return "#" + colorR + colorG + colorB; + } + + return "rgb(" + colorR + ', ' + colorG + ', ' + colorB + ')'; + }; + + $.fn.mColorPicker.RGBtoHex = function (color) { + + color = color.toLowerCase(); + + if (typeof color == 'undefined') return ''; + if (color.indexOf('#') > -1 && color.length > 6) return color; + if (color.indexOf('rgb') < 0) return color; + + if (color.indexOf('#') > -1) { + + return '#' + color.substr(1, 1) + color.substr(1, 1) + color.substr(2, 1) + color.substr(2, 1) + color.substr(3, 1) + color.substr(3, 1); + } + + var hexArray = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"], + decToHex = "#", + code1 = 0; + + color = color.replace(/[^0-9,]/g, '').split(","); + + for (var n = 0; n < color.length; n++) { + + code1 = Math.floor(color[n] / 16); + decToHex += hexArray[code1] + hexArray[color[n] - code1 * 16]; + } + + return decToHex; + }; + + $.fn.mColorPicker.hexToRGB = function (color) { + + color = color.toLowerCase(); + + if (typeof color == 'undefined') return ''; + if (color.indexOf('rgb') > -1) return color; + if (color.indexOf('#') < 0) return color; + + var c = color.replace('#', ''); + + if (c.length < 6) c = c.substr(0, 1) + c.substr(0, 1) + c.substr(1, 1) + c.substr(1, 1) + c.substr(2, 1) + c.substr(2, 1); + + return 'rgb(' + parseInt(c.substr(0, 2), 16) + ', ' + parseInt(c.substr(2, 2), 16) + ', ' + parseInt(c.substr(4, 2), 16) + ')'; + }; + + $(document).ready(function () { + + $('.mh_color_input').mColorPicker({ + imageFolder: 'plugins/message_highlight/colorpicker/images/', + allowTransparency: false, + showLogo: false, + liveEvents: false, + checkRedraw: 'ajaxSuccess' + }); + + + + // if ($.fn.mColorPicker.init.replace) { + // + // $('input[data-mcolorpicker!="true"]').filter(function() { + // + // return ($.fn.mColorPicker.init.replace == '[type=color]') ? this.getAttribute("type") == 'color': $(this).is($.fn.mColorPicker.init.replace); + // }).mColorPicker({ + // imageFolder: 'plugins/message_highlight/colorpicker/images/', + // allowTransparency: false, + // showLogo: false, + // liveEvents: false, + // checkRedraw: 'ajaxSuccess' + // }); + // + // $.fn.mColorPicker.liveEvents(); + // } + }); +})(jQuery); diff --git a/plugins/message_highlight/composer.json b/plugins/message_highlight/composer.json new file mode 100644 index 0000000..d9598b9 --- /dev/null +++ b/plugins/message_highlight/composer.json @@ -0,0 +1,23 @@ +{ + "name": "melroy89/message_highlight", + "description": "Assign colors to your emails based on Subject, Sender, Recipient or CC", + "version": "4.0.0", + "license": "GPL-2.0", + "homepage": "https://github.com/melroy89/message_highlight", + "type": "roundcube-plugin", + "authors": [ + { + "name": "Melroy van den Berg", + "email": "melroy@melroy.org", + "homepage": "https://github.com/melroy89/message_highlight", + "role": "Developer" + } + ], + "require": { + "roundcube/plugin-installer": ">=0.1.3" + }, + "support": { + "email": "melroy@melroy.org", + "issues": "https://github.com/melroy89/message_highlight/issues" + } +} diff --git a/plugins/message_highlight/config.inc.php b/plugins/message_highlight/config.inc.php new file mode 100644 index 0000000..51af096 --- /dev/null +++ b/plugins/message_highlight/config.inc.php @@ -0,0 +1,24 @@ + 'subject', + 'input' => 'My Subject', + 'color' => '#ff0000' + ), + array( + 'header' => 'from', + 'input' => 'nobody@example.com', + 'color' => '#00ff00' + ), + array( + 'header' => 'to', + 'input' => 'nobody@example.com', + 'color' => '#0000ff' + ), + array( + 'header' => 'cc', + 'input' => 'nobody@example.com', + 'color' => '#0000ff' + ), +); \ No newline at end of file diff --git a/plugins/message_highlight/localization/cs_CZ.inc b/plugins/message_highlight/localization/cs_CZ.inc new file mode 100644 index 0000000..d1850cc --- /dev/null +++ b/plugins/message_highlight/localization/cs_CZ.inc @@ -0,0 +1,16 @@ + diff --git a/plugins/message_highlight/localization/de_DE.inc b/plugins/message_highlight/localization/de_DE.inc new file mode 100644 index 0000000..a8aecaf --- /dev/null +++ b/plugins/message_highlight/localization/de_DE.inc @@ -0,0 +1,15 @@ + diff --git a/plugins/message_highlight/localization/en_US.inc b/plugins/message_highlight/localization/en_US.inc new file mode 100644 index 0000000..4768aba --- /dev/null +++ b/plugins/message_highlight/localization/en_US.inc @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/plugins/message_highlight/localization/fr_FR.inc b/plugins/message_highlight/localization/fr_FR.inc new file mode 100644 index 0000000..fc342c2 --- /dev/null +++ b/plugins/message_highlight/localization/fr_FR.inc @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/plugins/message_highlight/localization/hu_HU.inc b/plugins/message_highlight/localization/hu_HU.inc new file mode 100644 index 0000000..7e80a5e --- /dev/null +++ b/plugins/message_highlight/localization/hu_HU.inc @@ -0,0 +1,15 @@ + diff --git a/plugins/message_highlight/localization/it_IT.inc b/plugins/message_highlight/localization/it_IT.inc new file mode 100644 index 0000000..7807c07 --- /dev/null +++ b/plugins/message_highlight/localization/it_IT.inc @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/plugins/message_highlight/localization/nl_NL.inc b/plugins/message_highlight/localization/nl_NL.inc new file mode 100644 index 0000000..b4d29c5 --- /dev/null +++ b/plugins/message_highlight/localization/nl_NL.inc @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/plugins/message_highlight/localization/pl_PL.inc b/plugins/message_highlight/localization/pl_PL.inc new file mode 100644 index 0000000..2093ab0 --- /dev/null +++ b/plugins/message_highlight/localization/pl_PL.inc @@ -0,0 +1,16 @@ + diff --git a/plugins/message_highlight/localization/pt_BR.inc b/plugins/message_highlight/localization/pt_BR.inc new file mode 100644 index 0000000..fc8a7d8 --- /dev/null +++ b/plugins/message_highlight/localization/pt_BR.inc @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/plugins/message_highlight/localization/ru_RU.inc b/plugins/message_highlight/localization/ru_RU.inc new file mode 100644 index 0000000..6e9de0e --- /dev/null +++ b/plugins/message_highlight/localization/ru_RU.inc @@ -0,0 +1,15 @@ + + diff --git a/plugins/message_highlight/localization/sk_SK.inc b/plugins/message_highlight/localization/sk_SK.inc new file mode 100644 index 0000000..28c2a8a --- /dev/null +++ b/plugins/message_highlight/localization/sk_SK.inc @@ -0,0 +1,16 @@ + diff --git a/plugins/message_highlight/message_highlight.js b/plugins/message_highlight/message_highlight.js new file mode 100644 index 0000000..f088cc3 --- /dev/null +++ b/plugins/message_highlight/message_highlight.js @@ -0,0 +1,95 @@ +var mh_cur_row; + +$(document).ready(function() { + if(window.rcmail) { + + /* listen to roundcube insertrow event so we can color the rows */ + rcmail.addEventListener('insertrow', mh_insert_row); + + /* listen to receive row event after asking for another row */ + rcmail.addEventListener('plugin.mh_receive_row', mh_receive_row); + + /* initialise button click events */ + $('.mh_delete').click(function(e) { + e.preventDefault(); + mh_delete(this); + }); + + $('.mh_add').click(function(e) { + e.preventDefault(); + mh_add(this); + }); + } +}); + +/* insert row event to color a mail row */ +function mh_insert_row(evt) { + + if(!rcmail.env.messages) return; + + var message = rcmail.env.messages[evt.row.uid]; + + // check if our color info is present + if(message.flags && message.flags.plugin_mh_color) { + var row = $(evt.row.obj); + row.addClass('rcmfd_mh_row'); + + evt.row.obj.style.backgroundColor = message.flags.plugin_mh_color; + + var color_brightness = brightness(message.flags.plugin_mh_color); + if (color_brightness !== null && color_brightness < 123) { + row.addClass('rcmfd_mh_row_dark'); + } + + } +} + +/* delete a settings row */ +function mh_delete(button) { + if (confirm(rcmail.get_label('message_highlight.deleteconfirm'))) { + $(button).closest('tr').remove(); + } +} + +// do an ajax call to get a new row +function mh_add(button) { + mh_cur_row = $(button).closest('tr', '.mh_preferences'); + lock = rcmail.set_busy(true, 'loading'); + rcmail.http_request('plugin.mh_add_row', '', lock); +} + +// ajax return call +function mh_receive_row(data) { + var row = $(''+data.row+''); + $(mh_cur_row).after(row); + + $(row).find('.mh_color_input').mColorPicker(); + + $('.mh_delete').unbind('click').click(function(e) { + e.preventDefault(); + mh_delete(this); + }); + + $('.mh_add').unbind('click').click(function(e) { + e.preventDefault(); + mh_add(this); + }); + +} + +/* calculate the brightness of a color */ +function brightness(hex) { + var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i; + hex = hex.replace(shorthandRegex, function(m, r, g, b) { + return r + r + g + g + b + b; + }); + var rgb = hex.match(/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i) + if (rgb === null) { + return null; + } + rgb = rgb.slice(1,4) + .map(function(x) { return parseInt(x, 16); }); + + return (rgb[0] * 299 + rgb[1] * 587 + rgb[2] * 114) / 1000 +} + diff --git a/plugins/message_highlight/message_highlight.php b/plugins/message_highlight/message_highlight.php new file mode 100644 index 0000000..be1f316 --- /dev/null +++ b/plugins/message_highlight/message_highlight.php @@ -0,0 +1,205 @@ +rc = rcube::get_instance(); + + if ($this->rc->task === 'settings') { + + $this->add_texts('localization/', array('deleteconfirm')); + + $this->add_hook('preferences_list', array($this, 'mh_preferences')); + $this->add_hook('preferences_save', array($this, 'mh_save')); + $this->add_hook('preferences_sections_list',array($this, 'mh_preferences_section')); + + $this->include_script('colorpicker/mColorPicker.js'); + + $this->register_action('plugin.mh_add_row', array($this, 'mh_add_row')); + } elseif ($this->rc->task === 'mail') { + $this->add_hook('storage_init', array($this, 'storage_init')); + $this->add_hook('messages_list', array($this, 'mh_highlight')); + } + + $this->include_script('message_highlight.js'); + $this->load_config(); + + $skin_path = $this->local_skin_path(); + $this->include_stylesheet("$skin_path/message_highlight.css"); + + + } + + /** + * add the CC header to fetched headers + * + * @param $p + * @return mixed + */ + function storage_init($p) + { + $p['fetch_headers'] = trim(($p['fetch_headers'] ?? '') . ' ' . 'CC'); + return($p); + } + + + /** + * add highlight data to messages + * + * @param $p + * @return mixed + */ + function mh_highlight($p) + { + $this->prefs = array_merge($this->rc->config->get('message_highlight', array()), $this->rc->config->get('message_highlight_default', array())); + + // dont loop over all messages if we dont have any highlights or no msgs + if(!count($this->prefs) or !isset($p['messages']) or !is_array($p['messages'])) return $p; + + // loop over all messages and add highlight color to each message + foreach($p['messages'] as $message) { + if(($color = $this->mh_find_match($message)) !== false ) { + $message->list_flags['extra_flags']['plugin_mh_color'] = $color; + } + } + return($p); + } + + + /** + * find a match + * + * @param $message + * @return bool + */ + function mh_find_match($message) { + foreach($this->prefs as $p) { + if(stristr(rcube_mime::decode_header($message->{$p['header']}), $p['input'])) { + return($p['color']); + } + } + return false; + } + + // user preferences + function mh_preferences($args) { + if($args['section'] == 'mh_preferences') { + $this->add_texts('localization/', false); + + $args['blocks']['mh_preferences'] = array( + 'options' => array(), + 'name' => rcube_utils::rep_specialchars_output($this->gettext('mh_title')) + ); + + $i = 1; + $prefs = $this->rc->config->get('message_highlight', array()); + + foreach($prefs as $p) { + $args['blocks']['mh_preferences']['options'][$i++] = array( + 'content' => $this->mh_get_form_row($p['header'], $p['input'], $p['color'], true) + ); + } + + // no rows yet, add 1 empty row + if($i == 1) { + $args['blocks']['mh_preferences']['options'][$i] = array( + 'content' => $this->mh_get_form_row() + ); + } + } + + return($args); + } + + function mh_add_row() { + $this->rc->output->command('plugin.mh_receive_row', array('row' => $this->mh_get_form_row())); + } + + // create a form row + function mh_get_form_row($header = 'from', $input = '', $color = '#ffffff', $delete = false) { + + // header select box + $header_select = new html_select(array('name' => '_mh_header[]', 'class' => 'rcmfd_mh_header form-control custom-select pretty-select')); + $header_select->add(rcube_utils::rep_specialchars_output($this->gettext('subject')), 'subject'); + $header_select->add(rcube_utils::rep_specialchars_output($this->gettext('from')), 'from'); + $header_select->add(rcube_utils::rep_specialchars_output($this->gettext('to')), 'to'); + $header_select->add(rcube_utils::rep_specialchars_output($this->gettext('cc')), 'cc'); + + // input field + $input = new html_inputfield(array('name' => '_mh_input[]', 'class' => 'rcmfd_mh_input form-control', 'type' => 'text', 'autocomplete' => 'off', 'value' => $input)); + + // color box + $color = html::tag('input', array('id' => uniqid() ,'name' => '_mh_color[]', 'class' => 'mh_color_input', 'value' => $color, 'data-text' => 'hidden', 'data-hex' => 'true')); + + // delete button + // $button = html::a(array('href' => '#', 'class' => ' ', 'title' => $this->gettext('mh_delete')) , 'del'); + $button = html::tag('a', array('href' => '#', 'class' => 'button icon mh_delete ', 'title' => $this->gettext('mh_delete')), ''); + // $add_button = html::a(array('href' => '#', 'class' => 'button icon mh_add', 'title' => $this->gettext('mh_add')), ''); + // add button + $button = html::tag('input', array('class' => 'button mh_delete mh_button form-control btn btn-defaut', 'type' => 'button', 'value' => $this->gettext('mh_delete'), 'title' => $this->gettext('mh_delete_description'))); + $add_button = html::tag('input', array('class' => 'button mh_add mh_button form-control btn btn-default', 'type' => 'button', 'value' => $this->gettext('mh_add'), 'title' => $this->gettext('mh_add_description'))); + + $content = html::div('mh_preferences_row', + html::div('', $header_select->show($header)) . + html::div('ml-3 text-center', html::span('mh_matches', rcube_utils::rep_specialchars_output($this->gettext('mh_matches')))) . + html::div('ml-3', $input->show()) . + html::div('ml-5 text-center', html::span('mh_color', rcube_utils::rep_specialchars_output($this->gettext('mh_color')))) . + html::div('ml-3', $color) . + html::div('ml-3', $button) . + html::div('ml-3', $add_button) + ); + + return($content); + } + + // add a section to the preferences tab + function mh_preferences_section($args) { + $this->add_texts('localization/', false); + $args['list']['mh_preferences'] = array( + 'id' => 'mh_preferences', + 'section' => rcube_utils::rep_specialchars_output($this->gettext('mh_title')) + ); + return($args); + } + + // save preferences + function mh_save($args) { + if($args['section'] != 'mh_preferences') return; + + $rcmail = rcmail::get_instance(); + + $header = rcube_utils::get_input_value('_mh_header', rcube_utils::INPUT_POST); + $input = rcube_utils::get_input_value('_mh_input', rcube_utils::INPUT_POST); + $color = rcube_utils::get_input_value('_mh_color', rcube_utils::INPUT_POST); + + + for($i=0; $i < count($header); $i++) { + if(!in_array($header[$i], array('subject', 'from', 'to', 'cc'))) { + $rcmail->output->show_message('message_highlight.headererror', 'error'); + return; + } + if(!preg_match('/^#[0-9a-fA-F]{2,6}$/', $color[$i])) { + $rcmail->output->show_message('message_highlight.invalidcolor', 'error'); + return; + } + if($input[$i] == '') { + continue; + } + $prefs[] = array('header' => $header[$i], 'input' => $input[$i], 'color' => $color[$i]); + } + + $args['prefs']['message_highlight'] = $prefs; + return($args); + } +} diff --git a/plugins/message_highlight/package.xml b/plugins/message_highlight/package.xml new file mode 100644 index 0000000..9fa7e8f --- /dev/null +++ b/plugins/message_highlight/package.xml @@ -0,0 +1,18 @@ + + + message_highlight + + Melroy van den Berg + melroy89 + melroy@melroy.org + yes + + https://github.com/corbosman/message_highlight + + 4.0 + + GNU GPLv2 + diff --git a/plugins/message_highlight/skins/autumn-larry/message_highlight.css b/plugins/message_highlight/skins/autumn-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/autumn-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/black-larry/message_highlight.css b/plugins/message_highlight/skins/black-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/black-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/blue-larry/message_highlight.css b/plugins/message_highlight/skins/blue-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/blue-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/classic/message_highlight.css b/plugins/message_highlight/skins/classic/message_highlight.css new file mode 100644 index 0000000..bdb50d3 --- /dev/null +++ b/plugins/message_highlight/skins/classic/message_highlight.css @@ -0,0 +1,49 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -238px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -262px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} \ No newline at end of file diff --git a/plugins/message_highlight/skins/elastic/message_highlight.css b/plugins/message_highlight/skins/elastic/message_highlight.css new file mode 100644 index 0000000..c1532c3 --- /dev/null +++ b/plugins/message_highlight/skins/elastic/message_highlight.css @@ -0,0 +1,41 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; + color: #fff !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* preferences */ + +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .mh_button { + border: 1px solid #ced4da; +} + +/* pencil icon for settings item */ +.listing.iconized tr.mh_preferences>td.section:before { + content: "\f303"; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/green-larry/message_highlight.css b/plugins/message_highlight/skins/green-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/green-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/grey-larry/message_highlight.css b/plugins/message_highlight/skins/grey-larry/message_highlight.css new file mode 100644 index 0000000..4b5f988 --- /dev/null +++ b/plugins/message_highlight/skins/grey-larry/message_highlight.css @@ -0,0 +1,49 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/larry/message_highlight.css b/plugins/message_highlight/skins/larry/message_highlight.css new file mode 100644 index 0000000..c47c943 --- /dev/null +++ b/plugins/message_highlight/skins/larry/message_highlight.css @@ -0,0 +1,49 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -238px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -262px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/mint70-larry/message_highlight.css b/plugins/message_highlight/skins/mint70-larry/message_highlight.css new file mode 100644 index 0000000..c47c943 --- /dev/null +++ b/plugins/message_highlight/skins/mint70-larry/message_highlight.css @@ -0,0 +1,49 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -238px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -262px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/pink-larry/message_highlight.css b/plugins/message_highlight/skins/pink-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/pink-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/plata-larry/message_highlight.css b/plugins/message_highlight/skins/plata-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/plata-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/summer-larry/message_highlight.css b/plugins/message_highlight/skins/summer-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/summer-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/teal-larry/message_highlight.css b/plugins/message_highlight/skins/teal-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/teal-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/plugins/message_highlight/skins/violet-larry/message_highlight.css b/plugins/message_highlight/skins/violet-larry/message_highlight.css new file mode 100644 index 0000000..195999c --- /dev/null +++ b/plugins/message_highlight/skins/violet-larry/message_highlight.css @@ -0,0 +1,46 @@ +/* mail list */ +.rcmfd_mh_row td { + background-color: transparent !important; +} + +.rcmfd_mh_row_dark td * { + color: #fff !important; +} + +/* settings */ +.mh_preferences_row { + display: flex; + align-items: center; +} + +.mh_preferences_row .ml-3 { + margin-left: 10px; +} + +.mh_preferences_row .ml-5 { + margin-left: 15px; +} + +/* icon */ +#sections-table #rcmrowmh_preferences td.section { + background-position: 6px -262px; +} + +#sections-table #rcmrowmh_preferences.selected td.section { + background-position: 6px -238px; +} + +/* remove some colorpicker elements */ +#mColorPickerTransparent, #mColorPickerSwatches, #mColorPickerImgGray { + display: none; +} + +#mColorPickerFooter { + background-color: #ffffff !important; +} + +#mColorPicker { + height: 83px !important; + padding: 2px !important; + background-color: #ffffff !important; +} diff --git a/skins/litecube-f/assets/images/logo_header.png b/skins/litecube-f/assets/images/logo_header.png index 529bf53..350edea 100644 Binary files a/skins/litecube-f/assets/images/logo_header.png and b/skins/litecube-f/assets/images/logo_header.png differ diff --git a/skins/litecube-f/assets/images/logo_header_old.png b/skins/litecube-f/assets/images/logo_header_old.png new file mode 100644 index 0000000..529bf53 Binary files /dev/null and b/skins/litecube-f/assets/images/logo_header_old.png differ diff --git a/skins/litecube-f/assets/images/logo_print.png b/skins/litecube-f/assets/images/logo_print.png index 529bf53..350edea 100644 Binary files a/skins/litecube-f/assets/images/logo_print.png and b/skins/litecube-f/assets/images/logo_print.png differ diff --git a/skins/litecube-f/assets/images/logo_print_orig.png b/skins/litecube-f/assets/images/logo_print_orig.png new file mode 100644 index 0000000..529bf53 Binary files /dev/null and b/skins/litecube-f/assets/images/logo_print_orig.png differ diff --git a/skins/litecube-f/assets/styles/desktop.css b/skins/litecube-f/assets/styles/desktop.css index 15a9668..6902b44 100644 --- a/skins/litecube-f/assets/styles/desktop.css +++ b/skins/litecube-f/assets/styles/desktop.css @@ -96,12 +96,20 @@ body.xlarry.xskin .mailbox>a:before { #topline, .minimal #topline, #topnav { - background: linear-gradient(0deg, #d9e2e6, #f1f1f1); + background: linear-gradient(0deg, #d9e2e6 0%, #f1f1f1 75%, #9daec0 100%); + font-weight: bold; } #topline { /* box-shadow: inset 0px -2px 8px 1px #555555ee !important; */ padding: 4px 0px 4px 10px !important; + font-size: 10pt; +} + +#topline a:hover { + text-decoration: none; + color: #88bcf366 !important; + mix-blend-mode: exclusion; } #topnav, @@ -109,7 +117,7 @@ body.xlarry.xskin .mailbox>a:before { padding: 5px 0 0 0; height: 34px; margin: 0; - background: #fff; + background: #d3e8ff; border-bottom: 2px solid #ddd; box-shadow: 0px -2px 10px -1px #55555599 !important; top: 0 @@ -141,18 +149,19 @@ body.xlarry.xskin .mailbox>a:before { .minimal #taskbar .button-apps, .minimal #taskbar .button-help { - padding-right: 4px !important + padding-right: 4px !important; } #taskbar a.button-selected { height: 22px; border: 2px solid #ddd; border-bottom: none; - margin-top: 0 + margin-top: 0; } #header #topnav #taskbar a.button-selected { - background: linear-gradient(0deg, #D0D9DE 0%, #a6c5d1 100%) !important; + background: linear-gradient(0deg, #cbd4d8 0%, #c7cfd3 20%, #e2ecef 100%) !important; + box-shadow: 0px -2px 4px -1px #21212188 !important; } #taskbar a:hover {