liquid_feedback_frontend

changeset 1583:202876945a6c

merge
author jbe
date Tue Jan 26 18:19:13 2021 +0100 (2021-01-26)
parents c6883a7dce61 b4a377306a34
children 2874a199c727
files locale/translations.de.lua
line diff
     1.1 --- a/app/main/_layout/default.html	Mon Dec 14 18:06:06 2020 +0100
     1.2 +++ b/app/main/_layout/default.html	Tue Jan 26 18:19:13 2021 +0100
     1.3 @@ -161,6 +161,11 @@
     1.4        overflow: visible;
     1.5        display: block;
     1.6        margin-bottom: 16px;
     1.7 +      border-radius: 5px;
     1.8 +    }
     1.9 +
    1.10 +    .mdl-card__title {
    1.11 +      border-radius: 5px 5px 0 0;
    1.12      }
    1.13  
    1.14      .mdl-card__fullwidth {
    1.15 @@ -198,7 +203,7 @@
    1.16      .mdl-special-card {
    1.17        background: #fff;
    1.18        margin-bottom: 16px;
    1.19 -      border-radius: 2px;
    1.20 +      border-radius: 5px;
    1.21      }
    1.22  
    1.23      .mdl-navigation__head {
     2.1 --- a/app/main/oauth2/token.lua	Mon Dec 14 18:06:06 2020 +0100
     2.2 +++ b/app/main/oauth2/token.lua	Tue Jan 26 18:19:13 2021 +0100
     2.3 @@ -254,8 +254,8 @@
     2.4    r.real_member_id = token.real_member_id  
     2.5  end
     2.6  
     2.7 -if param.get("include_member", atom.boolean) then
     2.8 -  if allowed_scopes.identification or allowed_scopes.authentication then
     2.9 +if allowed_scopes.identification or allowed_scopes.authentication then
    2.10 +  if param.get("include_member", atom.boolean) then
    2.11      local member = token.member
    2.12      r.member = json.object{
    2.13        id = member.id,
    2.14 @@ -273,6 +273,14 @@
    2.15          r.real_member.identification = token.session.real_member.identification
    2.16        end
    2.17      end
    2.18 +    if unit.attr.role and param.get("include_roles") then
    2.19 +      r.roles = json.object()
    2.20 +      if not unit.attr.only_visible_for_role 
    2.21 +        or member:has_role(unit.attr.only_visible_for_role)
    2.22 +      then
    2.23 +        r.roles[unit.attr.role] = true
    2.24 +      end
    2.25 +    end
    2.26    end
    2.27  end
    2.28  
     3.1 --- a/locale/translations.de.lua	Mon Dec 14 18:06:06 2020 +0100
     3.2 +++ b/locale/translations.de.lua	Tue Jan 26 18:19:13 2021 +0100
     3.3 @@ -449,7 +449,7 @@
     3.4  ["Not a member"] = "Kein Mitglied";
     3.5  ["Not voted issues"] = "Nicht abgestimmt";
     3.6  ["Notification address unconfirmed"] = "E-Mail-Adresse für Benachrichtigungen unbestätigt";
     3.7 -["Notification email"] = "E-Mail für Benachrichtigungs";
     3.8 +["Notification email"] = "E-Mail für Benachrichtigungen";
     3.9  ["Notification level not set yet"] = "Benachrichtigungseinstellungen noch nicht vorgenommen";
    3.10  ["Notifications"] = "Benachrichtigungen";
    3.11  ["Number of incoming delegations, follow link to see more details"] = "Anzahl eingehender Delegationen, Link folgen für mehr Details";
    3.12 @@ -1043,5 +1043,7 @@
    3.13  ["Cancelled accounts (#{count})"] = "Gesperrte Konten (#{count})";
    3.14  ["Rejected requests (#{count})"] = "Abgelehnte Anfragen (#{count})";
    3.15  ["show incoming delegations"] = "Eingehende Delegationen zeigen";
    3.16 -
    3.17 +["#{hours} hours"] = "#{hours} Stunden";
    3.18 +["#{hours} minutes"] = "#{minutes} Minuten";
    3.19 +["just now"] = "gerade eben";
    3.20  }

Impressum / About Us