From c9ac428ede0a5d9c0a81d8c09ccb2055787a4520 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 31 Jan 2022 02:30:15 +0300 Subject: [PATCH 01/17] Groups: Update groups layot --- Web/Presenters/templates/@listView.xml | 11 +- Web/Presenters/templates/User/Groups.xml | 39 +- Web/Presenters/templates/components/error.xml | 15 +- Web/static/css/style.css | 23 +- locales/LICENSE | 504 ++++++++++++++++++ locales/crowdin.yml | 3 + locales/ru.strings | 6 + 7 files changed, 584 insertions(+), 17 deletions(-) create mode 100644 locales/LICENSE create mode 100644 locales/crowdin.yml diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index 35c9a2f0..e575a4a8 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -5,7 +5,11 @@
{include tabs}
- + + {ifset size} + {include size, x => $dat} + {/ifset} +
{var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} @@ -54,5 +58,10 @@ {/ifset} {/if}
+ + {ifset bottom} + {include bottom} + {/ifset} + {/block} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 18860fd8..1ad47c8d 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -5,16 +5,12 @@ {block title}{_"groups"}{/block} {block header} +{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {_my_groups} + {else} {$user->getCanonicalName()} » {_"groups"} - + {/if}
- - - - {_"create_group"} - - -
{/block} @@ -35,6 +31,12 @@ {/if} {/block} +{block size} +
+
Найдено групп ({$thisUser->getClubCount()})
+
+{/block} + {block link|strip|stripHtml} {$x->getURL()} {/block} @@ -63,3 +65,24 @@ {/if} {/block} + +{block bottom} +{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+
+

{_"open_new_group"}

+ {_"open_group_desc"} +
+
+ +
+

{_"search_group"}

+ {_"search_group_desc"} +
+ + + +
+
+{/if} +{/block} diff --git a/Web/Presenters/templates/components/error.xml b/Web/Presenters/templates/components/error.xml index 288129a2..1e3568d9 100644 --- a/Web/Presenters/templates/components/error.xml +++ b/Web/Presenters/templates/components/error.xml @@ -1,7 +1,8 @@ -
- Ошибка -

{$title}

-

- {$description} -

-
+
+ + {$title} +
+
+ {$description} + +
\ No newline at end of file diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 590a62d6..a15a305a 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1830,4 +1830,25 @@ body.scrolled .toTop:hover { .comments_count { padding: 5px 0px 0px 0px; -} \ No newline at end of file +} + +.groups_options { + padding: 10px 20px 20px; + border-top: #DEDEDE solid 1px; + margin-top: 12px; + margin-left: -12px; + margin-right: -12px; + } + + #gp_container { + display: inline-block; + } + + #gp_container span { + display: block; + margin: 10px 0 15px; + } + + #gp_container h4 { + font-size: 11px; + } \ No newline at end of file diff --git a/locales/LICENSE b/locales/LICENSE new file mode 100644 index 00000000..8000a6fa --- /dev/null +++ b/locales/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; 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. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/locales/crowdin.yml b/locales/crowdin.yml new file mode 100644 index 00000000..4fe6e093 --- /dev/null +++ b/locales/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /ru.strings + translation: /%two_letters_code%.strings diff --git a/locales/ru.strings b/locales/ru.strings index a283fe35..6c14252d 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -285,6 +285,12 @@ "meetings_many" = "$1 встреч"; "meetings_other" = "$1 встреч"; +"open_new_group" = "Открыть новую группу"; +"open_group_desc" = "Не можете найти нужную группу? Откройте свою..."; +"search_group" = "Поиск группы"; +"search_by_groups" = "Поиск по группам"; +"search_group_desc" = "Здесь Вы можете просмотреть существующие группы и выбрать группу себе по вкусу..."; + /* Albums */ "create" = "Создать"; From f7beeb3e2bef91e6f316df338f133594844e4c41 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Mon, 31 Jan 2022 02:49:15 +0300 Subject: [PATCH 02/17] We don't use crowdin anymore, why it's still there? --- locales/crowdin.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 locales/crowdin.yml diff --git a/locales/crowdin.yml b/locales/crowdin.yml deleted file mode 100644 index 4fe6e093..00000000 --- a/locales/crowdin.yml +++ /dev/null @@ -1,3 +0,0 @@ -files: - - source: /ru.strings - translation: /%two_letters_code%.strings From 1f0913c460d5edc1d40fa3d1ed77af2e46893b1c Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:28:20 +0300 Subject: [PATCH 03/17] Locales: Delete unnecessary LICENSE We already have COPYING in the root directory :/ --- locales/LICENSE | 504 ------------------------------------------------ 1 file changed, 504 deletions(-) delete mode 100644 locales/LICENSE diff --git a/locales/LICENSE b/locales/LICENSE deleted file mode 100644 index 8000a6fa..00000000 --- a/locales/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 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. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, 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 library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete 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 distribute a copy of this License along with the -Library. - - 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 Library or any portion -of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -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 Library, 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 Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you 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. - - If distribution of 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 satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be 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. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library 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. - - 9. 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 Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -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 with -this License. - - 11. 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 Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library 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 Library. - -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. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library 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. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -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 Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -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 - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. 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 LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. 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 library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; 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. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! From 7dea746dfaaf1f91899f884bdec1503cc462ec48 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:34:16 +0300 Subject: [PATCH 04/17] Locales: Localize strings for updated group layout Localized strings: open_new_group, open_group_desc, search_group, search_by_groups, search_group_desc (we already have search_for_groups but idk, I'll leave it for now) --- locales/en.strings | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locales/en.strings b/locales/en.strings index 7ef546da..bc5212d0 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -269,6 +269,12 @@ "meetings_one" = "$1 meeting"; "meetings_other" = "$1 meetings"; +"open_new_group" = "Open a new group"; +"open_group_desc" = "Can't find the right group? Open your own..."; +"search_group" = "Search group"; +"search_by_groups" = "Search by groups"; +"search_group_desc" = "Here you can browse through the existing groups and choose a group to suit your needs..."; + /* Albums */ "create" = "Create"; From 77bda53ad94a4529f390722e69c4e91c42195639 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:45:12 +0300 Subject: [PATCH 05/17] Global: Fix tabs --- Web/Presenters/templates/@listView.xml | 11 +++++------ Web/Presenters/templates/components/error.xml | 6 ++---- Web/static/css/style.css | 14 +++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index e575a4a8..b3a0a314 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -7,12 +7,12 @@ {ifset size} - {include size, x => $dat} + {include size, x => $dat} {/ifset}
{var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} - + {if sizeof($data) > 0}
@@ -30,7 +30,7 @@
- + {include description, x => $dat}
@@ -40,7 +40,7 @@
- +
{include "components/paginator.xml", conf => (object) [ "page" => $page, @@ -60,8 +60,7 @@
{ifset bottom} - {include bottom} + {include bottom} {/ifset} -
{/block} diff --git a/Web/Presenters/templates/components/error.xml b/Web/Presenters/templates/components/error.xml index 1e3568d9..9ce715db 100644 --- a/Web/Presenters/templates/components/error.xml +++ b/Web/Presenters/templates/components/error.xml @@ -1,8 +1,6 @@
- {$title} -
-
- {$description} + {$title}

+ {$description}
\ No newline at end of file diff --git a/Web/static/css/style.css b/Web/static/css/style.css index a15a305a..ce0b3543 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1838,17 +1838,17 @@ body.scrolled .toTop:hover { margin-top: 12px; margin-left: -12px; margin-right: -12px; - } +} - #gp_container { +#gp_container { display: inline-block; - } +} - #gp_container span { +#gp_container span { display: block; margin: 10px 0 15px; - } +} - #gp_container h4 { +#gp_container h4 { font-size: 11px; - } \ No newline at end of file +} From 42f862eaec70302f3f8fef2f35a5caf875c2f476 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:45:56 +0300 Subject: [PATCH 06/17] Groups: Fix tabs and div block I have SO many questions... --- Web/Presenters/templates/User/Groups.xml | 78 ++++++++++++------------ 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 1ad47c8d..8991c0a9 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -2,39 +2,39 @@ {var iterator = $user->getClubs($page, $admin)} {var count = $user->getClubCount($admin)} -{block title}{_"groups"}{/block} +{block title} + {_groups} +{/block} {block header} -{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} - {_my_groups} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {_my_groups} {else} - {$user->getCanonicalName()} » {_"groups"} + {$user->getCanonicalName()} » {_groups} {/if} -
-
{/block} {* BEGIN ELEMENTS DESCRIPTION *} {block tabs} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
- - {_groups} - -
-
- - {_managed} - -
- {/if} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+ + {_groups} + +
+
+ + {_managed} + +
+ {/if} {/block} {block size} -
+
Найдено групп ({$thisUser->getClubCount()})
-
+
{/block} {block link|strip|stripHtml} @@ -67,22 +67,24 @@ {/block} {block bottom} -{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
-
-

{_"open_new_group"}

- {_"open_group_desc"} -
-
- -
-

{_"search_group"}

- {_"search_group_desc"} -
- - - -
-
-{/if} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+
+

{_open_new_group}

+ {_open_group_desc} +
+ +
+
+
+

{_search_group}

+ {_search_group_desc} +
+ + + +
+
+
+ {/if} {/block} From a2b13116e6b4a89c199bd1cf7cc68e6c6acc923d Mon Sep 17 00:00:00 2001 From: kosfurler Date: Mon, 31 Jan 2022 15:15:51 +0300 Subject: [PATCH 07/17] Groups: Update layot New counter, info and actions blocks and some stye fixes --- Web/Presenters/templates/@listView.xml | 12 +++--- Web/Presenters/templates/User/Groups.xml | 39 ++++++++++++++++--- .../templates/components/paginator.xml | 24 ++++++------ Web/static/css/style.css | 13 +++++++ locales/ru.strings | 5 +++ 5 files changed, 71 insertions(+), 22 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index b3a0a314..aab6660e 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -24,24 +24,25 @@ + {ifset infotable} + {include infotable, x => $dat} + {else} {include name, x => $dat}
- - {include description, x => $dat} + {include description, x => $dat} + {/ifset} - + {include actions, x => $dat} - -
{include "components/paginator.xml", conf => (object) [ "page" => $page, "count" => $count, @@ -49,7 +50,6 @@ "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, "atBottom" => true, ]} -
{else} {ifset customErrorMessage} {include customErrorMessage} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 8991c0a9..5b8c3a74 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -33,7 +33,13 @@ {block size}
-
Найдено групп ({$thisUser->getClubCount()})
+
+ {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {tr("groups_list", $thisUser->getClubCount())} + {else} + {tr("groups", $user->getClubCount())} + {/if} +
{/block} @@ -45,8 +51,19 @@ Фотография группы {/block} -{block name} - {$x->getName()} +{block infotable} + + + + + + + + + + + +
Название: {$x->getName()}
Размер:{tr("participants", $x->getFollowersCount())}
{/block} {block description} @@ -56,13 +73,25 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + + {_check_community} + + + {if $clubPinned} {_remove_from_left_menu} {else} {_add_to_left_menu} {/if} + +
+ + + + +
+ {/if} {/block} @@ -87,4 +116,4 @@ {/if} -{/block} +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/components/paginator.xml b/Web/Presenters/templates/components/paginator.xml index cf717e23..7c14e7e4 100644 --- a/Web/Presenters/templates/components/paginator.xml +++ b/Web/Presenters/templates/components/paginator.xml @@ -1,16 +1,18 @@ {var $space = 2} {var $pageCount = ceil($conf->count / $conf->perPage)} -
- {if $conf->page > $space} - « - {/if} - {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} - {if $j > 0 && $j <= $pageCount} - {$j} +
+
+ {if $conf->page > $space} + « {/if} - {/for} - {if $conf->page <= $pageCount-$space} - » - {/if} + {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} + {if $j > 0 && $j <= $pageCount} + {$j} + {/if} + {/for} + {if $conf->page <= $pageCount-$space} + » + {/if} +
diff --git a/Web/static/css/style.css b/Web/static/css/style.css index ce0b3543..6ab60b75 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1852,3 +1852,16 @@ body.scrolled .toTop:hover { #gp_container h4 { font-size: 11px; } + +.container_gray .content:last-child { + margin-bottom: 0; + } + +.group_info { + padding: 0 0 0 5px !important; + } + +.group_info .label { + width: auto !important; + padding-right: 5px; +} \ No newline at end of file diff --git a/locales/ru.strings b/locales/ru.strings index 6c14252d..b21acfed 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -225,6 +225,7 @@ "subscriptions" = "Подписки"; "join_community" = "Вступить в группу"; "leave_community" = "Выйти из группы"; +"check_community" = "Просмотр группы"; "min_6_community" = "Название должно быть не менее 6 символов"; "participants" = "Участники"; "groups" = "Группы"; @@ -279,6 +280,10 @@ "groups_many" = "$1 групп"; "groups_other" = "$1 групп"; +"groups_list_zero" = "Вы не состоите ни в одной группе"; +"groups_list_one" = "Вы состоите в одной группе"; +"groups_list_other" = "Вы состоите в $1 группах"; + "meetings_zero" = "Ни одной встречи"; "meetings_one" = "Одна встреча"; "meetings_few" = "$1 встречи"; From 3f1b852e506be13827d24a75803e1cadfd843d68 Mon Sep 17 00:00:00 2001 From: kosfurler Date: Tue, 1 Feb 2022 19:50:53 +0300 Subject: [PATCH 08/17] Layout: Made a brand new layout for notes list and update counter in video list --- Web/Presenters/templates/@listView.xml | 96 ++++++++++++------------ Web/Presenters/templates/Notes/List.xml | 95 ++++++++++++++++++----- Web/Presenters/templates/Videos/List.xml | 14 +++- Web/static/css/style.css | 13 +++- locales/en.strings | 1 + locales/ru.strings | 11 ++- 6 files changed, 161 insertions(+), 69 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index aab6660e..839283b9 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -10,54 +10,58 @@ {include size, x => $dat} {/ifset} -
- {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {ifset specpage} + {include specpage, x => $dat} + {else} +
+ {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} - {if sizeof($data) > 0} -
- - - - - - - - -
- - {include preview, x => $dat} - - - {ifset infotable} - {include infotable, x => $dat} - {else} - - - {include name, x => $dat} - - -
- {include description, x => $dat} - {/ifset} - 		- {include actions, x => $dat} -
-
- {include "components/paginator.xml", conf => (object) [ - "page" => $page, - "count" => $count, - "amount" => sizeof($data), - "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, - "atBottom" => true, - ]} - {else} - {ifset customErrorMessage} - {include customErrorMessage} + {if sizeof($data) > 0} +
+ + + + + + + + +
+ + {include preview, x => $dat} + + + {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
+ {include description, x => $dat} + {/ifset} + 		+ {include actions, x => $dat} +
+
+ {include "components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => true, + ]} {else} - {include "components/nothing.xml"} - {/ifset} - {/if} -
+ {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "components/nothing.xml"} + {/ifset} + {/if} +
+ {/ifset} {ifset bottom} {include bottom} diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml index 44d831f5..2fb31c0c 100644 --- a/Web/Presenters/templates/Notes/List.xml +++ b/Web/Presenters/templates/Notes/List.xml @@ -5,12 +5,25 @@ {block title}{_notes}{/block} {block header} - {$owner->getCanonicalName()} - » - {_notes} - -
- {_create_note} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + {_my_notes} + {else} + + {$owner->getCanonicalName()} + » + {_notes} + {/if} +{/block} + +{block size} +
+
+ {tr("notes_list", $count)} + +  |  + {_create_note} + +
{/block} @@ -20,18 +33,66 @@ {* BEGIN ELEMENTS DESCRIPTION *} -{block link|strip|stripHtml} - /note{$x->getPrettyId()} -{/block} +{block specpage} +
-{block preview} -
{_note}
-{/block} + {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {if sizeof($data) > 0} -{block name} - {$x->getName()} -{/block} +
+
+ + + +
+ +
+ + {else} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + +

{_welcome}

{_notes_start_screen}
+ + {else} + {ifset customErrorMessage} + {include ../customErrorMessage} + {else} + {include ../components/nothing.xml} + {/ifset} + {/if} + {/if} +
{/block} diff --git a/Web/Presenters/templates/Videos/List.xml b/Web/Presenters/templates/Videos/List.xml index 0f04b482..be9e3cad 100644 --- a/Web/Presenters/templates/Videos/List.xml +++ b/Web/Presenters/templates/Videos/List.xml @@ -8,9 +8,17 @@ {block header} {$user->getCanonicalName()} » {_"videos"} - -
- {_"upload_video"} +{/block} + +{block size} +
+
+ {tr("videos", $count)} + +  |  + {_upload_video} + +
{/block} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 6ab60b75..5473d1d6 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1864,4 +1864,15 @@ body.scrolled .toTop:hover { .group_info .label { width: auto !important; padding-right: 5px; -} \ No newline at end of file +} + +table td[width="120"] { + text-align: right; +} + +.profile_thumb { + padding: 0px 10px 0px 0px; + width: 50px; + display: inline-block; + vertical-align: top; +} diff --git a/locales/en.strings b/locales/en.strings index bc5212d0..35c74464 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -310,6 +310,7 @@ "notes_zero" = "No notes"; "notes_one" = "$1 note"; "notes_other" = "$1 notes"; +"notes_start_screen" = "With notes, you can share your events with friends and see what's going on with them."; /* Menus */ diff --git a/locales/ru.strings b/locales/ru.strings index b21acfed..9fc20c03 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -324,9 +324,10 @@ "note" = "Заметка"; "name_note" = "Название"; "text_note" = "Содержание"; -"create_note" = "Создать заметку"; +"create_note" = "Добавить запись"; "edit_note" = "Редактировать заметку"; "actions" = "Действия"; +"notes_start_screen" = "С помощью заметок Вы можете делиться событиями из жизни с друзьями, а так же быть в курсе того, что происходит у них."; "edited" = "Отредактировано"; @@ -336,6 +337,12 @@ "notes_many" = "$1 заметок"; "notes_other" = "$1 заметок"; +"notes_list_zero" = "Не найдено ни одной заметки"; +"notes_list_one" = "Найдена одна заметка"; +"notes_list_few" = "Найдено $1 заметки"; +"notes_list_many" = "Найдено $1 заметок"; +"notes_list_other" = "Найдено $1 заметок"; + /* Menus */ "edit_button" = "ред."; @@ -502,7 +509,7 @@ "info_uploaded_by" = "Загрузил"; "info_upload_date" = "Дата загрузки"; -"videos_zero" = "Ни одной видеозаписи"; +"videos_zero" = "Нет видео"; "videos_one" = "Одна видеозапись"; "videos_few" = "$1 видеозаписи"; "videos_many" = "$1 видеозаписей"; From c911ebac258d33d7f3c51cdfcbc82e2fbe5739aa Mon Sep 17 00:00:00 2001 From: kosfurler Date: Tue, 1 Feb 2022 21:35:37 +0300 Subject: [PATCH 09/17] Groups: Fix action block issue --- Web/Presenters/templates/User/Groups.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 5b8c3a74..daf20087 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -72,19 +72,19 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} - {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} + {if $x->canBeModifiedBy($thisUser ?? NULL)} {_check_community} - - - {if $clubPinned} - {_remove_from_left_menu} - {else} - {_add_to_left_menu} - {/if} - - + {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} + + {if $clubPinned} + {_remove_from_left_menu} + {else} + {_add_to_left_menu} + {/if} + + {/if}
From 2cf8a307846dbb7d3738ca5f920e8bace03cda1c Mon Sep 17 00:00:00 2001 From: ayaao <58212796+ayaaop@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:33:52 +0600 Subject: [PATCH 10/17] L10n: Kazakh: Add missing new strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit с прошедшим новым годом cca9151661b0c0e341a0c9d54123d01203fee6df 1b1c88dd96dd8beeec0aff971f119658ebe3f37d 3edf34e0ea3a88db393675d745fdccaa1c81ccb1 70dd7e377306076cbe474b7d74d030348ff4f140 bf81402174006732d1ff62a201e669346f8d4b46 870653ccb1b5c7e21753926afb5e7a5466e4a3f0 d87277e7e74d465a73659ffb94b4e99c59c87a56 1df0545061acdbb476ffea0d342defa537ae6f74 5bad3dbd355fcdc2ea7b410a1e85c633d965f215 b1407ba823f72a3b11ec32f80388baed6152bce7 b7654c8d16b95fd4daf9a5889072e5406395a62e --- locales/kk.strings | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/locales/kk.strings b/locales/kk.strings index 4a985071..a90bbba4 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -9,6 +9,8 @@ "home" = "Басты бет"; "welcome" = "Қош келдіңіз!"; +"to_top" = "Жоғарыға"; + /* Login */ "log_in" = "Логин"; @@ -36,6 +38,13 @@ "password_reset_error" = "Құпиясөзді қалпына келтіру кезінде күтпеген қате орын алды."; "password_reset_rate_limit_error" = "Кешіріңіз, бірақ осы әрекетті сонай жиі жасай алмайсыз."; +"email_sent" = "Хат сәтті жіберілді."; +"email_sent_desc" = "Сіз енгізген электрондық пошта бар болса оған нұсқаулар келеді."; +"email_error" = "Электрондық хатты жіберу кезінде күтпеген қате орын алды."; +"email_rate_limit_error" = "Бұл әрекетті жиі жасай алмайсыз."; + +"email_verify_success" = "Электрондық поштаңыз расталды. Осы әлеуметтік желіде жақсы уақыт өткізуді тілейміз!"; + "registration_disabled_info" = "Жүйе әкімшісі тіркеуді өшірді. Мүмкіндігінше, егер досыңыз сайтта тіркелген болса одан шақыру сілтемесін сұраңыз."; "registration_closed" = "Тіркелу жабық"; "invites_you_to" = "$1 сізді $2 желіне шақырады."; @@ -216,6 +225,7 @@ "subscriptions" = "Жазылымдар"; "join_community" = "Топқа кіру"; "leave_community" = "Топтан шығу"; +"check_community" = "Топты қарау"; "min_6_community" = "Топтың аты тым болмаса 6 әріптен көп болу керек"; "participants" = "Қатысушылар"; "groups" = "Топтар"; @@ -232,6 +242,8 @@ "all_followers" = "Барлық жазылмандар"; "only_administrators" = "Тек әкімшілер"; "website" = "Сайт"; +"managed" = "Басқаратын"; +"size" = "Көлемі"; "administrators_one" = "$1 әкімші"; "administrators_other" = "$1 әкімші"; @@ -245,6 +257,7 @@ "hidden_yes" = "Жасырылған: Ия"; "hidden_no" = "Жасырылған: Жоқ"; "group_allow_post_for_everyone" = "Бәріне жазба жазуға рұқсат ету"; +"group_hide_from_global_feed" = "Жаһандық арнада жазбаларды көрсетпеу"; "statistics" = "Статистика"; "group_administrators_list" = "Әкімшілер тізімі"; "group_display_only_creator" = "Тек топты құрған кісіні көрсету"; @@ -263,10 +276,20 @@ "groups_one" = "$1 топ"; "groups_other" = "$1 топ"; +"groups_list_zero" = "Сіз ешқандай топқа қатыспайсыз."; +"groups_list_one" = "Сіз бір топқа қатысасыз"; +"groups_list_other" = "Сіз $1 топтардың қатысушысысыз"; + "meetings_zero" = "Кездесулер жоқ"; "meetings_one" = "$1 кездесу"; "meetings_other" = "$1 кездесу"; +"open_new_group" = "Жаңа топ ашу"; +"open_group_desc" = "Өзіңізге сай топ таба алмай жүрсіз бе? Өзіңіз ашып алыңыз!"; +"search_group" = "Топ іздеу"; +"search_by_groups" = "Топтардан іздеу"; +"search_group_desc" = "Мұнда сіз бар топтарға шолу жасай аласыз және қажеттіліктеріңізге сай топты таңдай аласыз..."; + /* Albums */ "create" = "Жасау"; @@ -294,10 +317,13 @@ "name_note" = "Тақырыбы"; "text_note" = "Мазмұны"; "create_note" = "Жолжазба жазу"; +"edit_note" = "Жолжазбаны өндеу"; "actions" = "Әрекеттер"; "feed" = "Жаңалықтар"; "publish_post" = "Жазба қосу"; +"edited" = "Өнделген"; + "notes_zero" = "Жолжазбалар жоқ"; "notes_one" = "$1 жолжазба"; "notes_other" = "$1 жолжазба"; @@ -337,6 +363,7 @@ "left_menu_donate" = "Қайырымдылық жасау"; +"footer_about_instance" = "инстанция туралы"; "footer_blog" = "блог"; "footer_help" = "көмек"; "footer_developers" = "әзірлеушілерге"; @@ -367,6 +394,8 @@ "cut" = "Кесілген"; "round_avatars" = "Дөңгелектелген"; +"apply_style_for_this_device" = "Стильді тек осы девайс үшін қосу"; + "search_for_groups" = "Топтар іздеу"; "search_for_people" = "Кісілер іздеу"; "search_button" = "Іздеу"; @@ -391,6 +420,7 @@ "ui_settings_rating_hide" = "Жасыру"; "additional_links" = "Қосымша сілтемелер"; +"ad_poster" = "Жарнама постері"; "two_factor_authentication" = "Екі факторлы аутентификация"; "two_factor_authentication_disabled" = "Бұзылудан сенімді қорғаныс қызметін қамтамасыз етеді: парақшаға кіру үшін 2FA қосымшасында алынған кодты енгізу керек."; @@ -637,6 +667,14 @@ "banned_2" = "Мұның себебі қарапайым: $1. Өкінішке орай, осы жолы сізді мәңгілікке блоктауға мәжбүр болдық."; "banned_3" = "Егер сізді қателесіп блоктады деп ойласаңыз, қолдау қызметіне жаза аласыз немесе жүйеден шыға аласыз."; +/* Registration confirm */ + +"ec_header" = "Тіркеуді растау"; +"ec_title" = "Рахмет!"; +"ec_1" = "$1, тіркелуіңіз аяқталуға жақын. Бірнеше минуттан кейін электрондық поштаңызға растау сілтемесі бар хат келуі керек."; +"ec_2" = "Егер қандай да бір себептермен хат келмесе, спам қалтасын тексеріңіз. Хатты ол жерден таппасаңыз, оны қайта жіберуге болады."; +"ec_resend" = "Қайта жіберу"; + /* Discussions */ "discussions" = "Талқылаулар"; @@ -718,7 +756,7 @@ "invalid_telegram_name" = "Telegram парақшаның аты қате"; "invalid_telegram_name_comment" = "Сіз енгізген Telegram-дағы парақшаның аты дұрыс емес."; -"token_manipulation_error" = "Токенді өңдеу қатесі"; +"token_manipulation_error" = "Токенді өндеу қатесі"; "token_manipulation_error_comment" = "Токен жарамсыз немесе мерзімі өтіп кеткен"; "profile_changed" = "Парақша өзгерілді"; @@ -758,6 +796,26 @@ "about_openvk" = "OpenVK туралы"; +"about_this_instance" = "Инстанция туралы"; +"rules" = "Ережелер"; +"most_popular_groups" = "Ең танымал топтар"; +"on_this_instance_are" = "Осы инстанцияда:"; + +"about_users_one" = "1 қолданушы"; +"about_users_other" = "$1 қолданушы"; + +"about_online_users_one" = "1 желідегі пайдаланушы"; +"about_online_users_other" = "$1 желідегі пайдаланушы"; + +"about_active_users_one" = "1 белсенді пайдаланушы"; +"about_active_users_other" = "$1 белсенді пайдаланушы"; + +"about_groups_one" = "1 топ"; +"about_groups_other" = "$1 топ"; + +"about_wall_posts_one" = "1 жазба"; +"about_wall_posts_other" = "$1 жазба"; + /* Dialogs */ "ok" = "ОК"; From 51ace8d88832cc95e6c9aaf0dc4bc7cc827e1bdb Mon Sep 17 00:00:00 2001 From: Celestora Date: Sat, 5 Feb 2022 20:09:37 +0200 Subject: [PATCH 11/17] Enforce usage of non-empty, correct profile names. Resolves #456 --- Web/Models/Entities/User.php | 19 +++++++++++++++++++ .../Exceptions/InvalidUserNameException.php | 7 +++++++ Web/Presenters/UserPresenter.php | 10 ++++++++-- locales/en.strings | 2 ++ locales/ru.strings | 2 ++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Web/Models/Exceptions/InvalidUserNameException.php diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 84e48041..37fbe3bc 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -5,6 +5,7 @@ use openvk\Web\Util\DateTime; use openvk\Web\Models\RowModel; use openvk\Web\Models\Entities\{Photo, Message, Correspondence, Gift}; use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Gifts, Notifications}; +use openvk\Web\Models\Exceptions\InvalidUserNameException; use Nette\Database\Table\ActiveRow; use Chandler\Database\DatabaseConnection; use Chandler\Security\User as ChandlerUser; @@ -739,6 +740,24 @@ class User extends RowModel return true; } + function setFirst_Name(string $firstName): void + { + $firstName = mb_convert_case($firstName, MB_CASE_TITLE); + if(!preg_match('%^\p{Lu}\p{Mn}?(?:\p{L&}\p{Mn}?){1,16}$%u', $firstName)) + throw new InvalidUserNameException; + + $this->stateChanges("first_name", $firstName); + } + + function setLast_Name(string $lastName): void + { + $lastName = mb_convert_case($lastName, MB_CASE_TITLE); + if(!preg_match('%^\p{Lu}\p{Mn}?(\p{L&}\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) + throw new InvalidUserNameException; + + $this->stateChanges("last_name", $lastName); + } + function setNsfwTolerance(int $tolerance): void { $this->stateChanges("nsfw_tolerance", $tolerance); diff --git a/Web/Models/Exceptions/InvalidUserNameException.php b/Web/Models/Exceptions/InvalidUserNameException.php new file mode 100644 index 00000000..12a595a6 --- /dev/null +++ b/Web/Models/Exceptions/InvalidUserNameException.php @@ -0,0 +1,7 @@ +willExecuteWriteAction($_GET['act'] === "status"); if($_GET['act'] === "main" || $_GET['act'] == NULL) { - $user->setFirst_Name(empty($this->postParam("first_name")) ? $user->getFirstName() : $this->postParam("first_name")); - $user->setLast_Name(empty($this->postParam("last_name")) ? "" : $this->postParam("last_name")); + try { + $user->setFirst_Name(empty($this->postParam("first_name")) ? $user->getFirstName() : $this->postParam("first_name")); + $user->setLast_Name(empty($this->postParam("last_name")) ? "" : $this->postParam("last_name")); + } catch(InvalidUserNameException $ex) { + $this->flashFail("err", tr("error"), tr("invalid_real_name")); + } + $user->setPseudo(empty($this->postParam("pseudo")) ? NULL : $this->postParam("pseudo")); $user->setStatus(empty($this->postParam("status")) ? NULL : $this->postParam("status")); if (strtotime($this->postParam("birthday")) < time()) diff --git a/locales/en.strings b/locales/en.strings index 55b6ba28..9d0f7ef6 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -750,6 +750,8 @@ "invalid_email_address" = "Invalid Email address"; "invalid_email_address_comment" = "The Email you entered is not correct."; +"invalid_real_name" = "Please, enter your real name. It'll be easier for your friends to find you like this."; + "invalid_birth_date" = "Invalid date of birth"; "invalid_birth_date_comment" = "The date of birth you entered is not correct."; diff --git a/locales/ru.strings b/locales/ru.strings index 085d9fae..c20a5719 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -785,6 +785,8 @@ "invalid_email_address" = "Неверный Email адрес"; "invalid_email_address_comment" = "Email, который вы ввели, не является корректным."; +"invalid_real_name" = "Пожалуйста, используйте реальные имена. Так вашим тульпам будет легче найти вас."; + "invalid_telegram_name" = "Неверное имя Telegram аккаунта"; "invalid_telegram_name_comment" = "Вы ввели неверное имя аккаунта Telegram."; From 3582156946af2894b31ba5b490c5cf39bc4129b7 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 12:47:14 +0300 Subject: [PATCH 12/17] Global: Remove arg for n:ifcontent from the footer --- Web/Presenters/templates/@layout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 9d723096..e6697c9d 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -262,7 +262,7 @@ {_footer_privacy}

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

-

+

{php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]}

From e5afb0fc88ad20a229f24812f5e893906dceaab8 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 16:09:26 +0300 Subject: [PATCH 13/17] Users, Groups: Fix URL avatar output This commit fixes the avatar URL output for those who visit the website with a port (e.g. ovk.domain.tld:1337) --- Web/Models/Entities/Club.php | 12 +----------- Web/Models/Entities/User.php | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php index 2230b1a0..0c91b11e 100644 --- a/Web/Models/Entities/Club.php +++ b/Web/Models/Entities/Club.php @@ -40,7 +40,7 @@ class Club extends RowModel function getAvatarUrl(): string { - $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; + $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; $avPhoto = $this->getAvatarPhoto(); return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); @@ -64,16 +64,6 @@ class Club extends RowModel else return "/club" . $this->getId(); } - /* - function getAvatarUrl(): string - { - $avAlbum = (new Albums)->getUserAvatarAlbum($this); - $avCount = $avAlbum->getPhotosCount(); - $avPhotos = $avAlbum->getPhotos($avCount, 1); - $avPhoto = iterator_to_array($avPhotos)[0] ?? NULL; - - return is_null($avPhoto) ? "/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); - } */ function getName(): string { diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 37fbe3bc..36077375 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -104,7 +104,7 @@ class User extends RowModel function getAvatarUrl(): string { - $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; + $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; if($this->getRecord()->deleted) return "$serverUrl/assets/packages/static/openvk/img/camera_200.png"; From 170343e989d2dacee8ec997a9da4bd3fa42d59e6 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 16:44:49 +0300 Subject: [PATCH 14/17] Videos: Use an actual thumbnail for YT videos --- Web/Models/VideoDrivers/YouTubeVideoDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/VideoDrivers/YouTubeVideoDriver.php b/Web/Models/VideoDrivers/YouTubeVideoDriver.php index 1c5b3160..f517d7fd 100644 --- a/Web/Models/VideoDrivers/YouTubeVideoDriver.php +++ b/Web/Models/VideoDrivers/YouTubeVideoDriver.php @@ -5,7 +5,7 @@ final class YouTubeVideoDriver extends VideoDriver { function getThumbnailURL(): string { - return "https://img.youtube.com/vi/$this->id/mq3.jpg"; + return "https://img.youtube.com/vi/$this->id/mqdefault.jpg"; } function getURL(): string From b5524b6b7b586e6f94308c050b80059eb9099b44 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 14:06:47 +0200 Subject: [PATCH 15/17] Users: Fix page with list of user's groups --- Web/Presenters/templates/@listView.xml | 4 +-- Web/Presenters/templates/User/Groups.xml | 31 ++++-------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index e6bfaa8a..e6d02350 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -27,8 +27,8 @@ - {ifset infotable} - {include infotable, x => $dat} + {ifset infoTable} + {include infoTable, x => $dat} {else} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 3a92bed8..f1926d1e 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -32,7 +32,7 @@ {/block} {block size} -
+
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {tr("groups_list", $thisUser->getClubCount())} @@ -51,6 +51,8 @@ Фотография группы {/block} +{block name}{/block} + {block infoTable} @@ -73,11 +75,11 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} {if $x->canBeModifiedBy($thisUser ?? NULL)} - + {_check_community} {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + {if $clubPinned} {_remove_from_left_menu} {else} @@ -116,26 +118,3 @@ {/if} {/block} - -{block bottom} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
-
-

{_open_new_group}

- {_open_group_desc} - - - -
-
-

{_search_group}

- {_search_group_desc} -
- - - - -
-
- {/if} -{/block} \ No newline at end of file From 9425180a6f62ce708d72ea89af4cc462bab02844 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 14:31:02 +0200 Subject: [PATCH 16/17] Global: Add ability to configure display of commit hash --- bootstrap.php | 2 +- openvk-example.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 70b52244..b2bcbec9 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -227,7 +227,7 @@ return (function() { if(empty($_SERVER["REQUEST_SCHEME"])) $_SERVER["REQUEST_SCHEME"] = empty($_SERVER["HTTPS"]) ? "HTTP" : "HTTPS"; - $showCommitHash = true; # plz remove when release + $showCommitHash = OPENVK_ROOT_CONF["openvk"]["preferences"]["bellsAndWhistles"]["showCommitHash"] ?? true; if(is_dir($gitDir = OPENVK_ROOT . "/.git") && $showCommitHash) $ver = trim(`git --git-dir="$gitDir" log --pretty="%h" -n1 HEAD` ?? "Unknown version") . "-nightly"; else diff --git a/openvk-example.yml b/openvk-example.yml index df9c55ef..a3b98d0c 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -59,6 +59,7 @@ openvk: bellsAndWhistles: fartscroll: false testLabel: false + showCommitHash: true defaultMobileTheme: "" telemetry: From a77aafbcbafe6ce95c7d27340f9ce692019ce288 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 15:08:38 +0200 Subject: [PATCH 17/17] Revert "Global: Add ability to configure display of commit hash" I did something strange --- bootstrap.php | 2 +- openvk-example.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index b2bcbec9..70b52244 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -227,7 +227,7 @@ return (function() { if(empty($_SERVER["REQUEST_SCHEME"])) $_SERVER["REQUEST_SCHEME"] = empty($_SERVER["HTTPS"]) ? "HTTP" : "HTTPS"; - $showCommitHash = OPENVK_ROOT_CONF["openvk"]["preferences"]["bellsAndWhistles"]["showCommitHash"] ?? true; + $showCommitHash = true; # plz remove when release if(is_dir($gitDir = OPENVK_ROOT . "/.git") && $showCommitHash) $ver = trim(`git --git-dir="$gitDir" log --pretty="%h" -n1 HEAD` ?? "Unknown version") . "-nightly"; else diff --git a/openvk-example.yml b/openvk-example.yml index a3b98d0c..df9c55ef 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -59,7 +59,6 @@ openvk: bellsAndWhistles: fartscroll: false testLabel: false - showCommitHash: true defaultMobileTheme: "" telemetry: