From 2522193b9e2f2511cc6b5e9fac098eb8f2025720 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sat, 31 Dec 2022 14:28:34 +0100 Subject: [PATCH] release 2.24 (see changelog) --- CHANGELOG.md | 13 ++ LICENSE | 339 +++++++++++++++++++++++++++++++++++++++ README.md | 48 +++++- _admin.php | 39 +++-- _define.php | 35 ++-- _install.php | 59 +++---- _prepend.php | 29 ++++ _public.php | 55 +++---- changelog | 6 - dcstore.xml | 13 ++ index.php | 155 ++++++++++-------- locales/fr/main.lang.php | 15 ++ locales/fr/main.po | 23 +-- script.js | 27 ---- 14 files changed, 642 insertions(+), 214 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 LICENSE create mode 100644 _prepend.php delete mode 100644 changelog create mode 100644 dcstore.xml create mode 100644 locales/fr/main.lang.php delete mode 100644 script.js diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..024ff98 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +2.0 - 2022.12.31 +* use URL for style sheet +* use color synthax for edition +* use anonymous function +* use abstract plugin id +* fix phpstan and php-cs-fixer errors + +1.4 - 2022.12.19 - Pierre Van Glabeke +* mŕj dc2.24 + +1.3 - 2018.01.23 - Pierre Van Glabeke +* ajout js pour fermeture +* modif date bloc licence \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/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/README.md b/README.md index a0f4492..ac54506 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,46 @@ -# moreCSS -Le plugin pour dotclear permet Ă  l'administrateur du blog d'ajouter des règles CSS au thème actif sans modifier ce dernier. +# README + +[![Release](https://img.shields.io/github/v/release/JcDenis/moreCSS)](https://github.com/JcDenis/moreCSS/releases) +[![Date](https://img.shields.io/github/release-date/JcDenis/moreCSS)](https://github.com/JcDenis/moreCSS/releases) +[![Issues](https://img.shields.io/github/issues/JcDenis/moreCSS)](https://github.com/JcDenis/moreCSS/issues) +[![Dotclear](https://img.shields.io/badge/dotclear-v2.24-blue.svg)](https://fr.dotclear.org/download) +[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/moreCSS) +[![License](https://img.shields.io/github/license/JcDenis/moreCSS)](https://github.com/JcDenis/moreCSS/blob/master/LICENSE) + +## WHAT IS MORECSS ? + +_moreCSS_ is a plugin for the open-source +web publishing software called Dotclear. + +It helps admin to add more CSS rules to current theme +without editing it. + +## REQUIREMENTS + + _moreCSS_ requires: + + * content admin permissions to manage CSS + * Dotclear 2.24 + +## USAGE + +First install _moreCSS_, manualy from a zip package or from +Dotaddict repository. (See Dotclear's documentation to know how do this) + +Add and configure "Style sheet" from sidebar menu +or by adding a favorites icon on dashboard. + +## LINKS + + * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) + * Source & contribution : [GitHub Page](https://github.com/JcDenis/moreCSS) + * Packages & details : [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/moreCSS) + * Discuss & help : [Dotclear forum](http://forum.dotclear.org/viewtopic.php?id=44908) + +## CONTRIBUTORS + + * Osku (author) + * Pierre Van Glabeke + * Jean-Christian Denis + + You are welcome to contribute to this code. diff --git a/_admin.php b/_admin.php index 1d8df48..d84fa73 100644 --- a/_admin.php +++ b/_admin.php @@ -1,34 +1,33 @@ menu[dcAdmin::MENU_BLOG]->addItem( __('Style sheet'), - dcCore::app()->adminurl->get('admin.plugin.moreCSS'), - [dcPage::getPF('moreCSS/icon.png')], - preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.moreCSS')) . '(&.*)?$/', $_SERVER['REQUEST_URI']), + dcCore::app()->adminurl->get('admin.plugin.' . basename(__DIR__)), + [dcPage::getPF(basename(__DIR__) . '/icon.png')], + preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.' . basename(__DIR__))) . '(&.*)?$/', $_SERVER['REQUEST_URI']), dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_CONTENT_ADMIN]), dcCore::app()->blog->id) ); -/* Register favorite */ dcCore::app()->addBehavior('adminDashboardFavoritesV2', function (dcFavorites $favs) { - $favs->register('moreCSS', [ + $favs->register(basename(__DIR__), [ 'title' => __('Style sheet'), - 'url' => dcCore::app()->adminurl->get('admin.plugin.moreCSS'), - 'small-icon' => [dcPage::getPF('moreCSS/icon.png')], - 'large-icon' => [dcPage::getPF('moreCSS/icon-big.png')], + 'url' => dcCore::app()->adminurl->get('admin.plugin.' . basename(__DIR__)), + 'small-icon' => [dcPage::getPF(basename(__DIR__) . '/icon.png')], + 'large-icon' => [dcPage::getPF(basename(__DIR__) . '/icon-big.png')], 'permissions' => dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_CONTENT_ADMIN]), ]); }); diff --git a/_define.php b/_define.php index 93256b8..7e2bf7b 100644 --- a/_define.php +++ b/_define.php @@ -1,19 +1,21 @@ registerModule( - 'moreCSS', + 'Style sheet', 'Another CSS stylesheet for the active theme', 'Osku and contributors', '2.0', @@ -22,8 +24,9 @@ $this->registerModule( 'permissions' => dcCore::app()->auth->makePermissions([ dcAuth::PERMISSION_CONTENT_ADMIN, ]), - 'type' => 'plugin', - 'support' => 'http://forum.dotclear.org/viewtopic.php?id=44908', - 'details' => 'https://plugins.dotaddict.org/dc2/details/moreCSS', + 'type' => 'plugin', + 'support' => 'http://forum.dotclear.org/viewtopic.php?id=44908', + 'details' => 'https://plugins.dotaddict.org/dc2/details/' . basename(__DIR__), + 'repository' => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/dcstore.xml', ] ); diff --git a/_install.php b/_install.php index ad68f2b..19edabe 100644 --- a/_install.php +++ b/_install.php @@ -1,34 +1,35 @@ error->add(sprintf(__('Dotclear version 2.6 minimum is required. moreCSS is deactivated.'))); - dcCore::app()->plugins->deactivateModule('moreCSS'); - return false; +/** + * @brief moreCSS, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Osku and contributors + * + * @copyright Jean-Christian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_CONTEXT_ADMIN')) { + return null; } -$new_version = dcCore::app()->plugins->moduleInfo('moreCSS','version'); - -$current_version = dcCore::app()->getVersion('moreCSS'); - -if (version_compare($current_version,$new_version,'>=')) { - return; +try { + if (!dcCore::app()->newVersion( + basename(__DIR__), + dcCore::app()->plugins->moduleInfo(basename(__DIR__), 'version') + )) { + return null; + } + + $s = dcCore::app()->blog->settings->get('themes'); + $s->put('morecss_active', true, 'boolean', 'Enable additionnal CSS for the active theme', false, true); + $s->put('morecss', '', 'string', 'Additionnal CSS for the active theme', false, true); + $s->put('morecss_min', '', 'string', 'Minified addtionnal CSS for the active theme', false, true); + + return true; +} catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); } -$s =& dcCore::app()->blog->settings->themes; -$s->put('morecss','','string','Additionnal css for the active theme',true,true); -$s->put('morecss_min','','string','Minified addtionnal css for the active theme',true,true); - -dcCore::app()->setVersion('moreCSS',$new_version); -return true; \ No newline at end of file +return false; diff --git a/_prepend.php b/_prepend.php new file mode 100644 index 0000000..7f1aa3f --- /dev/null +++ b/_prepend.php @@ -0,0 +1,29 @@ +url->register( + basename(__DIR__), + 'morecss.css', + '^morecss\.css(.*?)$', + function ($args) { + header('Content-Type: text/css; charset=UTF-8'); + + echo "/* CSS for plugin moreCss */ \n"; + echo (string) base64_decode((string) dcCore::app()->blog->settings->get('themes')->get('morecss_min')); + + exit; + } +); diff --git a/_public.php b/_public.php index 534a5c1..73cf1da 100644 --- a/_public.php +++ b/_public.php @@ -1,29 +1,30 @@ addBehavior('publicHeadContent',array('moreCSSpublicBehaviors','stylesheet')); - -class moreCSSpublicBehaviors -{ - public static function stylesheet() - { - $css = base64_decode(dcCore::app()->blog->settings->themes->morecss_min); - - if ($css != '') { - echo - "\n \n". - ''."\n"; - } - } +/** + * @brief moreCSS, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Osku and contributors + * + * @copyright Jean-Christian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_RC_PATH')) { + return null; } + +if (!dcCore::app()->blog->settings->get('themes')->get('morecss_active')) { + return null; +} + +dcCore::app()->addBehavior('publicHeadContent', function () { + $css = (string) base64_decode((string) dcCore::app()->blog->settings->get('themes')->get('morecss_min')); + if (!empty($css)) { + echo dcUtils::cssLoad( + dcCore::app()->blog->url . dcCore::app()->url->getURLFor(basename(__DIR__)), + 'screen', + md5($css) //no cache on content change + ); + } +}); diff --git a/changelog b/changelog deleted file mode 100644 index 80f74e2..0000000 --- a/changelog +++ /dev/null @@ -1,6 +0,0 @@ -v2.0 - 19/12/2022 - Pierre Van Glabeke -* mŕj dc2.24 - -v1.3 - 23/01/2018 - Pierre Van Glabeke -* ajout js pour fermeture -* modif date bloc licence \ No newline at end of file diff --git a/dcstore.xml b/dcstore.xml new file mode 100644 index 0000000..cd556d8 --- /dev/null +++ b/dcstore.xml @@ -0,0 +1,13 @@ + + + + Style sheet + 2.0 + Osku and contributors + Another CSS stylesheet for the active theme + https://github.com/JcDenis/moreCSS/releases/download/v2.0/plugin-moreCSS.zip + 2.24 + https://plugins.dotaddict.org/dc2/details/moreCSS + http://forum.dotclear.org/viewtopic.php?id=44908 + + diff --git a/index.php b/index.php index fec43d0..7aeefda 100644 --- a/index.php +++ b/index.php @@ -1,82 +1,95 @@ blog->settings->themes; - -if (isset($_POST['file_content'])) { - try { - // Save CSS - $css = base64_encode($_POST['file_content']); - $s->put('morecss',$css); - - // Minify it - $css_min = preg_replace('` {2,}`', ' ', $_POST['file_content']); - $css_min = preg_replace('/(\/\*[\s\S]*?\*\/)/', '', $css_min); - $css_min = preg_replace('/(\t|\r|\n)/', '', $css_min); - $css_min = str_replace(array(' { ',' {','{ '),'{', $css_min); - $css_min = str_replace(array(' } ',' }','} '),'}', $css_min); - $css_min = str_replace(array(' : ',' :',': '),':', $css_min); - $css_min = str_replace(array(' ; ',' ;','; '),';', $css_min); - $css_min = str_replace(array(' , ',' ,',', '),',', $css_min); - $s->put('morecss_min',base64_encode($css_min)); - - http::redirect(dcCore::app()->admin->getPageURL().'&config=1'); - } catch (Exception $e) { - dcCore::app()->error->add($e->getMessage()); - } +/** + * @brief moreCSS, a plugin for Dotclear 2 + * + * @package Dotclear + * @subpackage Plugin + * + * @author Osku and contributors + * + * @copyright Jean-Christian Denis + * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html + */ +if (!defined('DC_CONTEXT_ADMIN')) { + return null; } -$css_content = base64_decode($s->morecss); +dcPage::check(dcCore::app()->auth->makePermissions([ + dcAuth::PERMISSION_CONTENT_ADMIN, +])); -?> - - - <?php echo $page_title; ?> - - - - - -blog->name) => '', - ''.$page_title.'' => '' - )); +$s = dcCore::app()->blog->settings->get('themes'); -?> +if (isset($_POST['morecss'])) { + try { + // Save CSS + $css = base64_encode($_POST['morecss']); + $s->put('morecss', $css); + $s->put('morecss_active', !empty($_POST['morecss_active'])); -admin->getPageURL().'" id="file-form" method="post">'. + // Minify it + $css_min = preg_replace('` {2,}`', ' ', $_POST['morecss']); + $css_min = preg_replace('/(\/\*[\s\S]*?\*\/)/', '', $css_min); + $css_min = preg_replace('/(\t|\r|\n)/', '', $css_min); + $css_min = str_replace([' { ', ' {', '{ '], '{', $css_min); + $css_min = str_replace([' } ', ' }', '} '], '}', $css_min); + $css_min = str_replace([' : ', ' :', ': '], ':', $css_min); + $css_min = str_replace([' ; ', ' ;', '; '], ';', $css_min); + $css_min = str_replace([' , ', ' ,', ', '], ',', $css_min); + $s->put('morecss_min', base64_encode($css_min)); -'
'. - '

