1.1 --- a/LICENSE	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/LICENSE	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -23,14 +23,14 @@
     1.4  
     1.5  3rd party license information:
     1.6  
     1.7 ------------------------------------------------------------------------------
     1.8 +=============================================================================
     1.9  
    1.10  Some of the icons used in LiquidFeedback (except national flags) are from
    1.11  Silk icon set 1.3 by Mark James. [ http://www.famfamfam.com/lab/icons/silk/ ]
    1.12  His work is licensed under a Creative Commons Attribution 2.5 License.
    1.13  [ http://creativecommons.org/licenses/by/2.5/ ]
    1.14  
    1.15 ------------------------------------------------------------------------------
    1.16 +=============================================================================
    1.17  
    1.18  The emoticons are taken from the following web pages:
    1.19  
    1.20 @@ -44,7 +44,7 @@
    1.21  unless such conditions are required by law."
    1.22  The orange and red smiley are modified versions of Face-sad.
    1.23  
    1.24 ------------------------------------------------------------------------------
    1.25 +=============================================================================
    1.26  
    1.27  The "jquery" library is licensed as follows:
    1.28  
    1.29 @@ -86,7 +86,7 @@
    1.30  own licenses; we recommend you read them, as their terms may differ from
    1.31  the terms above.
    1.32  
    1.33 ------------------------------------------------------------------------------
    1.34 +=============================================================================
    1.35  
    1.36  "LESS - Leaner CSS" is licensed as follows:
    1.37  
    1.38 @@ -269,7 +269,7 @@
    1.39  
    1.40  END OF TERMS AND CONDITIONS
    1.41  
    1.42 ------------------------------------------------------------------------------
    1.43 +=============================================================================
    1.44  
    1.45  The collection of LDAP error codes (mldap_errorcodes[]) has been derived 
    1.46  from the file ldap.h that is part of OpenLDAP Software. OpenLDAP's license
    1.47 @@ -348,5 +348,296 @@
    1.48  
    1.49  End of OpenLDAP's license information
    1.50  
    1.51 +=============================================================================
    1.52 +
    1.53 +"wysihtml" is licensed as follows:
    1.54 +
    1.55 +The MIT License (MIT)
    1.56 +
    1.57 +Copyright (C) 2012-2016 XING AG, Voog and contributors
    1.58 +
    1.59 +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:
    1.60 +
    1.61 +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
    1.62 +
    1.63 +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.
    1.64 +
    1.65 +=============================================================================
    1.66 +
    1.67 +The Roboto font family is licensed as follows:
    1.68 +
    1.69 +Apache License
    1.70 +
    1.71 +Version 2.0, January 2004
    1.72 +
    1.73 +http://www.apache.org/licenses/
    1.74 +
    1.75 +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    1.76 +
    1.77 +1. Definitions.
    1.78 +
    1.79 +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
    1.80 +
    1.81 +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
    1.82 +
    1.83 +"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.
    1.84 +
    1.85 +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
    1.86 +
    1.87 +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
    1.88 +
    1.89 +"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.
    1.90 +
    1.91 +"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).
    1.92 +
    1.93 +"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.
    1.94 +
    1.95 +"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."
    1.96 +
    1.97 +"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.
    1.98 +
    1.99 +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.
   1.100 +
   1.101 +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.
   1.102 +
   1.103 +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:
   1.104 +
   1.105 +You must give any other recipients of the Work or Derivative Works a copy of this License; and
   1.106 +You must cause any modified files to carry prominent notices stating that You changed the files; and
   1.107 +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
   1.108 +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. 
   1.109 +
   1.110 +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.
   1.111 +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.
   1.112 +
   1.113 +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.
   1.114 +
   1.115 +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.
   1.116 +
   1.117 +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.
   1.118 +
   1.119 +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.
   1.120 +
   1.121 +END OF TERMS AND CONDITIONS
   1.122 +
   1.123 +=============================================================================
   1.124 +
   1.125 +The "mdl" library is licensed as follows:
   1.126 +
   1.127 +
   1.128 +
   1.129 +                                 Apache License
   1.130 +                           Version 2.0, January 2004
   1.131 +                        http://www.apache.org/licenses/
   1.132 +
   1.133 +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1.134 +
   1.135 +   1. Definitions.
   1.136 +
   1.137 +      "License" shall mean the terms and conditions for use, reproduction,
   1.138 +      and distribution as defined by Sections 1 through 9 of this document.
   1.139 +
   1.140 +      "Licensor" shall mean the copyright owner or entity authorized by
   1.141 +      the copyright owner that is granting the License.
   1.142 +
   1.143 +      "Legal Entity" shall mean the union of the acting entity and all
   1.144 +      other entities that control, are controlled by, or are under common
   1.145 +      control with that entity. For the purposes of this definition,
   1.146 +      "control" means (i) the power, direct or indirect, to cause the
   1.147 +      direction or management of such entity, whether by contract or
   1.148 +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
   1.149 +      outstanding shares, or (iii) beneficial ownership of such entity.
   1.150 +
   1.151 +      "You" (or "Your") shall mean an individual or Legal Entity
   1.152 +      exercising permissions granted by this License.
   1.153 +
   1.154 +      "Source" form shall mean the preferred form for making modifications,
   1.155 +      including but not limited to software source code, documentation
   1.156 +      source, and configuration files.
   1.157 +
   1.158 +      "Object" form shall mean any form resulting from mechanical
   1.159 +      transformation or translation of a Source form, including but
   1.160 +      not limited to compiled object code, generated documentation,
   1.161 +      and conversions to other media types.
   1.162 +
   1.163 +      "Work" shall mean the work of authorship, whether in Source or
   1.164 +      Object form, made available under the License, as indicated by a
   1.165 +      copyright notice that is included in or attached to the work
   1.166 +      (an example is provided in the Appendix below).
   1.167 +
   1.168 +      "Derivative Works" shall mean any work, whether in Source or Object
   1.169 +      form, that is based on (or derived from) the Work and for which the
   1.170 +      editorial revisions, annotations, elaborations, or other modifications
   1.171 +      represent, as a whole, an original work of authorship. For the purposes
   1.172 +      of this License, Derivative Works shall not include works that remain
   1.173 +      separable from, or merely link (or bind by name) to the interfaces of,
   1.174 +      the Work and Derivative Works thereof.
   1.175 +
   1.176 +      "Contribution" shall mean any work of authorship, including
   1.177 +      the original version of the Work and any modifications or additions
   1.178 +      to that Work or Derivative Works thereof, that is intentionally
   1.179 +      submitted to Licensor for inclusion in the Work by the copyright owner
   1.180 +      or by an individual or Legal Entity authorized to submit on behalf of
   1.181 +      the copyright owner. For the purposes of this definition, "submitted"
   1.182 +      means any form of electronic, verbal, or written communication sent
   1.183 +      to the Licensor or its representatives, including but not limited to
   1.184 +      communication on electronic mailing lists, source code control systems,
   1.185 +      and issue tracking systems that are managed by, or on behalf of, the
   1.186 +      Licensor for the purpose of discussing and improving the Work, but
   1.187 +      excluding communication that is conspicuously marked or otherwise
   1.188 +      designated in writing by the copyright owner as "Not a Contribution."
   1.189 +
   1.190 +      "Contributor" shall mean Licensor and any individual or Legal Entity
   1.191 +      on behalf of whom a Contribution has been received by Licensor and
   1.192 +      subsequently incorporated within the Work.
   1.193 +
   1.194 +   2. Grant of Copyright License. Subject to the terms and conditions of
   1.195 +      this License, each Contributor hereby grants to You a perpetual,
   1.196 +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
   1.197 +      copyright license to reproduce, prepare Derivative Works of,
   1.198 +      publicly display, publicly perform, sublicense, and distribute the
   1.199 +      Work and such Derivative Works in Source or Object form.
   1.200 +
   1.201 +   3. Grant of Patent License. Subject to the terms and conditions of
   1.202 +      this License, each Contributor hereby grants to You a perpetual,
   1.203 +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
   1.204 +      (except as stated in this section) patent license to make, have made,
   1.205 +      use, offer to sell, sell, import, and otherwise transfer the Work,
   1.206 +      where such license applies only to those patent claims licensable
   1.207 +      by such Contributor that are necessarily infringed by their
   1.208 +      Contribution(s) alone or by combination of their Contribution(s)
   1.209 +      with the Work to which such Contribution(s) was submitted. If You
   1.210 +      institute patent litigation against any entity (including a
   1.211 +      cross-claim or counterclaim in a lawsuit) alleging that the Work
   1.212 +      or a Contribution incorporated within the Work constitutes direct
   1.213 +      or contributory patent infringement, then any patent licenses
   1.214 +      granted to You under this License for that Work shall terminate
   1.215 +      as of the date such litigation is filed.
   1.216 +
   1.217 +   4. Redistribution. You may reproduce and distribute copies of the
   1.218 +      Work or Derivative Works thereof in any medium, with or without
   1.219 +      modifications, and in Source or Object form, provided that You
   1.220 +      meet the following conditions:
   1.221 +
   1.222 +      (a) You must give any other recipients of the Work or
   1.223 +          Derivative Works a copy of this License; and
   1.224 +
   1.225 +      (b) You must cause any modified files to carry prominent notices
   1.226 +          stating that You changed the files; and
   1.227 +
   1.228 +      (c) You must retain, in the Source form of any Derivative Works
   1.229 +          that You distribute, all copyright, patent, trademark, and
   1.230 +          attribution notices from the Source form of the Work,
   1.231 +          excluding those notices that do not pertain to any part of
   1.232 +          the Derivative Works; and
   1.233 +
   1.234 +      (d) If the Work includes a "NOTICE" text file as part of its
   1.235 +          distribution, then any Derivative Works that You distribute must
   1.236 +          include a readable copy of the attribution notices contained
   1.237 +          within such NOTICE file, excluding those notices that do not
   1.238 +          pertain to any part of the Derivative Works, in at least one
   1.239 +          of the following places: within a NOTICE text file distributed
   1.240 +          as part of the Derivative Works; within the Source form or
   1.241 +          documentation, if provided along with the Derivative Works; or,
   1.242 +          within a display generated by the Derivative Works, if and
   1.243 +          wherever such third-party notices normally appear. The contents
   1.244 +          of the NOTICE file are for informational purposes only and
   1.245 +          do not modify the License. You may add Your own attribution
   1.246 +          notices within Derivative Works that You distribute, alongside
   1.247 +          or as an addendum to the NOTICE text from the Work, provided
   1.248 +          that such additional attribution notices cannot be construed
   1.249 +          as modifying the License.
   1.250 +
   1.251 +      You may add Your own copyright statement to Your modifications and
   1.252 +      may provide additional or different license terms and conditions
   1.253 +      for use, reproduction, or distribution of Your modifications, or
   1.254 +      for any such Derivative Works as a whole, provided Your use,
   1.255 +      reproduction, and distribution of the Work otherwise complies with
   1.256 +      the conditions stated in this License.
   1.257 +
   1.258 +   5. Submission of Contributions. Unless You explicitly state otherwise,
   1.259 +      any Contribution intentionally submitted for inclusion in the Work
   1.260 +      by You to the Licensor shall be under the terms and conditions of
   1.261 +      this License, without any additional terms or conditions.
   1.262 +      Notwithstanding the above, nothing herein shall supersede or modify
   1.263 +      the terms of any separate license agreement you may have executed
   1.264 +      with Licensor regarding such Contributions.
   1.265 +
   1.266 +   6. Trademarks. This License does not grant permission to use the trade
   1.267 +      names, trademarks, service marks, or product names of the Licensor,
   1.268 +      except as required for reasonable and customary use in describing the
   1.269 +      origin of the Work and reproducing the content of the NOTICE file.
   1.270 +
   1.271 +   7. Disclaimer of Warranty. Unless required by applicable law or
   1.272 +      agreed to in writing, Licensor provides the Work (and each
   1.273 +      Contributor provides its Contributions) on an "AS IS" BASIS,
   1.274 +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
   1.275 +      implied, including, without limitation, any warranties or conditions
   1.276 +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
   1.277 +      PARTICULAR PURPOSE. You are solely responsible for determining the
   1.278 +      appropriateness of using or redistributing the Work and assume any
   1.279 +      risks associated with Your exercise of permissions under this License.
   1.280 +
   1.281 +   8. Limitation of Liability. In no event and under no legal theory,
   1.282 +      whether in tort (including negligence), contract, or otherwise,
   1.283 +      unless required by applicable law (such as deliberate and grossly
   1.284 +      negligent acts) or agreed to in writing, shall any Contributor be
   1.285 +      liable to You for damages, including any direct, indirect, special,
   1.286 +      incidental, or consequential damages of any character arising as a
   1.287 +      result of this License or out of the use or inability to use the
   1.288 +      Work (including but not limited to damages for loss of goodwill,
   1.289 +      work stoppage, computer failure or malfunction, or any and all
   1.290 +      other commercial damages or losses), even if such Contributor
   1.291 +      has been advised of the possibility of such damages.
   1.292 +
   1.293 +   9. Accepting Warranty or Additional Liability. While redistributing
   1.294 +      the Work or Derivative Works thereof, You may choose to offer,
   1.295 +      and charge a fee for, acceptance of support, warranty, indemnity,
   1.296 +      or other liability obligations and/or rights consistent with this
   1.297 +      License. However, in accepting such obligations, You may act only
   1.298 +      on Your own behalf and on Your sole responsibility, not on behalf
   1.299 +      of any other Contributor, and only if You agree to indemnify,
   1.300 +      defend, and hold each Contributor harmless for any liability
   1.301 +      incurred by, or claims asserted against, such Contributor by reason
   1.302 +      of your accepting any such warranty or additional liability.
   1.303 +
   1.304 +   END OF TERMS AND CONDITIONS
   1.305 +
   1.306 +   APPENDIX: How to apply the Apache License to your work.
   1.307 +
   1.308 +      To apply the Apache License to your work, attach the following
   1.309 +      boilerplate notice, with the fields enclosed by brackets "[]"
   1.310 +      replaced with your own identifying information. (Don't include
   1.311 +      the brackets!)  The text should be enclosed in the appropriate
   1.312 +      comment syntax for the file format. We also recommend that a
   1.313 +      file or class name and description of purpose be included on the
   1.314 +      same "printed page" as the copyright notice for easier
   1.315 +      identification within third-party archives.
   1.316 +
   1.317 +   Copyright 2015 Google Inc
   1.318 +
   1.319 +   Licensed under the Apache License, Version 2.0 (the "License");
   1.320 +   you may not use this file except in compliance with the License.
   1.321 +   You may obtain a copy of the License at
   1.322 +
   1.323 +       http://www.apache.org/licenses/LICENSE-2.0
   1.324 +
   1.325 +   Unless required by applicable law or agreed to in writing, software
   1.326 +   distributed under the License is distributed on an "AS IS" BASIS,
   1.327 +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   1.328 +   See the License for the specific language governing permissions and
   1.329 +   limitations under the License.
   1.330 +
   1.331 +   All code in any directories or sub-directories that end with *.html or
   1.332 +   *.css is licensed under the Creative Commons Attribution International
   1.333 +   4.0 License, which full text can be found here:
   1.334 +   https://creativecommons.org/licenses/by/4.0/legalcode.
   1.335 +
   1.336 +   As an exception to this license, all html or css that is generated by
   1.337 +   the software at the direction of the user is copyright the user. The
   1.338 +   user has full ownership and control over such content, including
   1.339 +   whether and how they wish to license it.
   1.340 +
   1.341 +=============================================================================
   1.342  
   1.343  END OF LICENSE FILE

     2.1 --- a/app/main/_filter/20_session.lua	Thu Jun 23 03:30:57 2016 +0200
     2.2 +++ b/app/main/_filter/20_session.lua	Sun Jul 15 14:07:29 2018 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4 -local cookie = request.get_cookie{ name = "liquid_feedback_session" }
     2.5 +local cookie = request.get_cookie{ name = config.cookie_name or "liquid_feedback_session" }
     2.6  
     2.7  if cookie then
     2.8    app.session = Session:by_ident(cookie)
     2.9 @@ -6,12 +6,12 @@
    2.10  if not app.session then
    2.11    app.session = Session:new()
    2.12    request.set_cookie{
    2.13 -    name = "liquid_feedback_session",
    2.14 +    name = config.cookie_name or "liquid_feedback_session",
    2.15      value = app.session.ident
    2.16    }
    2.17  end
    2.18  
    2.19 -request.set_csrf_secret(app.session.additional_secret)
    2.20 +request.set_csrf_secret(app.session:additional_secret_for("csrf"))
    2.21  
    2.22  locale.set{ lang = app.session.lang or config.default_lang or "en" }
    2.23  

     3.1 --- a/app/main/_filter/21_auth.lua	Thu Jun 23 03:30:57 2016 +0200
     3.2 +++ b/app/main/_filter/21_auth.lua	Sun Jul 15 14:07:29 2018 +0200
     3.3 @@ -2,26 +2,59 @@
     3.4  local view   = request.get_view()
     3.5  local action = request.get_action()
     3.6  
     3.7 -local auth_needed = not (
     3.8 -  module == 'index'
     3.9 -  and (
    3.10 -view   == "login"
    3.11 -    or action == "login"
    3.12 -    or view   == "register"
    3.13 -    or action == "register"
    3.14 -    or action == "cancel_register"
    3.15 -    or view   == "about"
    3.16 -    or view   == "reset_password"
    3.17 -    or action == "reset_password"
    3.18 -    or view   == "send_login"
    3.19 -    or action == "send_login"
    3.20 -    or view   == "confirm_notify_email"
    3.21 -    or action == "confirm_notify_email"
    3.22 -    or view   == "menu"
    3.23 -    or action == "set_lang"
    3.24 -    or view   == "404"
    3.25 -  )
    3.26 -)
    3.27 +local auth_needed = true
    3.28 +
    3.29 +if module == 'index' and (
    3.30 +     view == 'index'
    3.31 +  or view   == "login"
    3.32 +  or action == "login"
    3.33 +  or view   == "register"
    3.34 +  or action == "register"
    3.35 +  or action == "cancel_register"
    3.36 +  or view   == "about"
    3.37 +  or view   == "reset_password"
    3.38 +  or action == "reset_password"
    3.39 +  or view   == "send_login"
    3.40 +  or action == "send_login"
    3.41 +  or view   == "confirm_notify_email"
    3.42 +  or action == "confirm_notify_email"
    3.43 +  or view   == "menu"
    3.44 +  or action == "set_lang"
    3.45 +  or view   == "403"
    3.46 +  or view   == "404"
    3.47 +  or view   == "405"
    3.48 +) then
    3.49 +  auth_needed = false
    3.50 +end
    3.51 +
    3.52 +if module == "registration" then
    3.53 +  auth_needed = false
    3.54 +end
    3.55 +
    3.56 +if module == "style" then
    3.57 +  auth_needed = false
    3.58 +end
    3.59 +
    3.60 +if module == "help" then
    3.61 +  auth_needed = false
    3.62 +end
    3.63 +
    3.64 +if module == "oauth2" and (
    3.65 +     view   == "validate"
    3.66 +  or view   == "token"
    3.67 +  or view   == "session"
    3.68 +  or view   == "register"
    3.69 +) then
    3.70 +  auth_needed = false
    3.71 +end
    3.72 +
    3.73 +if module == "oauth2_client" then
    3.74 +  auth_needed = false
    3.75 +end
    3.76 +
    3.77 +if module == "api" then
    3.78 +  auth_needed = false
    3.79 +end
    3.80  
    3.81  if app.session:has_access("anonymous") then
    3.82  
    3.83 @@ -41,6 +74,7 @@
    3.84      or module == "index" and view == "search"
    3.85      or module == "index" and view == "usage_terms"
    3.86      or module == "help" and view == "introduction"
    3.87 +    or module == "style"
    3.88    then
    3.89      auth_needed = false
    3.90    end
    3.91 @@ -94,11 +128,21 @@
    3.92  
    3.93  if auth_needed and app.session.member == nil then
    3.94    trace.debug("Not authenticated yet.")
    3.95 +  local params = json.object()
    3.96 +  for key, val in pairs(request.get_param_strings()) do
    3.97 +    if type(val) == "string" then
    3.98 +      params[key] = val
    3.99 +    else
   3.100 +      -- shouldn't happen
   3.101 +      error("array type params not implemented")
   3.102 +    end
   3.103 +  end
   3.104    request.redirect{
   3.105      module = 'index', view = 'login', params = {
   3.106        redirect_module = module,
   3.107        redirect_view = view,
   3.108 -      redirect_id = param.get_id()
   3.109 +      redirect_id = param.get_id(),
   3.110 +      redirect_params = params
   3.111      }
   3.112    }
   3.113  elseif auth_needed and app.session.member.locked then

     4.1 --- a/app/main/_filter_view/30_navigation.lua	Thu Jun 23 03:30:57 2016 +0200
     4.2 +++ b/app/main/_filter_view/30_navigation.lua	Sun Jul 15 14:07:29 2018 +0200
     4.3 @@ -1,78 +1,118 @@
     4.4 -slot.select ( 'instance_name', function ()
     4.5 -  slot.put(" @ ")
     4.6 -  slot.put ( encode.html ( config.instance_name ) )
     4.7 -end)
     4.8 -
     4.9 -  
    4.10 -slot.select ( 'navigation_right', function ()
    4.11 +execute.inner()
    4.12  
    4.13 -  if app.session:has_access ("anonymous") and not (app.session.needs_delegation_check) then
    4.14 -  
    4.15 -    ui.form {
    4.16 -      attr = { class = "inline search" },
    4.17 -      method = "get",
    4.18 -      module = "index", view   = "search",
    4.19 -      content = function ()
    4.20 -        
    4.21 -        ui.field.text {
    4.22 -          attr = { placeholder = _"search" },
    4.23 -          name = "q"
    4.24 -        }
    4.25 -        
    4.26 -      end 
    4.27 -    }
    4.28 -
    4.29 -    ui.link {
    4.30 -      attr = { class = "searchLink" },
    4.31 -      module = "index", view = "search", content = function ()
    4.32 -        ui.image { static = "icons/16/magnifier.png" }
    4.33 -      end
    4.34 -    }
    4.35 -    
    4.36 +local for_meta_navigation = false
    4.37 +if config.meta_navigation_items_func and config.meta_navigation_html_func then
    4.38 +  for_meta_navigation =
    4.39 +    request.get_module() == "index" and (
    4.40 +      request.get_view() == "login"
    4.41 +      or request.get_view() == "register"
    4.42 +      or request.get_view() == "reset_password"
    4.43 +      or request.get_view() == "send_login"
    4.44 +    )
    4.45 +    or (request.get_module() == "registration")
    4.46 +    or (request.get_module() == "member" and request.get_view() == "show" and param.get_id() == app.session.member_id)
    4.47 +    or (request.get_module() == "member" and request.get_view() == "history" and param.get_id() == app.session.member_id)
    4.48 +    or (request.get_module() == "member" and (
    4.49 +      string.match(request.get_view(), "^settings")
    4.50 +      or string.match(request.get_view(), "^edit")
    4.51 +    ))
    4.52 +  local items = config.meta_navigation_items_func(app.session.member, for_meta_navigation and "login" or "LiquidFeedback")
    4.53 +  local meta_navigation = config.meta_navigation_html_func(items)
    4.54 +  slot.put_into("meta_navigation", meta_navigation)
    4.55 +  local meta_navigation_style = config.meta_navigation_style_func(items)
    4.56 +  slot.put_into("meta_navigation_style", meta_navigation_style)
    4.57 +  if config.meta_navigation_extra_style_func then
    4.58 +    local meta_navigation_extra_style = config.meta_navigation_extra_style_func(items)
    4.59 +    slot.put_into("meta_navigation_style", meta_navigation_extra_style)
    4.60    end
    4.61 -  
    4.62 -  if app.session.member == nil then
    4.63 -    
    4.64 -    slot.put ( " " )
    4.65 -    
    4.66 -    ui.link {
    4.67 -      text   = _"Login",
    4.68 -      module = 'index',
    4.69 -      view   = 'login',
    4.70 -      params = {
    4.71 -        redirect_module = request.get_module(),
    4.72 -        redirect_view = request.get_view(),
    4.73 -        redirect_id = param.get_id()
    4.74 -      }
    4.75 -    }
    4.76 -    
    4.77 -    slot.put ( " " )
    4.78 -  end
    4.79 -  
    4.80 -  if app.session.member == nil and not config.registration_disabled then
    4.81 -    
    4.82 -    ui.link {
    4.83 -      text   = _"Registration",
    4.84 -      module = 'index',
    4.85 -      view   = 'register'
    4.86 -    }
    4.87 +  local meta_navigation_script = config.meta_navigation_script_func(items)
    4.88 +  slot.put_into("script", meta_navigation_script)
    4.89 +end
    4.90 +
    4.91 +if not config.meta_navigation_items_func or not config.meta_navigation_html_func then
    4.92 +  slot.select ( 'header_bar', function ()
    4.93 +    ui.tag{ tag = "header", attr = { class = "mdl-layout__header mdl-layout__header--seamed" }, content = function()
    4.94 +      ui.container{ attr = { class = "mdl-layout__header-row" }, content = function()
    4.95 +        ui.link{ module = "index", view = "index", attr = { class = "mdl-layout-title" }, content = "LiquidFeedback" }
    4.96 +        ui.tag{ attr = { class = "mdl-layout-spacer" }, content = "" }
    4.97  
    4.98 -  end
    4.99 -  
   4.100 -  
   4.101 -  if app.session.member then
   4.102 -  
   4.103 -    slot.put ( " " )
   4.104 -    
   4.105 -    ui.tag { attr = { id = "member_menu" }, content = function()
   4.106 -      util.micro_avatar(app.session.member)
   4.107 +        if app.session:has_access ("anonymous") then
   4.108 +          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 ()
   4.109 +            ui.tag{ tag = "label", attr = { class = "mdl-button mdl-js-button mdl-button--icon", ["for"] = "fixed-header-drawer-exp" }, content = function()
   4.110 +              ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "search" }
   4.111 +            end }
   4.112 +            ui.container{ attr = { class = "mdl-textfield__expandable-holder" }, content = function()
   4.113 +              ui.tag{ tag = "input", attr = { class = "mdl-textfield__input", type = "text", name = "q", id = "fixed-header-drawer-exp" }, content = "" }
   4.114 +            end }
   4.115 +          end }
   4.116 +        end
   4.117 +        
   4.118 +        if app.session.member == nil and not (
   4.119 +          request.get_module() == "index" and (request.get_view() == "login" or request.get_view() == "reset_password" or request.get_view() == "send_login")
   4.120 +        ) and not config.meta_navigation_html_func then
   4.121 +          local redirect_params = json.object()
   4.122 +          for key, val in pairs(request.get_param_strings()) do
   4.123 +            if type(val) == "string" then
   4.124 +              redirect_params[key] = val
   4.125 +            else
   4.126 +              -- shouldn't happen
   4.127 +              error("array type params not implemented")
   4.128 +            end
   4.129 +          end
   4.130 +          ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function()
   4.131 +            local link = {
   4.132 +              content = function()
   4.133 +                ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "exit_to_app" }
   4.134 +                slot.put(" ")
   4.135 +                ui.tag{ attr = { class = "mdl-layout--large-screen-only" }, content = function()
   4.136 +                  ui.tag{ content = _"Login" }
   4.137 +                end }
   4.138 +              end,
   4.139 +              text   = _"Login",
   4.140 +              attr = { class = "mdl-navigation__link" }
   4.141 +            }
   4.142 +            if config.login and config.login.method == "oauth2" then
   4.143 +              link.module = "oauth2_client"
   4.144 +              link.view = "redirect"
   4.145 +              link.params = { provider = config.login.provider }
   4.146 +            else
   4.147 +              link.module = 'index'
   4.148 +              link.view   = 'login'
   4.149 +              link.params = {
   4.150 +                redirect_module = request.get_module(),
   4.151 +                redirect_view = request.get_view(),
   4.152 +                redirect_id = param.get_id(),
   4.153 +                redirect_params = redirect_params
   4.154 +              }
   4.155 +            end
   4.156 +            ui.link(link)
   4.157 +          end }
   4.158 +        end
   4.159 +          
   4.160 +        if app.session.member and not (
   4.161 +          config.meta_navigation_items_func and config.meta_navigation_html_func
   4.162 +        ) then
   4.163 +          ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function()
   4.164 +            ui.tag{ tag = "span", module = "member", view = "show", id = app.session.member.id, attr = { id = "lf-member-menu", class = "mdl-navigation__link" }, content = function()
   4.165 +              ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "person" }
   4.166 +              ui.tag{ attr = { class = "mdl-layout--large-screen-only" }, content = function()
   4.167 +                ui.tag{ content = app.session.member.name }
   4.168 +              end }
   4.169 +            end }
   4.170 +          
   4.171 +            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()
   4.172 +              execute.view{ module = "member", view = "_menu", params = { item_class = "mdl-menu__item", link_class = "mdl-menu__link" } }
   4.173 +            end }
   4.174 +          end }
   4.175 +
   4.176 +        end -- if app.session.member
   4.177 +      end }
   4.178      end }
   4.179 -    
   4.180 -  end -- if app.session.member
   4.181 -    
   4.182 -end)
   4.183 +  end)
   4.184 +end
   4.185  
   4.186  -- show notifications about things the user should take care of
   4.187 +--[[
   4.188  if app.session.member then
   4.189    execute.view{
   4.190      module = "index", view = "_sidebar_notifications", params = {
   4.191 @@ -80,34 +120,48 @@
   4.192      }
   4.193    }
   4.194  end
   4.195 +--]]
   4.196  
   4.197  slot.select ("footer", function ()
   4.198 +  ui.tag{ tag = "li", content = function()
   4.199 +    ui.link{ content = _"Quick guide", module = "help", view = "introduction" }
   4.200 +  end }
   4.201    if app.session.member_id and app.session.member.admin then
   4.202 -    ui.link {
   4.203 -      text   = _"System settings",
   4.204 -      module = 'admin',
   4.205 -      view   = 'index'
   4.206 -    }
   4.207 -    slot.put(" · ")
   4.208 +    ui.tag{ tag = "li", content = function()
   4.209 +      if config.admin_link then
   4.210 +        ui.link(config.admin_link)
   4.211 +      else
   4.212 +        ui.link{ content = _"System settings", module = "admin", view = "index" }
   4.213 +      end
   4.214 +    end }
   4.215    end
   4.216 -  ui.link{
   4.217 -    text   = _"About site",
   4.218 -    module = 'index',
   4.219 -    view   = 'about'
   4.220 -  }
   4.221 -  if config.use_terms then
   4.222 -    slot.put(" · ")
   4.223 +  ui.tag{ tag = "li", content = function()
   4.224      ui.link{
   4.225 -      text   = _"Use terms",
   4.226 +      text   = _"About site",
   4.227        module = 'index',
   4.228 -      view   = 'usage_terms'
   4.229 +      view   = 'about'
   4.230      }
   4.231 +  end }
   4.232 +  if not config.extra_footer_func then
   4.233 +    if config.use_terms and app.session.member then
   4.234 +      ui.tag{ tag = "li", content = function()
   4.235 +        ui.link{
   4.236 +          text   = _"Use terms",
   4.237 +          module = 'index',
   4.238 +          view   = 'usage_terms'
   4.239 +        }
   4.240 +      end }
   4.241 +    end
   4.242    end
   4.243 -  slot.put(" · ")
   4.244 -  ui.link{
   4.245 -    text   = _"LiquidFeedback",
   4.246 -    external = "http://www.liquidfeedback.org/"
   4.247 -  }
   4.248 +  if config.extra_footer_func then
   4.249 +    config.extra_footer_func()
   4.250 +  end
   4.251 +  ui.tag{ tag = "li", content = function()
   4.252 +    ui.link{
   4.253 +      text   = _"LiquidFeedback",
   4.254 +      external = "http://www.liquidfeedback.org/"
   4.255 +    }
   4.256 +  end }
   4.257  end)
   4.258  
   4.259  if not config.enable_debug_trace then
   4.260 @@ -117,4 +171,19 @@
   4.261  end
   4.262  
   4.263  
   4.264 -execute.inner()
   4.265 +
   4.266 +if app.current_initiative then
   4.267 +  app.current_issue = app.current_initiative.issue
   4.268 +end
   4.269 +
   4.270 +if app.current_issue then
   4.271 +  app.current_area = app.current_issue.area
   4.272 +end
   4.273 +
   4.274 +if app.current_area then
   4.275 +  app.current_unit = app.current_area.unit
   4.276 +end
   4.277 +
   4.278 +if not for_meta_navigation then
   4.279 +  execute.view{ module = "index", view = "_drawer" }
   4.280 +end

     5.1 --- a/app/main/_filter_view/34_stylesheet.lua	Thu Jun 23 03:30:57 2016 +0200
     5.2 +++ b/app/main/_filter_view/34_stylesheet.lua	Sun Jul 15 14:07:29 2018 +0200
     5.3 @@ -1,16 +1,3 @@
     5.4 -local value
     5.5 -if app.session.member then
     5.6 -  local setting_key = "liquidfeedback_frontend_stylesheet_url"
     5.7 -  local setting = Setting:by_pk(app.session.member.id, setting_key)
     5.8 -  value = setting and setting.value
     5.9 -end
    5.10 -
    5.11 -if value then
    5.12 -  slot.put_into("stylesheet_url", value)
    5.13 -else
    5.14 -  slot.put_into("stylesheet_url", request.get_relative_baseurl() .. "static/lf3.css")
    5.15 -end
    5.16 -
    5.17  execute.inner()
    5.18  
    5.19  if config.footer_html then 

     6.1 --- a/app/main/_layout/default.html	Thu Jun 23 03:30:57 2016 +0200
     6.2 +++ b/app/main/_layout/default.html	Sun Jul 15 14:07:29 2018 +0200
     6.3 @@ -1,276 +1,759 @@
     6.4 -<html>
     6.5 -<head>
     6.6 -  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     6.7 -  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
     6.8 -  <title><!-- WEBMCP SLOTNODIV html_title --></title>
     6.9 -  <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/gregor.js/gregor.css" />
    6.10 -  <link rel="stylesheet" type="text/css" href="<!-- WEBMCP SLOTNODIV stylesheet_url -->" />
    6.11 -  <!-- WEBMCP SLOTNODIV html_head -->
    6.12 -  <script src="__BASEURL__/static/js/jquery-1.11.1.min.js"></script>
    6.13 -  <script type="text/javascript">jsFail = true;</script>
    6.14 -  <![if !IE]>
    6.15 -    <script type="text/javascript">jsFail = false;</script>
    6.16 -  <![endif]>
    6.17 -  <script type="text/javascript" src="__BASEURL__/static/js/jsprotect.js"></script>
    6.18 -  <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
    6.19 -  <script type="text/javascript">var ui_tabs_active = {};</script>
    6.20 -</head>
    6.21 -<body style="">
    6.22 -<div class="head_outer">
    6.23 -  <div class="head">
    6.24 -    <div class="nav">
    6.25 -      <!--WEBMCP SLOTNODIV navigation -->
    6.26 -      <!--WEBMCP SLOTNODIV navigation_right -->
    6.27 -      <!--WEBMCP SLOTNODIV notification -->
    6.28 -    </div>
    6.29 -
    6.30 -    <a class="logo" href="__BASEURL__/">
    6.31 -      <span class="liquid">Liquid</span><span class="feedback">Feedback</span>
    6.32 -      <span class="instanceName"><!-- WEBMCP SLOTNODIV instance_name --></span>
    6.33 -    </a>
    6.34 -
    6.35 -    
    6.36 -  </div>
    6.37 -</div>
    6.38 -
    6.39 -<div class="page">
    6.40 -  <div class="layout_notice" id="layout_notice" onclick="document.getElementById('layout_notice').style.display='none';">
    6.41 -    <!-- WEBMCP SLOT notice -->
    6.42 -  </div>
    6.43 -  
    6.44 -  <div class="layout_warning" id="layout_warning" onclick="document.getElementById('layout_warning').style.display='none';">
    6.45 -    <!-- WEBMCP SLOT warning -->
    6.46 -  </div>
    6.47 -  
    6.48 -  <div class="layout_error" id="layout_error" onclick="document.getElementById('layout_error').style.display='none';">
    6.49 -    <!-- WEBMCP SLOT error -->
    6.50 -  </div>
    6.51 -
    6.52 -  <div class="layout_motd" id="layout_motd" onclick="document.getElementById('layout_motd').style.display='none';">
    6.53 -    <!-- WEBMCP SLOT motd -->
    6.54 -  </div>
    6.55 -
    6.56 -  <div class="title_outer">
    6.57 -    <!-- WEBMCP SLOT title -->
    6.58 -  </div>
    6.59 -  
    6.60 -  <!-- WEBMCP SLOT tabs -->
    6.61 -
    6.62 -  <!-- WEBMCP SLOTNODIV actions -->
    6.63 -  
    6.64 -  <div id="swiper_tabs" class="swiper_tabs" style="display: none;">
    6.65 -<!--    <div><a id="tab-0" href="#" onclick="slider.to(0); return false;"><img src="__BASEURL__/static/icons/16/chart_organisation.png" /></a></div>-->
    6.66 -    <div><a id="tab-0" href="#" onclick="slider.to(0); return false;"><img src="__BASEURL__/static/icons/16/text_list_bullets.png" width="32" height="32" /></a></div>
    6.67 -    <div><a id="tab-1" href="#" onclick="slider.to(1); return false;"><img src="__BASEURL__/static/icons/48/info.png" width="32" height="32" /></a></div>
    6.68 -    <div><a id="tab-2" href="#" onclick="slider.to(2); return false;"><img src="__BASEURL__/static/icons/16/group.png" width="32" height="32" /></a></div>
    6.69 -  </div>
    6.70 -  
    6.71 -  <div id="swiper_info"><!-- WEBMCP SLOTNODIV swiper_info --></div>
    6.72 -  <div id="swiper" class="swiper" style="position: absolute; width: 100%;">
    6.73 -    <div id="swiper_wrap" class="swiper_wrap">
    6.74 -    </div>
    6.75 -  </div>
    6.76 -  
    6.77 -  <div class="content">
    6.78 -    <div class="sidebar">
    6.79 -      <!-- WEBMCP SLOTNODIV sidebar -->
    6.80 -    </div>
    6.81 -
    6.82 -    <div class="main_outer">
    6.83 -      <!-- WEBMCP SLOTNODIV slideshow -->
    6.84 -      <div class="main">
    6.85 -        <!-- WEBMCP SLOTNODIV default -->
    6.86 -        <!-- WEBMCP SLOTNODIV extra -->
    6.87 -      </div>
    6.88 -    </div>
    6.89 -  </div>
    6.90 -  <br style="clear: both;" />
    6.91 -  <div class="footer">
    6.92 -    <!-- WEBMCP SLOTNODIV footer -->
    6.93 -  </div>
    6.94 -</div>
    6.95 -
    6.96 -  <div id="trace">
    6.97 -    <!-- WEBMCP SLOTNODIV trace_button -->
    6.98 -    <div id="trace_content" style="display: none;">
    6.99 -      <tt id="system_error"><!-- WEBMCP SLOT system_error --></tt>
   6.100 -      <h1>System trace (for computer programmers purposes)</h1>
   6.101 -      <br />
   6.102 -      <!-- WEBMCP SLOT trace -->
   6.103 -      <div class="trace_close" onclick="document.getElementById('trace_show').style.display='block';document.getElementById('trace_content').style.display='none';">
   6.104 -        close
   6.105 -      </div>
   6.106 -    </div>
   6.107 -  </div>
   6.108 -  <script>
   6.109 -    $(".trace_view > .trace_list").hide();
   6.110 -    $(".trace_head").click(function() {
   6.111 -      var el = this.nextSibling
   6.112 -      if (el) $(el).toggle();
   6.113 -    });
   6.114 -  </script>
   6.115 -  
   6.116 -  <!-- WEBMCP SLOTNODIV script -->
   6.117 -  
   6.118 -  <script>
   6.119 -  
   6.120 -    var slider;
   6.121 -  
   6.122 -    function initSlider () {
   6.123 -    
   6.124 -      var els = [
   6.125 -        $( '.main, .extra' ),
   6.126 -        $( '.tab-notification, .tab-whatcanido' ),
   6.127 -        $( '.tab-members' )
   6.128 -      ];
   6.129 -      
   6.130 -      var sidebarFound = false;
   6.131 -      for ( i = 1; i < els.length; i++) {
   6.132 -        if (els[i].length > 0) sidebarFound = true;
   6.133 -      }
   6.134 -      
   6.135 -      if (sidebarFound) $("#swiper_tabs").show();
   6.136 -
   6.137 -      var elsCount = 3;
   6.138 -      
   6.139 -      var slidePos;
   6.140 -
   6.141 -      function slideTo ( pos ) {
   6.142 -        if ( typeof ( slidePos ) != "undefined" ) {
   6.143 -          els[ slidePos ].hide();
   6.144 -          $ ( "#tab-" + slidePos ).removeClass ( "active" );
   6.145 -        }
   6.146 -        slidePos = pos;
   6.147 -        els[ slidePos ].show();
   6.148 -        $ ( "#tab-" + slidePos ).addClass ( "active" );
   6.149 -        if (pos == 1) {
   6.150 -          $("#swiper_info").hide();
   6.151 -        }
   6.152 -      }
   6.153 -      
   6.154 -      function slideNext () {
   6.155 -        var pos = slidePos + 1;
   6.156 -        if ( pos > elsCount - 1 ) {
   6.157 -          pos = elsCount - 1;
   6.158 -        } else {
   6.159 -          $( "#swiper").css("left", "400px");
   6.160 -          $( "#swiper").animate({ "left": "0px" }, 200);
   6.161 -        }
   6.162 -        slideTo ( pos );
   6.163 -      }
   6.164 -      
   6.165 -      function slidePrev () {
   6.166 -        var pos = slidePos - 1;
   6.167 -        if ( pos < 0 ) {
   6.168 -          pos = 0;
   6.169 -        } else {
   6.170 -          $( "#swiper").css("left", "-400px");
   6.171 -          $( "#swiper").animate({ "left": "0px" }, 200);
   6.172 -        }
   6.173 -        slideTo ( pos );
   6.174 -      }
   6.175 -      
   6.176 -      function exit() {
   6.177 -        for ( i = 0; i < els.length; i++) {
   6.178 -          els[i].show();
   6.179 -        }
   6.180 -        $( ".main_outer" ).append ( $( ".main" ).detach() );
   6.181 -        $( ".extra_outer" ).append ( $( ".extra" ).detach() );
   6.182 -        $( ".sidebar" ).append ( $(els[1]).detach() );
   6.183 -        $( ".sidebar" ).append ( $(els[2]).detach() );
   6.184 -        $( ".page" ).append ( $('.footer') );
   6.185 -        $( "body" ).append ( $('#trace') );
   6.186 -
   6.187 -      }
   6.188 -      
   6.189 -      var touchStartX;
   6.190 -      var touchStartY;
   6.191 -      var isScrolling;
   6.192 -      
   6.193 -      function touchDown ( e ) {
   6.194 -        touchStartX = e.originalEvent.touches[0].pageX;
   6.195 -        touchStartY = e.originalEvent.touches[0].pageY;
   6.196 -        isScrolling = undefined;
   6.197 -      }
   6.198 -      
   6.199 -      function touchMove ( e ) {
   6.200 -        var diffX = touchStartX - e.originalEvent.changedTouches[0].pageX;
   6.201 -        var diffY = touchStartY - e.originalEvent.changedTouches[0].pageY;
   6.202 -        if ( typeof( isScrolling ) == 'undefined' ) {
   6.203 -          isScrolling = Math.abs ( diffY ) > Math.abs ( diffX );
   6.204 -        }
   6.205 -        if ( ! isScrolling ) {
   6.206 -          $( "#swiper").css("left", -diffX + "px");
   6.207 -          e.preventDefault();
   6.208 -        }
   6.209 -      }
   6.210 -      
   6.211 -      function touchUp ( e ) {
   6.212 -        var diffX = touchStartX - e.originalEvent.changedTouches[0].pageX;
   6.213 -        var diffY = touchStartY - e.originalEvent.changedTouches[0].pageY;
   6.214 -        
   6.215 -        if ( isScrolling ) {
   6.216 -          // vertical scrolling
   6.217 -          return;
   6.218 -        }
   6.219 -        
   6.220 -        if ( Math.abs ( diffX ) < 100 ) {
   6.221 -          // go back not enough
   6.222 -          $( "#swiper").animate({
   6.223 -            "left": "0px",
   6.224 -          }, 200);
   6.225 -          return;
   6.226 -        }
   6.227 -        var direction = diffX < 0 ? "right" : "left";
   6.228 -
   6.229 -        if ( direction == "left" ) {
   6.230 -          slideNext();
   6.231 -        } else {
   6.232 -          slidePrev();
   6.233 -        }
   6.234 -      }
   6.235 -
   6.236 -      for ( i = 0; i < els.length; i++) {
   6.237 -        var el = els[i].detach();
   6.238 -        el.hide();
   6.239 -        $('#swiper_wrap').append ( el ) ;
   6.240 -      }
   6.241 -      
   6.242 -      $('#swiper_wrap').append ( $('.footer') );
   6.243 -      $('#swiper_wrap').append ( $('#trace') );
   6.244 -      slideTo ( 0 );
   6.245 -      
   6.246 -      if ( 'ontouchstart' in document.documentElement ) {
   6.247 -        $( "body" ).on( "touchstart", touchDown );
   6.248 -        $( "body" ).on( "touchmove", touchMove );
   6.249 -        $( "body" ).on( "touchend",   touchUp );
   6.250 -      }
   6.251 -      
   6.252 -      return {
   6.253 -        to: slideTo,
   6.254 -        exit: exit
   6.255 -      }
   6.256 -      
   6.257 -    }
   6.258 -    
   6.259 -    function resizeHandler() {
   6.260 -      if ( $(window).width() < 768 ) {
   6.261 -        if ( typeof ( slider ) == "undefined" ) {
   6.262 -          slider = initSlider();
   6.263 -        }
   6.264 -      } else {
   6.265 -        if ( typeof ( slider ) != "undefined" ) {
   6.266 -          slider.exit();
   6.267 -          slider = undefined;
   6.268 -        }
   6.269 -      }
   6.270 -      
   6.271 -    }
   6.272 -    
   6.273 -    $( window ).resize( resizeHandler );
   6.274 -    resizeHandler();
   6.275 -    
   6.276 -  </script>
   6.277 -
   6.278 -</body>
   6.279 -</html>
   6.280 +<!DOCTYPE html>
   6.281 +<html>
   6.282 +<head>
   6.283 +  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   6.284 +  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   6.285 +  <title><!-- WEBMCP SLOTNODIV html_title --></title>
   6.286 +  <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/style/style.css" />
   6.287 +  <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/gregor.js/gregor.css" />
   6.288 +  <!-- WEBMCP SLOTNODIV html_head -->
   6.289 +  <script type="text/javascript">jsFail = true;</script>
   6.290 +  <![if !IE]>
   6.291 +    <script type="text/javascript">jsFail = false;</script>
   6.292 +  <![endif]-->
   6.293 +  <script type="text/javascript" src="__BASEURL__/static/mdl/material.js"></script>
   6.294 +  <script type="text/javascript" src="__BASEURL__/static/js/jsprotect.js"></script>
   6.295 +  <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
   6.296 +  <style>
   6.297 +    @font-face {
   6.298 +      font-family: "Roboto";
   6.299 +      src: url("__BASEURL__/static/font/Roboto-Regular.ttf");
   6.300 +    }
   6.301 +    @font-face {
   6.302 +      font-family: "Roboto Bold";
   6.303 +      src: url("__BASEURL__/static/font/Roboto-Bold.ttf");
   6.304 +    }
   6.305 +    @font-face {
   6.306 +      font-family: "Roboto Slab";
   6.307 +      src: url("__BASEURL__/static/font/RobotoSlab-Regular.ttf");
   6.308 +    }
   6.309 +    @font-face {
   6.310 +      font-family: 'Material Icons';
   6.311 +      font-style: normal;
   6.312 +      font-weight: 400;
   6.313 +      src: url("__BASEURL__/static/font/material.woff2") format('woff2');
   6.314 +    }
   6.315 +
   6.316 +    .material-icons {
   6.317 +      font-family: 'Material Icons';
   6.318 +      font-weight: normal;
   6.319 +      font-style: normal;
   6.320 +      font-size: 24px;
   6.321 +      line-height: 1;
   6.322 +      letter-spacing: normal;
   6.323 +      text-transform: none;
   6.324 +      display: inline-block;
   6.325 +      white-space: nowrap;
   6.326 +      word-wrap: normal;
   6.327 +      direction: ltr;
   6.328 +      -webkit-font-feature-settings: 'liga';
   6.329 +      -webkit-font-smoothing: antialiased;
   6.330 +    }
   6.331 +    .material-icons.icon-green {
   6.332 +      color: #4CAF50;
   6.333 +    }
   6.334 +    .material-icons.icon-yellow {
   6.335 +      color: #FFEB3B;
   6.336 +    }
   6.337 +    .material-icons.icon-red {
   6.338 +      color: #F44336;
   6.339 +    }
   6.340 +    .mapboxgl-popup-content {
   6.341 +      max-width: 200px;
   6.342 +    }
   6.343 +    body {
   6.344 +      font-family: "Roboto";
   6.345 +      background: #fff;
   6.346 +    }
   6.347 +    strong {
   6.348 +      font-family: "Roboto Bold";
   6.349 +    }
   6.350 +    .slot_error {
   6.351 +      margin: 20px 20px 0 20px;
   6.352 +      background: #fed;
   6.353 +      padding: 20px;
   6.354 +    }
   6.355 +    .slot_notice {
   6.356 +      margin: 20px 20px 0 20px;
   6.357 +      background: #efd;
   6.358 +      padding: 20px;
   6.359 +    }
   6.360 +    h1 {
   6.361 +      font-size: 24px;
   6.362 +      margin-bottom: 0px;
   6.363 +    }
   6.364 +    
   6.365 +    .mdl-layout__container {
   6.366 +      max-width: 1600px;
   6.367 +      height: auto;
   6.368 +      background: #f7f7f7;
   6.369 +    }
   6.370 +    .mdl-layout__header-row {
   6.371 +      padding-left: 20px !important;
   6.372 +      padding-right: 10px !important;
   6.373 +    }
   6.374 +    .mdl-layout__content {
   6.375 +      flex-shrink: 0;
   6.376 +      width: 100%;
   6.377 +    }
   6.378 +    #lf-member-menu {
   6.379 +      cursor: pointer;
   6.380 +    }
   6.381 +    .notifications {
   6.382 +      display: block;
   6.383 +      text-align: center;
   6.384 +    }
   6.385 +    .page-content {
   6.386 +      xdisplay: flex;
   6.387 +      width: 100%;
   6.388 +    }
   6.389 +    .map, .ui_field_location {
   6.390 +      border: none;
   6.391 +      width: 100%;
   6.392 +      height: auto;
   6.393 +      max-height: 80vh;
   6.394 +      position: relative;
   6.395 +      border-radius: 2px;
   6.396 +    }
   6.397 +    .map:before {
   6.398 +      content: "";
   6.399 +      display: block;
   6.400 +      padding-top: 100%;
   6.401 +    }
   6.402 +    .map iframe {
   6.403 +      position: absolute;
   6.404 +      top: 0;
   6.405 +      left: 0;
   6.406 +      right: 0;
   6.407 +      bottom: 0;
   6.408 +      height: 100%;
   6.409 +    }
   6.410 +    .axto-logo {
   6.411 +      width: 100%;
   6.412 +    }
   6.413 +    .mdl-card__title-text a.issue {
   6.414 +      font-size: 18px;
   6.415 +      line-height: 20px;
   6.416 +    }
   6.417 +    .mdl-list__item .initiative_name {
   6.418 +      font-size: 18px;
   6.419 +      line-height: normal;
   6.420 +    }
   6.421 +    .initiatives.mdl-list  {
   6.422 +      margin-top: 10px;
   6.423 +      margin-bottom: 0px;
   6.424 +      padding-bottom: 0px;
   6.425 +    }
   6.426 +    .initiatives .mdl-list__item--three-line {
   6.427 +      min-height: 0;
   6.428 +      padding-top: 0;
   6.429 +      padding-bottom: 0;
   6.430 +    }
   6.431 +    .mdl-data-table__fullwidth {
   6.432 +      width: 100%;
   6.433 +    }
   6.434 +    .mdl-textfield__fullwidth {
   6.435 +      width: 100%;
   6.436 +    }
   6.437 +    
   6.438 +    .mdl-card {
   6.439 +      min-height: 20px;
   6.440 +      overflow: visible;
   6.441 +      display: block;
   6.442 +      margin-bottom: 16px;
   6.443 +    }
   6.444 +
   6.445 +    .mdl-card__fullwidth {
   6.446 +      width: 100%;
   6.447 +    }
   6.448 +    .mdl-card__title {
   6.449 +      display: block;
   6.450 +    }
   6.451 +    .mdl-card__title > h2,
   6.452 +    .mdl-card__title > a {
   6.453 +      display: inline-block;
   6.454 +      vertical-align: top;
   6.455 +    }
   6.456 +    .mdl-card__subtitle-text {
   6.457 +      display: block;
   6.458 +    }
   6.459 +    .mdl-card__content {
   6.460 +      font-size: 1rem;
   6.461 +      padding: 16px;
   6.462 +    }
   6.463 +    .mdl-card__content.mdl-card--no-bottom-pad {
   6.464 +      padding-bottom: 0;
   6.465 +    }
   6.466 +    .mdl-card__actions.mdl-card--action-border,
   6.467 +    .mdl-card__content.mdl-card--border {
   6.468 +      border-bottom: 1px solid rgba(0, 0, 0, 0.1);
   6.469 +    }
   6.470 +    .mdl-card__actions.mdl-card--notice,
   6.471 +    .mdl-card__content.mdl-card--notice {
   6.472 +      background: #fff9c4;
   6.473 +    }
   6.474 +    .mdl-card--has-fab {
   6.475 +      position: relative;
   6.476 +    }
   6.477 +    .mdl-special-card {
   6.478 +      background: #fff;
   6.479 +      margin-bottom: 16px;
   6.480 +      border-radius: 2px;
   6.481 +    }
   6.482 +
   6.483 +    .mdl-navigation__head {
   6.484 +      font-family: "Roboto Bold";
   6.485 +    }
   6.486 +    .mdl-list__item--three-line {
   6.487 +      height: auto;
   6.488 +      min-height: 88px;
   6.489 +    }
   6.490 +    .mdl-list__item--three-line .mdl-list__item-primary-content {
   6.491 +      height: auto;
   6.492 +      min-height: 52px;
   6.493 +    }
   6.494 +    .mdl-chip.clickable {
   6.495 +      cursor: pointer;
   6.496 +    }
   6.497 +    .mdl-chip.unit,
   6.498 +    .mdl-chip.area,
   6.499 +    .mdl-chip.issue {
   6.500 +      padding: 1px 6px;
   6.501 +      line-height: 24px;
   6.502 +      height: 24px;
   6.503 +      vertical-align: bottom;
   6.504 +      margin-right: 4px;
   6.505 +      margin-bottom: 8px;
   6.506 +    }
   6.507 +    .mdl-chip.unit i,
   6.508 +    .mdl-chip.area i,
   6.509 +    .mdl-chip.issue i {
   6.510 +      font-size: 18px;
   6.511 +      color: #444;
   6.512 +    }
   6.513 +    .mdl-chip.unit {
   6.514 +      xbackground: rgba(76,175,80,0.2);
   6.515 +    }
   6.516 +    .mdl-chip.area {
   6.517 +      xbackground: rgba(76,175,80,0.2);
   6.518 +    }
   6.519 +    .mdl-chip.issue {
   6.520 +      xbackground: rgba(76,175,80,0.2);
   6.521 +    }
   6.522 +    .mdl-menu {
   6.523 +      z-index: -9999;
   6.524 +    }
   6.525 +    .mdl-menu__item {
   6.526 +      padding: 0;
   6.527 +    }
   6.528 +    .mdl-menu__link {
   6.529 +      display: block;
   6.530 +      padding: 0 16px;
   6.531 +      min-height: 48px;
   6.532 +      text-decoration: none;
   6.533 +      color: #444;
   6.534 +    }
   6.535 +    .mdl-tabs__tab-bar {
   6.536 +      justify-content: flex-start;
   6.537 +    }
   6.538 +    .mdl-tabs__tab.is-active {
   6.539 +    color: rgba(0,0,0, 0.87);
   6.540 +    }
   6.541 +    .mdl-data-table--condensed tbody tr {
   6.542 +      height: 24px;
   6.543 +    }
   6.544 +    .mdl-data-table--condensed td {
   6.545 +      padding-top: 0;
   6.546 +      padding-bottom: 0;
   6.547 +      height: 24px;
   6.548 +    }
   6.549 +    .mdl-button--underlined {
   6.550 +      text-decoration: underline;
   6.551 +    }
   6.552 +    .right {
   6.553 +      text-align: right;
   6.554 +    }
   6.555 +    .mdl-tabs__left {
   6.556 +      display: inline-block;
   6.557 +      width: auto;
   6.558 +    }
   6.559 +    .float-left {
   6.560 +      float: left;
   6.561 +    }
   6.562 +    .float-right {
   6.563 +      float: right;
   6.564 +    }
   6.565 +    .clear-left {
   6.566 +      clear: left;
   6.567 +    }
   6.568 +    .clear-right {
   6.569 +      clear: right;
   6.570 +    }
   6.571 +    .float-right .mdl-menu__container {
   6.572 +      margin-right: 20px;
   6.573 +    }
   6.574 +    .inline {
   6.575 +      display: inline-block;
   6.576 +    }
   6.577 +    .warning {
   6.578 +      background-color: #fff9c4;
   6.579 +      color: #212121;
   6.580 +      padding: 16px;
   6.581 +      border-radius: 2px;
   6.582 +    }
   6.583 +    .toolbar a {
   6.584 +      color: #000;
   6.585 +      display: inline-block;
   6.586 +      border: 1px solid #ccc;
   6.587 +      position: relative;
   6.588 +    }
   6.589 +
   6.590 +    .toolbar a.wysihtml-command-active {
   6.591 +      background: #000;
   6.592 +      color: #fff;
   6.593 +    
   6.594 +    }
   6.595 +
   6.596 +    .toolbar a span.crossed {
   6.597 +      position: absolute;
   6.598 +      top: 0;
   6.599 +      left: 8px;
   6.600 +      font-weight: bold;
   6.601 +      font-size: 200%;
   6.602 +      line-height: 80%;
   6.603 +    }
   6.604 +    .toolbar a span.head_level {
   6.605 +      position: absolute;
   6.606 +      right: 0;
   6.607 +      bottom: 0;
   6.608 +    }
   6.609 +
   6.610 +    textarea {
   6.611 +      font-family: sans-serif;
   6.612 +      font-weight: normal !important;
   6.613 +      width: 100%;
   6.614 +      height: 40ex;
   6.615 +    }
   6.616 +    .bargraph {
   6.617 +      display: inline-block;
   6.618 +      vertical-align: top;
   6.619 +      height: 9px;
   6.620 +    }
   6.621 +  
   6.622 +    .bargraph div {
   6.623 +      margin: 0;
   6.624 +      padding: 0;
   6.625 +      display: inline-block;
   6.626 +      height: 9px;
   6.627 +    }
   6.628 +    .draft {
   6.629 +      font-family: 'Roboto Slab';
   6.630 +      font-weight: 300;
   6.631 +      overflow: auto;
   6.632 +      clear: left;
   6.633 +    }
   6.634 +    .draft img {
   6.635 +      float: right;
   6.636 +      margin-left: 1em;
   6.637 +    }
   6.638 +    
   6.639 +    .draft .landscape img {
   6.640 +      width: 50%;
   6.641 +    }
   6.642 +    
   6.643 +    .draft .portrait img {
   6.644 +      width: 33.333%;
   6.645 +    }
   6.646 +    
   6.647 +    @media (max-width: 960px) {
   6.648 +      .draft img {
   6.649 +        float: none;
   6.650 +        margin-left: 0;
   6.651 +      }
   6.652 +      .draft a.portrait,
   6.653 +      .draft a.landscape {
   6.654 +        width: 100%;
   6.655 +        display: block;
   6.656 +        text-align: center;
   6.657 +        margin-bottom: 2ex;
   6.658 +      }
   6.659 +      .draft .landscape img {
   6.660 +        width: 100%;
   6.661 +      }
   6.662 +      .draft .portrait img {
   6.663 +        width: 66.666%;
   6.664 +      }
   6.665 +    }
   6.666 +    
   6.667 +    .draft h1 {
   6.668 +      font-size: 150%;
   6.669 +      margin-bottom: 0;
   6.670 +    }
   6.671 +    .draft h2 {
   6.672 +      font-size: 133%;
   6.673 +      margin-bottom: 0;
   6.674 +    }
   6.675 +    .draft h3 {
   6.676 +      font-size: 125%;
   6.677 +      margin-bottom: 0;
   6.678 +    }
   6.679 +    .draft > a:first-child + h1,
   6.680 +    .draft > h1:first-child,
   6.681 +    .draft > h2:first-child,
   6.682 +    .draft > h3:first-child {
   6.683 +      margin-top: 0;
   6.684 +    }
   6.685 +    @media (max-width: 960px) {
   6.686 +      .draft > a:first-child + h1 {
   6.687 +        margin-top: 20px;
   6.688 +      }
   6.689 +    }
   6.690 +
   6.691 +    .folded {
   6.692 +      position: relative;
   6.693 +    }
   6.694 +    .folded .suggestion-content {
   6.695 +      max-height: 180px;
   6.696 +      overflow: hidden;
   6.697 +      position: relative;
   6.698 +    }
   6.699 +    .folded .suggestion-content:before {
   6.700 +      content: "";
   6.701 +      width: 100%;
   6.702 +      height: 25%;
   6.703 +      position: absolute;
   6.704 +      left: 0;
   6.705 +      bottom: 0;
   6.706 +    background: linear-gradient(rgba(0,0,0,0), #fff);
   6.707 +    }
   6.708 +    .suggestion-less,
   6.709 +    .suggestion-more {
   6.710 +      display: none;
   6.711 +    }
   6.712 +    .folded .suggestion-more,
   6.713 +    .unfolded .suggestion-less {
   6.714 +      display: inline-block;
   6.715 +    }
   6.716 +    
   6.717 +    .diff .diff_removed {
   6.718 +      text-decoration: line-through;
   6.719 +      background: #f00;
   6.720 +    }
   6.721 +    
   6.722 +    .diff .diff_added {
   6.723 +      text-decoration: underline;
   6.724 +      background: #0f0;
   6.725 +    }
   6.726 +    
   6.727 +    .material-icons {
   6.728 +      vertical-align: middle;
   6.729 +    }
   6.730 +    .material-icons-small {
   6.731 +      font-size: 18px;
   6.732 +    }
   6.733 +    
   6.734 +    a.mdl-layout-title {
   6.735 +      color: #fff;
   6.736 +      text-decoration: none;
   6.737 +    }
   6.738 +
   6.739 +    .what-can-i-do-here .mdl-card__content {
   6.740 +      font-size: 18px;
   6.741 +    }
   6.742 +
   6.743 +    .what-can-i-do-here .mdl-card__content ul {
   6.744 +      font-size: 1rem;
   6.745 +    }
   6.746 +
   6.747 +    .what-can-i-do-here ul {
   6.748 +      margin-top: 0.5em;
   6.749 +      margin-bottom: 0;
   6.750 +      padding-left: 1.5em
   6.751 +    }
   6.752 +    
   6.753 +    
   6.754 +    
   6.755 +    .lf-filter .mdl-button {
   6.756 +      padding-right: 4px;
   6.757 +    }
   6.758 +    
   6.759 +    .phase-current {
   6.760 +      font-family: "Roboto Bold";
   6.761 +    }
   6.762 +    
   6.763 +    .phase-info {
   6.764 +      padding-left: 27px;
   6.765 +      margin-bottom: 1ex;
   6.766 +    }
   6.767 +    
   6.768 +    .clickable {
   6.769 +      cursor: pointer;
   6.770 +    }
   6.771 +    
   6.772 +    .slot_title {
   6.773 +      margin-left: 16px;
   6.774 +      margin-top: 16px;
   6.775 +      font-size: 18px;
   6.776 +    }
   6.777 +    
   6.778 +    .slot_title > a,
   6.779 +    .slot_title > span {
   6.780 +      display: inline-block;
   6.781 +      padding: 0 4px 0 0;
   6.782 +      
   6.783 +    }
   6.784 +    
   6.785 +    .slot_title a.home {
   6.786 +      margin: 0;
   6.787 +    }
   6.788 +  
   6.789 +    .home i {
   6.790 +      font-size: 32px;
   6.791 +    }
   6.792 +    
   6.793 +    /* fix missing contrast */
   6.794 +    .mdl-list__item--three-line .mdl-list__item-text-body,
   6.795 +    .mdl-card__supporting-text,
   6.796 +    .mdl-card__subtitle-text {
   6.797 +      color: rgba(0,0,0, 0.75);
   6.798 +    }
   6.799 +       
   6.800 +    .mdl-textfield__label {
   6.801 +      color: rgba(0,0,0, 0.5);    
   6.802 +    }
   6.803 +    
   6.804 +    .mdl-list__item--three-line .mdl-list__item-text-body {
   6.805 +      height: auto;
   6.806 +      padding-bottom: 10px;
   6.807 +    }
   6.808 +    
   6.809 +    select {  
   6.810 +      font-family: 'Roboto','Helvetica','Arial',sans-serif;
   6.811 +      background-color: transparent;
   6.812 +      padding: 5px 0;
   6.813 +      border: none;
   6.814 +      border-bottom: 1px solid rgba(0,0,0, 0.12);
   6.815 +      font-size: 1rem;
   6.816 +    }
   6.817 +    
   6.818 +    
   6.819 +    .initiative_list .mdl-list__item {
   6.820 +      display: block;
   6.821 +    }
   6.822 +    .initiative_list .mdl-list__item-avatar {
   6.823 +      float: left;
   6.824 +      margin-right: 8px;
   6.825 +    }
   6.826 +    .initiative_list .mdl-list__item-avatar i {
   6.827 +      padding-left: 8px;
   6.828 +    }
   6.829 +    .initiative_list .mdl-list__item-avatar.positive {
   6.830 +      background: #4caf50;
   6.831 +    }
   6.832 +    .initiative_list .mdl-list__item-avatar.positive i {
   6.833 +      padding-top: 8px;
   6.834 +      vertical-align: top;
   6.835 +    }
   6.836 +    .initiative_list .mdl-list__item-avatar.negative {
   6.837 +      background: #f44336;
   6.838 +    }
   6.839 +    .initiative_list .mdl-list__item-avatar.negative i {
   6.840 +      padding-top: 10px;
   6.841 +      vertical-align: top;
   6.842 +    }
   6.843 +
   6.844 +    .initiative_pie {
   6.845 +      float: left;
   6.846 +      margin-right: 15px;
   6.847 +      margin-bottom: 15px;
   6.848 +    }
   6.849 +    
   6.850 +    .initiative .result {
   6.851 +      font-family: "Roboto Bold";
   6.852 +    }
   6.853 +    
   6.854 +    .admitted_info, .not_admitted_info {
   6.855 +      margin-left: 15px;
   6.856 +    }
   6.857 +
   6.858 +    .admitted_info table th,
   6.859 +    .not_admitted_info table th {
   6.860 +      text-align: left;
   6.861 +      padding-right: 10px;
   6.862 +    }
   6.863 +    
   6.864 +    .admitted_info table td,
   6.865 +    .not_admitted_info table td {
   6.866 +      text-align: right;
   6.867 +      padding-right: 5px;
   6.868 +    }
   6.869 +    
   6.870 +    .admitted
   6.871 +    
   6.872 +    .event_info i {
   6.873 +      font-size: 18px;
   6.874 +      color: #444;
   6.875 +      margin-right: 4px;
   6.876 +    }
   6.877 +    
   6.878 +    .ui_list_row label.mdl-radio {
   6.879 +      display: inline;
   6.880 +    }
   6.881 +    
   6.882 +    .member_image_photo {
   6.883 +      margin-top: 2ex;
   6.884 +      margin-bottom: 2ex;
   6.885 +    }
   6.886 +
   6.887 +    
   6.888 +/*************************************************************************
   6.889 + * Voting
   6.890 + */
   6.891 +.main .section #voting_form .sectionRow:last-child {
   6.892 +  border-radius: 0;
   6.893 +  margin-bottom: 0;
   6.894 +}
   6.895 +#voting {
   6.896 +  margin-top: 3ex;
   6.897 +  position: relative;
   6.898 +  margin-bottom: 2ex;
   6.899 +}
   6.900 +#voting .approval,
   6.901 +#voting .abstention,
   6.902 +#voting .disapproval {
   6.903 +  border: 1px #ccc solid;
   6.904 +  margin-bottom: 3ex;
   6.905 +  padding: 1ex;
   6.906 +  padding-bottom: 1ex;
   6.907 +  border-radius: 2px;
   6.908 +  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
   6.909 +}
   6.910 +#voting .movable {
   6.911 +  cursor: pointer;
   6.912 +}
   6.913 +#voting .disapproval {
   6.914 +  margin-bottom: 2ex;
   6.915 +}
   6.916 +#voting .approval {
   6.917 +  background-color: #9f9;
   6.918 +}
   6.919 +#voting .approval .movable {
   6.920 +  background-color: #dfd;
   6.921 +}
   6.922 +#voting .abstention {
   6.923 +  background-color: #eee;
   6.924 +}
   6.925 +#voting .abstention .movable {
   6.926 +  background-color: #fff;
   6.927 +}
   6.928 +#voting .disapproval {
   6.929 +  background-color: #f88;
   6.930 +}
   6.931 +#voting .disapproval .movable {
   6.932 +  background-color: #fbb;
   6.933 +}
   6.934 +#voting .movable {
   6.935 +  position: relative;
   6.936 +  border: 1px black solid;
   6.937 +  margin-top: 1ex;
   6.938 +  padding: 0;
   6.939 +  border-radius: 2px;
   6.940 +  min-height: 64px;
   6.941 +  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
   6.942 +}
   6.943 +#voting .initiative_name {
   6.944 +  display: inline-block;
   6.945 +  margin: 5px;
   6.946 +  font-family: "Roboto Bold";
   6.947 +}
   6.948 +
   6.949 +#voting .voting_form_active .movable {
   6.950 +  cursor: pointer;
   6.951 +  vertical-align: middle;
   6.952 +  cursor: move;
   6.953 +}
   6.954 +#voting .voting_form_active .clickable {
   6.955 +  cursor: auto;
   6.956 +}
   6.957 +#voting .voting_form_active a.clickable {
   6.958 +  cursor: pointer;
   6.959 +}
   6.960 +
   6.961 +  </style>
   6.962 +<!-- WEBMCP SLOTNODIV meta_navigation_style -->
   6.963 +  
   6.964 +</head>
   6.965 +<body style="">
   6.966 +<!-- WEBMCP SLOTNODIV meta_navigation -->
   6.967 +
   6.968 +<div class="mdl-layout mdl-js-layout mdl-shadow--2dp mdl-layout--fixed-header">
   6.969 +  <!-- WEBMCP SLOTNODIV header_bar -->
   6.970 +  <main class="mdl-layout__content">
   6.971 +    <!-- WEBMCP SLOTNODIV notificationx -->
   6.972 +    <!-- WEBMCP SLOT notice -->
   6.973 +    <!-- WEBMCP SLOT warning -->
   6.974 +    <!-- WEBMCP SLOT error -->
   6.975 +    <!-- WEBMCP SLOT motd -->
   6.976 +    <section class="mdl-layout__tab-panel is-active" id="scroll-tab-1">
   6.977 +      <div class="page-content">
   6.978 +        <!-- WEBMCP SLOT title -->
   6.979 +        <!-- WEBMCP SLOT filter -->
   6.980 +        <!-- WEBMCP SLOTNODIV default -->
   6.981 +        <!-- WEBMCP SLOTNODIV extra -->
   6.982 +        <!-- WEBMCP SLOTNODIV sidebar -->
   6.983 +      </div>
   6.984 +    </section>
   6.985 +    <br />
   6.986 +    <br />
   6.987 +    <br />
   6.988 +    <br />
   6.989 +    <footer class="mdl-mini-footer">
   6.990 +      <div class="mdl-mini-footer__left-section">
   6.991 +        <ul class="mdl-mini-footer__link-list">
   6.992 +          <!-- WEBMCP SLOTNODIV footer -->
   6.993 +        </ul>
   6.994 +      </div>
   6.995 +    </footer>
   6.996 +    <br /><br />
   6.997 +    <div id="trace">
   6.998 +      <!-- WEBMCP SLOTNODIV trace_button -->
   6.999 +      <div id="trace_content" style="display: none;">
  6.1000 +        <div id="system_error"><!-- WEBMCP SLOT system_error --></div>
  6.1001 +        <h1>System trace (for computer programmers purposes)</h1>
  6.1002 +        <br />
  6.1003 +        <!-- WEBMCP SLOT trace -->
  6.1004 +        <div class="trace_close" onclick="document.getElementById('trace_show').style.display='block';document.getElementById('trace_content').style.display='none';">
  6.1005 +          close
  6.1006 +        </div>
  6.1007 +      </div>
  6.1008 +    </div>
  6.1009 +  </main>
  6.1010 +</div>
  6.1011 +
  6.1012 +<div class="head_outer">
  6.1013 +  <div class="head">
  6.1014 +    <div class="nav">
  6.1015 +      <!--WEBMCP SLOTNODIV navigation -->
  6.1016 +    </div>
  6.1017 +
  6.1018 +  </div>
  6.1019 +</div>
  6.1020 +
  6.1021 +<!-- WEBMCP SLOTNODIV dialog -->
  6.1022 +
  6.1023 +<!-- WEBMCP SLOT tabs -->
  6.1024 +
  6.1025 +<script>
  6.1026 +/*
  6.1027 +  $(".trace_view > .trace_list").hide();
  6.1028 +  $(".trace_head").click(function() {
  6.1029 +    var el = this.nextSibling
  6.1030 +    if (el) $(el).toggle();
  6.1031 +  });
  6.1032 +  */
  6.1033 +</script>
  6.1034 +
  6.1035 +<!-- WEBMCP SLOTNODIV script -->
  6.1036 +
  6.1037 +</body>
  6.1038 +</html>

     7.1 --- a/app/main/_layout/system_error.html	Thu Jun 23 03:30:57 2016 +0200
     7.2 +++ b/app/main/_layout/system_error.html	Sun Jul 15 14:07:29 2018 +0200
     7.3 @@ -3,19 +3,10 @@
     7.4    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     7.5    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
     7.6    <title><!-- WEBMCP SLOTNODIV html_title --></title>
     7.7 -  <link rel="stylesheet" type="text/css" media="screen" href="__BASEURL__/static/gregor.js/gregor.css" />
     7.8 -  <link rel="stylesheet" type="text/css" href="__BASEURL__/static/lf3.css" />
     7.9    <!-- WEBMCP SLOTNODIV html_head -->
    7.10 -  <script src="__BASEURL__/static/js/jquery-1.11.1.min.js"></script>
    7.11 -  <script type="text/javascript">jsFail = true;</script>
    7.12 -  <![if !IE]>
    7.13 -    <script type="text/javascript">jsFail = false;</script>
    7.14 -  <![endif]>
    7.15 -  <script type="text/javascript" src="__BASEURL__/static/js/jsprotect.js"></script>
    7.16 -  <script type="text/javascript" src="__BASEURL__/static/js/partialload.js"></script>
    7.17 -  <script type="text/javascript">var ui_tabs_active = {};</script>
    7.18  </head>
    7.19  <body style="">
    7.20 +<!-- WEBMCP SLOTNODIV meta_navigation -->
    7.21  <div class="head_outer">
    7.22    <div class="head">
    7.23      <div class="nav">

     8.1 --- a/app/main/_prefork/10_init.lua	Thu Jun 23 03:30:57 2016 +0200
     8.2 +++ b/app/main/_prefork/10_init.lua	Sun Jul 15 14:07:29 2018 +0200
     8.3 @@ -1,4 +1,4 @@
     8.4 -config.app_version = "3.2.1"
     8.5 +config.app_version = "4.0.0-pre"
     8.6  
     8.7  -- TODO abstraction
     8.8  -- get record by id
     8.9 @@ -64,6 +64,61 @@
    8.10    config.ldap = {}
    8.11  end
    8.12  
    8.13 +if config.oauth2 then
    8.14 +  local scopes = {
    8.15 +    { scope = "authentication", name = { de = "Identität feststellen (nur Screen-Name)", en = "Determine identity (screen name only)" } },
    8.16 +    { scope = "identification", name = { de = "Identität feststellen", en = "Determine identity" } },
    8.17 +    { scope = "notify_email", name = { de = "E-Mail-Adresse für Benachrichtigungen verwenden", en = "Use email address for notifications" } },
    8.18 +    { scope = "read_contents", name = { de = "Inhalte lesen", en = "Read content" } },
    8.19 +    { scope = "read_authors", name = { de = "Autorennamen lesen", en = "Read author names" } },
    8.20 +    { scope = "read_ratings", name = { de = "Bewertungen lesen", en = "Read ratings" } },
    8.21 +    { scope = "read_identities", name = { de = "Identitäten lesen", en = "Read identities" } },
    8.22 +    { scope = "read_profiles", name = { de = "Profile lesen", en = "Read profiles" } },
    8.23 +    { scope = "post", name = { de = "Neue Inhalte veröffentlichen", en = "Post new content" } },
    8.24 +    { scope = "rate", name = { de = "Bewertungen vornehmen", en = "Do ratings" } },
    8.25 +    { scope = "vote", name = { de = "Abstimmen", en = "Vote" } },
    8.26 +    { scope = "delegate", name = { de = "Delegieren", en = "Delegate" } },
    8.27 +    { scope = "profile", name = { de = "Eigenes Profil lesen", en = "Read your profile" } },
    8.28 +    { scope = "settings", name = { de = "Einstellungen einsehen", en = "Read your settings" } },
    8.29 +    { scope = "update_name", name = { de = "Screen-Namen ändern", en = "Update screen name" } },
    8.30 +    { scope = "update_notify_email", name = { de = "E-Mail-Adresse für Benachrichtigungen ändern", en = "Update notify email address" } },
    8.31 +    { scope = "update_profile", name = { de = "Profil bearbeiten", en = "Update your profile" } },
    8.32 +    { scope = "update_settings", name = { de = "Benutzereinstellungen ändern", en = "Update your settings" } }   
    8.33 +  }
    8.34 +  local s = config.oauth2.available_scopes or {}
    8.35 +  for i, scope in ipairs(scopes) do
    8.36 +    s[#s+1] = scope
    8.37 +  end
    8.38 +  config.oauth2.available_scopes = s
    8.39 +  if not config.oauth2.endpoint_magic then
    8.40 +    config.oauth2.endpoint_magic = "liquidfeedback_client/redirection_endpoint"
    8.41 +  end
    8.42 +  if not config.oauth2.manifest_magic then
    8.43 +    config.oauth2.manifest_magic = "liquidfeedback_client/manifest"
    8.44 +  end
    8.45 +  if not config.oauth2.host_func then
    8.46 +    config.oauth2.host_func = function(domain) return extos.pfilter(nil, "host", "-t", "TXT", domain) end
    8.47 +  end
    8.48 +  if not config.oauth2.authorization_code_lifetime then
    8.49 +    config.oauth2.authorization_code_lifetime = 5 * 60
    8.50 +  end
    8.51 +  if not config.oauth2.refresh_token_lifetime then
    8.52 +    config.oauth2.refresh_token_lifetime = 60 * 60 * 24 * 30 * 3
    8.53 +  end
    8.54 +  if not config.oauth2.refresh_pause then
    8.55 +    config.oauth2.refresh_pause = 60
    8.56 +  end
    8.57 +  if not config.oauth2.refresh_grace_period then
    8.58 +    config.oauth2.refresh_grace_period = 60
    8.59 +  end
    8.60 +  if not config.oauth2.access_token_lifetime then
    8.61 +    config.oauth2.access_token_lifetime = 60 * 60
    8.62 +  end
    8.63 +  if not config.oauth2.dynamic_registration_lifetime then
    8.64 +    config.oauth2.dynamic_registration_lifetime = 60 * 60 * 24
    8.65 +  end
    8.66 +end
    8.67 +
    8.68  if not config.database then
    8.69    config.database = { engine='postgresql', dbname='liquid_feedback' }
    8.70  end
    8.71 @@ -135,10 +190,22 @@
    8.72  
    8.73  request.set_absolute_baseurl(config.absolute_base_url)
    8.74  
    8.75 +-- TODO remove style cache
    8.76 +
    8.77  listen(listen_options)
    8.78  
    8.79  listen{
    8.80    {
    8.81 +    proto = "main",
    8.82 +    name = "process_event_stream",
    8.83 +    handler = function(poll)
    8.84 +      Event:process_stream(poll)
    8.85 +    end    
    8.86 +  }
    8.87 +}
    8.88 +
    8.89 +listen{
    8.90 +  {
    8.91      proto = "interval",
    8.92      name  = "send_pending_notifications",
    8.93      delay = 5,
    8.94 @@ -149,11 +216,6 @@
    8.95          end
    8.96        end
    8.97        while true do
    8.98 -        if not Event:send_next_notification() then
    8.99 -          break
   8.100 -        end
   8.101 -      end
   8.102 -      while true do
   8.103          if not InitiativeForNotification:notify_next_member() then
   8.104            break
   8.105          end

     9.1 --- a/app/main/admin/_action/area_update.lua	Thu Jun 23 03:30:57 2016 +0200
     9.2 +++ b/app/main/admin/_action/area_update.lua	Sun Jul 15 14:07:29 2018 +0200
     9.3 @@ -1,6 +1,6 @@
     9.4  local area = Area:by_id(param.get_id()) or Area:new()
     9.5  
     9.6 -param.update(area, "unit_id", "name", "description", "external_reference", "active")
     9.7 +param.update(area, "unit_id", "name", "description", "external_reference", "quorum_standard", "quorum_issues", "quorum_time", "quorum_exponent", "quorum_factor", "active")
     9.8  
     9.9  if #area.name < 1 then
    9.10    slot.select("error", function()

    10.1 --- a/app/main/admin/_action/member_update.lua	Thu Jun 23 03:30:57 2016 +0200
    10.2 +++ b/app/main/admin/_action/member_update.lua	Sun Jul 15 14:07:29 2018 +0200
    10.3 @@ -2,7 +2,21 @@
    10.4  
    10.5  local member = Member:by_id(id) or Member:new()
    10.6  
    10.7 -param.update(member, "identification", "notify_email", "admin")
    10.8 +param.update(member, "identification", "admin")
    10.9 +
   10.10 +local notify_email = param.get("notify_email")
   10.11 +if notify_email == "" then
   10.12 +  notify_email = nil
   10.13 +end
   10.14 +
   10.15 +member.notify_email = notify_email
   10.16 +
   10.17 +local notify_email_unconfirmed = param.get("notify_email_unconfirmed")
   10.18 +if notify_email_unconfirmed == "" then
   10.19 +  notify_email_unconfirmed = nil
   10.20 +end
   10.21 +
   10.22 +member.notify_email_unconfirmed = notify_email_unconfirmed
   10.23  
   10.24  local locked = param.get("locked", atom.boolean)
   10.25  if locked ~= nil then
   10.26 @@ -40,10 +54,18 @@
   10.27    local privilege = Privilege:new()
   10.28    privilege.member_id = member.id
   10.29    privilege.unit_id = config.single_unit_id
   10.30 +  privilege.initiative_right = true
   10.31    privilege.voting_right = true
   10.32    privilege:save()
   10.33  end
   10.34  
   10.35 +if not id then
   10.36 +  local profile = MemberProfile:new()
   10.37 +  profile.member_id = member.id
   10.38 +  profile.profile = json.object()
   10.39 +  profile:save()
   10.40 +end
   10.41 +
   10.42  local units = Unit:new_selector()
   10.43    :add_field("privilege.member_id NOTNULL", "privilege_exists")
   10.44    :add_field("privilege.voting_right", "voting_right")

    11.1 --- a/app/main/admin/_action/policy_update.lua	Thu Jun 23 03:30:57 2016 +0200
    11.2 +++ b/app/main/admin/_action/policy_update.lua	Sun Jul 15 14:07:29 2018 +0200
    11.3 @@ -4,8 +4,8 @@
    11.4    policy, 
    11.5    "index", "name", "description", "active", 
    11.6    "min_admission_time", "max_admission_time", "discussion_time", "verification_time", "voting_time", 
    11.7 -  "issue_quorum_num", "issue_quorum_den", 
    11.8 -  "initiative_quorum_num", "initiative_quorum_den", 
    11.9 +  "issue_quorum", "issue_quorum_num", "issue_quorum_den",
   11.10 +  "initiative_quorum", "initiative_quorum_num", "initiative_quorum_den", 
   11.11    "direct_majority_num", "direct_majority_den", "direct_majority_strict", "direct_majority_positive", "direct_majority_non_negative",
   11.12    "indirect_majority_num", "indirect_majority_den", "indirect_majority_strict", "indirect_majority_positive", "indirect_majority_non_negative",
   11.13    "no_reverse_beat_path", "no_multistage_majority", "polling"

    12.1 --- a/app/main/admin/_filter/90_admin.lua	Thu Jun 23 03:30:57 2016 +0200
    12.2 +++ b/app/main/admin/_filter/90_admin.lua	Sun Jul 15 14:07:29 2018 +0200
    12.3 @@ -1,5 +1,5 @@
    12.4  if not app.session.member.admin then
    12.5 -  error('access denied')
    12.6 +  return execute.view { module = "index", view = "403" }
    12.7  end
    12.8  
    12.9  if config.admin_logger then

    13.1 --- a/app/main/admin/area_show.lua	Thu Jun 23 03:30:57 2016 +0200
    13.2 +++ b/app/main/admin/area_show.lua	Sun Jul 15 14:07:29 2018 +0200
    13.3 @@ -63,6 +63,11 @@
    13.4                            connecting_records = area.allowed_policies or {},
    13.5                            foreign_reference  = "id",
    13.6          }
    13.7 +        ui.field.text{    label = _"Admission quorum standard", name = "quorum_standard", value = hint and 10 or nil }
    13.8 +        ui.field.text{    label = _"Admission quorum issues", name = "quorum_issues", value = hint and 10 or nil }
    13.9 +        ui.field.text{    label = _"Admission quorum time", name = "quorum_time", value = hint and "60 days" or nil }
   13.10 +        ui.field.text{    label = _"Admission quorum exponent", name = "quorum_exponent", value = hint and 0.5 or nil }
   13.11 +        ui.field.text{    label = _"Admission qourum factor", name = "quorum_factor", value = hint and 2 or nil }
   13.12          slot.put("<br /><br />")
   13.13          ui.field.boolean{ label = _"Active?",     name = "active", value = hint and true or nil }
   13.14          ui.submit{ text = _"update area" }

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/app/main/admin/invite_list.lua	Sun Jul 15 14:07:29 2018 +0200
    14.3 @@ -0,0 +1,18 @@
    14.4 +local members = Member:new_selector():exec()
    14.5 +
    14.6 +ui.list{
    14.7 +  records = members,
    14.8 +  columns = {
    14.9 +    {
   14.10 +      name = "id",
   14.11 +    },
   14.12 +    {
   14.13 +      name = "invite_code",
   14.14 +    },
   14.15 +    {
   14.16 +      content = function(member)
   14.17 +        ui.link{ content = _"Invite letter",  module = "admin", view = "invite_pdf", id = member.id }
   14.18 +      end
   14.19 +    }
   14.20 +  }
   14.21 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/app/main/admin/invite_pdf.lua	Sun Jul 15 14:07:29 2018 +0200
    15.3 @@ -0,0 +1,25 @@
    15.4 +local id = param.get_id()
    15.5 +
    15.6 +local member = Member:by_id(id)
    15.7 +
    15.8 +
    15.9 +local luatex = require("luatex")
   15.10 +luatex.temp_dir = WEBMCP_BASE_PATH .. "tmp"
   15.11 +
   15.12 +local tex = luatex.new_document()
   15.13 +
   15.14 +local template = config.invitation.template
   15.15 +
   15.16 +if type(template) == "function" then
   15.17 +  template = template(member)
   15.18 +else
   15.19 +  template = template:gsub("#{invite_code}", member.invite_code)
   15.20 +  template = template:gsub("#{url}", request.get_absolute_baseurl())
   15.21 +end
   15.22 +
   15.23 +tex(template)
   15.24 +
   15.25 +local pdf = tex:get_pdf()
   15.26 +
   15.27 +slot.set_layout(nil, "application/pdf")
   15.28 +slot.put_into("data", pdf)

    16.1 --- a/app/main/admin/member_edit.lua	Thu Jun 23 03:30:57 2016 +0200
    16.2 +++ b/app/main/admin/member_edit.lua	Sun Jul 15 14:07:29 2018 +0200
    16.3 @@ -41,7 +41,8 @@
    16.4    
    16.5      ui.sectionRow( function()
    16.6        ui.field.text{     label = _"Identification", name = "identification" }
    16.7 -      ui.field.text{     label = _"Notification email", name = "notify_email" }
    16.8 +      ui.field.text{     label = _"Notification email (confirmed)", name = "notify_email" }
    16.9 +      ui.field.text{     label = _"Notification email (unconfirmed)", name = "notify_email_unconfirmed" }
   16.10        if member and member.activated then
   16.11          ui.field.text{     label = _"Screen name",        name = "name" }
   16.12        end

    17.1 --- a/app/main/admin/policy_show.lua	Thu Jun 23 03:30:57 2016 +0200
    17.2 +++ b/app/main/admin/policy_show.lua	Sun Jul 15 14:07:29 2018 +0200
    17.3 @@ -38,9 +38,11 @@
    17.4          ui.field.text{ label = _"Verification time",  name = "verification_time", value = hint and "15 days" or nil }
    17.5          ui.field.text{ label = _"Voting time",        name = "voting_time", value = hint and "15 days" or nil }
    17.6  
    17.7 -        ui.field.text{ label = _"Issue quorum numerator",   name = "issue_quorum_num", value = hint and "10" or nil }
    17.8 -        ui.field.text{ label = _"Issue quorum denominator", name = "issue_quorum_den", value = hint and "100" or nil }
    17.9 +        ui.field.text{ label = _"Issue quorum",   name = "issue_quorum", value = hint and "1" or nil }
   17.10 +        ui.field.text{ label = _"Issue quorum numerator",   name = "issue_quorum_num", value = hint and "1" or nil }
   17.11 +        ui.field.text{ label = _"Issue quorum denominator",   name = "issue_quorum_den", value = hint and "10" or nil }
   17.12  
   17.13 +        ui.field.text{ label = _"Initiative quorum absolute",   name = "initiative_quorum", value = hint and "1" or nil }
   17.14          ui.field.text{ label = _"Initiative quorum numerator",   name = "initiative_quorum_num", value = hint and "10" or nil }
   17.15          ui.field.text{ label = _"Initiative quorum denominator", name = "initiative_quorum_den", value = hint and "100" or nil }
   17.16  

    18.1 --- a/app/main/admin/unit_edit.lua	Thu Jun 23 03:30:57 2016 +0200
    18.2 +++ b/app/main/admin/unit_edit.lua	Sun Jul 15 14:07:29 2018 +0200
    18.3 @@ -1,5 +1,7 @@
    18.4  local id = param.get_id()
    18.5  
    18.6 +local hint = not id
    18.7 +
    18.8  local unit = Unit:by_id(id)
    18.9  
   18.10  ui.titleAdmin(_"Organizational unit")
   18.11 @@ -40,7 +42,7 @@
   18.12        ui.field.text{     label = _"Name",         name = "name" }
   18.13        ui.field.text{     label = _"Description",  name = "description", multiline = true }
   18.14        ui.field.text{     label = _"External reference",  name = "external_reference" }
   18.15 -      ui.field.boolean{  label = _"Active?",      name = "active" }
   18.16 +      ui.field.boolean{  label = _"Active?",      name = "active", value = hint and true or nil }
   18.17  
   18.18        slot.put("<br />")
   18.19        ui.submit{         text  = _"update unit" }

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/app/main/admin/verification.lua	Sun Jul 15 14:07:29 2018 +0200
    19.3 @@ -0,0 +1,134 @@
    19.4 +local verification = Verification:by_id(param.get_id())
    19.5 +
    19.6 +local data = {}
    19.7 +
    19.8 +for i, field in ipairs(config.verification.fields) do
    19.9 +  table.insert(data, {
   19.10 +    label = field.label,
   19.11 +    value = verification.request_data[field.name]
   19.12 +  })
   19.13 +end
   19.14 +
   19.15 +table.insert(data, {
   19.16 +  label = _"IP address",
   19.17 +  value = verification.request_origin.ip
   19.18 +})
   19.19 +
   19.20 +table.insert(data, {
   19.21 +  label = _"Hostname",
   19.22 +  value = verification.request_origin.hostname
   19.23 +})
   19.24 +
   19.25 +if verification.verified then
   19.26 +  table.insert(data, {
   19.27 +    label = _"Requested at",
   19.28 +    value = format.timestamp(verification.requested)
   19.29 +  })
   19.30 +end
   19.31 +
   19.32 +if verification.requesting_member_id then
   19.33 +  table.insert(data, {
   19.34 +    label = _"Requested by account",
   19.35 +    value = verification.requesting_member_id
   19.36 +  })
   19.37 +end
   19.38 +
   19.39 +if verification.verified then
   19.40 +  table.insert(data, {
   19.41 +    label = _"Verified at",
   19.42 +    value = format.timestamp(verification.verified)
   19.43 +  })
   19.44 +end
   19.45 +
   19.46 +if verification.denied then
   19.47 +  table.insert(data, {
   19.48 +    label = _"Denied at",
   19.49 +    value = format.timestamp(verification.denied)
   19.50 +  })
   19.51 +end
   19.52 +
   19.53 +if verification.verifying_member_id then
   19.54 +  table.insert(data, {
   19.55 +    label = _"Verified by account",
   19.56 +    value = verification.verifying_member_id
   19.57 +  })
   19.58 +end
   19.59 +
   19.60 +if verification.comment then
   19.61 +  table.insert(data, {
   19.62 +    label = _"Comment",
   19.63 +    value = verification.comment
   19.64 +  })
   19.65 +end
   19.66 +
   19.67 +if verification.verified_member_id then
   19.68 +  table.insert(data, {
   19.69 +    label = _"Used by account",
   19.70 +    value = verification.veried_member_id
   19.71 +  })
   19.72 +end
   19.73 +
   19.74 +ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
   19.75 +  ui.list{
   19.76 +    attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" },
   19.77 +    records = data,
   19.78 +    columns = {
   19.79 +      {
   19.80 +        label_attr = { class = "mdl-data-table__cell--non-numeric" },
   19.81 +        field_attr = { class = "mdl-data-table__cell--non-numeric" },
   19.82 +        label = _"Field",
   19.83 +        content = function(record)
   19.84 +          ui.tag{ content = record.label }
   19.85 +        end
   19.86 +      },
   19.87 +      {
   19.88 +        label_attr = { class = "mdl-data-table__cell--non-numeric" },
   19.89 +        field_attr = { class = "mdl-data-table__cell--non-numeric" },
   19.90 +        label = _"Value",
   19.91 +        content = function(record)
   19.92 +          ui.tag{ content = record.value }
   19.93 +        end
   19.94 +      },
   19.95 +    }
   19.96 +  }
   19.97 +end }
   19.98 +
   19.99 +if not verification.verification_data and not verification.denied then
  19.100 +  ui.form{
  19.101 +    module = "admin", action = "verification_update", id = verification.id,
  19.102 +    record = verification,
  19.103 +    content = function()
  19.104 +      ui.field.text{ 
  19.105 +        container_attr = { class = "mdl-textfield mdl-js-textfield mdl-textfield--floating-label" },
  19.106 +        attr = { id = "lf-verification_data", class = "mdl-textfield__input" },
  19.107 +        label = _"Verification data",
  19.108 +        name = "verification_data"
  19.109 +      }
  19.110 +      slot.put("<br /><br />")
  19.111 +      ui.tag{
  19.112 +        tag = "input",
  19.113 +        attr = {
  19.114 +          type = "submit",
  19.115 +          class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
  19.116 +          value = _"Verify account"
  19.117 +        }
  19.118 +      }
  19.119 +      slot.put(" &nbsp; ")
  19.120 +      ui.tag{
  19.121 +        tag = "input",
  19.122 +        attr = {
  19.123 +          type = "submit",
  19.124 +          name = "deny",
  19.125 +          class = "mdl-button mdl-js-button mdl-button--raised mdl-button--accent",
  19.126 +          value = _"Deny request"
  19.127 +        }
  19.128 +      }
  19.129 +      slot.put(" &nbsp; ")
  19.130 +      ui.link{ 
  19.131 +        attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
  19.132 +        content = _"Cancel", 
  19.133 +        module = "admin", view = "verification_list"
  19.134 +      }
  19.135 +    end
  19.136 +  }
  19.137 +end

    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/app/main/admin/verification_list.lua	Sun Jul 15 14:07:29 2018 +0200
    20.3 @@ -0,0 +1,70 @@
    20.4 +ui.heading{ level = 1, content = _"Verification requests" }
    20.5 +
    20.6 +if not config.verification or not config.verification.fields then
    20.7 +  return
    20.8 +end
    20.9 +
   20.10 +
   20.11 +local columns = {}
   20.12 +
   20.13 +for i, field in ipairs(config.verification.fields) do
   20.14 +  table.insert(columns, {
   20.15 +    label_attr = { class = "mdl-data-table__cell--non-numeric" },
   20.16 +    field_attr = { class = "mdl-data-table__cell--non-numeric" },
   20.17 +    label = field.label,
   20.18 +    content = function(record)
   20.19 +      ui.tag{ content = record.request_data[field.name] }
   20.20 +    end
   20.21 +  })
   20.22 +end
   20.23 +
   20.24 +table.insert(columns, {
   20.25 +  label = _"verified",
   20.26 +  name = "verified"
   20.27 +})
   20.28 +
   20.29 +table.insert(columns, {
   20.30 +  label = _"denied",
   20.31 +  name = "denied"
   20.32 +})
   20.33 +
   20.34 +table.insert(columns, {
   20.35 +  content = function(record)
   20.36 +    ui.link{ content = _"show", module = "admin", view = "verification", id = record.id }
   20.37 +  end
   20.38 +})
   20.39 +
   20.40 +local new_verifications = Verification:new_selector():add_where("verified ISNULL and denied ISNULL"):exec()
   20.41 +local verified_verifications = Verification:new_selector():add_where("verified NOTNULL"):exec()
   20.42 +local denied_verifications = Verification:new_selector():add_where("denied NOTNULL"):exec()
   20.43 +
   20.44 +ui.container{ attr = { class = "mdl-tabs mdl-js-tabs mdl-js-ripple-effect" }, content = function()
   20.45 +  ui.container{ attr = { class = "mdl-tabs__tab-bar" }, content = function()
   20.46 +    ui.link{ content = _"new requests", external = "#new_requests", attr = { class = "mdl-tabs__tab is-active" } }
   20.47 +    ui.link{ content = _"verified", external = "#verified", attr = { class = "mdl-tabs__tab" } }
   20.48 +    ui.link{ content = _"denied", external = "#denied", attr = { class = "mdl-tabs__tab" } }
   20.49 +  end }
   20.50 +  slot.put("<br />")
   20.51 +  ui.container{ attr = { class = "mdl-tabs__panel is-active", id = "new_requests" }, content = function()
   20.52 +    ui.list{
   20.53 +      records = new_verifications,
   20.54 +      attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" },
   20.55 +      columns = columns
   20.56 +    }
   20.57 +  end }
   20.58 +  ui.container{ attr = { class = "mdl-tabs__panel", id = "verified" }, content = function()
   20.59 +    ui.list{
   20.60 +      records = verified_verifications,
   20.61 +      attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" },
   20.62 +      columns = columns
   20.63 +    }
   20.64 +  end }
   20.65 +  ui.container{ attr = { class = "mdl-tabs__panel", id = "denied" }, content = function()
   20.66 +    ui.list{
   20.67 +      records = denied_verifications,
   20.68 +      attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" },
   20.69 +      columns = columns
   20.70 +    }
   20.71 +  end }
   20.72 +end }
   20.73 +

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/app/main/agent/_action/accept.lua	Sun Jul 15 14:07:29 2018 +0200
    21.3 @@ -0,0 +1,26 @@
    21.4 +local controlled_id = param.get("controlled_id")
    21.5 +
    21.6 +local agent = Agent:by_pk(controlled_id, app.session.member_id)
    21.7 +
    21.8 +if not agent then
    21.9 +  print("A")
   21.10 +  return false
   21.11 +end
   21.12 +
   21.13 +if agent.accepted ~= nil then
   21.14 +  print("B")
   21.15 +  return false
   21.16 +end
   21.17 +
   21.18 +if param.get("rejected") then
   21.19 +  print("C")
   21.20 +  agent.accepted = false
   21.21 +elseif param.get("accepted") then
   21.22 +  print("D")
   21.23 +  agent.accepted = true
   21.24 +else
   21.25 +  print("E")
   21.26 +  return false
   21.27 +end
   21.28 +print("F")
   21.29 +agent:save()

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/app/main/agent/show.lua	Sun Jul 15 14:07:29 2018 +0200
    22.3 @@ -0,0 +1,100 @@
    22.4 +local controlled_id = param.get("controlled_id")
    22.5 +
    22.6 +
    22.7 +ui.titleMember(_"Account access")
    22.8 +
    22.9 +ui.grid{ content = function()
   22.10 +
   22.11 +  ui.cell_main{ content = function()
   22.12 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   22.13 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   22.14 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Account access" }
   22.15 +      end }
   22.16 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
   22.17 +      
   22.18 +        local agent = Agent:new_selector()
   22.19 +          :add_where{ "controller_id = ?", app.session.member_id }
   22.20 +          :add_where{ "controlled_id = ?", controlled_id }
   22.21 +          :optional_object_mode()
   22.22 +          :exec()
   22.23 +
   22.24 +        if agent then
   22.25 +          
   22.26 +          if agent.accepted == nil then
   22.27 +            ui.container{ content = _"You have been granted access privileges for the following account:" }
   22.28 +          elseif agent.accepted == true then
   22.29 +            ui.container{ content = _"You have accepted access privileges for the following account:" }
   22.30 +          elseif agent.accepted == false then
   22.31 +            ui.container{ content = _"You have rejected access privileges for the following account:" }
   22.32 +          end
   22.33 +          
   22.34 +          slot.put("<br>")
   22.35 +          ui.link{
   22.36 +            content = agent.controllee.display_name,
   22.37 +            module = "member", view = "show", id = agent.controlled_id
   22.38 +          }
   22.39 +          slot.put("<br><br>")
   22.40 +      
   22.41 +          ui.form{
   22.42 +            attr = { class = "wide" },
   22.43 +            module = "agent",
   22.44 +            action = "accept",
   22.45 +            params = { controlled_id = controlled_id },
   22.46 +            routing = {
   22.47 +              ok = {
   22.48 +                mode = "redirect",
   22.49 +                module = "agent",
   22.50 +                view = "show",
   22.51 +                params = { controlled_id = controlled_id },
   22.52 +              }
   22.53 +            },
   22.54 +            content = function()
   22.55 +            
   22.56 +              if agent.accepted == nil then
   22.57 +                ui.tag{
   22.58 +                  tag = "input",
   22.59 +                  attr = {
   22.60 +                    type = "submit",
   22.61 +                    class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
   22.62 +                    value = _"Accept access privilege",
   22.63 +                    name = "accepted"
   22.64 +                  },
   22.65 +                  content = ""
   22.66 +                }
   22.67 +                slot.put(" &nbsp; ")
   22.68 +                ui.tag{
   22.69 +                  tag = "input",
   22.70 +                  attr = {
   22.71 +                    type = "submit",
   22.72 +                    class = "mdl-button mdl-js-button mdl-button--raised",
   22.73 +                    value = _"Reject access privilege",
   22.74 +                    name = "rejected"
   22.75 +                  },
   22.76 +                  content = ""
   22.77 +                }
   22.78 +              end
   22.79 +              slot.put(" &nbsp; ")
   22.80 +              ui.link {
   22.81 +                attr = { class = "mdl-button mdl-js-button" },
   22.82 +                module = "index", view = "index",
   22.83 +                content = _"Cancel"
   22.84 +              }
   22.85 +            end
   22.86 +          }
   22.87 +
   22.88 +        end
   22.89 +
   22.90 +      end }
   22.91 +    end }
   22.92 +  end }
   22.93 +
   22.94 +  ui.cell_sidebar{ content = function()
   22.95 +    execute.view {
   22.96 +      module = "member", view = "_sidebar_whatcanido", params = {
   22.97 +        member = app.session.member
   22.98 +      }
   22.99 +    }
  22.100 +  end }
  22.101 +  
  22.102 +end }
  22.103 +      

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/app/main/api/_filter/30_auth.lua	Sun Jul 15 14:07:29 2018 +0200
    23.3 @@ -0,0 +1,48 @@
    23.4 +local public_access_scopes = {
    23.5 +  anonymous = "read_contents",
    23.6 +  authors_pseudonymous = "read_contents read_authors",
    23.7 +  all_pseudonymous = "read_contents read_authors read_ratings",
    23.8 +  everything = "read_contents read_authors read_ratings read_identities read_profiles"
    23.9 +}
   23.10 +
   23.11 +local access_token, access_token_err = util.get_access_token()
   23.12 +
   23.13 +if access_token_err then
   23.14 +  if access_token_err == "header_and_param" then
   23.15 +    return util.api_error(400, "Unauthorized", "invalid_request", "Access token passed both via header and param")
   23.16 +  end
   23.17 +  return util.api_error(500, "Internal server error", "internal_error", "Internal server error")
   23.18 +end
   23.19 +
   23.20 +local scope
   23.21 +
   23.22 +if access_token then
   23.23 +  local token = Token:by_token_type_and_token("access", access_token)
   23.24 +  if token then
   23.25 +    app.access_token = token
   23.26 +    scope = token.scope
   23.27 +  else
   23.28 +    return util.api_error(401, "Unauthorized", "invalid_token", "The access token is invalid or expired")
   23.29 +  end
   23.30 +end
   23.31 +
   23.32 +if not scope then
   23.33 +  scope = public_access_scopes[config.public_access]
   23.34 +end
   23.35 +
   23.36 +if not scope then
   23.37 +  return util.api_error(403, "Forbidden", "insufficient_scope", "Public access is not allowed at this instance.")
   23.38 +end
   23.39 +
   23.40 +app.scopes = {}
   23.41 +
   23.42 +for scope in string.gmatch(scope, "[^ ]+") do
   23.43 +  local match = string.match(scope, "(.+)_detached")
   23.44 +  app.scopes[match or scope] = true
   23.45 +end
   23.46 +
   23.47 +if not next(app.scopes) then
   23.48 +  return util.api_error(403, "Forbidden", "insufficient_scope", "No valid scope found")
   23.49 +end
   23.50 +
   23.51 +execute.inner()

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/app/main/api/_issue.lua	Sun Jul 15 14:07:29 2018 +0200
    24.3 @@ -0,0 +1,22 @@
    24.4 +local issues = param.get("issues", "table")
    24.5 +
    24.6 +
    24.7 +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" }
    24.8 +
    24.9 +local r = json.array()
   24.10 +
   24.11 +for i, issue in ipairs(issues) do
   24.12 +  local ir = json.object()
   24.13 +  for j, field in ipairs(fields) do
   24.14 +    local value = issue[field]
   24.15 +    if value == nil then
   24.16 +      value = json.null
   24.17 +    else
   24.18 +      value = tostring(value)
   24.19 +    end
   24.20 +    ir[field] = value
   24.21 +  end
   24.22 +  r[#r+1] = ir
   24.23 +end
   24.24 +
   24.25 +return r

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/app/main/api/_member.lua	Sun Jul 15 14:07:29 2018 +0200
    25.3 @@ -0,0 +1,45 @@
    25.4 +local members = param.get("members", "table")
    25.5 +
    25.6 +local include_profile = param.get("include_profile", atom.boolean)
    25.7 +
    25.8 +if include_profile and not app.scopes.read_profiles then
    25.9 +  return util.api_error(403, "Forbidden", "insufficient_scope", "Scope read_profiles required")
   25.10 +end
   25.11 +
   25.12 +local fields = {}
   25.13 +
   25.14 +if app.scopes.read_authors or app.scopes.read_identities then
   25.15 +  fields = { "id", "created", "last_activity", "admin", "name", "location" }
   25.16 +end
   25.17 +
   25.18 +if app.scopes.read_identities then
   25.19 +  fields[#fields+1] = "identification"
   25.20 +end
   25.21 +
   25.22 +local r = json.array()
   25.23 +
   25.24 +if app.scopes.read_identities then
   25.25 +  
   25.26 +  if include_profile then
   25.27 +    members:load("profile")
   25.28 +  end
   25.29 +
   25.30 +  for i, member in ipairs(members) do
   25.31 +    local m = json.object()
   25.32 +    for j, field in ipairs(fields) do
   25.33 +      local value = member[field]
   25.34 +      if value == nil then
   25.35 +        value = json.null
   25.36 +      else
   25.37 +        value = tostring(value)
   25.38 +      end
   25.39 +      m[field] = value
   25.40 +    end
   25.41 +    if include_profile then
   25.42 +      m.profile = execute.chunk{ module = "api", chunk = "_profile", params = { profile = member.profile } }
   25.43 +    end
   25.44 +    r[#r+1] = m
   25.45 +  end
   25.46 +end
   25.47 +
   25.48 +return r

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/app/main/api/_profile.lua	Sun Jul 15 14:07:29 2018 +0200
    26.3 @@ -0,0 +1,22 @@
    26.4 +local profile = param.get("profile", "table")
    26.5 +
    26.6 +local r = json.object()
    26.7 +
    26.8 +for i, field in ipairs(config.member_profile_fields) do
    26.9 +  if profile.profile[field.id] then
   26.10 +    r[field.id] = profile.profile[field.id] or json.null
   26.11 +  end
   26.12 +end
   26.13 +--[[
   26.14 +if profile.statement then
   26.15 +  if request.get_param{ name = "statement_format" } == "html" then
   26.16 +    r.statement = profile:get_content("html")
   26.17 +    r.statement_format = "html"
   26.18 +  else
   26.19 +    r.statement = profile.statement
   26.20 +    r.statement_format = profile.formatting_engine
   26.21 +  end
   26.22 +end
   26.23 +--]]
   26.24 +
   26.25 +return r

    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/app/main/api/_settings.lua	Sun Jul 15 14:07:29 2018 +0200
    27.3 @@ -0,0 +1,11 @@
    27.4 +local settings = param.get("settings", "table")
    27.5 +
    27.6 +local r = json.object()
    27.7 +
    27.8 +for i, field in ipairs(config.member_settings_fields) do
    27.9 +  if settings.settings[field.id] ~= nil then
   27.10 +    r[field.id] = settings.settings[field.id]
   27.11 +  end
   27.12 +end
   27.13 +
   27.14 +return r

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/app/main/api/application.lua	Sun Jul 15 14:07:29 2018 +0200
    28.3 @@ -0,0 +1,40 @@
    28.4 +slot.set_layout(nil, "application/json")
    28.5 +
    28.6 +local r = json.array()
    28.7 +
    28.8 +local system_applications = SystemApplication:get_all()
    28.9 +
   28.10 +r[#r+1] = json.object{
   28.11 +  type = "system",
   28.12 +  name = "LiquidFeedback",
   28.13 +  base_url = request.get_absolute_baseurl(),
   28.14 +  manifest_url = request.get_absolute_baseurl() .. "api/1/info",
   28.15 +  cert_common_name = config.oauth2.cert_common_name
   28.16 +}
   28.17 +
   28.18 +for i, system_application in ipairs(system_applications) do
   28.19 +  r[#r+1] = json.object{
   28.20 +    type = "system",
   28.21 +    name = system_application.name,
   28.22 +    base_url = system_application.base_url,
   28.23 +    manifest_url = system_application.manifest_url,
   28.24 +    cert_common_name = system_application.cert_common_name
   28.25 +  }
   28.26 +end
   28.27 +
   28.28 +if app.access_token then
   28.29 +
   28.30 +  local member_applications = MemberApplication:by_member_id_with_domain(app.access_token.member_id)
   28.31 +
   28.32 +  for i, member_application in ipairs(member_applications) do
   28.33 +    r[#r+1] = json.object{
   28.34 +      type = "dynamic",
   28.35 +      name = "https://" .. member_application.domain .. "/",
   28.36 +      base_url = "https://" .. member_application.domain .. "/",
   28.37 +      manifest_url = "https://" .. member_application.domain .. "/" .. config.oauth2.manifest_magic
   28.38 +    }
   28.39 +  end
   28.40 +
   28.41 +end
   28.42 +
   28.43 +slot.put_into("data", json.export(json.object{ result = r }))

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/app/main/api/event.lua	Sun Jul 15 14:07:29 2018 +0200
    29.3 @@ -0,0 +1,132 @@
    29.4 +slot.set_layout(nil, "application/json")
    29.5 +
    29.6 +local r = json.object{
    29.7 +  result = json.array{}
    29.8 +}
    29.9 +
   29.10 +local selector = Event:new_selector()
   29.11 +
   29.12 +local member_id = param.get("member_id", atom.integer)
   29.13 +local other_member_id = param.get("member_id", atom.integer)
   29.14 +local scope = param.get("scope")
   29.15 +local issue_id = param.get("issue_id", atom.integer)
   29.16 +local state = param.get("state")
   29.17 +local initiative_id = param.get("initiative_id", atom.integer)
   29.18 +
   29.19 +local include_members = param.get("include_members", atom.boolean)
   29.20 +local include_other_members = param.get("include_other_members", atom.boolean)
   29.21 +local include_profile = param.get("include_profile", atom.boolean)
   29.22 +local include_issues = param.get("include_issues", atom.boolean)
   29.23 +local include_initiatives = param.get("include_initiatives", atom.boolean)
   29.24 +local include_drafts = param.get("include_drafts", atom.boolean)
   29.25 +local include_suggestions = param.get("include_suggestions", atom.boolean)
   29.26 +
   29.27 +if member_id then
   29.28 +  selector:add_where{ "member_id = ?", member_id }
   29.29 +end
   29.30 +
   29.31 +if other_member_id then
   29.32 +  selector:add_where{ "other_member_id = ?", other_member_id }
   29.33 +end
   29.34 +
   29.35 +if scope then
   29.36 +  selector:add_where{ "scope = ?", scope }
   29.37 +end
   29.38 +
   29.39 +if issue_id then
   29.40 +  selector:add_where{ "issue_id = ?", issue_id }
   29.41 +end
   29.42 +
   29.43 +if scope then
   29.44 +  selector:add_where{ "scope = ?", scope }
   29.45 +end
   29.46 +
   29.47 +if initiative_id then
   29.48 +  selector:add_where{ "initiative_id = ?", initiative_id }
   29.49 +end
   29.50 +
   29.51 +selector:add_order_by("id DESC")
   29.52 +
   29.53 +local events = selector:exec()
   29.54 +
   29.55 +local member_ids = {}
   29.56 +local issue_ids = {}
   29.57 +local initiative_ids = {}
   29.58 +local draft_ids = {}
   29.59 +local suggestion_ids = {}
   29.60 +
   29.61 +for i, event in ipairs(events) do
   29.62 +  local e = json.object()
   29.63 +  e.id = event.id
   29.64 +  e.occurrence = format.timestamp(event.occurrence)
   29.65 +  e.event = event.event
   29.66 +  e.member_id = event.member_id
   29.67 +  e.other_member_id = event.other_member_id
   29.68 +  e.scope = event.scope
   29.69 +  e.issue_id = event.issue_id
   29.70 +  e.state = event.state
   29.71 +  e.initiative_id = event.initiative_id
   29.72 +  e.draft_id = event.draft_id
   29.73 +  e.suggestion_id = event.suggestion_id
   29.74 +  e.value = event.value
   29.75 +  if include_members and e.member_id then
   29.76 +    member_ids[e.member_id] = true
   29.77 +  end
   29.78 +  if include_other_members and e.other_member_id then
   29.79 +    member_ids[e.member_id] = true
   29.80 +  end
   29.81 +  if include_issues and e.issue_id then
   29.82 +    issue_ids[e.issue_id] = true
   29.83 +  end
   29.84 +  if include_initiatives and e.initiative_id then
   29.85 +    initiative_ids[e.initiative_id] = true
   29.86 +  end
   29.87 +  if include_drafts and e.draft_id then
   29.88 +    draft_ids[e.draft_id] = true
   29.89 +  end
   29.90 +  if include_suggestions and e.suggestion_id then
   29.91 +    suggestion_ids[e.suggestion_id] = true
   29.92 +  end
   29.93 +  r.result[#r.result+1] = e
   29.94 +end
   29.95 +
   29.96 +function util.keys_to_array(tbl)
   29.97 +  local r = {}
   29.98 +  for k, v in pairs(tbl) do
   29.99 +    r[#r+1] = k
  29.100 +  end
  29.101 +  return r
  29.102 +end
  29.103 +
  29.104 +function util.array_to_json_object(tbl, key)
  29.105 +  local r = json.object()
  29.106 +  for i, v in ipairs(tbl) do
  29.107 +    r[v[key]] = v
  29.108 +  end
  29.109 +  return r
  29.110 +end
  29.111 +
  29.112 +if next(member_ids) then
  29.113 +  local members = Member:by_ids(util.keys_to_array(member_ids))
  29.114 +  r.members = util.array_to_json_object(
  29.115 +    execute.chunk{ module = "api", chunk = "_member", params = { members = members, include_profile = include_profile } },
  29.116 +    "id"
  29.117 +  )
  29.118 +  if r.members == false then
  29.119 +    return
  29.120 +  end
  29.121 +end
  29.122 +
  29.123 +if next(issue_ids) then
  29.124 +  local issues = Issue:by_ids(util.keys_to_array(issue_ids))
  29.125 +  r.issues = util.array_to_json_object(
  29.126 +    execute.chunk{ module = "api", chunk = "_issue", params = { issues = issues } },
  29.127 +    "id"
  29.128 +  )
  29.129 +  if r.issues == false then
  29.130 +    return
  29.131 +  end
  29.132 +end
  29.133 +
  29.134 +
  29.135 +slot.put_into("data", json.export(r))

    30.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.2 +++ b/app/main/api/info.lua	Sun Jul 15 14:07:29 2018 +0200
    30.3 @@ -0,0 +1,53 @@
    30.4 +slot.set_layout(nil, "application/json")
    30.5 +
    30.6 +local scope_string
    30.7 +
    30.8 +local scopes_list = {}
    30.9 +for scope in pairs(app.scopes) do
   30.10 +  scopes_list[#scopes_list+1] = scope
   30.11 +end
   30.12 +local scopes_string = table.concat(scopes_list, " ")
   30.13 +
   30.14 +local result = {}
   30.15 +
   30.16 +local r = json.object{
   30.17 +    service = "LiquidFeedback",
   30.18 +    core_version = db:query("SELECT * from liquid_feedback_version;")[1].string,
   30.19 +    api_version = config.app_version,
   30.20 +    client_tls_dn = request.get_header("X-SSL-DN"),
   30.21 +    scope = scopes_string
   30.22 +}
   30.23 +
   30.24 +if app.scopes.identification or app.scopes.authentication then
   30.25 +  r.member_id = app.access_token.member_id
   30.26 +  if app.access_token.member.role then
   30.27 +    r.member_is_role = true
   30.28 +  end
   30.29 +  if app.access_token.session then
   30.30 +    r.real_member_id = app.access_token.session.real_member_id
   30.31 +  end
   30.32 +  if param.get("include_member", atom.boolean) then
   30.33 +    local member = app.access_token.member
   30.34 +    result.member = json.object{
   30.35 +      id = member.id,
   30.36 +      name = member.name
   30.37 +    }
   30.38 +    if app.access_token.session and app.access_token.session.real_member then
   30.39 +      result.real_member = json.object{
   30.40 +        id = app.access_token.session.real_member.id,
   30.41 +        name = app.access_token.session.real_member.name,
   30.42 +      }
   30.43 +    end
   30.44 +    if app.scopes.identification then
   30.45 +      result.member.identification = member.identification
   30.46 +      if app.access_token.session and app.access_token.session.real_member then
   30.47 +        result.real_member.identification = app.access_token.session.real_member.identification
   30.48 +      end
   30.49 +    end
   30.50 +  end
   30.51 +end
   30.52 +
   30.53 +result.result = r
   30.54 +
   30.55 +slot.put_into("data", json.export(result))
   30.56 +slot.put_into("data", "\n")

    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/app/main/api/instance.lua	Sun Jul 15 14:07:29 2018 +0200
    31.3 @@ -0,0 +1,33 @@
    31.4 +local navigation
    31.5 +
    31.6 +if param.get("include_navigation") then
    31.7 +  
    31.8 +  local items = config.meta_navigation_items_func(
    31.9 +    app.access_token and app.access_token.member or nil, 
   31.10 +    param.get("client_id"), 
   31.11 +    param.get("login_url")
   31.12 +  )
   31.13 +  
   31.14 +  navigation = json.array()
   31.15 +  for i, item in ipairs(items) do
   31.16 +    navigation[#navigation+1] = json.object{
   31.17 +      name        = item.name,
   31.18 +      description = item.description,
   31.19 +      url         = item.url,
   31.20 +      active      = item.active
   31.21 +    }
   31.22 +  end
   31.23 +
   31.24 +end
   31.25 +  
   31.26 +local result = json.object{
   31.27 +  name          = config.instance_name,
   31.28 +  slogan        = config.meta_navigation_slogan,
   31.29 +  home_url      = config.meta_navigation_home_url,
   31.30 +  logo_url      = config.meta_navigation_logo_url,
   31.31 +  logo_alt_text = config.meta_navigation_logo_alt_text,
   31.32 +  navigation    = navigation
   31.33 +}
   31.34 +
   31.35 +slot.set_layout(nil, "application/json")
   31.36 +slot.put_into("data", json.export(json.object{ result = result }))

    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/app/main/api/member.lua	Sun Jul 15 14:07:29 2018 +0200
    32.3 @@ -0,0 +1,20 @@
    32.4 +slot.set_layout(nil, "application/json")
    32.5 +
    32.6 +local r = json.object{
    32.7 +  result = json.array()
    32.8 +}
    32.9 +
   32.10 +local selector = Member:new_selector()
   32.11 +  :add_where("activated NOTNULL")
   32.12 +  :add_order_by("id")
   32.13 +
   32.14 +if param.get("id") then
   32.15 +  selector:add_where{ "id = ?", param.get("id") }
   32.16 +end
   32.17 +
   32.18 +local members = selector:exec()
   32.19 +local r.result = execute.chunk{ module = "api", chunk = "_member", params = { members = members } } 
   32.20 +
   32.21 +
   32.22 +slot.put_into("data", json.export(r))
   32.23 +slot.put_into("data", "\n")

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/app/main/api/navigation.lua	Sun Jul 15 14:07:29 2018 +0200
    33.3 @@ -0,0 +1,34 @@
    33.4 +local access_token = param.get("access_token")
    33.5 +local client_id = param.get("client_id")
    33.6 +local login_url = param.get("login_url")
    33.7 +local format = param.get("format")
    33.8 +
    33.9 +if format ~= "html" and format ~= "raw_html" then
   33.10 +  format = "json"
   33.11 +end
   33.12 +
   33.13 +local items = config.meta_navigation_items_func(app.access_token and app.access_token.member or nil, client_id, login_url)
   33.14 +
   33.15 +if format == "json" then
   33.16 +  slot.set_layout(nil, "application/json")
   33.17 +  local r = json.array()
   33.18 +  for i, item in ipairs(items) do
   33.19 +    r[#r+1] = json.object{
   33.20 +      name = item.name,
   33.21 +      description = item.description,
   33.22 +      url = item.url,
   33.23 +      active = item.active
   33.24 +    }
   33.25 +  end
   33.26 +  slot.put_into("data", json.export(json.object{ result = r }))
   33.27 +elseif format == "html" then
   33.28 +  slot.set_layout(nil, "application/json")
   33.29 +  local html = config.meta_navigation_style_func(items) .. config.meta_navigation_html_func(items) .. config.meta_navigation_script_func(items)
   33.30 +  slot.put_into("data", json.export(json.object{ result = html }))
   33.31 +elseif format == "raw_html" then
   33.32 +  slot.set_layout(nil, "text/html")
   33.33 +  local html = config.meta_navigation_style_func(items) .. config.meta_navigation_html_func(items) .. config.meta_navigation_script_func(items)
   33.34 +  slot.put_into("data", html)
   33.35 +end
   33.36 +
   33.37 +

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/app/main/api/notify_email.lua	Sun Jul 15 14:07:29 2018 +0200
    34.3 @@ -0,0 +1,16 @@
    34.4 +slot.set_layout(nil, "application/json")
    34.5 +
    34.6 +local r = json.object{}
    34.7 +
    34.8 +if not app.scopes.notify_email then
    34.9 +  return util.api_error(403, "Forbidden", "insufficient_scope", "Scope notify_email required")
   34.10 +end
   34.11 +
   34.12 +if app.access_token.member.notify_email ~= "" then
   34.13 +  r.notify_email = app.access_token.member.notify_email
   34.14 +else
   34.15 +  r.notify_email = json.null
   34.16 +end
   34.17 +
   34.18 +slot.put_into("data", json.export(json.object{ result = r }))
   34.19 +slot.put_into("data", "\n")

    35.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.2 +++ b/app/main/api/profile.lua	Sun Jul 15 14:07:29 2018 +0200
    35.3 @@ -0,0 +1,53 @@
    35.4 +slot.set_layout(nil, "application/json")
    35.5 +
    35.6 +local r = json.object{}
    35.7 +
    35.8 +if request.is_post() then
    35.9 +  if not app.scopes.update_profile then
   35.10 +    return util.api_error(403, "Forbidden", "insufficient_scope", "Scope update_profile required")
   35.11 +  end
   35.12 +  local profile = app.access_token.member.profile
   35.13 +  local fields = json.import(param.get("update"))
   35.14 +  if not fields then
   35.15 +    return util.api_error(400, "Bad Request", "profile_data_expected", "JSON object with updated profile data expected")
   35.16 +  end
   35.17 +  for i, field in ipairs(config.member_profile_fields) do
   35.18 +    if json.type(fields, field.id) ~= "nil" then
   35.19 +      local value = fields[field.id]
   35.20 +      if value ~= nil and (field.type == "string" or field.type == "text") and json.type(value) ~= "string" then
   35.21 +        return util.api_error(400, "Bad Request", "string_expected", "JSON encoded string value expected")
   35.22 +      end
   35.23 +      profile.profile[field.id] = value
   35.24 +    end
   35.25 +  end
   35.26 +  profile:save()
   35.27 +  r.status = 'ok'
   35.28 +  slot.put_into("data", json.export(r))
   35.29 +  slot.put_into("data", "\n")
   35.30 +else
   35.31 +  local member_id = tonumber(param.get("member_id"))
   35.32 +  local profile
   35.33 +  if member_id then
   35.34 +    if not app.scopes.read_profiles then
   35.35 +      return util.api_error(403, "Forbidden", "insufficient_scope", "Scope profile required")
   35.36 +    end
   35.37 +    local member = Member:by_id(member_id)
   35.38 +    if not member then
   35.39 +      return util.api_error(400, "Bad Request", "member_not_found", "No member with requested member_id")
   35.40 +    end
   35.41 +    profile = member.profile
   35.42 +  elseif app.access_token then
   35.43 +    if not app.scopes.profile and not app.scopes.read_profiles then
   35.44 +      return util.api_error(403, "Forbidden", "insufficient_scope", "Scope profile required")
   35.45 +    end
   35.46 +    profile = app.access_token.member.profile
   35.47 +  else
   35.48 +    return util.api_error(400, "Bad Request", "no_member_id", "No member_id requested")
   35.49 +  end
   35.50 +  if profile then
   35.51 +    r = execute.chunk{ module = "api", chunk = "_profile", params = { profile = profile } }
   35.52 +  end
   35.53 +  slot.put_into("data", json.export(json.object{ result = r }))
   35.54 +  slot.put_into("data", "\n")
   35.55 +end
   35.56 +

    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/app/main/api/profile_info.lua	Sun Jul 15 14:07:29 2018 +0200
    36.3 @@ -0,0 +1,16 @@
    36.4 +slot.set_layout(nil, "application/json")
    36.5 +
    36.6 +local r = json.object()
    36.7 +
    36.8 +r.result = json.array()
    36.9 +for i, field in ipairs(config.member_profile_fields) do
   36.10 +  table.insert(r.result, json.object{
   36.11 +    id = field.id,
   36.12 +    name = field.name,
   36.13 +    type = field.type
   36.14 +  })
   36.15 +end
   36.16 +
   36.17 +slot.put_into("data", json.export(r))
   36.18 +slot.put_into("data", "\n")
   36.19 +

    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/app/main/api/settings.lua	Sun Jul 15 14:07:29 2018 +0200
    37.3 @@ -0,0 +1,50 @@
    37.4 +slot.set_layout(nil, "application/json")
    37.5 +
    37.6 +if not app.access_token then
    37.7 +  return util.api_error(400, "Forbidden", "insufficient_scope", "Scope 'settings' required")
    37.8 +end
    37.9 +
   37.10 +local r = json.object{}
   37.11 +
   37.12 +if request.is_post() then
   37.13 +  if not app.scopes.update_settings then
   37.14 +    return util.api_error(403, "Forbidden", "insufficient_scope", "Scope update_settings required")
   37.15 +  end
   37.16 +  local settings = app.access_token.member.settings
   37.17 +  if not settings then
   37.18 +    settings = MemberSettings:new()
   37.19 +    settings.member_id = app.access_token.member_id
   37.20 +    settings.settings = json.object()
   37.21 +  end
   37.22 +  local fields = json.import(param.get("update"))
   37.23 +  if not fields then
   37.24 +    return util.api_error(400, "Bad Request", "settings_data_expected", "JSON object with updated settings data expected")
   37.25 +  end
   37.26 +  for i, field in ipairs(config.member_settings_fields) do
   37.27 +    if json.type(fields, field.id) ~= "nil" then
   37.28 +      local value = fields[field.id]
   37.29 +      if value ~= nil then
   37.30 +        if (field.type == "string" or field.type == "text") and json.type(value) ~= "string" then
   37.31 +          return util.api_error(400, "Bad Request", "string_expected", "JSON encoded string value expected")
   37.32 +        end
   37.33 +        if (field.type == "boolean") and json.type(value) ~= "boolean" then
   37.34 +          return util.api_error(400, "Bad Request", "boolean_expected", "JSON encoded boolean value expected")
   37.35 +        end
   37.36 +      end
   37.37 +      settings.settings[field.id] = value
   37.38 +    end
   37.39 +  end
   37.40 +  settings:save()
   37.41 +  r.status = 'ok'
   37.42 +  slot.put_into("data", json.export(r))
   37.43 +  slot.put_into("data", "\n")
   37.44 +else
   37.45 +  if not app.scopes.settings then
   37.46 +    return util.api_error(403, "Forbidden", "insufficient_scope", "Scope 'settings' required")
   37.47 +  end
   37.48 +  local settings = app.access_token.member.settings or json.object()
   37.49 +  r = execute.chunk{ module = "api", chunk = "_settings", params = { settings = settings } }
   37.50 +  slot.put_into("data", json.export(json.object{ result = r }))
   37.51 +  slot.put_into("data", "\n")
   37.52 +end
   37.53 +

    38.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.2 +++ b/app/main/api/settings_info.lua	Sun Jul 15 14:07:29 2018 +0200
    38.3 @@ -0,0 +1,16 @@
    38.4 +slot.set_layout(nil, "application/json")
    38.5 +
    38.6 +local r = json.object()
    38.7 +
    38.8 +r.result = json.array()
    38.9 +for i, field in ipairs(config.member_settings_fields) do
   38.10 +  table.insert(r.result, json.object{
   38.11 +    id = field.id,
   38.12 +    name = field.name,
   38.13 +    type = field.type
   38.14 +  })
   38.15 +end
   38.16 +
   38.17 +slot.put_into("data", json.export(r))
   38.18 +slot.put_into("data", "\n")
   38.19 +

    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/app/main/api/style.lua	Sun Jul 15 14:07:29 2018 +0200
    39.3 @@ -0,0 +1,24 @@
    39.4 +slot.set_layout(nil, "application/json")
    39.5 +
    39.6 +
    39.7 +local r = json.object{
    39.8 +  color = json.object()
    39.9 +}
   39.10 +
   39.11 +local style = execute.chunk{ module = "style", chunk = "_style", params = { style = config.style } }
   39.12 +
   39.13 +if style.color_md then
   39.14 +  r.color.md = {}
   39.15 +  for k, v in pairs(style.color_md) do
   39.16 +    r.color.md[k] = v
   39.17 +  end
   39.18 +end
   39.19 +
   39.20 +if style.color_rgb then
   39.21 +  r.color.rgb = {}
   39.22 +  for k, v in pairs(style.color_rgb) do
   39.23 +    r.color.rgb[k] = v
   39.24 +  end
   39.25 +end
   39.26 +
   39.27 +slot.put_into("data", json.export(json.object{ result = r }))

    40.1 --- a/app/main/area/_head.lua	Thu Jun 23 03:30:57 2016 +0200
    40.2 +++ b/app/main/area/_head.lua	Sun Jul 15 14:07:29 2018 +0200
    40.3 @@ -36,4 +36,4 @@
    40.4      }
    40.5    end }
    40.6    
    40.7 -end )
    40.8 \ No newline at end of file
    40.9 +end )

    41.1 --- a/app/main/area/_sidebar_members.lua	Thu Jun 23 03:30:57 2016 +0200
    41.2 +++ b/app/main/area/_sidebar_members.lua	Sun Jul 15 14:07:29 2018 +0200
    41.3 @@ -4,7 +4,6 @@
    41.4  
    41.5  local area = param.get("area", "table")
    41.6  local members_selector = Member:new_selector()
    41.7 -  :join("membership", nil, { "membership.member_id = member.id AND membership.area_id = ?", area.id })
    41.8    :add_where("member.active")
    41.9    :limit(50)
   41.10    

    42.1 --- a/app/main/area/_sidebar_whatcanido.lua	Thu Jun 23 03:30:57 2016 +0200
    42.2 +++ b/app/main/area/_sidebar_whatcanido.lua	Sun Jul 15 14:07:29 2018 +0200
    42.3 @@ -1,10 +1,9 @@
    42.4 -local member = param.get ( "member", "table" ) or app.session.member
    42.5 -
    42.6  local area = param.get ( "area", "table" )
    42.7 +area:load_delegation_info_once_for_member_id(app.session.member_id)
    42.8  
    42.9  local participating_trustee_id
   42.10  local participating_trustee_name
   42.11 -if member then
   42.12 +if app.session.member then
   42.13    if area.delegation_info.first_trustee_participation then
   42.14      participating_trustee_id = area.delegation_info.first_trustee_id
   42.15      participating_trustee_name = area.delegation_info.first_trustee_name
   42.16 @@ -14,232 +13,192 @@
   42.17    end
   42.18  end
   42.19  
   42.20 -ui.sidebar ( "tab-whatcanido", function ()
   42.21 +ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   42.22 +  ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   42.23 +    ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"What can I do here?" }
   42.24 +  end }
   42.25 +  ui.container{ attr = { class = "what-can-i-do-here" }, content = function()
   42.26  
   42.27 -  ui.sidebarHeadWhatCanIDo()
   42.28 -  
   42.29 -  if member and not app.session.member:has_voting_right_for_unit_id(area.unit_id) then
   42.30 -    ui.sidebarSection( _"You are not entitled to vote in this unit" )
   42.31 -  end
   42.32 -  
   42.33 -  if member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then
   42.34 +    if app.session.member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then
   42.35      
   42.36 -    if not app.session.member.disable_notifications then
   42.37 -      
   42.38 -      local ignored_area = IgnoredArea:by_pk(app.session.member_id, area.id)
   42.39 +      if not app.session.member.disable_notifications then
   42.40 +        
   42.41 +        local ignored_area = IgnoredArea:by_pk(app.session.member_id, area.id)
   42.42  
   42.43 -      if not ignored_area then
   42.44 -        ui.sidebarSection ( function ()
   42.45 -        
   42.46 -          ui.heading {
   42.47 -            level = 3, 
   42.48 -            content = _"You are receiving updates by email for this subject area"
   42.49 -          }
   42.50 -          ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
   42.51 -            ui.tag { tag = "li", content = function ()
   42.52 -              ui.tag { content = function ()
   42.53 -                ui.link {
   42.54 -                  module = "area", action = "update_ignore",
   42.55 -                  params = { area_id = area.id },
   42.56 -                  routing = { default = {
   42.57 -                    mode = "redirect", module = "area", view = "show", id = area.id
   42.58 -                  } },
   42.59 -                  text = _"unsubscribe from update emails about this area"
   42.60 -                }
   42.61 +        if not ignored_area then
   42.62 +          ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
   42.63 +            ui.tag{ content = _"You are receiving updates by email for this subject area" }
   42.64 +            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
   42.65 +              ui.tag { tag = "li", content = function ()
   42.66 +                ui.tag { content = function ()
   42.67 +                  ui.link {
   42.68 +                    module = "area", action = "update_ignore",
   42.69 +                    params = { area_id = area.id },
   42.70 +                    routing = { default = {
   42.71 +                      mode = "redirect", module = "index", view = "index", params = { unit = area.unit_id, area = area.id }
   42.72 +                    } },
   42.73 +                    text = _"unsubscribe from update emails about this area"
   42.74 +                  }
   42.75 +                end }
   42.76                end }
   42.77              end }
   42.78            end }
   42.79 -        end )
   42.80 -      end
   42.81 +        end
   42.82 +        
   42.83 +        if ignored_area then
   42.84 +          ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
   42.85 +            ui.tag{ content = _"I want to stay informed" }
   42.86 +            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
   42.87 +              ui.tag { tag = "li", content = function ()
   42.88 +                ui.tag { content = function ()
   42.89 +                  ui.link {
   42.90 +                    module = "area", action = "update_ignore",
   42.91 +                    params = { area_id = area.id, delete = true },
   42.92 +                    routing = { default = {
   42.93 +                      mode = "redirect", module = "index", view = "index", params = { unit = area.unit_id, area = area.id }
   42.94 +                    } },
   42.95 +                    text = _"subscribe for update emails about this area"
   42.96 +                  }
   42.97 +                end }
   42.98 +              end }
   42.99 +            end }
  42.100 +          end }
  42.101 +        end
  42.102        
  42.103 -      if ignored_area then
  42.104 -        ui.sidebarSection ( function ()
  42.105 -        
  42.106 -          ui.heading {
  42.107 -            level = 3, 
  42.108 -            content = _"I want to stay informed"
  42.109 -          }
  42.110 +      else
  42.111 +        ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
  42.112 +          ui.tag{ content = _"I want to stay informed about this subject area" }
  42.113            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.114              ui.tag { tag = "li", content = function ()
  42.115                ui.tag { content = function ()
  42.116 +                ui.tag{ content = _"Edit your global " }
  42.117                  ui.link {
  42.118 -                  module = "area", action = "update_ignore",
  42.119 -                  params = { area_id = area.id, delete = true },
  42.120 -                  routing = { default = {
  42.121 -                    mode = "redirect", module = "area", view = "show", id = area.id
  42.122 -                  } },
  42.123 -                  text = _"subscribe for update emails about this area"
  42.124 +                  module = "member", view = "settings_notification",
  42.125 +                  params = { return_to = "area", return_to_area_id = area.id },
  42.126 +                  text = _"notification settings"
  42.127                  }
  42.128 +                ui.tag{ content = _" to receive updates by email" }
  42.129                end }
  42.130              end }
  42.131            end }
  42.132 -        end )
  42.133 -      end
  42.134 -    
  42.135 -    else
  42.136 -      ui.sidebarSection ( function ()
  42.137 -      
  42.138 -        ui.heading {
  42.139 -          level = 3, 
  42.140 -          content = _"I want to stay informed about this subject area"
  42.141 -        }
  42.142 -        ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.143 -          ui.tag { tag = "li", content = function ()
  42.144 -            ui.tag { content = function ()
  42.145 -              ui.tag{ content = _"Edit your global " }
  42.146 -              ui.link {
  42.147 -                module = "member", view = "settings_notification",
  42.148 -                params = { return_to = "area", return_to_area_id = area.id },
  42.149 -                text = _"notification settings"
  42.150 -              }
  42.151 -              ui.tag{ content = _" to receive updates by email" }
  42.152 -            end }
  42.153 -          end }
  42.154 -        end }
  42.155 -      end )
  42.156 -    end
  42.157 -    
  42.158 -    if area.delegation_info.own_participation then
  42.159 -      ui.sidebarSection ( function ()
  42.160 -        ui.image{ attr = { class = "right" }, static = "icons/48/star.png" }
  42.161 -        ui.heading {
  42.162 -          level = 3, 
  42.163 -          content = _"You are subscribed for this subject area" 
  42.164 -        }
  42.165 -        ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.166 -          ui.tag { tag = "li", content = function ()
  42.167 -            ui.tag { content = function ()
  42.168 -              ui.link {
  42.169 -                module = "membership", action = "update",
  42.170 -                routing = { default = {
  42.171 -                  mode = "redirect", module = "area", view = "show", id = area.id
  42.172 -                } },
  42.173 -                params = { area_id = area.id, delete = true },
  42.174 -                text = _"unsubscribe"
  42.175 -              }
  42.176 -            end }
  42.177 -          end }
  42.178          end }
  42.179 -      end )
  42.180 -    end
  42.181 -
  42.182 -    if not area.delegation_info.own_participation then
  42.183 -      ui.sidebarSection ( function ()
  42.184 +      end
  42.185        
  42.186 -        ui.heading {
  42.187 -          level = 3, 
  42.188 -          content = _"I want to participate in this subject area"
  42.189 -        }
  42.190 -        ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.191 -          ui.tag { tag = "li", content = function ()
  42.192 -            ui.tag { content = function ()
  42.193 -              ui.link {
  42.194 -                module = "membership", action = "update",
  42.195 -                routing = { default = {
  42.196 -                  mode = "redirect", module = "area", view = "show", id = area.id
  42.197 -                } },
  42.198 -                params = { area_id = area.id },
  42.199 -                text = _"subscribe"
  42.200 -              }
  42.201 -            end }
  42.202 +      if app.session.member:has_voting_right_for_unit_id ( area.unit_id ) then
  42.203 +        ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
  42.204 +          ui.tag{ content = _"I want to vote" }
  42.205 +          ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.206 +            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." }
  42.207            end }
  42.208          end }
  42.209 -      end )
  42.210 -    end
  42.211 +      end
  42.212 +      
  42.213 +      if app.session.member and not app.session.member:has_voting_right_for_unit_id(area.unit_id) then
  42.214 +        ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = _"You are not entitled to vote in this unit" }
  42.215 +      end
  42.216        
  42.217 -    
  42.218 -    
  42.219 -    ui.sidebarSection ( function ()
  42.220 -    
  42.221 +      if app.session.member and app.session.member:has_voting_right_for_unit_id(area.unit_id) then
  42.222 +
  42.223 +        if not config.disable_delegations then
  42.224 +          
  42.225 +          ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
  42.226 +
  42.227 +            if not area.delegation_info.first_trustee_id then
  42.228 +              ui.tag{ content = _"I want to delegate this subject area" }
  42.229 +            else
  42.230 +              ui.container { attr = { class = "right" }, content = function()
  42.231 +                local member = Member:by_id(area.delegation_info.first_trustee_id)
  42.232 +                execute.view{
  42.233 +                  module = "member_image",
  42.234 +                  view = "_show",
  42.235 +                  params = {
  42.236 +                    member = member,
  42.237 +                    image_type = "avatar",
  42.238 +                    show_dummy = true
  42.239 +                  }
  42.240 +                }
  42.241 +              end }
  42.242 +              ui.tag{ content = _"You delegated this subject area" }
  42.243 +            end
  42.244  
  42.245 -      if not area.delegation_info.first_trustee_id then
  42.246 -        ui.heading{ level = 3, content = _"I want to delegate this subject area" }
  42.247 -      else
  42.248 -        ui.container { attr = { class = "right" }, content = function()
  42.249 -          local member = Member:by_id(area.delegation_info.first_trustee_id)
  42.250 -          execute.view{
  42.251 -            module = "member_image",
  42.252 -            view = "_show",
  42.253 -            params = {
  42.254 -              member = member,
  42.255 -              image_type = "avatar",
  42.256 -              show_dummy = true
  42.257 +            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.258 +              if area.delegation_info.own_delegation_scope == "unit" then
  42.259 +                ui.tag { tag = "li", content = function ()
  42.260 +                  ui.link {
  42.261 +                    module = "delegation", view = "show", params = {
  42.262 +                      unit_id = area.unit_id,
  42.263 +                    },
  42.264 +                    content = _("change/revoke delegation of organizational unit")
  42.265 +                  }
  42.266 +                end }
  42.267 +              end
  42.268 +              
  42.269 +              if area.delegation_info.own_delegation_scope == nil then
  42.270 +                ui.tag { tag = "li", content = function ()
  42.271 +                  ui.link {
  42.272 +                    module = "delegation", view = "show", params = {
  42.273 +                      area_id = area.id
  42.274 +                    },
  42.275 +                    content = _"choose subject area delegatee" 
  42.276 +                  }
  42.277 +                end }
  42.278 +              elseif area.delegation_info.own_delegation_scope == "area" then
  42.279 +                ui.tag { tag = "li", content = function ()
  42.280 +                  ui.link {
  42.281 +                    module = "delegation", view = "show", params = {
  42.282 +                      area_id = area.id
  42.283 +                    },
  42.284 +                    content = _"change/revoke area delegation" 
  42.285 +                  }
  42.286 +                end }
  42.287 +              else
  42.288 +                ui.tag { tag = "li", content = function ()
  42.289 +                  ui.link {
  42.290 +                    module = "delegation", view = "show", params = {
  42.291 +                      area_id = area.id
  42.292 +                    },
  42.293 +                    content = _"change/revoke delegation only for this subject area" 
  42.294 +                  }
  42.295 +                end }
  42.296 +              end
  42.297 +            end }
  42.298 +          end }
  42.299 +        end 
  42.300 +        
  42.301 +        if app.session.member:has_initiative_right_for_unit_id ( area.unit_id ) then
  42.302 +          ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
  42.303 +            ui.tag{
  42.304 +              content = _("I want to start a new initiative", {
  42.305 +                area_name = area.name
  42.306 +              } ) 
  42.307              }
  42.308 -          }
  42.309 -        end }
  42.310 -        ui.heading{ level = 3, content = _"You delegated this subject area" }
  42.311 -      end
  42.312 -
  42.313 -      ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.314 -        if area.delegation_info.own_delegation_scope == "unit" then
  42.315 -          ui.tag { tag = "li", content = function ()
  42.316 -            ui.link {
  42.317 -              module = "delegation", view = "show", params = {
  42.318 -                unit_id = area.unit_id,
  42.319 -              },
  42.320 -              content = _("change/revoke delegation of organizational unit")
  42.321 -            }
  42.322 +            ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.323 +              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." }
  42.324 +              ui.tag { tag = "li", content = function ()
  42.325 +                ui.tag { content = function ()
  42.326 +                  ui.tag { content = _"If you cannot find any appropriate existing issue, " }
  42.327 +                  ui.link {
  42.328 +                    module = "initiative", view = "new",
  42.329 +                    params = { area_id = area.id },
  42.330 +                    text = _"start an initiative in a new issue"
  42.331 +                  }
  42.332 +                end }
  42.333 +              end }
  42.334 +            end }
  42.335            end }
  42.336          end
  42.337 -        
  42.338 -        if area.delegation_info.own_delegation_scope == nil then
  42.339 -          ui.tag { tag = "li", content = function ()
  42.340 -            ui.link {
  42.341 -              module = "delegation", view = "show", params = {
  42.342 -                area_id = area.id
  42.343 -              },
  42.344 -              content = _"choose subject area delegatee" 
  42.345 -            }
  42.346 -          end }
  42.347 -        elseif area.delegation_info.own_delegation_scope == "area" then
  42.348 -          ui.tag { tag = "li", content = function ()
  42.349 -            ui.link {
  42.350 -              module = "delegation", view = "show", params = {
  42.351 -                area_id = area.id
  42.352 -              },
  42.353 -              content = _"change/revoke area delegation" 
  42.354 -            }
  42.355 -          end }
  42.356 -        else
  42.357 -          ui.tag { tag = "li", content = function ()
  42.358 -            ui.link {
  42.359 -              module = "delegation", view = "show", params = {
  42.360 -                area_id = area.id
  42.361 -              },
  42.362 -              content = _"change/revoke delegation only for this subject area" 
  42.363 -            }
  42.364 -          end }
  42.365 -        end
  42.366 -      end }
  42.367 -    end )
  42.368 -
  42.369 -
  42.370 -      
  42.371 -      
  42.372 -    if app.session.member:has_voting_right_for_unit_id ( area.unit_id ) then
  42.373 -      ui.sidebarSection ( function ()
  42.374 -        ui.heading {
  42.375 -          level = 3, 
  42.376 -          content = _("I want to start a new initiative", {
  42.377 -            area_name = area.name
  42.378 -          } ) 
  42.379 -        }
  42.380 -        ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
  42.381 -          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." }
  42.382 -          ui.tag { tag = "li", content = function ()
  42.383 -            ui.tag { content = function ()
  42.384 -              ui.tag { content = _"If you cannot find any appropriate existing issue, " }
  42.385 -              ui.link {
  42.386 -                module = "initiative", view = "new",
  42.387 -                params = { area_id = area.id },
  42.388 -                text = _"start an initiative in a new issue"
  42.389 -              }
  42.390 -            end }
  42.391 +            
  42.392 +      end
  42.393 +    else
  42.394 +      ui.container { attr = { class = "mdl-card__content mdl-card--border" }, content = function ()
  42.395 +        ui.tag{ content = _"You are not entitled to vote in this unit" }
  42.396 +        ui.tag{ tag = "ul", content = function()
  42.397 +          ui.tag{ tag = "li", content = function()
  42.398 +            ui.link{ module = "index", view = "login", content = _"Login" }
  42.399            end }
  42.400          end }
  42.401 -      end )
  42.402 +      end }
  42.403      end
  42.404 -  else
  42.405 -  end
  42.406 +  end }
  42.407    
  42.408 -end )
  42.409 \ No newline at end of file
  42.410 +end }

    43.1 --- a/app/main/area/show.lua	Thu Jun 23 03:30:57 2016 +0200
    43.2 +++ b/app/main/area/show.lua	Sun Jul 15 14:07:29 2018 +0200
    43.3 @@ -6,59 +6,68 @@
    43.4    return
    43.5  end
    43.6  
    43.7 +app.current_area = area
    43.8 +
    43.9 +
   43.10  area:load_delegation_info_once_for_member_id(app.session.member_id)
   43.11  
   43.12  app.html_title.title = area.name
   43.13  app.html_title.subtitle = _("Area")
   43.14  
   43.15 -execute.view {
   43.16 -  module = "area", view = "_head", params = {
   43.17 -    area = area, member = app.session.member
   43.18 -  }
   43.19 -}
   43.20 +ui.container{ attr = { class = "mdl-grid" }, content = function()
   43.21 +  ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
   43.22 +    ui.heading{ content = area.unit.name .. " / " .. area.name }
   43.23  
   43.24 -execute.view {
   43.25 -  module = "area", view = "_sidebar_whatcanido", params = {
   43.26 -    area = area
   43.27 -  }
   43.28 -}
   43.29 +    execute.view {
   43.30 +      module = "area", view = "_head", params = {
   43.31 +        area = area, member = app.session.member
   43.32 +      }
   43.33 +    }
   43.34 +
   43.35 +    execute.view {
   43.36 +      module = "area", view = "_sidebar_whatcanido", params = {
   43.37 +        area = area
   43.38 +      }
   43.39 +    }
   43.40  
   43.41 -execute.view {
   43.42 -  module = "area", view = "_sidebar_members", params = {
   43.43 -    area = area
   43.44 -  }
   43.45 -}
   43.46 +    execute.view {
   43.47 +      module = "area", view = "_sidebar_members", params = {
   43.48 +        area = area
   43.49 +      }
   43.50 +    }
   43.51  
   43.52 -local function getOpenIssuesSelector()
   43.53 -  return area:get_reference_selector("issues")
   43.54 -    :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()")
   43.55 -end
   43.56 +    local function getOpenIssuesSelector()
   43.57 +      return area:get_reference_selector("issues")
   43.58 +        :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()")
   43.59 +    end
   43.60  
   43.61 -local admission_selector = getOpenIssuesSelector()
   43.62 -  :add_where("issue.state = 'admission'");
   43.63 +    local admission_selector = getOpenIssuesSelector()
   43.64 +      :add_where("issue.state = 'admission'");
   43.65  
   43.66 -local discussion_selector = getOpenIssuesSelector()
   43.67 -  :add_where("issue.state = 'discussion'");
   43.68 +    local discussion_selector = getOpenIssuesSelector()
   43.69 +      :add_where("issue.state = 'discussion'");
   43.70  
   43.71 -local verification_selector = getOpenIssuesSelector()
   43.72 -  :add_where("issue.state = 'verification'");
   43.73 +    local verification_selector = getOpenIssuesSelector()
   43.74 +      :add_where("issue.state = 'verification'");
   43.75  
   43.76 -local voting_selector = getOpenIssuesSelector()
   43.77 -  :add_where("issue.state = 'voting'");
   43.78 +    local voting_selector = getOpenIssuesSelector()
   43.79 +      :add_where("issue.state = 'voting'");
   43.80  
   43.81  
   43.82 -local closed_selector = area:get_reference_selector("issues")
   43.83 -  :add_where("issue.closed NOTNULL")
   43.84 -  :add_order_by("issue.closed DESC")
   43.85 +    local closed_selector = area:get_reference_selector("issues")
   43.86 +      :add_where("issue.closed NOTNULL")
   43.87 +      :add_order_by("issue.closed DESC")
   43.88  
   43.89 -local members_selector = area:get_reference_selector("members"):add_where("member.active")
   43.90 -local delegations_selector = area:get_reference_selector("delegations")
   43.91 -  :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
   43.92 -  :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active")
   43.93 +    local members_selector = area:get_reference_selector("members"):add_where("member.active")
   43.94 +    local delegations_selector = area:get_reference_selector("delegations")
   43.95 +      :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
   43.96 +      :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active")
   43.97  
   43.98  
   43.99 -execute.view {
  43.100 -  module = "issue",
  43.101 -  view = "_list2",
  43.102 -  params = { for_area = area }
  43.103 -}
  43.104 +    execute.view {
  43.105 +      module = "issue",
  43.106 +      view = "_list",
  43.107 +      params = { for_area = area }
  43.108 +    }
  43.109 +  end }
  43.110 +end }

    44.1 --- a/app/main/contact/list.lua	Thu Jun 23 03:30:57 2016 +0200
    44.2 +++ b/app/main/contact/list.lua	Sun Jul 15 14:07:29 2018 +0200
    44.3 @@ -5,97 +5,112 @@
    44.4  
    44.5  ui.title(_"Contacts")
    44.6  
    44.7 +ui.grid{ content = function()
    44.8 +  ui.cell_main{ content = function()
    44.9  
   44.10 -ui.paginate{
   44.11 -  selector = contacts_selector,
   44.12 -  content = function()
   44.13 -    local contacts = contacts_selector:exec()
   44.14 -    if #contacts == 0 then
   44.15 -      ui.field.text{ value = _"You didn't save any member as contact yet." }
   44.16 -    else
   44.17 -      ui.list{
   44.18 -        records = contacts,
   44.19 -        columns = {
   44.20 -          {
   44.21 -            label = _"Name",
   44.22 -            content = function(record)
   44.23 -              ui.link{
   44.24 -                text = record.other_member.name,
   44.25 -                module = "member",
   44.26 -                view = "show",
   44.27 -                id = record.other_member_id
   44.28 -              }
   44.29 -            end
   44.30 -          },
   44.31 -          {
   44.32 -            label = _"Published",
   44.33 -            content = function(record)
   44.34 -              ui.field.boolean{ value = record.public }
   44.35 -            end
   44.36 -          },
   44.37 -          {
   44.38 -            content = function(record)
   44.39 -              if record.public then
   44.40 -                ui.link{
   44.41 -                  attr = { class = "action" },
   44.42 -                  text = _"Hide",
   44.43 -                  module = "contact",
   44.44 -                  action = "add_member",
   44.45 -                  id = record.other_member_id,
   44.46 -                  params = { public = false },
   44.47 -                  routing = {
   44.48 -                    default = {
   44.49 -                      mode = "redirect",
   44.50 -                      module = request.get_module(),
   44.51 -                      view = request.get_view(),
   44.52 -                      id = request.get_id_string(),
   44.53 -                      params = request.get_param_strings()
   44.54 -                    }
   44.55 -                  }
   44.56 -                }
   44.57 -              else
   44.58 -                ui.link{
   44.59 -                  attr = { class = "action" },
   44.60 -                  text = _"Publish",
   44.61 -                  module = "contact",
   44.62 -                  action = "add_member",
   44.63 -                  id = record.other_member_id,
   44.64 -                  params = { public = true },
   44.65 -                  routing = {
   44.66 -                    default = {
   44.67 -                      mode = "redirect",
   44.68 -                      module = request.get_module(),
   44.69 -                      view = request.get_view(),
   44.70 -                      id = request.get_id_string(),
   44.71 -                      params = request.get_param_strings()
   44.72 -                    }
   44.73 -                  }
   44.74 -                }
   44.75 -              end
   44.76 -            end
   44.77 -          },
   44.78 -          {
   44.79 -            content = function(record)
   44.80 -              ui.link{
   44.81 -                attr = { class = "action" },
   44.82 -                text = _"Remove",
   44.83 -                module = "contact",
   44.84 -                action = "remove_member",
   44.85 -                id = record.other_member_id,
   44.86 -                routing = {
   44.87 -                  default = {
   44.88 -                    mode = "redirect",
   44.89 -                    module = request.get_module(),
   44.90 -                    view = request.get_view(),
   44.91 -                    id = request.get_id_string(),
   44.92 -                    params = request.get_param_strings()
   44.93 -                  }
   44.94 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   44.95 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   44.96 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Contacts" }
   44.97 +      end }
   44.98 +      ui.container{ attr = { class = "mdl-card__content mdl-card--border" }, content = function()
   44.99 +
  44.100 +
  44.101 +        ui.paginate{
  44.102 +          selector = contacts_selector,
  44.103 +          content = function()
  44.104 +            local contacts = contacts_selector:exec()
  44.105 +            if #contacts == 0 then
  44.106 +              ui.field.text{ value = _"You didn't save any member as contact yet." }
  44.107 +            else
  44.108 +              ui.list{
  44.109 +                attr = { class = "mdl-data-table mdl-js-data-table mdl-shadow--2dp" },
  44.110 +                records = contacts,
  44.111 +                columns = {
  44.112 +                  {
  44.113 +                    label = _"Name",
  44.114 +                    content = function(record)
  44.115 +                      ui.link{
  44.116 +                        text = record.other_member.name,
  44.117 +                        module = "member",
  44.118 +                        view = "show",
  44.119 +                        id = record.other_member_id
  44.120 +                      }
  44.121 +                    end
  44.122 +                  },
  44.123 +                  {
  44.124 +                    label = _"Published",
  44.125 +                    content = function(record)
  44.126 +                      ui.field.boolean{ value = record.public }
  44.127 +                    end
  44.128 +                  },
  44.129 +                  {
  44.130 +                    content = function(record)
  44.131 +                      if record.public then
  44.132 +                        ui.link{
  44.133 +                          attr = { class = "action" },
  44.134 +                          text = _"Hide",
  44.135 +                          module = "contact",
  44.136 +                          action = "add_member",
  44.137 +                          id = record.other_member_id,
  44.138 +                          params = { public = false },
  44.139 +                          routing = {
  44.140 +                            default = {
  44.141 +                              mode = "redirect",
  44.142 +                              module = request.get_module(),
  44.143 +                              view = request.get_view(),
  44.144 +                              id = request.get_id_string(),
  44.145 +                              params = request.get_param_strings()
  44.146 +                            }
  44.147 +                          }
  44.148 +                        }
  44.149 +                      else
  44.150 +                        ui.link{
  44.151 +                          attr = { class = "action" },
  44.152 +                          text = _"Publish",
  44.153 +                          module = "contact",
  44.154 +                          action = "add_member",
  44.155 +                          id = record.other_member_id,
  44.156 +                          params = { public = true },
  44.157 +                          routing = {
  44.158 +                            default = {
  44.159 +                              mode = "redirect",
  44.160 +                              module = request.get_module(),
  44.161 +                              view = request.get_view(),
  44.162 +                              id = request.get_id_string(),
  44.163 +                              params = request.get_param_strings()
  44.164 +                            }
  44.165 +                          }
  44.166 +                        }
  44.167 +                      end
  44.168 +                    end
  44.169 +                  },
  44.170 +                  {
  44.171 +                    content = function(record)
  44.172 +                      ui.link{
  44.173 +                        attr = { class = "action" },
  44.174 +                        text = _"Remove",
  44.175 +                        module = "contact",
  44.176 +                        action = "remove_member",
  44.177 +                        id = record.other_member_id,
  44.178 +                        routing = {
  44.179 +                          default = {
  44.180 +                            mode = "redirect",
  44.181 +                            module = request.get_module(),
  44.182 +                            view = request.get_view(),
  44.183 +                            id = request.get_id_string(),
  44.184 +                            params = request.get_param_strings()
  44.185 +                          }
  44.186 +                        }
  44.187 +                      }
  44.188 +                    end
  44.189 +                  },
  44.190                  }
  44.191                }
  44.192              end
  44.193 -          },
  44.194 +          end
  44.195          }
  44.196 -      }
  44.197 -    end
  44.198 -  end
  44.199 -}
  44.200 +
  44.201 +      end }
  44.202 +    end }
  44.203 +  end }
  44.204 +end }

    45.1 --- a/app/main/delegation/_action/update.lua	Thu Jun 23 03:30:57 2016 +0200
    45.2 +++ b/app/main/delegation/_action/update.lua	Sun Jul 15 14:07:29 2018 +0200
    45.3 @@ -1,3 +1,7 @@
    45.4 +if config.disable_delegations then
    45.5 +  return
    45.6 +end
    45.7 +
    45.8  local truster_id = app.session.member.id
    45.9  
   45.10  local trustee_id = param.get("trustee_id", atom.integer)
   45.11 @@ -58,7 +62,7 @@
   45.12    end
   45.13  
   45.14    if not app.session.member:has_voting_right_for_unit_id(check_unit_id) then
   45.15 -    error("access denied")
   45.16 +    return execute.view { module = "index", view = "403" }
   45.17    end
   45.18  
   45.19    if not delegation then

    46.1 --- a/app/main/delegation/_info.lua	Thu Jun 23 03:30:57 2016 +0200
    46.2 +++ b/app/main/delegation/_info.lua	Sun Jul 15 14:07:29 2018 +0200
    46.3 @@ -174,7 +174,7 @@
    46.4    if info.own_participation then
    46.5      if issue and issue.fully_frozen then
    46.6        ui.link{
    46.7 -        attr = { class = "right" },
    46.8 +        attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" },
    46.9          module = "vote", view = "list", params = {
   46.10            issue_id = issue.id
   46.11          },
   46.12 @@ -184,8 +184,9 @@
   46.13        }
   46.14      else
   46.15        if issue then
   46.16 -        local text = _"you are interested"
   46.17 -        ui.image { attr = { class = "star", title = text, alt = text }, static = "icons/48/eye.png" }
   46.18 +        ui.tag{ tag = "i", attr = { class = "material-icons" }, content = "star" }
   46.19 +        slot.put(" ")
   46.20 +        ui.tag{ content = _"you are interested" }
   46.21          if not issue.closed and info.own_participation and info.weight and info.weight > 1 then
   46.22            ui.link { 
   46.23              attr = { class = "right" }, content = "+" .. (info.weight - 1),
   46.24 @@ -198,11 +199,7 @@
   46.25          local text = _"you are subscribed"
   46.26          ui.image { attr = { class = "icon24 star", title = text, alt = text }, static = "icons/48/star.png" }
   46.27        end
   46.28 -      if not for_title then
   46.29 -        slot.put("<br />")
   46.30 -      else
   46.31 -        slot.put(" ")
   46.32 -      end
   46.33 +      slot.put(" ")
   46.34      end
   46.35    end
   46.36  end
   46.37 @@ -260,3 +257,15 @@
   46.38    end
   46.39  end
   46.40  
   46.41 +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
   46.42 +    ui.link{
   46.43 +      attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" },
   46.44 +      module = "vote", view = "list", params = {
   46.45 +        issue_id = issue.id
   46.46 +      },
   46.47 +      content = function ()
   46.48 +        ui.tag { content = _"vote now" }
   46.49 +      end
   46.50 +    }
   46.51 +  else
   46.52 +end