# HG changeset patch # User bsw/jbe # Date 1531656449 -7200 # Node ID 32cc544d5a5b8604f3ed1dd9444b0e8d038bc2ef # Parent 7ea154c9238a119216519b1ccf1b3233ebf43769 Cumulative patch for upcoming frontend version 4 diff -r 7ea154c9238a -r 32cc544d5a5b LICENSE --- a/LICENSE Thu Jun 23 03:30:57 2016 +0200 +++ b/LICENSE Sun Jul 15 14:07:29 2018 +0200 @@ -23,14 +23,14 @@ 3rd party license information: ------------------------------------------------------------------------------ +============================================================================= Some of the icons used in LiquidFeedback (except national flags) are from Silk icon set 1.3 by Mark James. [ http://www.famfamfam.com/lab/icons/silk/ ] His work is licensed under a Creative Commons Attribution 2.5 License. [ http://creativecommons.org/licenses/by/2.5/ ] ------------------------------------------------------------------------------ +============================================================================= The emoticons are taken from the following web pages: @@ -44,7 +44,7 @@ unless such conditions are required by law." The orange and red smiley are modified versions of Face-sad. ------------------------------------------------------------------------------ +============================================================================= The "jquery" library is licensed as follows: @@ -86,7 +86,7 @@ own licenses; we recommend you read them, as their terms may differ from the terms above. ------------------------------------------------------------------------------ +============================================================================= "LESS - Leaner CSS" is licensed as follows: @@ -269,7 +269,7 @@ END OF TERMS AND CONDITIONS ------------------------------------------------------------------------------ +============================================================================= The collection of LDAP error codes (mldap_errorcodes[]) has been derived from the file ldap.h that is part of OpenLDAP Software. OpenLDAP's license @@ -348,5 +348,296 @@ End of OpenLDAP's license information +============================================================================= + +"wysihtml" is licensed as follows: + +The MIT License (MIT) + +Copyright (C) 2012-2016 XING AG, Voog and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +============================================================================= + +The Roboto font family is licensed as follows: + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +============================================================================= + +The "mdl" library is licensed as follows: + + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2015 Google Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + All code in any directories or sub-directories that end with *.html or + *.css is licensed under the Creative Commons Attribution International + 4.0 License, which full text can be found here: + https://creativecommons.org/licenses/by/4.0/legalcode. + + As an exception to this license, all html or css that is generated by + the software at the direction of the user is copyright the user. The + user has full ownership and control over such content, including + whether and how they wish to license it. + +============================================================================= END OF LICENSE FILE diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_filter/20_session.lua --- a/app/main/_filter/20_session.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_filter/20_session.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,4 +1,4 @@ -local cookie = request.get_cookie{ name = "liquid_feedback_session" } +local cookie = request.get_cookie{ name = config.cookie_name or "liquid_feedback_session" } if cookie then app.session = Session:by_ident(cookie) @@ -6,12 +6,12 @@ if not app.session then app.session = Session:new() request.set_cookie{ - name = "liquid_feedback_session", + name = config.cookie_name or "liquid_feedback_session", value = app.session.ident } end -request.set_csrf_secret(app.session.additional_secret) +request.set_csrf_secret(app.session:additional_secret_for("csrf")) locale.set{ lang = app.session.lang or config.default_lang or "en" } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_filter/21_auth.lua --- a/app/main/_filter/21_auth.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_filter/21_auth.lua Sun Jul 15 14:07:29 2018 +0200 @@ -2,26 +2,59 @@ local view = request.get_view() local action = request.get_action() -local auth_needed = not ( - module == 'index' - and ( -view == "login" - or action == "login" - or view == "register" - or action == "register" - or action == "cancel_register" - or view == "about" - or view == "reset_password" - or action == "reset_password" - or view == "send_login" - or action == "send_login" - or view == "confirm_notify_email" - or action == "confirm_notify_email" - or view == "menu" - or action == "set_lang" - or view == "404" - ) -) +local auth_needed = true + +if module == 'index' and ( + view == 'index' + or view == "login" + or action == "login" + or view == "register" + or action == "register" + or action == "cancel_register" + or view == "about" + or view == "reset_password" + or action == "reset_password" + or view == "send_login" + or action == "send_login" + or view == "confirm_notify_email" + or action == "confirm_notify_email" + or view == "menu" + or action == "set_lang" + or view == "403" + or view == "404" + or view == "405" +) then + auth_needed = false +end + +if module == "registration" then + auth_needed = false +end + +if module == "style" then + auth_needed = false +end + +if module == "help" then + auth_needed = false +end + +if module == "oauth2" and ( + view == "validate" + or view == "token" + or view == "session" + or view == "register" +) then + auth_needed = false +end + +if module == "oauth2_client" then + auth_needed = false +end + +if module == "api" then + auth_needed = false +end if app.session:has_access("anonymous") then @@ -41,6 +74,7 @@ or module == "index" and view == "search" or module == "index" and view == "usage_terms" or module == "help" and view == "introduction" + or module == "style" then auth_needed = false end @@ -94,11 +128,21 @@ if auth_needed and app.session.member == nil then trace.debug("Not authenticated yet.") + local params = json.object() + for key, val in pairs(request.get_param_strings()) do + if type(val) == "string" then + params[key] = val + else + -- shouldn't happen + error("array type params not implemented") + end + end request.redirect{ module = 'index', view = 'login', params = { redirect_module = module, redirect_view = view, - redirect_id = param.get_id() + redirect_id = param.get_id(), + redirect_params = params } } elseif auth_needed and app.session.member.locked then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_filter_view/30_navigation.lua --- a/app/main/_filter_view/30_navigation.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_filter_view/30_navigation.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,78 +1,118 @@ -slot.select ( 'instance_name', function () - slot.put(" @ ") - slot.put ( encode.html ( config.instance_name ) ) -end) - - -slot.select ( 'navigation_right', function () +execute.inner() - if app.session:has_access ("anonymous") and not (app.session.needs_delegation_check) then - - ui.form { - attr = { class = "inline search" }, - method = "get", - module = "index", view = "search", - content = function () - - ui.field.text { - attr = { placeholder = _"search" }, - name = "q" - } - - end - } - - ui.link { - attr = { class = "searchLink" }, - module = "index", view = "search", content = function () - ui.image { static = "icons/16/magnifier.png" } - end - } - +local for_meta_navigation = false +if config.meta_navigation_items_func and config.meta_navigation_html_func then + for_meta_navigation = + request.get_module() == "index" and ( + request.get_view() == "login" + or request.get_view() == "register" + or request.get_view() == "reset_password" + or request.get_view() == "send_login" + ) + or (request.get_module() == "registration") + or (request.get_module() == "member" and request.get_view() == "show" and param.get_id() == app.session.member_id) + or (request.get_module() == "member" and request.get_view() == "history" and param.get_id() == app.session.member_id) + or (request.get_module() == "member" and ( + string.match(request.get_view(), "^settings") + or string.match(request.get_view(), "^edit") + )) + local items = config.meta_navigation_items_func(app.session.member, for_meta_navigation and "login" or "LiquidFeedback") + local meta_navigation = config.meta_navigation_html_func(items) + slot.put_into("meta_navigation", meta_navigation) + local meta_navigation_style = config.meta_navigation_style_func(items) + slot.put_into("meta_navigation_style", meta_navigation_style) + if config.meta_navigation_extra_style_func then + local meta_navigation_extra_style = config.meta_navigation_extra_style_func(items) + slot.put_into("meta_navigation_style", meta_navigation_extra_style) end - - if app.session.member == nil then - - slot.put ( " " ) - - ui.link { - text = _"Login", - module = 'index', - view = 'login', - params = { - redirect_module = request.get_module(), - redirect_view = request.get_view(), - redirect_id = param.get_id() - } - } - - slot.put ( " " ) - end - - if app.session.member == nil and not config.registration_disabled then - - ui.link { - text = _"Registration", - module = 'index', - view = 'register' - } + local meta_navigation_script = config.meta_navigation_script_func(items) + slot.put_into("script", meta_navigation_script) +end + +if not config.meta_navigation_items_func or not config.meta_navigation_html_func then + slot.select ( 'header_bar', function () + ui.tag{ tag = "header", attr = { class = "mdl-layout__header mdl-layout__header--seamed" }, content = function() + ui.container{ attr = { class = "mdl-layout__header-row" }, content = function() + ui.link{ module = "index", view = "index", attr = { class = "mdl-layout-title" }, content = "LiquidFeedback" } + ui.tag{ attr = { class = "mdl-layout-spacer" }, content = "" } - end - - - if app.session.member then - - slot.put ( " " ) - - ui.tag { attr = { id = "member_menu" }, content = function() - util.micro_avatar(app.session.member) + if app.session:has_access ("anonymous") then + ui.form { attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--expandable mdl-textfield--floating-label mdl-textfield--align-right" }, method = "get", module = "index", view = "search", content = function () + ui.tag{ tag = "label", attr = { class = "mdl-button mdl-js-button mdl-button--icon", ["for"] = "fixed-header-drawer-exp" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "search" } + end } + ui.container{ attr = { class = "mdl-textfield__expandable-holder" }, content = function() + ui.tag{ tag = "input", attr = { class = "mdl-textfield__input", type = "text", name = "q", id = "fixed-header-drawer-exp" }, content = "" } + end } + end } + end + + if app.session.member == nil and not ( + request.get_module() == "index" and (request.get_view() == "login" or request.get_view() == "reset_password" or request.get_view() == "send_login") + ) and not config.meta_navigation_html_func then + local redirect_params = json.object() + for key, val in pairs(request.get_param_strings()) do + if type(val) == "string" then + redirect_params[key] = val + else + -- shouldn't happen + error("array type params not implemented") + end + end + ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function() + local link = { + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "exit_to_app" } + slot.put(" ") + ui.tag{ attr = { class = "mdl-layout--large-screen-only" }, content = function() + ui.tag{ content = _"Login" } + end } + end, + text = _"Login", + attr = { class = "mdl-navigation__link" } + } + if config.login and config.login.method == "oauth2" then + link.module = "oauth2_client" + link.view = "redirect" + link.params = { provider = config.login.provider } + else + link.module = 'index' + link.view = 'login' + link.params = { + redirect_module = request.get_module(), + redirect_view = request.get_view(), + redirect_id = param.get_id(), + redirect_params = redirect_params + } + end + ui.link(link) + end } + end + + if app.session.member and not ( + config.meta_navigation_items_func and config.meta_navigation_html_func + ) then + ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function() + ui.tag{ tag = "span", module = "member", view = "show", id = app.session.member.id, attr = { id = "lf-member-menu", class = "mdl-navigation__link" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "person" } + ui.tag{ attr = { class = "mdl-layout--large-screen-only" }, content = function() + ui.tag{ content = app.session.member.name } + end } + end } + + ui.tag { tag = "ul", attr = { class = "mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect", ["for"] = "lf-member-menu" }, content = function() + execute.view{ module = "member", view = "_menu", params = { item_class = "mdl-menu__item", link_class = "mdl-menu__link" } } + end } + end } + + end -- if app.session.member + end } end } - - end -- if app.session.member - -end) + end) +end -- show notifications about things the user should take care of +--[[ if app.session.member then execute.view{ module = "index", view = "_sidebar_notifications", params = { @@ -80,34 +120,48 @@ } } end +--]] slot.select ("footer", function () + ui.tag{ tag = "li", content = function() + ui.link{ content = _"Quick guide", module = "help", view = "introduction" } + end } if app.session.member_id and app.session.member.admin then - ui.link { - text = _"System settings", - module = 'admin', - view = 'index' - } - slot.put(" · ") + ui.tag{ tag = "li", content = function() + if config.admin_link then + ui.link(config.admin_link) + else + ui.link{ content = _"System settings", module = "admin", view = "index" } + end + end } end - ui.link{ - text = _"About site", - module = 'index', - view = 'about' - } - if config.use_terms then - slot.put(" · ") + ui.tag{ tag = "li", content = function() ui.link{ - text = _"Use terms", + text = _"About site", module = 'index', - view = 'usage_terms' + view = 'about' } + end } + if not config.extra_footer_func then + if config.use_terms and app.session.member then + ui.tag{ tag = "li", content = function() + ui.link{ + text = _"Use terms", + module = 'index', + view = 'usage_terms' + } + end } + end end - slot.put(" · ") - ui.link{ - text = _"LiquidFeedback", - external = "http://www.liquidfeedback.org/" - } + if config.extra_footer_func then + config.extra_footer_func() + end + ui.tag{ tag = "li", content = function() + ui.link{ + text = _"LiquidFeedback", + external = "http://www.liquidfeedback.org/" + } + end } end) if not config.enable_debug_trace then @@ -117,4 +171,19 @@ end -execute.inner() + +if app.current_initiative then + app.current_issue = app.current_initiative.issue +end + +if app.current_issue then + app.current_area = app.current_issue.area +end + +if app.current_area then + app.current_unit = app.current_area.unit +end + +if not for_meta_navigation then + execute.view{ module = "index", view = "_drawer" } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_filter_view/34_stylesheet.lua --- a/app/main/_filter_view/34_stylesheet.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_filter_view/34_stylesheet.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,16 +1,3 @@ -local value -if app.session.member then - local setting_key = "liquidfeedback_frontend_stylesheet_url" - local setting = Setting:by_pk(app.session.member.id, setting_key) - value = setting and setting.value -end - -if value then - slot.put_into("stylesheet_url", value) -else - slot.put_into("stylesheet_url", request.get_relative_baseurl() .. "static/lf3.css") -end - execute.inner() if config.footer_html then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_layout/default.html --- a/app/main/_layout/default.html Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_layout/default.html Sun Jul 15 14:07:29 2018 +0200 @@ -1,276 +1,759 @@ - - - - - <!-- WEBMCP SLOTNODIV html_title --> - - - - - - - - - - - - - -
-
-
- - - -
- - - - -
-
- -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - - - - - - -
-
-
-
-
- -
-
- -
- -
- -
- - -
-
-
-
-
- -
-
- -
- - -
- - - - - - - - + + + + + + <!-- WEBMCP SLOTNODIV html_title --> + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ + + + + +
+
+
+
+
+
+
+
+
    + +
+
+
+

+
+ + +
+
+
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_layout/system_error.html --- a/app/main/_layout/system_error.html Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_layout/system_error.html Sun Jul 15 14:07:29 2018 +0200 @@ -3,19 +3,10 @@ <!-- WEBMCP SLOTNODIV html_title --> - - - - - - - - - - +
diff -r 7ea154c9238a -r 32cc544d5a5b app/main/_prefork/10_init.lua --- a/app/main/_prefork/10_init.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/_prefork/10_init.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,4 +1,4 @@ -config.app_version = "3.2.1" +config.app_version = "4.0.0-pre" -- TODO abstraction -- get record by id @@ -64,6 +64,61 @@ config.ldap = {} end +if config.oauth2 then + local scopes = { + { scope = "authentication", name = { de = "Identität feststellen (nur Screen-Name)", en = "Determine identity (screen name only)" } }, + { scope = "identification", name = { de = "Identität feststellen", en = "Determine identity" } }, + { scope = "notify_email", name = { de = "E-Mail-Adresse für Benachrichtigungen verwenden", en = "Use email address for notifications" } }, + { scope = "read_contents", name = { de = "Inhalte lesen", en = "Read content" } }, + { scope = "read_authors", name = { de = "Autorennamen lesen", en = "Read author names" } }, + { scope = "read_ratings", name = { de = "Bewertungen lesen", en = "Read ratings" } }, + { scope = "read_identities", name = { de = "Identitäten lesen", en = "Read identities" } }, + { scope = "read_profiles", name = { de = "Profile lesen", en = "Read profiles" } }, + { scope = "post", name = { de = "Neue Inhalte veröffentlichen", en = "Post new content" } }, + { scope = "rate", name = { de = "Bewertungen vornehmen", en = "Do ratings" } }, + { scope = "vote", name = { de = "Abstimmen", en = "Vote" } }, + { scope = "delegate", name = { de = "Delegieren", en = "Delegate" } }, + { scope = "profile", name = { de = "Eigenes Profil lesen", en = "Read your profile" } }, + { scope = "settings", name = { de = "Einstellungen einsehen", en = "Read your settings" } }, + { scope = "update_name", name = { de = "Screen-Namen ändern", en = "Update screen name" } }, + { scope = "update_notify_email", name = { de = "E-Mail-Adresse für Benachrichtigungen ändern", en = "Update notify email address" } }, + { scope = "update_profile", name = { de = "Profil bearbeiten", en = "Update your profile" } }, + { scope = "update_settings", name = { de = "Benutzereinstellungen ändern", en = "Update your settings" } } + } + local s = config.oauth2.available_scopes or {} + for i, scope in ipairs(scopes) do + s[#s+1] = scope + end + config.oauth2.available_scopes = s + if not config.oauth2.endpoint_magic then + config.oauth2.endpoint_magic = "liquidfeedback_client/redirection_endpoint" + end + if not config.oauth2.manifest_magic then + config.oauth2.manifest_magic = "liquidfeedback_client/manifest" + end + if not config.oauth2.host_func then + config.oauth2.host_func = function(domain) return extos.pfilter(nil, "host", "-t", "TXT", domain) end + end + if not config.oauth2.authorization_code_lifetime then + config.oauth2.authorization_code_lifetime = 5 * 60 + end + if not config.oauth2.refresh_token_lifetime then + config.oauth2.refresh_token_lifetime = 60 * 60 * 24 * 30 * 3 + end + if not config.oauth2.refresh_pause then + config.oauth2.refresh_pause = 60 + end + if not config.oauth2.refresh_grace_period then + config.oauth2.refresh_grace_period = 60 + end + if not config.oauth2.access_token_lifetime then + config.oauth2.access_token_lifetime = 60 * 60 + end + if not config.oauth2.dynamic_registration_lifetime then + config.oauth2.dynamic_registration_lifetime = 60 * 60 * 24 + end +end + if not config.database then config.database = { engine='postgresql', dbname='liquid_feedback' } end @@ -135,10 +190,22 @@ request.set_absolute_baseurl(config.absolute_base_url) +-- TODO remove style cache + listen(listen_options) listen{ { + proto = "main", + name = "process_event_stream", + handler = function(poll) + Event:process_stream(poll) + end + } +} + +listen{ + { proto = "interval", name = "send_pending_notifications", delay = 5, @@ -149,11 +216,6 @@ end end while true do - if not Event:send_next_notification() then - break - end - end - while true do if not InitiativeForNotification:notify_next_member() then break end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/_action/area_update.lua --- a/app/main/admin/_action/area_update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/_action/area_update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,6 +1,6 @@ local area = Area:by_id(param.get_id()) or Area:new() -param.update(area, "unit_id", "name", "description", "external_reference", "active") +param.update(area, "unit_id", "name", "description", "external_reference", "quorum_standard", "quorum_issues", "quorum_time", "quorum_exponent", "quorum_factor", "active") if #area.name < 1 then slot.select("error", function() diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/_action/member_update.lua --- a/app/main/admin/_action/member_update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/_action/member_update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -2,7 +2,21 @@ local member = Member:by_id(id) or Member:new() -param.update(member, "identification", "notify_email", "admin") +param.update(member, "identification", "admin") + +local notify_email = param.get("notify_email") +if notify_email == "" then + notify_email = nil +end + +member.notify_email = notify_email + +local notify_email_unconfirmed = param.get("notify_email_unconfirmed") +if notify_email_unconfirmed == "" then + notify_email_unconfirmed = nil +end + +member.notify_email_unconfirmed = notify_email_unconfirmed local locked = param.get("locked", atom.boolean) if locked ~= nil then @@ -40,10 +54,18 @@ local privilege = Privilege:new() privilege.member_id = member.id privilege.unit_id = config.single_unit_id + privilege.initiative_right = true privilege.voting_right = true privilege:save() end +if not id then + local profile = MemberProfile:new() + profile.member_id = member.id + profile.profile = json.object() + profile:save() +end + local units = Unit:new_selector() :add_field("privilege.member_id NOTNULL", "privilege_exists") :add_field("privilege.voting_right", "voting_right") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/_action/policy_update.lua --- a/app/main/admin/_action/policy_update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/_action/policy_update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -4,8 +4,8 @@ policy, "index", "name", "description", "active", "min_admission_time", "max_admission_time", "discussion_time", "verification_time", "voting_time", - "issue_quorum_num", "issue_quorum_den", - "initiative_quorum_num", "initiative_quorum_den", + "issue_quorum", "issue_quorum_num", "issue_quorum_den", + "initiative_quorum", "initiative_quorum_num", "initiative_quorum_den", "direct_majority_num", "direct_majority_den", "direct_majority_strict", "direct_majority_positive", "direct_majority_non_negative", "indirect_majority_num", "indirect_majority_den", "indirect_majority_strict", "indirect_majority_positive", "indirect_majority_non_negative", "no_reverse_beat_path", "no_multistage_majority", "polling" diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/_filter/90_admin.lua --- a/app/main/admin/_filter/90_admin.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/_filter/90_admin.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if not app.session.member.admin then - error('access denied') + return execute.view { module = "index", view = "403" } end if config.admin_logger then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/area_show.lua --- a/app/main/admin/area_show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/area_show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -63,6 +63,11 @@ connecting_records = area.allowed_policies or {}, foreign_reference = "id", } + ui.field.text{ label = _"Admission quorum standard", name = "quorum_standard", value = hint and 10 or nil } + ui.field.text{ label = _"Admission quorum issues", name = "quorum_issues", value = hint and 10 or nil } + ui.field.text{ label = _"Admission quorum time", name = "quorum_time", value = hint and "60 days" or nil } + ui.field.text{ label = _"Admission quorum exponent", name = "quorum_exponent", value = hint and 0.5 or nil } + ui.field.text{ label = _"Admission qourum factor", name = "quorum_factor", value = hint and 2 or nil } slot.put("

") ui.field.boolean{ label = _"Active?", name = "active", value = hint and true or nil } ui.submit{ text = _"update area" } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/invite_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/admin/invite_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,18 @@ +local members = Member:new_selector():exec() + +ui.list{ + records = members, + columns = { + { + name = "id", + }, + { + name = "invite_code", + }, + { + content = function(member) + ui.link{ content = _"Invite letter", module = "admin", view = "invite_pdf", id = member.id } + end + } + } +} diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/invite_pdf.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/admin/invite_pdf.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,25 @@ +local id = param.get_id() + +local member = Member:by_id(id) + + +local luatex = require("luatex") +luatex.temp_dir = WEBMCP_BASE_PATH .. "tmp" + +local tex = luatex.new_document() + +local template = config.invitation.template + +if type(template) == "function" then + template = template(member) +else + template = template:gsub("#{invite_code}", member.invite_code) + template = template:gsub("#{url}", request.get_absolute_baseurl()) +end + +tex(template) + +local pdf = tex:get_pdf() + +slot.set_layout(nil, "application/pdf") +slot.put_into("data", pdf) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/member_edit.lua --- a/app/main/admin/member_edit.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/member_edit.lua Sun Jul 15 14:07:29 2018 +0200 @@ -41,7 +41,8 @@ ui.sectionRow( function() ui.field.text{ label = _"Identification", name = "identification" } - ui.field.text{ label = _"Notification email", name = "notify_email" } + ui.field.text{ label = _"Notification email (confirmed)", name = "notify_email" } + ui.field.text{ label = _"Notification email (unconfirmed)", name = "notify_email_unconfirmed" } if member and member.activated then ui.field.text{ label = _"Screen name", name = "name" } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/policy_show.lua --- a/app/main/admin/policy_show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/policy_show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -38,9 +38,11 @@ ui.field.text{ label = _"Verification time", name = "verification_time", value = hint and "15 days" or nil } ui.field.text{ label = _"Voting time", name = "voting_time", value = hint and "15 days" or nil } - ui.field.text{ label = _"Issue quorum numerator", name = "issue_quorum_num", value = hint and "10" or nil } - ui.field.text{ label = _"Issue quorum denominator", name = "issue_quorum_den", value = hint and "100" or nil } + ui.field.text{ label = _"Issue quorum", name = "issue_quorum", value = hint and "1" or nil } + ui.field.text{ label = _"Issue quorum numerator", name = "issue_quorum_num", value = hint and "1" or nil } + ui.field.text{ label = _"Issue quorum denominator", name = "issue_quorum_den", value = hint and "10" or nil } + ui.field.text{ label = _"Initiative quorum absolute", name = "initiative_quorum", value = hint and "1" or nil } ui.field.text{ label = _"Initiative quorum numerator", name = "initiative_quorum_num", value = hint and "10" or nil } ui.field.text{ label = _"Initiative quorum denominator", name = "initiative_quorum_den", value = hint and "100" or nil } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/unit_edit.lua --- a/app/main/admin/unit_edit.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/admin/unit_edit.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,7 @@ local id = param.get_id() +local hint = not id + local unit = Unit:by_id(id) ui.titleAdmin(_"Organizational unit") @@ -40,7 +42,7 @@ ui.field.text{ label = _"Name", name = "name" } ui.field.text{ label = _"Description", name = "description", multiline = true } ui.field.text{ label = _"External reference", name = "external_reference" } - ui.field.boolean{ label = _"Active?", name = "active" } + ui.field.boolean{ label = _"Active?", name = "active", value = hint and true or nil } slot.put("
") ui.submit{ text = _"update unit" } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/verification.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/admin/verification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,134 @@ +local verification = Verification:by_id(param.get_id()) + +local data = {} + +for i, field in ipairs(config.verification.fields) do + table.insert(data, { + label = field.label, + value = verification.request_data[field.name] + }) +end + +table.insert(data, { + label = _"IP address", + value = verification.request_origin.ip +}) + +table.insert(data, { + label = _"Hostname", + value = verification.request_origin.hostname +}) + +if verification.verified then + table.insert(data, { + label = _"Requested at", + value = format.timestamp(verification.requested) + }) +end + +if verification.requesting_member_id then + table.insert(data, { + label = _"Requested by account", + value = verification.requesting_member_id + }) +end + +if verification.verified then + table.insert(data, { + label = _"Verified at", + value = format.timestamp(verification.verified) + }) +end + +if verification.denied then + table.insert(data, { + label = _"Denied at", + value = format.timestamp(verification.denied) + }) +end + +if verification.verifying_member_id then + table.insert(data, { + label = _"Verified by account", + value = verification.verifying_member_id + }) +end + +if verification.comment then + table.insert(data, { + label = _"Comment", + value = verification.comment + }) +end + +if verification.verified_member_id then + table.insert(data, { + label = _"Used by account", + value = verification.veried_member_id + }) +end + +ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + ui.list{ + attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" }, + records = data, + columns = { + { + label_attr = { class = "mdl-data-table__cell--non-numeric" }, + field_attr = { class = "mdl-data-table__cell--non-numeric" }, + label = _"Field", + content = function(record) + ui.tag{ content = record.label } + end + }, + { + label_attr = { class = "mdl-data-table__cell--non-numeric" }, + field_attr = { class = "mdl-data-table__cell--non-numeric" }, + label = _"Value", + content = function(record) + ui.tag{ content = record.value } + end + }, + } + } +end } + +if not verification.verification_data and not verification.denied then + ui.form{ + module = "admin", action = "verification_update", id = verification.id, + record = verification, + content = function() + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-verification_data", class = "mdl-textfield__input" }, + label = _"Verification data", + name = "verification_data" + } + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Verify account" + } + } + slot.put("   ") + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "deny", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--accent", + value = _"Deny request" + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + content = _"Cancel", + module = "admin", view = "verification_list" + } + end + } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/admin/verification_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/admin/verification_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,70 @@ +ui.heading{ level = 1, content = _"Verification requests" } + +if not config.verification or not config.verification.fields then + return +end + + +local columns = {} + +for i, field in ipairs(config.verification.fields) do + table.insert(columns, { + label_attr = { class = "mdl-data-table__cell--non-numeric" }, + field_attr = { class = "mdl-data-table__cell--non-numeric" }, + label = field.label, + content = function(record) + ui.tag{ content = record.request_data[field.name] } + end + }) +end + +table.insert(columns, { + label = _"verified", + name = "verified" +}) + +table.insert(columns, { + label = _"denied", + name = "denied" +}) + +table.insert(columns, { + content = function(record) + ui.link{ content = _"show", module = "admin", view = "verification", id = record.id } + end +}) + +local new_verifications = Verification:new_selector():add_where("verified ISNULL and denied ISNULL"):exec() +local verified_verifications = Verification:new_selector():add_where("verified NOTNULL"):exec() +local denied_verifications = Verification:new_selector():add_where("denied NOTNULL"):exec() + +ui.container{ attr = { class = "mdl-tabs mdl-js-tabs mdl-js-ripple-effect" }, content = function() + ui.container{ attr = { class = "mdl-tabs__tab-bar" }, content = function() + ui.link{ content = _"new requests", external = "#new_requests", attr = { class = "mdl-tabs__tab is-active" } } + ui.link{ content = _"verified", external = "#verified", attr = { class = "mdl-tabs__tab" } } + ui.link{ content = _"denied", external = "#denied", attr = { class = "mdl-tabs__tab" } } + end } + slot.put("
") + ui.container{ attr = { class = "mdl-tabs__panel is-active", id = "new_requests" }, content = function() + ui.list{ + records = new_verifications, + attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" }, + columns = columns + } + end } + ui.container{ attr = { class = "mdl-tabs__panel", id = "verified" }, content = function() + ui.list{ + records = verified_verifications, + attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" }, + columns = columns + } + end } + ui.container{ attr = { class = "mdl-tabs__panel", id = "denied" }, content = function() + ui.list{ + records = denied_verifications, + attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" }, + columns = columns + } + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/agent/_action/accept.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/agent/_action/accept.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,26 @@ +local controlled_id = param.get("controlled_id") + +local agent = Agent:by_pk(controlled_id, app.session.member_id) + +if not agent then + print("A") + return false +end + +if agent.accepted ~= nil then + print("B") + return false +end + +if param.get("rejected") then + print("C") + agent.accepted = false +elseif param.get("accepted") then + print("D") + agent.accepted = true +else + print("E") + return false +end +print("F") +agent:save() diff -r 7ea154c9238a -r 32cc544d5a5b app/main/agent/show.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/agent/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,100 @@ +local controlled_id = param.get("controlled_id") + + +ui.titleMember(_"Account access") + +ui.grid{ content = function() + + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Account access" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local agent = Agent:new_selector() + :add_where{ "controller_id = ?", app.session.member_id } + :add_where{ "controlled_id = ?", controlled_id } + :optional_object_mode() + :exec() + + if agent then + + if agent.accepted == nil then + ui.container{ content = _"You have been granted access privileges for the following account:" } + elseif agent.accepted == true then + ui.container{ content = _"You have accepted access privileges for the following account:" } + elseif agent.accepted == false then + ui.container{ content = _"You have rejected access privileges for the following account:" } + end + + slot.put("
") + ui.link{ + content = agent.controllee.display_name, + module = "member", view = "show", id = agent.controlled_id + } + slot.put("

") + + ui.form{ + attr = { class = "wide" }, + module = "agent", + action = "accept", + params = { controlled_id = controlled_id }, + routing = { + ok = { + mode = "redirect", + module = "agent", + view = "show", + params = { controlled_id = controlled_id }, + } + }, + content = function() + + if agent.accepted == nil then + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Accept access privilege", + name = "accepted" + }, + content = "" + } + slot.put("   ") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised", + value = _"Reject access privilege", + name = "rejected" + }, + content = "" + } + end + slot.put("   ") + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "index", view = "index", + content = _"Cancel" + } + end + } + + end + + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/_filter/30_auth.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/_filter/30_auth.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,48 @@ +local public_access_scopes = { + anonymous = "read_contents", + authors_pseudonymous = "read_contents read_authors", + all_pseudonymous = "read_contents read_authors read_ratings", + everything = "read_contents read_authors read_ratings read_identities read_profiles" +} + +local access_token, access_token_err = util.get_access_token() + +if access_token_err then + if access_token_err == "header_and_param" then + return util.api_error(400, "Unauthorized", "invalid_request", "Access token passed both via header and param") + end + return util.api_error(500, "Internal server error", "internal_error", "Internal server error") +end + +local scope + +if access_token then + local token = Token:by_token_type_and_token("access", access_token) + if token then + app.access_token = token + scope = token.scope + else + return util.api_error(401, "Unauthorized", "invalid_token", "The access token is invalid or expired") + end +end + +if not scope then + scope = public_access_scopes[config.public_access] +end + +if not scope then + return util.api_error(403, "Forbidden", "insufficient_scope", "Public access is not allowed at this instance.") +end + +app.scopes = {} + +for scope in string.gmatch(scope, "[^ ]+") do + local match = string.match(scope, "(.+)_detached") + app.scopes[match or scope] = true +end + +if not next(app.scopes) then + return util.api_error(403, "Forbidden", "insufficient_scope", "No valid scope found") +end + +execute.inner() diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/_issue.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/_issue.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,22 @@ +local issues = param.get("issues", "table") + + +local fields = { "id", "area_id", "policy_id", "admin_notice", "external_reference", "state", "phase_finished", "created", "accepted", "half_frozen", "fully_frozen", "closed", "cleaned", "min_admission_time", "max_admission_time", "discussion_time", "verification_time", "voting_time", "latest_snapshot_id", "admission_snapshot_id", "half_freeze_snapshot_id", "full_freeze_snapshot_id", "population", "voter_count", "status_quo_schulze_rank" } + +local r = json.array() + +for i, issue in ipairs(issues) do + local ir = json.object() + for j, field in ipairs(fields) do + local value = issue[field] + if value == nil then + value = json.null + else + value = tostring(value) + end + ir[field] = value + end + r[#r+1] = ir +end + +return r diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/_member.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/_member.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,45 @@ +local members = param.get("members", "table") + +local include_profile = param.get("include_profile", atom.boolean) + +if include_profile and not app.scopes.read_profiles then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope read_profiles required") +end + +local fields = {} + +if app.scopes.read_authors or app.scopes.read_identities then + fields = { "id", "created", "last_activity", "admin", "name", "location" } +end + +if app.scopes.read_identities then + fields[#fields+1] = "identification" +end + +local r = json.array() + +if app.scopes.read_identities then + + if include_profile then + members:load("profile") + end + + for i, member in ipairs(members) do + local m = json.object() + for j, field in ipairs(fields) do + local value = member[field] + if value == nil then + value = json.null + else + value = tostring(value) + end + m[field] = value + end + if include_profile then + m.profile = execute.chunk{ module = "api", chunk = "_profile", params = { profile = member.profile } } + end + r[#r+1] = m + end +end + +return r diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/_profile.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/_profile.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,22 @@ +local profile = param.get("profile", "table") + +local r = json.object() + +for i, field in ipairs(config.member_profile_fields) do + if profile.profile[field.id] then + r[field.id] = profile.profile[field.id] or json.null + end +end +--[[ +if profile.statement then + if request.get_param{ name = "statement_format" } == "html" then + r.statement = profile:get_content("html") + r.statement_format = "html" + else + r.statement = profile.statement + r.statement_format = profile.formatting_engine + end +end +--]] + +return r diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/_settings.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/_settings.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,11 @@ +local settings = param.get("settings", "table") + +local r = json.object() + +for i, field in ipairs(config.member_settings_fields) do + if settings.settings[field.id] ~= nil then + r[field.id] = settings.settings[field.id] + end +end + +return r diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/application.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/application.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,40 @@ +slot.set_layout(nil, "application/json") + +local r = json.array() + +local system_applications = SystemApplication:get_all() + +r[#r+1] = json.object{ + type = "system", + name = "LiquidFeedback", + base_url = request.get_absolute_baseurl(), + manifest_url = request.get_absolute_baseurl() .. "api/1/info", + cert_common_name = config.oauth2.cert_common_name +} + +for i, system_application in ipairs(system_applications) do + r[#r+1] = json.object{ + type = "system", + name = system_application.name, + base_url = system_application.base_url, + manifest_url = system_application.manifest_url, + cert_common_name = system_application.cert_common_name + } +end + +if app.access_token then + + local member_applications = MemberApplication:by_member_id_with_domain(app.access_token.member_id) + + for i, member_application in ipairs(member_applications) do + r[#r+1] = json.object{ + type = "dynamic", + name = "https://" .. member_application.domain .. "/", + base_url = "https://" .. member_application.domain .. "/", + manifest_url = "https://" .. member_application.domain .. "/" .. config.oauth2.manifest_magic + } + end + +end + +slot.put_into("data", json.export(json.object{ result = r })) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/event.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/event.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,132 @@ +slot.set_layout(nil, "application/json") + +local r = json.object{ + result = json.array{} +} + +local selector = Event:new_selector() + +local member_id = param.get("member_id", atom.integer) +local other_member_id = param.get("member_id", atom.integer) +local scope = param.get("scope") +local issue_id = param.get("issue_id", atom.integer) +local state = param.get("state") +local initiative_id = param.get("initiative_id", atom.integer) + +local include_members = param.get("include_members", atom.boolean) +local include_other_members = param.get("include_other_members", atom.boolean) +local include_profile = param.get("include_profile", atom.boolean) +local include_issues = param.get("include_issues", atom.boolean) +local include_initiatives = param.get("include_initiatives", atom.boolean) +local include_drafts = param.get("include_drafts", atom.boolean) +local include_suggestions = param.get("include_suggestions", atom.boolean) + +if member_id then + selector:add_where{ "member_id = ?", member_id } +end + +if other_member_id then + selector:add_where{ "other_member_id = ?", other_member_id } +end + +if scope then + selector:add_where{ "scope = ?", scope } +end + +if issue_id then + selector:add_where{ "issue_id = ?", issue_id } +end + +if scope then + selector:add_where{ "scope = ?", scope } +end + +if initiative_id then + selector:add_where{ "initiative_id = ?", initiative_id } +end + +selector:add_order_by("id DESC") + +local events = selector:exec() + +local member_ids = {} +local issue_ids = {} +local initiative_ids = {} +local draft_ids = {} +local suggestion_ids = {} + +for i, event in ipairs(events) do + local e = json.object() + e.id = event.id + e.occurrence = format.timestamp(event.occurrence) + e.event = event.event + e.member_id = event.member_id + e.other_member_id = event.other_member_id + e.scope = event.scope + e.issue_id = event.issue_id + e.state = event.state + e.initiative_id = event.initiative_id + e.draft_id = event.draft_id + e.suggestion_id = event.suggestion_id + e.value = event.value + if include_members and e.member_id then + member_ids[e.member_id] = true + end + if include_other_members and e.other_member_id then + member_ids[e.member_id] = true + end + if include_issues and e.issue_id then + issue_ids[e.issue_id] = true + end + if include_initiatives and e.initiative_id then + initiative_ids[e.initiative_id] = true + end + if include_drafts and e.draft_id then + draft_ids[e.draft_id] = true + end + if include_suggestions and e.suggestion_id then + suggestion_ids[e.suggestion_id] = true + end + r.result[#r.result+1] = e +end + +function util.keys_to_array(tbl) + local r = {} + for k, v in pairs(tbl) do + r[#r+1] = k + end + return r +end + +function util.array_to_json_object(tbl, key) + local r = json.object() + for i, v in ipairs(tbl) do + r[v[key]] = v + end + return r +end + +if next(member_ids) then + local members = Member:by_ids(util.keys_to_array(member_ids)) + r.members = util.array_to_json_object( + execute.chunk{ module = "api", chunk = "_member", params = { members = members, include_profile = include_profile } }, + "id" + ) + if r.members == false then + return + end +end + +if next(issue_ids) then + local issues = Issue:by_ids(util.keys_to_array(issue_ids)) + r.issues = util.array_to_json_object( + execute.chunk{ module = "api", chunk = "_issue", params = { issues = issues } }, + "id" + ) + if r.issues == false then + return + end +end + + +slot.put_into("data", json.export(r)) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/info.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/info.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,53 @@ +slot.set_layout(nil, "application/json") + +local scope_string + +local scopes_list = {} +for scope in pairs(app.scopes) do + scopes_list[#scopes_list+1] = scope +end +local scopes_string = table.concat(scopes_list, " ") + +local result = {} + +local r = json.object{ + service = "LiquidFeedback", + core_version = db:query("SELECT * from liquid_feedback_version;")[1].string, + api_version = config.app_version, + client_tls_dn = request.get_header("X-SSL-DN"), + scope = scopes_string +} + +if app.scopes.identification or app.scopes.authentication then + r.member_id = app.access_token.member_id + if app.access_token.member.role then + r.member_is_role = true + end + if app.access_token.session then + r.real_member_id = app.access_token.session.real_member_id + end + if param.get("include_member", atom.boolean) then + local member = app.access_token.member + result.member = json.object{ + id = member.id, + name = member.name + } + if app.access_token.session and app.access_token.session.real_member then + result.real_member = json.object{ + id = app.access_token.session.real_member.id, + name = app.access_token.session.real_member.name, + } + end + if app.scopes.identification then + result.member.identification = member.identification + if app.access_token.session and app.access_token.session.real_member then + result.real_member.identification = app.access_token.session.real_member.identification + end + end + end +end + +result.result = r + +slot.put_into("data", json.export(result)) +slot.put_into("data", "\n") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/instance.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/instance.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,33 @@ +local navigation + +if param.get("include_navigation") then + + local items = config.meta_navigation_items_func( + app.access_token and app.access_token.member or nil, + param.get("client_id"), + param.get("login_url") + ) + + navigation = json.array() + for i, item in ipairs(items) do + navigation[#navigation+1] = json.object{ + name = item.name, + description = item.description, + url = item.url, + active = item.active + } + end + +end + +local result = json.object{ + name = config.instance_name, + slogan = config.meta_navigation_slogan, + home_url = config.meta_navigation_home_url, + logo_url = config.meta_navigation_logo_url, + logo_alt_text = config.meta_navigation_logo_alt_text, + navigation = navigation +} + +slot.set_layout(nil, "application/json") +slot.put_into("data", json.export(json.object{ result = result })) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/member.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/member.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,20 @@ +slot.set_layout(nil, "application/json") + +local r = json.object{ + result = json.array() +} + +local selector = Member:new_selector() + :add_where("activated NOTNULL") + :add_order_by("id") + +if param.get("id") then + selector:add_where{ "id = ?", param.get("id") } +end + +local members = selector:exec() +local r.result = execute.chunk{ module = "api", chunk = "_member", params = { members = members } } + + +slot.put_into("data", json.export(r)) +slot.put_into("data", "\n") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/navigation.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/navigation.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,34 @@ +local access_token = param.get("access_token") +local client_id = param.get("client_id") +local login_url = param.get("login_url") +local format = param.get("format") + +if format ~= "html" and format ~= "raw_html" then + format = "json" +end + +local items = config.meta_navigation_items_func(app.access_token and app.access_token.member or nil, client_id, login_url) + +if format == "json" then + slot.set_layout(nil, "application/json") + local r = json.array() + for i, item in ipairs(items) do + r[#r+1] = json.object{ + name = item.name, + description = item.description, + url = item.url, + active = item.active + } + end + slot.put_into("data", json.export(json.object{ result = r })) +elseif format == "html" then + slot.set_layout(nil, "application/json") + local html = config.meta_navigation_style_func(items) .. config.meta_navigation_html_func(items) .. config.meta_navigation_script_func(items) + slot.put_into("data", json.export(json.object{ result = html })) +elseif format == "raw_html" then + slot.set_layout(nil, "text/html") + local html = config.meta_navigation_style_func(items) .. config.meta_navigation_html_func(items) .. config.meta_navigation_script_func(items) + slot.put_into("data", html) +end + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/notify_email.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/notify_email.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +slot.set_layout(nil, "application/json") + +local r = json.object{} + +if not app.scopes.notify_email then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope notify_email required") +end + +if app.access_token.member.notify_email ~= "" then + r.notify_email = app.access_token.member.notify_email +else + r.notify_email = json.null +end + +slot.put_into("data", json.export(json.object{ result = r })) +slot.put_into("data", "\n") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/profile.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/profile.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,53 @@ +slot.set_layout(nil, "application/json") + +local r = json.object{} + +if request.is_post() then + if not app.scopes.update_profile then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope update_profile required") + end + local profile = app.access_token.member.profile + local fields = json.import(param.get("update")) + if not fields then + return util.api_error(400, "Bad Request", "profile_data_expected", "JSON object with updated profile data expected") + end + for i, field in ipairs(config.member_profile_fields) do + if json.type(fields, field.id) ~= "nil" then + local value = fields[field.id] + if value ~= nil and (field.type == "string" or field.type == "text") and json.type(value) ~= "string" then + return util.api_error(400, "Bad Request", "string_expected", "JSON encoded string value expected") + end + profile.profile[field.id] = value + end + end + profile:save() + r.status = 'ok' + slot.put_into("data", json.export(r)) + slot.put_into("data", "\n") +else + local member_id = tonumber(param.get("member_id")) + local profile + if member_id then + if not app.scopes.read_profiles then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope profile required") + end + local member = Member:by_id(member_id) + if not member then + return util.api_error(400, "Bad Request", "member_not_found", "No member with requested member_id") + end + profile = member.profile + elseif app.access_token then + if not app.scopes.profile and not app.scopes.read_profiles then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope profile required") + end + profile = app.access_token.member.profile + else + return util.api_error(400, "Bad Request", "no_member_id", "No member_id requested") + end + if profile then + r = execute.chunk{ module = "api", chunk = "_profile", params = { profile = profile } } + end + slot.put_into("data", json.export(json.object{ result = r })) + slot.put_into("data", "\n") +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/profile_info.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/profile_info.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +slot.set_layout(nil, "application/json") + +local r = json.object() + +r.result = json.array() +for i, field in ipairs(config.member_profile_fields) do + table.insert(r.result, json.object{ + id = field.id, + name = field.name, + type = field.type + }) +end + +slot.put_into("data", json.export(r)) +slot.put_into("data", "\n") + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/settings.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/settings.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,50 @@ +slot.set_layout(nil, "application/json") + +if not app.access_token then + return util.api_error(400, "Forbidden", "insufficient_scope", "Scope 'settings' required") +end + +local r = json.object{} + +if request.is_post() then + if not app.scopes.update_settings then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope update_settings required") + end + local settings = app.access_token.member.settings + if not settings then + settings = MemberSettings:new() + settings.member_id = app.access_token.member_id + settings.settings = json.object() + end + local fields = json.import(param.get("update")) + if not fields then + return util.api_error(400, "Bad Request", "settings_data_expected", "JSON object with updated settings data expected") + end + for i, field in ipairs(config.member_settings_fields) do + if json.type(fields, field.id) ~= "nil" then + local value = fields[field.id] + if value ~= nil then + if (field.type == "string" or field.type == "text") and json.type(value) ~= "string" then + return util.api_error(400, "Bad Request", "string_expected", "JSON encoded string value expected") + end + if (field.type == "boolean") and json.type(value) ~= "boolean" then + return util.api_error(400, "Bad Request", "boolean_expected", "JSON encoded boolean value expected") + end + end + settings.settings[field.id] = value + end + end + settings:save() + r.status = 'ok' + slot.put_into("data", json.export(r)) + slot.put_into("data", "\n") +else + if not app.scopes.settings then + return util.api_error(403, "Forbidden", "insufficient_scope", "Scope 'settings' required") + end + local settings = app.access_token.member.settings or json.object() + r = execute.chunk{ module = "api", chunk = "_settings", params = { settings = settings } } + slot.put_into("data", json.export(json.object{ result = r })) + slot.put_into("data", "\n") +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/settings_info.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/settings_info.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +slot.set_layout(nil, "application/json") + +local r = json.object() + +r.result = json.array() +for i, field in ipairs(config.member_settings_fields) do + table.insert(r.result, json.object{ + id = field.id, + name = field.name, + type = field.type + }) +end + +slot.put_into("data", json.export(r)) +slot.put_into("data", "\n") + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/api/style.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/api/style.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,24 @@ +slot.set_layout(nil, "application/json") + + +local r = json.object{ + color = json.object() +} + +local style = execute.chunk{ module = "style", chunk = "_style", params = { style = config.style } } + +if style.color_md then + r.color.md = {} + for k, v in pairs(style.color_md) do + r.color.md[k] = v + end +end + +if style.color_rgb then + r.color.rgb = {} + for k, v in pairs(style.color_rgb) do + r.color.rgb[k] = v + end +end + +slot.put_into("data", json.export(json.object{ result = r })) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/area/_head.lua --- a/app/main/area/_head.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/area/_head.lua Sun Jul 15 14:07:29 2018 +0200 @@ -36,4 +36,4 @@ } end } -end ) \ No newline at end of file +end ) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/area/_sidebar_members.lua --- a/app/main/area/_sidebar_members.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/area/_sidebar_members.lua Sun Jul 15 14:07:29 2018 +0200 @@ -4,7 +4,6 @@ local area = param.get("area", "table") local members_selector = Member:new_selector() - :join("membership", nil, { "membership.member_id = member.id AND membership.area_id = ?", area.id }) :add_where("member.active") :limit(50) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/area/_sidebar_whatcanido.lua --- a/app/main/area/_sidebar_whatcanido.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/area/_sidebar_whatcanido.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,10 +1,9 @@ -local member = param.get ( "member", "table" ) or app.session.member - local area = param.get ( "area", "table" ) +area:load_delegation_info_once_for_member_id(app.session.member_id) local participating_trustee_id local participating_trustee_name -if member then +if app.session.member then if area.delegation_info.first_trustee_participation then participating_trustee_id = area.delegation_info.first_trustee_id participating_trustee_name = area.delegation_info.first_trustee_name @@ -14,232 +13,192 @@ end end -ui.sidebar ( "tab-whatcanido", function () +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" } + end } + ui.container{ attr = { class = "what-can-i-do-here" }, content = function() - ui.sidebarHeadWhatCanIDo() - - if member and not app.session.member:has_voting_right_for_unit_id(area.unit_id) then - ui.sidebarSection( _"You are not entitled to vote in this unit" ) - end - - if member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then + if app.session.member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then - if not app.session.member.disable_notifications then - - local ignored_area = IgnoredArea:by_pk(app.session.member_id, area.id) + if not app.session.member.disable_notifications then + + local ignored_area = IgnoredArea:by_pk(app.session.member_id, area.id) - if not ignored_area then - ui.sidebarSection ( function () - - ui.heading { - level = 3, - content = _"You are receiving updates by email for this subject area" - } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.link { - module = "area", action = "update_ignore", - params = { area_id = area.id }, - routing = { default = { - mode = "redirect", module = "area", view = "show", id = area.id - } }, - text = _"unsubscribe from update emails about this area" - } + if not ignored_area then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"You are receiving updates by email for this subject area" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.tag { content = function () + ui.link { + module = "area", action = "update_ignore", + params = { area_id = area.id }, + routing = { default = { + mode = "redirect", module = "index", view = "index", params = { unit = area.unit_id, area = area.id } + } }, + text = _"unsubscribe from update emails about this area" + } + end } end } end } end } - end ) - end + end + + if ignored_area then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to stay informed" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.tag { content = function () + ui.link { + module = "area", action = "update_ignore", + params = { area_id = area.id, delete = true }, + routing = { default = { + mode = "redirect", module = "index", view = "index", params = { unit = area.unit_id, area = area.id } + } }, + text = _"subscribe for update emails about this area" + } + end } + end } + end } + end } + end - if ignored_area then - ui.sidebarSection ( function () - - ui.heading { - level = 3, - content = _"I want to stay informed" - } + else + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to stay informed about this subject area" } ui.tag { tag = "ul", attr = { class = "ul" }, content = function () ui.tag { tag = "li", content = function () ui.tag { content = function () + ui.tag{ content = _"Edit your global " } ui.link { - module = "area", action = "update_ignore", - params = { area_id = area.id, delete = true }, - routing = { default = { - mode = "redirect", module = "area", view = "show", id = area.id - } }, - text = _"subscribe for update emails about this area" + module = "member", view = "settings_notification", + params = { return_to = "area", return_to_area_id = area.id }, + text = _"notification settings" } + ui.tag{ content = _" to receive updates by email" } end } end } end } - end ) - end - - else - ui.sidebarSection ( function () - - ui.heading { - level = 3, - content = _"I want to stay informed about this subject area" - } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.tag{ content = _"Edit your global " } - ui.link { - module = "member", view = "settings_notification", - params = { return_to = "area", return_to_area_id = area.id }, - text = _"notification settings" - } - ui.tag{ content = _" to receive updates by email" } - end } - end } - end } - end ) - end - - if area.delegation_info.own_participation then - ui.sidebarSection ( function () - ui.image{ attr = { class = "right" }, static = "icons/48/star.png" } - ui.heading { - level = 3, - content = _"You are subscribed for this subject area" - } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.link { - module = "membership", action = "update", - routing = { default = { - mode = "redirect", module = "area", view = "show", id = area.id - } }, - params = { area_id = area.id, delete = true }, - text = _"unsubscribe" - } - end } - end } end } - end ) - end - - if not area.delegation_info.own_participation then - ui.sidebarSection ( function () + end - ui.heading { - level = 3, - content = _"I want to participate in this subject area" - } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.link { - module = "membership", action = "update", - routing = { default = { - mode = "redirect", module = "area", view = "show", id = area.id - } }, - params = { area_id = area.id }, - text = _"subscribe" - } - end } + if app.session.member:has_voting_right_for_unit_id ( area.unit_id ) then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to vote" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"check the issues on the right, and click on 'Vote now' to vote on an issue which is in voting phase." } end } end } - end ) - end + end + + if app.session.member and not app.session.member:has_voting_right_for_unit_id(area.unit_id) then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = _"You are not entitled to vote in this unit" } + end - - - ui.sidebarSection ( function () - + if app.session.member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then + + if not config.disable_delegations then + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + if not area.delegation_info.first_trustee_id then + ui.tag{ content = _"I want to delegate this subject area" } + else + ui.container { attr = { class = "right" }, content = function() + local member = Member:by_id(area.delegation_info.first_trustee_id) + execute.view{ + module = "member_image", + view = "_show", + params = { + member = member, + image_type = "avatar", + show_dummy = true + } + } + end } + ui.tag{ content = _"You delegated this subject area" } + end - if not area.delegation_info.first_trustee_id then - ui.heading{ level = 3, content = _"I want to delegate this subject area" } - else - ui.container { attr = { class = "right" }, content = function() - local member = Member:by_id(area.delegation_info.first_trustee_id) - execute.view{ - module = "member_image", - view = "_show", - params = { - member = member, - image_type = "avatar", - show_dummy = true + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if area.delegation_info.own_delegation_scope == "unit" then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + unit_id = area.unit_id, + }, + content = _("change/revoke delegation of organizational unit") + } + end } + end + + if area.delegation_info.own_delegation_scope == nil then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = _"choose subject area delegatee" + } + end } + elseif area.delegation_info.own_delegation_scope == "area" then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = _"change/revoke area delegation" + } + end } + else + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = _"change/revoke delegation only for this subject area" + } + end } + end + end } + end } + end + + if app.session.member:has_initiative_right_for_unit_id ( area.unit_id ) then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ + content = _("I want to start a new initiative", { + area_name = area.name + } ) } - } - end } - ui.heading{ level = 3, content = _"You delegated this subject area" } - end - - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if area.delegation_info.own_delegation_scope == "unit" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - unit_id = area.unit_id, - }, - content = _("change/revoke delegation of organizational unit") - } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"Take a look through the existing issues. Maybe someone else started a debate on your topic (and you can join it) or the topic has been decided already in the past." } + ui.tag { tag = "li", content = function () + ui.tag { content = function () + ui.tag { content = _"If you cannot find any appropriate existing issue, " } + ui.link { + module = "initiative", view = "new", + params = { area_id = area.id }, + text = _"start an initiative in a new issue" + } + end } + end } + end } end } end - - if area.delegation_info.own_delegation_scope == nil then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - area_id = area.id - }, - content = _"choose subject area delegatee" - } - end } - elseif area.delegation_info.own_delegation_scope == "area" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - area_id = area.id - }, - content = _"change/revoke area delegation" - } - end } - else - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - area_id = area.id - }, - content = _"change/revoke delegation only for this subject area" - } - end } - end - end } - end ) - - - - - if app.session.member:has_voting_right_for_unit_id ( area.unit_id ) then - ui.sidebarSection ( function () - ui.heading { - level = 3, - content = _("I want to start a new initiative", { - area_name = area.name - } ) - } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = _"Take a look through the existing issues. Maybe someone else started a debate on your topic (and you can join it) or the topic has been decided already in the past." } - ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.tag { content = _"If you cannot find any appropriate existing issue, " } - ui.link { - module = "initiative", view = "new", - params = { area_id = area.id }, - text = _"start an initiative in a new issue" - } - end } + + end + else + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"You are not entitled to vote in this unit" } + ui.tag{ tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ module = "index", view = "login", content = _"Login" } end } end } - end ) + end } end - else - end + end } -end ) \ No newline at end of file +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/area/show.lua --- a/app/main/area/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/area/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -6,59 +6,68 @@ return end +app.current_area = area + + area:load_delegation_info_once_for_member_id(app.session.member_id) app.html_title.title = area.name app.html_title.subtitle = _("Area") -execute.view { - module = "area", view = "_head", params = { - area = area, member = app.session.member - } -} +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + ui.heading{ content = area.unit.name .. " / " .. area.name } -execute.view { - module = "area", view = "_sidebar_whatcanido", params = { - area = area - } -} + execute.view { + module = "area", view = "_head", params = { + area = area, member = app.session.member + } + } + + execute.view { + module = "area", view = "_sidebar_whatcanido", params = { + area = area + } + } -execute.view { - module = "area", view = "_sidebar_members", params = { - area = area - } -} + execute.view { + module = "area", view = "_sidebar_members", params = { + area = area + } + } -local function getOpenIssuesSelector() - return area:get_reference_selector("issues") - :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()") -end + local function getOpenIssuesSelector() + return area:get_reference_selector("issues") + :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()") + end -local admission_selector = getOpenIssuesSelector() - :add_where("issue.state = 'admission'"); + local admission_selector = getOpenIssuesSelector() + :add_where("issue.state = 'admission'"); -local discussion_selector = getOpenIssuesSelector() - :add_where("issue.state = 'discussion'"); + local discussion_selector = getOpenIssuesSelector() + :add_where("issue.state = 'discussion'"); -local verification_selector = getOpenIssuesSelector() - :add_where("issue.state = 'verification'"); + local verification_selector = getOpenIssuesSelector() + :add_where("issue.state = 'verification'"); -local voting_selector = getOpenIssuesSelector() - :add_where("issue.state = 'voting'"); + local voting_selector = getOpenIssuesSelector() + :add_where("issue.state = 'voting'"); -local closed_selector = area:get_reference_selector("issues") - :add_where("issue.closed NOTNULL") - :add_order_by("issue.closed DESC") + local closed_selector = area:get_reference_selector("issues") + :add_where("issue.closed NOTNULL") + :add_order_by("issue.closed DESC") -local members_selector = area:get_reference_selector("members"):add_where("member.active") -local delegations_selector = area:get_reference_selector("delegations") - :join("member", "truster", "truster.id = delegation.truster_id AND truster.active") - :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active") + local members_selector = area:get_reference_selector("members"):add_where("member.active") + local delegations_selector = area:get_reference_selector("delegations") + :join("member", "truster", "truster.id = delegation.truster_id AND truster.active") + :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active") -execute.view { - module = "issue", - view = "_list2", - params = { for_area = area } -} + execute.view { + module = "issue", + view = "_list", + params = { for_area = area } + } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/contact/list.lua --- a/app/main/contact/list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/contact/list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -5,97 +5,112 @@ ui.title(_"Contacts") +ui.grid{ content = function() + ui.cell_main{ content = function() -ui.paginate{ - selector = contacts_selector, - content = function() - local contacts = contacts_selector:exec() - if #contacts == 0 then - ui.field.text{ value = _"You didn't save any member as contact yet." } - else - ui.list{ - records = contacts, - columns = { - { - label = _"Name", - content = function(record) - ui.link{ - text = record.other_member.name, - module = "member", - view = "show", - id = record.other_member_id - } - end - }, - { - label = _"Published", - content = function(record) - ui.field.boolean{ value = record.public } - end - }, - { - content = function(record) - if record.public then - ui.link{ - attr = { class = "action" }, - text = _"Hide", - module = "contact", - action = "add_member", - id = record.other_member_id, - params = { public = false }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - else - ui.link{ - attr = { class = "action" }, - text = _"Publish", - module = "contact", - action = "add_member", - id = record.other_member_id, - params = { public = true }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end - end - }, - { - content = function(record) - ui.link{ - attr = { class = "action" }, - text = _"Remove", - module = "contact", - action = "remove_member", - id = record.other_member_id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Contacts" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + + ui.paginate{ + selector = contacts_selector, + content = function() + local contacts = contacts_selector:exec() + if #contacts == 0 then + ui.field.text{ value = _"You didn't save any member as contact yet." } + else + ui.list{ + attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" }, + records = contacts, + columns = { + { + label = _"Name", + content = function(record) + ui.link{ + text = record.other_member.name, + module = "member", + view = "show", + id = record.other_member_id + } + end + }, + { + label = _"Published", + content = function(record) + ui.field.boolean{ value = record.public } + end + }, + { + content = function(record) + if record.public then + ui.link{ + attr = { class = "action" }, + text = _"Hide", + module = "contact", + action = "add_member", + id = record.other_member_id, + params = { public = false }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + else + ui.link{ + attr = { class = "action" }, + text = _"Publish", + module = "contact", + action = "add_member", + id = record.other_member_id, + params = { public = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end + end + }, + { + content = function(record) + ui.link{ + attr = { class = "action" }, + text = _"Remove", + module = "contact", + action = "remove_member", + id = record.other_member_id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end + }, } } end - }, + end } - } - end - end -} + + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/delegation/_action/update.lua --- a/app/main/delegation/_action/update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/delegation/_action/update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,3 +1,7 @@ +if config.disable_delegations then + return +end + local truster_id = app.session.member.id local trustee_id = param.get("trustee_id", atom.integer) @@ -58,7 +62,7 @@ end if not app.session.member:has_voting_right_for_unit_id(check_unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end if not delegation then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/delegation/_info.lua --- a/app/main/delegation/_info.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/delegation/_info.lua Sun Jul 15 14:07:29 2018 +0200 @@ -174,7 +174,7 @@ if info.own_participation then if issue and issue.fully_frozen then ui.link{ - attr = { class = "right" }, + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, module = "vote", view = "list", params = { issue_id = issue.id }, @@ -184,8 +184,9 @@ } else if issue then - local text = _"you are interested" - ui.image { attr = { class = "star", title = text, alt = text }, static = "icons/48/eye.png" } + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "star" } + slot.put(" ") + ui.tag{ content = _"you are interested" } if not issue.closed and info.own_participation and info.weight and info.weight > 1 then ui.link { attr = { class = "right" }, content = "+" .. (info.weight - 1), @@ -198,11 +199,7 @@ local text = _"you are subscribed" ui.image { attr = { class = "icon24 star", title = text, alt = text }, static = "icons/48/star.png" } end - if not for_title then - slot.put("
") - else - slot.put(" ") - end + slot.put(" ") end end end @@ -260,3 +257,15 @@ end end +if issue and app.session.member and issue.fully_frozen and not issue.closed and not issue.member_info.direct_voted and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "vote", view = "list", params = { + issue_id = issue.id + }, + content = function () + ui.tag { content = _"vote now" } + end + } + else +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/delegation/show.lua --- a/app/main/delegation/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/delegation/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -113,283 +113,303 @@ ui.script{ static = "js/update_delegation_info.js" } -ui.section( function () - - ui.sectionHead( function () - ui.heading{ level = 1, content = head_text } - end ) - - ui.sectionRow( function () +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--8-col" }, content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = head_text } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + + ui.form{ + attr = { class = "wide section", id = "delegationForm" }, + module = "delegation", + action = "update", + params = { + unit_id = unit and unit.id or nil, + area_id = area and area.id or nil, + issue_id = issue and issue.id or nil, + initiative_id = initiative_id + }, + routing = { + default = { + mode = "redirect", + module = area and "area" or initiative and "initiative" or issue and "issue" or "unit", + view = "show", + id = area and area.id or initiative and initiative.id or issue and issue.id or unit.id, + } + }, + content = function() + local records + if issue then + local delegate_name = "" + local scope = _"no delegation set" + local area_delegation = Delegation:by_pk(app.session.member_id, nil, issue.area_id) + if area_delegation then + delegate_name = area_delegation.trustee and area_delegation.trustee.name or _"abandoned" + scope = _"area" + else + local unit_delegation = Delegation:by_pk(app.session.member_id, issue.area.unit_id) + if unit_delegation then + delegate_name = unit_delegation.trustee.name + scope = config.single_unit_id and _"global" or _"unit" + end + end + local text_apply + local text_abandon + if config.single_unit_id then + text_apply = _("Apply global or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) + text_abandon = _"Abandon unit and area delegations for this issue" + else + text_apply = _("Apply unit or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) + text_abandon = _"Abandon unit and area delegations for this issue" + end + + records = { + { id = -1, name = text_apply }, + { id = 0, name = text_abandon } + } + elseif area then + local delegate_name = "" + local scope = _"no delegation set" + local unit_delegation = Delegation:by_pk(app.session.member_id, area.unit_id) + if unit_delegation then + delegate_name = unit_delegation.trustee.name + scope = config.single_unit_id and _"global" or _"unit" + end + local text_apply + local text_abandon + if config.single_unit_id then + text_apply = _("Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) + text_abandon = _"Abandon global delegation for this area" + else + text_apply = _("Apply unit delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) + text_abandon = _"Abandon unit delegation for this area" + end + records = { + { + id = -1, + name = text_apply + }, + { + id = 0, + name = text_abandon + } + } + + else + records = { + { + id = -1, + name = _"No delegation" + } + } - ui.form{ - attr = { class = "wide section", id = "delegationForm" }, - module = "delegation", - action = "update", - params = { - unit_id = unit and unit.id or nil, - area_id = area and area.id or nil, - issue_id = issue and issue.id or nil, - initiative_id = initiative_id - }, - routing = { - default = { - mode = "redirect", - module = area and "area" or initiative and "initiative" or issue and "issue" or "unit", - view = "show", - id = area and area.id or initiative and initiative.id or issue and issue.id or unit.id, - } - }, - content = function() - local records - if issue then - local delegate_name = "" - local scope = _"no delegation set" - local area_delegation = Delegation:by_pk(app.session.member_id, nil, issue.area_id) - if area_delegation then - delegate_name = area_delegation.trustee and area_delegation.trustee.name or _"abandoned" - scope = _"area" - else - local unit_delegation = Delegation:by_pk(app.session.member_id, issue.area.unit_id) - if unit_delegation then - delegate_name = unit_delegation.trustee.name - scope = config.single_unit_id and _"global" or _"unit" + end + -- add current trustee + if current_trustee_id then + records[#records+1] = {id="_", name= "--- " .. _"Current delegatee" .. " ---"} + records[#records+1] = { id = current_trustee_id, name = current_trustee_name } + end + -- add initiative authors + if initiative then + records[#records+1] = {id="_", name= "--- " .. _"Initiators" .. " ---"} + for i,record in ipairs(initiative.initiators) do + records[#records+1] = record.member + end + end + -- add saved members + if #contact_members > 0 then + records[#records+1] = {id="_", name= "--- " .. _"Saved contacts" .. " ---"} + for i, record in ipairs(contact_members) do + records[#records+1] = record + end + end + + local disabled_records = {} + disabled_records["_"] = true + disabled_records[app.session.member_id] = true + + local value = current_trustee_id + if preview_trustee_id then + value = preview_trustee_id + end + if preview_trustee_id == nil and delegation and not delegation.trustee_id then + value = 0 + end + + ui.tag{ content = _"Choose your delegatee" } + + ui.field.select{ + attr = { onchange = "updateDelegationInfo();" }, + name = "trustee_id", + foreign_records = records, + foreign_id = "id", + foreign_name = "name", + disabled_records = disabled_records, + value = value + } + slot.put("
") + + ui.container{ content = _"You can choose only members which you have been saved as contact before." } + + ui.field.hidden{ name = "preview" } + + slot.put("
") + ui.tag { tag = "input", content = "", attr = { + type = "submit", + value = _"Save", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + } } + + slot.put("   ") + if initiative then + ui.link{ + module = "initiative", + view = "show", + id = initiative.id, + attr = { class = "mdl-button mdl-js-button mdl-button--underlined" }, + content = function() + slot.put(_"Cancel") + end, + } + elseif issue then + ui.link{ + module = "issue", + view = "show", + id = issue.id, + attr = { class = "mdl-button mdl-js-button mdl-button--underlined" }, + content = function() + slot.put(_"Cancel") + end, + } + elseif area then + ui.link{ + module = "index", + view = "index", + params = { unit = area.unit_id, area = area.id }, + attr = { class = "mdl-button mdl-js-button mdl-button--underlined" }, + content = function() + slot.put(_"Cancel") + end, + } + else + ui.link{ + module = "index", + view = "index", + attr = { class = "mdl-button mdl-js-button mdl-button--underlined" }, + content = function() + slot.put(_"Cancel") + end, + } + end + end - end - local text_apply - local text_abandon - if config.single_unit_id then - text_apply = _("Apply global or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) - text_abandon = _"Abandon unit and area delegations for this issue" - else - text_apply = _("Apply unit or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) - text_abandon = _"Abandon unit and area delegations for this issue" - end - - records = { - { id = -1, name = text_apply }, - { id = 0, name = text_abandon } - } - elseif area then - local delegate_name = "" - local scope = _"no delegation set" - local unit_delegation = Delegation:by_pk(app.session.member_id, area.unit_id) - if unit_delegation then - delegate_name = unit_delegation.trustee.name - scope = config.single_unit_id and _"global" or _"unit" - end - local text_apply - local text_abandon - if config.single_unit_id then - text_apply = _("Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) - text_abandon = _"Abandon global delegation for this area" - else - text_apply = _("Apply unit delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope }) - text_abandon = _"Abandon unit delegation for this area" - end - records = { - { - id = -1, - name = text_apply - }, - { - id = 0, - name = text_abandon - } - } - - else - records = { - { - id = -1, - name = _"No delegation" - } } - end - -- add current trustee - if current_trustee_id then - records[#records+1] = {id="_", name= "--- " .. _"Current delegatee" .. " ---"} - records[#records+1] = { id = current_trustee_id, name = current_trustee_name } - end - -- add initiative authors - if initiative then - records[#records+1] = {id="_", name= "--- " .. _"Initiators" .. " ---"} - for i,record in ipairs(initiative.initiators) do - records[#records+1] = record.member - end - end - -- add saved members - if #contact_members > 0 then - records[#records+1] = {id="_", name= "--- " .. _"Saved contacts" .. " ---"} - for i, record in ipairs(contact_members) do - records[#records+1] = record - end - end - - local disabled_records = {} - disabled_records["_"] = true - disabled_records[app.session.member_id] = true - - local value = current_trustee_id - if preview_trustee_id then - value = preview_trustee_id - end - if preview_trustee_id == nil and delegation and not delegation.trustee_id then - value = 0 - end + end } + end } + end } + -- ------------------------ - ui.heading{ level = 2, content = _"Choose your delegatee" } - - ui.field.select{ - attr = { onchange = "updateDelegationInfo();" }, - name = "trustee_id", - foreign_records = records, - foreign_id = "id", - foreign_name = "name", - disabled_records = disabled_records, - value = value - } - - ui.container{ content = _"You can choose only members which you have been saved as contact before." } + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col mdl-cell--4-col-desktop" }, content = function() + ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() - ui.field.hidden{ name = "preview" } - - slot.put("
") - ui.tag { tag = "input", content = "", attr = { - type = "submit", - value = _"Save", - class = "btn btn-default", - } } - - slot.put("


") - if initiative then - ui.link{ - module = "initiative", - view = "show", - id = initiative.id, - content = function() - slot.put(_"Cancel") - end, + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.container{ + attr = { class = "mdl-card__title-text" }, + content = _"Preview of delegation" } - elseif issue then - ui.link{ - module = "issue", - view = "show", - id = issue.id, - content = function() - slot.put(_"Cancel") - end, - } - elseif area then - ui.link{ - module = "area", - view = "show", - id = area.id, - content = function() - slot.put(_"Cancel") - end, - } - else - ui.link{ - module = "index", - view = "index", - content = function() - slot.put(_"Cancel") - end, - } - end + end } - end - } - -end ) end ) --- ------------------------ - -ui.sidebar( "tab-members", function () - -ui.sidebarHead( function () - ui.heading { level = 1, content = _"Preview of delegation" } -end ) + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + local preview_inherit = false + local tmp_preview_trustee_id = preview_trustee_id + if preview_trustee_id == -1 then + preview_inherit = true + tmp_preview_trustee_id = nil + end + local delegation_chain = Member:new_selector() + :add_field("delegation_chain.*") + :join({ "delegation_chain(?,?,?,?,?,?)", app.session.member.id, unit_id, area_id, issue_id, tmp_preview_trustee_id, preview_inherit }, "delegation_chain", "member.id = delegation_chain.member_id") + :add_order_by("index") + :exec() -local preview_inherit = false -local tmp_preview_trustee_id = preview_trustee_id -if preview_trustee_id == -1 then - preview_inherit = true - tmp_preview_trustee_id = nil -end -local delegation_chain = Member:new_selector() - :add_field("delegation_chain.*") - :join({ "delegation_chain(?,?,?,?,?,?)", app.session.member.id, unit_id, area_id, issue_id, tmp_preview_trustee_id, preview_inherit }, "delegation_chain", "member.id = delegation_chain.member_id") - :add_order_by("index") - :exec() + for i, record in ipairs(delegation_chain) do + local style + local overridden = (not issue or issue.state ~= 'voting') and record.overridden + ui.sidebarSection( function () + if record.scope_in then + if not overridden then + local text = _"delegated to" + ui.image{ + attr = { class = "delegation_arrow", alt = text, title = text }, + static = "delegation_arrow_24_vertical.png" + } + else + local text = _"delegated to" + ui.image{ + attr = { class = "delegation_arrow delegation_arrow_overridden", alt = text, title = text }, + static = "delegation_arrow_24_vertical.png" + } + end + ui.tag{ + attr = { class = "delegation_scope" .. (overridden and " delegation_scope_overridden" or "") }, + content = function() + if record.scope_in == "unit" then + slot.put(config.single_object_mode and _"Global delegation" or _"Unit delegation") + elseif record.scope_in == "area" then + slot.put(_"Area delegation") + elseif record.scope_in == "issue" then + slot.put(_"Issue delegation") + end + end + } + end + ui.container{ + attr = { class = overridden and "delegation_overridden" or "" }, + content = function() + execute.view{ + module = "member", + view = "_show_thumb", + params = { member = record } + } + end + } + if issue and issue.state ~= 'voting' and record.participation and not record.overridden then + ui.container{ + attr = { class = "delegation_participation" }, + content = function() + if i == #delegation_chain then + ui.tag{ content = _"This member is currently participating in this issue." } + else + ui.tag{ content = _"This member is participating, the remaining delegation chain is suspended during discussing." } + end + end + } + end + slot.put("
") + end ) + end -for i, record in ipairs(delegation_chain) do - local style - local overridden = (not issue or issue.state ~= 'voting') and record.overridden - ui.sidebarSection( function () - if record.scope_in then - if not overridden then - local text = _"delegated to" - ui.image{ - attr = { class = "delegation_arrow", alt = text, title = text }, - static = "delegation_arrow_24_vertical.png" - } - else - local text = _"delegated to" - ui.image{ - attr = { class = "delegation_arrow delegation_arrow_overridden", alt = text, title = text }, - static = "delegation_arrow_24_vertical.png" - } - end - ui.tag{ - attr = { class = "delegation_scope" .. (overridden and " delegation_scope_overridden" or "") }, - content = function() - if record.scope_in == "unit" then - slot.put(config.single_object_mode and _"Global delegation" or _"Unit delegation") - elseif record.scope_in == "area" then - slot.put(_"Area delegation") - elseif record.scope_in == "issue" then - slot.put(_"Issue delegation") + if preview_trustee_id == 0 or not preview_trustee_id == null and delegation and not delegation.trustee_id then + ui.image{ + static = "icons/16/table_go_crossed.png" + } + if issue_id then + slot.put(_"Delegation turned off for issue") + elseif area_id then + slot.put(_"Delegation turned off for area") end end - } - end - ui.container{ - attr = { class = overridden and "delegation_overridden" or "" }, - content = function() - execute.view{ - module = "member", - view = "_show_thumb", - params = { member = record } - } - end - } - if issue and issue.state ~= 'voting' and record.participation and not record.overridden then - ui.container{ - attr = { class = "delegation_participation" }, - content = function() - if i == #delegation_chain then - ui.tag{ content = _"This member is currently participating in this issue." } - else - ui.tag{ content = _"This member is participating, the remaining delegation chain is suspended during discussing." } - end - end - } - end - slot.put("
") - end ) -end - -if preview_trustee_id == 0 or not preview_trustee_id == null and delegation and not delegation.trustee_id then - ui.image{ - static = "icons/16/table_go_crossed.png" - } - if issue_id then - slot.put(_"Delegation turned off for issue") - elseif area_id then - slot.put(_"Delegation turned off for area") - end -end + + end } + + end } + + end } -end ) \ No newline at end of file +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/draft/_action/add.lua --- a/app/main/draft/_action/add.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/draft/_action/add.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,8 +1,31 @@ +local draft_text = param.get("content") + +if not draft_text then + return false +end + +local draft_text = util.wysihtml_preproc(draft_text) + +local valid_html, error_message = util.html_is_safe(draft_text) +if not valid_html then + slot.put_into("error", _("Draft contains invalid formatting or character sequence: #{error_message}", { error_message = error_message }) ) + return false +end + +if config.initiative_abstract then + local abstract = param.get("abstract") + if not abstract then + return false + end + abstract = encode.html(abstract) + draft_text = abstract .. "" .. draft_text +end + return Draft:update_content( app.session.member.id, param.get("initiative_id", atom.integer), param.get("formatting_engine"), - param.get("content"), + draft_text, nil, param.get("preview") or param.get("edit") ) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/draft/_show.lua --- a/app/main/draft/_show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/draft/_show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -10,7 +10,11 @@ content = draft.content } else - slot.put(draft:get_content("html")) + if draft.formatting_engine == "html" or not draft.formatting_engine then + slot.put(draft.content) + else + slot.put(draft:get_content("html")) + end end end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/draft/diff.lua --- a/app/main/draft/diff.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/draft/diff.lua Sun Jul 15 14:07:29 2018 +0200 @@ -33,41 +33,8 @@ end -execute.view{ module = "issue", view = "_sidebar_state", params = { - initiative = initiative -} } - -execute.view { - module = "issue", view = "_sidebar_issue", - params = { - issue = initiative.issue, - highlight_initiative_id = initiative.id - } -} - -execute.view { - module = "issue", view = "_sidebar_whatcanido", - params = { initiative = initiative } -} - -execute.view { - module = "issue", view = "_sidebar_members", params = { - issue = initiative.issue, initiative = initiative - } -} - - - -execute.view { - module = "issue", view = "_head", params = { - issue = initiative.issue - } -} - - - -local old_draft_content = string.gsub(string.gsub(old_draft.content, "\n", " ###ENTER###\n"), " ", "\n") -local new_draft_content = string.gsub(string.gsub(new_draft.content, "\n", " ###ENTER###\n"), " ", "\n") +local old_draft_content = string.gsub(string.gsub(util.html_to_text(old_draft.content), "\n", " ###ENTER###\n"), " ", "\n") +local new_draft_content = string.gsub(string.gsub(util.html_to_text(new_draft.content), "\n", " ###ENTER###\n"), " ", "\n") local key = multirand.string(24, "0123456789abcdefghijklmnopqrstuvwxyz") @@ -84,7 +51,7 @@ new_draft_file:write("\n") new_draft_file:close() -local output, err, status = extos.pfilter(nil, "sh", "-c", "diff -U 1000000000 '" .. old_draft_filename .. "' '" .. new_draft_filename .. "' | grep -v ^--- | grep -v ^+++ | grep -v ^@") +local output, err, status = extos.pfilter(nil, "sh", "-c", "diff -a -U 1000000000 '" .. old_draft_filename .. "' '" .. new_draft_filename .. "' | grep --binary-files=text -v ^--- | grep --binary-files=text -v ^+++ | grep --binary-files=text -v ^@") os.remove(old_draft_filename) os.remove(new_draft_filename) @@ -116,93 +83,133 @@ if not state_changed then slot.put(" ") end - slot.put(encode.html(line)) + --slot.put(encode.html(line)) + slot.put(line) else slot.put("
") end end -ui.section( function() - ui.sectionHead( function() - ui.link{ - module = "initiative", view = "show", id = initiative.id, - content = function () +execute.view{ module = "issue", view = "_head", params = { issue = initiative.issue } } + +ui.grid{ content = function() + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function () ui.heading { - level = 1, - content = initiative.display_name - } - end - } - ui.heading{ level = 2, content = _("Comparision of revisions #{id1} and #{id2}", { - id1 = old_draft.id, - id2 = new_draft.id - } ) } - end ) - - if app.session.member_id and not new_draft.initiative.revoked then - local supporter = app.session.member:get_reference_selector("supporters") - :add_where{ "initiative_id = ?", new_draft.initiative_id } - :optional_object_mode() - :exec() - if supporter and supporter.draft_id ~= new_draft.id then - ui.sectionRow("draft_updated_info", function() - ui.container{ - attr = { class = "info" }, - content = _"The draft of this initiative has been updated!" + attr = { class = "mdl-card__title-text" }, + content = function() + ui.link{ + module = "initiative", view = "show", id = initiative.id, + content = initiative.display_name + } + end } - slot.put(" ") - ui.link{ - text = _"refresh my support", - module = "initiative", - action = "add_support", - id = new_draft.initiative.id, - params = { draft_id = new_draft.id }, - routing = { - default = { - mode = "redirect", - module = "initiative", - view = "show", - id = new_draft.initiative.id - } + ui.container{ content = _("Comparision of revisions #{id1} and #{id2}", { + id1 = old_draft.id, + id2 = new_draft.id + } ) } + end } + + if app.session.member_id and not new_draft.initiative.revoked then + local supporter = app.session.member:get_reference_selector("supporters") + :add_where{ "initiative_id = ?", new_draft.initiative_id } + :optional_object_mode() + :exec() + if supporter and supporter.draft_id == old_draft.id and new_draft.id == initiative.current_draft.id then + ui.container { + attr = { class = "mdl-card__content mdl-card--no-bottom-pad mdl-card--notice" }, + content = _"The draft of this initiative has been updated!" } - } + ui.container { + attr = { class = "mdl-card__actions mdl-card--action-border mdl-card--notice" }, + content = function () + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + text = _"refresh my support", + module = "initiative", + action = "add_support", + id = new_draft.initiative.id, + params = { draft_id = new_draft.id }, + routing = { + default = { + mode = "redirect", + module = "initiative", + view = "show", + id = new_draft.initiative.id + } + } + } - slot.put(" · ") - - ui.link{ - text = _"remove my support", - module = "initiative", - action = "remove_support", - id = new_draft.initiative.id, - routing = { - default = { - mode = "redirect", - module = "initiative", - view = "show", - id = new_draft.initiative.id - } + slot.put("   ") + + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + text = _"remove my support", + module = "initiative", + action = "remove_support", + id = new_draft.initiative.id, + routing = { + default = { + mode = "redirect", + module = "initiative", + view = "show", + id = new_draft.initiative.id + } + } + } + + slot.put("   ") + + ui.link{ + attr = { class = "mdl-button mdl-js-button" }, + text = _"cancel", + module = "initiative", + view = "show", + id = new_draft.initiative.id, + } + end } - } - - end ) - end - end - - ui.sectionRow( function() + end + end - if not status then - ui.field.text{ value = _"The drafts do not differ" } - else - ui.container{ - tag = "div", - attr = { class = "diff" }, - content = function() - output = output:gsub("[^\n\r]+", function(line) - process_line(line) - end) + ui.container { + attr = { class = "draft mdl-card__content mdl-card--border" }, + content = function () + if not status then + ui.field.text{ value = _"The drafts do not differ" } + else + ui.container{ + tag = "div", + attr = { class = "diff" }, + content = function() + output = output:gsub("[^\n\r]+", function(line) + process_line(line) + end) + end + } + end end } - end + end } + end } + ui.cell_sidebar{ content = function() + + execute.view{ module = "issue", view = "_sidebar", params = { + initiative = initiative, + issue = initiative.issue + } } - end ) -end ) + execute.view { + module = "issue", view = "_sidebar_whatcanido", + params = { initiative = initiative } + } + + execute.view { + module = "issue", view = "_sidebar_members", params = { + issue = initiative.issue, initiative = initiative + } + } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/draft/new.lua --- a/app/main/draft/new.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/draft/new.lua Sun Jul 15 14:07:29 2018 +0200 @@ -13,25 +13,16 @@ return end - -execute.view{ - module = "issue", view = "_head", params = { - issue = initiative.issue, - initiative = initiative - } -} - -execute.view { - module = "issue", view = "_sidebar_issue", - params = { - issue = initiative.issue, - } -} - - +local draft = initiative.current_draft +if config.initiative_abstract then + draft.abstract = string.match(draft.content, "(.+)") + if draft.abstract then + draft.content = string.match(draft.content, "(.*)") + end +end ui.form{ - record = initiative.current_draft, + record = draft, attr = { class = "vertical section" }, module = "draft", action = "add", @@ -46,103 +37,119 @@ }, content = function() - ui.sectionHead( function() - ui.heading { level = 1, content = initiative.display_name } - end) - - if param.get("preview") then - ui.sectionRow( function() - ui.field.hidden{ name = "formatting_engine", value = param.get("formatting_engine") } - ui.field.hidden{ name = "content", value = param.get("content") } - local formatting_engine - if config.enforce_formatting_engine then - formatting_engine = config.enforce_formatting_engine - else - formatting_engine = param.get("formatting_engine") - end - ui.container{ - attr = { class = "draft" }, - content = function() - slot.put(format.wiki_text(param.get("content"), formatting_engine)) - end - } + ui.grid{ content = function() + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = initiative.display_name } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + if param.get("preview") then + ui.sectionRow( function() + if config.initiative_abstract then + ui.field.hidden{ name = "abstract", value = param.get("abstract") } + ui.container{ + attr = { class = "abstract" }, + content = param.get("abstract") + } + slot.put("
") + end + local draft_text = param.get("content") + local draft_text = util.wysihtml_preproc(draft_text) + ui.field.hidden{ name = "content", value = draft_text } + ui.container{ + attr = { class = "draft" }, + content = function() + slot.put(draft_text) + end + } + slot.put("
") - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _'Publish now' - }, - content = "" - } - slot.put("
") - slot.put("
") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored", + value = _'Publish now' + }, + content = "" + } + slot.put("   ") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "edit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect", + value = _'Edit again' + }, + content = "" + } + slot.put("   ") - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "edit", - class = "btn-link", - value = _'Edit again' - }, - content = "" - } - slot.put(" | ") - ui.link{ - content = _"Cancel", - module = "initiative", - view = "show", - id = initiative.id - } - end ) + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }, + content = _"Cancel", + module = "initiative", + view = "show", + id = initiative.id + } + end ) - else - ui.sectionRow( function() - execute.view{ module = "initiative", view = "_sidebar_wikisyntax" } - - if not config.enforce_formatting_engine then - ui.field.select{ - label = _"Wiki engine", - name = "formatting_engine", - foreign_records = config.formatting_engines, - attr = {id = "formatting_engine"}, - foreign_id = "id", - foreign_name = "name" - } - end - - ui.heading{ level = 2, content = _"Enter your proposal and/or reasons" } + else + ui.sectionRow( function() + if config.initiative_abstract then + ui.container { content = _"Enter abstract:" } + ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--expandable mdl-textfield__fullwidth" }, content = function() + ui.field.text{ + name = "abstract", + multiline = true, + attr = { id = "abstract", style = "height: 20ex; width: 100%;" }, + value = param.get("abstract") + } + end } + end + + ui.container { content = _"Enter your proposal and/or reasons:" } + ui.field.wysihtml{ + name = "content", + multiline = true, + attr = { id = "draft", style = "height: 50ex; width: 100%;" }, + value = param.get("content") + } + if not issue or issue.state == "admission" or issue.state == "discussion" then + ui.container { content = _"You can change your text again anytime during admission and discussion phase" } + else + ui.container { content = _"You cannot change your text again later, because this issue is already in verfication phase!" } + end + slot.put("
") - ui.field.text{ - name = "content", - multiline = true, - attr = { style = "height: 50ex; width: 100%;" }, - value = param.get("content") - } - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "preview", - class = "btn btn-default", - value = _'Preview' - }, - content = "" - } - slot.put("
") - slot.put("
") - - ui.link{ - content = _"Cancel", - module = "initiative", - view = "show", - id = initiative.id - } - - end ) - end + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "preview", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored", + value = _'Preview' + }, + content = "" + } + slot.put("   ") + + ui.link{ + content = _"Cancel", + module = "initiative", + view = "show", + id = initiative.id, + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" } + } + + end ) + end + end } + end } + end } + end } end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/draft/show.lua --- a/app/main/draft/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/draft/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,4 +1,12 @@ -local draft = Draft:new_selector():add_where{ "id = ?", param.get_id() }:single_object_mode():exec() +local draft = Draft:new_selector():add_where{ "id = ?", param.get_id() }:optional_object_mode():exec() + +if not draft then + execute.view { module = "index", view = "404" } + request.set_status("404 Not Found") + return +end + + local source = param.get("source", atom.boolean) execute.view{ diff -r 7ea154c9238a -r 32cc544d5a5b app/main/help/introduction.lua --- a/app/main/help/introduction.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/help/introduction.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,51 +1,36 @@ ui.title(_"Introduction") --- show the user what can be done -execute.view { module = "index", view = "_sidebar_whatcanido" } +ui.grid{ content = function() + ui.cell_main{ content = function() -ui.section(function() - ui.sectionHead(function() - ui.heading{ level = 1, content = _"Structured discussion" } - end) - ui.sectionRow(function() - ui.heading{ level = 2, content = _"Initiatives and issues" } - ui.tag{ tag = "p", content = _"[introduction] iniatives and issues" } - ui.heading{ level = 2, content = _"Subject areas" } - ui.tag{ tag = "p", content = _"[introduction] subject areas" } - ui.heading{ level = 2, content = _"Organizational units" } - ui.tag{ tag = "p", content = _"[introduction] organizational units" } - ui.heading{ level = 2, content = _"Rules of procedure" } - ui.tag{ tag = "p", content = _"[introduction] rules of procedure" } - end ) -end ) -ui.section(function() - ui.sectionHead(function() - ui.heading{ level = 1, content = _"4 phases of a decision" } - end) - ui.sectionRow(function() - ui.heading{ level = 2, content = _"(1) Admission phase" } - ui.tag{ tag = "p", content = _"[introduction] phase 1 admission" } - ui.heading{ level = 2, content = _"(2) Discussion phase" } - ui.tag{ tag = "p", content = _"[introduction] phase 2 discussion" } - ui.heading{ level = 2, content = _"(3) Verification phase" } - ui.tag{ tag = "p", content = _"[introduction] phase 3 verification" } - ui.heading{ level = 2, content = _"(4) Voting phase" } - ui.tag{ tag = "p", content = _"[introduction] phase 4 voting" } - end) -end) -ui.section(function() - ui.sectionHead(function() - ui.heading{ level = 1, content = _"Vote delegation" } - end) - ui.sectionRow(function() - ui.tag{ tag = "p", content = _"[introduction] vote delegation" } - end) -end) -ui.section(function() - ui.sectionHead(function() - ui.heading{ level = 1, content = _"Preference voting" } - end) - ui.sectionRow(function() - ui.tag{ tag = "p", content = _"[introduction] preference voting" } - end) -end) + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--has-fab mdl-card--border" }, content = function () + ui.heading { attr = { class = "mdl-card__title-text" }, level = 1, content = _"Quick guide" } + end } + ui.container { attr = { class = "draft mdl-card__content mdl-card--border" }, content = function() + ui.heading{ level = 2, content = _"Initiatives and issues" } + ui.tag{ tag = "p", content = _"[introduction] iniatives and issues" } + ui.heading{ level = 2, content = _"Subject areas" } + ui.tag{ tag = "p", content = _"[introduction] subject areas" } + ui.heading{ level = 2, content = _"Organizational units" } + ui.tag{ tag = "p", content = _"[introduction] organizational units" } + ui.heading{ level = 2, content = _"Rules of procedure" } + ui.tag{ tag = "p", content = _"[introduction] rules of procedure" } + ui.heading{ level = 2, content = _"Admission phase" } + ui.tag{ tag = "p", content = _"[introduction] phase 1 admission" } + ui.heading{ level = 2, content = _"Discussion phase" } + ui.tag{ tag = "p", content = _"[introduction] phase 2 discussion" } + ui.heading{ level = 2, content = _"Verification phase" } + ui.tag{ tag = "p", content = _"[introduction] phase 3 verification" } + ui.heading{ level = 2, content = _"Voting phase" } + ui.tag{ tag = "p", content = _"[introduction] phase 4 voting" } + ui.heading{ level = 2, content = _"Vote delegation" } + ui.tag{ tag = "p", content = _"[introduction] vote delegation" } + ui.heading{ level = 2, content = _"Preference voting" } + ui.tag{ tag = "p", content = _"[introduction] preference voting" } + + end } + end } + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/http_options.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/http_options.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,17 @@ +-- TODO workaround, needs to be resolved in WebMCP's request.handler +if not request._route then + return +end + +if request.get_module() == "oauth2" and request.get_view() == "session" then + local origin = request.get_header("Origin") + if origin then + request.add_header("Access-Control-Allow-Origin", origin) + end + request.add_header("Access-Control-Allow-Credentials", "true") + request.add_header("Access-Control-Max-Age", "0") +else + request.add_header("Access-Control-Allow-Origin", "*") +end + +request.add_header("Access-Control-Allow-Headers", "Authorization") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/403.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/403.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,21 @@ +request.set_status("403 Forbidden") + +ui.title("403 Forbidden") + +ui.grid{ content = function() + + ui.cell_main{ content = function() + + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Forbidden" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.link{ + content = _"Go back to home page", + module = "index", view = "index" + } + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/404.lua --- a/app/main/index/404.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/404.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,13 +1,21 @@ +request.set_status("404 Not found") + ui.title("404 Not found") -ui.section(function() - ui.sectionHead(function() - ui.heading{ level = 1, content = _"Page not found" } - end) - ui.sectionRow(function() - ui.link{ - content = _"Go back to home page", - module = "index", view = "index" - } - end) -end) \ No newline at end of file +ui.grid{ content = function() + + ui.cell_main{ content = function() + + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Page not found" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.link{ + content = _"Go back to home page", + module = "index", view = "index" + } + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/405.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/405.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,21 @@ +request.set_status("405 Method Not Allowed") + +ui.title("405 Method Not Allowed") + +ui.grid{ content = function() + + ui.cell_main{ content = function() + + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Method not allowed" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.link{ + content = _"Go back to home page", + module = "index", view = "index" + } + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_action/login.lua --- a/app/main/index/_action/login.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_action/login.lua Sun Jul 15 14:07:29 2018 +0200 @@ -99,6 +99,7 @@ member:save() app.session.member = member app.session:save() + trace.debug('User authenticated') if config.etherpad then do_etherpad_auth(member) @@ -116,9 +117,7 @@ ui.tag { content = _"to show more info and learn what you can do" } end ) else - slot.select("error", function() - ui.tag{ content = _'Invalid login name or password!' } - end) + slot.put_into("error_code", "invalid_credentials") trace.debug('User NOT authenticated') return false end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_action/logout.lua --- a/app/main/index/_action/logout.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_action/logout.lua Sun Jul 15 14:07:29 2018 +0200 @@ -9,3 +9,7 @@ } end end + +if config.meta_navigation_logout_url then + request.redirect{ external = config.meta_navigation_logout_url } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_action/register.lua --- a/app/main/index/_action/register.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_action/register.lua Sun Jul 15 14:07:29 2018 +0200 @@ -4,13 +4,13 @@ if app.session.authority == "ldap" then if not config.ldap.member or config.ldap.member.registration ~= "manual" then - error("access denied") + return execute.view { module = "index", view = "403" } end member = ldap.create_member(app.session.authority_uid, true) else if config.registration_disabled then - error("registration disabled") + return execute.view { module = "index", view = "403" } end member = Member:new_selector() :add_where{ "invite_code = ?", code } @@ -21,38 +21,58 @@ :exec() end - + if not member then slot.put_into("error", _"The code you've entered is invalid") request.redirect{ mode = "forward", module = "index", - view = "register" + view = "register", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } return false end local notify_email = param.get("notify_email") -if not util.is_profile_field_locked(member, "notify_email") and notify_email then +if not util.is_profile_field_locked(member, "notify_email") and not member.notify_email and notify_email then if #notify_email < 5 then slot.put_into("error", _"Email address too short!") request.redirect{ mode = "redirect", module = "index", view = "register", - params = { code = member.invite_code } + params = { + code = member.invite_code, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } return false end end -if member and not util.is_profile_field_locked(member, "notify_email") and not notify_email then +if member and not util.is_profile_field_locked(member, "notify_email") and not member.notify_email and not notify_email then request.redirect{ mode = "redirect", module = "index", view = "register", - params = { code = member.invite_code, step = 1 } + params = { + code = member.invite_code, + skip = param.get("skip"), + step = 1, + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } return false end @@ -71,7 +91,12 @@ params = { code = member.invite_code, notify_email = notify_email, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -87,7 +112,12 @@ params = { code = member.invite_code, notify_email = notify_email, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -105,7 +135,12 @@ params = { code = member.invite_code, notify_email = notify_email, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -124,7 +159,12 @@ code = member.invite_code, notify_email = notify_email, name = member.name, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -141,7 +181,12 @@ code = member.invite_code, notify_email = notify_email, name = member.name, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -158,7 +203,12 @@ code = member.invite_code, notify_email = notify_email, name = member.name, - step = 1 + step = 1, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } return false @@ -169,10 +219,16 @@ if step > 2 then for i, checkbox in ipairs(config.use_terms_checkboxes) do - local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) - if not accepted then - slot.put_into("error", checkbox.not_accepted_error) - return false + local member_useterms = MemberUseterms:new_selector() + :add_where{ "member_id = ?", member.id } + :add_where{ "contract_identifier = ?", checkbox.name } + :exec() + if #member_useterms == 0 then + local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) + if not accepted then + slot.put_into("error", checkbox.not_accepted_error) + return false + end end end @@ -190,7 +246,12 @@ code = member.invite_code, notify_email = notify_email, name = member.name, - login = member.login + login = member.login, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } --]] @@ -219,7 +280,7 @@ member.name = name end - if notify_email ~= member.notify_email then + if not member.notify_email then local success = member:set_notify_email(notify_email) if not success then slot.put_into("error", _"Can't send confirmation email") @@ -231,7 +292,10 @@ for i, checkbox in ipairs(config.use_terms_checkboxes) do local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) - member:set_setting("use_terms_checkbox_" .. checkbox.name, "accepted at " .. tostring(now)) + local member_useterms = MemberUseterms:new() + member_useterms.member_id = member.id + member_useterms.contract_identifier = checkbox.name + member_useterms:save() end member.activated = 'now' @@ -239,12 +303,24 @@ member.last_activity = 'now' member:save() - slot.put_into("notice", _"You've successfully registered and you can login now with your login and password!") + if not member.profile then + local profile = MemberProfile:new() + profile.member_id = member.id + profile.profile = json.object() + profile:save() + end + + slot.put_into("notice", _"Registration succeeded") + + app.session.member_id = member.id + app.session:save() request.redirect{ mode = "redirect", - module = "index", - view = "login", + module = param.get("redirect_module") or "index", + view = param.get("redirect_view") or "index", + id = param.get("redirect_id"), + params = param.get("redirect_params") } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_drawer.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/_drawer.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,141 @@ +local member = app.session.member +local units +if member then + units = member:get_reference_selector("units"):add_order_by("name"):exec() + units:load_delegation_info_once_for_member_id(member.id) +else + units = Unit:new_selector():add_where("active"):add_order_by("name"):exec() +end + +slot.select("drawer", function() + ui.container{ attr = { class = "mdl-layout__drawer" }, content = function() + ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function () + ui.link{ content = config.instance_name, attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider mdl-navigation__head" }, module = "index", view = "index" } + + if #units > 0 then + for i, unit in ipairs(units) do + local class = "mdl-navigation__link mdl-navigation__head" + if i == #units then + class = class .. " mdl-menu__item--full-bleed-divider" + end + ui.link{ attr = { class = class }, content = unit.name, module = "unit", view = "show", id = unit.id } + local areas = unit.areas + for i, area in ipairs(areas) do + local class = "mdl-navigation__link mdl-menu__item--small" + if i == #areas then + class = class .. " mdl-menu__item--full-bleed-divider" + end + ui.link{ attr = { class = class }, module = "area", view = "show", id = area.id, content = function() + ui.tag{ content = "⤷" } + slot.put(" ") + ui.tag{ content = area.name } + end } + end + end + end + + ui.link{ attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider" }, content = _"Member list", module = "member", view = "list" } + ui.link{ attr = { class = "mdl-navigation__link" }, content = _"Quick guide", module = "help", view = "introduction" } + + if app.session.member_id and app.session.member.admin then + ui.link{ attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider" }, content = _"System settings", module = "admin", view = "index" } + end + + end } + end } +end) + +if true then + return +end + +for i, unit in ipairs(units) do + + ui.sidebar ( "tab-whatcanido units", function () + + local areas_selector = Area:new_selector() + :reset_fields() + :add_field("area.id", nil, { "grouped" }) + :add_field("area.unit_id", nil, { "grouped" }) + :add_field("area.name", nil, { "grouped" }) + :add_where{ "area.unit_id = ?", unit.id } + :add_where{ "area.active" } + :add_order_by("area.name") + + local areas = areas_selector:exec() + if member then + areas:load_delegation_info_once_for_member_id(member.id) + end + + if #areas > 0 then + + ui.container { + attr = { class = "sidebarHead" }, + content = function () + ui.heading { level = 2, content = function () + ui.link { + attr = { class = "unit" }, + module = "unit", view = "show", id = unit.id, + content = unit.name + } + + if member then + local delegation = Delegation:by_pk(member.id, unit.id, nil, nil) + + if delegation then + ui.link { + module = "delegation", view = "show", params = { + unit_id = unit.id + }, + attr = { class = "delegation_info" }, + content = function () + ui.delegation(delegation.trustee_id, delegation.trustee.name) + end + } + end + end + end } + + end + } + + + ui.tag { tag = "div", attr = { class = "areas areas-" .. unit.id }, content = function () + + for i, area in ipairs(areas) do + + ui.tag { tag = "div", attr = { class = "sidebarRow" }, content = function () + + if member then + local delegation = Delegation:by_pk(member.id, nil, area.id, nil) + + if delegation then + ui.link { + module = "delegation", view = "show", params = { + area_id = area.id + }, + attr = { class = "delegation_info" }, + content = function () + ui.delegation(delegation.trustee_id, delegation.trustee_id and delegation.trustee.name) + end + } + end + end + + slot.put ( " " ) + + ui.link { + attr = { class = "area" }, + module = "area", view = "show", id = area.id, + content = area.name + } + + + end } + end + end } + end + end ) +end + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_head.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/_head.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,142 @@ +local unit_id = config.single_unit_id or tonumber(request.get_param{ name = "unit" }) +if unit_id == "all" then + unit_id = nil +end +local unit +if unit_id then + unit = Unit:by_id(unit_id) +end +local area_id = config.single_area_id or tonumber(request.get_param{ name = "area" }) +if area_id == "all" then + area_id = nil +end +local area +if area_id then + area = Area:by_id(area_id) +end +if area and unit and area.unit_id ~= unit.id then + area_id = nil +end +if area and area.unit_id == unit_id then + if app.session.member_id then + area:load_delegation_info_once_for_member_id(app.session.member_id) + end + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + if unit then + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + if not config.single_area_id then + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = unit.name .. " / " .. area.name } + else + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = unit.name } + end + end } + end + if area.description and #(area.description) > 0 then + if not config.single_area_id then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = area.description } + else + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = unit.description } + end + end + if not (config.voting_only and config.disable_delegations) and app.session.member_id then + ui.container{ attr = { class = "mdl-card__actions" }, content = function() + + if app.session.member_id then + if area.delegation_info.first_trustee_id then + local member = Member:by_id(area.delegation_info.first_trustee_id) + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "forward" } + execute.view{ + module = "member_image", + view = "_show", + params = { + member = member, + image_type = "avatar", + show_dummy = true + } + } + end + + if not config.disable_delegations then + if area.delegation_info.own_delegation_scope == "unit" then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "delegation", view = "show", params = { + unit_id = area.unit_id, + }, + content = _("change/revoke delegation of organizational unit") + } + slot.put("   ") + end + if area.delegation_info.own_delegation_scope == nil then + local text + if config.single_area_id then + text = _"choose delegatee" + else + text = _"choose subject area delegatee" + end + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "forward" } + ui.tag{ content = text } + end + } + slot.put("   ") + elseif area.delegation_info.own_delegation_scope == "area" then + local text + if config.single_area_id then + text = _"change/revoke delegation" + else + text = _"change/revoke area delegation" + end + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = text + } + slot.put("   ") + else + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "delegation", view = "show", params = { + area_id = area.id + }, + content = _"change/revoke delegation only for this subject area" + } + slot.put("   ") + end + end + end + if not config.voting_only and app.session.member_id and app.session.member:has_initiative_right_for_unit_id ( area.unit_id ) then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "initiative", view = "new", + params = { area_id = area.id }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "add" } + ui.tag{ content = _"new issue" } + end + } + end + end } + end + end } +elseif unit then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = unit.name } + end } + if unit.description and #(unit.description) > 0 then + ui.container{ attr = { class = "mdl-card__supporting-text mdl-card--border" }, content = unit.description } + end + --ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + --end } + end } +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_lang_chooser.lua --- a/app/main/index/_lang_chooser.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_lang_chooser.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,31 @@ +ui.tag{ tag = "button", attr = { id = "lf-lang-menu", class = "mdl-button mdl-js-button float-right" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "language" } + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "translate" } +end } + +ui.tag { tag = "ul", attr = { class = "mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect", ["data-mdl-for"] = "lf-lang-menu" }, content = function() + for i, lang in ipairs(config.enabled_languages) do + local langcode + locale.do_with({ lang = lang }, function() + langcode = _("[Name of Language]") + end) + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ + content = langcode, + attr = { class = "mdl-menu__link" }, + module = "index", + action = "set_lang", + params = { lang = lang }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_members.lua --- a/app/main/index/_sidebar_members.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_members.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,38 +1,60 @@ +local limit = 50 + if not app.session:has_access("all_pseudonymous") then return end -local member_count = MemberCount:get() +local unit_id = request.get_param{ name = "unit" } +if unit_id == "all" then + unit_id = nil +end -if not member_count then - return +local selector = Member:new_selector() + :add_where("active") + :add_order_by("last_login DESC NULLS LAST, id DESC") + +if unit_id then + selector:join("privilege", nil, "privilege.member_id = member.id") + selector:add_where{ "privilege.unit_id = ?", unit_id } end -ui.sidebar ( "tab-members", function () - ui.sidebarHead( function() - ui.heading { - level = 2, - content = _("Registered members (#{count})", { count = member_count }) +local member_count = selector:count() + +selector:limit(limit) + + +ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + local text + if unit_id then + text = _("Eligible members (#{count})", { count = selector:count() }) + else + text = _("Registered members (#{count})", { count = selector:count() }) + end + ui.container{ + attr = { class = "mdl-card__title-text" }, + content = text } - end ) - - local selector = Member:new_selector() - :add_where("active") - :add_order_by("last_login DESC NULLS LAST, id DESC") - :limit(50) + end } - execute.view { - module = 'member', view = '_list', params = { - members_selector = selector, - no_filter = true, no_paginate = true, - member_class = "sidebarRow sidebarRowNarrow" + ui.container{ attr = { class = "mdl-card__content" }, content = function() + execute.view { + module = 'member', view = '_list', params = { + members_selector = selector, + no_filter = true, no_paginate = true, + member_class = "sidebarRow sidebarRowNarrow" + } } - } + end } - ui.link { - attr = { class = "sidebarRow moreLink" }, - text = _"Show full member list", - module = "member", view = "list" - } - -end ) + if member_count > limit then + ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + text = _"Show full member list", + module = "member", view = "list" + } + end } + end +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_motd.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/index/_sidebar_motd.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,26 @@ +if app.session.member and config.motd_intern or config.motd_extern then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Message of the day" } + end } + ui.container{ attr = { class = "mdl-card__content what-can-i-do-here" }, content = function() + if app.session.member and config.motd_intern then + ui.container{ + attr = { class = "draft motd" }, + content = function() + slot.put(config.motd_intern) + end + } + end + if config.motd_extern then + ui.container{ + attr = { class = "draft motd" }, + content = function() + slot.put(config.motd_extern) + end + } + end + end } + end } + slot.put("
") +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_motd_intern.lua --- a/app/main/index/_sidebar_motd_intern.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_motd_intern.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,10 +1,15 @@ if config.motd_intern then - slot.select("motd", function() - ui.container{ - attr = { class = "wiki motd" }, - content = function() - slot.put(config.motd_intern) - end - } - end ) + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Message of the day" } + end } + ui.container{ attr = { class = "mdl-card__content what-can-i-do-here" }, content = function() + ui.container{ + attr = { class = "wiki motd" }, + content = function() + slot.put(config.motd_intern) + end + } + end } + end } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_motd_public.lua --- a/app/main/index/_sidebar_motd_public.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_motd_public.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,10 +1,7 @@ if config.motd_public then - slot.select("motd", function() - ui.container{ - attr = { class = "wiki motd" }, - content = function() - slot.put(config.motd_public) - end - } - end ) + ui.container{ attr = { class = "mdl-special-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__content" }, content = function() + slot.put(config.motd_public) + end } + end } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_notifications.lua --- a/app/main/index/_sidebar_notifications.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_notifications.lua Sun Jul 15 14:07:29 2018 +0200 @@ -7,6 +7,18 @@ } end +local agents = Agent:new_selector() + :add_where{ "controller_id = ?", app.session.member_id } + :add_where{ "accepted ISNULL" } + :exec() +for i, agent in ipairs(agents) do + local member = Member:by_id(agent.controlled_id) + notification_links[#notification_links+1] = { + module = "agent", view = "show", params = { controlled_id = agent.controlled_id }, + text = _("Account access invitation from '#{member_name}'", { member_name = member.name }) + } +end + if config.check_delegations_interval_soft then local member = Member:new_selector() :add_where({ "id = ?", app.session.member_id }) @@ -99,28 +111,19 @@ } end -local mode = param.get("mode") or "view" - if #notification_links > 0 then - if mode == "link" then - slot.select("notification", function () - local text = _"notifications" - ui.link { - attr = { class = "notifications", title = text }, - module = "index", view = "notifications", - content = function () - ui.image { attr = { class = "icon", alt = text }, static = "icons/48/bell.png" } - ui.tag { attr = { class = "count" }, content = #notification_links } + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Notifications" } + end } + ui.container{ attr = { class = "mdl-card__content what-can-i-do-here" }, content = function() + ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() + for i, notification_link in ipairs(notification_links) do + ui.tag{ tag = "li", content = function() + ui.link(notification_link) + end } end - } - end ) - elseif mode == "view" then - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - for i, notification_link in ipairs(notification_links) do - ui.tag{ tag = "li", content = function() - ui.link(notification_link) - end } - end + end } end } - end + end } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_units.lua --- a/app/main/index/_sidebar_units.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_units.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,3 +1,5 @@ +if true then return end + local member = param.get ( "member", "table" ) local units if member then @@ -30,14 +32,6 @@ :add_where{ "area.active" } :add_order_by("area.name") - if member then - areas_selector:left_join ( - "membership", nil, - { "membership.area_id = area.id AND membership.member_id = ?", member.id } - ) - areas_selector:add_field("membership.member_id NOTNULL", "subscribed", { "grouped" }) - end - local areas = areas_selector:exec() if member then areas:load_delegation_info_once_for_member_id(member.id) @@ -78,21 +72,9 @@ ui.tag { tag = "div", attr = { class = "areas areas-" .. unit.id }, content = function () - local any_subscribed = false - local subscribed_count = 0 for i, area in ipairs(areas) do - local class = "sidebarRow" - class = class .. (not area.subscribed and " disabled" or "") - - ui.tag { tag = "div", attr = { class = class }, content = function () - - if area.subscribed then - local text = _"subscribed" - ui.image { attr = { class = "icon16 star", alt = text, title = text }, static = "icons/48/star.png" } - any_subscribed = true - subscribed_count = subscribed_count +1 - end + ui.tag { tag = "div", attr = { class = "sidebarRow" }, content = function () if member then local delegation = Delegation:by_pk(member.id, nil, area.id, nil) @@ -121,31 +103,6 @@ end } end - if subscribed_count < #areas then - local text - if any_subscribed then - text = _"show other subject areas" - else - text = _"show subject areas" - end - ui.script{ script = "$('.areas-" .. unit.id .. "').addClass('folded');" } - ui.tag { tag = "div", attr = { class = "sidebarRow moreLink whenfolded" }, content = function () - ui.link { - attr = { - onclick = "$('.areas-" .. unit.id .. "').removeClass('folded'); return false;" - }, - text = text - } - end } - ui.tag { tag = "div", attr = { class = "sidebarRow moreLink whenunfolded" }, content = function () - ui.link { - attr = { - onclick = "$('.areas-" .. unit.id .. "').addClass('folded'); return false;" - }, - text = _"collapse subject areas" - } - end } - end end } end end ) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/_sidebar_whatcanido.lua --- a/app/main/index/_sidebar_whatcanido.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/_sidebar_whatcanido.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,84 +1,116 @@ -ui.sidebar ( "tab-whatcanido", function () - - ui.sidebarHeadWhatCanIDo() +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" } + end } + ui.container{ attr = { class = "what-can-i-do-here" }, content = function() - if app.session.member then - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to know whats going on" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = _"take a look on the issues (see left)" } - ui.tag { tag = "li", content = _"by default only those issues are shown, for which your are eligible to participate (change filters on top of the list)" } - end } - end ) - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to stay informed" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag{ content = _"check your " } - ui.link{ - module = "member", view = "settings_notification", - params = { return_to = "home" }, - text = _"notifications settings" - } - end } - ui.tag { tag = "li", content = function () - ui.tag{ content = _"subscribe subject areas or add your interested to issues and you will be notified about changes (follow the instruction on the area or issue page)" } - end } - end } - end ) - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to start a new initiative" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = _"open the appropriate subject area for your issue and follow the instruction on that page." } - end } - end ) - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to delegate my vote" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = _"open the organizational unit, subject area or issue you like to delegate and follow the instruction on that page." } - end } - end ) - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to take a look at other organizational units" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - module = "unit", view = "list", - text = _"show all units" - } - end } - end } - end ) - if config.download_dir then - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to download all data" } + if app.session.member then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to know whats going on" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"take a look on the issues (see right)" } + ui.tag { tag = "li", content = _"by default only those issues are shown, for which your are eligible to participate (change filters on top of the list)" } + end } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to stay informed" } ui.tag { tag = "ul", attr = { class = "ul" }, content = function () ui.tag { tag = "li", content = function () + ui.tag{ content = _"check your " } ui.link{ - module = "index", view = "download", - text = _"download database" + module = "member", view = "settings_notification", + params = { return_to = "home" }, + text = _"notifications settings" } end } + if not config.voting_only then + ui.tag { tag = "li", content = function () + ui.tag{ content = _"subscribe subject areas or add your interested to issues and you will be notified about changes (follow the instruction on the area or issue page)" } + end } + end + end } + end } + if app.session.member.has_voting_right then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to vote" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"check the issues on the right, and click on 'Vote now' to vote on an issue which is in voting phase." } + end } + end } + if not config.disable_delegations then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to delegate my vote" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"open the organizational unit, subject area or issue you like to delegate and follow the instruction on that page." } + end } + end } + end + end + if not config.voting_only and app.session.member.has_initiative_right then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to start a new initiative" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"open the appropriate subject area for your issue and follow the instruction on that page." } + end } + end } + end + if not config.single_unit_id then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to take a look at other organizational units" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + module = "unit", view = "list", + text = _"show all units" + } + end } + end } + end } + end + if config.download_dir then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to download all data" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + module = "index", view = "download", + text = _"download database" + } + end } + end } + end } + end + end + if not app.session.member then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"You are not entitled to vote in this unit" } + ui.tag{ tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ module = "index", view = "login", content = _"Login" } + end } + end } + end } + end + if not config.voting_only then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to learn more about LiquidFeedback" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function() + ui.link { module = "help", view = "introduction", content = _"structured discussion" } + end } + ui.tag { tag = "li", content = function() + ui.link { module = "help", view = "introduction", content = _"4 phases of a decision" } + end } + if not config.disable_delegations then + ui.tag { tag = "li", content = function() + ui.link { module = "help", view = "introduction", content = _"vote delegation" } + end } + end + ui.tag { tag = "li", content = function() + ui.link { module = "help", view = "introduction", content = _"preference voting" } + end } end } - end ) + end } end - end - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to learn more about LiquidFeedback" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function() - ui.link { module = "help", view = "introduction", content = _"structured discussion" } - end } - ui.tag { tag = "li", content = function() - ui.link { module = "help", view = "introduction", content = _"4 phases of a decision" } - end } - ui.tag { tag = "li", content = function() - ui.link { module = "help", view = "introduction", content = _"vote delegation" } - end } - ui.tag { tag = "li", content = function() - ui.link { module = "help", view = "introduction", content = _"preference voting" } - end } - end } - end ) - -end ) + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/about.lua --- a/app/main/index/about.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/about.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,103 +1,104 @@ ui.title(_"About site") -ui.section( function() +ui.grid{ content = function() + ui.cell_full{ content = function() - ui.sectionHead( function() - ui.heading{ level = 1, content = _"About site" } - end ) - - ui.sectionRow( function() + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() - ui.heading{ level = 3, content = _"This service is provided by:" } - slot.put(config.app_service_provider) - - end ) - - ui.sectionRow( function() - - ui.heading{ level = 3, content = _"This service is provided using the following software components:" } + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"This service is provided by:" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + slot.put(config.app_service_provider) + end } + end } + + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"This service is provided using the following software components:" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() - local tmp = { - { - name = "LiquidFeedback Frontend", - url = "http://www.public-software-group.org/liquid_feedback", - version = config.app_version, - license = "MIT/X11", - license_url = "http://www.public-software-group.org/licenses" - }, - { - name = "LiquidFeedback Core", - url = "http://www.public-software-group.org/liquid_feedback", - version = db:query("SELECT * from liquid_feedback_version;")[1].string, - license = "MIT/X11", - license_url = "http://www.public-software-group.org/licenses" - }, - { - name = "WebMCP", - url = "http://www.public-software-group.org/webmcp", - version = WEBMCP_VERSION or _WEBMCP_VERSION, - license = "MIT/X11", - license_url = "http://www.public-software-group.org/licenses" - } - } - - if _MOONBRIDGE_VERSION then - tmp[#tmp+1] = { - name = "Moonbridge", - url = "http://www.public-software-group.org/moonbridge", - version = _MOONBRIDGE_VERSION, - license = "MIT/X11", - license_url = "http://www.public-software-group.org/licenses" - } - end - - tmp[#tmp+1] = { - name = "Lua", - url = "http://www.lua.org", - version = _VERSION:gsub("Lua ", ""), - license = "MIT/X11", - license_url = "http://www.lua.org/license.html" - } - - tmp[#tmp+1] = { - name = "PostgreSQL", - url = "http://www.postgresql.org/", - version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""), - license = "PostgreSQL License", - license_url = "http://www.postgresql.org/about/licence" - } + local tmp = { + { + name = "LiquidFeedback Frontend", + url = "http://www.public-software-group.org/liquid_feedback", + version = config.app_version, + license = "MIT/X11", + license_url = "http://www.public-software-group.org/licenses" + }, + { + name = "LiquidFeedback Core", + url = "http://www.public-software-group.org/liquid_feedback", + version = db:query("SELECT * from liquid_feedback_version;")[1].string, + license = "MIT/X11", + license_url = "http://www.public-software-group.org/licenses" + }, + { + name = "WebMCP", + url = "http://www.public-software-group.org/webmcp", + version = WEBMCP_VERSION or _WEBMCP_VERSION, + license = "MIT/X11", + license_url = "http://www.public-software-group.org/licenses" + } + } + + if _MOONBRIDGE_VERSION then + tmp[#tmp+1] = { + name = "Moonbridge", + url = "http://www.public-software-group.org/moonbridge", + version = _MOONBRIDGE_VERSION, + license = "MIT/X11", + license_url = "http://www.public-software-group.org/licenses" + } + end + + tmp[#tmp+1] = { + name = "Lua", + url = "http://www.lua.org", + version = _VERSION:gsub("Lua ", ""), + license = "MIT/X11", + license_url = "http://www.lua.org/license.html" + } + + tmp[#tmp+1] = { + name = "PostgreSQL", + url = "http://www.postgresql.org/", + version = db:query("SELECT version();")[1].version:gsub("PostgreSQL ", ""):gsub("on.*", ""), + license = "PostgreSQL License", + license_url = "http://www.postgresql.org/about/licence" + } - ui.list{ - records = tmp, - columns = { - { - content = function(record) - ui.link{ - content = record.name, - external = record.url + ui.list{ + records = tmp, + columns = { + { + content = function(record) + ui.link{ + content = record.name, + external = record.url + } + end + }, + { + content = function(record) ui.field.text{ value = record.version } end + }, + { + content = function(record) + ui.link{ + content = record.license, + external = record.license_url + } + end + } - end - }, - { - content = function(record) ui.field.text{ value = record.version } end - }, - { - content = function(record) - ui.link{ - content = record.license, - external = record.license_url - } - end + } + } - } - } - } - - end ) - - ui.sectionRow( function() - ui.heading{ level = 3, content = "3rd party license information:" } - slot.put('Some of the icons used in Liquid Feedback are from Silk icon set 1.3 by Mark James. His work is licensed under a Creative Commons Attribution 2.5 License.') - - end ) -end ) + slot.put("
") + ui.container{ content = "3rd party license information:" } + slot.put('Some of the icons used in Liquid Feedback are from Silk icon set 1.3 by Mark James. His work is licensed under a Creative Commons Attribution 2.5 License.') + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/document.lua --- a/app/main/index/document.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/document.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if not config.document_dir then - error("feature not enabled") + return execute.view { module = "index", view = "404" } end slot.put_into("title", _"Download documents") @@ -54,4 +54,4 @@ end } } -} \ No newline at end of file +} diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/document_file.lua --- a/app/main/index/document_file.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/document_file.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if not config.document_dir then - error("feature not enabled") + return execute.view { module = "index", view = "404" } end local filename = param.get("filename") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/download.lua --- a/app/main/index/download.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/download.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if not config.download_dir then - error("feature not enabled") + return execute.view { module = "index", view = "404" } end local file_list = extos.listdir(config.download_dir) @@ -58,4 +58,4 @@ } } end) -end) \ No newline at end of file +end) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/download_file.lua --- a/app/main/index/download_file.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/download_file.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if not config.download_dir then - error("feature not enabled") + return execute.view { module = "index", view = "404" } end local filename = param.get("filename") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/index.lua --- a/app/main/index/index.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/index.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,114 +1,88 @@ -local function getIssuesSelector() - return Issue:new_selector() - :add_order_by([[ - coalesce( - issue.fully_frozen + issue.voting_time, - issue.half_frozen + issue.verification_time, - issue.accepted + issue.discussion_time, - issue.created + issue.max_admission_time - ) - now() - ]]) +if not app.session:has_access("anonymous") then + slot.put("
      Closed user group, please login.














") + return +end + +local unit_id = request.get_param{ name = "unit" } +local area_id = request.get_param{ name = "area" } + +if unit_id == "all" then + unit_id = nil +end + +if area_id == "all" then + area_id = nil +end + +local unit +local area + +if unit_id then + unit = Unit:by_id(unit_id) +end + +if area_id then + area = Area:by_id(area_id) end ---[[ -ui.title( function () - ui.link { attr = { class = "home" }, module = "index", view = "index", text = _"Home" } -end) ---]] - -ui.title() +ui.grid{ content = function() + ui.cell_main{ content = function() -if false then -slot.select ( "tabs", function () - - ui.tag { - attr = { onclick = "showTab(0);" }, - content = "units", - } - slot.put ( " " ) - ui.tag { - attr = { onclick = "showTab(1);" }, - content = "timeline" - } - slot.put ( " " ) - ui.tag { - attr = { onclick = "showTab(2);" }, - content = "what" - } - slot.put ( " " ) - ui.tag { - attr = { onclick = "showTab(3);" }, - content = "members" - } - -end ) + execute.view{ module = "index", view = "_sidebar_motd_public" } + + execute.view{ module = "issue", view = "_list" } + end } -ui.script { script = [[ - - var tabs = ["tab1", "main", "tab2", "tab3"] - var currentId; - - function showTab(id) { - var tabId = tabs[id]; - $('.tab').hide(); - $('.main').hide(); - $('.' + tabId).show(); - currentId = id; - }; - - showTab(0); - - $(function(){ - // Bind the swipeHandler callback function to the swipe event on div.box - $( "body" ).on( "swiperight", function swipeHandler( event ) { - newId = currentId - 1; - if (newId < 0) return; - showTab(newId); - } ) - $( "body" ).on( "swipeleft", function swipeHandler( event ) { - newId = currentId + 1; - if (newId > tabs.length - 1) return; - showTab(newId); - } ) - }); - -]]} -end - + ui.cell_sidebar{ content = function() + execute.view{ module = "index", view = "_sidebar_motd" } + if app.session.member then + execute.view{ module = "index", view = "_sidebar_notifications" } + end + if config.firstlife then + ui.container{ attr = { class = "map mdl-special-card mdl-shadow--2dp pos-before-main" }, content = function() + ui.tag{ tag = "iframe", attr = { src = config.firstlife.areaviewer_url .. "?" .. config.firstlife.coordinates .. "&domain=" .. request.get_absolute_baseurl(), class = "map" }, content = "" } + end } + end + if config.map then + local initiatives = Initiative:new_selector():exec() + local geo_objects = {} + for i, initiative in ipairs(initiatives) do + if initiative.location and initiative.location.coordinates then + local geo_object = { + lon = initiative.location.coordinates[1], + lat = initiative.location.coordinates[2], + label = "i" .. initiative.id, + description = slot.use_temporary(function() + ui.link{ module = "initiative", view = "show", id = initiative.id, text = initiative.display_name } + end), + type = "initiative" + } + table.insert(geo_objects, geo_object) + end + end + if ontomap_get_instances then + local instances = ontomap_get_instances() + for i, instance in ipairs(instances) do + table.insert(geo_objects, instance) + end + end + ui.container{ attr = { class = "map mdl-special-card mdl-shadow--2dp pos-before-main" }, content = function() + ui.map(geo_objects) + end } + end + if config.logo then + config.logo() + end + if area then + execute.view{ module = "area", view = "_sidebar_whatcanido", params = { area = area } } + elseif unit then + execute.view{ module = "unit", view = "_sidebar_whatcanido", params = { unit = unit } } + else + execute.view{ module = "index", view = "_sidebar_whatcanido" } + end + + execute.view { module = "index", view = "_sidebar_members" } + + end } +end } -if app.session.member then - execute.view{ module = "index", view = "_sidebar_motd_intern" } -else - execute.view{ module = "index", view = "_sidebar_motd_public" } -end - -if app.session:has_access("anonymous") then - -- show the units the member has voting privileges for - execute.view { - module = "index", view = "_sidebar_units", params = { - member = app.session.member - } - } -end - --- show the user what can be done -execute.view { module = "index", view = "_sidebar_whatcanido" } - --- show active members -if app.session:has_access("all_pseudonymous") then - execute.view{ module = "index", view = "_sidebar_members" } -end - -if app.session:has_access("anonymous") then - - if not app.session.member then --- execute.view { --- module = "slideshow", view = "_index" --- } - end - - execute.view { - module = "issue", view = "_list2", params = { } - } - -end -- if app.session:has_access "anonymous" \ No newline at end of file diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/login.lua --- a/app/main/index/login.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/login.lua Sun Jul 15 14:07:29 2018 +0200 @@ -8,90 +8,131 @@ ui.title(_"Login") app.html_title.title = _"Login" -execute.view{ module = "index", view = "_sidebar_motd_public" } +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + execute.view{ module = "index", view = "_sidebar_motd_public" } -ui.section(function() + execute.view{ module = "index", view = "_lang_chooser" } + + ui.heading{ level = 1, content = _"Login" } -ui.sectionHead(function() - ui.heading{ level = 1, content = _"Login" } - ui.container { attr = { class = "right" }, content = function() - for i, lang in ipairs(config.enabled_languages) do - local langcode - locale.do_with({ lang = lang }, function() - langcode = _("[Name of Language]") - end) - - if i > 1 then - slot.put(" | ") + local redirect_params = {} + local redirect_params_string = param.get("redirect_params") + + if redirect_params_string then + local tmp = json.import(redirect_params_string) + if type(tmp) == "table" then + for k, v in pairs(tmp) do + if type(v) == "string" then + redirect_params[k] = v + end + end end - - ui.link{ - content = function() - ui.tag{ content = langcode } - end, - module = "index", - action = "set_lang", - params = { lang = lang }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() + end + + ui.form{ + module = 'index', + action = 'login', + routing = { + ok = { + mode = 'redirect', + module = param.get("redirect_module") or "index", + view = param.get("redirect_view") or "index", + id = param.get("redirect_id"), + params = redirect_params + }, + error = { + mode = 'redirect', + module = "index", + view = "login", + params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } - } - end - end } -end) -ui.form{ - module = 'index', - action = 'login', - routing = { - ok = { - mode = 'redirect', - module = param.get("redirect_module") or "index", - view = param.get("redirect_view") or "index", - id = param.get("redirect_id"), - }, - error = { - mode = 'forward', - module = 'index', - view = 'login', - } - }, - content = function() - ui.sectionRow(function() - ui.field.text{ - attr = { id = "username_field" }, - label = _'Login name', - name = 'login', - value = '' - } - ui.script{ script = 'document.getElementById("username_field").focus();' } - ui.field.password{ - label = _'Password', - name = 'password', - value = '' - } - ui.container { attr = { class = "actions" }, content = function() + }, + content = function() + if slot.get_content("error_code") == "invalid_credentials" then + ui.container{ attr = { class = "warning" }, content = _"Invalid login name or password!" } + end + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-login__username", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-login__username" }, + label = _'Login name', + name = 'login', + value = '' + } + slot.put("
") + ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-login__password", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-login__password" }, + label = _'Password', + name = 'password', + value = '' + } + slot.put("

") ui.tag{ tag = "input", attr = { type = "submit", - class = "btn btn-default", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", value = _'Login' - }, - content = "" + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }, + module = "index", view = "index", text = _"Cancel" } - slot.put("
") - slot.put("
") - ui.link{ module = "index", view = "reset_password", text = _"Forgot password?" } - slot.put("  ") - ui.link{ module = "index", view = "send_login", text = _"Forgot login name?" } - end } - end ) - end -} -end ) \ No newline at end of file + if not config.disable_registration then + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "index", view = "register", text = _"No account yet?", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + end + if config.self_registration then + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "registration", view = "register", text = _"No account yet?", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + end + slot.put("

") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "index", view = "reset_password", text = _"Forgot password?", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "index", view = "send_login", text = _"Forgot login name?", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + end + } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/register.lua --- a/app/main/index/register.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/register.lua Sun Jul 15 14:07:29 2018 +0200 @@ -5,7 +5,7 @@ end if config.registration_disabled and not ldap_uid then - error("registration disabled") + return execute.view { module = "index", view = "404" } end execute.view{ module = "index", view = "_lang_chooser" } @@ -33,28 +33,21 @@ -ui.section( function() - +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + ui.heading{ level = 1, content = _"Account registration" } +--[[ if not code and not ldap_uid then - ui.title(_"Registration (step 1 of 3: Invite code)") - ui.sectionHead( function() - ui.heading { level = 1, content = _"Invite code" } - end ) + ui.heading{ level = 1, content = _"Registration (step 1 of 3: Invite code)" } elseif (not member.notify_email and not notify_email) or (not member.name and not name) or (not member.login and not login and not member.authority) or step == 1 then - ui.title(_"Registration (step 2 of 3: Personal information)") - ui.sectionHead( function() - ui.heading { level = 1, content = _"Check and enter personal data" } - end ) + ui.heading { level = 1, content = _"Registration (step 2 of 3: Personal information)" } else - ui.title(_"Registration (step 3 of 3: Terms of use and password)") - ui.sectionHead( function() - ui.heading { level = 1, content = _"Read and accept the terms and choose a password" } - end ) + ui.heading { level = 1, content = _"Registration (step 3 of 3: Terms of use and password)" } end - +--]] ui.sectionRow( function() ui.form{ attr = { class = "wide" }, @@ -64,20 +57,34 @@ code = code, notify_email = notify_email, name = name, - login = login + login = login, + skip = param.get("skip"), + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") }, content = function() if not code and not ldap_uid then ui.field.hidden{ name = "step", value = 1 } - ui.heading { level = 2, content = _"Please enter the invite code you've received" } + ui.tag { tag = "p", content = _"Please enter the invite code you've received" } ui.field.text{ - name = 'code', - value = param.get("invite") + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Invite code', + name = 'code', + value = '' } - ui.submit{ - text = _'proceed with registration', - attr = { class = "btn btn-default" } + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _'proceed with registration' + } } slot.put(" ") else @@ -94,125 +101,182 @@ execute.view{ module = "member", view = "_profile", params = { member = member, for_registration = true } } - if not util.is_profile_field_locked(member, "notify_email") then - ui.heading { level = 2, content = _'Email address' } + slot.put("

") + + if not util.is_profile_field_locked(member, "notify_email") and not member.notify_email then ui.tag{ tag = "p", content = _"Please enter your email address. This address will be used for automatic notifications (if you request them) and in case you've lost your password. This address will not be published. After registration you will receive an email with a confirmation link." } ui.field.text{ - name = 'notify_email', + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Email address', + name = 'notify_email', value = param.get("notify_email") or member.notify_email } end if not util.is_profile_field_locked(member, "name") then - ui.heading { level = 2, content = _'Screen name' } ui.tag{ tag = "p", content = _"Please choose a name, i.e. your real name or your nick name. This name will be shown to others to identify you." } ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Screen name', name = 'name', value = param.get("name") or member.name } end if not util.is_profile_field_locked(member, "login") then - ui.heading { level = 2, content = _'Login name' } ui.tag{ tag = "p", content = _"Please choose a login name. This name will not be shown to others and is used only by you to login into the system. The login name is case sensitive." } ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Login name', name = 'login', value = param.get("login") or member.login } end - ui.submit{ - text = _'proceed with registration', - attr = { class = "btn btn-default" } - } - slot.put(" ") - ui.link{ - content = _"one step back", - module = "index", - view = "register", - params = { - invite = code + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _'proceed with registration' } } - else - + if param.get("skip") ~= "1" then + slot.put(" ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + content = _"one step back", + module = "index", + view = "register", + params = { + invite = code, + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + end + else ui.field.hidden{ name = "step", value = "3" } - ui.container{ - attr = { class = "wiki use_terms" }, - content = function() - slot.put(config.use_terms) - end - } + + local need_to_accept_terms = false for i, checkbox in ipairs(config.use_terms_checkboxes) do - slot.put("
") - ui.tag{ - tag = "div", + local member_useterms = MemberUseterms:new_selector() + :add_where{ "member_id = ?", member.id } + :add_where{ "contract_identifier = ?", checkbox.name } + :exec() + if #member_useterms == 0 then + need_to_accept_terms = true + end + end + + if need_to_accept_terms then + ui.container{ + attr = { class = "wiki use_terms" }, content = function() + slot.put(config.use_terms) + end + } + + for i, checkbox in ipairs(config.use_terms_checkboxes) do + local member_useterms = MemberUseterms:new_selector() + :add_where{ "member_id = ?", member.id } + :add_where{ "contract_identifier = ?", checkbox.name } + :exec() + if #member_useterms == 0 then + slot.put("
") ui.tag{ - tag = "input", - attr = { - type = "checkbox", - id = "use_terms_checkbox_" .. checkbox.name, - name = "use_terms_checkbox_" .. checkbox.name, - value = "1", - style = "float: left;", - checked = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) and "checked" or nil - } - } - slot.put(" ") - ui.tag{ - tag = "label", - attr = { ['for'] = "use_terms_checkbox_" .. checkbox.name }, - content = function() slot.put(checkbox.html) end + tag = "div", + content = function() + ui.tag{ + tag = "input", + attr = { + type = "checkbox", + id = "use_terms_checkbox_" .. checkbox.name, + name = "use_terms_checkbox_" .. checkbox.name, + value = "1", + style = "float: left;", + checked = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) and "checked" or nil + } + } + slot.put(" ") + ui.tag{ + tag = "label", + attr = { ['for'] = "use_terms_checkbox_" .. checkbox.name }, + content = function() slot.put(checkbox.html) end + } + end } end - } - end + end - slot.put("
") - + slot.put("
") + end + member.notify_email = notify_email or member.notify_email member.name = name or member.name member.login = login or member.login - ui.heading { level = 2, content = _"Personal information" } - execute.view{ module = "member", view = "_profile", params = { - member = member, include_private_data = true - } } - ui.field.text{ - readonly = true, - label = _'Login name', - name = 'login', - value = member.login - } +-- ui.heading { level = 2, content = _"Personal information" } +-- execute.view{ module = "member", view = "_profile", params = { +-- member = member, include_private_data = true +-- } } +-- ui.field.text{ +-- readonly = true, +-- label = _'Login name', +-- name = 'login', +-- value = member.login +-- } if not (member.authority == "ldap") then - ui.heading { level = 2, content = _'Password' } ui.tag{ tag = "p", content = _"Please choose a password and enter it twice. The password is case sensitive." } ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Password', name = 'password1', } + slot.put("
") ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__code", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__code" }, + label = _'Repeat password', name = 'password2', } end - ui.submit{ - text = _'activate account', - attr = { class = "btn btn-default" } + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _'activate account' + } } slot.put(" ") ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, content = _"one step back", module = "index", view = "register", @@ -220,8 +284,13 @@ code = code, notify_email = notify_email, name = name, - login = login, - step = 1 + login = login, + skip = param.get("skip"), + step = 1, + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } } end @@ -232,13 +301,20 @@ slot.put("

") ui.link{ - content = _"cancel registration", + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }, + content = _"cancel", module = "index", action = "cancel_register", routing = { default = { - mode = "redirect", module = "index", view = "index" + mode = "redirect", module = "index", view = "login", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } } } end ) -end ) + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/reset_password.lua --- a/app/main/index/reset_password.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/reset_password.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,15 +1,11 @@ -execute.view{ module = "index", view = "_lang_chooser" } ui.title(_"Reset password") -ui.section( function() +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + execute.view{ module = "index", view = "_lang_chooser" } - ui.sectionHead( function() - ui.heading{ level = 1, content = _"Reset password" } - end ) - - ui.sectionRow( function() - + ui.heading{ level = 1, content = _"Forgot password?" } local secret = param.get("secret") @@ -23,39 +19,57 @@ module = "index", action = "reset_password", routing = { - ok = { + default = { mode = "redirect", module = "index", - view = "index" + view = "login", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } }, content = function() - ui.field.text{ - label = _"login name", - name = "login" + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-login__username", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-login__username" }, + label = _'Login name', + name = 'login', + value = '' } + slot.put("
") - ui.container { attr = { class = "actions" }, content = function() - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", value = _"Request password reset link" - }, - content = "" + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }, + module = "index", view = "login", text = _"Cancel", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") } - slot.put("

") - ui.link{ module = "index", view = "send_login", text = _"Forgot login name?" } - slot.put("  ") - ui.link{ - content = function() - slot.put(_"Cancel") - end, - module = "index", - view = "login" - } - end } + } + slot.put("

") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "index", view = "send_login", text = _"Forgot login name?", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } end } @@ -120,5 +134,5 @@ } end - end ) -end ) \ No newline at end of file + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/search.lua --- a/app/main/index/search.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/search.lua Sun Jul 15 14:07:29 2018 +0200 @@ -94,7 +94,7 @@ if count > 0 then execute.view{ module = "issue", - view = "_list2", + view = "_list", params = { search = search_string, no_filter = true diff -r 7ea154c9238a -r 32cc544d5a5b app/main/index/send_login.lua --- a/app/main/index/send_login.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/index/send_login.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,54 +1,63 @@ ui.title(_"Recover login name") -ui.section( function() +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + execute.view{ module = "index", view = "_lang_chooser" } - ui.sectionHead( function() - ui.heading{ level = 1, content = _"Request email with login name" } - end ) - - ui.sectionRow( function() + ui.heading{ level = 1, content = _"Forgot login name?" } ui.tag{ tag = 'p', content = _'Please enter your email address. You will receive an email with your login name.' } + ui.form{ attr = { class = "vertical" }, module = "index", action = "send_login", routing = { - ok = { + default = { mode = "redirect", module = "index", - view = "index" + view = "login", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } } }, content = function() - ui.field.text{ - label = _"Email address", - name = "email" + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-login__username", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-login__username" }, + label = _'Email address', + name = 'email', + value = '' } + slot.put("
") - ui.container { attr = { class = "actions" }, content = function() - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", + slot.put("

") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", value = _"Request email with login name" - }, - content = "" } - slot.put("

") - ui.link{ - content = function() - slot.put(_"Cancel") - end, - module = "index", - view = "login" - } - end } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }, + module = "index", view = "login", text = _"Cancel", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } end } - end ) -end ) \ No newline at end of file + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/add_initiator.lua --- a/app/main/initiative/_action/add_initiator.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/add_initiator.lua Sun Jul 15 14:07:29 2018 +0200 @@ -8,7 +8,7 @@ local initiator = Initiator:by_pk(initiative.id, app.session.member.id) if not initiator or initiator.accepted ~= true then - error("access denied") + return execute.view { module = "index", view = "403" } end -- TODO important m1 selectors returning result _SET_! diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/add_support.lua --- a/app/main/initiative/_action/add_support.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/add_support.lua Sun Jul 15 14:07:29 2018 +0200 @@ -7,7 +7,7 @@ local issue = initiative:get_reference_selector("issue"):for_share():single_object_mode():exec() if not app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end if issue.closed then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/create.lua --- a/app/main/initiative/_action/create.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/create.lua Sun Jul 15 14:07:29 2018 +0200 @@ -25,7 +25,7 @@ end if not app.session.member:has_voting_right_for_unit_id(area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end local policy_id = param.get("policy_id", atom.integer) @@ -44,15 +44,15 @@ return false end if policy.polling and not app.session.member:has_polling_right_for_unit_id(area.unit_id) then - error("no polling right for this unit") + return execute.view { module = "index", view = "403" } end - if not area:get_reference_selector("allowed_policies") :add_where{ "policy.id = ?", policy_id } :optional_object_mode() :exec() then - error("policy not allowed") + slot.put_into("error", "policy not allowed") + return false end end @@ -82,22 +82,6 @@ return false end -local formatting_engine -if config.enforce_formatting_engine then - formatting_engine = config.enforce_formatting_engine -else - formatting_engine = param.get("formatting_engine") - local formatting_engine_valid = false - for i, fe in ipairs(config.formatting_engines) do - if formatting_engine == fe.id then - formatting_engine_valid = true - end - end - if not formatting_engine_valid then - error("invalid formatting engine!") - end -end - local timing if not issue and policy.free_timeable then local free_timing_string = util.trim(param.get("free_timing")) @@ -109,7 +93,8 @@ if config.free_timing and config.free_timing.available_func then available_timings = config.free_timing.available_func(policy) if available_timings == false then - error("error in free timing config") + slot.put_into("error", "error in free timing config") + return false end end if available_timings then @@ -126,10 +111,39 @@ end timing = config.free_timing.calculate_func(policy, free_timing_string) if not timing then - error("error in free timing config") + slot.put_into("error", "error in free timing config") + return false end end +local draft_text = param.get("draft") + +if not draft_text then + return false +end + +local draft_text = util.wysihtml_preproc(draft_text) + +local valid_html, error_message = util.html_is_safe(draft_text) +if not valid_html then + slot.put_into("error", _("Draft contains invalid formatting or character sequence: #{error_message}", { error_message = error_message }) ) + return false +end + +if config.initiative_abstract then + local abstract = param.get("abstract") + if not abstract then + return false + end + abstract = encode.html(abstract) + draft_text = abstract .. "" .. draft_text +end + +local location = param.get("location") +if location == "" then + location = nil +end + if param.get("preview") or param.get("edit") then return end @@ -177,7 +191,8 @@ local draft = Draft:new() draft.initiative_id = initiative.id draft.formatting_engine = formatting_engine -draft.content = param.get("draft") +draft.content = draft_text +draft.location = location draft.author_id = app.session.member.id draft:save() diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/reject_initiator_invitation.lua --- a/app/main/initiative/_action/reject_initiator_invitation.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/reject_initiator_invitation.lua Sun Jul 15 14:07:29 2018 +0200 @@ -13,7 +13,7 @@ end if initiator.accepted ~= nil then - error("access denied") + return execute.view { module = "index", view = "403" } end initiator.accepted = false diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/remove_initiator.lua --- a/app/main/initiative/_action/remove_initiator.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/remove_initiator.lua Sun Jul 15 14:07:29 2018 +0200 @@ -20,11 +20,11 @@ local initiator_todelete = Initiator:by_pk(initiative.id, param.get("member_id", atom.integer)) if not (initiator and initiator.accepted) and not (initiator.member_id == initiator_todelete.member_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end if initiator_todelete.accepted == false and initiator.member_id ~= initiator_todelete.member_id then - error("access denied") + return execute.view { module = "index", view = "403" } end local initiators = initiative diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_action/revoke.lua --- a/app/main/initiative/_action/revoke.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_action/revoke.lua Sun Jul 15 14:07:29 2018 +0200 @@ -2,7 +2,7 @@ local initiator = Initiator:by_pk(initiative.id, app.session.member.id) if not initiator or initiator.accepted ~= true then - error("access denied") + return execute.view { module = "index", view = "403" } end -- TODO important m1 selectors returning result _SET_! @@ -29,7 +29,7 @@ if suggested_initiative_id ~= -1 then local suggested_initiative = Initiative:by_id(suggested_initiative_id) if not suggested_initiative then - error("object not found") + return false end if initiative.id == suggested_initiative.id then slot.put_into("error", _"You can't suggest the initiative you are revoking") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_bargraph.lua --- a/app/main/initiative/_bargraph.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_bargraph.lua Sun Jul 15 14:07:29 2018 +0200 @@ -43,14 +43,17 @@ local max_value = initiative.issue.population or 0 local quorum if initiative.issue.accepted then - quorum = initiative.issue.policy.initiative_quorum_num / initiative.issue.policy.initiative_quorum_den + quorum = initiative.issue.initiative_quorum or 0 else - quorum = initiative.issue.policy.issue_quorum_num / initiative.issue.policy.issue_quorum_den + quorum = initiative.issue.issue_quorum or 0 + end + if quorum > max_value then + max_value = quorum end ui.bargraph{ max_value = max_value, width = 100, - quorum = max_value * quorum, + quorum = quorum, quorum_color = "#00F", bars = { { color = "#5a5", value = (initiative.satisfied_supporter_count or 0) }, diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_head.lua --- a/app/main/initiative/_head.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_head.lua Sun Jul 15 14:07:29 2018 +0200 @@ -19,180 +19,166 @@ local initiators = initiators_members_selector:exec() -ui.sectionHead( "initiativeInfo", function () +ui.container{ attr = { class = "mdl-card__title mdl-card--has-fab mdl-card--border" }, content = function () + + ui.heading { + attr = { class = "mdl-card__title-text" }, + level = 2, + content = function() + ui.tag{ content = initiative.display_name } + end + } - ui.heading { - level = 1, - content = initiative.display_name - } - - ui.container { attr = { class = "support" }, content = function () - if initiative.supporter_count == nil then - ui.tag { - attr = { class = "supporterCount" }, - content = _"[calculating]" + if app.session.member and app.session.member:has_voting_right_for_unit_id(initiative.issue.area.unit_id) then + if not initiative.issue.closed and not initiative.member_info.supported then + if not initiative.issue.fully_frozen then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--fab mdl-button--colored" , + style = "position: absolute; right: 20px; bottom: -27px;" + }, + module = "initiative", action = "add_support", + routing = { default = { + mode = "redirect", module = "initiative", view = "show", id = initiative.id + } }, + id = initiative.id, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + end } - elseif initiative.issue.closed == nil then - ui.tag { - attr = { class = "satisfiedSupporterCount" }, - content = _("#{count} supporter", { count = initiative.satisfied_supporter_count }) - } - if initiative.potential_supporter_count and - initiative.potential_supporter_count > 0 - then - slot.put ( " " ) - ui.tag { - attr = { class = "potentialSupporterCount" }, - content = _("(+ #{count} potential)", { count = initiative.potential_supporter_count }) + end + end + if initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.issue.member_info.direct_voted then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--fab mdl-button--colored" , + style = "position: absolute; right: 20px; bottom: -27px;" + }, + module = "vote", view = "list", + params = { issue_id = initiative.issue_id }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = config.voting_icon or "mail_outline" } + end + } + end + end +end } + +ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function () + + if not config.voting_only and app.session:has_access("authors_pseudonymous") then + for i, member in ipairs(initiators) do + if i > 1 then + slot.put(" ") + end + util.micro_avatar( member ) + end -- for i, member + end + + if member then + ui.container { attr = { class = "mySupport float-right right" }, content = function () + if initiative.issue.fully_frozen then + slot.put("
") + if initiative.issue.member_info.direct_voted then + ui.tag { content = _"You have voted" } + slot.put("
") + if not initiative.issue.closed then + ui.link { + module = "vote", view = "list", + params = { issue_id = initiative.issue.id }, + text = _"change vote" + } + else + ui.link { + module = "vote", view = "list", + params = { issue_id = initiative.issue.id }, + text = _"show vote" + } + end + slot.put(" ") + elseif active_trustee_id then + ui.tag { content = _"You have voted via delegation" } + ui.link { + content = _"Show voting ballot", + module = "vote", view = "list", params = { + issue_id = initiative.issue.id, member_id = active_trustee_id + } + } + elseif not initiative.issue.closed then + ui.link { + attr = { class = "btn btn-default" }, + module = "vote", view = "list", + params = { issue_id = initiative.issue.id }, + text = _"vote now" } end - - end - - slot.put ( "
" ) - + elseif initiative.member_info.supported then + ui.container{ content = function() + ui.tag{ content = _"You are supporter" } + slot.put(" ") + if initiative.member_info.satisfied then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + else + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + end + end } + if initiative.issue.member_info.own_participation then + ui.link { + attr = { class = "btn-link" }, + module = "initiative", action = "remove_support", + routing = { default = { + mode = "redirect", module = "initiative", view = "show", id = initiative.id + } }, + id = initiative.id, + text = _"remove my support" + } + + else + + ui.link { + module = "delegation", view = "show", params = { + issue_id = initiative.issue_id, + initiative_id = initiative.id + }, + content = _"via delegation" + } + + end + + slot.put(" ") + + end + end } + + end + + if config.initiative_abstract then + local abstract = string.match(initiative.current_draft.content, "(.+)") + if abstract then + ui.container{ + attr = { class = "abstract", style = "padding-right: 140px;" }, + content = function() slot.put(abstract) end + } + end + end + + ui.container { attr = { class = "support" }, content = function () + + if not config.voting_only then execute.view { module = "initiative", view = "_bargraph", params = { initiative = initiative } } - end } - - if member then - ui.container { attr = { class = "mySupport right" }, content = function () - if initiative.issue.fully_frozen then - if initiative.issue.member_info.direct_voted then - --ui.image { attr = { class = "icon48 right" }, static = "icons/48/voted_ok.png" } - ui.tag { content = _"You have voted" } - slot.put("
") - if not initiative.issue.closed then - ui.link { - module = "vote", view = "list", - params = { issue_id = initiative.issue.id }, - text = _"change vote" - } - else - ui.link { - module = "vote", view = "list", - params = { issue_id = initiative.issue.id }, - text = _"show vote" - } - end - slot.put(" ") - elseif active_trustee_id then - ui.tag { content = _"You have voted via delegation" } - ui.link { - content = _"Show voting ballot", - module = "vote", view = "list", params = { - issue_id = initiative.issue.id, member_id = active_trustee_id - } - } - elseif not initiative.issue.closed then - ui.link { - attr = { class = "btn btn-default" }, - module = "vote", view = "list", - params = { issue_id = initiative.issue.id }, - text = _"vote now" - } - end - elseif initiative.member_info.supported then - if initiative.member_info.satisfied then - ui.image { attr = { class = "icon48 right" }, static = "icons/32/support_satisfied.png" } - else - ui.image { attr = { class = "icon48 right" }, static = "icons/32/support_unsatisfied.png" } - end - ui.container { content = _"You are supporter" } + slot.put(" ") - if initiative.issue.member_info.own_participation then - ui.link { - attr = { class = "btn-link" }, - module = "initiative", action = "remove_support", - routing = { default = { - mode = "redirect", module = "initiative", view = "show", id = initiative.id - } }, - id = initiative.id, - text = _"remove my support" - } - - else - - ui.link { - module = "delegation", view = "show", params = { - issue_id = initiative.issue_id, - initiative_id = initiative.id - }, - content = _"via delegation" - } - - end - - slot.put(" ") - - - elseif not initiative.issue.closed then - ui.link { - attr = { class = "btn btn-default" }, - module = "initiative", action = "add_support", - routing = { default = { - mode = "redirect", module = "initiative", view = "show", id = initiative.id - } }, - id = initiative.id, - text = _"add my support" - } - - end - end } - + ui.supporter_count(initiative) end - slot.put("
") - - ui.container { - attr = { class = "initiators" }, - content = function () - - if app.session:has_access("authors_pseudonymous") then - for i, member in ipairs(initiators) do - if i > 1 then - slot.put(" ") - end - util.micro_avatar(member) - if member.accepted == nil then - slot.put ( " " ) - ui.tag { content = _"(invited)" } - end - end -- for i, member - - end - - end - } -- ui.container "initiators" + end } + +end } - ui.container { - attr = { class = "links" }, - content = function () - - local drafts_count = initiative:get_reference_selector("drafts"):count() - ui.link { - content = _("suggestions (#{count}) ↓", { - count = # ( initiative.suggestions ) - }), - external = "#suggestions" - } +execute.view { + module = "initiative", view = "_sidebar_state", + params = { initiative = initiative } +} - slot.put ( " | " ) - - ui.link{ - module = "initiative", view = "history", id = initiative.id, - content = _("draft history (#{count})", { count = drafts_count }) - } - - end - } -- ui.containers "links" - end ) - - execute.view { - module = "initiative", view = "_sidebar_state", - params = { initiative = initiative } - } - diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_list.lua --- a/app/main/initiative/_list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,7 +1,8 @@ -local member = param.get("member", "table") or app.session.member +local for_member = param.get("for_member", "table") local initiatives = param.get("initiatives", "table") -local highlight_initiative_id = param.get ( "highlight_initiative_id", "number" ) +local ommit_initiative_id = param.get ( "ommit_initiative_id", "number" ) + local for_initiative = param.get("initiative", "table") @@ -13,7 +14,7 @@ ui.tag { tag = "ul", - attr = { class = "initiatives" }, + attr = { class = "initiatives mdl-list" }, content = function () local last_group for i, initiative in ipairs(initiatives) do @@ -29,51 +30,57 @@ group = "not_admitted" end end - if not for_initiative and group ~= last_group and not for_event then + if not for_initiative and group ~= last_group and not for_event and not for_member then local text if group == "admitted" then if initiative.issue.state == "finished_with_winner" then text = _"Competing initiatives in pairwise comparison to winner:" - else + elseif initiative.issue.voter_count and initiative.issue.voter_count > 0 then text = _"Competing initiatives in pairwise comparison to best initiative:" end end - if group == "not_admitted" then + if group == "not_admitted" and initiative.issue.state ~= "canceled_no_initiative_admitted" then text = _("Competing initiatives failed the 2nd quorum (#{num}/#{den}):", { num = initiative.issue.policy.initiative_quorum_num, den = initiative.issue.policy.initiative_quorum_den } ) end if text then - slot.put("
") - ui.container { attr = { class = "result" }, content = text } + ui.tag{ tag = "li", attr = { class = "mdl-list__item" }, content = function() + ui.container{ attr = { class = "mdl-list__item-primary-content" }, content = text } + end } end last_group = group end - local class = "" - if highlight_initiative_id == initiative.id then - class = "highlighted" - end - if app.session.member then - if initiative.member_info.supported then - class = class .. " supported" - end - if initiative.member_info.satisfied then - class = class .. " satisfied" + if ommit_initiative_id ~= initiative.id then + local class = "mdl-list__item mdl-list__item--three-line" + if app.session.member then + if initiative.member_info.supported then + class = class .. " supported" + end + if initiative.member_info.satisfied then + class = class .. " satisfied" + end end + ui.tag { + tag = "li", attr = { class = class }, + content = function () + if i == 1 and not ommit_initiative_id and not for_member and ( + initiative.issue.state == "finished_with_winner" + or initiative.issue.state == "finished_without_winner" + ) then + util.initiative_pie(initiative) + end + execute.view { + module = "initiative", view = "_list_element", params = { + initiative = initiative, for_event = for_event, for_member = for_member + } + } + end + } end - ui.tag { - tag = "li", attr = { class = class }, - content = function () - execute.view { - module = "initiative", view = "_list_element", params = { - initiative = initiative, for_event = for_event - } - } - end - } end end -} \ No newline at end of file +} diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_list_element.lua --- a/app/main/initiative/_list_element.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_list_element.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,14 +1,28 @@ local initiative = param.get("initiative", "table") local for_event = param.get("for_event", atom.boolean) +local for_member = param.get("for_member", "table") local issue = initiative.issue -local class = "initiative" +if initiative.vote_grade ~= nil then + if initiative.vote_grade > 0 then + local text = _"voted yes" + ui.container{ attr = { class = "mdl-list__item-avatar positive" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons", title = text }, content = "thumb_up" } + end } + elseif initiative.vote_grade == 0 then + elseif initiative.vote_grade < 0 then + local text = _"voted no" + ui.container{ attr = { class = "mdl-list__item-avatar negative" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons", title = text }, content = "thumb_down" } + end } + end +end +local class = "initiative mdl-list__item-primary-content" if initiative.rank == 1 then class = class .. " rank1" end - if initiative.revoked then class = class .. " revoked" end @@ -16,88 +30,112 @@ ui.container{ attr = { class = class }, content = function () - if initiative.rank ~= 1 and not for_event then - execute.view { - module = "initiative", view = "_bargraph", params = { - initiative = initiative, - battled_initiative = issue.initiatives[1] - } - } - slot.put(" ") - end - ui.tag { + ui.container { attr = { class = "initiative_name" }, content = function() + if not for_member and app.session.member then + if initiative.member_info.supported then + if initiative.member_info.satisfied then + ui.tag{ tag = "i", attr = { id = "lf-initiative__support-" .. initiative.id, class = "material-icons material-icons-small" }, content = "thumb_up" } + --ui.container { attr = { class = "mdl-tooltip", ["for"] = "lf-initiative__support-" .. initiative.id }, content = _"You are supporter of this initiative" } + else + ui.tag{ tag = "i", attr = { id = "lf-initiative__support-" .. initiative.id, class = "material-icons material-icons-small mdl-color-text--orange-500" }, content = "thumb_up" } + --ui.container { attr = { class = "mdl-tooltip", ["for"] = "lf-initiative__support-" .. initiative.id }, content = _"supporter with restricting suggestions" } + end + slot.put(" ") + end + end ui.link { text = initiative.display_name, module = "initiative", view = "show", id = initiative.id } - slot.put(" ") - if initiative.vote_grade ~= nil then - if initiative.vote_grade > 0 then - local text = _"voted yes" - ui.image { attr = { class = "icon16", title = text, alt = text }, static = "icons/32/support_satisfied.png" } - elseif initiative.vote_grade == 0 then - elseif initiative.vote_grade < 0 then - local text = _"voted no" - ui.image { attr = { class = "icon16", title = text, alt = text }, static = "icons/32/voted_no.png" } + end + } + ui.container{ attr = { class = "mdl-list__item-text-body" }, content = function() + local draft_content = initiative.current_draft.content + if config.initiative_abstract then + local abstract = string.match(draft_content, "(.+)") + if abstract then + slot.put(abstract) + end + end + if not config.voting_only then + if app.session:has_access("authors_pseudonymous") then + local initiator_members = initiative:get_reference_selector("initiating_members") + :add_field("initiator.accepted", "accepted") + :add_order_by("member.name") + :add_where("initiator.accepted") + :exec() + + local initiators = {} + for i, member in ipairs(initiator_members) do + if member.accepted then + initiators[#initiators+1] = member.name + end end - elseif app.session.member then - if initiative.member_info.supported then - if initiative.member_info.satisfied then - local text = _"supporter" - ui.image { attr = { class = "icon16", title = text, alt = text }, static = "icons/32/support_satisfied.png" } - else - local text = _"supporter with restricting suggestions" - ui.image { attr = { class = "icon16", title = text, alt = text }, static = "icons/32/support_unsatisfied.png" } - end - end + ui.tag{ content = _"by" } + slot.put(" ") + ui.tag{ content = table.concat(initiators, ", ") } + slot.put("
") end end - } + if initiative.rank ~= 1 and (issue.voter_count == nil or issue.voter_count > 0) and not for_event then + if not config.voting_only or issue.closed then + execute.view { + module = "initiative", view = "_bargraph", params = { + initiative = initiative, + battled_initiative = issue.initiatives[1] + } + } + + slot.put("   ") + + ui.supporter_count(initiative) + end + end + + if initiative.positive_votes ~= nil then + + local result_text + + if issue.voter_count == 0 then + result_text = _("No votes (0)", { result = result }) + + elseif initiative.rank == 1 and not for_event then + local result = "" + if initiative.eligible then + result = _("Reached #{sign}#{num}/#{den}", { + sign = issue.policy.direct_majority_strict and ">" or "≥", + num = issue.policy.direct_majority_num, + den = issue.policy.direct_majority_den + }) + else + result = _("Failed #{sign}#{num}/#{den}", { + sign = issue.policy.direct_majority_strict and ">" or "≥", + num = issue.policy.direct_majority_num, + den = issue.policy.direct_majority_den + }) + end + local neutral_count = issue.voter_count - initiative.positive_votes - initiative.negative_votes + + result_text = _("#{result}: #{yes_count} Yes (#{yes_percent}), #{no_count} No (#{no_percent}), #{neutral_count} Abstention (#{neutral_percent})", { + result = result, + yes_count = initiative.positive_votes, + yes_percent = format.percent_floor(initiative.positive_votes, issue.voter_count), + neutral_count = neutral_count, + neutral_percent = format.percent_floor(neutral_count, issue.voter_count), + no_count = initiative.negative_votes, + no_percent = format.percent_floor(initiative.negative_votes, issue.voter_count) + }) + + end + + ui.container { attr = { class = "result" }, content = result_text } + + end + + end } end } -if initiative.rank == 1 - and issue.voter_count - and initiative.positive_votes ~= nil - and initiative.negative_votes ~= nil - and not for_event -then - local result = "" - if initiative.eligible then - result = _("Reached #{sign}#{num}/#{den}", { - sign = issue.policy.direct_majority_strict and ">" or "≥", - num = issue.policy.direct_majority_num, - den = issue.policy.direct_majority_den - }) - else - result = _("Failed #{sign}#{num}/#{den}", { - sign = issue.policy.direct_majority_strict and ">" or "≥", - num = issue.policy.direct_majority_num, - den = issue.policy.direct_majority_den - }) - end - local neutral_count = issue.voter_count - initiative.positive_votes - initiative.negative_votes - - local result_text - - if issue.voter_count > 0 then - result_text = _("#{result}: #{yes_count} Yes (#{yes_percent}), #{no_count} No (#{no_percent}), #{neutral_count} Abstention (#{neutral_percent})", { - result = result, - yes_count = initiative.positive_votes, - yes_percent = format.percent_floor(initiative.positive_votes, issue.voter_count), - neutral_count = neutral_count, - neutral_percent = format.percent_floor(neutral_count, issue.voter_count), - no_count = initiative.negative_votes, - no_percent = format.percent_floor(initiative.negative_votes, issue.voter_count) - }) - else - result_text = _("#{result}: No votes (0)", { result = result }) - end - - ui.container { attr = { class = "result" }, content = result_text } - -end - diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_sidebar_history.lua --- a/app/main/initiative/_sidebar_history.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_sidebar_history.lua Sun Jul 15 14:07:29 2018 +0200 @@ -7,7 +7,7 @@ ui.heading { level = 1, content = _"History" } end ) execute.view { - module = "issue", view = "_list2", params = { + module = "issue", view = "_list", params = { for_initiative = initiative, for_sidebar = true } } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_sidebar_state.lua --- a/app/main/initiative/_sidebar_state.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/_sidebar_state.lua Sun Jul 15 14:07:29 2018 +0200 @@ -15,6 +15,9 @@ negative_votes - positive_votes local head_text + + util.initiative_pie( initiative ) + if initiative.winner then head_text = _"Approved" elseif initiative.rank then @@ -23,8 +26,6 @@ head_text = _"Rejected" end - util.initiative_pie( initiative ) - ui.heading { level = 1, content = head_text } ui.tag { tag = "table", content = function () @@ -38,6 +39,16 @@ } ui.tag { tag = "th", content = _"Yes" } end } + ui.tag { tag = "tr", attr = { class = "no" }, content = function () + ui.tag { tag = "td", content = + tostring(negative_votes) + } + ui.tag { tag = "th", content = _"No" } + ui.tag { tag = "td", content = + format.percent_floor(negative_votes, max_value) + } + ui.tag { tag = "th", content = _"No" } + end } ui.tag { tag = "tr", attr = { class = "abstention" }, content = function () ui.tag { tag = "td", content = tostring(abstention_votes) @@ -48,16 +59,6 @@ } ui.tag { tag = "th", content = _"Abstention" } end } - ui.tag { tag = "tr", attr = { class = "no" }, content = function () - ui.tag { tag = "td", content = - tostring(negative_votes) - } - ui.tag { tag = "th", content = _"No" } - ui.tag { tag = "td", content = - format.percent_floor(negative_votes, max_value) - } - ui.tag { tag = "th", content = _"No" } - end } end } end } @@ -108,4 +109,4 @@ end } end - \ No newline at end of file + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/_suggestions.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/initiative/_suggestions.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,358 @@ +local initiative = param.get("initiative", "table") +local direct_supporter +if app.session.member_id then + direct_supporter = initiative.issue.member_info.own_participation and initiative.member_info.supported +end + + +ui.link { attr = { name = "suggestions" }, text = "" } + + +ui.container { + attr = { class = "section suggestions" }, + content = function () + + if # ( initiative.suggestions ) > 0 then + + ui.heading { + level = 1, + content = _("Suggestions for improvement (#{count})", { count = # ( initiative.suggestions ) } ) + } + ui.container { content = _"written and rated by the supportes of this initiative to improve the proposal and its reasons" } + slot.put("
") + + for i, suggestion in ipairs(initiative.suggestions) do + + local opinion = Opinion:by_pk(app.session.member_id, suggestion.id) + + local class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp not-folded" + if suggestion.id == param.get("suggestion_id", atom.number) then + class = class .. " highlighted" + end + if member and not initiative.issue.fully_frozen and not initiative.issue.closed and initiative.member_info.supported then + class = class .. " rateable" + end + + ui.link { attr = { name = "s" .. suggestion.id }, text = "" } + ui.tag { tag = "div", attr = { class = class, id = "s" .. suggestion.id }, content = function () + ui.tag{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { level = 2, + attr = { class = "mdl-card__title-text" }, + content = format.string(suggestion.name, { + truncate_at = 160, truncate_suffix = true + }) } + + if opinion then + + ui.container { attr = { class = "mdl-card__content"}, content = function() + local class = "" + local text = "" + + if opinion.degree == 2 then + class = "must" + text = _"must" + elseif opinion.degree == 1 then + class = "should" + text = _"should" + elseif opinion.degree == 0 then + class = "neutral" + text = _"neutral" + elseif opinion.degree == -1 then + class = "shouldnot" + text = _"should not" + elseif opinion.degree == -2 then + class = "mustnot" + text = _"must not" + end + + ui.tag { + attr = { class = class }, + content = text + } + + slot.put ( " " ) + + if + (opinion.degree > 0 and not opinion.fulfilled) + or (opinion.degree < 0 and opinion.fulfilled) + then + ui.tag{ content = _"but" } + else + ui.tag{ content = _"and" } + end + + slot.put ( " " ) + + local class = "" + local text = "" + + if opinion.fulfilled then + class = "implemented" + text = _"is implemented" + else + class = "notimplemented" + text = _"is not implemented" + end + + ui.tag { + attr = { class = class }, + content = text + } + + if + (opinion.degree > 0 and not opinion.fulfilled) + or (opinion.degree < 0 and opinion.fulfilled) + then + if math.abs(opinion.degree) > 1 then + slot.put(" !!") + else + slot.put(" !") + end + else + slot.put(" ✓") + end + + end } + + end + + end } + + ui.container{ attr = { class = "suggestion-content" }, content = function() + + local plus2 = (suggestion.plus2_unfulfilled_count or 0) + + (suggestion.plus2_fulfilled_count or 0) + local plus1 = (suggestion.plus1_unfulfilled_count or 0) + + (suggestion.plus1_fulfilled_count or 0) + local minus1 = (suggestion.minus1_unfulfilled_count or 0) + + (suggestion.minus1_fulfilled_count or 0) + local minus2 = (suggestion.minus2_unfulfilled_count or 0) + + (suggestion.minus2_fulfilled_count or 0) + + local with_opinion = plus2 + plus1 + minus1 + minus2 + + local neutral = (suggestion.initiative.supporter_count or 0) + - with_opinion + + local neutral2 = with_opinion + - (suggestion.plus2_fulfilled_count or 0) + - (suggestion.plus1_fulfilled_count or 0) + - (suggestion.minus1_fulfilled_count or 0) + - (suggestion.minus2_fulfilled_count or 0) + + ui.container { + attr = { class = "mdl-card__content mdl-card--border suggestionInfo" }, + content = function () + + if app.session:has_access("authors_pseudonymous") then + util.micro_avatar ( suggestion.author ) + end + + if with_opinion > 0 then + ui.container { attr = { class = "suggestion-rating" }, content = function () + ui.tag { content = _"collective rating:" } + slot.put(" ") + ui.bargraph{ + max_value = suggestion.initiative.supporter_count, + width = 100, + bars = { + { color = "#0a0", value = plus2 }, + { color = "#8a8", value = plus1 }, + { color = "#eee", value = neutral }, + { color = "#a88", value = minus1 }, + { color = "#a00", value = minus2 }, + } + } + slot.put(" | ") + ui.tag { content = _"implemented:" } + slot.put ( " " ) + ui.bargraph{ + max_value = with_opinion, + width = 100, + bars = { + { color = "#0a0", value = suggestion.plus2_fulfilled_count }, + { color = "#8a8", value = suggestion.plus1_fulfilled_count }, + { color = "#eee", value = neutral2 }, + { color = "#a88", value = suggestion.minus1_fulfilled_count }, + { color = "#a00", value = suggestion.minus2_fulfilled_count }, + } + } + end } + end + + end + } + + ui.container { + attr = { class = "mdl-card__content mdl-card--border suggestion-text draft" }, + content = function () + slot.put ( suggestion:get_content( "html" ) ) + + end + } + + if direct_supporter then + ui.container{ attr = { class = "mdl-card__content rating" }, content = function () + + if not opinion then + opinion = {} + end + ui.form { + module = "opinion", action = "update", params = { + suggestion_id = suggestion.id + }, + routing = { default = { + mode = "redirect", + module = "initiative", view = "show", id = suggestion.initiative_id, + params = { suggestion_id = suggestion.id }, + anchor = "s" .. suggestion.id -- TODO webmcp + } }, + content = function () + + ui.container{ attr = { class = "opinon-question" }, content = _"Should the initiator implement this suggestion?" } + ui.container { content = function () + + local options = { + { degree = 2, label = _"must" }, + { degree = 1, label = _"should" }, + { degree = 0, label = _"neutral" }, + { degree = -1, label = _"should not" }, + { degree = -2, label = _"must not" }, + } + + for i, option in ipairs(options) do + local active = opinion.degree == option.degree + ui.tag{ + tag = "label", + attr = { class = "mdl-radio mdl-js-radio mdl-js-ripple-effect" }, + ["for"] = "s" .. suggestion.id .. "_degree" .. option.degree, + content = function() + ui.tag{ + tag = "input", + attr = { + class = "mdl-radio__button", + type = "radio", + name = "degree", + value = option.degree, + id = "s" .. suggestion.id .. "_degree" .. option.degree, + checked = active and "checked" or nil + } + } + ui.tag{ + attr = { class = "mdl-radio__label" }, + content = option.label + } + end + } + slot.put("     ") + end + end } + + slot.put("
") + + ui.container{ attr = { class = "opinon-question" }, content = _"Did the initiator implement this suggestion?" } + ui.container { content = function () + + local options = { + { degree = "false", id = "notfulfilled", label = _"No (not yet)" }, + { degree = "true", id = "fulfilled", label = _"Yes, it's implemented" }, + } + + for i, option in ipairs(options) do + local active = opinion.fulfilled == (option.degree == "true" and true or false) + ui.tag{ + tag = "label", + attr = { class = "mdl-radio mdl-js-radio mdl-js-ripple-effect" }, + ["for"] = "s" .. suggestion.id .. "_" .. option.id, + content = function() + ui.tag{ + tag = "input", + attr = { + class = "mdl-radio__button", + type = "radio", + name = "fulfilled", + value = option.degree, + id = "s" .. suggestion.id .. "_" .. option.id, + checked = active and "checked" or nil + } + } + ui.tag{ + attr = { class = "mdl-radio__label" }, + content = option.label + } + end + } + slot.put("     ") + end + end } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"publish my rating" + }, + content = "" + } + + end + } + + end } + end + + end } + + ui.container { attr = { class = "rating-button" }, content = function() + + local text = _"Read more" + + if direct_supporter then + text = text .. " / " .. _"Rate suggestion" + end + + ui.link { + attr = { + class = "mdl-button mdl-js-button suggestion-more", + onclick = "document.querySelector('#s" .. suggestion.id .. "').classList.remove('folded');document.querySelector('#s" .. suggestion.id .. "').classList.add('unfolded'); return false;" + }, + text = text + } + + ui.link { + attr = { + class = "mdl-button suggestion-less", + onclick = "document.querySelector('#s" .. suggestion.id .. "').classList.add('folded');document.querySelector('#s" .. suggestion.id .. "').classList.remove('unfolded'); return false;" + }, + text = _"Show less" + } + --[[ + ui.link{ + attr = { class = "mdl-button" }, + content = _"Details", + module = "suggestion", view = "show", id = suggestion.id + } + --]] + end } + ui.script{ script = [[ + window.addEventListener("load", function() { + var textEl = document.querySelector('#s]] .. suggestion.id .. [[ .suggestion-content'); + var height = textEl.clientHeight; + if (height > 180) { + document.querySelector('#s]] .. suggestion.id .. [[').classList.add('folded'); + document.querySelector('#s]] .. suggestion.id .. [[ .rating-button').classList.add('mdl-card__actions'); + document.querySelector('#s]] .. suggestion.id .. [[ .rating-button').classList.add('mdl-card--border'); + } + }); + ]] } + + end } + + end -- for i, suggestion + + end -- if #initiative.suggestions > 0 + end +} diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/history.lua --- a/app/main/initiative/history.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/history.lua Sun Jul 15 14:07:29 2018 +0200 @@ -4,125 +4,127 @@ initiative.issue:load_everything_for_member_id(app.session.member_id) -execute.view{ module = "issue", view = "_sidebar_state", params = { - initiative = initiative -} } +ui.grid{ content = function() -execute.view { - module = "issue", view = "_sidebar_issue", - params = { - issue = initiative.issue, - highlight_initiative_id = initiative.id - } -} - -execute.view { - module = "issue", view = "_sidebar_whatcanido", - params = { initiative = initiative } -} - -execute.view { - module = "issue", view = "_sidebar_members", params = { - issue = initiative.issue, initiative = initiative - } -} + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() - - -execute.view { - module = "issue", view = "_head", params = { - issue = initiative.issue - } -} - -ui.form{ - method = "get", - module = "draft", - view = "diff", - attr = { class = "section" }, - content = function() - ui.field.hidden{ name = "initiative_id", value = initiative.id } - - ui.sectionHead( function() - ui.link{ - module = "initiative", view = "show", id = initiative.id, - content = function () - ui.heading { - level = 1, - content = initiative.display_name + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function () + ui.heading { + attr = { class = "mdl-card__title-text" }, + content = function() + ui.link{ + module = "initiative", view = "show", id = initiative.id, + content = initiative.display_name + } + end + } + ui.container { content = _"Draft history" } + end } + + ui.container { + attr = { class = "mdl-card__content" }, + content = function() + ui.form{ + method = "get", + module = "draft", + view = "diff", + attr = { class = "section" }, + content = function() + ui.field.hidden{ name = "initiative_id", value = initiative.id } + + ui.sectionRow( function() + + local columns = { + { + label = _"draft ID", + content = function(record) + ui.tag { content = record.id } + end + }, + { + label = _"published at", + content = function(record) + ui.link{ + attr = { class = "action" }, + module = "draft", view = "show", id = record.id, + text = format.timestamp(record.created) + } + end + }, + { + label = _"compare", + content = function(record) + slot.put('') + slot.put('') + --lot.put('') + end + } + } + + if app.session:has_access("authors_pseudonymous") then + columns[#columns+1] = { + label = _"author", + content = function(record) + if record.author then + return util.micro_avatar ( record.author ) + end + end + } + end + + if config.render_external_reference and config.render_external_reference.draft then + columns[#columns+1] = { + label = _"external reference", + content = function(draft) + config.render_external_reference.draft(draft, function (callback) + callback() + end) + end + } + end + + ui.list{ + records = initiative.drafts, + columns = columns + } + + slot.put("
") + ui.container { attr = { class = "actions" }, content = function() + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"compare revisions" + }, + content = "" + } + end } + end ) + end } end } - ui.heading { level = 2, content = _"Draft history" } - end) - - ui.sectionRow( function() - - local columns = { - { - label = _"draft ID", - content = function(record) - ui.tag { content = record.id } - end - }, - { - label = _"published at", - content = function(record) - ui.link{ - attr = { class = "action" }, - module = "draft", view = "show", id = record.id, - text = format.timestamp(record.created) - } - end - }, - { - label = _"compare", - content = function(record) - slot.put('') - slot.put('') - end - } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view{ module = "issue", view = "_sidebar", params = { + initiative = initiative, + issue = initiative.issue + } } + + execute.view { + module = "issue", view = "_sidebar_whatcanido", + params = { initiative = initiative } + } + + execute.view { + module = "issue", view = "_sidebar_members", params = { + issue = initiative.issue, initiative = initiative } - - if app.session:has_access("authors_pseudonymous") then - columns[#columns+1] = { - label = _"author", - content = function(record) - if record.author then - return util.micro_avatar ( record.author ) - end - end - } - end - - if config.render_external_reference and config.render_external_reference.draft then - columns[#columns+1] = { - label = _"external reference", - content = function(draft) - config.render_external_reference.draft(draft, function (callback) - callback() - end) - end - } - end - - ui.list{ - records = initiative.drafts, - columns = columns - } - - slot.put("
") - ui.container { attr = { class = "actions" }, content = function() - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"compare revisions" - }, - content = "" - } - end } - end ) - end -} + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/new.lua --- a/app/main/initiative/new.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/new.lua Sun Jul 15 14:07:29 2018 +0200 @@ -33,29 +33,21 @@ module = "issue", view = "_head", params = { issue = issue, member = app.session.member } } - execute.view { - module = "issue", view = "_sidebar_state", - params = { - issue = issue - } - } - execute.view { - module = "issue", view = "_sidebar_issue", - params = { - issue = issue - } - } else + --[[ execute.view { module = "area", view = "_head", params = { area = area, member = app.session.member } } + --]] + --[[ execute.view { module = "initiative", view = "_sidebar_policies", params = { area = area, } } + --]] end ui.form{ @@ -67,216 +59,221 @@ }, attr = { class = "vertical" }, content = function() - - if preview then - ui.section( function() - ui.sectionHead( function() - ui.heading{ level = 1, content = encode.html(param.get("name")) } - if not issue then - ui.container { content = policy.name } - end - if param.get("free_timing") then - ui.container { content = param.get("free_timing") } - end - slot.put("
") - - ui.field.hidden{ name = "formatting_engine", value = param.get("formatting_engine") } - ui.field.hidden{ name = "policy_id", value = param.get("policy_id") } - ui.field.hidden{ name = "name", value = param.get("name") } - ui.field.hidden{ name = "draft", value = param.get("draft") } - ui.field.hidden{ name = "free_timing", value = param.get("free_timing") } - ui.field.hidden{ name = "polling", value = param.get("polling", atom.boolean) } - local formatting_engine - if config.enforce_formatting_engine then - formatting_engine = config.enforce_formatting_engine - else - formatting_engine = param.get("formatting_engine") - end - ui.container{ - attr = { class = "draft" }, - content = function() - slot.put(format.wiki_text(param.get("draft"), formatting_engine)) - end - } - slot.put("
") - - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _'Publish now' - }, - content = "" - } - slot.put("
") - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "edit", - class = "btn-link", - value = _'Edit again' - }, - content = "" - } - slot.put(" | ") - if issue then - ui.link{ content = _"Cancel", module = "issue", view = "show", id = issue.id } - else - ui.link{ content = _"Cancel", module = "area", view = "show", id = area.id } - end - end ) - end ) - else - - - execute.view{ module = "initiative", view = "_sidebar_wikisyntax" } - - ui.section( function() - if preview then - ui.sectionHead( function() - ui.heading { level = 1, content = _"Edit again" } - end ) - elseif issue_id then - ui.sectionHead( function() - ui.heading { level = 1, content = _"Add a new competing initiative to issue" } - end ) - else - ui.sectionHead( function() - ui.heading { level = 1, content = _"Create a new issue" } - end ) - end - - ui.sectionRow( function() - if not preview and not issue_id then - ui.container { attr = { class = "section" }, content = _"Before creating a new issue, please check any existant issues before, if the topic is already in discussion." } - slot.put("
") - end - if not issue_id then - local tmp = { { id = -1, name = "" } } - for i, allowed_policy in ipairs(area.allowed_policies) do - if not allowed_policy.polling or app.session.member:has_polling_right_for_unit_id(area.unit_id) then - tmp[#tmp+1] = allowed_policy - end + ui.grid{ content = function() + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + if preview then + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Preview" } + elseif issue_id then + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"New competing initiative" } + else + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Create a new issue" } end - ui.heading{ level = 2, content = _"Please choose a policy for the new issue:" } - ui.field.select{ - name = "policy_id", - foreign_records = tmp, - foreign_id = "id", - foreign_name = "name", - value = param.get("policy_id", atom.integer) or area.default_policy and area.default_policy.id - } - if policy and policy.free_timeable then - local available_timings - if config.free_timing and config.free_timing.available_func then - available_timings = config.free_timing.available_func(policy) - if available_timings == false then - error("error in free timing config") - end - end - ui.heading{ level = 4, content = _"Free timing:" } - if available_timings then - ui.field.select{ - name = "free_timing", - foreign_records = available_timings, - foreign_id = "id", - foreign_name = "name", - value = param.get("free_timing") - } - else - ui.field.text{ - name = "free_timing", - value = param.get("free_timing") - } - end - end - end + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() - if issue and issue.policy.polling and app.session.member:has_polling_right_for_unit_id(area.unit_id) then - slot.put("
") - ui.field.boolean{ name = "polling", label = _"No admission needed", value = polling } - end - - slot.put("
") - ui.heading { level = 2, content = _"Enter a title for your initiative (max. 140 chars):" } - ui.field.text{ - attr = { style = "width: 100%;" }, - name = "name", - value = param.get("name") - } - ui.container { content = _"The title is the figurehead of your iniative. It should be short but meaningful! As others identifies your initiative by this title, you cannot change it later!" } - if not config.enforce_formatting_engine then - slot.put("
") - ui.heading { level = 4, content = _"Choose a formatting engine:" } - ui.field.select{ - name = "formatting_engine", - foreign_records = config.formatting_engines, - attr = {id = "formatting_engine"}, - foreign_id = "id", - foreign_name = "name", - value = param.get("formatting_engine") - } - end - slot.put("
") + if preview then + + ui.section( function() + ui.sectionHead( function() + ui.heading{ level = 1, content = encode.html(param.get("name")) } + if not issue then + ui.container { content = policy.name } + end + if param.get("free_timing") then + ui.container { content = param.get("free_timing") } + end + slot.put("
") + + local draft_text = param.get("draft") + local draft_text = util.wysihtml_preproc(draft_text) - ui.heading { level = 2, content = _"Enter your proposal and/or reasons:" } - ui.field.text{ - name = "draft", - multiline = true, - attr = { style = "height: 50ex; width: 100%;" }, - value = param.get("draft") or config.draft_template or [[ -Proposal -====== - -Replace me with your proposal. - - -Reasons -====== - -Argument 1 ------- - -Replace me with your first argument - + ui.field.hidden{ name = "policy_id", value = param.get("policy_id") } + ui.field.hidden{ name = "name", value = param.get("name") } + if config.initiative_abstract then + ui.field.hidden{ name = "abstract", value = param.get("abstract") } + ui.container{ + attr = { class = "abstract" }, + content = param.get("abstract") + } + slot.put("
") + end + ui.field.hidden{ name = "draft", value = draft_text } + ui.field.hidden{ name = "free_timing", value = param.get("free_timing") } + ui.field.hidden{ name = "polling", value = param.get("polling", atom.boolean) } + ui.field.hidden{ name = "location", value = param.get("location") } + local formatting_engine + if config.enforce_formatting_engine then + formatting_engine = config.enforce_formatting_engine + else + formatting_engine = param.get("formatting_engine") + end + ui.container{ + attr = { class = "draft" }, + content = function() + slot.put(draft_text) + end + } + slot.put("
") -Argument 2 ------- - -Replace me with your second argument + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored", + value = _'Publish now' + }, + content = "" + } + slot.put("   ") + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "edit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect", + value = _'Edit again' + }, + content = "" + } + slot.put("   ") + local class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" + if issue then + ui.link{ content = _"Cancel", module = "issue", view = "show", id = issue.id, attr = { class = class } } + else + ui.link{ content = _"Cancel", module = "index", view = "index", params = { unit = area.unit_id, area = area.id }, attr = { class = class } } + end + end ) + end ) + else + + ui.sectionRow( function() + --[[ + if not preview and not issue_id then + ui.container { attr = { class = "section" }, content = _"Before creating a new issue, please check any existant issues before, if the topic is already in discussion." } + slot.put("
") + end + --]] + if not issue_id then + local tmp = { { id = -1, name = "" } } + for i, allowed_policy in ipairs(area.allowed_policies) do + if not allowed_policy.polling or app.session.member:has_polling_right_for_unit_id(area.unit_id) then + tmp[#tmp+1] = allowed_policy + end + end + ui.container{ content = _"Please choose a policy for the new issue:" } + ui.field.select{ + name = "policy_id", + foreign_records = tmp, + foreign_id = "id", + foreign_name = "name", + value = param.get("policy_id", atom.integer) or area.default_policy and area.default_policy.id + } + if policy and policy.free_timeable then + local available_timings + if config.free_timing and config.free_timing.available_func then + available_timings = config.free_timing.available_func(policy) + if available_timings == false then + slot.put_into("error", "error in free timing config") + return false + end + end + ui.heading{ level = 4, content = _"Free timing:" } + if available_timings then + ui.field.select{ + name = "free_timing", + foreign_records = available_timings, + foreign_id = "id", + foreign_name = "name", + value = param.get("free_timing") + } + else + ui.field.text{ + name = "free_timing", + value = param.get("free_timing") + } + end + end + end -]] - } - if not issue or issue.state == "admission" or issue.state == "discussion" then - ui.container { content = _"You can change your text again anytime during admission and discussion phase" } - else - ui.container { content = _"You cannot change your text again later, because this issue is already in verfication phase!" } - end - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "preview", - class = "btn btn-default", - value = _'Preview' - }, - content = "" - } - slot.put("
") - slot.put("
") - - if issue then - ui.link{ content = _"Cancel", module = "issue", view = "show", id = issue.id } - else - ui.link{ content = _"Cancel", module = "area", view = "show", id = area.id } - end - end ) - end ) - end + if issue and issue.policy.polling and app.session.member:has_polling_right_for_unit_id(area.unit_id) then + slot.put("
") + ui.field.boolean{ name = "polling", label = _"No admission needed", value = polling } + end + + ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label mdl-card__fullwidth" }, content = function () + ui.field.text{ + attr = { id = "lf-initiative__name", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-initiative__name" }, + label = _"Title", + name = "name", + value = param.get("name") + } + end } + + if config.initiative_abstract then + ui.container { content = _"Enter abstract:" } + ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--expandable mdl-textfield__fullwidth" }, content = function() + ui.field.text{ + name = "abstract", + multiline = true, + attr = { id = "abstract", style = "height: 20ex; width: 100%;" }, + value = param.get("abstract") + } + end } + end + + ui.container { content = _"Enter your proposal and/or reasons:" } + ui.container{ attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--expandable mdl-textfield__fullwidth" }, content = function() + ui.field.wysihtml{ + name = "draft", + multiline = true, + attr = { id = "draft", style = "height: 50ex; width: 100%;" }, + value = param.get("draft") or config.draft_template + } + end } + if not issue or issue.state == "admission" or issue.state == "discussion" then + ui.container { content = _"You can change your text again anytime during admission and discussion phase" } + else + ui.container { content = _"You cannot change your text again later, because this issue is already in verfication phase!" } + end + slot.put("
") + + slot.put("
") + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "preview", + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored", + value = _'Preview' + }, + content = "" + } + slot.put("   ") + + local class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" + if issue then + + ui.link{ content = _"Cancel", module = "issue", view = "show", id = issue.id, attr = { class = class } } + else + ui.link{ content = _"Cancel", module = "index", view = "index", params = { unit = area.unit_id, area = area.id }, attr = { class = class } } + end + end ) + end + end } + end } + end } + if config.map or config.firstlife then + ui.cell_sidebar{ content = function() + ui.container{ attr = { class = "mdl-special-card map mdl-shadow--2dp" }, content = function() + ui.field.location{ name = "location", value = param.get("location") } + end } + end } + end + end } end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/remove_initiator.lua --- a/app/main/initiative/remove_initiator.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/remove_initiator.lua Sun Jul 15 14:07:29 2018 +0200 @@ -8,7 +8,7 @@ local initiator = Initiator:by_pk(initiative.id, app.session.member.id) if not initiator or initiator.accepted ~= true then - error("access denied") + return execute.view { module = "index", view = "403" } end execute.view { @@ -106,4 +106,4 @@ } end ) end -} \ No newline at end of file +} diff -r 7ea154c9238a -r 32cc544d5a5b app/main/initiative/show.lua --- a/app/main/initiative/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/initiative/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -7,6 +7,8 @@ return end +app.current_initiative = initiative + local issue_info if member then @@ -15,541 +17,173 @@ issue_info = initiative.issue.member_info end -execute.view { - module = "issue", view = "_head", - params = { - issue = initiative.issue, - initiative = initiative, - member = app.session.member - } -} - local direct_supporter if app.session.member_id then direct_supporter = initiative.issue.member_info.own_participation and initiative.member_info.supported end -ui.script { script = [[ - function showTab(tabId) { - $('.tab').hide(); - $('.main').hide(); - $('.main, .slot_extra .section').hide(); - $('.' + tabId).show(); - if (tabId == "main") $('.slot_extra .section').show(); - }; - showTab('main'); -]]} - -execute.view{ module = "issue", view = "_sidebar_state", params = { - initiative = initiative -} } - -execute.view { - module = "issue", view = "_sidebar_issue", - params = { - issue = initiative.issue, - highlight_initiative_id = initiative.id - } -} +slot.put_into("header", initiative.display_name) -execute.view { - module = "issue", view = "_sidebar_whatcanido", - params = { initiative = initiative } -} - -execute.view { - module = "issue", view = "_sidebar_members", params = { - issue = initiative.issue, initiative = initiative - } -} +execute.view{ module = "issue", view = "_head", params = { issue = initiative.issue, link_issue = true } } -ui.section( function () - execute.view{ - module = "initiative", view = "_head", params = { - initiative = initiative - } - } - - if direct_supporter and not initiative.issue.closed then - local supporter = app.session.member:get_reference_selector("supporters") - :add_where{ "initiative_id = ?", initiative.id } - :optional_object_mode() - :exec() - - if supporter then +ui.grid{ content = function() - local old_draft_id = supporter.draft_id - local new_draft_id = initiative.current_draft.id - - if old_draft_id ~= new_draft_id then - ui.sectionRow( "draft_updated_info", function () - ui.container{ - attr = { class = "info" }, - content = _"The draft of this initiative has been updated!" - } - slot.put(" ") - ui.link{ - content = _"show differences", - module = "draft", - view = "diff", - params = { - old_draft_id = old_draft_id, - new_draft_id = new_draft_id - } - } - if not initiative.revoked then - slot.put(" | ") - ui.link{ - text = _"refresh my support", - module = "initiative", - action = "add_support", - id = initiative.id, - params = { draft_id = initiative.current_draft.id }, - routing = { - default = { - mode = "redirect", - module = "initiative", - view = "show", - id = initiative.id - } - } - } - slot.put(" | ") - end - - ui.link{ - text = _"remove my support", - module = "initiative", - action = "remove_support", - id = initiative.id, - routing = { - default = { - mode = "redirect", - module = "initiative", - view = "show", - id = initiative.id - } - } - } - - end ) - end - end - end - - if config.render_external_reference and config.render_external_reference.initiative then - config.render_external_reference.initiative(initiative, function (callback) - ui.sectionRow(callback) - end) - end - - ui.sectionRow( function () - ui.container { - attr = { class = "draft" }, - content = function () - slot.put ( initiative.current_draft:get_content ( "html" ) ) - end - } - end ) - -end) - -ui.link { attr = { name = "suggestions" }, text = "" } - - -ui.container { - attr = { class = "section suggestions" }, - content = function () - - if # ( initiative.suggestions ) > 0 then - - ui.sectionHead( function () - ui.heading { - level = 1, - content = _("Suggestions for improvement (#{count})", { count = # ( initiative.suggestions ) } ) + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + execute.view{ + module = "initiative", view = "_head", params = { + initiative = initiative } - ui.container { content = _"written and rated by the supportes of this initiative to improve the proposal and its reasons" } - end ) - - for i, suggestion in ipairs(initiative.suggestions) do - - local opinion = Opinion:by_pk(app.session.member_id, suggestion.id) + } - local class = "sectionRow suggestion" - if suggestion.id == param.get("suggestion_id", atom.number) then - class = class .. " highlighted" - end - if member and not initiative.issue.fully_frozen and not initiative.issue.closed and initiative.member_info.supported then - class = class .. " rateable" - end - - - ui.tag { tag = "div", attr = { class = class, id = "s" .. suggestion.id }, content = function () + if direct_supporter and not initiative.issue.closed then + local supporter = app.session.member:get_reference_selector("supporters") + :add_where{ "initiative_id = ?", initiative.id } + :optional_object_mode() + :exec() + + if supporter then - if opinion then - - ui.container { attr = { class = "opinion"}, content = function() - local class = "" - local text = "" - - if opinion.degree == 2 then - class = "must" - text = _"must" - elseif opinion.degree == 1 then - class = "should" - text = _"should" - elseif opinion.degree == 0 then - class = "neutral" - text = _"neutral" - elseif opinion.degree == -1 then - class = "shouldnot" - text = _"should not" - elseif opinion.degree == -2 then - class = "mustnot" - text = _"must not" - end - - ui.tag { - attr = { class = class }, - content = text - } - - slot.put ( " " ) - - if - (opinion.degree > 0 and not opinion.fulfilled) - or (opinion.degree < 0 and opinion.fulfilled) - then - ui.tag{ content = _"but" } - else - ui.tag{ content = _"and" } - end - - slot.put ( " " ) - - local class = "" - local text = "" - - if opinion.fulfilled then - class = "implemented" - text = _"is implemented" - else - class = "notimplemented" - text = _"is not implemented" - end - - ui.tag { - attr = { class = class }, - content = text - } - - if - (opinion.degree > 0 and not opinion.fulfilled) - or (opinion.degree < 0 and opinion.fulfilled) - then - if math.abs(opinion.degree) > 1 then - slot.put(" !!") - else - slot.put(" !") + local old_draft_id = supporter.draft_id + local new_draft_id = initiative.current_draft.id + + if old_draft_id ~= new_draft_id then + ui.container { + attr = { class = "mdl-card__content mdl-card--no-bottom-pad mdl-card--notice" }, + content = _"The draft of this initiative has been updated!" + } + ui.container { + attr = { class = "mdl-card__actions mdl-card--action-border mdl-card--notice" }, + content = function () + if not initiative.revoked then + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + text = _"refresh my support", + module = "initiative", + action = "add_support", + id = initiative.id, + params = { draft_id = initiative.current_draft.id }, + routing = { + default = { + mode = "redirect", + module = "initiative", + view = "show", + id = initiative.id + } + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + content = _"show differences", + module = "draft", + view = "diff", + params = { + old_draft_id = old_draft_id, + new_draft_id = new_draft_id + } + } + slot.put("   ") end - else - slot.put(" ✓") - end - - end } - - end - - - ui.link { attr = { name = "s" .. suggestion.id }, text = "" } - ui.heading { level = 2, - attr = { class = "suggestionHead" }, - content = format.string(suggestion.name, { - truncate_at = 160, truncate_suffix = true - }) } - - - local plus2 = (suggestion.plus2_unfulfilled_count or 0) - + (suggestion.plus2_fulfilled_count or 0) - local plus1 = (suggestion.plus1_unfulfilled_count or 0) - + (suggestion.plus1_fulfilled_count or 0) - local minus1 = (suggestion.minus1_unfulfilled_count or 0) - + (suggestion.minus1_fulfilled_count or 0) - local minus2 = (suggestion.minus2_unfulfilled_count or 0) - + (suggestion.minus2_fulfilled_count or 0) - - local with_opinion = plus2 + plus1 + minus1 + minus2 - - local neutral = (suggestion.initiative.supporter_count or 0) - - with_opinion - - local neutral2 = with_opinion - - (suggestion.plus2_fulfilled_count or 0) - - (suggestion.plus1_fulfilled_count or 0) - - (suggestion.minus1_fulfilled_count or 0) - - (suggestion.minus2_fulfilled_count or 0) - - ui.container { - attr = { class = "suggestionInfo" }, - content = function () - - if with_opinion > 0 then - ui.container { attr = { class = "suggestion-rating" }, content = function () - ui.tag { content = _"collective rating:" } - slot.put(" ") - ui.bargraph{ - max_value = suggestion.initiative.supporter_count, - width = 100, - bars = { - { color = "#0a0", value = plus2 }, - { color = "#8a8", value = plus1 }, - { color = "#eee", value = neutral }, - { color = "#a88", value = minus1 }, - { color = "#a00", value = minus2 }, + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + text = _"remove my support", + module = "initiative", + action = "remove_support", + id = initiative.id, + routing = { + default = { + mode = "redirect", + module = "initiative", + view = "show", + id = initiative.id } } - slot.put(" | ") - ui.tag { content = _"implemented:" } - slot.put ( " " ) - ui.bargraph{ - max_value = with_opinion, - width = 100, - bars = { - { color = "#0a0", value = suggestion.plus2_fulfilled_count }, - { color = "#8a8", value = suggestion.plus1_fulfilled_count }, - { color = "#eee", value = neutral2 }, - { color = "#a88", value = suggestion.minus1_fulfilled_count }, - { color = "#a00", value = suggestion.minus2_fulfilled_count }, - } - } - end } - end - - if app.session:has_access("authors_pseudonymous") then - util.micro_avatar ( suggestion.author ) - else - slot.put("
") - end - - ui.container { - attr = { class = "suggestion-text" }, - content = function () - slot.put ( suggestion:get_content( "html" ) ) - - - if direct_supporter then - - ui.container { - attr = { class = "rating" }, - content = function () - - if not opinion then - opinion = {} - end - ui.form { - module = "opinion", action = "update", params = { - suggestion_id = suggestion.id - }, - routing = { default = { - mode = "redirect", - module = "initiative", view = "show", id = suggestion.initiative_id, - params = { suggestion_id = suggestion.id }, - anchor = "s" .. suggestion.id -- TODO webmcp - } }, - content = function () - - - ui.heading { level = 3, content = _"Should the initiator implement this suggestion?" } - ui.container { content = function () - - local active = opinion.degree == 2 - ui.tag { tag = "input", attr = { - type = "radio", name = "degree", value = 2, - id = "s" .. suggestion.id .. "_degree2", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_degree2", - class = active and "active-plus2" or nil, - }, - content = _"must" - } - - local active = opinion.degree == 1 - ui.tag { tag = "input", attr = { - type = "radio", name = "degree", value = 1, - id = "s" .. suggestion.id .. "_degree1", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_degree1", - class = active and "active-plus1" or nil, - }, - content = _"should" - } - - local active = not opinion.member_id - ui.tag { tag = "input", attr = { - type = "radio", name = "degree", value = 0, - id = "s" .. suggestion.id .. "_degree0", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_degree0", - class = active and "active-neutral" or nil, - }, - content = _"neutral" - } - - local active = opinion.degree == -1 - ui.tag { tag = "input", attr = { - type = "radio", name = "degree", value = -1, - id = "s" .. suggestion.id .. "_degree-1", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_degree-1", - class = active and "active-minus1" or nil, - }, - content = _"should not" - } - - local active = opinion.degree == -2 - ui.tag { tag = "input", attr = { - type = "radio", name = "degree", value = -2, - id = "s" .. suggestion.id .. "_degree-2", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_degree-2", - class = active and "active-minus2" or nil, - }, - content = _"must not" - } - end } - - slot.put("
") - - ui.heading { level = 3, content = _"Did the initiator implement this suggestion?" } - ui.container { content = function () - local active = opinion.fulfilled == false - ui.tag { tag = "input", attr = { - type = "radio", name = "fulfilled", value = "false", - id = "s" .. suggestion.id .. "_notfulfilled", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_notfulfilled", - class = active and "active-notfulfilled" or nil, - }, - content = _"No (not yet)" - } - - local active = opinion.fulfilled - ui.tag { tag = "input", attr = { - type = "radio", name = "fulfilled", value = "true", - id = "s" .. suggestion.id .. "_fulfilled", - checked = active and "checked" or nil - } } - ui.tag { - tag = "label", - attr = { - ["for"] = "s" .. suggestion.id .. "_fulfilled", - class = active and "active-fulfilled" or nil, - }, - content = _"Yes, it's implemented" - } - end } - slot.put("
") - - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"publish my rating" - }, - content = "" - } - - end - } - - end -- if not issue,fully_frozen or closed - } - end - - local text = _"Read more" - - if direct_supporter then - text = _"Show more and rate this" - end - - ui.link{ - attr = { class = "suggestion-details" }, - content = _"Details", - module = "suggestion", view = "show", id = suggestion.id } - ui.link { - attr = { - class = "suggestion-more", - onclick = "$('#s" .. suggestion.id .. "').removeClass('folded').addClass('unfolded'); return false;" - }, - text = text - } - - ui.link { - attr = { - class = "suggestion-less", - onclick = "$('#s" .. suggestion.id .. "').addClass('folded').removeClass('unfolded'); return false;" - }, - text = _"Show less" - } - end - } - - ui.script{ script = [[ - var textEl = $('#s]] .. suggestion.id .. [[ .suggestion-text'); - var height = textEl.height(); - if (height > 150) $('#s]] .. suggestion.id .. [[').addClass('folded'); - ]] } - + end + } + end + end + end + + if config.render_external_reference and config.render_external_reference.initiative then + config.render_external_reference.initiative(initiative, function (callback) + ui.sectionRow(callback) + end) + end + local draft_content = initiative.current_draft.content + if config.initiative_abstract then + local abstract = string.match(draft_content, "(.+)") + if abstract then + draft_content = string.match(draft_content, "(.*)") + end + end + ui.container { + attr = { class = "draft mdl-card__content mdl-card--border" }, + content = function () + if initiative.current_draft.formatting_engine == "html" or not initiative.current_draft.formatting_engine then + if config.draft_filter then + slot.put(config.draft_filter(draft_content)) + else + slot.put(draft_content) end - } -- ui.paragraph - - - - end } -- ui.tag "li" - - end -- for i, suggestion + else + slot.put ( initiative.current_draft:get_content ( "html" ) ) + end + end + } - else -- if #initiative.suggestions > 0 + local drafts_count = initiative:get_reference_selector("drafts"):count() - local text - if initiative.issue.closed then - text = _"No suggestions" - else - text = _"No suggestions yet" + if not config.voting_only then + ui.container { + attr = { class = "mdl-card__actions" }, + content = function() + ui.link{ + attr = { class = "mdl-button mdl-js-button" }, + module = "initiative", view = "history", id = initiative.id, + content = _("draft history (#{count})", { count = drafts_count }) + } + end + } end - ui.sectionHead( function() - ui.heading { level = 1, content = text } - end) - - end -- if #initiative.suggestions > 0 + + end } + + execute.view{ module = "initiative", view = "_suggestions", params = { initiative = initiative } } - end -} + end } + + ui.cell_sidebar{ content = function() + if config.logo then + config.logo() + end + execute.view { + module = "issue", view = "_sidebar", + params = { + issue = initiative.issue, + initiative = initiative, + member = app.session.member + } + } + + execute.view { + module = "issue", view = "_sidebar_whatcanido", + params = { + issue = initiative.issue, + initiative = initiative, + member = app.session.member + } + } + + execute.view { + module = "issue", view = "_sidebar_members", params = { + issue = initiative.issue, initiative = initiative + } + } + + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/interest/_action/update.lua --- a/app/main/interest/_action/update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/interest/_action/update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -5,7 +5,7 @@ local issue = Issue:new_selector():add_where{ "id = ?", issue_id }:for_share():single_object_mode():exec() if not app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end if issue.closed then @@ -25,9 +25,9 @@ if param.get("delete", atom.boolean) then if interest then interest:destroy() - slot.put_into("notice", _"Interest removed") +-- slot.put_into("notice", _"Interest removed") else - slot.put_into("notice", _"Interest already removed") +-- slot.put_into("notice", _"Interest already removed") end return end @@ -37,5 +37,5 @@ interest.issue_id = issue_id interest.member_id = app.session.member_id interest:save() - slot.put_into("notice", _"Interest updated") +-- slot.put_into("notice", _"Interest updated") end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/interest/show_incoming.lua --- a/app/main/interest/show_incoming.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/interest/show_incoming.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,34 +1,63 @@ local issue = Issue:by_id(param.get("issue_id", atom.integer)) local member = Member:by_id(param.get("member_id", atom.integer)) +if not issue or not member then + return execute.view { module = "index", view = "404" } +end + +if app.session.member_id then + issue:load_everything_for_member_id ( app.session.member_id ) +end + + local members_selector = Member:new_selector() :join("delegating_interest_snapshot", nil, "delegating_interest_snapshot.member_id = member.id") :join("issue", nil, "issue.id = delegating_interest_snapshot.issue_id") :add_where{ "delegating_interest_snapshot.issue_id = ?", issue.id } - :add_where{ "delegating_interest_snapshot.event = ?", issue.latest_snapshot_event } + :add_where{ "delegating_interest_snapshot.snapshot_id = ?", issue.latest_snapshot_id } :add_where{ "delegating_interest_snapshot.delegate_member_ids[1] = ?", member.id } :add_field{ "delegating_interest_snapshot.weight" } -execute.view{ - module = "issue", view = "_head", params = { - issue = issue - } -} +execute.view{ module = "issue", view = "_head", params = { issue = issue, link_issue = true } } -ui.section( function() - - ui.sectionHead( function() - ui.heading{ level = 1, content = _("Incoming delegations for '#{member}'", { member = member.name }) } - end) + +ui.grid{ content = function() + + ui.cell_main{ content = function() - execute.view{ - module = "member", - view = "_list", - params = { - members_selector = members_selector, - issue = issue, - trustee = member + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("Incoming delegations for '#{member}'", { member = member.name }) } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + execute.view{ + module = "member", + view = "_list", + params = { + members_selector = members_selector, + issue = issue, + trustee = member + } + } + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "issue", view = "_sidebar", + params = { + issue = issue, + member = app.session.member + } } - } -end ) \ No newline at end of file + execute.view { + module = "issue", view = "_sidebar_members", params = { + issue = issue + } + } + + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_filters.lua --- a/app/main/issue/_filters.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_filters.lua Sun Jul 15 14:07:29 2018 +0200 @@ -12,82 +12,195 @@ admission_order_field = "filter_issue_order.order_in_area" end +local filter = { class = "filter_mode", name = "mode", label = _"mode" } + +filter[#filter+1] = { + name = "issue", + label = _"issue list", + selector_modifier = function() end +} + +filter[#filter+1] = { + name = "timeline", + label = _"timeline", + selector_modifier = function() end +} + +--filters[#filters+1] = filter + if not for_issue and not for_member then - - -- mode - local filter = { class = "filter_mode", name = "mode" } + -- units - filter[#filter+1] = { - name = "issue", - label = _"issue view", - selector_modifier = function () end - } - - filter[#filter+1] = { - name = "timeline", - label = _"timeline", - selector_modifier = function ( selector ) - selector:add_order_by ( "event.occurrence DESC" ) - selector:add_order_by ( "id DESC" ) + if not config.single_unit_id then + + local units + if app.session.member then + units = app.session.member:get_reference_selector("units"):add_order_by("name"):add_where("active"):exec() + else + units = Unit:new_selector():add_where("active"):add_order_by("name"):exec() end - } - filters[#filters+1] = filter + units:load_delegation_info_once_for_member_id(app.session.member_id) - -- context + + local filter = { class = "filter_unit", name = "unit", label = _"unit" } - local filter = { class = "filter_filter", name = "filter" } - - if member and not for_unit and not for_area then filter[#filter+1] = { - name = "my_units", - label = _"in my units", - selector_modifier = function ( selector ) - selector:join ( "area", "filter_area", "filter_area.id = issue.area_id" ) - selector:join ( "privilege", "filter_privilege", { - "filter_privilege.unit_id = filter_area.unit_id AND filter_privilege.member_id = ?", member.id - }) - end + name = "all", + label = _"all units", + selector_modifier = function() end } + + for i, unit in ipairs(units) do + filter[#filter+1] = { + name = tostring(unit.id), + label = unit.name, + selector_modifier = function(selector) + selector:join("area", "__filter_area", "__filter_area.id = issue.area_id") + selector:add_where{ "__filter_area.unit_id = ?", unit.id } + end + } + + end + + filters[#filters+1] = filter + end - if member and not for_area then + -- areas + local selected_unit_id = config.single_unit_id or request.get_param{ name = "unit" } + if selected_unit_id == "all" then + selected_unit_id = nil + end + local selected_unit = Unit:by_id(selected_unit_id) + + if not config.single_area_id and selected_unit then + + local filter = { class = "filter_unit", name = "area", label = _"area" } + + filter[#filter+1] = { + name = "all", + label = _"all subject areas", + selector_modifier = function() end + } + local areas = selected_unit.areas + if config.area_reverse_order then + areas = {} + for i, area in ipairs(selected_unit.areas) do + table.insert(areas, 1, area) + end + end + + for i, area in ipairs(areas) do + if area.active then + filter[#filter+1] = { + name = tostring(area.id), + label = area.name, + selector_modifier = function(selector) + if area.unit_id == selected_unit.id then + selector:add_where{ "issue.area_id = ?", area.id } + end + end + } + end + end + + filters[#filters+1] = filter + + end + + if app.session.member_id then + + -- interest + + local filter = { class = "filter_filter", name = "filter", label = _"interest" } + filter[#filter+1] = { - name = "my_areas", - label = _"in my areas", - selector_modifier = function ( selector ) - selector:join ( "membership", "filter_membership", { - "filter_membership.area_id = issue.area_id AND filter_membership.member_id = ?", member.id - }) - end + name = "all", + label = _"all issues", + selector_modifier = function() end } + + if member and not for_unit and not for_area and not config.single_unit_id then + filter[#filter+1] = { + name = "my_units", + label = _"in my units", + selector_modifier = function ( selector ) + selector:join ( "area", "filter_area", "filter_area.id = issue.area_id" ) + selector:join ( "privilege", "filter_privilege", { + "filter_privilege.unit_id = filter_area.unit_id AND filter_privilege.member_id = ?", member.id + }) + end + } + end + + if member then + filter[#filter+1] = { + name = "my_issues", + label = _"my issues", + selector_modifier = function ( selector ) + selector:left_join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", member.id }) + selector:left_join("direct_interest_snapshot", "filter_interest_s", { "filter_interest_s.issue_id = issue.id AND filter_interest_s.member_id = ? AND filter_interest_s.snapshot_id = issue.latest_snapshot_id", member.id }) + selector:left_join("delegating_interest_snapshot", "filter_d_interest_s", { "filter_d_interest_s.issue_id = issue.id AND filter_d_interest_s.member_id = ? AND filter_d_interest_s.snapshot_id = issue.latest_snapshot_id", member.id }) + end + } + end + + if not config.voting_only then + filters[#filters+1] = filter + end + + -- my issues + + if request.get_param{ name = "filter" } == "my_issues" then + + local delegation = request.get_param{ name = "delegation" } + + local filter = { class = "filter_interest subfilter", name = "interest", label = _"delegation" } + + filter[#filter+1] = { + name = "all", + label = _"interested directly or via delegation", + selector_modifier = function ( selector ) + selector:add_where ( "filter_interest.issue_id NOTNULL OR filter_d_interest_s.issue_id NOTNULL" ) + end + } + + filter[#filter+1] = { + name = "direct", + label = _"direct interest", + selector_modifier = function ( selector ) + selector:add_where ( "filter_interest.issue_id NOTNULL" ) + end + } + + filter[#filter+1] = { + name = "via_delegation", + label = _"interest via delegation", + selector_modifier = function ( selector ) + selector:add_where ( "filter_d_interest_s.issue_id NOTNULL" ) + end + } + + filter[#filter+1] = { + name = "initiated", + label = _"initiated by me", + selector_modifier = function ( selector ) + selector:add_where ( "filter_interest.issue_id NOTNULL" ) + end + } + + filters[#filters+1] = filter + + end + end - if member then - filter[#filter+1] = { - name = "my_issues", - label = _"my issues", - selector_modifier = function ( selector ) - selector:left_join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", member.id }) - --selector:left_join("direct_interest_snapshot", "filter_interest_s", { "filter_interest_s.issue_id = issue.id AND filter_interest_s.member_id = ? AND filter_interest_s.event = issue.latest_snapshot_event", member.id }) - selector:left_join("delegating_interest_snapshot", "filter_d_interest_s", { "filter_d_interest_s.issue_id = issue.id AND filter_d_interest_s.member_id = ? AND filter_d_interest_s.event = issue.latest_snapshot_event", member.id }) - end - } - end - - filter[#filter+1] = { - name = "all", - label = _"all issues", - selector_modifier = function() end - } - - filters[#filters+1] = filter - -- phase - local filter = { name = "phase" } + local filter = { name = "phase", label = _"phase" } filter[#filter+1] = { name = "all", @@ -106,7 +219,7 @@ filter[#filter+1] = { name = "admission", - label = _"(1) Admission", + label = _"Admission", selector_modifier = function ( selector ) selector:add_where { "issue.state = ?", "admission" } if not for_events then @@ -119,7 +232,7 @@ filter[#filter+1] = { name = "discussion", - label = _"(2) Discussion", + label = _"Discussion", selector_modifier = function ( selector ) selector:add_where { "issue.state = ?", "discussion" } if not for_events then @@ -131,7 +244,7 @@ filter[#filter+1] = { name = "verification", - label = _"(3) Verification", + label = _"Verification", selector_modifier = function ( selector ) selector:add_where { "issue.state = ?", "verification" } if not for_events then @@ -143,7 +256,7 @@ filter[#filter+1] = { name = "voting", - label = _"(4) Voting", + label = _"Voting", selector_modifier = function ( selector ) selector:add_where { "issue.state = ?", "voting" } if not for_events then @@ -155,7 +268,7 @@ filter[#filter+1] = { name = "closed", - label = _"(5) Result", + label = _"Results", selector_modifier = function ( selector ) if not for_events then selector:add_where ( "issue.closed NOTNULL" ) @@ -165,57 +278,16 @@ end } - filters[#filters+1] = filter - - -- my issues - - if request.get_param{ name = "filter" } == "my_issues" then - - local delegation = request.get_param{ name = "delegation" } - - local filter = { class = "filter_interest subfilter", name = "interest" } - - filter[#filter+1] = { - name = "all", - label = _"interested directly or via delegation", - selector_modifier = function ( selector ) - selector:add_where ( "filter_interest.issue_id NOTNULL OR filter_d_interest_s.issue_id NOTNULL" ) - end - } - - filter[#filter+1] = { - name = "direct", - label = _"direct interest", - selector_modifier = function ( selector ) - selector:add_where ( "filter_interest.issue_id NOTNULL" ) - end - } - - filter[#filter+1] = { - name = "via_delegation", - label = _"interest via delegation", - selector_modifier = function ( selector ) - selector:add_where ( "filter_d_interest_s.issue_id NOTNULL" ) - end - } - - filter[#filter+1] = { - name = "initiated", - label = _"initiated by me", - selector_modifier = function ( selector ) - selector:add_where ( "filter_interest.issue_id NOTNULL" ) - end - } - + -- TODO + if not config.voting_only then filters[#filters+1] = filter - end -- voting if phase == "voting" and member then - local filter = { class = "subfilter", name = "voted" } + local filter = { class = "subfilter", name = "voted", label = _"voted" } filter[#filter+1] = { name = "all", @@ -248,9 +320,15 @@ if phase == "closed" then - local filter = { class = "subfilter", name = "closed" } + local filter = { class = "subfilter", name = "closed", label = _"closed" } filter[#filter+1] = { + name = "all", + label = _"all results", + selector_modifier = function ( selector ) end + } + + filter[#filter+1] = { name = "finished", label = _"finished", selector_modifier = function ( selector ) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_head.lua --- a/app/main/issue/_head.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_head.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,74 +1,52 @@ local issue = param.get("issue", "table") -local initiative = param.get("initiative", "table") +local link_issue = param.get("link_issue", atom.boolean) -local member = param.get ( "member", "table" ) - +slot.put_into("header", issue.name) ui.title ( function () + + if not config.single_unit_id then + ui.link { + attr = { class = "unit" }, + content = function() + ui.tag{ attr = { class = "name" }, content = issue.area.unit.name } + end, + module = "index", view = "index", + params = { unit = issue.area.unit.id } + } - ui.tag { - attr = { class = "unit" }, - content = function() - ui.link { - content = function() - ui.tag{ attr = { class = "name" }, content = issue.area.unit.name } - end, - module = "unit", view = "show", - id = issue.area.unit.id - } - end - } - ui.tag { attr = { class = "spacer" }, content = function() - slot.put ( " » " ) - end } - - ui.tag { - attr = { class = "area" }, - content = function() + ui.tag { attr = { class = "spacer" }, content = function() + slot.put ( " » " ) + end } + end + + if not config.single_area_id then + ui.tag { attr = { class = "area" }, content = function() + -- area link ui.link { content = function() ui.tag{ attr = { class = "name" }, content = issue.area.name } end, - module = "area", view = "show", - id = issue.area.id + module = "index", view = "index", + params = { unit = issue.area.unit_id, area = issue.area.id } } - end - } - - ui.tag { attr = { class = "spacer" }, content = function() - slot.put ( " » " ) - end } + end } - ui.tag { - attr = { class = "issue" }, - content = function() - -- issue link - ui.link { - text = _("#{policy_name} ##{issue_id}", { - policy_name = issue.policy.name, - issue_id = issue.id - } ), - module = "issue", view = "show", - id = issue.id - } - - slot.put ( " " ) - - if member then - execute.view { - module = "delegation", view = "_info", params = { - issue = issue, member = member, for_title = true - } - } - end - end - } - - if initiative then - ui.tag{ - attr = { class = "initiative" }, - content = initiative.display_name - } + ui.tag { attr = { class = "spacer" }, content = function() + slot.put ( " » " ) + end } end -end ) -- ui.title + if link_issue then + ui.link { + content = function() + ui.tag { attr = { class = "issue" }, content = issue.name } + end, + module = "issue", view = "show", id = issue.id + } + else + ui.tag { attr = { class = "issue" }, content = issue.name } + end + +end ) + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/issue/_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,425 @@ +local for_member = param.get ( "for_member", "table" ) +local for_unit = param.get ( "for_unit", "table" ) +local for_area = param.get ( "for_area", "table" ) +local for_issue = param.get ( "for_issue", "table" ) +local for_initiative = param.get ( "for_initiative", "table" ) +local for_sidebar = param.get("for_sidebar", atom.boolean) +local no_filter = param.get ( "no_filter", atom.boolean ) +local search = param.get ( "search" ) + +local limit = 25 + +local mode = request.get_param{ name = "mode" } or "issue" + +if for_initiative or for_issue or for_member then + mode = "timeline" +end + +local selector + +if search then + + selector = Issue:get_search_selector(search) + + +elseif mode == "timeline" then + + local event_max_id = request.get_param_strings()["event_max_id"] + + selector = Event:new_selector() + :add_order_by("event.id DESC") + :join("issue", nil, "issue.id = event.issue_id") + :add_field("now() - event.occurrence", "time_ago") + :limit(limit + 1) + + if event_max_id then + selector:add_where{ "event.id < ?", event_max_id } + end + + if for_member then + selector:add_where{ "event.member_id = ?", for_member.id } + end + + if for_initiative then + selector:add_where{ "event.initiative_id = ?", for_initiative.id } + end + + +elseif mode == "issue" then + + selector = Issue:new_selector() + +end + +if for_unit then + selector:join("area", nil, "area.id = issue.area_id") + selector:add_where{ "area.unit_id = ?", for_unit.id } +elseif for_area then + selector:add_where{ "issue.area_id = ?", for_area.id } +elseif for_issue then + selector:add_where{ "issue.id = ?", for_issue.id } +end + +if not search and app.session.member_id then + selector + :left_join("interest", "_interest", { + "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id + } ) + :add_field("(_interest.member_id NOTNULL)", "is_interested") + :left_join("delegating_interest_snapshot", "_delegating_interest", { [[ + _delegating_interest.issue_id = issue.id AND + _delegating_interest.member_id = ? AND + _delegating_interest.snapshot_id = issue.latest_snapshot_id + ]], app.session.member.id } ) + :add_field("_delegating_interest.delegate_member_ids[1]", "is_interested_by_delegation_to_member_id") + :add_field("_delegating_interest.delegate_member_ids[array_upper(_delegating_interest.delegate_member_ids, 1)]", "is_interested_via_member_id") + :add_field("array_length(_delegating_interest.delegate_member_ids, 1)", "delegation_chain_length") +end + +local function doit() + + local last_event_id + + local items = selector:exec() + + local row_class = "sectionRow" + if for_sidebar then + row_class = "sidebarRow" + end + + if mode == "timeline" then + local issues = items:load ( "issue" ) + local initiative = items:load ( "initiative" ) + items:load ( "suggestion" ) + items:load ( "member" ) + issues:load_everything_for_member_id ( app.session.member_id ) + initiative:load_everything_for_member_id ( app.session.member_id ) + elseif mode == "issue" then + items:load_everything_for_member_id ( app.session.member_id ) + end + + local last_event_date + for i, item in ipairs(items) do + local event + local issue + if mode == "timeline" then + event = item + issue = item.issue + elseif mode == "issue" then + event = {} + issue = item + end + + last_event_id = event.id + + local class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth event " .. row_class + if event.suggestion_id then + class = class .. " suggestion" + end + + ui.container{ attr = { class = class, }, content = function() + local event_name + local event_icon + local negative_event = false + + local days_ago_text + + if mode == "timeline" then + event_name = event.event_name + if event.event == "issue_state_changed" then + if event.state == "discussion" then + event_name = _"Discussion started" + elseif event.state == "verification" then + event_name = _"Verification started" + elseif event.state == "voting" then + event_name = _"Voting started" + elseif event.state == "finished_with_winner" then + event_name = event.state_name + elseif event.state == "finished_without_winner" then + event_name = event.state_name + negative_event = true + else + event_name = event.state_name + negative_event = true + end + elseif event.event == "initiative_revoked" then + negative_event = true + end + + if event.time_ago == 0 then + days_ago_text = _("today at #{time}", { time = format.time(event.occurrence) }) + elseif event.time_ago == 1 then + days_ago_text = _("yesterday at #{time}", { time = format.time(event.occurrence) }) + else + days_ago_text = _("#{interval} ago", { interval = format.interval_text ( event.time_ago ) } ) + end + + elseif mode == "issue" then + local event_icons_map = { + admission = "bubble_chart", + discussion = "question_answer", + verification = "find_in_page", + voting = "mail", + finished_with_winner = "gavel", + finished_without_winner = "gavel", + canceled = "clear" + } + event_icon = event_icons_map[issue.state] or event_icons_map["canceled"] + event_name = issue.state_name + if issue.state_time_left:sub(1,1) ~= "-" then + days_ago_text = _( "#{interval_text} left", { + interval_text = format.interval_text ( issue.state_time_left ) + }) + elseif issue.closed then + days_ago_text = _( "#{interval_text} ago", { + interval_text = format.interval_text ( issue.closed_ago ) + }) + else + days_ago_text = _"phase ends soon" + end + if issue.closed and not issue.fully_frozen then + negative_event = true + end + if issue.state == "finished_without_winner" + or issue.state == "canceled_no_initiative_admitted" + or issue.state == "canceled_by_admin" + then + negative_event = true + end + end + + local class= "event_info" + + if negative_event then + class = class .. " negative" + end + + if not for_issue and not for_initiative then + ui.container{ attr = { class = "mdl-card__title mdl-card--has-fab mdl-card--border" }, content = function() + if not (config.single_unit_id and config.single_area_id) then + if not config.single_unit_id then + slot.put ( " " ) + ui.link{ + module = "index", view = "index", params = { unit = issue.area.unit_id }, + attr = { class = "mdl-chip unit" }, content = function() + ui.tag{ attr = { class = "mdl-chip__text" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "flag" } + slot.put(" ") + ui.tag{ content = issue.area.unit.name } + end } + end + } + end + if not config.single_area_id then + slot.put(" ") + ui.link{ + module = "index", view = "index", params = { unit = issue.area.unit_id, area = issue.area_id }, + attr = { class = "mdl-chip area" }, content = function() + ui.tag{ attr = { class = "mdl-chip__text" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "folder" } + slot.put(" ") + ui.tag{ content = issue.area.name } + end} + end + } + end + end + --ui.heading{ level = 2, attr = { class = "mdl-card__title-text", style = "display: block;" }, content = function() + slot.put(" ") + ui.link{ + module = "issue", view = "show", id = issue.id, + attr = { class = "mdl-chip issue" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "label" } + slot.put(" ") + ui.tag{ attr = { class = "mdl-chip__text" }, content = issue.name } + end } + --end } + ui.container{ attr = { class = "mdl-card__subtitle-text .mdl-cell--hide-phone" }, content = function() + ui.container{ attr = { class = class }, content = function () + if event_icon then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = event_icon } + end + slot.put(" ") + ui.tag { content = event_name } + slot.put(" ") + ui.tag{ content = "(" .. days_ago_text .. ")" } + end } + end } + if app.session.member and issue.fully_frozen and not issue.closed and not issue.member_info.direct_voted and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--fab mdl-button--colored" , + style = "position: absolute; right: 20px; bottom: -27px;" + }, + module = "vote", view = "list", + params = { issue_id = issue.id }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = config.voting_icon or "mail_outline" } + end + } + end + end } + end + + if event.suggestion_id then + ui.container{ attr = { class = "suggestion" }, content = function() + ui.link{ + text = format.string(event.suggestion.name, { + truncate_at = 160, truncate_suffix = true + }), + module = "initiative", view = "show", id = event.initiative.id, + params = { suggestion_id = event.suggestion_id }, + anchor = "s" .. event.suggestion_id + } + end } + end + + if not for_initiative and (not for_issue or event.initiative_id) then + + ui.container{ attr = { class = "initiative_list" }, content = function() + if event.initiative_id then + local initiative = event.initiative + + execute.view{ module = "initiative", view = "_list", params = { + issue = issue, + initiative = initiative, + for_event = mode == "timeline" and not (event.state == issue.state) + + } } + else + local initiatives = issue.initiatives + execute.view{ module = "initiative", view = "_list", params = { + issue = issue, + initiatives = initiatives, + for_event = mode == "timeline" and not (event.state == issue.state) + } } + end + end } + end + if app.session.member_id then + ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + execute.view{ + module = "delegation", view = "_info", params = { + issue = issue, member = for_member + } + } + end } + end + end } + + end + + if mode == "timeline" then + if for_sidebar then + ui.container { attr = { class = row_class }, content = function () + ui.link{ + attr = { class = "moreLink" }, + text = _"Show full history", + module = "initiative", view = "history", id = for_initiative.id + } + end } + elseif #items > limit then + ui.container { attr = { class = row_class }, content = function () + local params = request.get_param_strings() + ui.link{ + attr = { class = "moreLink" }, + text = _"Show older events", + module = request.get_module(), + view = request.get_view(), + id = for_unit and for_unit.id or for_area and for_area.id or for_issue and for_issue.id or for_member and for_member.id, + params = { + mode = "timeline", + event_max_id = last_event_id, + tab = params["tab"], + phase = params["phase"], + closed = params["closed"] + } + } + end } + elseif #items < 1 then + ui.container { attr = { class = row_class }, content = _"No more events available" } + end + end + + if #items < 1 then + ui.section( function() + ui.sectionRow( function() + ui.container{ content = _"No results for this selection" } + end ) + end ) + end + + +end + + +local filters = {} + +if not for_initiative and not for_issue and not no_filter then + + filters = execute.chunk{ + module = "issue", chunk = "_filters", params = { + for_events = mode == "timeline" and true or false, + member = app.session.member, + for_member = for_member, + state = for_state, + for_unit = for_unit and true or false, + for_area = for_area and true or false + }} +end + +filters.opened = true +filters.selector = selector + + +local function dotabs() + slot.select("filter", function() + ui.container{ attr = { class = "mdl-tabs mdl-js-tabs mdl-js-ripple-effect float-left" }, content = function() + ui.container{ attr = { class = "mdl-tabs__tab-bar" }, content = function() + local mode = request.get_param{ name = "mode" } + local css_active = (not mode or mode == "issue") and " is-active" or "" + ui.link{ module = request.get_module(), view = request.get_view(), id = request.get_id_string(), content = "Issues", attr = { class = "mdl-tabs__tab" .. css_active } } + local css_active = mode and " is-active" or " " + ui.link{ module = request.get_module(), view = request.get_view(), id = request.get_id_string(), params = { mode = "timeline" }, content = "Timeline", attr = { class = "mdl-tabs__tab" .. css_active } } + ui.link{ module = "member", view = "list", content = "Member", attr = { class = "mdl-tabs__tab" } } + end } + end } + end) +end + + +if mode == "timeline" then + --dotabs() + filters.content = function() + execute.view{ module = "index", view = "_head" } + doit() + end +else + -- dotabs() + filters.content = function() + if config.voting_only then + local admission_order_field = "filter_issue_order.order_in_unit" + if for_area then + admission_order_field = "filter_issue_order.order_in_area" + end + selector:left_join ( "issue_order_in_admission_state", "filter_issue_order", "filter_issue_order.id = issue.id" ) + selector:add_order_by ( "issue.closed DESC NULLS FIRST" ) + selector:add_order_by ( "issue.accepted ISNULL" ) + selector:add_order_by ( "CASE WHEN issue.accepted ISNULL THEN NULL ELSE justify_interval(coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()) END" ) + selector:add_order_by ( "CASE WHEN issue.accepted ISNULL THEN " .. admission_order_field .. " ELSE NULL END" ) + selector:add_order_by ( "id" ) + end + execute.view{ module = "index", view = "_head" } + ui.paginate{ + selector = selector, + per_page = 25, + content = doit + } + end +end + +filters.class = "mdl-special-card mdl-card__fullwidth mdl-shadow--2dp" + +ui.filters(filters) + + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_sidebar.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/issue/_sidebar.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,133 @@ +local issue = param.get("issue", "table") +local initiative = param.get("initiative", "table") + +local member = param.get ( "member", "table" ) + +ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = issue.name } + end } + + if issue.admin_notice then + ui.container{ attr = { class = "mdl-card__content mdl-card--border phases" }, content = function() + slot.put(encode.html_newlines(issue.admin_notice)) + end } + end + + ui.container{ attr = { class = "mdl-card__content mdl-card--border phases" }, content = function() + execute.view{ module = "issue", view = "_sidebar_state", params = { + issue = issue + } } + end } + + if app.session.member then + if issue.fully_frozen then + if issue.member_info.direct_voted then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "mail_outline" } + slot.put(" ") + ui.tag { content = _"You have voted" } + end } + elseif active_trustee_id then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "mail_outline" } + slot.put(" ") + ui.tag { content = _"You have voted via delegation" } + end } + end + elseif not issue.closed then + if issue.member_info.own_participation then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "remove_red_eye" } + slot.put(" ") + ui.tag{ content = _"You are interested in this issue" } + end } + end + end + + if not issue.closed then + ui.container{ attr = { class = "mdl-card__actions" }, content = function() + if issue.fully_frozen then + if issue.member_info.direct_voted then + if not issue.closed then + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "vote", view = "list", + params = { issue_id = issue.id }, + text = _"change vote" + } + else + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "vote", view = "list", + params = { issue_id = issue.id }, + text = _"show vote" + } + end + elseif active_trustee_id then + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + content = _"Show voting ballot", + module = "vote", view = "list", params = { + issue_id = issue.id, member_id = active_trustee_id + } + } + elseif not issue.closed then + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "vote", view = "list", + params = { issue_id = issue.id }, + text = _"vote now" + } + end + elseif not issue.closed then + if issue.member_info.own_participation then + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "interest", action = "update", + params = { issue_id = issue.id, delete = true }, + routing = { default = { + mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id + } }, + text = _"remove my interest" + } + else + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "interest", action = "update", + params = { issue_id = issue.id }, + routing = { default = { + mode = "redirect", module = initiative and "initiative" or "issue", view = "show", id = initiative and initiative.id or issue.id + } }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "remove_red_eye" } + slot.put(" ") + ui.tag{ content = _"add my interest" } + end + } + end + end + end } + end + end + +end } + +if initiative then + + ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Competing initiatives" } + end } + + execute.view { + module = "issue", view = "_sidebar_issue", + params = { + issue = issue, + ommit_initiative_id = initiative.id + } + } + + end } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_sidebar_issue.lua --- a/app/main/issue/_sidebar_issue.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_sidebar_issue.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,39 +1,44 @@ local issue = param.get("issue", "table") -local hide_initiatives = param.get("hide_initiatives", atom.boolean) -local highlight_initiative_id = param.get ( "highlight_initiative_id", "number" ) - -ui.sidebar ( "tab-whatcanido", function () +local ommit_initiative_id = param.get ( "ommit_initiative_id", "number" ) - ui.sidebarHead( function() - ui.heading { - level = 2, - content = _"Competing initiatives" - } - end ) - +--[[ +ui.heading { + level = 2, + content = _"Competing initiatives" +} +--]] + +if #(issue.initiatives) > (ommit_initiative_id and 1 or 0) then execute.view { module = "initiative", view = "_list", params = { issue = issue, initiatives = issue.initiatives, - highlight_initiative_id = highlight_initiative_id + ommit_initiative_id = ommit_initiative_id } } - if #issue.initiatives == 1 then - ui.sidebarSection( function () - - if not issue.closed and not (issue.state == "voting") then - ui.container { content = function() - ui.tag { content = _"Currently this is the only initiative in this issue, because nobody started a competing initiative (yet)." } - if app.session.member and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then - slot.put(" ") - ui.tag { content = _"To create a competing initiative see below." } - end - end } - else - ui.container { content = _"This is the only initiative in this issue, because nobody started a competing initiative." } - end - end ) - end +end + +if #issue.initiatives == 1 then + ui.container { attr = { class = "mdl-card__content" }, content = function() + if not issue.closed and not (issue.state == "voting") then + ui.tag { content = _"Currently this is the only initiative in this issue, because nobody started a competing initiative (yet)." } + else + ui.container { content = _"This is the only initiative in this issue, because nobody started a competing initiative." } + end + end } +end -end ) -- ui.sidebar +if app.session.member + and app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) + and not issue.closed and not issue.fully_frozen +then + ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + ui.link { + attr = { class = "mdl-button mdl-js-button" }, + module = "initiative", view = "new", + params = { issue_id = issue.id }, + content = _"start a new competing initiative" + } + end } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_sidebar_members.lua --- a/app/main/issue/_sidebar_members.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_sidebar_members.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,21 +1,25 @@ local issue = param.get("issue", "table") local initiative = param.get("initiative", "table") +if config.voting_only and not issue.closed then + return +end + + if app.session:has_access("all_pseudonymous") then - ui.sidebar ( "tab-members", function () + ui.container{ attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.tag { tag = "a", attr = { name = "members" }, content = "" } - local text = _"Interested members" - if issue.state == "finished_with_winner" or issue.state == "finished_without_winner" then - text = _"Voters" - end - - ui.sidebarHead( function() - ui.heading{ - level = 2, content = text - } - end ) - + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + local text = _"Interested members" + if issue.state == "finished_with_winner" or issue.state == "finished_without_winner" then + text = _"Voters" + end + + ui.container{ attr = { class = "mdl-card__title-text" }, content = text } + end } + local interested_members_selector if issue.state == "finished_with_winner" or issue.state == "finished_without_winner" then @@ -38,28 +42,29 @@ interested_members_selector = issue:get_reference_selector("interested_members_snapshot") :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id") :add_field("direct_interest_snapshot.weight") - :add_where("direct_interest_snapshot.event = issue.latest_snapshot_event") + :add_where("direct_interest_snapshot.snapshot_id = issue.latest_snapshot_id") if initiative then - interested_members_selector:left_join("direct_supporter_snapshot", nil, { "direct_supporter_snapshot.initiative_id = ? AND direct_interest_snapshot.issue_id = direct_supporter_snapshot.issue_id AND direct_supporter_snapshot.member_id = direct_interest_snapshot.member_id AND direct_supporter_snapshot.event = issue.latest_snapshot_event", initiative.id }) + interested_members_selector:left_join("direct_supporter_snapshot", nil, { "direct_supporter_snapshot.initiative_id = ? AND direct_interest_snapshot.issue_id = direct_supporter_snapshot.issue_id AND direct_supporter_snapshot.member_id = direct_interest_snapshot.member_id AND direct_supporter_snapshot.snapshot_id = issue.latest_snapshot_id", initiative.id }) interested_members_selector:add_field("direct_supporter_snapshot.member_id NOTNULL", "supporter") interested_members_selector:add_field("satisfied", "supporter_satisfied") end end - execute.view{ - module = "member", - view = "_list", - params = { - issue = issue, - initiative = initiative, - members_selector = interested_members_selector, - paginator_name = "members", - member_class = "sidebarRow sidebarRowNarrow", - for_votes = issue.state == "finished_with_winner" or issue.state == "finished_without_winner" + ui.container{ attr = { class = "mdl-card__content" }, content = function() + execute.view{ + module = "member", + view = "_list", + params = { + issue = issue, + initiative = initiative, + members_selector = interested_members_selector, + paginator_name = "members", + member_class = "sidebarRow sidebarRowNarrow", + for_votes = issue.state == "finished_with_winner" or issue.state == "finished_without_winner", + no_filter = true + } } - } - - end ) - + end } + end } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_sidebar_state.lua --- a/app/main/issue/_sidebar_state.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_sidebar_state.lua Sun Jul 15 14:07:29 2018 +0200 @@ -13,165 +13,164 @@ view_id = issue.id end -ui.sidebar( "tab-whatcanido", function() +local current_occured = false +local failed = false + +ui.tag{ tag = "table", content = function() - ui.sidebarHead( function() - ui.heading{ level = 2, content = function() - ui.link{ - content = issue.name, - module = "issue", view = "show", id = issue.id - } - end } - end ) +local function quorum_text(policy, quorum) + local num + local den + + if quorum == 1 then + return math.max(policy.issue_quorum or 0, issue.issue_quorum or 0) + elseif quorum == 2 then + num = policy.initiative_quorum_num + den = policy.initiative_quorum_den + end + + if num == nil or den == nil then + return 0 + end + + if den == 100 or den == 10 then + return _("#{percentage}%", { percentage = num * 100 / den }) + else + return num .. "/" .. den + end + +end - local current_occured = false - local failed = false +local phases = { "admission", "discussion", "verification", "voting" } + +for i, state in ipairs(phases) do + local current = state == issue.state + + if current then + current_occured = true + end - for i, state in ipairs{ "admission", "discussion", "verification", "voting" } do - local current = state == issue.state + local phase_success = ( + (state == "admission" and issue.accepted) + or (state == "discussion" and issue.half_frozen) + or (state == "verification" and issue.fully_frozen and issue.state ~= "canceled_no_initiative_admitted") + or (state == "voting" and issue.closed and issue.state ~= "canceled_no_initiative_admitted" and issue.state ~= "canceled_by_admin") + ) + + if not failed then + ui.container{ tag = "div", attr = { id = "phase-" .. state, class = current and "phase-current" or nil }, content = function() - if current then - current_occured = true - end - - local phase_success = ( - (state == "admission" and issue.accepted) - or (state == "discussion" and issue.half_frozen) - or (state == "verification" and issue.fully_frozen and issue.state ~= "canceled_no_initiative_admitted") - or (state == "voting" and issue.closed and issue.state ~= "canceled_no_initiative_admitted" and issue.state ~= "canceled_by_admin") - ) - - if not failed then - ui.link{ attr = { - onclick = "$('#phase-help-" .. state .. "').toggle();return false;", - class = "sidebarRow sidebarRowNarrow", - }, content = function() + local state_names = { + admission = _"Admission", + discussion = _"Discussion", + verification = _"Verification", + voting = _"Voting" + } - local state_names = { - admission = _"Admission", - discussion = _"Discussion", - verification = _"Verification", - voting = _"Voting" - } - - local state_name = "(" .. i .. ") " .. state_names[state] or state + local state_name = state_names[state] or state + + local quorum + if state == "admission" then + quorum = quorum_text(issue.policy, 1) + elseif state == "verification" then + quorum = quorum_text(issue.policy, 2) + end + + local time_text + if current then + local time_left + if issue.state_time_left:sub(1,1) ~= "-" then + time_text = format.interval_text(issue.state_time_left, { mode = "time_left" }) + else + time_text = "phase ends soon" + end + elseif current_occured then + local phase_duration = issue[state .. "_time_text"] + time_text = _("#{duration}", { duration = format.interval_text(phase_duration) } ) + else + local text = "failed" + if quorum then + text = _("failed #{quorum}", { quorum = quorum }) + end + if phase_success then + if quorum == 0 then + text = _"without quorum" + elseif quorum then + text = _("reached #{quorum}", { quorum = quorum }) + else + text = _"finished" + end + elseif issue.state == "canceled_revoked_before_accepted" or + issue.state == "canceled_after_revocation_during_discussion" or + issue.state == "canceled_after_revocation_during_verification" + then + text = _"revoked" + elseif issue.state == "canceled_by_admin" then + text = _"canceled" + end + time_text = text + end - local function quorum_text(policy, quorum) - local num - local den - - if quorum == 1 then - num = policy.issue_quorum_num - den = policy.issue_quorum_den - elseif quorum == 2 then - num = policy.initiative_quorum_num - den = policy.initiative_quorum_den - end - - if num == nil or den == nil then - return 0 - end - - if den == 100 or den == 10 then - return _("#{percentage}%", { percentage = num * 100 / den }) - else - return num .. "/" .. den - end - - end - - local quorum - if state == "admission" then - quorum = quorum_text(issue.policy, 1) - elseif state == "verification" then - quorum = quorum_text(issue.policy, 2) + if not config.voting_only or state == "voting" then + if current then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "play_arrow" } + elseif not current_occured and not phase_success then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "clear" } + elseif current_occured and issue.accepted then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "schedule" } + elseif current_occured then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "lock" } + else + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "check" } end - if current then - local time_left - if issue.state_time_left:sub(1,1) ~= "-" then - time_left = format.interval_text(issue.state_time_left, { mode = "time_left" }) - else - time_left = "phase ends soon" - end - - ui.tag{ attr = { class = "right" }, - content = time_left - } - elseif current_occured then - local phase_duration = issue[state .. "_time_text"] - ui.tag{ attr = { class = "right" }, - content = _("#{duration}", { - duration = format.interval_text(phase_duration) - } ) - } - else - local text = "failed" - if quorum then - text = _("failed #{quorum}", { quorum = quorum }) - end - if phase_success then - if quorum == 0 then - text = _"without quorum" - elseif quorum then - text = _("reached #{quorum}", { quorum = quorum }) - else - text = _"finished" - end - elseif issue.state == "canceled_revoked_before_accepted" or - issue.state == "canceled_after_revocation_during_discussion" or - issue.state == "canceled_after_revocation_during_verification" - then - text = _"revoked" - elseif issue.state == "canceled_by_admin" then - text = _"canceled" - end - - ui.tag{ attr = { class = "right" }, - content = text - } + if not config.voting_only then + slot.put(" ") end - ui.heading{ level = 3, content = function() - if current then - ui.image{ attr = { class = "icon16" }, static = "icons/32/phase_current.png" } - elseif not current_occured and not phase_success then - ui.image{ attr = { class = "icon16" }, static = "icons/32/phase_failed.png" } - elseif current_occured then - ui.image{ attr = { class = "icon16" }, static = "icons/32/empty.png" } - else - ui.image{ attr = { class = "icon16" }, static = "icons/32/phase_finished.png" } + ui.tag{ attr = { class = "mdl-data-table__cell--non-numeric" }, content = function() + if not config.voting_only then + ui.tag{ content = i .. "." } end slot.put(" ") - ui.tag{ content = state_name } - end } + ui.tag{ content = state_name } + end} + ui.tag{ content = " (" .. time_text .. ")"} + + slot.put(" ") + + if not current then + ui.tag{ tag = "i", attr = { onclick = "document.getElementById('phase-info-" .. i .. "').classList.toggle('hidden');", class = "material-icons material-icons-small clickable" }, content = "info_outline" } + end + end + + end } + + local help_texts = { + admission = _("As soon as one initiative of this issue reaches the 1st quorum of #{quorum} support, the issue will proceed to discussion phase.", { quorum = quorum_text(issue.policy, 1) }), + discussion = _"During the discussion phase, the issue is debated on while the initiators improve the proposals and reasons in their initiatives. Supporters of initiatives can write and rate suggestions for improvement.", + verification = _("During the verification phase, existing initiatives cannot be changed anymore. Initiatives need to pass the 2nd quorum of #{quorum} at end of verification phase to become admitted for voting.", { quorum = quorum_text(issue.policy, 2) }), + voting = _"During the voting phase, votes for all admitted initiatives in this issue can be cast. The final result will be calculated as soon as this phase ends." + } + + local class = "phase-info" + if not current then + class = class .. " hidden" + end - local help_texts = { - admission = _("As soon as one initiative of this issue reaches the 1st quorum of #{quorum} support, the issue will proceed to discussion phase.", { quorum = quorum_text(issue.policy, 1) }), - discussion = _"During the discussion phase, the issue is debated on while the initiators improve the proposals and reasons in their initiatives. Supporters of initiatives can write and rate suggestions for improvement.", - verification = _("During the verification phase, existing initiatives cannot be changed anymore. Initiatives need to pass the 2nd quorum of #{quorum} at end of verification phase to become admitted for voting.", { quorum = quorum_text(issue.policy, 2) }), - voting = _"During the voting phase, votes for all admitted initiatives in this issue can be cast. The final result will be calculated as soon as this phase ends." - } - ui.container { attr = { id = "phase-help-" .. state, style = "display: none;" }, content = help_texts[state] } - - end } + if not config.voting_only then + ui.container { attr = { id = "phase-info-" .. i, class = class }, content = help_texts[state] } end - if not phase_success and not current and not current_occured then - failed = true - end + end + + if not phase_success and not current and not current_occured then + failed = true end - - if issue.closed then - ui.sidebarSection( function() - ui.heading { level = 1, content = issue.state_name } - end ) - end - - if issue.admin_notice then - ui.sidebarSection( function() - ui.heading { level = 3, content = _"Administrative notice:" } - slot.put(encode.html_newlines(issue.admin_notice)) - end ) - end -end ) +end + +end } + +if issue.closed then + ui.tag{ content = issue.state_name } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/_sidebar_whatcanido.lua --- a/app/main/issue/_sidebar_whatcanido.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/_sidebar_whatcanido.lua Sun Jul 15 14:07:29 2018 +0200 @@ -19,488 +19,557 @@ end end -ui.sidebar ( "tab-whatcanido", function () +local supporter - ui.sidebarHeadWhatCanIDo() - - local supporter +if initiative and app.session.member_id then + supporter = app.session.member:get_reference_selector("supporters") + :add_where{ "initiative_id = ?", initiative.id } + :optional_object_mode() + :exec() +end + +local view_module +local view_id - if initiative and app.session.member_id then - supporter = app.session.member:get_reference_selector("supporters") - :add_where{ "initiative_id = ?", initiative.id } - :optional_object_mode() - :exec() - end +if initiative then + issue = issue + view_module = "initiative" + view_id = initiative.id +else + view_module = "issue" + view_id = issue.id +end - local view_module - local view_id +local initiator +if initiative and app.session.member_id then + initiator = Initiator:by_pk(initiative.id, app.session.member.id) +end + +local initiators - if initiative then - issue = issue - view_module = "initiative" - view_id = initiative.id +if initiative then + local initiators_members_selector = initiative:get_reference_selector("initiating_members") + :add_field("initiator.accepted", "accepted") + :add_order_by("member.name") + if initiator and initiator.accepted then + initiators_members_selector:add_where("initiator.accepted ISNULL OR initiator.accepted") else - view_module = "issue" - view_id = issue.id + initiators_members_selector:add_where("initiator.accepted") end - local initiator - if initiative and app.session.member_id then - initiator = Initiator:by_pk(initiative.id, app.session.member.id) - end - - local initiators - - if initiative then - local initiators_members_selector = initiative:get_reference_selector("initiating_members") - :add_field("initiator.accepted", "accepted") - :add_order_by("member.name") - if initiator and initiator.accepted then - initiators_members_selector:add_where("initiator.accepted ISNULL OR initiator.accepted") - else - initiators_members_selector:add_where("initiator.accepted") - end - - initiators = initiators_members_selector:exec() - end + initiators = initiators_members_selector:exec() +end - if initiator and - initiator.accepted and - not issue.fully_frozen and - not issue.closed and - not initiative.revoked - then +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" } + end } + ui.container{ attr = { class = "what-can-i-do-here" }, content = function() + + if initiator and + initiator.accepted and + not issue.fully_frozen and + not issue.closed and + not initiative.revoked + then - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = function() + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () ui.tag { content = _"You are initiator of this initiative" } - end } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if issue.half_frozen then - ui.tag { tag = "li", content = _"this issue is in verification phase, therefore the initiative text cannot be updated anymore" } - else - ui.tag { tag = "li", content = function () - ui.link{ - module = "draft", view = "new", - params = { initiative_id = initiative.id }, - content = _"edit proposal and/or reasons" - } - end } - ui.tag { tag = "li", content = function () - ui.link{ - attr = { class = "action" }, - module = "initiative", view = "add_initiator", - params = { initiative_id = initiative.id }, - content = _"invite another initiator" - } - end } - if #initiative.initiators > 1 then + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if issue.half_frozen then + ui.tag { tag = "li", content = _"this issue is in verification phase, therefore the initiative text cannot be updated anymore" } + else ui.tag { tag = "li", content = function () ui.link{ - module = "initiative", view = "remove_initiator", + module = "draft", view = "new", + params = { initiative_id = initiative.id }, + content = _"edit proposal and/or reasons" + } + end } + ui.tag { tag = "li", content = function () + ui.link{ + attr = { class = "action" }, + module = "initiative", view = "add_initiator", params = { initiative_id = initiative.id }, - content = _"remove an initiator" + content = _"invite another initiator" + } + end } + if #initiative.initiators > 1 then + ui.tag { tag = "li", content = function () + ui.link{ + module = "initiative", view = "remove_initiator", + params = { initiative_id = initiative.id }, + content = _"remove an initiator" + } + end } + end + ui.tag { tag = "li", content = function () + ui.link{ + module = "initiative", view = "revoke", id = initiative.id, + content = _"revoke initiative" } end } end - ui.tag { tag = "li", content = function () + end } + end } + end + + -- invited as initiator + if initiator and initiator.accepted == nil and not initiative.issue.half_frozen and not initiative.issue.closed then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag { content = _"You are invited to become initiator of this initiative" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag{ tag = "li", content = function () ui.link{ - module = "initiative", view = "revoke", id = initiative.id, - content = _"revoke initiative" + content = _"accept invitation", + module = "initiative", + action = "accept_invitation", + id = initiative.id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } } end } - end - end } - end } - end - - -- invited as initiator - if initiator and initiator.accepted == nil and not initiative.issue.half_frozen and not initiative.issue.closed then - ui.container { attr = { class = "sidebarRow highlighted" }, content = function () - ui.heading { level = 3, content = function() - ui.tag { content = _"You are invited to become initiator of this initiative" } - end } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag{ tag = "li", content = function () - ui.link{ - content = _"accept invitation", - module = "initiative", - action = "accept_invitation", - id = initiative.id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() + + ui.tag{ tag = "li", content = function () + ui.link{ + content = _"refuse invitation", + module = "initiative", + action = "reject_initiator_invitation", + params = { + initiative_id = initiative.id, + member_id = app.session.member.id + }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } } } - } + end } end } - - ui.tag{ tag = "li", content = function () - ui.link{ - content = _"refuse invitation", - module = "initiative", - action = "reject_initiator_invitation", + end } + end + + + if privileged_to_vote and issue.member_info.first_trustee_id then + local member = Member:by_id(issue.member_info.first_trustee_id) + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + --[[ + ui.container { attr = { class = "right" }, content = function() + execute.view{ + module = "member_image", + view = "_show", params = { - initiative_id = initiative.id, - member_id = app.session.member.id - }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } + member = member, + image_type = "avatar", + show_dummy = true } } end } - end } - end } - end - - - if privileged_to_vote and issue.member_info.first_trustee_id then - local member = Member:by_id(issue.member_info.first_trustee_id) - ui.sidebarSection( function () - ui.container { attr = { class = "right" }, content = function() - execute.view{ - module = "member_image", - view = "_show", - params = { - member = member, - image_type = "avatar", - show_dummy = true - } - } - end } - if issue.member_info.own_delegation_scope == "unit" then - ui.heading{ level = 3, content = _"You delegated this organizational unit" } - elseif issue.member_info.own_delegation_scope == "area" then - ui.heading{ level = 3, content = _"You delegated this subject area" } - elseif issue.member_info.own_delegation_scope == "issue" then - ui.heading{ level = 3, content = _"You delegated this issue" } - end - - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if issue.member_info.own_delegation_scope == "area" or - issue.member_info.own_delegation_scope == "unit" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - issue_id = issue.id, - initiative_id = initiative and initiative.id or nil - }, - content = _"change/revoke delegation only for this issue" - } - end } - end + --]] if issue.member_info.own_delegation_scope == "unit" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - unit_id = issue.area.unit_id, - }, - content = _("change/revoke delegation of organizational unit", { - unit_name = issue.area.unit.name - }) - } - end } + ui.tag{ content = _"You delegated this organizational unit" } elseif issue.member_info.own_delegation_scope == "area" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - area_id = issue.area_id, - }, - content = _"change/revoke delegation of subject area" - } - end } - end - if issue.member_info.own_delegation_scope == nil then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - issue_id = issue.id, - initiative_id = initiative and initiative.id or nil - }, - content = _"choose issue delegatee" - } - end } + ui.tag{ content = _"You delegated this subject area" } elseif issue.member_info.own_delegation_scope == "issue" then - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - issue_id = issue.id, - initiative_id = initiative and initiative.id or nil - }, - content = _"change/revoke issue delegation" - } - end } - end - end } - - if issue.member_info.first_trustee_id and issue.member_info.own_participation then - local text = _"As long as you are interested in this issue yourself, the delegation is suspended for this issue, but it will be applied again in the voting phase unless you vote yourself." - if issue.state == "voting" then - text = _"This delegation is suspended, because you voted yourself." + ui.tag{ content = _"You delegated this issue" } end - ui.container { content = text } - end - end ) - end - - if privileged_to_vote and not issue.closed and not issue.fully_frozen then - if issue.member_info.own_participation then - ui.sidebarSection( function () - ui.container{ attr = { class = "right" }, content = function() - ui.image{ attr = { class = "right" }, static = "icons/48/eye.png" } - if issue.member_info.weight and issue.member_info.weight > 1 then - slot.put("
") - ui.tag{ - attr = { class = "right" }, - content = "+" .. issue.member_info.weight - 1 - } - end - end } - ui.heading{ level = 3, content = _("You are interested in this issue", { id = issue.id }) } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if issue.member_info.weight and issue.member_info.weight > 1 then + if issue.member_info.own_delegation_scope == "area" or + issue.member_info.own_delegation_scope == "unit" then ui.tag { tag = "li", content = function () ui.link { - module = "delegation", view = "show_incoming", - params = { issue_id = issue.id, member_id = app.session.member_id }, - content = _("you have #{count} incoming delegations", { - count = issue.member_info.weight - 1 + module = "delegation", view = "show", params = { + issue_id = issue.id, + initiative_id = initiative and initiative.id or nil + }, + content = _"change/revoke delegation only for this issue" + } + end } + end + if issue.member_info.own_delegation_scope == "unit" then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + unit_id = issue.area.unit_id, + }, + content = _("change/revoke delegation of organizational unit", { + unit_name = issue.area.unit.name }) } end } + elseif issue.member_info.own_delegation_scope == "area" then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + area_id = issue.area_id, + }, + content = _"change/revoke delegation of subject area" + } + end } end - ui.tag { tag = "li", content = function () - ui.link { - module = "interest", action = "update", - routing = { default = { - mode = "redirect", module = view_module, view = "show", id = view_id - } }, - params = { issue_id = issue.id, delete = true }, - text = _"remove my interest" - } - end } - end } - end ) - else - ui.sidebarSection( function () - ui.heading{ level = 3, content = _("I want to participate in this issue", { id = issue.id }) } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link { - module = "interest", action = "update", - params = { issue_id = issue.id }, - routing = { default = { - mode = "redirect", module = view_module, view = "show", id = view_id - } }, - text = _"add my interest" - } - end } - ui.tag { tag = "li", content = _"browse through the competing initiatives" } - end } - end ) - end - - if initiative then - - if not initiative.member_info.supported or active_trustee_id then - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = function() - ui.tag { content = _"I like this initiative and I want to support it" } - end } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if issue.member_info.own_delegation_scope == nil then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + issue_id = issue.id, + initiative_id = initiative and initiative.id or nil + }, + content = _"choose issue delegatee" + } + end } + elseif issue.member_info.own_delegation_scope == "issue" then ui.tag { tag = "li", content = function () ui.link { - module = "initiative", action = "add_support", + module = "delegation", view = "show", params = { + issue_id = issue.id, + initiative_id = initiative and initiative.id or nil + }, + content = _"change/revoke issue delegation" + } + end } + end + if issue.member_info.first_trustee_id and issue.member_info.own_participation then + local text = _"As long as you are interested in this issue yourself, the delegation is suspended for this issue, but it will be applied again in the voting phase unless you vote yourself." + if issue.state == "voting" then + text = _"This delegation is suspended, because you voted yourself." + end + ui.tag { tag = "li", content = function () + ui.container { content = text } + end } + end + + end } + + end } + end + + if not config.disable_delegations and privileged_to_vote and not issue.closed and not issue.fully_frozen then + if issue.member_info.own_participation then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + --[[ + ui.container{ attr = { class = "right" }, content = function() + ui.image{ attr = { class = "right" }, static = "icons/48/eye.png" } + if issue.member_info.weight and issue.member_info.weight > 1 then + slot.put("
") + ui.tag{ + attr = { class = "right" }, + content = "+" .. issue.member_info.weight - 1 + } + end + end } + --]] + ui.tag{ content = _("You are interested in this issue", { id = issue.id }) } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if issue.member_info.weight and issue.member_info.weight > 1 then + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show_incoming", + params = { issue_id = issue.id, member_id = app.session.member_id }, + content = _("you have #{count} incoming delegations", { + count = issue.member_info.weight - 1 + }) + } + end } + end + ui.tag { tag = "li", content = function () + ui.link { + module = "interest", action = "update", routing = { default = { - mode = "redirect", module = "initiative", view = "show", id = initiative.id + mode = "redirect", module = view_module, view = "show", id = view_id } }, - id = initiative.id, - text = _"add my support" + params = { issue_id = issue.id, delete = true }, + text = _"remove my interest" } end } end } end } - - else -- if not supported - ui.container { attr = { class = "sidebarRow" }, content = function () - if initiative.member_info.satisfied then - ui.image{ attr = { class = "right icon48" }, static = "icons/32/support_satisfied.png" } - else - ui.image{ attr = { class = "right icon48" }, static = "icons/32/support_unsatisfied.png" } - end - ui.heading { level = 3, content = _"You are supporting this initiative" } + else + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _("I want to participate in this issue", { id = issue.id }) } ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if not initiative.member_info.satisfied then + ui.tag { tag = "li", content = function () + ui.link { + module = "interest", action = "update", + params = { issue_id = issue.id }, + routing = { default = { + mode = "redirect", module = view_module, view = "show", id = view_id + } }, + text = _"add my interest" + } + end } + ui.tag { tag = "li", content = _"browse through the competing initiatives" } + end } + end } + end + + if initiative then + + if not initiative.member_info.supported or active_trustee_id then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag { content = _"I like this initiative and I want to support it" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () ui.tag { tag = "li", content = function () - ui.tag { content = function () - ui.link { - external = "#suggestions", - content = _"you restricted your support by rating suggestions as must or must not" - } - end } - end } - end - ui.tag { tag = "li", content = function () - ui.tag { content = function () ui.link { - xattr = { class = "btn btn-remove" }, - module = "initiative", action = "remove_support", + module = "initiative", action = "add_support", routing = { default = { mode = "redirect", module = "initiative", view = "show", id = initiative.id } }, id = initiative.id, - text = _"remove my support" + text = _"add my support" } end } end } end } - end } - - end -- not supported - - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = _"I want to improve this initiative" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - if issue.state == "verification" then - ui.tag { tag = "li", content = _"this issue is in verification phase, therefore the initiative text cannot be updated anymore" } - elseif issue.state == "voting" then - ui.tag { tag = "li", content = _"this issue is in voting phase, therefore the initiative text cannot be updated anymore" } - else - if initiative.member_info.initiated then - ui.tag { tag = "li", content =_"take a look at the suggestions of your supporters" } - ui.tag { tag = "li", content =_"if you like to implement a suggestion in your proposal and/or reasons, update your initiative draft" } - ui.tag { tag = "li", content =_"to argue about suggestions, just add your arguments to your reasons in the initiative draft, so your supporters can learn about your opinion" } + else -- if not supported + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + --[[ + if initiative.member_info.satisfied then + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + else + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "warning" } end - - if not initiative.member_info.supported or active_trustee_id then - ui.tag { tag = "li", content =_"add your support (see above) and rate or write new suggestions (and thereby restrict your support to certain conditions if necessary)" } - else - ui.tag { tag = "li", content = _"take a look at the suggestions (see left) and rate them" } + --]] + ui.tag{ content = _"You are supporting this initiative" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if not initiative.member_info.satisfied then + ui.tag { tag = "li", content = function () + ui.tag { content = function () + ui.link { + external = "#suggestions", + content = _"you restricted your support by rating suggestions as must or must not" + } + end } + end } + end ui.tag { tag = "li", content = function () - ui.link { - module = "suggestion", view = "new", params = { - initiative_id = initiative.id - }, - content = _"write a new suggestion" - } + ui.tag { content = function () + ui.link { + xattr = { class = "btn btn-remove" }, + module = "initiative", action = "remove_support", + routing = { default = { + mode = "redirect", module = "initiative", view = "show", id = initiative.id + } }, + id = initiative.id, + text = _"remove my support" + } + end } end } + end } + end } + + end -- not supported + + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"I want to improve this initiative" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if issue.state == "verification" then + ui.tag { tag = "li", content = _"this issue is in verification phase, therefore the initiative text cannot be updated anymore" } + elseif issue.state == "voting" then + ui.tag { tag = "li", content = _"this issue is in voting phase, therefore the initiative text cannot be updated anymore" } + else + + if initiative.member_info.initiated then + ui.tag { tag = "li", content =_"take a look at the suggestions of your supporters" } + ui.tag { tag = "li", content =_"if you like to implement a suggestion in your proposal and/or reasons, update your initiative draft" } + ui.tag { tag = "li", content =_"to argue about suggestions, just add your arguments to your reasons in the initiative draft, so your supporters can learn about your opinion" } + end + + if not initiative.member_info.supported or active_trustee_id then + ui.tag { tag = "li", content =_"add your support (see above) and rate or write new suggestions (and thereby restrict your support to certain conditions if necessary)" } + else + ui.tag { tag = "li", content = _"take a look at the suggestions (see right) and rate them" } + ui.tag { tag = "li", content = function () + ui.link { + module = "suggestion", view = "new", params = { + initiative_id = initiative.id + }, + content = _"write a new suggestion" + } + end } + end end + end } + end } + + end + + if + (issue.state == "admission" or + issue.state == "discussion" or + issue.state == "verification") + then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + if initiative then + ui.tag{ content = _"I don't like this initiative and I want to add my opinion or counter proposal" } + else + ui.tag{ content = _"I don't like any of the initiative in this issue and I want to add my opinion or counter proposal" } end + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link { + module = "issue", view = "show", id = issue.id, + content = _"take a look at the competing initiatives" + } + end } + ui.tag { tag = "li", content = function () + ui.link { + module = "initiative", view = "new", + params = { issue_id = issue.id }, + content = _"start a new competing initiative" + } + end } + end } end } - end } + end end - if - (issue.state == "admission" or - issue.state == "discussion" or - issue.state == "verification") - then - ui.sidebarSection( function () - if initiative then - ui.heading{ level = 3, content = _"I don't like this initiative and I want to add my opinion or counter proposal" } - else - ui.heading{ level = 3, content = _"I don't like any of the initiative in this issue and I want to add my opinion or counter proposal" } - end + if not config.disable_delegations and privileged_to_vote and not issue.closed then + + if not issue.member_info.first_trustee_id then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"I want to delegate this issue" } + + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + issue_id = issue.id, + initiative_id = initiative and initiative.id or nil + }, + content = _"choose issue delegatee" + } + end } + end } + end } + end + + end + + if initiator and initiator.accepted == false then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag { content = _"You refused to become initiator of this initiative" } ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link { - module = "issue", view = "show", id = issue.id, - content = _"take a look at the competing initiatives" - } - end } - ui.tag { tag = "li", content = function () - ui.link { - module = "initiative", view = "new", - params = { issue_id = issue.id }, - content = _"start a new competing initiative" + ui.tag{ tag = "li", content = function () + ui.link{ + text = _"allow invitation again", + module = "initiative", + action = "remove_initiator", + params = { + initiative_id = initiative.id, + member_id = app.session.member.id + }, + routing = { + ok = { + mode = "redirect", + module = "initiative", + view = "show", + id = initiative.id + } + } } end } end } - end ) - end - - end - - if privileged_to_vote and not issue.closed then - - if not issue.member_info.first_trustee_id then - ui.sidebarSection( function () - ui.heading{ level = 3, content = _"I want to delegate this issue" } + end } + end - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - issue_id = issue.id, - initiative_id = initiative and initiative.id or nil - }, - content = _"choose issue delegatee" - } - end } - end } - end ) - end + - end - - if initiator and initiator.accepted == false then - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = function() - ui.tag { content = _"You refused to become initiator of this initiative" } - end } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag{ tag = "li", content = function () - ui.link{ - text = _"allow invitation again", - module = "initiative", - action = "remove_initiator", - params = { - initiative_id = initiative.id, - member_id = app.session.member.id - }, - routing = { - ok = { - mode = "redirect", - module = "initiative", - view = "show", - id = initiative.id - } - } - } - end } - end } - end } - end - - - - if privileged_to_vote then - - if initiative and - (issue.state == "admission" or - issue.state == "discussion" or - issue.state == "verification") - then + if privileged_to_vote then - elseif issue.state == "verification" then - - elseif issue.state == "voting" then - if not issue.member_info.direct_voted then - if not issue.member_info.non_voter then - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = _"I like to vote on this issue:" } + if initiative and + (issue.state == "admission" or + issue.state == "discussion" or + issue.state == "verification") + then + + elseif issue.state == "verification" then + + elseif issue.state == "voting" then + if not issue.member_info.direct_voted then + if not issue.member_info.non_voter then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"I like to vote on this issue:" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.tag { content = function () + if not issue.closed then + ui.link { + xattr = { class = "btn btn-vote" }, + module = "vote", view = "list", + params = { issue_id = issue.id }, + text = _"vote now" + } + end + end } + end } + end } + end } + end + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + if not issue.member_info.non_voter then + ui.tag{ content = _"I don't like to vote this issue (myself):" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + content = _"do not notify me about this voting anymore", + module = "vote", + action = "non_voter", + params = { issue_id = issue.id }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end } + else + ui.tag{ content = _"You do not like to vote this issue (yourself)" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + in_brackets = true, + content = _"discard", + module = "vote", + action = "non_voter", + params = { issue_id = issue.id, delete = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end } + end + end } + else + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"I like to change/revoke my vote:" } ui.tag { tag = "ul", attr = { class = "ul" }, content = function () ui.tag { tag = "li", content = function () ui.tag { content = function () @@ -509,131 +578,73 @@ xattr = { class = "btn btn-vote" }, module = "vote", view = "list", params = { issue_id = issue.id }, - text = _"vote now" + text = _"change my vote" + } + end + end } + end } + ui.tag { tag = "li", content = function () + ui.tag { content = function () + if not issue.closed then + ui.link { + module = "vote", action = "update", + params = { + issue_id = issue.id, + discard = true + }, + routing = { + default = { + mode = "redirect", + module = "issue", + view = "show", + id = issue.id + } + }, + text = _"discard my vote" } end end } end } - end } - end } + end } + + end } + end - ui.container { attr = { class = "sidebarRow" }, content = function () - if not issue.member_info.non_voter then - ui.heading { level = 3, content = _"I don't like to vote this issue (myself):" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - content = _"do not notify me about this voting anymore", - module = "vote", - action = "non_voter", - params = { issue_id = issue.id }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - end } - else - ui.heading { level = 3, content = _"You do not like to vote this issue (yourself)" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - in_brackets = true, - content = _"discard", - module = "vote", - action = "non_voter", - params = { issue_id = issue.id, delete = true }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } + end + end + + if not app.session.member or not privileged_to_vote then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"You are not entitled to vote in this unit" } + ui.tag{ tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ module = "index", view = "login", content = _"Login" } + end } + end } + end } + end + + if issue.closed then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag { content = _"This issue is closed" } + end } + end + + if initiative and config.tell_others and config.tell_others.initiative then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + + ui.heading { level = 3, content = _"Tell others about this initiative:" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + + for i, link in ipairs (config.tell_others.initiative(initiative)) do + ui.tag { tag = "li", content = function () + ui.link ( link ) end } end + end } - else - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = _"I like to change/revoke my vote:" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.tag { content = function () - if not issue.closed then - ui.link { - xattr = { class = "btn btn-vote" }, - module = "vote", view = "list", - params = { issue_id = issue.id }, - text = _"change my vote" - } - end - end } - end } - ui.tag { tag = "li", content = function () - ui.tag { content = function () - if not issue.closed then - ui.link { - module = "vote", action = "update", - params = { - issue_id = issue.id, - discard = true - }, - routing = { - default = { - mode = "redirect", - module = "issue", - view = "show", - id = issue.id - } - }, - text = _"discard my vote" - } - end - end } - end } - end } - - end } - - end + end } end - end - - if app.session.member and not privileged_to_vote then - ui.sidebarSection( _"You are not entitled to vote in this unit" ) - end - - if issue.closed then - ui.container { attr = { class = "sidebarRow" }, content = function () - ui.heading { level = 3, content = _"This issue is closed" } - end } - end + end } - if initiative and config.tell_others and config.tell_others.initiative then - ui.container { attr = { class = "sidebarRow" }, content = function () - - ui.heading { level = 3, content = _"Tell others about this initiative:" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - - for i, link in ipairs (config.tell_others.initiative(initiative)) do - ui.tag { tag = "li", content = function () - ui.link ( link ) - end } - end - - end } - end } - end - - -end ) +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/history.lua --- a/app/main/issue/history.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/history.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,9 +1,14 @@ local issue = Issue:by_id(param.get_id()) issue:load_everything_for_member_id ( app.session.member_id ) +execute.view{ + module = "issue", view = "_head", params = { + issue = issue, for_history = true + } +} + execute.view { - module = "issue", view = "_head", - params = { issue = issue, member = app.session.member } + module = "issue", view = "_list", params = { for_issue = issue } } execute.view { @@ -13,16 +18,6 @@ } } -execute.view{ module = "issue", view = "_sidebar_state", params = { - issue = issue -} } - -execute.view { - module = "issue", view = "_sidebar_whatcanido", params = { - issue = issue - } -} - execute.view { module = "issue", view = "_sidebar_members", params = { issue = issue @@ -31,17 +26,4 @@ -ui.section( function() - - execute.view{ - module = "issue", view = "_head2", params = { - issue = issue, for_history = true - } - } - execute.view { - module = "issue", view = "_list2", params = { for_issue = issue } - } - -end ) - diff -r 7ea154c9238a -r 32cc544d5a5b app/main/issue/show.lua --- a/app/main/issue/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/issue/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,11 +1,15 @@ local issue = Issue:by_id ( param.get_id () ) if not issue then - execute.view { module = "index", view = "404" } - request.set_status("404 Not Found") - return + return execute.view { module = "index", view = "404" } end +app.current_issue = issue + +issue.area:load_delegation_info_once_for_member_id(app.session.member_id) + +execute.view{ module = "issue", view = "_head", params = { issue = issue } } + local initiatives = issue.initiatives if app.session.member_id then @@ -17,111 +21,109 @@ app.html_title.title = _("Issue ##{id}", { id = issue.id }) end -execute.view { - module = "issue", view = "_head", - params = { issue = issue, member = app.session.member } -} - -execute.view{ module = "issue", view = "_sidebar_state", params = { - issue = issue -} } +ui.grid{ content = function() + + ui.cell_main{ content = function() -execute.view { - module = "issue", view = "_sidebar_whatcanido", params = { - issue = issue - } -} + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Competing initiatives" } + end } + execute.view { + module = "initiative", view = "_list", + params = { + issue = issue, + initiatives = initiatives + } + } + end } -execute.view { - module = "issue", view = "_sidebar_members", params = { - issue = issue - } -} + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Details" } + end } -ui.section( function () - - execute.view{ - module = "issue", view = "_head2", params = { - issue = issue - } - } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + local policy = issue.policy + ui.form{ + record = issue, + readonly = true, + attr = { class = "sectionRow form" }, + content = function() + if issue.snapshot then + ui.field.timestamp{ label = _"Last counting:", value = issue.snapshot } + end + ui.field.text{ label = _"Population", name = "population" } + ui.field.timestamp{ label = _"Created at", name = "created" } + if policy.polling then + ui.field.text{ label = _"Admission time", value = _"Implicitly admitted" } + else + ui.field.text{ label = _"Minimum admission time", value = format.interval_text(issue.min_admission_time_text) } + ui.field.text{ label = _"Maximum admission time", value = format.interval_text(issue.max_admission_time_text) } + ui.field.text{ label = _"Issue quorum", value = issue.issue_quorum } + end + if issue.accepted then + ui.field.timestamp{ label = _"Accepted at", name = "accepted" } + end + ui.field.text{ label = _"Discussion time", value = format.interval_text(issue.discussion_time_text) } + if issue.half_frozen then + ui.field.timestamp{ label = _"Half frozen at", name = "half_frozen" } + end + ui.field.text{ label = _"Verification time", value = format.interval_text(issue.verification_time_text) } + ui.field.text{ + label = _"Initiative quorum", + value = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den) + } + if issue.fully_frozen then + ui.field.timestamp{ label = _"Fully frozen at", name = "fully_frozen" } + end + ui.field.text{ label = _"Voting time", value = format.interval_text(issue.voting_time_text) } + if issue.closed then + ui.field.timestamp{ label = _"Closed", name = "closed" } + end + end + } - if issue.initiatives[1].rank == 1 then - execute.view{ module = "initiative", view = "_sidebar_state", params = { - initiative = issue.initiatives[1] - } } - end - - ui.sectionRow( function () + if issue.initiatives[1].rank == 1 then + execute.view{ module = "initiative", view = "_sidebar_state", params = { + initiative = issue.initiatives[1] + } } + end + + end } + + end } + + end } + + ui.cell_sidebar{ content = function() + if config.logo then + config.logo() + end execute.view { - module = "initiative", view = "_list", - params = { + module = "issue", view = "_sidebar", + params = { issue = issue, - initiatives = initiatives + member = app.session.member } } - end ) - -end ) -ui.section(function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Details" } - end ) - local policy = issue.policy - ui.form{ - record = issue, - readonly = true, - attr = { class = "sectionRow form" }, - content = function() - if issue.snapshot then - ui.field.timestamp{ label = _"Last counting:", value = issue.snapshot } - end - ui.field.text{ label = _"Population", name = "population" } - ui.field.timestamp{ label = _"Created at", name = "created" } - if policy.polling then - ui.field.text{ label = _"Admission time", value = _"Implicitly admitted" } - else - ui.field.text{ label = _"Minimum admission time", value = format.interval_text(issue.min_admission_time_text) } - ui.field.text{ label = _"Maximum admission time", value = format.interval_text(issue.max_admission_time_text) } - ui.field.text{ - label = _"Issue quorum", - value = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) + execute.view { + module = "issue", view = "_sidebar_whatcanido", + params = { + issue = issue, + member = app.session.member + } + } + + if not config.voting_only or issue.state ~= "voting" then + execute.view { + module = "issue", view = "_sidebar_members", params = { + issue = issue } - if issue.population then - ui.field.text{ - label = _"Currently required", - value = math.ceil(issue.population * policy.issue_quorum_num / policy.issue_quorum_den) - } - end - end - if issue.accepted then - ui.field.timestamp{ label = _"Accepted at", name = "accepted" } - end - ui.field.text{ label = _"Discussion time", value = format.interval_text(issue.discussion_time_text) } - if issue.half_frozen then - ui.field.timestamp{ label = _"Half frozen at", name = "half_frozen" } - end - ui.field.text{ label = _"Verification time", value = format.interval_text(issue.verification_time_text) } - ui.field.text{ - label = _"Initiative quorum", - value = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den) } - if issue.population then - ui.field.text{ - label = _"Currently required", - value = math.ceil(issue.population * (issue.policy.initiative_quorum_num / issue.policy.initiative_quorum_den)), - } - end - if issue.fully_frozen then - ui.field.timestamp{ label = _"Fully frozen at", name = "fully_frozen" } - end - ui.field.text{ label = _"Voting time", value = format.interval_text(issue.voting_time_text) } - if issue.closed then - ui.field.timestamp{ label = _"Closed", name = "closed" } - end end - } + end } -end ) - +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/remove_application.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_action/remove_application.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,10 @@ +local id = param.get_id() + +local application = MemberApplication:by_id(id) + +if application.member_id ~= app.session.member_id then + return +end + +application:destroy() + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update.lua --- a/app/main/member/_action/update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_action/update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,28 +1,16 @@ -local fields = { - "organizational_unit", - "internal_posts", - "realname", - "birthday", - "address", - "email", - "xmpp_address", - "website", - "phone", - "mobile_phone", - "profession", - "external_memberships", - "external_posts" -} +local profile = app.session.member.profile -local update_args = { app.session.member } - -for i, field in ipairs(fields) do - if not util.is_profile_field_locked(app.session.member, field) then - param.update(app.session.member, field) +for i, field in ipairs(config.member_profile_fields) do + if not util.is_profile_field_locked(app.session.member, field.id) then + local value = param.get(field.id) + if value == "" then + value = null + end + profile.profile[field.id] = value end end -if not util.is_profile_field_locked(app.session.member, "statement") then +if not util.is_profile_field_locked(profile, "statement") then local formatting_engine = param.get("formatting_engine") or config.enforce_formatting_engine local formatting_engine_valid = false @@ -38,24 +26,37 @@ local statement = param.get("statement") - if statement ~= app.session.member.statement or - formatting_engine ~= app.session.member.formatting_engine then - app.session.member.formatting_engine = formatting_engine - app.session.member.statement = statement - app.session.member:render_content(true) + if statement ~= profile.statement or + formatting_engine ~= profile.formatting_engine then + profile.formatting_engine = formatting_engine + profile.statement = statement + profile:render_content(true) end end -if not util.is_profile_field_locked(app.session.member, "birthday") then - if tostring(app.session.member.birthday) == "invalid_date" then - app.session.member.birthday = nil +if not util.is_profile_field_locked(profile, "birthday") then + if tostring(profile.birthday) == "invalid_date" then + profile.birthday = nil slot.put_into("error", _"Date format is not valid. Please use following format: YYYY-MM-DD") return false end end -app.session.member:save() +local search_strings = {} +for i, field in ipairs(config.member_profile_fields) do + if field.index and profile.profile[field.id] and #(profile.profile[field.id]) > 0 then + search_strings[#search_strings+1] = profile.profile[field.id] + end +end + +if profile.statement and #(profile.statement) > 0 then + search_strings[#search_strings+1] = profile.statement +end + +profile.profile_text_data = table.concat(search_strings, " ") + +profile:save() slot.put_into("notice", _"Your page has been updated") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update_agent.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_action/update_agent.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,29 @@ +if not config.role_registration then + return +end +if not app.session.member.role then + return +end + +local controller_id = param.get("controller_id") + +local member = Member:by_id(controller_id) + +if member.role then + return +end + +local agent = Agent:by_pk(app.session.member_id, controller_id) + +if param.get("delete") then + agent:destroy() + return +end + +if not agent then + agent = Agent:new() + agent.controlled_id = app.session.member_id + agent.controller_id = controller_id + agent:save() +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update_email.lua --- a/app/main/member/_action/update_email.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_action/update_email.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,7 +1,7 @@ local resend = param.get("resend", atom.boolean) if not resend and util.is_profile_field_locked(app.session.member, "notify_email") then - error("access denied") + return execute.view { module = "index", view = "403" } end if app.session.member.notify_email_locked then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update_login.lua --- a/app/main/member/_action/update_login.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_action/update_login.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ -if util.is_profile_field_locked(app.session.member, "login") then - error("access denied") +if util.is_profile_field_locked(app.session.member, "login") or app.session.member.role then + return execute.view { module = "index", view = "403" } end local login = param.get("login") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update_name.lua --- a/app/main/member/_action/update_name.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_action/update_name.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,5 @@ if util.is_profile_field_locked(app.session.member, "name") then - error("access denied") + return execute.view { module = "index", view = "403" } end local name = param.get("name") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_action/update_password.lua --- a/app/main/member/_action/update_password.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_action/update_password.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,3 +1,7 @@ +if app.session.member.role then + return execute.view { module = "index", view = "403" } +end + local old_password = param.get("old_password") local new_password1 = param.get("new_password1") local new_password2 = param.get("new_password2") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_agent_menu.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_agent_menu.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,35 @@ +if app.session.real_member_id then + local member = Member:by_id(app.session.real_member_id) + ui.tag{ tag = "li", attr = { class = item_class }, content = function() + ui.link{ + content = _("switch to: #{member_name}", { member_name = member.display_name }), + attr = { class = link_class }, + module = "role", + action = "switch" + } + end } +end + +local member_id = app.session.real_member_id or app.session.member_id + +local controlled_members_count = Member:new_selector() + :join("agent", nil, "agent.controlled_id = member.id") + :add_where("agent.accepted") + :add_where("NOT member.locked") + :add_where{ "agent.controller_id = ?", member_id } + :exec() + +for i, member in ipairs(controlled_members_count) do + if member.id ~= app.session.member_id then + ui.tag{ tag = "li", attr = { class = item_class }, content = function() + ui.link{ + content = _("switch to: #{member_name}", { member_name = member.identification }), + attr = { class = link_class }, + module = "role", + action = "switch", + id = member.id + } + end } + end +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_list.lua --- a/app/main/member/_list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -18,7 +18,7 @@ members_selector:left_join("delegating_voter", "_member_list__delegating_voter", { "_member_list__delegating_voter.issue_id = issue.id AND _member_list__delegating_voter.member_id = ?", app.session.member_id }) members_selector:add_field("member.id = ANY(_member_list__delegating_voter.delegate_member_ids)", "in_delegation_chain") else - members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id }) + members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.snapshot_id = issue.latest_snapshot_id AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id }) members_selector:add_field("member.id = ANY(_member_list__delegating_interest.delegate_member_ids)", "in_delegation_chain") end end @@ -80,7 +80,7 @@ name = paginator_name, anchor = paginator_name, selector = members_selector, - per_page = 25, + per_page = 100, content = function() ui.container{ attr = { class = "member_list" }, @@ -88,20 +88,18 @@ local members = members_selector:exec() for i, member in ipairs(members) do - ui.sectionRow( function() - execute.view{ - module = "member", - view = "_show_thumb", - params = { - class = member_class, - member = member, - initiative = initiative, - issue = issue, - trustee = trustee, - initiator = initiator - } + execute.view{ + module = "member", + view = "_show_thumb", + params = { + class = member_class, + member = member, + initiative = initiative, + issue = issue, + trustee = trustee, + initiator = initiator } - end ) + } end @@ -121,4 +119,4 @@ content = list_members, filter } -end \ No newline at end of file +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_menu.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_menu.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,31 @@ +local item_class = param.get("item_class") +local link_class = param.get("link_class") + + +ui.tag{ tag = "li", attr = { class = item_class }, content = function() + ui.link{ + content = _"profile and settings", + attr = { class = link_class }, + module = "member", + view = "show", + id = app.session.member_id + } +end } + +execute.view{ module = "member", view = "_agent_menu" } + +ui.tag{ tag = "li", attr = { class = item_class }, content = function() + ui.link{ + text = _"logout", + attr = { class = link_class }, + module = 'index', + action = 'logout', + routing = { + default = { + mode = "redirect", + module = "index", + view = "index" + } + } + } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_profile.lua --- a/app/main/member/_profile.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_profile.lua Sun Jul 15 14:07:29 2018 +0200 @@ -2,20 +2,13 @@ local for_registration = param.get("for_registration", atom.boolean) -if not member then - local member_id = param.get("member_id", atom.integer) - if member_id then - member = Member:by_id(member_id) - end -end - ui.form{ attr = { class = "form" }, record = member, readonly = true, content = function() - if not for_registration then + if not for_registration and MemberImage:by_pk(member.id, "photo", true) then ui.container { attr = { class = "member_photo" }, content = function() execute.view{ module = "member_image", @@ -42,60 +35,15 @@ if for_registration and member.notify_email then ui.field.text{ label = _"Notification email", name = "notify_email" } end - - if member.realname and #member.realname > 0 then - ui.field.text{ label = _"Real name", name = "realname" } - end - if member.email and #member.email > 0 then - ui.field.text{ label = _"email", name = "email" } - end - if member.xmpp_address and #member.xmpp_address > 0 then - ui.field.text{ label = _"xmpp", name = "xmpp_address" } - end - if member.website and #member.website > 0 then - ui.field.text{ label = _"Website", name = "website" } - end - if member.phone and #member.phone > 0 then - ui.field.text{ label = _"Phone", name = "phone" } - end - if member.mobile_phone and #member.mobile_phone > 0 then - ui.field.text{ label = _"Mobile phone", name = "mobile_phone" } + if member.profile then + local profile = member.profile.profile or {} + for i, field in ipairs(config.member_profile_fields) do + if profile[field.id] and #(profile[field.id]) > 0 then + ui.field.text{ label = field.name, name = field.id, value = profile[field.id] } + end + end end - if member.address and #member.address > 0 then - ui.container{ - content = function() - ui.tag{ - tag = "label", - attr = { class = "ui_field_label" }, - content = _"Address" - } - ui.tag{ - tag = "span", - content = function() - slot.put(encode.html_newlines(encode.html(member.address))) - end - } - end - } - end - if member.profession and #member.profession > 0 then - ui.field.text{ label = _"Profession", name = "profession" } - end - if member.birthday and #member.birthday > 0 then - ui.field.text{ label = _"Birthday", name = "birthday" } - end - if member.organizational_unit and #member.organizational_unit > 0 then - ui.field.text{ label = _"Organizational unit", name = "organizational_unit" } - end - if member.internal_posts and #member.internal_posts > 0 then - ui.field.text{ label = _"Internal posts", name = "internal_posts" } - end - if member.external_memberships and #member.external_memberships > 0 then - ui.field.text{ label = _"Memberships", name = "external_memberships", multiline = true } - end - if member.external_posts and #member.external_posts > 0 then - ui.field.text{ label = _"Posts", name = "external_posts", multiline = true } - end + if member.admin then ui.field.boolean{ label = _"Admin?", name = "admin" } end @@ -105,13 +53,13 @@ if member.last_activity then ui.field.text{ label = _"Last activity (updated daily)", value = format.date(member.last_activity) or _"not yet" } end - if member.id and member.statement and #member.statement > 0 then + if member.profile and member.profile.statement and #member.profile.statement > 0 then slot.put("
") slot.put("
") ui.container{ attr = { class = " wiki" }, content = function() - slot.put(member:get_content("html")) + slot.put(member.profile:get_content("html")) end } end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_settings_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_settings_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,155 @@ + + +ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.container{ content = _"I want to show or edit my profile" } + ui.tag { tag = "ul", content = function() + + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"show my profile", + module = "member", + view = "show", + id = app.session.member_id + } + end } + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"edit my profile", + module = "member", + view = "edit", + id = app.session.member_id + } + end } + + end } + +end } + +ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + + ui.container{ content = _"I want to change account settings" } + + ui.tag { tag = "ul", content = function() + + if not util.is_profile_field_locked(app.session.member, "login") and not app.session.member.role then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"change my login", + module = "member", + view = "settings_login", + } + end } + end + + if not util.is_profile_field_locked(app.session.member, "password") and not app.session.member.role then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"change my password", + module = "member", + view = "settings_password", + } + end } + end + + if not util.is_profile_field_locked(app.session.member, "name") then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"change my screen name", + module = "member", + view = "settings_name" + } + end } + end + + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"change avatar/photo", + module = "member", + view = "edit_images", + } + end } + + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"notification settings", + module = "member", + view = "settings_notification", + } + end } + if not util.is_profile_field_locked(app.session.member, "notify_email") then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"notification email address", + module = "member", + view = "settings_email", + } + end } + end + + if app.session.member.role then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"agents", + module = "member", + view = "settings_agent", + } + end } + end + + if config.role_registration and not app.session.member.role then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"request role account", + module = "role", + view = "request", + } + end } + end + + if config.oauth2 then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"connected applications", + module = "member", + view = "settings_applications", + } + end } + end + + if config.download_dir then + ui.tag{ tag = "li", content = function() + ui.link{ + content = _"database download", + module = "index", + view = "download", + } + end } + end + + end } + +end } + +ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + + ui.container{ content = _"Logout" } + + ui.tag { tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ + text = _"logout", + module = 'index', + action = 'logout', + routing = { + default = { + mode = "redirect", + module = "index", + view = "index" + } + } + } + end } + + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_show_thumb.lua --- a/app/main/member/_show_thumb.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_show_thumb.lua Sun Jul 15 14:07:29 2018 +0200 @@ -14,7 +14,7 @@ name_html = encode.html(member.name) end -local container_class = "member_thumb" +local container_class = "mdl-chip mdl-chip--contact clickable mdl-badge mdl-badge--overlap" if initiator and member.accepted ~= true then container_class = container_class .. " not_accepted" end @@ -40,141 +40,69 @@ container_class = container_class .. " in_delegation_chain" end +local el_id = multirand.string(32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz") +local weight = 0 +if member.weight then + weight = member.weight +end +if member.voter_weight then + weight = member.voter_weight +end + ui.container{ - attr = { class = container_class }, + attr = { id = el_id, class = container_class, ["data-badge"] = weight > 1 and "+" .. weight - 1 or nil }, content = function() - local function doit() - execute.view{ - module = "member_image", - view = "_show", - params = { - member = member, - image_type = "avatar", - show_dummy = true - } - } - ui.tag{ - attr = { class = "member_name" }, - content = function() slot.put(name_html) end + execute.view{ + module = "member_image", + view = "_show", + params = { + member = member, + image_type = "avatar", + show_dummy = true } - end + } + ui.tag{ + attr = { class = "mdl-chip__text" }, + content = function() slot.put(name_html) end + } - if app.session:has_access("everything") then - ui.link{ - attr = { title = _"Show member" }, - module = "member", - view = "show", - id = member.id, - content = doit - } - else - ui.tag{ content = doit } - end - if member.grade then slot.put ( " " ) - ui.link{ - module = "vote", - view = "list", - params = { - issue_id = initiative.issue.id, - member_id = member.id, + if member.grade > 0 then + ui.tag{ tag = "i", attr = { class = "material-icons icon-green" }, content = "thumb_up" } + elseif member.grade < 0 then + ui.tag{ tag = "i", attr = { class = "material-icons icon-red" }, content = "thumb_down" } + else + ui.tag{ tag = "i", attr = { class = "material-icons icon-yellow" }, content = "brightness_1" } + end + end + + if (member.voter_comment) then + ui.image{ + attr = { + alt = _"Voting comment available", + title = _"Voting comment available", + class = "icon24 right" }, - content = function() - if member.grade > 0 then - ui.image{ - attr = { - alt = _"Voted yes", - title = _"Voted yes", - class = "icon24 right" - }, - static = "icons/32/support_satisfied.png" - } - elseif member.grade < 0 then - ui.image{ - attr = { - alt = _"Voted no", - title = _"Voted no", - class = "icon24 right" - }, - static = "icons/32/voted_no.png" - } - else - ui.image{ - attr = { - alt = _"Abstention", - title = _"Abstention", - class = "icon24 right" - }, - static = "icons/16/bullet_yellow.png" - } - end - end + static = "icons/16/comment.png" } end - if (member.voter_comment) then - ui.link{ - module = "vote", - view = "list", - params = { - issue_id = issue.id, - member_id = member.id, - }, - content = function() - ui.image{ - attr = { - alt = _"Voting comment available", - title = _"Voting comment available", - class = "icon24 right" - }, - static = "icons/16/comment.png" - } - end - } - end - local weight = 0 - if member.weight then - weight = member.weight - end - if member.voter_weight then - weight = member.voter_weight - end - - if (issue or initiative) and weight > 1 then - local module = "interest" - if member.voter_weight then - module = "vote" - end - - slot.put ( " " ) - ui.link{ - attr = { - class = in_delegation_chain and "in_delegation_chain" or nil, - title = _"Number of incoming delegations, follow link to see more details" - }, - content = _("+ #{weight}", { weight = weight - 1 }), - module = module, - view = "show_incoming", - params = { - member_id = member.id, - initiative_id = initiative and initiative.id or nil, - issue_id = issue and issue.id or nil - } - } + if (issue or initiative) and weight > 0 then end if member.supporter then - slot.put ( " " ) - if member.supporter_satisfied then - local text = _"supporter" - ui.image{ attr = { class = "icon24 right", alt = text, title = text }, static = "icons/32/support_satisfied.png" } - else - local text = _"supporter with restricting suggestions" - ui.image{ attr = { class = "icon24 right", alt = text, title = text }, static = "icons/32/support_unsatisfied.png" } - end + ui.tag { attr = { class = "mdl-chip__action" }, content = function() + if member.supporter_satisfied then + local text = _"supporter" + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "thumb_up" } + else + local text = _"supporter with restricting suggestions" + ui.tag{ tag = "i", attr = { class = "material-icons mdl-color-text--orange-900" }, content = "thumb_up" } + end + end } end if not member.active then @@ -205,3 +133,60 @@ end } + +if member.grade or (issue and weight > 1) or app.session.member_id or app.session:has_access("everything") then + ui.tag { tag = "ul", attr = { class = "mdl-menu mdl-menu--bottom-left mdl-js-menu mdl-js-ripple-effect", ["for"] = el_id }, content = function() + if (member.grade) then + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ + attr = { class = "mdl-menu__link" }, + module = "vote", + view = "list", + params = { + issue_id = issue.id, + member_id = member.id, + }, + content = _"show ballot" + } + end } + end + if issue and weight > 1 then + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + local module = "interest" + if member.voter_weight then + module = "vote" + end + ui.link{ attr = { class = "mdl-menu__link" }, content = _"show incoming delegations", module = module, view = "show_incoming", params = { + member_id = member.id, + initiative_id = initiative and initiative.id or nil, + issue_id = issue and issue.id or nil + } } + end } + end + if app.session:has_access("everything") then + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ attr = { class = "mdl-menu__link" }, content = _"show profile", module = "member", view = "show", id = member.id } + end } + end + if app.session.member_id then + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ + attr = { class = "mdl-menu__link" }, + text = _"add to my list of private contacts", + module = "contact", + action = "add_member", + id = member.id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end + end } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_sidebar_contacts.lua --- a/app/main/member/_sidebar_contacts.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_sidebar_contacts.lua Sun Jul 15 14:07:29 2018 +0200 @@ -12,18 +12,15 @@ order = "name" } -ui.sidebar( "tab-members", function() +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Published contacts" } + end } - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Published contacts" } - end ) - - --ui.sidebarSection( function() - + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.container{ content = _"Published contacts" } if public_contacts_selector:count() == 0 then - ui.sidebarSection( function() - ui.field.text{ value = _"No published contacts" } - end ) + ui.container{ content = _"No published contacts" } else ui.paginate{ selector = public_contacts_selector, @@ -31,7 +28,7 @@ content = function() local contacts = public_contacts_selector:exec() for i, contact in ipairs(contacts) do - ui.sidebarSection( "sidebarRowNarrow", function() + ui.container{ content = function() execute.view{ module = "member_image", view = "_show", params = { member_id = contact.other_member.id, class = "micro_avatar", popup_text = contact.other_member.name, @@ -44,45 +41,118 @@ view = "show", id = contact.other_member.id } - end ) + if app.session.member_id == member.id then + ui.link{ + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "get_app" } + end, + module = "contact", + action = "add_member", + id = contact.other_member_id, + params = { public = false }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + ui.link{ + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "delete" } + end, + module = "contact", + action = "remove_member", + id = contact.other_member_id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end + end } end end } end - --end ) - - - if app.session.member_id and app.session.member_id == member.id - and private_contacts_selector:count() > 0 - then + end } + + if member.id == app.session.member_id then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"Private contacts" } + + if app.session.member_id and app.session.member_id == member.id + and private_contacts_selector:count() > 0 + then - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Private contacts" } - end ) - - ui.paginate{ - selector = private_contacts_selector, - name = "contacts", - content = function() - local contacts = private_contacts_selector:exec() - for i, contact in ipairs(contacts) do - ui.sidebarSection( "sidebarRowNarrow", function() - execute.view{ module = "member_image", view = "_show", params = { - member_id = contact.other_member.id, class = "micro_avatar", - popup_text = contact.other_member.name, - image_type = "avatar", show_dummy = true, - } } - slot.put(" ") - ui.link{ - content = contact.other_member.name, - module = "member", - view = "show", - id = contact.other_member.id - } - end ) - end + ui.paginate{ + selector = private_contacts_selector, + name = "contacts", + content = function() + local contacts = private_contacts_selector:exec() + for i, contact in ipairs(contacts) do + ui.container{ content = function() + execute.view{ module = "member_image", view = "_show", params = { + member_id = contact.other_member.id, class = "micro_avatar", + popup_text = contact.other_member.name, + image_type = "avatar", show_dummy = true, + } } + slot.put(" ") + ui.link{ + content = contact.other_member.name, + module = "member", + view = "show", + id = contact.other_member.id + } + slot.put(" ") + ui.link{ + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "publish" } + end, + module = "contact", + action = "add_member", + id = contact.other_member_id, + params = { public = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + ui.link{ + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "delete" } + end, + module = "contact", + action = "remove_member", + id = contact.other_member_id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end + end + } end - } - + end } end -end ) \ No newline at end of file +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_sidebar_whatcanido.lua --- a/app/main/member/_sidebar_whatcanido.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/_sidebar_whatcanido.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,327 +1,210 @@ local member = param.get("member", "table") -ui.sidebar( "tab-whatcanido", function() - - if not member.active then - ui.container{ attr = { class = "sidebarSection" }, content = function() - slot.put(" · ") - ui.tag{ - attr = { class = "interest deactivated_member_info" }, - content = _"This member is inactive" - } - end } - end +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" } + end } + ui.container{ attr = { class = "what-can-i-do-here" }, content = function() - if member.locked then - ui.container{ attr = { class = "sidebarSection" }, content = function() - slot.put(" · ") - ui.tag{ - attr = { class = "interest deactivated_member_info" }, - content = _"This member is locked" - } - end } - end - - - ui.sidebarHeadWhatCanIDo() - if member.id == app.session.member_id and not app.session.needs_delegation_check then - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to customize my profile" } - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - ui.tag{ tag = "li", content = function() - ui.link{ - content = _"edit profile data", - module = "member", - view = "edit" - } - end } - ui.tag{ tag = "li", content = function() - ui.link{ - content = _"change avatar/photo", - module = "member", - view = "edit_images" - } - end } - end } - end ) - --[[ - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to manage my saved contacts" } - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - ui.tag{ tag = "li", content = function() + if not member.active then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + slot.put(" · ") + ui.tag{ + attr = { class = "interest deactivated_member_info" }, + content = _"This member is inactive" + } + end } + end + + if member.locked then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + slot.put(" · ") + ui.tag{ + attr = { class = "interest deactivated_member_info" }, + content = _"This member is locked" + } + end } + end - ui.link{ - content = _"show saved contacts", - module = 'contact', - view = 'list' - } - - end } - end } - end ) - --]] - - ui.sidebarSection( function() - - ui.heading { level = 3, content = _"I want to change account settings" } - - local pages = {} + if app.session.member_id == member.id then + execute.view{ module = "member", view = "_settings_list" } + end + + if app.session.member_id and not (member.id == app.session.member.id) then + + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () - pages[#pages+1] = { view = "settings_notification", text = _"notification settings" } - if not util.is_profile_field_locked(app.session.member, "notify_email") then - pages[#pages+1] = { view = "settings_email", text = _"change your notification email address" } - end - if not util.is_profile_field_locked(app.session.member, "name") then - pages[#pages+1] = { view = "settings_name", text = _"change your screen name" } - end - if not util.is_profile_field_locked(app.session.member, "login") then - pages[#pages+1] = { view = "settings_login", text = _"change your login" } - end - if not util.is_profile_field_locked(app.session.member, "password") then - pages[#pages+1] = { view = "settings_password", text = _"change your password" } - end - - if config.download_dir then - pages[#pages+1] = { module = "index", view = "download", text = _"database download" } - end - - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - for i, page in ipairs(pages) do - ui.tag{ tag = "li", content = function() - ui.link{ - module = page.module or "member", - view = page.view, - text = page.text - } - end } - end - end } - end ) - - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to logout" } - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - ui.tag{ tag = "li", content = function() - ui.link{ - text = _"logout", - module = 'index', - action = 'logout', - routing = { - default = { - mode = "redirect", - module = "index", - view = "index" + local contact = Contact:by_pk(app.session.member.id, member.id) + if not contact then + ui.tag{ content = _"I want to save this member as contact (i.e. to use as delegatee)" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + text = _"add to my list of public contacts", + module = "contact", + action = "add_member", + id = member.id, + params = { public = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } } - } - } - end } - end } - end ) - - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to change the interface language" } - ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() - for i, lang in ipairs(config.enabled_languages) do - - local langcode - - locale.do_with({ lang = lang }, function() - langcode = _("[Name of Language]") - end) - - ui.tag{ tag = "li", content = function() - ui.link{ - content = _('Select language "#{langcode}"', { langcode = langcode }), - module = "index", - action = "set_lang", - params = { lang = lang }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() + end } + ui.tag { tag = "li", content = function () + ui.link{ + text = _"add to my list of private contacts", + module = "contact", + action = "add_member", + id = member.id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } } } - } + end } + end } + elseif contact.public then + ui.tag{ content = _"You saved this member as contact (i.e. to use as delegatee) and others can see it" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + text = _"make this contact private", + module = "contact", + action = "add_member", + id = contact.other_member_id, + params = { public = false }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + ui.tag { tag = "li", content = function () + ui.link{ + text = _"remove from my contact list", + module = "contact", + action = "remove_member", + id = contact.other_member_id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + end } + else + ui.tag{ content = _"You saved this member as contact (i.e. to use as delegatee)" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + text = _"make this contact public", + module = "contact", + action = "add_member", + id = contact.other_member_id, + params = { public = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } + ui.tag { tag = "li", content = function () + ui.link{ + text = _"remove from my contact list", + module = "contact", + action = "remove_member", + id = contact.other_member_id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } + } + } + end } end } end end } - end ) - elseif app.session.member_id and not (member.id == app.session.member.id) then - - ui.sidebarSection( function () - - local contact = Contact:by_pk(app.session.member.id, member.id) - if not contact then - ui.heading { level = 3, content = _"I want to save this member as contact (i.e. to use as delegatee)" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - text = _"add to my list of public contacts", - module = "contact", - action = "add_member", - id = member.id, - params = { public = true }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - ui.tag { tag = "li", content = function () - ui.link{ - text = _"add to my list of private contacts", - module = "contact", - action = "add_member", - id = member.id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - end } - elseif contact.public then - ui.heading { level = 3, content = _"You saved this member as contact (i.e. to use as delegatee) and others can see it" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - text = _"make this contact private", - module = "contact", - action = "add_member", - id = contact.other_member_id, - params = { public = false }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - ui.tag { tag = "li", content = function () - ui.link{ - text = _"remove from my contact list", - module = "contact", - action = "remove_member", - id = contact.other_member_id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() + + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + local ignored_member = IgnoredMember:by_pk(app.session.member.id, member.id) + if not ignored_member then + ui.tag{ content = _"I do not like to hear from this member" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + attr = { class = "interest" }, + text = _"block this member", + module = "member", + action = "update_ignore_member", + id = member.id, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } } } - } + end } end } - end } - else - ui.heading { level = 3, content = _"You saved this member as contact (i.e. to use as delegatee)" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - text = _"make this contact public", - module = "contact", - action = "add_member", - id = contact.other_member_id, - params = { public = true }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - ui.tag { tag = "li", content = function () - ui.link{ - text = _"remove from my contact list", - module = "contact", - action = "remove_member", - id = contact.other_member_id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() + else + ui.tag{ content = _"You blocked this member (i.e. you will not be notified about this members actions)" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link{ + text = _"unblock member", + module = "member", + action = "update_ignore_member", + id = member.id, + params = { delete = true }, + routing = { + default = { + mode = "redirect", + module = request.get_module(), + view = request.get_view(), + id = request.get_id_string(), + params = request.get_param_strings() + } } } - } + end } end } - end } - end - end ) - - ui.sidebarSection( function() - local ignored_member = IgnoredMember:by_pk(app.session.member.id, member.id) - if not ignored_member then - ui.heading { level = 3, content = _"I do not like to hear from this member" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - attr = { class = "interest" }, - text = _"block this member", - module = "member", - action = "update_ignore_member", - id = member.id, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - end } - else - ui.heading { level = 3, content = _"You blocked this member (i.e. you will not be notified about this members actions)" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link{ - text = _"unblock member", - module = "member", - action = "update_ignore_member", - id = member.id, - params = { delete = true }, - routing = { - default = { - mode = "redirect", - module = request.get_module(), - view = request.get_view(), - id = request.get_id_string(), - params = request.get_param_strings() - } - } - } - end } - end } - end - end ) - end -end ) \ No newline at end of file + end + end } + + end + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/_timeline.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/_timeline.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,51 @@ +local member = param.get("member", "table") + +local events = Event:by_member_id(member.id) + +local last_date + +for i, event in ipairs(events) do + + ui.container{ content = function() + + local date = atom.date(event.occurrence) + if date ~= last_date then + last_date = date + ui.heading{ level = 3, content = format.date(date) } + end + + local date_dumped = atom.dump(event.occurrence) + local time = atom.time:load(string.sub(date_dumped, 12, #date_dumped)) + + ui.tag{ content = format.time(time) } + + slot.put(" ") + + if event.event == "member_active" then + ui.tag{ content = _"account activated" } + end + + if event.event == "initiative_created_in_new_issue" then + ui.tag{ content = _("created #{initiative} (as new issue)", { initiative = event.initiative.display_name }) } + end + + if event.event == "interest" then + if event.value == 1 then + ui.tag{ content = _("added interest to #{issue}", { issue = event.issue.name }) } + else + ui.tag{ content = _"removed interest" } + end + end + + if event.event == "support" then + if event.value == 1 then + ui.tag{ content = _("added support to #{initiative}", { initiative = event.initiative.display_name }) } + else + ui.tag{ content = _"removed support" } + end + end + + end } + + +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/edit.lua --- a/app/main/member/edit.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/edit.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,117 +1,122 @@ ui.titleMember(_"Edit your profile data") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +local profile = app.session.member.profile + +ui.grid{ content = function() + ui.cell_main{ content = function() -ui.form{ - record = app.session.member, - attr = { class = "vertical" }, - module = "member", - action = "update", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - - ui.section( function() - - ui.sectionHead( function() - ui.heading{ level = 1, content = _"Edit your profile data" } - end ) - - ui.sectionRow( _"All fields are optional. Please enter only data which should be published." ) - - ui.sectionRow( function() - - ui.field.text{ label = _"Organizational unit", name = "organizational_unit", readonly = config.locked_profile_fields.organizational_unit } - ui.field.text{ label = _"Internal posts", name = "internal_posts", readonly = config.locked_profile_fields.internal_posts } - ui.field.text{ label = _"Real name", name = "realname", readonly = config.locked_profile_fields.realname } - ui.field.text{ label = _"Birthday" .. " YYYY-MM-DD ", name = "birthday", attr = { id = "profile_birthday" }, readonly = config.locked_profile_fields.birthday } - ui.script{ static = "gregor.js/gregor.js" } - util.gregor("profile_birthday", "document.getElementById('timeline_search_date').form.submit();") - ui.field.text{ label = _"Address", name = "address", multiline = true, readonly = config.locked_profile_fields.address } - ui.field.text{ label = _"email", name = "email", readonly = config.locked_profile_fields.email } - ui.field.text{ label = _"xmpp", name = "xmpp_address", readonly = config.locked_profile_fields.xmpp_address } - ui.field.text{ label = _"Website", name = "website", readonly = config.locked_profile_fields.website } - ui.field.text{ label = _"Phone", name = "phone", readonly = config.locked_profile_fields.phone } - ui.field.text{ label = _"Mobile phone", name = "mobile_phone", readonly = config.locked_profile_fields.mobile_phone } - ui.field.text{ label = _"Profession", name = "profession", readonly = config.locked_profile_fields.profession } - ui.field.text{ label = _"External memberships", name = "external_memberships", multiline = true, readonly = config.locked_profile_fields.external_memberships } - ui.field.text{ label = _"External posts", name = "external_posts", multiline = true, readonly = config.locked_profile_fields.external_posts } + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Edit your profile data" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.form{ + record = profile, + attr = { class = "vertical" }, + module = "member", + action = "update", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "show", + id = app.session.member_id + } + }, + content = function() + + ui.container{ content = _"All fields are optional. Please enter only data which should be published." } + + for i, field in ipairs(config.member_profile_fields) do + ui.container{ + attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + content = function() + ui.tag{ tag = "input", attr = { class = "mdl-textfield__input", name = field.id, id = "input_" .. field.id, readonly = config.locked_profile_fields[field.id], value = profile and profile.profile and profile.profile[field.id] or nil } } + ui.tag{ tag = "label", attr = { class = "mdl-textfield__label", ["for"] = "input_" .. field.id }, content = field.name } + end } + slot.put("
") + end - if not config.enforce_formatting_engine then - ui.field.select{ - label = _"Wiki engine for statement", - name = "formatting_engine", - foreign_records = config.formatting_engines, - attr = {id = "formatting_engine"}, - foreign_id = "id", - foreign_name = "name", - value = param.get("formatting_engine") - } - ui.tag{ - tag = "div", - content = function() - ui.tag{ - tag = "label", - attr = { class = "ui_field_label" }, - content = function() slot.put(" ") end, + if not config.enforce_formatting_engine then + ui.field.select{ + label = _"Wiki engine for statement", + name = "formatting_engine", + foreign_records = config.formatting_engines, + attr = {id = "formatting_engine"}, + foreign_id = "id", + foreign_name = "name", + value = param.get("formatting_engine") } ui.tag{ + tag = "div", content = function() - ui.link{ - text = _"Syntax help", - module = "help", - view = "show", - id = "wikisyntax", - attr = {onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"} + ui.tag{ + tag = "label", + attr = { class = "ui_field_label" }, + content = function() slot.put(" ") end, } - slot.put(" ") - ui.link{ - text = _"(new window)", - module = "help", - view = "show", - id = "wikisyntax", - attr = {target = "_blank", onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"} + ui.tag{ + content = function() + ui.link{ + text = _"Syntax help", + module = "help", + view = "show", + id = "wikisyntax", + attr = {onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"} + } + slot.put(" ") + ui.link{ + text = _"(new window)", + module = "help", + view = "show", + id = "wikisyntax", + attr = {target = "_blank", onClick="this.href=this.href.replace(/wikisyntax[^.]*/g, 'wikisyntax_'+getElementById('formatting_engine').value)"} + } + end } end } end - } - end - ui.field.text{ - label = _"Statement", - name = "statement", - multiline = true, - attr = { style = "height: 50ex;" }, - value = param.get("statement") + ui.field.text{ + label = _"Statement", + name = "statement", + multiline = true, + attr = { style = "height: 50ex;" }, + value = param.get("statement") + } + slot.put("
") + ui.container{ attr = { class = "actions" }, content = function() + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect", + value = _"publish profile data" + }, + content = "" + } + slot.put("   ") + ui.link{ + attr = { + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect", + }, + content = _"cancel", + module = "member", view = "show", id = app.session.member.id + } + end } + end } - slot.put("
") - ui.container{ attr = { class = "actions" }, content = function() - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"publish profile data" - }, - content = "" - } - slot.put("


") - ui.link{ - content = _"cancel", - module = "member", view = "show", id = app.session.member.id - } - end } - end ) - end ) - end -} \ No newline at end of file + + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/edit_images.lua --- a/app/main/member/edit_images.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/edit_images.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,76 +1,88 @@ ui.titleMember(_"avatar/photo") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Upload avatar/photo" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + ui.form{ + record = app.session.member, + attr = { + class = "vertical section", + enctype = 'multipart/form-data' + }, + module = "member", + action = "update_images", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings" + } + }, + content = function() + execute.view{ + module = "member_image", + view = "_show", + params = { + class = "float-right", + member = app.session.member, + image_type = "avatar", + force_update = true + } + } + ui.heading { level = 4, content = _"Avatar"} + ui.container { content = _"Your avatar is a small photo, which will be shown always next to your name." } + slot.put("
") + ui.field.image{ field_name = "avatar" } -ui.form{ - record = app.session.member, - attr = { - class = "vertical section", - enctype = 'multipart/form-data' - }, - module = "member", - action = "update_images", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Upload avatar/photo" } - end ) - ui.sectionRow( function() - execute.view{ - module = "member_image", - view = "_show", - params = { - class = "right", - member = app.session.member, - image_type = "avatar", - force_update = true + execute.view{ + module = "member_image", + view = "_show", + params = { + class = "float-right", + member = app.session.member, + image_type = "photo", + force_update = true + } + } + ui.heading { level = 4, content = _"Photo"} + ui.container { content = _"Your photo will be shown in your profile." } + slot.put("
") + ui.field.image{ field_name = "photo" } + slot.put("
") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"publish avatar/photo" + }, + content = "" + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + content = _"cancel", + module = "member", view = "settings" + } + end } + + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member } - ui.heading { level = 2, content = _"Avatar"} - ui.container { content = _"Your avatar is a small photo, which will be shown always next to your name." } - slot.put("
") - ui.field.image{ field_name = "avatar" } - slot.put("

") - execute.view{ - module = "member_image", - view = "_show", - params = { - class = "right", - member = app.session.member, - image_type = "photo", - force_update = true - } - } - ui.heading { level = 2, content = _"Photo"} - ui.container { content = _"Your photo will be shown in your profile." } - slot.put("
") - ui.field.image{ field_name = "photo" } - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"publish avatar/photo" - }, - content = "" - } - slot.put("


") - ui.link{ - content = _"cancel", - module = "member", view = "show", id = app.session.member.id - } - end ) - end -} \ No newline at end of file + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/history.lua --- a/app/main/member/history.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/history.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,72 +1,93 @@ local member = Member:by_id(param.get_id()) +if not member then + execute.view { module = "index", view = "404" } + request.set_status("404 Not Found") + return +end + + ui.titleMember(member) -ui.section( function() - - ui.sectionHead( function() - ui.heading{ level = 1, content = _"Account history" } - end) +ui.grid{ content = function() + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Account history" } + end } - ui.sectionRow( function() - ui.form{ - attr = { class = "vertical" }, - content = function() - ui.field.text{ label = _"Current name", value = member.name } - ui.field.text{ label = _"Current status", value = member.active and _'activated' or _'deactivated' } - end - } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + + + ui.form{ + attr = { class = "vertical" }, + content = function() + ui.field.text{ label = _"Current name", value = member.name } + ui.field.text{ label = _"Current status", value = member.active and _'activated' or _'deactivated' } + end + } - local entries = member:get_reference_selector("history_entries"):add_order_by("id DESC"):exec() - - if #entries > 0 then - ui.tag{ - tag = "table", - content = function() + local entries = member:get_reference_selector("history_entries"):add_order_by("id DESC"):exec() + + if #entries > 0 then ui.tag{ - tag = "tr", + tag = "table", content = function() ui.tag{ - tag = "th", - content = _("Name") + tag = "tr", + content = function() + ui.tag{ + tag = "th", + content = _("Name") + } + ui.tag{ + tag = "th", + content = _("Status") + } + ui.tag{ + tag = "th", + content = _("until") + } + end } - ui.tag{ - tag = "th", - content = _("Status") - } - ui.tag{ - tag = "th", - content = _("until") - } + for i, entry in ipairs(entries) do + ui.tag{ + tag = "tr", + content = function() + ui.tag{ + tag = "td", + content = entry.name + } + ui.tag{ + tag = "td", + content = entry.active and _'activated' or _'deactivated', + } + ui.tag{ + tag = "td", + content = format.timestamp(entry["until"]) + } + end + } + end end } - for i, entry in ipairs(entries) do - ui.tag{ - tag = "tr", - content = function() - ui.tag{ - tag = "td", - content = entry.name - } - ui.tag{ - tag = "td", - content = entry.active and _'activated' or _'deactivated', - } - ui.tag{ - tag = "td", - content = format.timestamp(entry["until"]) - } - end - } - end end + slot.put("
") + ui.container{ + content = _("This member account has been created at #{created}", { created = format.timestamp(member.activated)}) + } + + end} + end} + end } + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = member } - end - slot.put("
") - ui.container{ - content = _("This member account has been created at #{created}", { created = format.timestamp(member.activated)}) } - end) + end } -end) \ No newline at end of file +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/list.lua --- a/app/main/member/list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -3,17 +3,21 @@ local members_selector = Member:new_selector() :add_where("activated NOTNULL") -ui.section( function() +ui.grid{ content = function() + ui.cell_full{ content = function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Member list" } - end ) + ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function() - ui.sectionRow( function() - execute.view{ - module = "member", - view = "_list", - params = { members_selector = members_selector } - } - end ) -end ) + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Member list" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + execute.view{ + module = "member", + view = "_list", + params = { members_selector = members_selector } + } + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/settings.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,55 @@ +execute.view{ module = "index", view = "_lang_chooser" } + +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Settings" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local agents = Agent:new_selector() + :add_where{ "controller_id = ?", app.session.member_id } + :add_where{ "accepted ISNULL" } + :exec() + + if #agents > 0 then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.container{ content = _"You have been granted access to the following account(s):" } + for i, agent in ipairs(agents) do + local member = Member:by_id(agent.controlled_id) + ui.tag { tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ + module = "agent", view = "show", params = { controlled_id = agent.controlled_id }, + content= _("Account access invitation from '#{member_name}'", { member_name = member.name }) + } + end } + end } + end + end } + end + + + local controlled_members_count = Member:new_selector() + :join("agent", nil, "agent.controlled_id = member.id") + :add_where("agent.accepted") + :add_where("NOT member.locked") + :add_where{ "agent.controller_id = ?", app.session.member_id } + :count() + if controlled_members_count > 0 or app.session.real_member_id then + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.container{ content = _"I want to switch to another account" } + ui.tag { tag = "ul", content = function() + execute.view{ module = "member", view = "_agent_menu" } + end } + end } + end + + execute.view{ module = "member", view = "_settings_list" } + + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_agent.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/settings_agent.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,118 @@ +if not app.session.member.role then + return +end + +ui.titleMember(_"Account access") + +ui.grid{ content = function() + + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Agents" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local agents = Agent:new_selector() + :add_where{ "controlled_id = ?", app.session.member_id } + :exec() + + if #(agents) > 0 then + ui.list{ + records = agents, + columns = { + { + label = _"Account access by member", + content = function(record) + ui.tag{ content = record.controller.name } + end + }, + { + label = _"Status", + content = function(record) + local text + if record.accepted then + text = _"accepted" + elseif record.accepted == false then + text = _"rejected" + else + text = _"not decided yet" + end + ui.tag{ content = text } + end + }, + { + content = function(record) + ui.link{ content = _"Revoke", module = "member", action = "update_agent", params = { delete = true, controller_id = record.controller_id } } + end + }, + } + } + else + ui.container{ content = _"No other members are allowed to use this account." } + end + + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + ui.form{ + attr = { class = "wide" }, + module = "member", + action = "update_agent", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings_agent" + } + }, + content = function() + + ui.container{ content = _"Add new account access privilege" } + + local contact_members = Member:build_selector{ + is_contact_of_member_id = app.session.member_id, + active = true, + order = "name" + }:add_where("NOT member.role"):exec() + + ui.field.select{ + name = "controller_id", + foreign_records = contact_members, + foreign_id = "id", + foreign_name = "name" + } + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Grant account access" + }, + content = "" + } + slot.put("   ") + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "member", view = "show", id = app.session.member_id, + content = _"Cancel" + } + end + } + + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_applications.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/member/settings_applications.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,41 @@ +ui.titleMember(_"Connected applications") + +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Connected applications" } + end } + + local applications = MemberApplication:by_member_id(app.session.member_id) + + for i, application in ipairs(applications) do + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + if application.system_application_id then + ui.heading{ level = 2, content = application.system_application.name } + else + ui.heading{ level = 2, content = application.domain } + end + local scopes = {} + for scope in string.gmatch(application.scope, "[^ ]+") do + scopes[#scopes+1] = util.scope_name(scope) + end + local scopes_string = table.concat(scopes, ", ") + ui.container{ content = scopes_string } + ui.link{ content = _"Remove application", module = "member", action = "remove_application", id = application.id } + end } + end + + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_email.lua --- a/app/main/member/settings_email.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/settings_email.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,59 +1,73 @@ ui.titleMember(_"Email address") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() -ui.form{ - attr = { class = "vertical" }, - module = "member", - action = "update_email", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - ui.section( function() - - ui.sectionHead( function() - ui.heading { level = 1, content = _"Email address for notifications" } - end ) + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Email address for notifications" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() - ui.sectionRow( function() - if app.session.member.notify_email then - ui.field.text{ label = _"confirmed address", value = app.session.member.notify_email, readonly = true } - end - if app.session.member.notify_email_unconfirmed then - ui.field.text{ label = _"unconfirmed address", value = app.session.member.notify_email_unconfirmed, readonly = true } - end - if app.session.member.notify_email or app.session.member.notify_email_unconfirmed then - slot.put("
") - end - ui.heading { level = 2, content = _"Enter a new email address:" } - ui.field.text{ name = "email" } - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"Save" + ui.form{ + attr = { class = "vertical" }, + module = "member", + action = "update_email", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings" + } }, - content = "" + content = function() + if app.session.member.notify_email then + ui.field.text{ label = _"confirmed address", value = app.session.member.notify_email, readonly = true } + end + if app.session.member.notify_email_unconfirmed then + ui.field.text{ label = _"unconfirmed address", value = app.session.member.notify_email_unconfirmed, readonly = true } + end + if app.session.member.notify_email or app.session.member.notify_email_unconfirmed then + slot.put("
") + end + ui.heading { level = 4, content = _"Enter a new email address:" } + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__notify_email", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__notify_email" }, + label = _'email address', + name = 'email', + value = '' + } + slot.put("
") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Save" + }, + content = "" + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + content = _"Cancel", + module = "member", view = "settings" + } + end } - slot.put("


") - ui.link{ - content = _"Cancel", - module = "member", view = "show", id = app.session.member.id - } - end ) - end ) - end -} + + end } + end } + end } + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_login.lua --- a/app/main/member/settings_login.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/settings_login.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,52 +1,69 @@ ui.titleMember(_"login name") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Login name" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() -ui.form{ - attr = { class = "wide" }, - module = "member", - action = "update_login", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - ui.section( function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Login name" } - end ) + ui.form{ + attr = { class = "wide" }, + module = "member", + action = "update_login", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings" + } + }, + content = function() - ui.sectionRow( function() - ui.heading { level = 2, content = _"Enter a new login name" } - ui.field.text{ name = "login", value = app.session.member.login } - - slot.put("
") - - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"Save" - }, - content = "" + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__login", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__login" }, + label= _'Login', + name = 'login', + value = app.session.member.login + } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Save" + }, + content = "" + } + slot.put("  ") + + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "member", view = "settings", + content = _"Cancel" + } + end } - slot.put("


") + + + end } + end } + end } - ui.link { - module = "member", view = "show", id = app.session.member_id, - content = _"Cancel" - } - end ) - end ) - end -} + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_name.lua --- a/app/main/member/settings_name.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/settings_name.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,50 +1,66 @@ ui.titleMember(_"Screen name") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() -ui.form{ - attr = { class = "wide" }, - module = "member", - action = "update_name", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - ui.section( function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Screen name" } - end ) + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Screen name" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() - ui.sectionRow( function() - ui.heading { level = 2, content = _"Enter a new screen name:" } - ui.field.text{ name = "name", value = app.session.member.name } - - slot.put("
") - - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"Save" + ui.form{ + attr = { class = "wide" }, + module = "member", + action = "update_name", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings" + } }, - content = "" + content = function() + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__name", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__name" }, + label= _'Screen name', + name = 'name', + value = app.session.member.name + } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Save" + }, + content = "" + } + slot.put("   ") + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "member", view = "show", + content = _"Cancel" + } + end } - slot.put("


") - ui.link { - module = "member", view = "show", id = app.session.member_id, - content = _"Cancel" - } - end ) - end ) - end -} + + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_notification.lua --- a/app/main/member/settings_notification.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/settings_notification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,194 +1,224 @@ local return_to = param.get("return_to") -local return_to_area_id param.get("return_to_area_id", atom.integer) +local return_to_area_id = param.get("return_to_area_id", atom.integer) +local return_to_area = Area:by_id(return_to_area_id) ui.titleMember(_"notification settings") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"notification settings" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() -ui.form{ - attr = { class = "vertical" }, - module = "member", - action = "update_notify_level", - routing = { - ok = { - mode = "redirect", - module = return_to == "area" and "area" or return_to == "home" and "index" or "member", - view = return_to == "area" and "show" or return_to == "home" and "index" or "show", - id = return_to == "area" and return_to_area_id or return_to ~= "home" and app.session.member_id or nil - } - }, - content = function() - - ui.section( function() - - ui.sectionHead( function() - ui.heading { level = 1, content = _"Do you like to receive updates by email?" } - end ) - - ui.sectionRow( function() - - ui.container{ content = function() - ui.tag{ - tag = "input", - attr = { - id = "notify_level_all", - type = "radio", name = "disable_notifications", value = "false", - checked = not app.session.member.disable_notifications and "checked" or nil, - onchange = [[ $(".view_on_notify_level_all_false")[this.checked ? "show" : "hide"](400) ]] + ui.form{ + attr = { class = "vertical" }, + module = "member", + action = "update_notify_level", + routing = { + ok = { + mode = "redirect", + module = return_to == "area" and "index" or return_to == "home" and "index" or "member", + view = return_to == "area" and "index" or return_to == "home" and "index" or "settings", + params = return_to_area and { unit = return_to_area.unit_id, area = return_to_area.id } or nil } - } - ui.tag{ - tag = "label", attr = { ['for'] = "notify_level_all" }, - content = _"I like to receive notifications" - } - end } - - - ui.container{ attr = { class = "view_on_notify_level_all_false", style = "margin-left: 3em;" }, content = function() - slot.put("
") - - ui.container{ content = _"You will receive status update notification on issue phase changes. Additionally you can subscribe for a regular digest including updates on initiative drafts and new suggestions." } - slot.put("
") - ui.container{ content = function() - ui.tag{ - tag = "input", - attr = { - id = "digest_on", - type = "radio", name = "digest", value = "true", - checked = (app.session.member.disable_notifications or app.session.member.notification_hour ~= nil) and "checked" or nil, - onchange = [[ $(".view_on_digest_true")[this.checked ? "show" : "hide"](400) ]] + }, + content = function() + + + ui.container{ content = function() + ui.tag{ tag = "label", attr = { + class = "mdl-radio mdl-js-radio mdl-js-ripple-effect", + ["for"] = "notify_level_all" + }, + content = function() + ui.tag{ + tag = "input", + attr = { + id = "notify_level_all", + class = "mdl-radio__button", + type = "radio", name = "disable_notifications", value = "false", + checked = not app.session.member.disable_notifications and "checked" or nil, + } + } + ui.tag{ + attr = { class = "mdl-radio__label", ['for'] = "notify_level_all" }, + content = _"I like to receive notifications" + } + end } - } + end } + + + ui.container{ attr = { class = "view_on_notify_level_all_false", style = "margin-left: 3em;" }, content = function() + slot.put("
") + + ui.container{ content = _"You will receive status update notification on issue phase changes. Additionally you can subscribe for a regular digest including updates on initiative drafts and new suggestions." } + slot.put("
") + ui.container{ content = function() + ui.tag{ tag = "label", attr = { + class = "mdl-radio mdl-js-radio mdl-js-ripple-effect", + ["for"] = "digest_on" + }, + content = function() + ui.tag{ + tag = "input", + attr = { + id = "digest_on", + class = "mdl-radio__button", + type = "radio", name = "digest", value = "true", + checked = (app.session.member.disable_notifications or app.session.member.notification_hour ~= nil) and "checked" or nil, + } + } + ui.tag{ + attr = { class = "mdl-radio__label", ['for'] = "digest_on" }, + content = _"I want to receive a regular digest" + } + end + } + end } + + ui.container{ attr = { class = "view_on_digest_true", style = "margin-left: 4em;" }, content = function() + + ui.tag{ content = _"every" } + slot.put(" ") + ui.field.select{ + container_attr = { style = "display: inline-block; vertical-align: middle;" }, + attr = { style = "width: 10em;" }, + name = "notification_dow", + foreign_records = { + { id = "daily", name = _"day" }, + { id = 0, name = _"Sunday" }, + { id = 1, name = _"Monday" }, + { id = 2, name = _"Tuesday" }, + { id = 3, name = _"Wednesday" }, + { id = 4, name = _"Thursday" }, + { id = 5, name = _"Friday" }, + { id = 6, name = _"Saturday" } + }, + foreign_id = "id", + foreign_name = "name", + value = app.session.member.notification_dow + } + + slot.put(" ") + + ui.tag{ content = _"between" } + slot.put(" ") + local foreign_records = {} + for i = 0, 23 do + foreign_records[#foreign_records+1] = { + id = i, + name = string.format("%02d:00 - %02d:59", i, i), + } + end + local random_hour + if app.session.member.disable_notifications or app.session.member.notification_hour == nil then + random_hour = multirand.integer(0,23) + end + ui.field.select{ + container_attr = { style = "display: inline-block; vertical-align: middle;" }, + attr = { style = "width: 10em;" }, + name = "notification_hour", + foreign_records = foreign_records, + foreign_id = "id", + foreign_name = "name", + value = random_hour or app.session.member.notification_hour + } + end } + + ui.container{ content = function() + ui.tag{ tag = "label", attr = { + class = "mdl-radio mdl-js-radio mdl-js-ripple-effect", + ["for"] = "digest_off" + }, + content = function() + ui.tag{ + tag = "input", + attr = { + id = "digest_off", + class = "mdl-radio__button", + type = "radio", name = "digest", value = "false", + checked = not app.session.member.disable_notifications and app.session.member.notification_dow == nil and app.session.member.notification_hour == nil and "checked" or nil, + } + } + ui.tag{ + tag = "label", attr = { class = "mdl-radio__label", ['for'] = "digest_off" }, + content = _"don't send me a digest" + } + end + } + end } + end } + + slot.put("
") + + ui.container{ content = function() + ui.tag{ tag = "label", attr = { + class = "mdl-radio mdl-js-radio mdl-js-ripple-effect", + ["for"] = "notify_level_none" + }, + content = function() + ui.tag{ + tag = "input", + attr = { + id = "notify_level_none", + class = "mdl-radio__button", + type = "radio", name = "disable_notifications", value = "true", + checked = app.session.member.disable_notifications and "checked" or nil + } + } + ui.tag{ + attr = { class = "mdl-radio__label", ['for'] = "notify_level_none" }, + content = _"don't send me notifications by email" + } + end + } + end } + + slot.put("
") + ui.tag{ - tag = "label", attr = { ['for'] = "digest_on" }, - content = _"I want to receive a regular digest" + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Save" + }, + content = "" } - end } - - ui.container{ attr = { class = "view_on_digest_true", style = "margin-left: 4em;" }, content = function() - - ui.tag{ content = _"every" } - slot.put(" ") - ui.field.select{ - container_attr = { style = "display: inline-block; vertical-align: middle;" }, - attr = { style = "width: 10em;" }, - name = "notification_dow", - foreign_records = { - { id = "daily", name = _"day" }, - { id = 0, name = _"Sunday" }, - { id = 1, name = _"Monday" }, - { id = 2, name = _"Tuesday" }, - { id = 3, name = _"Wednesday" }, - { id = 4, name = _"Thursday" }, - { id = 5, name = _"Friday" }, - { id = 6, name = _"Saturday" } - }, - foreign_id = "id", - foreign_name = "name", - value = app.session.member.notification_dow - } + slot.put("   ") slot.put(" ") - - ui.tag{ content = _"between" } - slot.put(" ") - local foreign_records = {} - for i = 0, 23 do - foreign_records[#foreign_records+1] = { - id = i, - name = string.format("%02d:00 - %02d:59", i, i), + if return_to == "home" then + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "index", view = "index", + content = _"cancel" + } + else + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "member", view = "settings", + content = _"cancel" } end - local random_hour - if app.session.member.disable_notifications or app.session.member.notification_hour == nil then - random_hour = multirand.integer(0,23) - end - ui.field.select{ - container_attr = { style = "display: inline-block; vertical-align: middle;" }, - attr = { style = "width: 10em;" }, - name = "notification_hour", - foreign_records = foreign_records, - foreign_id = "id", - foreign_name = "name", - value = random_hour or app.session.member.notification_hour - } - end } - - ui.container{ content = function() - ui.tag{ - tag = "input", - attr = { - id = "digest_off", - type = "radio", name = "digest", value = "false", - checked = not app.session.member.disable_notifications and app.session.member.notification_dow == nil and app.session.member.notification_hour == nil and "checked" or nil, - onchange = [[ $(".view_on_digest_true")[this.checked ? "hide" : "show"](400) ]] - } - } - ui.tag{ - tag = "label", attr = { ['for'] = "digest_off" }, - content = _"don't send me a digest" - } - end } - end } - - slot.put("
") + + end + } - ui.container{ content = function() - ui.tag{ - tag = "input", - attr = { - id = "notify_level_none", - type = "radio", name = "disable_notifications", value = "true", - checked = app.session.member.disable_notifications and "checked" or nil, - onchange = [[ $(".view_on_notify_level_all_false")[this.checked ? "hide" : "show"](400) ]] - } - } - ui.tag{ - tag = "label", attr = { ['for'] = "notify_level_none" }, - content = _"don't send me notifications by email" - } - end } - - if app.session.member.disable_notifications then - ui.script{ script = [[ $(".view_on_notify_level_all_false").hide() ]] } - end - - if not app.session.member.disable_notifications and app.session.member.notification_hour == nil then - ui.script{ script = [[ $(".view_on_digest_true").hide() ]] } - end + end } + end } + end } - slot.put("
") - - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"Save" - }, - content = "" - } - slot.put("


") - - slot.put(" ") - if return_to == "home" then - ui.link { - module = "index", view = "index", - content = _"cancel" - } - else - ui.link { - module = "member", view = "show", id = app.session.member_id, - content = _"cancel" - } - end - end ) - end ) - - end -} - + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/settings_password.lua --- a/app/main/member/settings_password.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/settings_password.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,58 +1,88 @@ ui.titleMember(_"Password") -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = app.session.member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Password" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() -ui.form{ - attr = { class = "wide" }, - module = "member", - action = "update_password", - routing = { - ok = { - mode = "redirect", - module = "member", - view = "show", - id = app.session.member_id - } - }, - content = function() - ui.section( function() - ui.sectionHead( function() - ui.heading { level = 1, content = _"Password" } - end ) + ui.form{ + attr = { class = "wide" }, + module = "member", + action = "update_password", + routing = { + ok = { + mode = "redirect", + module = "member", + view = "settings" + } + }, + content = function() - ui.sectionRow( function() - ui.heading { level = 2, content = _"Enter your current password:" } - ui.field.password{ name = "old_password" } + ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__old_password", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__old_password" }, + label= _'Curent password', + name = 'old_password', + value = "" + } + + slot.put("
") + + ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__new_password1", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__new_password1" }, + label= _'New password', + name = 'new_password1', + value = "" + } - slot.put("
") - - ui.heading { level = 2, content = _"Enter a new password:" } - ui.field.password{ name = "new_password1" } + slot.put("
") + + ui.field.password{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-member__new_password2", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-member__new_password2" }, + label= _'Repeat new password', + name = 'new_password2', + value = "" + } - ui.heading { level = 2, content = _"Enter your new password again please:" } - ui.field.password{ name = "new_password2" } - - slot.put("
") + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Save" + }, + content = "" + } + slot.put("   ") + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "member", view = "show", id = app.session.member_id, + content = _"Cancel" + } + end + } - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - value = _"Save" - }, - content = "" - } - slot.put("


") - ui.link { - module = "member", view = "show", id = app.session.member_id, - content = _"Cancel" - } - end ) - end ) - end -} \ No newline at end of file + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member/show.lua --- a/app/main/member/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -61,129 +61,141 @@ ui.titleMember(member) -execute.view { - module = "member", view = "_sidebar_whatcanido", params = { - member = member - } -} +ui.grid{ content = function() + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + execute.view{ + module = "member_image", + view = "_show", + params = { + member = member, + image_type = "avatar", + show_dummy = true, + class = "left", + force_update = app.session.member_id == member.id + } + } + slot.put(" ") + ui.tag{ content = member.name } + end } + ui.container { + attr = { class = "float-right" }, + content = function() + ui.link{ + content = _"Account history", + module = "member", view = "history", id = member.id + } + end + } + end } + + ui.container{ attr = { class = "mdl-card__content" }, content = function() -execute.view { - module = "member", view = "_sidebar_contacts", params = { - member = member - } -} + if member.identification then + ui.container{ content = member.identification } + end + execute.view{ + module = "member", + view = "_profile", + params = { member = member } + } -ui.section( function() - ui.sectionHead( function() - execute.view{ - module = "member_image", - view = "_show", - params = { - member = member, - image_type = "avatar", - show_dummy = true, - class = "left", - force_update = app.session.member_id == member.id - } - } - ui.heading{ level = 1, content = member.name } - slot.put("
") - ui.container { - attr = { class = "right" }, - content = function() - ui.link{ - content = _"Account history", - module = "member", view = "history", id = member.id + --[[ + execute.view { + module = "member", view = "_timeline", + params = { member = member } } - end - } - if member.identification then - ui.container{ content = member.identification } + --]] + end } + end } + + if #initiated_initiatives > 0 then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Initiatives created by this member" } + end } + ui.container{ attr = { class = "initiative_list" }, content = function() + execute.view { + module = "initiative", view = "_list", + params = { initiatives = initiated_initiatives, for_member = member }, + } + end } + end } + end + + if #supported_initiatives > 0 then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What this member is currently supporting" } + end } + ui.container{ attr = { class = "initiative_list" }, content = function() + execute.view { + module = "initiative", view = "_list", + params = { initiatives = supported_initiatives, for_member = member }, + } + end } + end } end - end ) - ui.sectionRow( function() - execute.view{ - module = "member", - view = "_profile", - params = { member = member } - } - end ) -end ) + + if #voted_initiatives > 0 then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"How this member voted" } + end } + ui.container{ attr = { class = "initiative_list" }, content = function() + execute.view { + module = "initiative", view = "_list", + params = { initiatives = voted_initiatives, for_member = member }, + } + end } + end } + end + --[[ + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Outgoing delegations" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + execute.view { + module = "delegation", view = "_list", + params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, + } + end } + end } - -ui.section( function() - ui.sectionHead( function() - ui.heading { level = 2, content = _"Initiatives created by this member" } - end ) - ui.sectionRow( function() - for i, initiative in ipairs(initiated_initiatives) do - execute.view { - module = "initiative", view = "_list", - params = { initiative = initiative }, + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Incoming delegations" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + execute.view { + module = "delegation", view = "_list", + params = { delegations_selector = incoming_delegations_selector, incoming = true }, + } + end } + end } + --]] + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { member = member } - end - end ) -end ) + } -ui.section( function() - ui.sectionHead( function() - ui.heading { level = 2, content = _"What this member is currently supporting" } - end ) - ui.sectionRow( function() - for i, initiative in ipairs(supported_initiatives) do - execute.view { - module = "initiative", view = "_list", - params = { initiative = initiative }, + execute.view { + module = "member", view = "_sidebar_contacts", params = { member = member } - end - end ) -end ) - -ui.section( function() - ui.sectionHead( function() - ui.heading { level = 2, content = _"How this member voted" } - end ) - ui.sectionRow( function() - for i, initiative in ipairs(voted_initiatives) do - execute.view { - module = "initiative", view = "_list", - params = { initiative = initiative } - } - end - end ) -end ) - + } + end } -ui.section( function() - ui.sectionHead( function() - ui.heading { level = 2, content = _"Outgoing delegations" } - end ) - ui.sectionRow( function() - execute.view { - module = "delegation", view = "_list", - params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, - } - end ) -end ) - - -ui.section( function() - - ui.sectionHead( function() - ui.heading { level = 2, content = _"Incoming delegations" } - end ) - ui.sectionRow( function() - execute.view { - module = "delegation", view = "_list", - params = { delegations_selector = incoming_delegations_selector, incoming = true }, - } - end ) - -end ) - +end } if app.session.member_id == member.id then ui.script{ script = [[ diff -r 7ea154c9238a -r 32cc544d5a5b app/main/member_image/_show.lua --- a/app/main/member_image/_show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/member_image/_show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -13,15 +13,18 @@ class = "" end - if config.fastpath_url_func then ui.image{ - attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class }, + attr = { title = popup_text, class = "mdl-chip__contact member_image member_image_" .. image_type .. class }, external = config.fastpath_url_func(member_id, image_type) } else + local c = "mdl-chip__contact " + if image_type == "photo" then + c = "" + end ui.image{ - attr = { title = popup_text, class = "member_image member_image_" .. image_type .. class }, + attr = { title = popup_text, class = c .. "member_image member_image_" .. image_type .. class }, module = "member_image", view = "show", extension = "jpg", diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/_action/accept_scope.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/_action/accept_scope.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,76 @@ +local system_application_id = param.get("system_application_id", atom.integer) +local domain = param.get("domain") +local response_type = param.get("response_type") + +if domain then + domain = string.lower(domain) +end +local scopes = {} +for i = 0, math.huge do + scopes[i] = param.get("scope" .. i) + if not scopes[i] then + break + end +end + +local redirect_uri = param.get("redirect_uri") +local redirect_uri_explicit = param.get("redirect_uri_explicit", atom.boolean) +local state = param.get("state") + +local selector + +if system_application_id then + selector = MemberApplication:get_selector_by_member_id_and_system_application_id(app.session.member_id, system_application_id) +else + selector = MemberApplication:get_selector_by_member_id_and_domain(app.session.member_id, domain) +end +selector:for_update() + +local member_application = selector:exec() + +if not member_application then + member_application = MemberApplication:new() + member_application.member_id = app.session.member_id + member_application.system_application_id = system_application_id + member_application.domain = domain +end + +local new_scopes = {} + +for i = 0, #scopes do + if scopes[i] then + for scope in string.gmatch(scopes[i], "[^ ]+") do + new_scopes[scope] = true + end + end +end + +if member_application.scopes then + for scope in string.gmatch(member_application.scopes, "[^ ]+") do + new_scopes[scope] = true + end +end + +local new_scopes_list = {} + +for k, v in pairs(new_scopes) do + new_scopes_list[#new_scopes_list+1] = k +end + +local new_scopes_string = table.concat(new_scopes_list, " ") + +member_application.scope = new_scopes_string + +member_application:save() + +execute.chunk{ module = "oauth2", chunk = "_authorization", params = { + member_id = app.session.member_id, + system_application_id = system_application_id, + domain = domain, + session_id = app.session.id, + redirect_uri = redirect_uri, + redirect_uri_explicit = redirect_uri_explicit, + scopes = scopes, + state = state, + response_type = response_type +} } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/_authorization.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/_authorization.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,70 @@ +local member_id = param.get("member_id", atom.integer) +local system_application_id = param.get("system_application_id", atom.integer) +local domain = param.get("domain") +local session_id = param.get("session_id", atom.integer) +local redirect_uri = param.get("redirect_uri") +local redirect_uri_explicit = param.get("redirect_uri_explicit", atom.boolean) +local scopes = param.get("scopes", "table") +local state = param.get("state") +local response_type = param.get("response_type") + +if response_type == "code" then + + local token = Token:create_authorization( + member_id, + system_application_id, + domain, + session_id, + redirect_uri, + redirect_uri_explicit, + scopes, + state + ) + + request.redirect{ + external = redirect_uri, + params = { code = token.token, state = state } + } + + +elseif response_type == "token" then + + local expiry = db:query({ "SELECT now() + (? || 'sec')::interval AS access", config.oauth2.access_token_lifetime }, "object").access + + local anchor_params = { + state = state, + expires_in = config.oauth2.access_token_lifetime, + token_type = "bearer" + } + + for i = 0, #scopes do + if scopes[i] then + local access_token = Token:new() + access_token.token_type = "access" + access_token.member_id = member_id + access_token.system_application_id = system_application_id + access_token.domain = domain + access_token.session_id = session_id + access_token.expiry = expiry + access_token.scope = scopes[i] + access_token:save() + local index = i == 0 and "" or i + anchor_params["access_token" .. index] = access_token.token + end + end + + local anchor_params_list = {} + for k, v in pairs(anchor_params) do + anchor_params_list[#anchor_params_list+1] = k .. "=" .. encode.url_part(v) + end + local anchor = table.concat(anchor_params_list, "&") + + request.redirect{ + external = redirect_uri .. "#" .. anchor + } + +else + + error("Internal error, should not happen") + +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/_filter_view/10_transaction.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/_filter_view/10_transaction.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,5 @@ +db:query("BEGIN;") + +execute.inner() + +db:query("COMMIT;") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/authorization.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/authorization.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,267 @@ +local function show_error(text) + ui.title("Authorization") + ui.section(function() + ui.sectionHead(function() + ui.heading{ content = _"Error during authorization" } + end) + ui.sectionRow(function() + ui.container{ content = text } + end ) + end ) +end + +local client_id = param.get("client_id") +local redirect_uri = param.get("redirect_uri") +local redirect_uri_explicit = redirect_uri and true or false +local response_type = param.get("response_type") +local state = param.get("state") + +local no_scope_requested = true + +local scopes = { + [0] = param.get("scope") +} + +for i = 1, math.huge do + scopes[i] = param.get("scope" .. i) + if not scopes[i] then + break + end +end + +if #scopes == 0 and not scopes[0] then + scopes[0] = "identification" +end + +local requested_scopes = {} + +for i = 0, #scopes do + if scopes[i] then + for scope in string.gmatch(scopes[i], "[^ ]+") do + requested_scopes[scope] = true + end + end +end + +local system_application +local member_application +local client_name +local scopes_to_accept = table.new(requested_scopes) +local accepted_scopes = {} + +local domain + +if client_id then + domain = string.match(client_id, "^dynamic:([a-z0-9.-]+)$") +end + +local dynamic_application_check +if domain then + if #domain > 255 then + return show_error(_"Domain too long") + end + if string.find(domain, "^%.") or string.find(domain, "%.$") or string.find(domain, "%.%.") then + return show_error(_"Invalid domain format") + end + if redirect_uri then + local redirect_uri_domain, magic = string.match(redirect_uri, "^[Hh][Tt][Tt][Pp][Ss]://([A-Za-z0-9_.-]+)/(.*)$") + if not redirect_uri_domain or string.lower(redirect_uri_domain) ~= domain or magic ~= config.oauth2.endpoint_magic then + return show_error(_"Redirect URI forbidden") + end + else + redirect_uri = "https://" .. domain .. "/" .. config.oauth2.endpoint_magic + end + dynamic_application_check = DynamicApplicationScope:check_scopes(domain, redirect_uri, response_type, requested_scopes) + if dynamic_application_check == "not_registered" then + return show_error(_"Redirect URI or response type not registered") + end + client_name = domain + member_application = MemberApplication:by_member_id_and_domain(app.session.member_id, domain) + if member_application then + for scope in string.gmatch(member_application.scope, "[^ ]+") do + accepted_scopes[scope] = true + scopes_to_accept[scope] = nil + end + end +else + system_application = SystemApplication:by_client_id(client_id) + if system_application then + if redirect_uri_explicit then + if + redirect_uri ~= system_application.default_redirect_uri + and not SystemApplicationRedirectUri:by_pk(system_application.id, redirect_uri) + then + return show_error(_"Redirect URI invalid") + end + else + redirect_uri = system_application.default_redirect_uri + end + if system_application.flow ~= response_type then + return show_error(_"Response type not allowed for given client") + end + client_name = system_application.name + member_application = MemberApplication:by_member_id_and_system_application_id(app.session.member_id, system_application.id) + end +end + +if not client_name then + return show_error(_"Client ID invalid") +end + +local function error_redirect(error_code, description) + local params = { + state = state, + error = error_code, + error_description = description + } + if response_type == "token" then + local anchor_params_list = {} + for k, v in pairs(params) do + anchor_params_list[#anchor_params_list+1] = k .. "=" .. encode.url_part(v) + end + local anchor = table.concat(anchor_params_list, "&") + request.redirect{ + external = redirect_uri .. "#" .. anchor + } + else + request.redirect{ + external = redirect_uri, + params = params + } + end +end + +if response_type ~= "code" and response_type ~= "token" then + return error_redirect("unsupported_response_type", "Invalid response type") +end + +for i = 0, #scopes do + if scopes[i] == "" then + return error_redirect("invalid_scope", "Empty scope requested") + end +end + +for scope in pairs(requested_scopes) do + local scope_valid = false + for i, entry in ipairs(config.oauth2.available_scopes) do + if scope == entry.scope or scope == entry.scope .. "_detached" then + scope_valid = true + break + end + end + if not scope_valid then + return error_redirect("invalid_scope", "Requested scope not available") + end +end + +if system_application then + if system_application.permitted_scope then + local permitted_scopes = {} + for scope in string.gmatch(system_application.permitted_scope, "[^ ]+") do + permitted_scopes[scope] = true + end + for scope in pairs(requested_scopes) do + if not permitted_scopes[scope] then + return error_redirect("invalid_scope", "Scope not permitted") + end + end + end + if system_application.forbidden_scope then + for scope in string.gmatch(system_application.forbidden_scope, "[^ ]+") do + if requested_scopes[scope] then + return error_redirect("invalid_scope", "Scope forbidden") + end + end + end + if system_application.automatic_scope then + for scope in string.gmatch(system_application.automatic_scope, "[^ ]+") do + scopes_to_accept[scope] = nil + accepted_scopes[scope] = true + end + end + if member_application then + for scope in string.gmatch(member_application.scope, "[^ ]+") do + scopes_to_accept[scope] = nil + accepted_scopes[scope] = true + end + end +else + if dynamic_application_check == "missing_scope" then + return error_redirect("invalid_scope", "Scope not permitted") + end +end + +if next(scopes_to_accept) then + ui.title("Application authorization") + ui.section(function() + ui.sectionHead(function() + ui.heading{ content = client_name } + ui.heading{ content = "wants to access your account" } + end) + if not system_application and not member_application then + ui.sectionRow(function() + ui.container{ content = _"Warning: Untrusted third party application." } + end) + end + ui.sectionRow(function() + ui.heading{ level = 3, content = _"Requested privileges:" } + ui.tag{ tag = "ul", attr = { class = "ul" }, content = function() + for i, entry in ipairs(config.oauth2.available_scopes) do + local name = entry.name[locale.get("lang")] or entry.scope + if accepted_scopes[entry.scope] or requested_scopes[entry.scope] or accepted_scopes[entry.scope .. "_detached"] or requested_scopes[entry.scope .. "_detached"] then + ui.tag{ tag = "li", content = function() + ui.tag{ content = name } + if accepted_scopes[entry.scope .. "_detached"] or requested_scopes[entry.scope .. "_detached"] then + slot.put(" ") + ui.tag{ content = _"(detached)" } + end + if scopes_to_accept[entry.scope] or scopes_to_accept[entry.scope .. "_detached"] then + slot.put(" ") + ui.tag{ content = _"(new)" } + end + -- TODO display changes + end } + end + end + end } + end ) + local params = { + system_application_id = system_application and system_application.id or nil, + domain = domain, + redirect_uri = redirect_uri, + redirect_uri_explicit = redirect_uri_explicit, + state = state, + response_type = response_type + } + for i = 0, #scopes do + params["scope" .. i] = scopes[i] + end + ui.form{ + module = "oauth2", action = "accept_scope", params = params, + routing = { default = { mode = "redirect", module = "oauth2", view = "authorization", params = request.get_param_strings() } }, + content = function() + ui.sectionRow(function() + ui.submit{ text = _"Grant authorization", attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored " } } + slot.put("   ") + ui.link{ content = _"Decline authorization", attr = { class = "mdl-button mdl-js-button" }, external = redirect_uri, params = { error = "access_denied", error_description = "User declined to authorize client" } } + end ) + end + } + end ) +else + + execute.chunk{ module = "oauth2", chunk = "_authorization", params = { + member_id = app.session.member_id, + system_application_id = system_application and system_application.id or nil, + domain = domain, + session_id = app.session.id, + redirect_uri = redirect_uri, + redirect_uri_explicit = redirect_uri_explicit, + scopes = scopes, + state = state, + response_type = response_type + } } + + +end + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/register.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/register.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,77 @@ +if not request.is_post() then + return execute.view { module = "index", view = "405" } +end + +slot.set_layout(nil, "application/json;charset=UTF-8") + +local r = json.object() + +local function error_result(error_code, error_description) + -- TODO special HTTP status codes for some errors? + request.set_status("400 Bad Request") + slot.put_into("data", json.export{ + error = error_code, + error_description = error_description + }) +end + +local client_id = param.get("client_id") +local flow = param.get("flow") +local scope = param.get("scope") + +if flow ~= "code" and flow ~= "token" then + return error_result("invalid_request", "invalid flow") +end + +local domain + +if client_id then + domain = string.match(client_id, "^dynamic:([a-z0-9.-]+)$") + if not domain then + return error_result("invalid_client", "invalid client_id (use lower case host name prefixed with 'dynamic:')") + end +end + +local cert_ca = request.get_header("X-LiquidFeedback-CA") +local cert_distinguished_name = request.get_header("X-SSL-DN") +local cert_common_name + +if cert_distinguished_name then + cert_common_name = string.match(cert_distinguished_name, "%f[^/\0]CN=([A-Za-z0-9_.-]+)%f[/\0]") + if not cert_common_name then + return error_result("invalid_client", "CN in X.509 certificate invalid") + end +else + return error_result("invalid_client", "X.509 client authorization missing") +end + +if cert_ca ~= "public" then + return error_result("invalid_client", "X.509 certificate not signed by publicly trusted certificate authority or wrong endpoint used") +end + +if domain then + if domain ~= cert_common_name then + return error_result("invalid_grant", "CN in X.509 certificate incorrect") + end +else + domain = cert_common_name +end + +local redirect_uri = "https://" .. domain .. "/" .. config.oauth2.endpoint_magic + +local expiry = db:query({ "SELECT now() + (? || 'sec')::interval AS expiry", config.oauth2.dynamic_registration_lifetime }, "object").expiry + +for s in string.gmatch(scope, "[^ ]+") do + local dynamic_application_scope = DynamicApplicationScope:new() + dynamic_application_scope.redirect_uri = redirect_uri + dynamic_application_scope.flow = flow + dynamic_application_scope.scope = s + dynamic_application_scope.expiry = expiry + dynamic_application_scope:upsert_mode() + dynamic_application_scope:save() +end + +r.client_id = "dynamic:" .. domain +r.expires_in = config.oauth2.dynamic_registration_lifetime + +slot.put_into("data", json.export(r)) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/session.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/session.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,32 @@ +if not request.is_post() then + return execute.view { module = "index", view = "405" } +end + +slot.set_layout(nil, "application/json") + +local r = json.object{ + member_id = json.null +} + +if app.session.member_id then + local origin = request.get_header("Origin") + if origin then + local system_applications = SystemApplication:by_origin(origin) + if #system_applications > 0 then + r.member_id = app.session.member_id + r.real_member_id = app.session.real_member_id + if app.session.member.role then + r.member_is_role = true + end + else + local member_application = MemberApplication:by_member_id_and_origin(app.session.member_id, origin) + if member_application then + r.member_id = app.session.member_id + r.real_member_id = app.session.real_member_id + end + end + end +end + +slot.put_into("data", json.export(r)) + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/token.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/token.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,274 @@ +if not request.is_post() then + return execute.view { module = "index", view = "405" } +end + +slot.set_layout(nil, "application/json;charset=UTF-8") + +request.add_header("Cache-Control", "no-store") +request.add_header("Pragma", "no-cache") + +local function error_result(error_code, error_description) + -- TODO special HTTP status codes for some errors? + request.set_status("400 Bad Request") + slot.put_into("data", json.export{ + error = error_code, + error_description = error_description + }) +end + +local token +local grant_type = param.get("grant_type") +if grant_type == "authorization_code" then + local code = param.get("code") + token = Token:by_token_type_and_token("authorization", code) +elseif grant_type == "refresh_token" then + local refresh_token = param.get("refresh_token") + token = Token:by_token_type_and_token("refresh", refresh_token) +elseif grant_type == "access_token" then + local access_token, access_token_err = util.get_access_token() + if access_token_err then + if access_token_err == "header_and_param" then + return error_result("invalid_request", "Access token passed both via header and param") + end + error("Error in util.get_access_token") + end + token = Token:by_token_type_and_token("access", access_token) +else + return error_result("unsupported_grant_type", "Grant type not supported") +end + +if not token then + return error_result("invalid_grant", "Token invalid or expired") +end + +if grant_type == "authorization_code" then + if not token.used then + local expiry = db:query({"SELECT now() + (? || 'sec')::interval AS expiry", config.oauth2.authorization_code_lifetime }, "object").expiry + token.used = true + token.expiry = expiry + token:save() + else + token:destroy() + return error_result("invalid_grant", "Token invalid or expired") + end +end + +if grant_type ~= "access_token" then + local cert_ca = request.get_header("X-LiquidFeedback-CA") + local cert_distinguished_name = request.get_header("X-SSL-DN") + local cert_common_name + if cert_distinguished_name then + cert_common_name = string.match(cert_distinguished_name, "%f[^/\0]CN=([A-Za-z0-9_.-]+)%f[/\0]") + if not cert_common_name then + return error_result("invalid_client", "CN in X.509 certificate invalid") + end + else + return error_result("invalid_client", "X.509 client authorization missing") + end + if token.system_application then + if cert_ca ~= "private" then + return error_result("invalid_client", "X.509 certificate not signed by private certificate authority or wrong endpoint used") + end + if cert_common_name ~= token.system_application.cert_common_name then + return error_result("invalid_grant", "CN in X.509 certificate incorrect") + end + else + if cert_ca ~= "public" then + return error_result("invalid_client", "X.509 certificate not signed by publicly trusted certificate authority or wrong endpoint used") + end + if cert_common_name ~= token.domain then + return error_result("invalid_grant", "CN in X.509 certificate incorrect") + end + end + local client_id = param.get("client_id") + if client_id then + if token.system_application then + if client_id ~= token.system_application.client_id then + return error_result("invalid_grant", "Token was issued to another client") + end + else + if client_id ~= "dynamic:" .. token.domain then + return error_result ("invalid_grant", "Token was issued to another client") + end + end + elseif grant_type == "authorization_code" and not cert_common_name then + return error_result("invalid_request", "No client_id supplied for authorization_code request") + end +end + +if grant_type == "authorization_code" then + local redirect_uri = param.get("redirect_uri") + if (token.redirect_uri_explicit or redirect_uri) and token.redirect_uri ~= redirect_uri then + return error_result("invalid_request", "Redirect URI missing or invalid") + end +end + +local scopes = { + [0] = param.get("scope") +} +for i = 1, math.huge do + scopes[i] = param.get("scope" .. i) + if not scopes[i] then + break + end +end + +if not scopes[0] and #scopes == 0 then + for dummy, token_scope in ipairs(token.token_scopes) do + scopes[token_scope.index] = token_scope.scope + end +end + +local allowed_scopes = {} +local requested_detached_scopes = {} +for scope in string.gmatch(token.scope, "[^ ]+") do + allowed_scopes[scope] = true +end +for i = 0, #scopes do + if scopes[i] then + for scope in string.gmatch(scopes[i], "[^ ]+") do + if string.match(scope, "_detached$") then + requested_detached_scopes[scope] = true + end + if not allowed_scopes[scope] then + return error_result("invalid_scope", "Scope exceeds limits") + end + end + end +end + +local expiry + +if grant_type == "access_token" then + expiry = db:query({ "SELECT FLOOR(EXTRACT(EPOCH FROM ? - now())) AS access_time_left", token.expiry }, "object") +else + expiry = db:query({ + "SELECT now() + (? || 'sec')::interval AS refresh, now() + (? || 'sec')::interval AS access", + config.oauth2.refresh_token_lifetime, + config.oauth2.access_token_lifetime + }, "object") +end + +if grant_type == "refresh_token" then + local requested_detached_scopes_list = {} + for scope in pairs(requested_detached_scopes) do + requested_detached_scopes_list[#requested_detached_scopes_list+1] = scope + end + local tokens_to_reduce = Token:old_refresh_token_by_token(token, requested_detached_scopes_list) + for dummy, t in ipairs(tokens_to_reduce) do + local t_scopes = {} + for t_scope in string.gmatch(t.scope, "[^ ]+") do + t_scopes[t_scope] = true + end + for scope in pairs(requested_detached_scopes) do + local scope_without_detached = string.gmatch(scope, "(.+)_detached") + if t_scope[scope] then + t_scope[scope] = nil + t_scope[scope_without_detached] = true + end + end + local t_scope_list = {} + for scope in pairs(t_scopes) do + t_scope_list[#t_scope_list+1] = scope + end + t.scope = table.concat(t_scope_list, " ") + t:save() + end +end + +local r = json.object() + +local refresh_token +if + grant_type ~= "access_token" + and (grant_type == "authorization_code" or #(Token:fresh_refresh_token_by_token(token)) == 0) +then + refresh_token = Token:new() + refresh_token.token_type = "refresh" + if grant_type == "authorization_code" then + refresh_token.authorization_token_id = token.id + else + refresh_token.authorization_token_id = token.authorization_token_id + end + refresh_token.member_id = token.member_id + refresh_token.system_application_id = token.system_application_id + refresh_token.domain = token.domain + refresh_token.session_id = token.session_id + refresh_token.expiry = expiry.refresh + refresh_token.scope = token.scope + refresh_token:save() + r.refresh_token = refresh_token.token +end + + +r.token_type = "bearer" +if grant_type == "access_token" then + r.expires_in = expiry.access_time_left +else + r.expires_in = config.oauth2.access_token_lifetime +end + +for i = 0, #scopes do + if scopes[i] then + local scope = scopes[i] + local access_token = Token:new() + access_token.token_type = "access" + if grant_type == "authorization_code" then + access_token.authorization_token_id = token.id + else + access_token.authorization_token_id = token.authorization_token_id + end + access_token.member_id = token.member_id + access_token.system_application_id = token.system_application_id + access_token.domain = token.domain + access_token.session_id = token.session_id + if grant_type == "access_token" then + access_token.expiry = token.expiry + else + access_token.expiry = expiry.access + end + access_token.scope = scope + access_token:save() + if refresh_token then + local refresh_token_scope = TokenScope:new() + refresh_token_scope.token_id = refresh_token.id + refresh_token_scope.index = i + refresh_token_scope.scope = scope + refresh_token_scope:save() + end + local index = i == 0 and "" or i + r["access_token" .. index] = access_token.token + end +end + +r.member_id = token.member_id +if token.member.role then + r.member_is_role = true +end +if token.session then + r.real_member_id = token.real_member_id +end + +if param.get("include_member", atom.boolean) then + if allowed_scopes.identification or allowed_scopes.authentication then + local member = token.member + r.member = json.object{ + id = member.id, + name = member.name, + } + if token.session and token.session.real_member then + r.real_member = json.object{ + id = token.session.real_member.id, + name = token.session.real_member.name, + } + end + if allowed_scopes.identification then + r.member.identification = member.identification + if token.session and token.session.real_member then + r.real_member.identification = token.session.real_member.identification + end + end + end +end + +slot.put_into("data", json.export(r)) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/oauth2/validate.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/oauth2/validate.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,85 @@ +if not request.is_post() then + return execute.view { module = "index", view = "405" } +end + +slot.set_layout(nil, "application/json") + +local function error_result(error_code, description) + local r = json.object() + r.error = error_code + r.error_description = description + slot.put_into("data", json.export(r)) + request.set_status("400 Bad Request") +end + +local access_token, access_token_err = util.get_access_token() + +if access_token_err then + if access_token_err == "header_and_param" then + return error_result("invalid_request", "Access token passed both via header and param") + end + error("Error in util.get_access_token") +end + +if not access_token then + return error_result("invalid_token", "No access token supplied") +end + +local token = Token:by_token_type_and_token("access", access_token) + +if not token then + return error_result("invalid_token", "Access token invalid") +end + +local scopes = {} +for scope in string.gmatch(token.scope, "[^ ]+") do + local match = string.match(scope, "(.+)_detached$") + scopes[match or scope] = true +end +local scope_list = {} +for scope in pairs(scopes) do + scope_list[#scope_list+1] = scope +end +table.sort(scope_list) +local scope = table.concat(scope_list, " ") + +local r = json.object() +r.scope = scope +r.member_id = token.member_id +if token.member.role then + r.member_is_role = true +end +if token.session then + r.real_member_id = token.session.real_member_id +end + +if param.get("include_member", atom.boolean) then + if scopes.identification or scopes.authentication then + local member = token.member + r.member = json.object{ + id = member.id, + name = member.name, + } + if token.session and token.session.real_member then + r.real_member = json.object{ + id = token.session.real_member.id, + name = token.session.real_member.name, + } + end + if scopes.identification then + r.member.identification = member.identification + if token.session and token.session.real_member then + r.real_member.identification = token.session.real_member.identification + end + end + if param.get("include_member_notify_email", atom.boolean) then + r.member.notify_email = member.notify_email + end + end +end + +r.logged_in = token.session_id and true or false +slot.put_into("data", json.export(r)) + + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/opinion/_action/update.lua --- a/app/main/opinion/_action/update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/opinion/_action/update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -41,7 +41,7 @@ end if degree ~= 0 and not app.session.member:has_voting_right_for_unit_id(suggestion.initiative.issue.area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end if not opinion then diff -r 7ea154c9238a -r 32cc544d5a5b app/main/policy/_list.lua --- a/app/main/policy/_list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/policy/_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -20,11 +20,12 @@ ui.heading { level = 3, content = policy.name } - ui.tag{ - content = policy.description - } - - slot.put ( "
" ) + if policy.description and #(policy.description) > 0 then + ui.tag{ + content = policy.description + } + slot.put ( "
" ) + end ui.link { attr = { @@ -55,8 +56,8 @@ if policy.polling then ui.field.text{ label = _"New" .. ":", value = _"without" } else - ui.field.text{ label = _"New" .. ":", value = "≤ min " .. format.interval_text(policy.max_admission_time) } - ui.field.text{ label = _"New" .. ":", value = "≤ max " .. format.interval_text(policy.max_admission_time) } + ui.field.text{ label = _"New" .. ":", value = "≥ " .. format.interval_text(policy.min_admission_time) } + ui.field.text{ label = _"New" .. ":", value = "≤ " .. format.interval_text(policy.max_admission_time) } end ui.field.text{ label = _"Discussion" .. ":", value = format.interval_text(policy.discussion_time) or _"variable" } ui.field.text{ label = _"Frozen" .. ":", value = format.interval_text(policy.verification_time) or _"variable" } @@ -69,7 +70,7 @@ else ui.field.text{ label = _"Issue quorum" .. ":", - value = "≥ " .. tostring(policy.issue_quorum_num) .. "/" .. tostring(policy.issue_quorum_den) + value = "≥ " .. tostring(policy.issue_quorum) } end ui.field.text{ @@ -88,4 +89,4 @@ } end } -end \ No newline at end of file +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/_action/register.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/_action/register.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,296 @@ +local function check_italian_mobile_phone_number(value) + + if not value then + return false + end + + value = string.gsub(value, "[^0-9]*", "") + + if #(value) < 9 or #(value) > 10 then + return false + end + + local mobile_phone_prefixes = { + { min = 320, max = 329, comment = "Wind Tre" }, + { min = 330, max = 339, comment = "Telecom Italia (TIM)" }, + { min = 340, max = 349, comment = "Vodafone Omnitel" }, + { min = 350, max = 359, comment = "" }, + { min = 360, max = 369, comment = "Telecom Italia (TIM)" }, + { min = 370, max = 379, comment = "" }, + { min = 380, max = 389, comment = "Wind Tre" }, + { min = 390, max = 393, comment = "Wind Tre" }, + { min = 394, max = 399, comment = "Wind Tre" } + } + + local value_prefix = tonumber(string.match(value, "^(...)")) + + local valid_prefix = false + + for i, prefix in ipairs(mobile_phone_prefixes) do + trace.debug(value_prefix, prefix.min) + if value_prefix >= prefix.min and value_prefix <= prefix.max then + valid_prefix = true + end + end + + if valid_prefix then + return true + else + return false + end +end + +local function check_uk_mobile_phone_number(value) + + if not value then + return false + end + + value = string.gsub(value, "[^0-9]*", "") + + if #(value) < 11 or #(value) > 11 then + return false + end + + local mobile_phone_prefixes = { + { min = 071, max = 079, comment = "UK phone" }, + } + + local value_prefix = tonumber(string.match(value, "^(...)")) + + local valid_prefix = false + + for i, prefix in ipairs(mobile_phone_prefixes) do + trace.debug(value_prefix, prefix.min) + if value_prefix >= prefix.min and value_prefix <= prefix.max then + valid_prefix = true + end + end + + if valid_prefix then + return true + else + return false + end +end + +local errors = 0 + +local manual_verification + +if config.self_registration.allow_bypass_checks and param.get("manual_verification") then + manual_verification = true +end + +for i, checkbox in ipairs(config.use_terms_checkboxes) do + local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) + if not accepted then + slot.put_into("error", checkbox.not_accepted_error) + errors = errors + 1 + end +end + +local email = param.get("email") + +local members = Member:new_selector() + :add_where{ "notify_email = ? OR notify_email_unconfirmed = ?", email } + :exec() + +if #members > 0 then + slot.select("error", function() + slot.put_into("registration_register_email_invalid", "already_used") + ui.tag{ content = _"This email address already been used. Please check your inbox for an invitation or contact us." } + end) + errors = errors + 1 +end + +local verification = Verification:new() +verification.requested = "now" +verification.request_origin = json.object{ + ip = request.get_header("X-Forwarded-For"), + hostname = request.get_header("X-Forwarded-Host") +} +verification.request_data = json.object() + +for i, field in ipairs(config.self_registration.fields) do + if field.name == "date_of_birth" then + local day = tonumber(param.get("verification_data_" .. field.name .. "_day")) + local month = tonumber(param.get("verification_data_" .. field.name .. "_month")) + local year = tonumber(param.get("verification_data_" .. field.name .. "_year")) + local date = atom.date:new{ year = year, month = month, day = day } + if date.invalid then + slot.select("error", function() + ui.container{ content = _"Please check date of birth" } + slot.put_into("self_registration__invalid_" .. field.name, "invalid") + end) + errors = errors + 1 + end + local today = atom.date:get_current() + local date_16y_ago = atom.date:new{ year = today.year - 16, month = today.month, day = today.day } + if date_16y_ago.invalid and today.month == 2 and today.day == 29 then + date_16y_ago = atom.date:new{ year = today.year - 16, month = 2, day = 28 } + end + if date > date_16y_ago then + request.redirect{ external = encode.url { module = "registration", view = "register_rejected_age" } } + return + end + verification.request_data[field.name] = string.format("%04i-%02i-%02i", year, month, day) + + else + local value = param.get("verification_data_" .. field.name) + if not value or (#value < 1 and (not manual_verification or field.name ~= "mobile_phone")) then + slot.put_into("self_registration__invalid_" .. field.name, "to_short") + slot.select("error", function() + ui.container{ content = _("Please enter: #{field_name}", { field_name = field.label }) } + end) + errors = errors + 1 + end + if field.name == "fiscal_code" then + value = string.upper(value) + value = string.gsub(value, "[^A-Z0-9]", "") + elseif field.name == "mobile_phone" then + value = string.gsub(value, "[^0-9]", "") + else + value = string.gsub(value, "^%s+", "") + value = string.gsub(value, "%s+$", "") + value = string.gsub(value, "%s+", " ") + end + verification.request_data[field.name] = value + end +end + +local automatic_verification_possible = true + +local mobile_phone = verification.request_data.mobile_phone + +if not manual_verification then + if config.self_registration.check_for_italien_mobile_phone then + if not check_italian_mobile_phone_number(mobile_phone) then + slot.select("error", function() + ui.container{ content = _"Please check the mobile phone number (invalid format)" } + end) + errors = errors + 1 + end + end + + if config.self_registration.check_for_uk_mobile_phone then + if not check_uk_mobile_phone_number(mobile_phone) then + slot.select("error", function() + ui.container{ content = _"Please check the mobile phone number (invalid format)" } + end) + errors = errors + 1 + end + end +end + +if config.self_registration.check_for_italian_fiscal_code then + local check_fiscal_code = execute.chunk{ module = "registration", chunk = "_check_fiscal_code" } + + local fiscal_code_valid, fiscal_code_error = check_fiscal_code( + verification.request_data.fiscal_code, + { + first_name = verification.request_data.first_name, + last_name = verification.request_data.name, + year = tonumber(string.match(verification.request_data.date_of_birth, "^(....)-..-..$")), + month = tonumber(string.match(verification.request_data.date_of_birth, "^....-(..)-..$")), + day = tonumber(string.match(verification.request_data.date_of_birth, "^....-..-(..)$")), + } + ) + + if fiscal_code_valid then + verification.comment = (verification.comment or "").. " /// Fiscal code matched" + else + slot.select("error", function() + ui.container{ content = _"Please check the fiscal code (invalid format or does not match name, first name and/or date of birth)" } + end) + errors = errors + 1 + --table.insert(manual_check_reasons, "fiscal code does not match (" .. fiscal_code_error .. ")") + end +end + +if errors > 0 then + return false +end + +local member = Member:new() +member.notify_email = email +member:save() + +for i, checkbox in ipairs(config.use_terms_checkboxes) do + local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) + local member_useterms = MemberUseterms:new() + member_useterms.member_id = member.id + member_useterms.contract_identifier = checkbox.name + member_useterms:save() +end + +verification.requesting_member_id = member.id + +local manual_check_reasons = {} + +if manual_verification then + table.insert(manual_check_reasons, "User requested manual verification (during step 1)") +end + +local existing_verifications = Verification:new_selector() + :add_where{ "request_data->>'mobile_phone' = ?", mobile_phone } + :add_where("comment ilike '%SMS code%'") + :exec() + +if #existing_verifications > 0 then + table.insert(manual_check_reasons, "mobile phone number already used before") +end + +if #manual_check_reasons > 0 then + local reasons = table.concat(manual_check_reasons, ", ") + verification.comment = (verification.comment or "").. " /// Manual verification needed: " .. reasons + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_manual_check_needed" } } + +else + local pin = multirand.string(6, "0123456789") + verification.request_data.sms_code = pin + verification.request_data.sms_code_tries = 3 + local sms_text = config.self_registration.sms_text + local sms_text = string.gsub(sms_text, "{PIN}", pin) + print("SMS Code: " .. sms_text) + local phone_number + if config.self_registration.sms_strip_leading_zero then + phone_number = string.match(verification.request_data.mobile_phone, "0(.+)") + else + phone_number = verification.request_data.mobile_phone + end + phone_number = config.self_registration.sms_prefix .. phone_number + local params = { + id = config.self_registration.sms_id, + pass = config.self_registration.sms_pass, + gateway = config.self_registration.sms_gateway, + absender = config.self_registration.sms_from, + text = sms_text, + nummer = phone_number, + test = config.self_registration.test and "1" or nil + } + local params_list = {} + for k, v in pairs(params) do + table.insert(params_list, encode.url_part(k) .. "=" .. encode.url_part(v)) + end + + local params_string = table.concat(params_list, "&") + local url = "http://gateway.any-sms.biz/send_sms.php?" .. params_string + print("curl " .. url) + local output, err, status = extos.pfilter(nil, "curl", url) + print(output) + verification.request_data.sms_code_sent_status = output + if not string.match(output, "^err:0") then + verification.comment = (verification.comment or "").. " /// Manual verification needed: sending SMS failed (" .. output .. ")" + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_manual_check_needed" } } + return + end + verification.comment = (verification.comment or "") .. " /// SMS code " .. pin .. " sent" + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_enter_pin", id = verification.id } } +end + + + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/_action/register_pin.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/_action/register_pin.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,71 @@ +local id = param.get_id() +local verification = Verification:by_id(id) + +if not verification then + return false +end + +local pin = param.get("pin") + +if param.get("manual_verification") then + verification.comment = (verification.comment or "") .. " /// User requested manual verification (during step 2)" + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_manual_check_needed" } } + return false +elseif verification.request_data.sms_code ~= pin then + verification.request_data.sms_code_tries = verification.request_data.sms_code_tries - 1 + verification.comment = (verification.comment or "") .. " /// User entered wrong PIN " .. pin + if verification.request_data.sms_code_tries > 0 then + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_enter_pin", id = verification.id, params = { invalid_pin = true } } } + return false + else + verification.comment = (verification.comment or "") .. " /// Manual verification needed: user entered invalid PIN three times" + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_manual_check_needed" } } + return false + end +end + +verification.comment = (verification.comment or "").. " /// User entered correct PIN code" + +verification.verified = "now" +verification.verification_data = verification.request_data + +local identification = config.self_registration.identification_func(verification.request_data) + +local members_with_same_identification = Member:new_selector() + :add_where{ "identification = ?", identification } + :exec() + +if #members_with_same_identification > 0 then + verification.comment = (verification.comment or "").. " /// Manual verification needed: user with same name already exists" + verification:save() + request.redirect{ external = encode.url { module = "registration", view = "register_manual_check_needed" } } + return false +end + +local member = Member:by_id(verification.requesting_member_id) + +member.identification = identification +member.notify_email = verification.request_data.email + +member:send_invitation() + +for i, unit_id in ipairs(config.self_registration.grant_privileges_for_unit_ids) do + local privilege = Privilege:new() + privilege.member_id = member.id + privilege.unit_id = unit_id + privilege.initiative_right = true + privilege.voting_right = true + privilege:save() +end + +verification.verified_member_id = member.id + +verification.comment = (verification.comment or "").. " /// Account created" + +verification:save() + + +request.redirect{ external = encode.url { module = "registration", view = "register_completed" } } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/_action/update_vote.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/_action/update_vote.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,81 @@ +if not app.session.member then + return +end + +local cancel = param.get("cancel") and true or false +if cancel then return true end + +local issue = Issue:new_selector():add_where{ "id = ?", param.get("issue_id", atom.integer) }:for_share():single_object_mode():exec() + + +if not app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then + return execute.view { module = "index", view = "403" } +end + +if issue.state ~= "voting" and not issue.closed then + slot.put_into("error", _"Voting has not started yet.") + return false +end + +if issue.phase_finished or issue.closed and not update_comment then + slot.put_into("error", _"This issue is already closed.") + return false +end + +local direct_voter = DirectVoter:by_pk(issue.id, app.session.member_id) + +if param.get("discard") then + if direct_voter then + direct_voter:destroy() + end + slot.put_into("notice", _"Your vote has been discarded. Delegation rules apply if set.") + return +end + +local initiatives = issue:get_reference_selector("initiatives") + :add_where("initiative.admitted") + :add_order_by("initiative.satisfied_supporter_count DESC") + :exec() + +local vote_for_initiative_id = tonumber(param.get("vote_for_initiative_id")) + +local voted = 0 + +for i, initiative in ipairs(initiatives) do + if initiative.id == vote_for_initiative_id then + voted = voted + 1 + end +end + +if voted ~= 1 then + slot.put_into("error", _"Please choose one project to vote for.") + return false +end + +if not direct_voter then + direct_voter = DirectVoter:new() + direct_voter.issue_id = issue.id + direct_voter.member_id = app.session.member_id + direct_voter:save() +else + local votes = Vote:new_selector() + :add_where{ "vote.issue_id = ?", issue.id } + :add_where{ "vote.member_id = ?", app.session.member_id } + :exec() + for i, vote in ipairs(votes) do + vote:destroy() + end +end + +for i, initiative in ipairs(initiatives) do + local vote = Vote:new() + vote.issue_id = issue.id + vote.initiative_id = initiative.id + vote.member_id = app.session.member_id + if initiative.id == vote_for_initiative_id then + vote.grade = 1 + else + vote.grade = 0 + end + vote:save() +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/_check_fiscal_code.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/_check_fiscal_code.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,198 @@ +local oddmap = { + [0] = 1, 0, 5, 7, 9, 13, 15, 17, 19, 21, + 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, 16, + 10, 22, 25, 24, 23 +} + +local monthtable = { + "A", "B", "C", "D", "E", "H", "L", "M", "P", "R", "S", "T" +} + +local function removeaccent(str) + local gsub = string.gsub + str = gsub(str, "\195\129", "A") + str = gsub(str, "\195\128", "A") + str = gsub(str, "\195\161", "a") + str = gsub(str, "\195\160", "a") + str = gsub(str, "\195\137", "E") + str = gsub(str, "\195\136", "E") + str = gsub(str, "\195\169", "e") + str = gsub(str, "\195\168", "e") + str = gsub(str, "\195\141", "I") + str = gsub(str, "\195\140", "I") + str = gsub(str, "\195\173", "i") + str = gsub(str, "\195\172", "i") + str = gsub(str, "\195\147", "O") + str = gsub(str, "\195\146", "O") + str = gsub(str, "\195\179", "o") + str = gsub(str, "\195\178", "o") + str = gsub(str, "\195\154", "U") + str = gsub(str, "\195\153", "U") + str = gsub(str, "\195\186", "u") + str = gsub(str, "\195\185", "u") + return str +end + +local function normalize_name(str) + local gsub = string.gsub + str = removeaccent(str) + str = gsub(str, " ", "") + str = gsub(str, "-", "") + str = gsub(str, "'", "") + str = gsub(str, "\226\128\146", "") + str = gsub(str, "\226\128\147", "") + str = gsub(str, "\226\128\148", "") + if string.find(str, "^[A-Za-z]+$") then + return string.upper(str) + else + return nil + end +end + +local function remove_consonants(str) + return (string.gsub(str, "[BCDFGHJKLMNPQRSTVWXYZ]", "")) +end + +local function remove_vowels(str) + return (string.gsub(str, "[AEIOU]", "")) +end + +local function numberize(str) + local gsub = string.gsub + str = gsub(str, "L", "0") + str = gsub(str, "M", "1") + str = gsub(str, "N", "2") + str = gsub(str, "P", "3") + str = gsub(str, "Q", "4") + str = gsub(str, "R", "5") + str = gsub(str, "S", "6") + str = gsub(str, "T", "7") + str = gsub(str, "U", "8") + str = gsub(str, "V", "9") + return str +end + +return function(code, data) + local sub = string.sub + local byte = string.byte + local byte0 = byte("0") + local byteA = byte("A") + local function byteat(str, pos) + return (byte(sub(str, pos, pos))) + end + if #code ~= 16 then + return false, "Invalid length" + end + local sum = 0 + for i = 1, 15, 2 do + local b = byteat(code, i) + local b0 = b - byte0 + if b0 >= 0 and b0 <= 9 then + sum = sum + oddmap[b0] + else + local bA = b - byteA + if bA >= 0 and bA <= 25 then + sum = sum + oddmap[bA] + else + return false, "Invalid character" + end + end + end + for i = 2, 14, 2 do + local b = byteat(code, i) + local b0 = b - byte0 + if b0 >= 0 and b0 <= 9 then + sum = sum + b0 + else + local bA = b - byteA + if bA >= 0 and bA <= 25 then + sum = sum + bA + else + return false, "Invalid character" + end + end + end + local check = byteat(code, 16) + local checkA = check - byteA + if checkA >= 0 and checkA <= 25 then + if checkA ~= sum % 26 then + return false, "Invalid checksum" + end + else + local check0 = check - byte0 + if check0 >= 0 and check0 <= 9 then + return false, "Checksum must not be numeric" + else + return false, "Invalid character" + end + end + if data then + if data.last_name then + local name = normalize_name(data.last_name) + if not name then + return false, "Invalid last name" + end + local consonants = remove_vowels(name) + local short = sub(consonants, 1, 3) + if #short < 3 then + local vowels = remove_consonants(name) + short = short .. sub(vowels, 1, 3 - #short) + while #short < 3 do + short = short .. "X" + end + end + if short ~= sub(code, 1, 3) then + return false, "Last name not matching" + end + end + if data.first_name then + local name = normalize_name(data.first_name) + if not name then + return false, "Invalid first name" + end + local consonants = remove_vowels(name) + local short + if #consonants >= 4 then + short = sub(consonants, 1, 1) .. sub(consonants, 3, 4) + else + short = consonants + if #short < 3 then + local vowels = remove_consonants(name) + short = short .. sub(vowels, 1, 3 - #short) + while #short < 3 do + short = short .. "X" + end + end + end + if short ~= sub(code, 4, 6) then + return false, "First name not matching" + end + end + if data.year then + local year = tostring(data.year % 100) + if #year < 2 then + year = "0" .. year + end + if year ~= numberize(sub(code, 7, 8)) then + return false, "Year of birth not matching" + end + end + if data.month then + local monthchar = monthtable[data.month] + if monthchar ~= sub(code, 9, 9) then + return false, "Month of birth not matching" + end + end + if data.day then + local day = tostring(data.day) + if #day < 2 then + day = "0" .. day + end + local daycode = numberize(sub(code, 10, 11)) + if day ~= daycode and tostring(day + 40) ~= daycode then + return false, "Day of birth not matching" + end + end + end + return true +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/_register_form.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/_register_form.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,102 @@ +for i, field in ipairs(config.self_registration.fields) do + local class = "" + local field_error = slot.get_content("self_registration__invalid_" .. field.name) + if field_error == "" then + field_error = nil + end + if field_error then + class = " is-invalid" + end + if field.name == "date_of_birth" then + slot.put("
") + ui.tag{ tag = "label", attr = { style = "vertical-align: bottom; border-bottom: 1px solid rgba(0,0,0, 0.12); color: #777; font-size: 16px;" }, content = field.label .. ":" } + slot.put("   ") + local days = { { id = 0, name = _"day" } } + for i = 1, 31 do + table.insert(days, { id = i, name = i }) + end + local months = { + { id = 0, name = _"month" }, + { id = 1, name = "gennaio" }, + { id = 2, name = "febbraio" }, + { id = 3, name = "marzo" }, + { id = 4, name = "aprile" }, + { id = 5, name = "maggio" }, + { id = 6, name = "giugno" }, + { id = 7, name = "luglio" }, + { id = 8, name = "agosto" }, + { id = 9, name = "settembre" }, + { id = 10, name = "ottobre" }, + { id = 11, name = "novembre" }, + { id = 12, name = "dicembre" }, + } + if config.self_registration.lang == "en" then + months = { + { id = 0, name = _"month" }, + { id = 1, name = "January" }, + { id = 2, name = "February" }, + { id = 3, name = "March" }, + { id = 4, name = "April" }, + { id = 5, name = "May" }, + { id = 6, name = "June" }, + { id = 7, name = "July" }, + { id = 8, name = "August" }, + { id = 9, name = "September" }, + { id = 10, name = "October" }, + { id = 11, name = "November" }, + { id = 12, name = "December" }, + } + end + local years = { { id = 0, name = _"year" } } + for i = 2002, 1900, -1 do + table.insert(years, { id = i, name = i }) + end + ui.field.select{ + container_attr = { style = "display: inline-block; " }, + attr = { class = class }, + foreign_records = days, + foreign_id = "id", + foreign_name = "name", + name = "verification_data_" .. field.name .. "_day", + value = tonumber(request.get_param{ name = "verification_data_" .. field.name .. "_day" }) + } + slot.put("   ") + ui.field.select{ + container_attr = { style = "display: inline-block; " }, + attr = { class = class }, + foreign_records = months, + foreign_id = "id", + foreign_name = "name", + name = "verification_data_" .. field.name .. "_month", + value = tonumber(request.get_param{ name = "verification_data_" .. field.name .. "_month" }) + } + slot.put("   ") + ui.field.select{ + container_attr = { style = "display: inline-block; " }, + attr = { class = class }, + foreign_records = years, + foreign_id = "id", + foreign_name = "name", + name = "verification_data_" .. field.name .. "_year", + value = tonumber(request.get_param{ name = "verification_data_" .. field.name .. "_year" }) + } + slot.put("
") + + else + if field.name == "mobile_phone" then + if config.self_registration.lang ~= "en" then + ui.tag{ content = "+39" } + slot.put(" ") + end + end + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" .. class }, + attr = { id = "lf-register__data_" .. field.name, class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data" .. field.name }, + label = field.label, + name = "verification_data_" .. field.name, + value = request.get_param{ name = "verification_data_" .. field.name } + } + end + slot.put("
") +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/register.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/register.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,95 @@ +ui.title(_"Self registration") +app.html_title.title = _"Self registration" + +slot.put("") + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.form{ + attr = { onsubmit = "document.getElementById('register_button').disabled = true;" }, + module = "registration", action = "register", + routing = { + error = { mode = "forward", module = "registration", view = "register" } + }, + content = function() + + ui.container{ content = config.self_registration.info_top } + + execute.view{ module = "registration", view = "_register_form" } + + ui.container{ + attr = { class = "use_terms" }, + content = function() + slot.put(config.use_terms) + end + } + + for i, checkbox in ipairs(config.use_terms_checkboxes) do + ui.tag{ tag = "label", attr = { + class = "mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect", + ["for"] = "use_terms_checkbox_" .. checkbox.name + }, + content = function() + ui.tag{ + tag = "input", + attr = { + type = "checkbox", + class = "mdl-checkbox__input", + id = "use_terms_checkbox_" .. checkbox.name, + name = "use_terms_checkbox_" .. checkbox.name, + value = "1", + style = "float: left;", + checked = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) and "checked" or nil + } + } + ui.tag{ + attr = { class = "mdl-checkbox__label" }, + content = function() slot.put(checkbox.html) end + } + end + } + slot.put("

") + end + + ui.container{ content = function() + slot.put(config.self_registration.info_bottom) + end } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + id = "register_button", + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Proceed with registration" + } + } + slot.put("   ") + ui.tag{ + tag = "input", + attr = { + name = "manual_verification", + id = "manual_verification_button", + type = "submit", + class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined", + value = _"Manual verification (w/o mobile)" + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "index", view = "login", text = _"Cancel", params = { + redirect_module = param.get("redirect_module"), + redirect_view = param.get("redirect_view"), + redirect_id = param.get("redirect_id"), + redirect_params = param.get("redirect_params") + } + } + end + } + + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/register_completed.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/register_completed.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +ui.title(_"Self registration") +app.html_title.title = _"Self registration" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.heading{ content = _"Self registration completed" } + slot.put("
") + ui.container { content = _"We have sent you an invitation email to finish the account setup." } + slot.put("
") + ui.container { content = _"Please also check your SPAM folder." } + slot.put("
") + + + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/register_enter_pin.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/register_enter_pin.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,66 @@ +local id = param.get_id() +local verification = Verification:by_id(id) +local invalid_pin = param.get("invalid_pin", atom.boolean) + +ui.title(_"Self registration") +app.html_title.title = _"Self registration" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.heading{ content = _"PIN page" } + slot.put("
") + ui.container { content = _"You should receive a PIN code via SMS shortly. Please enter the PIN." } + + if invalid_pin then + slot.put("
") + ui.container { attr = { class = "warning" }, content = _"Invalid PIN, please try again!" } + slot.put("
") + end + + ui.form{ + module = "registration", action = "register_pin", id = verification.id, + content = function() + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "pin", class = "mdl-textfield__input", autofocus = "autofocus" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "pin" }, + label = "PIN code", + name = "pin" + } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Proceed with registration" + } + } + + slot.put("

") + + ui.heading{ content = _"No PIN code received?" } + slot.put("
") + ui.container { content = _"If you have not received a PIN code, our team will need to check your registration manually. We will be in touch within two working days. Please accept our apologies for the inconvenience." } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + name = "manual_verification", + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised", + value = _"Start manual verification" + } + } + + end + } + + + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/register_manual_check_needed.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/register_manual_check_needed.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,22 @@ +ui.title(_"Self registration") +app.html_title.title = _"Self registration" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.heading{ content = _"Manual verification needed" } + slot.put("
") + ui.container { content = function() + ui.tag{ content = "We are sorry but the automatic verification of personal data has not been successful. We will need to verify your information manually. We apologise for the wait, and thank you for your cooperation. Until your information is verified, you can continue to " } + ui.link{ content = _"browse the portal as an unregistered user", module = "index", view = "index" } + ui.tag{ content = "." } + slot.put("

") + ui.tag{ content = "For problems related to registration and use of the platform, please email " } + ui.link{ external = "mailto:" .. config.self_registration.contact_email, content = config.self_registration.contact_email } + ui.tag{ content = "." } + end } + slot.put("
") + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration/register_rejected_age.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration/register_rejected_age.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,18 @@ +ui.title(_"Self registration") +app.html_title.title = _"Self registration" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.heading{ content = _"Registration rejected" } + slot.put("
") + ui.container { content = function() + ui.tag { content = _"Sorry, but you need to be at least 16 years old to participate. You can " } + ui.link{ content = _"browse the platform as a guest", module = "index", view = "index" } + ui.tag{ content = "." } + end } + slot.put("
") + + + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/_action/update_role_verification.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/_action/update_role_verification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,74 @@ +local verification = RoleVerification:by_id(param.get_id()) + +local function update_data() + verification.verification_data = json.object() + + for i, field in ipairs(config.role_registration.fields) do + local value = param.get(field.name) + value = string.gsub(value, "^%s+", "") + value = string.gsub(value, "%s+$", "") + value = string.gsub(value, "%s+", " ") + verification.verification_data[field.name] = value + end +end + +if verification.verified then + + local member = Member:by_id(verification.verified_member_id) + + if param.get("cancel") then + db:query({ "SELECT delete_member(?)", member.id }) + return + end + + member.identification = param.get("identification") + member.name = param.get("screen_name") + member.notify_email = param.get("email") + member:save() + + update_data() + + verification:save() + + if param.get("invite") then + member:send_invitation() + end + +elseif param.get("drop") then + + verification.denied = "now" + verification:save() + return + +elseif param.get("accredit") then + + local member = Member:new() + member.role = true + member.identification = param.get("identification") + member.name = param.get("screen_name") + member.notify_email = param.get("email") + member:save() + + for i, unit_id in ipairs(config.role_registration.grant_privileges_for_unit_ids) do + local privilege = Privilege:new() + privilege.member_id = member.id + privilege.unit_id = unit_id + privilege.initiative_right = false -- TODO + privilege.voting_right = true + privilege:save() + end + + local agent = Agent:new() + agent.controlled_id = member.id + agent.controller_id = verification.requesting_member_id + agent:save() + + update_data() + + verification.verified_member_id = member.id + verification.verifying_member_id = app.session.member_id + verification.verified = "now" + + verification:save() + +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/_action/update_verification.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/_action/update_verification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,79 @@ +local verification = Verification:by_id(param.get_id()) + +local function update_data() + verification.verification_data = json.object() + + for i, field in ipairs(config.self_registration.fields) do + local value = param.get(field.name) + if field.name == "fiscal_code" then + value = string.gsub(value, "[^A-Z0-9]", "") + elseif field.name == "mobile_phone" then + value = string.gsub(value, "[^0-9]", "") + else + value = string.gsub(value, "^%s+", "") + value = string.gsub(value, "%s+$", "") + value = string.gsub(value, "%s+", " ") + end + verification.verification_data[field.name] = value + end +end + +if verification.verified_member_id then + + local member = Member:by_id(verification.verified_member_id) + + if param.get("cancel") then + db:query({ "SELECT delete_member(?)", member.id }) + return + end + + member.identification = param.get("identification") + member.notify_email = param.get("email") + member:save() + + update_data() + + verification:save() + + if param.get("invite") then + member:send_invitation() + end + +elseif param.get("drop") then + + verification.denied = "now" + verification:save() + return + +elseif param.get("accredit") then + + local member = Member:by_id(verification.requesting_member_id) + member.identification = param.get("identification") + member.notify_email = param.get("email") + member:save() + member:send_invitation() + + for i, unit_id in ipairs(config.self_registration.grant_privileges_for_unit_ids) do + local privilege = Privilege:new() + privilege.member_id = member.id + privilege.unit_id = unit_id + privilege.initiative_right = true + privilege.voting_right = true + privilege:save() + end + + update_data() + + verification.verified_member_id = verification.requesting_member_id + verification.verifying_member_id = app.session.member_id + verification.verified = "now" + + verification:save() + + +else + + update_data() + verification:save() + +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/_filter/90_admin.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/_filter/90_admin.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,9 @@ +if not app.session.member.admin then + return execute.view { module = "index", view = "403" } +end + +if config.admin_logger then + config.admin_logger(request.get_param_strings()) +end + +execute.inner() diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/_role_verification_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/_role_verification_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,38 @@ +local verifications = param.get("verifications", "table") + +local columns = { + { + label = _"Requested at", + content = function(record) + ui.link{ module = "registration_admin", view = "role_verification", id = record.id, content = function() + ui.container{ content = format.date(record.requested) } + ui.container{ attr = { class = "light" }, content = format.time(record.requested) } + end } + end + } +} + +for i, field in ipairs(config.role_registration.fields) do + table.insert(columns, { + label = field.label, + content = function(record) + ui.tag{ content = record.request_data[field.name] } + end + }) +end + +ui.list{ + records = verifications, + columns = columns +} + +slot.put([[]]) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/_verification_list.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/_verification_list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,76 @@ +local verifications = param.get("verifications", "table") + +ui.list{ + records = verifications, + columns = { + { + label = _"Requested at", + content = function(record) + ui.link{ module = "registration_admin", view = "verification", id = record.id, content = function() + ui.container{ content = format.date(record.requested) } + ui.container{ attr = { class = "light" }, content = format.time(record.requested) } + end } + end + }, + { + label = _"Name", + content = function(record) + ui.container{ content = function() + ui.tag{ content = (record.verification_data or record.request_data).name } + ui.tag{ content = ", " } + ui.tag{ content = (record.verification_data or record.request_data).first_name } + end } + end + }, + --[[ + { + label = _"City", + content = function(record) + ui.container{ content = (record.verification_data or record.request_data).zip_code } + ui.tag{ content = " " } + ui.tag{ content = (record.verification_data or record.request_data).city } + end + }, + --]] + { + label = _"Date/place of birth", + content = function(record) + ui.container{ content = (record.verification_data or record.request_data).date_of_birth } + ui.container{ content = (record.verification_data or record.request_data).place_of_birth } + end + }, + { + label = _"Fiscal code", + content = function(record) + ui.tag{ content = (record.verification_data or record.request_data).fiscal_code } + end + }, + { + label = _"Contact", + content = function(record) + ui.container{ content = function() + ui.tag{ content = (record.verification_data or record.request_data).email } + end } + ui.container{ content = function() + ui.tag{ content = config.self_registration.sms_prefix } + local phone_number = (record.verification_data or record.request_data).mobile_phone + if config.self_registration.sms_strip_leading_zero then + phone_number = string.match(phone_number, "0(.+)") + end + ui.tag{ content = phone_number } + end } + end + } + } +} + +slot.put([[]]) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/index.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/index.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,212 @@ +ui.title(_"Usermanagement") +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Usermanagement" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + ui.container{ content = _"User accounts" } + + ui.tag{ tag = "ul", content = function() + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", content = _("Open requests (#{count})", { count = count }) } + end } + + ui.tag{ tag = "ul", content = function() + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%User requested manual verification (during step 1)'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "manual_requested", step = 1 }, content = _("Manual verification requested during step 1 (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%User requested manual verification (during step 2)'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "manual_requested", step = 2 }, content = _("Manual verification requested during step 2 (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '% sent'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "pin_sent" }, content = _("PIN code not entered (yet) (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment similar to '%fiscal code does not match[^/]*'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "fiscal_code" }, content = _("Fiscal code does not match (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%mobile phone number already used before'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "mobile_phone" }, content = _("Phone number used before (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%user with same name already exist'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "identification" }, content = _("Identification used before (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%user entered invalid PIN three times'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "invalid_pin" }, content = _("Invalid PIN entered (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("comment ilike '%user with same name already exists'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "same_name_already_exists" }, content = _("User with same name already exists (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_where("not comment ilike '%User requested manual verification'") + :add_where("not comment ilike '% sent'") + :add_where("not comment similar to '%fiscal code does not match[^/]*'") + :add_where("not comment ilike '%mobile phone number already used before'") + :add_where("not comment ilike '%user with same name already exist'") + :add_where("not comment ilike '%user entered invalid PIN three times'") + :add_where("not comment ilike '%user with same name already exists'") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "other" }, content = _("other reasons (#{count})", { count = count }) } + end } + end } + + local count = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_accredited", content = _("Accredited (#{count})", { count = count }) } + ui.tag{ tag = "ul", content = function() + + local count = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where("member.activated ISNULL") + :add_where("member.deleted ISNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_accredited", params = { mode = "not_activated" }, content = _("Account not activated (yet) (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where("member.activated NOTNULL") + :add_where("member.deleted ISNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_accredited", params = { mode = "activated" }, content = _("Activated accounts (#{count})", { count = count }) } + end } + + local count = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where("member.deleted NOTNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_cancelled", content = _("Cancelled accounts (#{count})", { count = count }) } + end } + end } + end } + + local count = Verification:new_selector() + :add_where("denied NOTNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "verification_rejected", content = _("Rejected requests (#{count})", { count = count }) } + end } + + end } + + ui.container{ content = _"Role accounts" } + + ui.tag{ tag = "ul", content = function() + + local count = RoleVerification:new_selector() + :add_where("verified ISNULL") + :add_where("denied ISNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "role_verification_requests", content = _("Open requests (#{count})", { count = count }) } + end } + + local count = RoleVerification:new_selector() + :add_where("verified NOTNULL") + :add_where("denied ISNULL") + :join("member", nil, "member.id = role_verification.verified_member_id") + :add_where("member.deleted ISNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "role_verification_accredited", content = _("Accredited (#{count})", { count = count }) } + end } + + local count = RoleVerification:new_selector() + :add_where("verified NOTNULL") + :add_where("denied ISNULL") + :join("member", nil, "member.id = role_verification.verified_member_id") + :add_where("member.deleted NOTNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "role_verification_cancelled", content = _("Cancelled (#{count})", { count = count }) } + end } + + local count = RoleVerification:new_selector() + :add_where("verified ISNULL") + :add_where("denied NOTNULL") + :count() + ui.tag{ tag = "li", content = function() + ui.link{ module = "registration_admin", view = "role_verification_rejected", content = _("Rejected (#{count})", { count = count }) } + end } + + + end } + + end } + end } + + + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/role_verification.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/role_verification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,168 @@ +local verification = RoleVerification:by_id(param.get_id()) +local data = verification.verification_data or verification.request_data + +local identification = config.role_registration.identification_func(data) +local member +if verification.verified_member_id then + member = Member:by_id(verification.verified_member_id) + identification = member.identification +end + +local group, title, view +if verification.verified then + if member.deleted then + group = _"Cancelled accounts" + title = _"Cancelled account" + view = "role_verification_cancelled" + else + group = _"Accredited users" + title = member.identification + view = "role_verification_accredited" + end +elseif verification.denied then + group = "Rejected requests" + title = _"Rejected request" + view = "role_verification_rejected" +else + group = "Open requests" + title = _"Open request" + view = "role_verification_requests" +end + + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Rolemanagement" } + slot.put ( " » " ) + ui.link { module = "registration_admin", view = view, content = group } + slot.put ( " » " ) + ui.tag { tag = "span", content = title } +end) +app.html_title.title = _"Rolemanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = title } + end } + + + ui.form{ + module = "registration_admin", action = "update_role_verification", id = verification.id, + routing = { ok = { mode = "redirect", module = "registration_admin", view = view } }, + record = data, + content = function() + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + for i, field in ipairs(config.role_registration.fields) do + ui.container{ content = function() + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__data_" .. field.name, class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data" .. field.name }, + label = field.label, + name = field.name + } + + ui.tag{ content = verification.request_data[field.name] } + end } + end + + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label", style = "width: 30em;" }, + attr = { id = "lf-register__data_identification", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data_identification" }, + label = "Identification", + name = "identification", + value = identification + } + + end } + + local member = Member:by_id(verification.requesting_member_id) + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.tag{ content = _"Requested by:" } + slot.put(" ") + ui.link{ content = member.name, module = "member", view = "show", id = member.id } + end } + + ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + + if verification.denied then + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + elseif verification.verified then + ui.submit{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Save role data" } + slot.put("   ") + if not member.activated then + ui.submit{ name = "invite", attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Send email invitation again" } + slot.put("   ") + end + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + slot.put("   ") + ui.submit{ name = "cancel", attr = { class = "mdl-button mdl-js-button" }, value = _"Delete account" } + else + ui.submit{ name = "accredit", attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Accredit role" } + slot.put("   ") + ui.submit{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Save role data" } + slot.put("   ") + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + slot.put("   ") + ui.submit{ name = "drop", attr = { class = "mdl-button mdl-js-button" }, value = "Reject request" } + end + end } + + end + } + end } + + local verifications = RoleVerification:new_selector() + :join("member", nil, "member.id = role_verification.verified_member_id") + :add_where{ "member.identification = ?", identification } + :add_where{ "role_verification.id <> ?", verification.id } + :exec() + + if #verifications > 0 then + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Same identification" } + end } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + execute.view{ module = "registration_admin", view = "_role_verification_list", params = { verifications = verifications } } + end } + end } + end + + for i, field_name in ipairs(config.role_registration.match_fields) do + local field + for j, f in ipairs(config.role_registration.fields) do + if f.name == field_name then + field = f + end + end + local verifications = Verification:new_selector() + :add_where("verified NOTNULL") + :add_where{ "lower(request_data->>'" .. field.name .. "') = lower(?)", data[field.name] } + :add_where{ "verification.id <> ?", verification.id } + :exec() + + if #verifications > 0 then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Same " .. field.label } + end } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end } + end } + end + end + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/role_verification_accredited.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/role_verification_accredited.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,86 @@ +local mode = param.get("mode") + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Rolemanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Accredited role accounts"} +end) +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Accredited role accounts" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications_selector = RoleVerification:new_selector() + :join("member", nil, "member.id = role_verification.verified_member_id") + :add_where("member.deleted ISNULL") + :add_order_by("member.identification") + + if mode == "activated" then + verifications_selector:add_where("member.activated NOTNULL") + elseif mode == "not_activated" then + verifications_selector:add_where("member.activated ISNULL") + end + + local verifications = verifications_selector:exec() + + if #verifications > 0 then + ui.list{ + records = verifications, + columns = { + { + label = _"Identification", + content = function(record) + ui.container{ content = function() + local member = Member:by_id(record.verified_member_id) + if member then + ui.link{ module = "registration_admin", view = "role_verification", id = record.id, content = member.identification } + end + end } + end + }, + { + label = _"Account", + content = function(record) + local member = Member:by_id(record.verified_member_id) + if member and member.activated then + ui.link{ module = "member", view = "show", id = record.verified_member_id, content = "ID " .. record.verified_member_id } + else + ui.tag{ content = "ID " } + ui.tag{ content = record.verified_member_id } + ui.tag{ content = ", " } + ui.tag{ content = _"not activated (yet)" } + + end + end + }, + { + label = _"Verified at", + content = function(record) + ui.tag{ content = format.timestamp(record.verified) } + end + }, + { + label = _"Verified by", + content = function(record) + local member = Member:by_id(record.verifying_member_id) + ui.link{ module = "member", view = "show", id = member.id, content = member.identification or (member.id .. " " .. member.name) } + end + }, + } + } + end + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/role_verification_cancelled.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/role_verification_cancelled.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,35 @@ +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Rolemanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Cancelled accounts"} +end) +app.html_title.title = _"Rolemanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Cancelled accounts" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications = RoleVerification:new_selector() + :join("member", nil, "member.id = role_verification.verified_member_id") + :add_where("member.deleted NOTNULL") + :add_order_by("requested DESC") + :exec() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_role_verification_list", params = { verifications = verifications } } + end + + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/role_verification_rejected.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/role_verification_rejected.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,35 @@ +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Rolemanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Rejected requests"} +end) +app.html_title.title = _"Rolemanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Rejected role accreditation requests" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications = RoleVerification:new_selector() + :add_where("denied NOTNULL") + :add_order_by("requested DESC") + :exec() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_role_verification_list", params = { verifications = verifications } } + end + + end } + end } + + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/role_verification_requests.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/role_verification_requests.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,42 @@ +local mode = param.get("mode") + +local verifications_selector = RoleVerification:new_selector() + :add_where("verified ISNULL") + :add_where("denied ISNULL") + :add_order_by("requested DESC") + +local title = _"Open role requests" + +local verifications = verifications_selector:exec() + + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Rolemanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = _"Open requests" } +end) + +app.html_title.title = _"Rolemanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = title } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_role_verification_list", params = { verifications = verifications } } + end + + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/verification.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/verification.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,167 @@ +local verification = Verification:by_id(param.get_id()) +local data = verification.verification_data or verification.request_data + +local identification = config.self_registration.identification_func(data) +local member +if verification.verified_member_id then + member = Member:by_id(verification.verified_member_id) + identification = member.identification +end + +local group, title, view +if verification.verified_member_id then + if member.deleted then + group = _"Cancelled accounts" + title = _"Cancelled account" + view = "verification_cancelled" + else + group = _"Accredited users" + title = member.identification + view = "verification_accredited" + end +elseif verification.denied then + group = "Rejected requests" + title = _"Rejected request" + view = "verification_rejected" +else + group = "Open requests" + title = _"Open request" + view = "verification_requests" +end + + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Usermanagement" } + slot.put ( " » " ) + ui.link { module = "registration_admin", view = view, content = group } + slot.put ( " » " ) + ui.tag { tag = "span", content = title } +end) +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = title } + end } + + + ui.form{ + module = "registration_admin", action = "update_verification", id = verification.id, + routing = { ok = { mode = "redirect", module = "registration_admin", view = view } }, + record = data, + content = function() + + if not verification.verified_member_id then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.container{ content = verification.comment and verification.comment:gsub("///", " / ") or ""} + end } + end + + ui.container{ attr = { class = "mdl-card__content" }, content = function() + + for i, field in ipairs(config.self_registration.fields) do + ui.container{ content = function() + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" }, + attr = { id = "lf-register__data_" .. field.name, class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data" .. field.name }, + label = field.label, + name = field.name + } + + ui.tag{ content = verification.request_data[field.name] } + end } + end + + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label", style = "width: 30em;" }, + attr = { id = "lf-register__data_identification", class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data_identification" }, + label = "Identification", + name = "identification", + value = identification + } + + end } + + ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function() + + if verification.denied then + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + elseif verification.verified_member_id then + ui.submit{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Save personal data" } + slot.put("   ") + if not member.activated then + ui.submit{ name = "invite", attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Send email invitation again" } + slot.put("   ") + end + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + slot.put("   ") + ui.submit{ name = "cancel", attr = { class = "mdl-button mdl-js-button" }, value = _"Delete account" } + else + ui.submit{ name = "accredit", attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Accredit user" } + slot.put("   ") + ui.submit{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, value = "Save personal data" } + slot.put("   ") + ui.link{ attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, module = "registration_admin", view = view, content = "Back" } + slot.put("   ") + ui.submit{ name = "drop", attr = { class = "mdl-button mdl-js-button" }, value = "Reject request" } + end + end } + + end + } + end } + + local verifications = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where{ "member.identification = ?", identification } + :add_where{ "verification.id <> ?", verification.id } + :exec() + + if #verifications > 0 then + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Same identification" } + end } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end } + end } + end + + for i, field_name in ipairs(config.self_registration.match_fields) do + local field + for j, f in ipairs(config.self_registration.fields) do + if f.name == field_name then + field = f + end + end + local verifications = Verification:new_selector() + :add_where("verified_member_id NOTNULL") + :add_where{ "lower(request_data->>'" .. field.name .. "') = lower(?)", data[field.name] } + :add_where{ "verification.id <> ?", verification.id } + :exec() + + if #verifications > 0 then + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Same " .. field.label } + end } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end } + end } + end + end + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/verification_accredited.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/verification_accredited.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,110 @@ +local mode = param.get("mode") + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Usermanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Accredited users"} +end) +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Accredited users" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications_selector = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where("member.deleted ISNULL") + + if mode == "activated" then + verifications_selector:add_where("member.activated NOTNULL") + end + + if mode ~= "not_activated" then + verifications_selector:add_order_by("member.identification") + local verifications = verifications_selector:exec() + + if #verifications > 0 then + ui.list{ + records = verifications, + columns = { + { + label = _"Name", + content = function(record) + ui.container{ content = function() + local member = Member:by_id(record.verified_member_id) + if member then + ui.link{ module = "registration_admin", view = "verification", id = record.id, content = member.identification } + end + end } + end + }, + --[[ + { + label = _"City", + content = function(record) + ui.container{ content = (record.verification_data or record.request_data).zip_code } + ui.tag{ content = " " } + ui.tag{ content = (record.verification_data or record.request_data).city } + end + }, + --]] + { + label = _"Account", + content = function(record) + local member = Member:by_id(record.verified_member_id) + if member and member.activated then + ui.link{ module = "member", view = "show", id = record.verified_member_id, content = "ID " .. record.verified_member_id } + else + ui.tag{ content = "ID " } + ui.tag{ content = record.verified_member_id } + ui.tag{ content = ", " } + ui.tag{ content = _"not activated (yet)" } + + end + end + }, + { + label = _"Verified at", + content = function(record) + ui.tag{ content = format.timestamp(record.verified) } + end + }, + { + label = _"Verified by", + content = function(record) + if record.verifying_member_id then + local member = Member:by_id(record.verifying_member_id) + ui.link{ module = "member", view = "show", id = member.id, content = member.identification or (member.id .. " " .. member.name) } + local state = string.match(record.comment, "[^/]+$") + slot.put(" ") + ui.tag{ content = state } + elseif record.verified then + ui.tag{ content = _"SMS" } + end + + end + }, + } + } + end + elseif mode == "not_activated" then + verifications_selector:add_where("member.activated ISNULL") + :add_order_by("verification.id DESC") + local verifications = verifications_selector:exec() + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end + + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/verification_cancelled.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/verification_cancelled.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,35 @@ +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Usermanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Cancelled accounts"} +end) +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Cancelled accounts" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications = Verification:new_selector() + :join("member", nil, "member.id = verification.verified_member_id") + :add_where("member.deleted NOTNULL") + :add_order_by("requested DESC") + :exec() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end + + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/verification_rejected.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/verification_rejected.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,35 @@ +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Usermanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = "Rejected requests"} +end) +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = _"Rejected accreditation requests" } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + local verifications = Verification:new_selector() + :add_where("denied NOTNULL") + :add_order_by("request_data->>'name', request_data->>'first_name', requested DESC") + :exec() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end + + end } + end } + + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/registration_admin/verification_requests.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/registration_admin/verification_requests.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,78 @@ +local mode = param.get("mode") +local step = param.get("step", atom.integer) + +local verifications_selector = Verification:new_selector() + :add_where("verified_member_id ISNULL") + :add_where("denied ISNULL") + :add_order_by("requested DESC") + +local title = _"Open requests" + +if mode == "manual_requested" and step == 1 then + title = _"Manual verification requested during step 1" + verifications_selector:add_where("comment ilike '%User requested manual verification (during step 1)'") +elseif mode == "manual_requested" and step == 2 then + title = _"Manual verification requested during step 2" + verifications_selector:add_where("comment ilike '%User requested manual verification (during step 2)'") +elseif mode == "pin_sent" then + title = _"PIN code not entered" + verifications_selector:add_where("comment ilike '% sent'") +elseif mode == "fiscal_code" then + title = _"Fiscal code does not match" + verifications_selector:add_where("comment similar to '%fiscal code does not match[^/]*'") +elseif mode == "mobile_phone" then + title = _"Phone number used before" + verifications_selector:add_where("comment ilike '%mobile phone number already used before'") +elseif mode == "identification" then + title = _"Identification used before" + verifications_selector:add_where("comment ilike '%user with same name already exist'") +elseif mode == "invalid_pin" then + title = _"Invalid PIN entered" + verifications_selector:add_where("comment ilike '%user entered invalid PIN three times'") +elseif mode == "same_name_already_exists" then + title = _"Same name already exists" + verifications_selector:add_where("comment ilike '%user with same name already exists'") +elseif mode == "other" then + title = _"Other reasons" + verifications_selector:add_where("not comment ilike '%User requested manual verification'") + verifications_selector:add_where("not comment ilike '% sent'") + verifications_selector:add_where("not comment similar to '%fiscal code does not match[^/]*'") + verifications_selector:add_where("not comment ilike '%mobile phone number already used before'") + verifications_selector:add_where("not comment ilike '%user with same name already exist'") + verifications_selector:add_where("not comment ilike '%user entered invalid PIN three times'") + verifications_selector:add_where("not comment ilike '%user with same name already exists'") +end + +local verifications = verifications_selector:exec() + + +ui.title(function() + ui.link { module = "registration_admin", view = "index", content = _"Usermanagement" } + slot.put ( " » " ) + ui.tag { tag = "span", content = _"Open requests" } +end) + +app.html_title.title = _"Usermanagement" + +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + ui.tag{ content = title } + end } + end } + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + if #verifications > 0 then + execute.view{ module = "registration_admin", view = "_verification_list", params = { verifications = verifications } } + end + + end } + end } + + end } +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/role/_action/request.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/role/_action/request.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,57 @@ +if not app.session.member or app.session.member.role then + return +end + +local errors = 0 + +if config.use_terms_checkboxes_role then + for i, checkbox in ipairs(config.use_terms_checkboxes_role) do + local accepted = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) + if not accepted then + slot.put_into("error", checkbox.not_accepted_error) + errors = errors + 1 + end + end +end + +local email = param.get("email") + +local members = Member:new_selector() + :add_where{ "notify_email = ? OR notify_email_unconfirmed = ?", email } + :exec() + +if #members > 0 then + slot.select("error", function() + slot.put_into("registration_register_email_invalid", "already_used") + ui.tag{ content = _"This email address already been used. Please check your inbox for an invitation or contact us." } + end) + errors = errors + 1 +end + +local verification = RoleVerification:new() +verification.requesting_member_id = app.session.member_id +verification.requested = "now" +verification.request_origin = json.object{ + ip = request.get_header("X-Forwarded-For"), + hostname = request.get_header("X-Forwarded-Host") +} +verification.request_data = json.object() + +for i, field in ipairs(config.role_registration.fields) do + local value = param.get("verification_data_" .. field.name) + if not value or #value < 1 then + slot.put_into("self_registration__invalid_" .. field.name, "to_short") + slot.select("error", function() + ui.container{ content = _("Please enter: #{field_name}", { field_name = field.label }) } + end) + errors = errors + 1 + end + value = string.gsub(value, "^%s+", "") + value = string.gsub(value, "%s+$", "") + value = string.gsub(value, "%s+", " ") + verification.request_data[field.name] = value +end + +verification:save() + +request.redirect{ external = encode.url { module = "member", view = "show", id = app.session.member_id } } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/role/_action/switch.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/role/_action/switch.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,55 @@ +local id = param.get_id() + +local member_id = app.session.real_member_id or app.session.member_id + +if id then + local member = Member:by_id(id) + + if member.locked then + return + end + + local agent = Agent:by_pk(member.id, member_id) + + if not agent then + return + end + + local session = Session:new() + session.member_id = member.id + session.real_member_id = member_id + session:save() + + if not member.activated then + member.activated = "now" + end + + member.last_login = "now" + member.last_activity = "now" + member.active = true + member:save() + + app.session:destroy() + + request.set_cookie{ + name = config.cookie_name or "liquid_feedback_session", + value = session.ident + } +elseif app.session.real_member_id then + local session = Session:new() + session.member_id = app.session.real_member_id + session:save() + + app.session:destroy() + + request.set_cookie{ + name = config.cookie_name or "liquid_feedback_session", + value = session.ident + } +end + +if config.meta_navigation_home_url then + request.redirect{ external = config.meta_navigation_home_url } +else + request.redirect{ module = "index", view = "index" } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/role/_request_form.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/role/_request_form.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,19 @@ +for i, field in ipairs(config.role_registration.fields) do + local class = "" + local field_error = slot.get_content("role_registration__invalid_" .. field.name) + if field_error == "" then + field_error = nil + end + if field_error then + class = " is-invalid" + end + ui.field.text{ + container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" .. class }, + attr = { id = "lf-register__data_" .. field.name, class = "mdl-textfield__input" }, + label_attr = { class = "mdl-textfield__label", ["for"] = "lf-register__data" .. field.name }, + label = field.label, + name = "verification_data_" .. field.name, + value = request.get_param{ name = "verification_data_" .. field.name } + } + slot.put("
") +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/role/request.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/role/request.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,96 @@ +ui.titleMember(_"Request role account") + +ui.grid{ content = function() + + ui.cell_main{ content = function() + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Request role accounts" } + end } + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + + + ui.form{ + attr = { onsubmit = "document.getElementById('register_button').disabled = true;" }, + module = "role", action = "request", + routing = { + error = { mode = "forward", module = "role", view = "request" } + }, + content = function() + + ui.container{ content = config.role_registration.info_top } + + execute.view{ module = "role", view = "_request_form" } + + ui.container{ + attr = { class = "use_terms" }, + content = function() + slot.put(config.use_terms_role) + end + } + + if config.use_terms_checkboxes_role then + for i, checkbox in ipairs(config.use_terms_checkboxes_role) do + ui.tag{ tag = "label", attr = { + class = "mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect", + ["for"] = "use_terms_checkbox_" .. checkbox.name + }, + content = function() + ui.tag{ + tag = "input", + attr = { + type = "checkbox", + class = "mdl-checkbox__input", + id = "use_terms_checkbox_" .. checkbox.name, + name = "use_terms_checkbox_" .. checkbox.name, + value = "1", + style = "float: left;", + checked = param.get("use_terms_checkbox_" .. checkbox.name, atom.boolean) and "checked" or nil + } + } + ui.tag{ + attr = { class = "mdl-checkbox__label" }, + content = function() slot.put(checkbox.html) end + } + end + } + slot.put("

") + end + end + + ui.container{ content = function() + slot.put(config.role_registration.info_bottom) + end } + + slot.put("
") + + ui.tag{ + tag = "input", + attr = { + id = "register_button", + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Proceed with registration" + } + } + slot.put("   ") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" }, + module = "member", view = "show", id = app.session.member_id, text = _"Cancel", + } + + end } + end } + end } + end } + + ui.cell_sidebar{ content = function() + execute.view { + module = "member", view = "_sidebar_whatcanido", params = { + member = app.session.member + } + } + end } + +end } + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/style/_style.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/style/_style.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,91 @@ +local style = param.get("style", "table") + +local md_colors = { + ["500"] = { + red = "244,67,54", + pink = "233,30,99", + purple = "156,39,176", + ["deep-purple"] = "103,58,183", + indigo = "63,81,181", + blue = "33,150,243", + ["light-blue"] = "3,169,244", + cyan = "0,188,212", + teal = "0,150,136", + green = "76,175,80", + ["light-green"] = "139,195,74", + lime = "205,220,57", + yellow = "255,235,59", + amber = "255,193,7", + orange = "255,152,0", + ["deep-orange"] = "255,87,34", + brown = "121,85,72", + grey = "158,158,158", + ["blue-grey"] = "96,125,139", + }, + ["A200"] = { + red = "255,82,82", + pink = "255,64,129", + purple = "224,64,251", + ["deep-purple"] = "124,77,255", + indigo = "83,109,254", + blue = "68,138,255", + ["light-blue"] = "64,196,255", + cyan = "24,255,255", + teal = "100,255,218", + green = "105,240,174", + ["light-green"] = "178,255,89", + lime = "238,255,65", + yellow = "255,255,0", + amber = "255,215,64", + orange = "255,171,64", + ["deep-orange"] = "255,110,64", + brown ="62,39,35", + grey = "33,33,33", + ["blue-grey"] = "38,50,56" + } +} + +local r = {} + +if style.color then + r.color = { + primary = style.color.primary, + primary_dark = style.color.primary_dark, + accent = style.color.accent, + primary_contrast = style.color.primary_contrast, + accent_contrast = style.color.accent_contrast + } + r.color_rgb = { + primary = style.color.primary, + accent = style.color.accent + } +elseif style.color_md then + r.color_md = { + primary = style.color_md.primary, + primary_contrast = style.color_md.primary_contrast, + accent = style.color_md.accent, + accent_contrast = style.color_md.accent_contrast + } +else + r.color_md = { + primary = "grey", + primary_contrast = "dark", + accent = "red", + accent_contrast = "dark" + } +end +if not r.color then + r.color = { + primary = "$palette-" .. r.color_md.primary .. "-500", + primary_dark = "$palette-" .. r.color_md.primary .. "-700", + accent = "$palette-" .. r.color_md.accent .. "-A200", + primary_contrast = "$color-" .. r.color_md.primary_contrast.. "-contrast", + accent_contrast = "$color-" .. r.color_md.accent_contrast .. "-contrast" + } + r.color_rgb = { + primary = md_colors["500"][r.color_md.primary], + accent = md_colors["A200"][r.color_md.accent] + } +end + +return r diff -r 7ea154c9238a -r 32cc544d5a5b app/main/style/style.css.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/style/style.css.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,47 @@ +slot.set_layout(nil, "text/css") + +local style = execute.chunk{ module = "style", chunk = "_style", params = { style = config.style } } + +local scss = [[ +@import "../style/mdl/color-definitions"; +$color-primary: ]] .. style.color.primary .. [[; +$color-primary-dark: ]] .. style.color.primary .. [[; +$color-primary-contrast: ]] .. style.color.primary_contrast .. [[; +$color-accent: ]] .. style.color.accent .. [[; +$color-accent-contrast: ]] .. style.color.accent_contrast .. [[; +$checkbox-image-path: "]] .. request.get_absolute_baseurl() .. "static/mdl" .. [["; +@import "../style/mdl/material-design-lite" +]] + +local key = extos.crypt(json.export(style.color), "$1$12345678") -- TODO hash function +local filename_scss = encode.file_path(WEBMCP_BASE_PATH, 'tmp', "style-" .. key .. ".scss") +local filename_css = encode.file_path(WEBMCP_BASE_PATH, 'tmp', "style-" .. key .. ".css") + +local css_file = io.open(filename_css, "r") + +if not config.css then + config.css = {} +end + +if not config.css[key] then + if css_file then + config.css[key] = css_file:read("*a") + else + local scss_file = assert(io.open(filename_scss, "w")) + scss_file:write(scss) + scss_file:write("\n") + scss_file:close() + + local output, err, status = extos.pfilter(nil, "sassc", filename_scss) + if status ~= 0 then + error(err) + end + config.css[key] = output + local css_file = assert(io.open(filename_css, "w")) + css_file:write(config.css[key]) + css_file:close() + end +end + +slot.put_into("data", config.css[key]) + diff -r 7ea154c9238a -r 32cc544d5a5b app/main/suggestion/_action/add.lua --- a/app/main/suggestion/_action/add.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/suggestion/_action/add.lua Sun Jul 15 14:07:29 2018 +0200 @@ -6,7 +6,7 @@ local initiative = Initiative:by_id(param.get("initiative_id", atom.integer)) if not app.session.member:has_voting_right_for_unit_id(initiative.issue.area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end @@ -27,7 +27,8 @@ end end if not formatting_engine_valid then - error("invalid formatting engine!") + slot.put_into("error", "invalid formatting engine!") + return false end if param.get("preview") then @@ -68,4 +69,4 @@ opinion:save() -slot.put_into("notice", _"Your suggestion has been added") \ No newline at end of file +slot.put_into("notice", _"Your suggestion has been added") diff -r 7ea154c9238a -r 32cc544d5a5b app/main/unit/_head.lua --- a/app/main/unit/_head.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/unit/_head.lua Sun Jul 15 14:07:29 2018 +0200 @@ -29,4 +29,4 @@ end end } -end ) \ No newline at end of file +end ) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/unit/_sidebar.lua --- a/app/main/unit/_sidebar.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/unit/_sidebar.lua Sun Jul 15 14:07:29 2018 +0200 @@ -11,15 +11,6 @@ :add_where{ "area.active" } :add_order_by("area.name") -if member then - areas_selector:left_join ( - "membership", nil, - { "membership.area_id = area.id AND membership.member_id = ?", member.id } - ) - areas_selector:add_field("membership.member_id NOTNULL", "subscribed", { "grouped" }) -end - - local areas = areas_selector:exec() if member then unit:load_delegation_info_once_for_member_id(member.id) @@ -77,4 +68,4 @@ end -- if #areas > 0 -end ) -- ui.sidebar \ No newline at end of file +end ) -- ui.sidebar diff -r 7ea154c9238a -r 32cc544d5a5b app/main/unit/_sidebar_whatcanido.lua --- a/app/main/unit/_sidebar_whatcanido.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/unit/_sidebar_whatcanido.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,69 +1,108 @@ local unit = param.get ( "unit", "table" ) +unit:load_delegation_info_once_for_member_id(app.session.member_id) -ui.sidebar ( "tab-whatcanido", function () +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" } + end } + ui.container{ attr = { class = "what-can-i-do-here" }, content = function() - ui.sidebarHeadWhatCanIDo() - - if app.session.member then - - if app.session.member:has_voting_right_for_unit_id ( unit.id ) then - ui.sidebarSection( function () - - if not unit.delegation_info.first_trustee_id then - ui.heading{ level = 3, content = _"I want to delegate this organizational unit" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + if app.session.member and app.session.member:has_voting_right_for_unit_id ( unit.id ) then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to stay informed" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.tag{ content = _"check your " } + ui.link{ + module = "member", view = "settings_notification", + params = { return_to = "home" }, + text = _"notifications settings" + } + end } + if not config.voting_only then ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - unit_id = unit.id, - }, - content = _("choose delegatee", { - unit_name = unit.name - }) + ui.tag{ content = _"subscribe subject areas or add your interested to issues and you will be notified about changes (follow the instruction on the area or issue page)" } + end } + end + end } + end } + + if not config.disable_delegations then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + if not unit.delegation_info.first_trustee_id then + ui.tag{ content = _"I want to delegate this organizational unit" } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + unit_id = unit.id, + }, + content = _("choose delegatee", { + unit_name = unit.name + }) + } + end } + end } + else + ui.container { attr = { class = "right" }, content = function() + local member = Member:by_id(unit.delegation_info.first_trustee_id) + execute.view{ + module = "member_image", + view = "_show", + params = { + member = member, + image_type = "avatar", + show_dummy = true + } } end } - end } - else - ui.container { attr = { class = "right" }, content = function() - local member = Member:by_id(unit.delegation_info.first_trustee_id) - execute.view{ - module = "member_image", - view = "_show", - params = { - member = member, - image_type = "avatar", - show_dummy = true - } - } - end } - ui.heading{ level = 3, content = _"You delegated this unit" } + ui.tag{ content = _"You delegated this unit" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = function () - ui.link { - module = "delegation", view = "show", params = { - unit_id = unit.id, - }, - content = _("change/revoke delegation", { - unit_name = unit.name - }) - } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = function () + ui.link { + module = "delegation", view = "show", params = { + unit_id = unit.id, + }, + content = _("change/revoke delegation", { + unit_name = unit.name + }) + } + end } end } - end } - end - end ) + end + end } + end + + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ + content = _"I want to vote" + } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"check the issues on the right, and click on 'Vote now' to vote on an issue which is in voting phase." } + end } + end } - ui.sidebarSection( function() - ui.heading { level = 3, content = _"I want to start a new initiative" } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - ui.tag { tag = "li", content = _"Open the appropriate subject area where your issue fits in and follow the instruction on that page." } - end } - end ) + else + ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function () + ui.tag{ content = _"You are not entitled to vote in this unit" } + ui.tag{ tag = "ul", content = function() + ui.tag{ tag = "li", content = function() + ui.link{ module = "index", view = "login", content = _"Login" } + end } + end } + end } + end - else - ui.sidebarSection( _"You are not entitled to vote in this unit" ) + if not config.voting_only and app.session.member_id and app.session.member:has_initiative_right_for_unit_id ( unit.id ) then + ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function() + ui.tag{ content = _"I want to start a new initiative" } + ui.tag{ tag = "ul", attr = { class = "ul" }, content = function () + ui.tag { tag = "li", content = _"open the appropriate subject area for your issue and follow the instruction on that page." } + end } + end } end - - end + + end } -end ) \ No newline at end of file +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/unit/show.lua --- a/app/main/unit/show.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/unit/show.lua Sun Jul 15 14:07:29 2018 +0200 @@ -8,6 +8,7 @@ return end +app.current_unit = unit unit:load_delegation_info_once_for_member_id(app.session.member_id) @@ -38,36 +39,40 @@ :add_where("issue.closed NOTNULL") :add_order_by("issue.closed DESC") - - -execute.view { module = "unit", view = "_head", params = { unit = unit } } - + ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() + + ui.heading{ content = unit.name } -execute.view { - module = "unit", view = "_sidebar", params = { - unit = unit - } -} + execute.view { module = "unit", view = "_head", params = { unit = unit } } + + execute.view { + module = "unit", view = "_sidebar", params = { + unit = unit + } + } -execute.view { - module = "unit", view = "_sidebar_whatcanido", params = { - unit = unit - } -} + execute.view { + module = "unit", view = "_sidebar_whatcanido", params = { + unit = unit + } + } -execute.view { - module = "unit", view = "_sidebar_members", params = { - unit = unit - } -} + execute.view { + module = "unit", view = "_sidebar_members", params = { + unit = unit + } + } -execute.view { - module = "issue", - view = "_list2", - params = { for_unit = unit, head = function () - ui.heading { attr = { class = "left" }, level = 1, content = unit.name } + execute.view { + module = "issue", + view = "_list", + params = { for_unit = unit, head = function () + ui.heading { attr = { class = "left" }, level = 1, content = unit.name } + end } + } + end } end } -} --[[ if app.session:has_access("all_pseudonymous") then @@ -90,4 +95,4 @@ ui.tabs(tabs) ---]] \ No newline at end of file +--]] diff -r 7ea154c9238a -r 32cc544d5a5b app/main/util/_unit_area_filter.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/main/util/_unit_area_filter.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,44 @@ +local member = app.session.member +local units +if member then + units = member:get_reference_selector("units"):add_order_by("name"):exec() + units:load_delegation_info_once_for_member_id(member.id) +else + units = Unit:new_selector():add_where("active"):add_order_by("name"):exec() +end + +ui.tag{ tag = "button", attr = { id = "unit-menu", class = "mdl-button mdl-js-button" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "filter_list" } + ui.tag{ content = "All units" } +end } +ui.tag{ tag = "ul", attr = { class = "mdl-menu mdl-menu--top-left mdl-js-menu mdl-js-ripple-effect", ["data-mdl-for"]="unit-menu" }, content = function() + if #units > 0 then + for i, unit in ipairs(units) do + local class = "mdl-navigation__link mdl-navigation__head" + if i == #units then + class = class .. " mdl-menu__item--full-bleed-divider" + end + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ attr = { class = classx }, content = unit.name, module = "unit", view = "show", id = unit.id } + end } + end + end +end } + +if app.current_unit then + ui.tag{ tag = "button", attr = { id = "area-menu", class = "mdl-button mdl-js-button mdl-button--icon" }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "more_vert" } + end } + ui.tag{ content = "All units" } + ui.tag{ tag = "ul", attr = { class = "mdl-menu mdl-menu--top-left mdl-js-menu mdl-js-ripple-effect", ["data-mdl-for"]="area-menu" }, content = function() + for i, area in ipairs({}) do + local class = "mdl-navigation__link mdl-menu__item--small" + if i == #areas then + class = class .. " mdl-menu__item--full-bleed-divider" + end + ui.tag{ tag = "li", attr = { class = "mdl-menu__item" }, content = function() + ui.link{ attr = { class = classx }, module = "area", view = "show", id = area.id, content = area.name } + end } + end + end } +end diff -r 7ea154c9238a -r 32cc544d5a5b app/main/vote/_action/update.lua --- a/app/main/vote/_action/update.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/vote/_action/update.lua Sun Jul 15 14:07:29 2018 +0200 @@ -3,10 +3,16 @@ local issue = Issue:new_selector():add_where{ "id = ?", param.get("issue_id", atom.integer) }:for_share():single_object_mode():exec() +-- TODO patch for project voting +if config.alternative_voting and config.alternative_voting[tostring(issue.policy.id)] then + return false +end + + local preview = (param.get("preview") or param.get("edit")) and true or false if not app.session.member:has_voting_right_for_unit_id(issue.area.unit_id) then - error("access denied") + return execute.view { module = "index", view = "403" } end local update_comment = param.get("update_comment") and true or false @@ -82,7 +88,8 @@ end end if not formatting_engine_valid then - error("invalid formatting engine!") + slot.put_into("error", "invalid formatting engine!") + return false end end @@ -116,7 +123,7 @@ local grade = tonumber(grade) local initiative = Initiative:by_id(initiative_id) if initiative.issue.id ~= issue.id then - error("initiative from wrong issue") + return execute.view { module = "index", view = "403" } end if not preview and not issue.closed then local vote = Vote:by_pk(initiative_id, app.session.member.id) diff -r 7ea154c9238a -r 32cc544d5a5b app/main/vote/list.lua --- a/app/main/vote/list.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/vote/list.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,5 +1,23 @@ local issue = Issue:by_id(param.get("issue_id"), atom.integer) +-- TODO patch for project voting +if not issue.closed and config.alternative_voting and config.alternative_voting[tostring(issue.policy.id)] then + local voting_config = config.alternative_voting[tostring(issue.policy.id)] + + local url = encode.url { + module = voting_config.module, + view = voting_config.view, + params = { issue_id = issue.id } + } + + return request.redirect{ external = url } +end + +if not issue then + execute.view { module = "index", view = "404" } + return +end + local member_id = param.get("member_id", atom.integer) local member local readonly = false @@ -7,8 +25,9 @@ local preview = param.get("preview") and true or false if member_id then - if not issue.closed then - error("access denied") + if not issue.closed then + execute.view{ module = "index", view = "403" } + return end member = Member:by_id(member_id) readonly = true @@ -149,7 +168,7 @@ ui.sidebar( "tab-members", function() ui.sidebarHead(function() - ui.heading{ level = 2, content = _"Incoming delegations" } + ui.heading{ level = 4, content = _"Incoming delegations" } end) execute.view{ module = "member", @@ -166,407 +185,410 @@ end) end - -ui.section( function() - - ui.sectionHead( function() - if preview then - ui.heading { level = 1, content = _"Preview of voting ballot" } - elseif readonly then - local str = _("Ballot of '#{member_name}'", - {member_name = string.format('%s', - encode.url{ - module = "member", - view = "show", - id = member.id, - }, - encode.html(member.name)) - } - ) - ui.heading { level = 1, content = function () slot.put ( str ) end } - else - ui.heading { level = 1, content = _"Voting" } - end - end ) - - ui.sectionRow( function() +ui.container{ attr = { class = "mdl-grid" }, content = function() + ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function() - ui.form{ - record = direct_voter, - attr = { - id = "voting_form", - class = readonly and "voting_form_readonly" or "voting_form_active" - }, - module = "vote", - action = "update", - params = { issue_id = issue.id }, - content = function() - if not readonly or preview then - local scoring = param.get("scoring") - if not scoring then - for i, initiative in ipairs(initiatives) do - local vote = initiative.vote - if vote then - tempvotings[initiative.id] = vote.grade - else - tempvotings[initiative.id] = 0 - end - end - local tempvotings_list = {} - for key, val in pairs(tempvotings) do - tempvotings_list[#tempvotings_list+1] = tostring(key) .. ":" .. tostring(val) - end - if #tempvotings_list > 0 then - scoring = table.concat(tempvotings_list, ";") - else - scoring = "" - end + ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() + ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() + ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function() + if preview then + ui.tag{ content = _"Preview of voting ballot" } + elseif readonly then + local str = _("Ballot of '#{member_name}'", { member_name = string.format( + '%s', + encode.url{ module = "member", view = "show", id = member.id }, + encode.html(member.name) + ) }) + ui.tag{ content = function () slot.put ( str ) end } + else + ui.tag{ content = _"Voting" } end - slot.put('') - end - if preview then - ui.heading{ level = 2, content = _"Your choice" } - elseif not readonly then - ui.heading{ level = 2, content = _"Make your choice by placing the initiatives" } - end - - ui.container{ - attr = { id = "voting" }, + end } + end } + + ui.container{ attr = { class = "mdl-card__content" }, content = function() + + ui.form{ + record = direct_voter, + attr = { + id = "voting_form", + class = readonly and "voting_form_readonly" or "voting_form_active" + }, + module = "vote", + action = "update", + params = { issue_id = issue.id }, content = function() - local approval_index, disapproval_index = 0, 0 - local approval_used, disapproval_used - for grade = max_grade, min_grade, -1 do - local entries = sections[grade] - local class - if grade > 0 then - class = "approval" - elseif grade < 0 then - class = "disapproval" - else - class = "abstention" + if not readonly or preview then + local scoring = param.get("scoring") + if not scoring then + for i, initiative in ipairs(initiatives) do + local vote = initiative.vote + if vote then + tempvotings[initiative.id] = vote.grade + else + tempvotings[initiative.id] = 0 + end + end + local tempvotings_list = {} + for key, val in pairs(tempvotings) do + tempvotings_list[#tempvotings_list+1] = tostring(key) .. ":" .. tostring(val) + end + if #tempvotings_list > 0 then + scoring = table.concat(tempvotings_list, ";") + else + scoring = "" + end end - if - #entries > 0 or - (grade == 1 and not approval_used) or - (grade == -1 and not disapproval_used) or - grade == 0 - then - ui.container{ - attr = { class = class }, - content = function() - local heading - if class == "approval" then - approval_used = true - approval_index = approval_index + 1 - if approval_count > 1 then - if approval_index == 1 then - if #entries == 1 then - heading = _"Approval (first preference) [single entry]" + slot.put('') + end + if preview then + ui.container{ content = _"Your choice" } + elseif not readonly then + ui.container{ content = _"Make your choice by placing the initiatives" } + end + + ui.container{ + attr = { id = "voting" }, + content = function() + local approval_index, disapproval_index = 0, 0 + local approval_used, disapproval_used + for grade = max_grade, min_grade, -1 do + local entries = sections[grade] + local class + if grade > 0 then + class = "approval" + elseif grade < 0 then + class = "disapproval" + else + class = "abstention" + end + if + #entries > 0 or + (grade == 1 and not approval_used) or + (grade == -1 and not disapproval_used) or + grade == 0 + then + ui.container{ + attr = { class = class }, + content = function() + local heading + if class == "approval" then + approval_used = true + approval_index = approval_index + 1 + if approval_count > 1 then + if approval_index == 1 then + if #entries == 1 then + heading = _"Approval (first preference) [single entry]" + else + heading = _"Approval (first preference) [many entries]" + end + elseif approval_index == 2 then + if #entries == 1 then + heading = _"Approval (second preference) [single entry]" + else + heading = _"Approval (second preference) [many entries]" + end + elseif approval_index == 3 then + if #entries == 1 then + heading = _"Approval (third preference) [single entry]" + else + heading = _"Approval (third preference) [many entries]" + end + else + if #entries == 1 then + heading = _"Approval (#th preference) [single entry]" + else + heading = _"Approval (#th preference) [many entries]" + end + end else - heading = _"Approval (first preference) [many entries]" - end - elseif approval_index == 2 then - if #entries == 1 then - heading = _"Approval (second preference) [single entry]" - else - heading = _"Approval (second preference) [many entries]" + if #entries == 1 then + heading = _"Approval [single entry]" + else + heading = _"Approval [many entries]" + end end - elseif approval_index == 3 then - if #entries == 1 then - heading = _"Approval (third preference) [single entry]" + elseif class == "abstention" then + if #entries == 1 then + heading = _"Abstention [single entry]" + else + heading = _"Abstention [many entries]" + end + elseif class == "disapproval" then + disapproval_used = true + disapproval_index = disapproval_index + 1 + if disapproval_count > disapproval_index + 1 then + if #entries == 1 then + heading = _"Disapproval (prefer to lower blocks) [single entry]" + else + heading = _"Disapproval (prefer to lower blocks) [many entries]" + end + elseif disapproval_count == 2 and disapproval_index == 1 then + if #entries == 1 then + heading = _"Disapproval (prefer to lower block) [single entry]" + else + heading = _"Disapproval (prefer to lower block) [many entries]" + end + elseif disapproval_index == disapproval_count - 1 then + if #entries == 1 then + heading = _"Disapproval (prefer to last block) [single entry]" + else + heading = _"Disapproval (prefer to last block) [many entries]" + end else - heading = _"Approval (third preference) [many entries]" - end - else - if #entries == 1 then - heading = _"Approval (#th preference) [single entry]" - else - heading = _"Approval (#th preference) [many entries]" + if #entries == 1 then + heading = _"Disapproval [single entry]" + else + heading = _"Disapproval [many entries]" + end end end - else - if #entries == 1 then - heading = _"Approval [single entry]" - else - heading = _"Approval [many entries]" - end - end - elseif class == "abstention" then - if #entries == 1 then - heading = _"Abstention [single entry]" - else - heading = _"Abstention [many entries]" - end - elseif class == "disapproval" then - disapproval_used = true - disapproval_index = disapproval_index + 1 - if disapproval_count > disapproval_index + 1 then - if #entries == 1 then - heading = _"Disapproval (prefer to lower blocks) [single entry]" - else - heading = _"Disapproval (prefer to lower blocks) [many entries]" - end - elseif disapproval_count == 2 and disapproval_index == 1 then - if #entries == 1 then - heading = _"Disapproval (prefer to lower block) [single entry]" - else - heading = _"Disapproval (prefer to lower block) [many entries]" - end - elseif disapproval_index == disapproval_count - 1 then - if #entries == 1 then - heading = _"Disapproval (prefer to last block) [single entry]" - else - heading = _"Disapproval (prefer to last block) [many entries]" - end - else - if #entries == 1 then - heading = _"Disapproval [single entry]" - else - heading = _"Disapproval [many entries]" - end - end - end - ui.tag { - tag = "div", - attr = { class = "cathead" }, - content = heading - } - for i, initiative in ipairs(entries) do - ui.container{ - attr = { - class = "movable", - id = "entry_" .. tostring(initiative.id) - }, - content = function() - local initiators_selector = initiative:get_reference_selector("initiating_members") - :add_where("accepted") - local initiators = initiators_selector:exec() - local initiator_names = {} - for i, initiator in ipairs(initiators) do - initiator_names[#initiator_names+1] = initiator.name - end - local initiator_names_string = table.concat(initiator_names, ", ") + ui.tag { + tag = "div", + attr = { class = "cathead " }, + content = heading + } + for i, initiative in ipairs(entries) do ui.container{ - attr = { style = "float: right; position: relative;" }, + attr = { + class = "movable", + id = "entry_" .. tostring(initiative.id) + }, content = function() - ui.link{ - attr = { class = "clickable" }, - content = _"Show", - module = "initiative", - view = "show", - id = initiative.id - } - slot.put(" ") - ui.link{ - attr = { class = "clickable", target = "_blank" }, - content = _"(new window)", - module = "initiative", - view = "show", - id = initiative.id + local initiators_selector = initiative:get_reference_selector("initiating_members") + :add_where("accepted") + local initiators = initiators_selector:exec() + local initiator_names = {} + for i, initiator in ipairs(initiators) do + initiator_names[#initiator_names+1] = initiator.name + end + local initiator_names_string = table.concat(initiator_names, ", ") + ui.container{ + attr = { style = "float: right; position: relative;" }, + content = function() + ui.link{ + attr = { class = "clickable" }, + content = _"Show", + module = "initiative", + view = "show", + id = initiative.id + } + slot.put(" ") + ui.link{ + attr = { class = "clickable", target = "_blank" }, + content = _"(new window)", + module = "initiative", + view = "show", + id = initiative.id + } + if not readonly then + slot.put(" ") + ui.image{ attr = { class = "grabber" }, static = "icons/grabber.png" } + end + end } if not readonly then - slot.put(" ") - ui.image{ attr = { class = "grabber" }, static = "icons/grabber.png" } - end - end - } - if not readonly then - ui.container{ - attr = { style = "float: left; position: relative;" }, - content = function() - ui.tag{ - tag = "input", - attr = { - onclick = "if (jsFail) return true; voting_moveUp(this.parentNode.parentNode); return(false);", - name = "move_up_" .. tostring(initiative.id), - class = not disabled and "clickable" or nil, - type = "image", - src = encode.url{ static = "icons/move_up.png" }, - alt = _"Move up" - } - } - slot.put(" ") - ui.tag{ - tag = "input", - attr = { - onclick = "if (jsFail) return true; voting_moveDown(this.parentNode.parentNode); return(false);", - name = "move_down_" .. tostring(initiative.id), - class = not disabled and "clickable" or nil, - type = "image", - src = encode.url{ static = "icons/move_down.png" }, - alt = _"Move down" - } + ui.container{ + attr = { style = "float: left; position: relative;" }, + content = function() + ui.tag{ + tag = "button", + attr = { + onclick = "if (jsFail) return true; voting_moveUp(this.parentNode.parentNode); return(false);", + name = "move_up_" .. tostring(initiative.id), + class = "clickable mdl-button mdl-js-button mdl-button--icon", + alt = _"Move up", + }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "arrow_upward" } + end + } + ui.tag{ + tag = "button", + attr = { + onclick = "if (jsFail) return true; voting_moveDown(this.parentNode.parentNode); return(false);", + name = "move_down_" .. tostring(initiative.id), + class = "clickable mdl-button mdl-js-button mdl-button--icon", + alt = _"Move down" + }, + content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "arrow_downward" } + end + } + slot.put(" ") + end } - slot.put(" ") end - } - end - ui.container{ - content = function() - ui.tag{ content = "i" .. initiative.id .. ": " } - ui.tag{ content = initiative.shortened_name } - slot.put("
") - for i, initiator in ipairs(initiators) do - ui.link{ - attr = { class = "clickable" }, - content = function () - execute.view{ - module = "member_image", - view = "_show", - params = { - member = initiator, - image_type = "avatar", - show_dummy = true, - class = "micro_avatar", - popup_text = text - } + ui.container{ + content = function() + ui.tag{ attr = { class = "initiative_name" }, content = function() + ui.tag{ content = "i" .. initiative.id .. ": " } + ui.tag{ content = initiative.shortened_name } + end } + slot.put("
") + for i, initiator in ipairs(initiators) do + ui.link{ + attr = { class = "clickable" }, + content = function () + execute.view{ + module = "member_image", + view = "_show", + params = { + member = initiator, + image_type = "avatar", + show_dummy = true, + class = "micro_avatar", + popup_text = text + } + } + end, + module = "member", view = "show", id = initiator.id } - end, - module = "member", view = "show", id = initiator.id - } - slot.put(" ") - ui.tag{ content = initiator.name } - slot.put(" ") - end + slot.put(" ") + ui.tag{ content = initiator.name } + slot.put(" ") + end + end + } end } end - } - end + end + } + end + end + end + } + if app.session.member_id and preview then + local formatting_engine = param.get("formatting_engine") or config.enforce_formatting_engine + local comment = param.get("comment") + if comment and #comment > 0 then + local rendered_comment = format.wiki_text(comment, formatting_engine) + ui.container{ content = _"Voting comment" } + ui.container { attr = { class = "member_statement" }, content = function() + slot.put(rendered_comment) + end } + slot.put("
") + end + end + if (readonly or direct_voter and direct_voter.comment) and not preview and not (app.session.member_id == member.id) then + local text + if direct_voter and direct_voter.comment_changed then + text = _("Voting comment (last updated: #{timestamp})", { timestamp = format.timestamp(direct_voter.comment_changed) }) + elseif direct_voter and direct_voter.comment then + text = _"Voting comment" + end + if text then + ui.container{ content = text } + end + if direct_voter and direct_voter.comment then + local rendered_comment = direct_voter:get_content('html') + ui.container { attr = { class = "member_statement" }, content = function() + slot.put(rendered_comment) + end } + slot.put("
") + end + end + if app.session.member_id and app.session.member_id == member.id then + if (not readonly or direct_voter) and not preview then + ui.container{ content = function() + if not config.enforce_formatting_engine then + ui.field.select{ + label = _"Wiki engine for statement", + name = "formatting_engine", + foreign_records = config.formatting_engines, + attr = {id = "formatting_engine"}, + foreign_id = "id", + foreign_name = "name", + value = param.get("formatting_engine") or direct_voter and direct_voter.formatting_engine + } end - } + ui.container{ content = _"Voting comment (optional)" } + ui.field.text{ + name = "comment", + multiline = true, + value = param.get("comment") or direct_voter and direct_voter.comment, + attr = { style = "height: 10ex; width: 100%;" }, + } + end } + end + + if preview then + if not config.enforce_formatting_engine then + ui.field.hidden{ name = "formatting_engine", value = param.get("formatting_engine") } + end + ui.field.hidden{ name = "comment", value = param.get("comment") or direct_voter and direct_voter.comment } + end + + if not readonly or direct_voter or preview then + if preview then + slot.put(" ") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + name = issue.closed and "update_comment" or nil, + value = submit_button_text -- finish voting / update comment + } + } + end + if not preview then + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "preview", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Preview", + } + } + else + slot.put("   ") + ui.tag{ + tag = "input", + attr = { + type = "submit", + name = "edit", + class = "mdl-button mdl-js-button mdl-button--raised", + value = edit_button_text, + } + } + end end end end } - if app.session.member_id and preview then - local formatting_engine = param.get("formatting_engine") or config.enforce_formatting_engine - local comment = param.get("comment") - if comment and #comment > 0 then - local rendered_comment = format.wiki_text(comment, formatting_engine) - ui.heading{ level = "2", content = _"Voting comment" } - ui.container { attr = { class = "member_statement" }, content = function() - slot.put(rendered_comment) - end } - slot.put("
") - end - end - if (readonly or direct_voter and direct_voter.comment) and not preview and not (app.session.member_id == member.id) then - local text - if direct_voter and direct_voter.comment_changed then - text = _("Voting comment (last updated: #{timestamp})", { timestamp = format.timestamp(direct_voter.comment_changed) }) - elseif direct_voter and direct_voter.comment then - text = _"Voting comment" - end - if text then - ui.heading{ level = "2", content = text } - end - if direct_voter and direct_voter.comment then - local rendered_comment = direct_voter:get_content('html') - ui.container { attr = { class = "member_statement" }, content = function() - slot.put(rendered_comment) - end } - slot.put("
") - end - end - if app.session.member_id and app.session.member_id == member.id then - if (not readonly or direct_voter) and not preview then - ui.container{ content = function() - if not config.enforce_formatting_engine then - ui.field.select{ - label = _"Wiki engine for statement", - name = "formatting_engine", - foreign_records = config.formatting_engines, - attr = {id = "formatting_engine"}, - foreign_id = "id", - foreign_name = "name", - value = param.get("formatting_engine") or direct_voter and direct_voter.formatting_engine - } - end - ui.heading { level = 2, content = _"Voting comment (optional)" } - ui.field.text{ - name = "comment", - multiline = true, - value = param.get("comment") or direct_voter and direct_voter.comment, - attr = { style = "height: 10ex; width: 100%;" }, + slot.put("
") + ui.link{ + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + text = _"Cancel", + module = "issue", + view = "show", + id = issue.id + } + if direct_voter then + slot.put("   ") + ui.link { + attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, + module = "vote", action = "update", + params = { + issue_id = issue.id, + discard = true + }, + routing = { + default = { + mode = "redirect", + module = "issue", + view = "show", + id = issue.id } - end } - end - - if preview then - if not config.enforce_formatting_engine then - ui.field.hidden{ name = "formatting_engine", value = param.get("formatting_engine") } - end - ui.field.hidden{ name = "comment", value = param.get("comment") or direct_voter and direct_voter.comment } - end - - if not readonly or direct_voter or preview then - ui.container{ content = function() - if preview then - slot.put(" ") - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-default", - name = issue.closed and "update_comment" or nil, - value = submit_button_text -- finish voting / update comment - } - } - end - if not preview then - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "preview", - class = "btn btn-default", - value = _"Preview", - } - } - else - slot.put(" ") - ui.tag{ - tag = "input", - attr = { - type = "submit", - name = "edit", - class = "btn-link", - value = edit_button_text, - } - } - end - end } - end + }, + text = _"Discard my vote" + } end - end - } - slot.put("
") - ui.link{ - text = _"Cancel", - module = "issue", - view = "show", - id = issue.id - } - if direct_voter then - slot.put(" | ") - ui.link { - module = "vote", action = "update", - params = { - issue_id = issue.id, - discard = true - }, - routing = { - default = { - mode = "redirect", - module = "issue", - view = "show", - id = issue.id - } - }, - text = _"Discard my vote" - } - end - - end ) -end ) \ No newline at end of file + + end } + end } + end } +end } diff -r 7ea154c9238a -r 32cc544d5a5b app/main/vote/show_incoming.lua --- a/app/main/vote/show_incoming.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/app/main/vote/show_incoming.lua Sun Jul 15 14:07:29 2018 +0200 @@ -8,6 +8,13 @@ issue = Issue:by_id(param.get("issue_id")) end +if not issue then + execute.view { module = "index", view = "404" } + request.set_status("404 Not Found") + return +end + + if app.session.member_id then if initiative then initiative:load_everything_for_member_id(app.session.member.id) diff -r 7ea154c9238a -r 32cc544d5a5b config/example.lua --- a/config/example.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/config/example.lua Sun Jul 15 14:07:29 2018 +0200 @@ -88,7 +88,7 @@ -- "everything" -- -> Show everything a member can see, including profile pages -- ------------------------------------------------------------------------ -config.public_access = "none" +config.public_access = "authors_pseudonymous" @@ -483,5 +483,28 @@ -- ------------------------------------------------------------------------ -- uncomment the following line to enable debug trace -- ------------------------------------------------------------------------ --- config.enable_debug_trace = true +config.enable_debug_trace = true + + +config.fork = { + pre =1, min = 1, max = 1, max_requests = 1, min_requests = 1 +} + +config.localhost = true +config.oauth2 = { + available_scopes = { + { scope = "read", name = { de = "Lesen", en = "Read data" } }, + { scope = "write", name = { de = "Schreiben", en = "Write data" } }, + { scope = "privA", name = { de = "Beispielprivileg A", en = "Example privilege A" } }, + { scope = "privB", name = { de = "Beispielprivileg B", en = "Example privilege B" } } + }, + authorization_code_lifetime = 5 * 60, + refresh_token_lifetime = 60 * 60 * 24 * 30 * 3, + refresh_pause = 60, + refresh_grace_period = 60, + access_token_lifetime = 60 * 60, + -- NOTE for init.lua : check for refresh_pause >= refresh_grace_period + endpoint_magic = "liquidfeedback_client_redirection_endpoint" +} + diff -r 7ea154c9238a -r 32cc544d5a5b env/format/interval_text.lua --- a/env/format/interval_text.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/format/interval_text.lua Sun Jul 15 14:07:29 2018 +0200 @@ -5,6 +5,8 @@ local options = options or {} + value = value:match("^([^ ]* *[^ ]* *[^ ]* *[^ ]*)") + value = value:gsub("%..*", "") :gsub("days", "{DAYS}") :gsub("day", "{DAY}") diff -r 7ea154c9238a -r 32cc544d5a5b env/lf4rcs/commit.lua --- a/env/lf4rcs/commit.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/lf4rcs/commit.lua Sun Jul 15 14:07:29 2018 +0200 @@ -42,7 +42,7 @@ local target_node_id = initiative.current_draft.external_reference if target_node_id then local branch = "i" .. initiative.id - lf4rcs[repository].commit(path, exec, branch, target_node_id, close_message, merge_message) + config.lf4rcs[repository].commit(path, exec, branch, target_node_id, close_message, merge_message) end end end diff -r 7ea154c9238a -r 32cc544d5a5b env/lf4rcs/init.lua --- a/env/lf4rcs/init.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/lf4rcs/init.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,9 +1,7 @@ function lf4rcs.init() - local super_handler = config.notification_handler_func - config.notification_handler_func = function(event) - if super_handler then super_handler(event) end + Event.add_handler(function(event) lf4rcs.notification_handler(event) - end + end) config.render_external_reference = { draft = lf4rcs.render_draft_reference, initiative = lf4rcs.render_initiative_reference diff -r 7ea154c9238a -r 32cc544d5a5b env/model/has_rendered_content.lua --- a/env/model/has_rendered_content.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/model/has_rendered_content.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,4 +1,4 @@ -function model.has_rendered_content(class, rendered_class, content_field_name) +function model.has_rendered_content(class, rendered_class, content_field_name, primary_key) local content_field_name = content_field_name or 'content' @@ -12,6 +12,8 @@ for i, key in ipairs(class.primary_key) do selector:add_where{ "$ = ?", { key }, self[key] } end + elseif class.primary_key then + selector:add_where{ "$ = ?", { class.primary_key }, self[class.primary_key] } else selector:add_where{ "id = ?", self.id } end @@ -24,6 +26,8 @@ for i, key in ipairs(class.primary_key) do selector:add_where{ "$.$ = ?", { rendered_class.table }, { key }, self[key] } end + elseif class.primary_key then + selector:add_where{ "$." .. primary_key .. " = ?", { rendered_class.table }, self[class.primary_key] } else selector:add_where{ "$." .. class.table .. "_id = ?", { rendered_class.table }, self.id } end @@ -43,6 +47,8 @@ for i, key in ipairs(class.primary_key) do rendered[key] = self[key] end + elseif class.primary_key then + rendered[primary_key] = self[class.primary_key] else rendered[class.table .. "_id"] = self.id end @@ -65,6 +71,8 @@ for i, key in ipairs(class.primary_key) do selector:add_where{ "$.$ = ?", { rendered_class.table }, { key }, self.id } end + elseif class.primary_key then + selector:add_where{ primary_key .. " = ?", self[class.primary_key] } else selector:add_where{ class.table .. "_id = ?", self.id } end @@ -79,4 +87,4 @@ return rendered.content end -end \ No newline at end of file +end diff -r 7ea154c9238a -r 32cc544d5a5b env/request/router.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/request/router.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,41 @@ +local api_endpoints = { + instance = true, + navigation = true, + style = true, + application = true, + info = true, + member = true, + notify_email = true, + profile_info = true, + profile = true, + settings_info = true, + settings = true, + event = true +} + +function request.router() + + local api_prefix = "api/1/" + + local path = request.get_path() + + if path == api_prefix .. "register" then + return { module = "oauth2", view = "register" } + elseif path == api_prefix .. "authorization" then + return { module = "oauth2", view = "authorization" } + elseif path == api_prefix .. "token" then + return { module = "oauth2", view = "token" } + elseif path == api_prefix .. "validate" then + return { module = "oauth2", view = "validate" } + elseif path == api_prefix .. "session" then + return { module = "oauth2", view = "session" } + else + local endpoint = string.match(path, "^" .. api_prefix .. "(.*)$") + if api_endpoints[endpoint] then + return { module = "api", view = endpoint } + end + end + + return request.default_router(path) + +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/bargraph.lua --- a/env/ui/bargraph.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/ui/bargraph.lua Sun Jul 15 14:07:29 2018 +0200 @@ -26,7 +26,7 @@ if bar.value > 0 then at_least_one_bar = true local value = bar.value * args.width / args.max_value - if quorum and quorum < length + value then + if quorum and quorum <= length + value then local dlength = math.max(quorum - length - 1, 0) local dlength_abs = math.floor(dlength) local rest = rest + dlength - dlength_abs diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/cell_full.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/cell_full.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,6 @@ +function ui.cell_full(args) + args.attr = args.attr or {} + args.attr.class = args.attr.class and args.attr.class .. " " or "" + args.attr.class = args.attr.class .. "mdl-cell mdl-cell--12-col" + ui.container(args) +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/cell_main.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/cell_main.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,6 @@ +function ui.cell_main(args) + args.attr = args.attr or {} + args.attr.class = args.attr.class and args.attr.class .. " " or "" + args.attr.class = args.attr.class .. "mdl-cell mdl-cell--12-col mdl-cell--5-col-tablet mdl-cell--8-col-desktop mdl-cell--order-2-tablet mdl-cell--order-2-desktop" + ui.container(args) +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/cell_sidebar.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/cell_sidebar.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,6 @@ +function ui.cell_sidebar(args) + args.attr = args.attr or {} + args.attr.class = args.attr.class and args.attr.class .. " " or "" + args.attr.class = args.attr.class .. "mdl-cell mdl-cell--12-col mdl-cell--3-col-tablet mdl-cell--4-col-desktop mdl-cell--order-1-tablet mdl-cell--order-1-desktop" + ui.container(args) +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/field/location.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/field/location.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,33 @@ +function ui.field.location(args) + if config.map then + ui.form_element(args, {fetch_value = true}, function(args) + ui.tag{ + tag = "input", + attr = { type = "hidden", name = args.name, value = args.value, id = "ui_field_location_value" } + } + end) + ui.map({}, "ui_field_location_value") + elseif config.firstlife then + ui.form_element(args, {fetch_value = true}, function(args) + ui.tag{ + tag = "input", + attr = { type = "hidden", name = args.name, value = args.value, id = "ui_field_location_value" } + } + ui.tag{ tag = "iframe", attr = { src = config.firstlife.inputmap_url .. "/src/index.html?domain=" .. request.get_absolute_baseurl() .. "&" .. config.firstlife.coordinates .. "&lightArea=false&contrast=false&mode=lite", id = "ui_field_location", class = "ui_field_location" }, content = "" } + + ui.script{ script = [[ + + window.addEventListener("message", function (e) { + if (e.origin !== "]] .. config.firstlife.inputmap_url .. [[") return; + var data = e.data; + if (data.src == "InputMap") { + var el = document.getElementById("ui_field_location_value"); + el.value = JSON.stringify({ "type": "Point", "coordinates": [data.lng, data.lat], "zoom_level": data.zoom_level }); + console.log(el.value); + } + }); + + ]] } + end) + end +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/field/wysihtml.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/field/wysihtml.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,83 @@ +function ui.field.wysihtml(args) + + local toolbar = { + { command = "bold", title ="CTRL+B", icon = "format_bold" }, + { command = "italic", title ="CTRL+I", icon = "format_italic" }, + { command = "createLink", icon = "insert_link" }, + { command = "removeLink", icon = "insert_link", crossed = "\\" }, + { command = "formatBlock", command_value = "h1", icon = "title", head_level = "1" }, + { command = "formatBlock", command_value = "h2", icon = "title", head_level = "2" }, + { command = "formatBlock", command_value = "h3", icon = "title", head_level = "3" }, + { command = "formatBlock", command_blank = "true", icon = "format_clear" }, + { command = "insertBlockQuote", icon = "format_quote" }, + { command = "insertUnorderedList", icon = "format_list_bulleted" }, + { command = "insertOrderedList", icon = "format_list_numbered" }, + { command = "outdentList", icon = "format_indent_decrease" }, + { command = "indentList", icon = "format_indent_increase" }, +-- { command = "alignLeftStyle", icon = "format_align_left" }, +-- { command = "alignRightStyle", icon = "format_align_right" }, +-- { command = "alignCenterStyle", icon = "format_align_center" }, + { command = "undo", icon = "undo" }, + { command = "redo", icon = "redo" } + } + + slot.put([[ + + ]]) + + ui.container{ attr = { id = "toolbar", class = "toolbar", style = "display: none;" }, content = function() + for i, t in ipairs(toolbar) do + ui.tag{ tag = "a", attr = { ["data-wysihtml-command"] = t.command, ["data-wysihtml-command-value"] = t.command_value, ["data-wysihtml-command-blank-value"] = t.command_blank, title = t.shortcut }, content = function() + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = t.icon } + if t.crossed then + ui.tag{ attr = { class = "crossed" }, content = t.crossed } + end + if t.head_level then + ui.tag{ attr = { class = "head_level" }, content = t.head_level } + end + end } + end + slot.put([[ +
+ + OK Cancel +
+ ]]) + slot.put([[ ]] .. _"expert editor (HTML)" .. [[ ]]) + end } + + ui.field.text(args) + + ui.tag{ tag = "script", attr = { src = request.get_absolute_baseurl() .. "static/wysihtml/wysihtml.js" }, content = "" } + ui.tag{ tag = "script", attr = { src = request.get_absolute_baseurl() .. "static/wysihtml/wysihtml.all-commands.js" }, content = "" } + ui.tag{ tag = "script", attr = { src = request.get_absolute_baseurl() .. "static/wysihtml/wysihtml.toolbar.js" }, content = "" } + ui.tag{ tag = "script", attr = { src = request.get_absolute_baseurl() .. "static/wysihtml/wysihtml_liquidfeedback_rules.js" }, content = "" } + ui.script{ script = [[ + function initEditor() { + var editor = new wysihtml.Editor("]] .. args.attr.id .. [[", { + toolbar: "toolbar", + parserRules: wysihtmlParserRules, + useLineBreaks: true + }); + } + if(window.addEventListener){ + window.addEventListener('load', initEditor, false); + } else { + window.attachEvent('onload', initEditor); + } + ]] } + +end + diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/filters.lua --- a/env/ui/filters.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/ui/filters.lua Sun Jul 15 14:07:29 2018 +0200 @@ -1,55 +1,72 @@ -function ui.filters(args) +local function filters(args) + local el_id = ui.create_unique_id() + local class = "lf-filter" + if args.class then + class = class .. " " .. args.class + end ui.container{ - attr = { class = "ui_filter" }, + attr = { class = { class } }, content = function() for idx, filter in ipairs(args) do local filter_name = filter.name or "filter" - local current_option = atom.string:load(request.get_param{ name = filter_name }) - if not current_option then - current_option = param.get(filter_name) + local current_option_name = atom.string:load(request.get_param{ name = filter_name }) + if not current_option_name then + current_option_name = param.get(filter_name) end - local current_option_valid = false + local current_option = filter[1] for idx, option in ipairs(filter) do - if current_option == option.name then - current_option_valid = true + if current_option_name == option.name then + current_option = option end end - if not current_option or #current_option == 0 or not current_option_valid then - current_option = filter[1].name + if not current_option_name or #current_option_name == 0 or not current_option then + current_option_name = filter[1].name end + ui.tag{ tag = "button", attr = { id = "filter-" .. filter_name .. "-menu", class = "mdl-button mdl-js-button" }, content = function() + ui.tag{ content = current_option.label } + slot.put(" ") + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "arrow_drop_down" } + end } local id = request.get_id_string() local params = request.get_param_strings() - local class = "ui_filter_head" + local class = "mdl-menu mdl-js-menu mdl-js-ripple-effect" if filter.class then class = class .. " " .. filter.class end - ui.container{ - attr = { class = class }, + ui.tag{ + tag = "ul", + attr = { class = class, ["data-mdl-for"] = "filter-" .. filter_name .. "-menu" }, content = function() - slot.put(filter.label) for idx, option in ipairs(filter) do params[filter_name] = option.name local attr = {} - if current_option == option.name then - attr.class = "active" + attr.class = "mdl-menu__link" + if current_option_name == option.name then + attr.class = attr.class .. " active" option.selector_modifier(args.selector) end if idx > 1 then slot.put(" ") end - ui.link{ - attr = attr, - module = request.get_module(), - view = request.get_view(), - id = id, - params = params, - text = option.label, - partial = { - params = { - [filter_name] = option.name + ui.tag{ + tag = "li", + attr = { class = "mdl-menu__item" }, + content = function() + ui.link{ + attr = attr, + module = request.get_module(), + view = request.get_view(), + id = id, + params = params, + content = option.label, + partial = { + params = { + [filter_name] = idx > 1 and option.name or nil + } + } } - } + end } end end @@ -57,6 +74,16 @@ end end } +end + +function ui.filters(args) + if args.slot then + slot.select(args.slot, function() + filters(args) + end) + else + filters(args) + end ui.container{ attr = { class = "ui_filter_content" }, content = function() diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/grid.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/grid.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,6 @@ +function ui.grid(args) + args.attr = args.attr or {} + args.attr.class = args.attr.class and args.attr.class .. " " or "" + args.attr.class = args.attr.class .. "mdl-grid" + ui.container(args) +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/map.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/map.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +function ui.map(geo_objects, input_element_id) + local header = config.map.header + if type(header) == "function" then + header = header() + end + slot.put_into("html_head", header) + ui.container{ attr = { id = "map" }, content = "" } + config.map.func( + "map", + config.map.default_viewport.lon, + config.map.default_viewport.lat, + config.map.default_viewport.zoom, + geo_objects, + input_element_id + ) +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/supporter_count.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/ui/supporter_count.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,22 @@ +function ui.supporter_count(initiative) + if initiative.supporter_count == nil then + ui.tag { + attr = { class = "supporterCount" }, + content = _"[calculating]" + } + elseif initiative.issue.closed == nil then + ui.tag { + attr = { class = "satisfiedSupporterCount" }, + content = _("#{count} supporter", { count = initiative.satisfied_supporter_count }) + } + if initiative.potential_supporter_count and + initiative.potential_supporter_count > 0 + then + slot.put ( " " ) + ui.tag { + attr = { class = "potentialSupporterCount" }, + content = _("(+ #{count} potential)", { count = initiative.potential_supporter_count }) + } + end + end +end diff -r 7ea154c9238a -r 32cc544d5a5b env/ui/title.lua --- a/env/ui/title.lua Thu Jun 23 03:30:57 2016 +0200 +++ b/env/ui/title.lua Sun Jul 15 14:07:29 2018 +0200 @@ -7,10 +7,7 @@ module = "index", view = "index", attr = { class = "home", title = _"Home" }, content = function () - ui.image { - attr = { class = "icon24", alt = title }, - static = "icons/48/home.png" - } + ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "home" } end } @@ -18,12 +15,12 @@ ui.tag { attr = { class = "spacer" }, content = function() slot.put ( " » " ) end } - ui.tag { tag = "span", content = content } + ui.tag { content = content } else ui.tag { attr = { class = "spacer" }, content = function() slot.put ( " " ) end } - ui.tag { tag = "span", content = _"Home" } + ui.tag { content = _"Home" } end end ) diff -r 7ea154c9238a -r 32cc544d5a5b env/util/api_error.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/util/api_error.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,12 @@ +function util.api_error(status_code, status_text, error_code, error_description) + slot.set_layout(nil, "application/json") + request.set_status(status_code, status_text) + if status_code == 401 then + request.add_header("WWW-Authenticate", "Bearer error=\"" .. error_code .. "\", error_description=\"" .. error_description .. "\"") + end + slot.put_into("data", json.export(json.object{ + error = error_code, + error_description = error_description + })) + return false +end diff -r 7ea154c9238a -r 32cc544d5a5b env/util/get_access_token.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/util/get_access_token.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,16 @@ +function util.get_access_token() + + local access_token_header = request.get_header("Authorization") + if access_token_header then + access_token_header = string.match(access_token_header, "^Bearer ([^ ,]*)$") + end + + local access_token_param = param.get("access_token") + + if access_token_header and access_token_param then + return nil, "header_and_param" + end + + return(access_token_header or access_token_param) + +end diff -r 7ea154c9238a -r 32cc544d5a5b env/util/html_is_safe.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/env/util/html_is_safe.lua Sun Jul 15 14:07:29 2018 +0200 @@ -0,0 +1,191 @@ +function util.html_is_safe(str) + + -- All (ASCII) control characters except \t\n\f\r are forbidden: + if string.find(str, "[\0-\8\11\14-\31\127]") then + return false, "Invalid ASCII control character" + end + + -- Memorize expected closing tags: + local stack = {} + + -- State during parsing: + local para = false --

tag open + local bold = false -- tag open + local italic = false -- tag open + local supsub = false -- or tag open + local link = false -- tag open + local heading = false -- tag open + local list = false --

    or