'. - '

'.form::textarea('file_content',60,20,html::escapeHTML($css_content),'maximal','').'

'. -'

'.form::hidden('p','moreCSS'). - dcCore::app()->formNonce(). - '

+ dcAdminNotices::addSuccessNotice( + __('Configuration successfully updated.') + ); + dcCore::app()->adminurl->redirect( + 'admin.plugin.' . basename(__DIR__) + ); + } catch (Exception $e) { + dcCore::app()->error->add($e->getMessage()); + } +} + +echo ' +' . __('Style sheet') . ''; +if (dcCore::app()->auth->user_prefs->interface->colorsyntax) { + echo + dcPage::jsJson('dotclear_colorsyntax', ['colorsyntax' => dcCore::app()->auth->user_prefs->interface->colorsyntax]) . + dcPage::jsLoadCodeMirror(dcCore::app()->auth->user_prefs->interface->colorsyntax_theme); +} +echo ' +' . +dcPage::breadcrumb([ + html::escapeHTML(dcCore::app()->blog->name) => '', + __('Style sheet') => '', +]) . +dcPage::notices() . ' + +
+ +

+

' . form::textarea('morecss', 72, 25, [ + 'default' => html::escapeHTML((string) base64_decode((string) $s->get('morecss'))), + 'class' => 'maximal', +]) . '

+ +

+ +

' . +form::hidden('p', 'moreCSS') . +dcCore::app()->formNonce() . ' +

'; -?> +if (dcCore::app()->auth->user_prefs->interface->colorsyntax) { + echo + dcPage::jsJson('theme_editor_mode', ['mode' => 'css']) . + dcPage::jsModuleLoad('themeEditor/js/mode.js') . + dcPage::jsRunCodeMirror('editor', 'morecss', 'dotclear', dcCore::app()->auth->user_prefs->interface->colorsyntax_theme); +} +echo ' - +'; diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php new file mode 100644 index 0000000..2b3ec31 --- /dev/null +++ b/locales/fr/main.lang.php @@ -0,0 +1,15 @@ + 1);\n" -#: _admin.php:15 -#: _admin.php:24 -#: index.php:15 msgid "Style sheet" msgstr "Feuille de style" -#: _install.php:16 -msgid "Dotclear version 2.6 minimum is required. moreCSS is deactivated." -msgstr "La version 2.6 de Dotclear est requise. moreCSS est désactivé." - -#: index.php:72 msgid "Style sheet:" msgstr "Feuille de style :" +msgid "Enable additionnal CSS for the active theme" +msgstr "Autorisation la feuille de style additionnelle pour le thème actif" + msgid "Another CSS stylesheet for the active theme" msgstr "Une autre feuille de style CSS pour le thème actif" + diff --git a/script.js b/script.js deleted file mode 100644 index 216e200..0000000 --- a/script.js +++ /dev/null @@ -1,27 +0,0 @@ -$(function(){ - var msg=false; - $('#file-form input[name="write"]').click(function(e){ - var f=this.form; - var data={ - file_content:(!dotclear.colorsyntax?$(f).find('#file_content').get(0).value:editor.getValue()), - xd_check:$(f).find('input[name="xd_check"]').get(0).value, - write:1 - }; - if(msg==false){ - msg=$('

'); - $('#file_content').parent().after(msg); - } - msg.text(dotclear.msg.saving_document); - $.post(document.location.href,data,function(res,status){ - var err=$(res).find('div.error li:first'); - if(err.length>0){ - msg.text(dotclear.msg.error_occurred+' '+err.text()); - return; - }else{ - msg.text(dotclear.msg.document_saved); - //$('#file-chooser').empty(); - //$(res).find('#file-chooser').children().appendTo('#file-chooser'); - if($.isFunction(confirmClosePage['getCurrentForms'])){confirmClosePage.forms=[]; - confirmClosePage.getCurrentForms();}}}); - e.preventDefault();});$('#file-form input[name="delete"]').click(function(){return window.confirm(dotclear.msg.confirm_reset_file);}); - });