liquid_feedback_frontend
changeset 1644:678c7146f27b
Fixed cancel links in member setting views
author | bsw |
---|---|
date | Tue Feb 09 21:20:01 2021 +0100 (2021-02-09) |
parents | d0a85bdf78ae |
children | afff8198bd98 |
files | app/main/member/edit.lua app/main/member/edit_images.lua app/main/member/settings_agent.lua app/main/member/settings_email.lua app/main/member/settings_login.lua app/main/member/settings_name.lua app/main/member/settings_notification.lua app/main/member/settings_password.lua |
line diff
1.1 --- a/app/main/member/edit.lua Tue Feb 09 21:09:47 2021 +0100 1.2 +++ b/app/main/member/edit.lua Tue Feb 09 21:20:01 2021 +0100 1.3 @@ -97,12 +97,10 @@ 1.4 content = "" 1.5 } 1.6 slot.put(" ") 1.7 - ui.link{ 1.8 - attr = { 1.9 - class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect", 1.10 - }, 1.11 - content = _"cancel", 1.12 - module = "member", view = "show", id = app.session.member.id 1.13 + ui.link { 1.14 + attr = { class = "mdl-button mdl-js-button" }, 1.15 + module = "member", view = "show", id = app.session.member_id, 1.16 + content = _"Cancel" 1.17 } 1.18 end } 1.19 end
2.1 --- a/app/main/member/edit_images.lua Tue Feb 09 21:09:47 2021 +0100 2.2 +++ b/app/main/member/edit_images.lua Tue Feb 09 21:20:01 2021 +0100 2.3 @@ -65,10 +65,10 @@ 2.4 content = "" 2.5 } 2.6 slot.put(" ") 2.7 - ui.link{ 2.8 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 2.9 - content = _"cancel", 2.10 - module = "member", view = "settings" 2.11 + ui.link { 2.12 + attr = { class = "mdl-button mdl-js-button" }, 2.13 + module = "member", view = "show", id = app.session.member_id, 2.14 + content = _"Cancel" 2.15 } 2.16 end 2.17 }
3.1 --- a/app/main/member/settings_agent.lua Tue Feb 09 21:09:47 2021 +0100 3.2 +++ b/app/main/member/settings_agent.lua Tue Feb 09 21:20:01 2021 +0100 3.3 @@ -94,8 +94,15 @@ 3.4 content = "" 3.5 } 3.6 slot.put(" ") 3.7 + ui.link{ 3.8 + attr = { 3.9 + class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect", 3.10 + }, 3.11 + content = _"cancel", 3.12 + module = "member", view = "show", id = app.session.member.id 3.13 + } 3.14 ui.link { 3.15 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 3.16 + attr = { class = "mdl-button mdl-js-button" }, 3.17 module = "member", view = "show", id = app.session.member_id, 3.18 content = _"Cancel" 3.19 }
4.1 --- a/app/main/member/settings_email.lua Tue Feb 09 21:09:47 2021 +0100 4.2 +++ b/app/main/member/settings_email.lua Tue Feb 09 21:20:01 2021 +0100 4.3 @@ -50,10 +50,10 @@ 4.4 content = "" 4.5 } 4.6 slot.put(" ") 4.7 - ui.link{ 4.8 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 4.9 - content = _"Cancel", 4.10 - module = "member", view = "settings" 4.11 + ui.link { 4.12 + attr = { class = "mdl-button mdl-js-button" }, 4.13 + module = "member", view = "show", id = app.session.member_id, 4.14 + content = _"Cancel" 4.15 } 4.16 end 4.17 }
5.1 --- a/app/main/member/settings_login.lua Tue Feb 09 21:09:47 2021 +0100 5.2 +++ b/app/main/member/settings_login.lua Tue Feb 09 21:20:01 2021 +0100 5.3 @@ -45,8 +45,8 @@ 5.4 slot.put(" ") 5.5 5.6 ui.link { 5.7 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 5.8 - module = "member", view = "settings", 5.9 + attr = { class = "mdl-button mdl-js-button" }, 5.10 + module = "member", view = "show", id = app.session.member_id, 5.11 content = _"Cancel" 5.12 } 5.13 end
6.1 --- a/app/main/member/settings_name.lua Tue Feb 09 21:09:47 2021 +0100 6.2 +++ b/app/main/member/settings_name.lua Tue Feb 09 21:20:01 2021 +0100 6.3 @@ -43,8 +43,8 @@ 6.4 } 6.5 slot.put(" ") 6.6 ui.link { 6.7 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 6.8 - module = "member", view = "show", 6.9 + attr = { class = "mdl-button mdl-js-button" }, 6.10 + module = "member", view = "show", id = app.session.member_id, 6.11 content = _"Cancel" 6.12 } 6.13 end
7.1 --- a/app/main/member/settings_notification.lua Tue Feb 09 21:09:47 2021 +0100 7.2 +++ b/app/main/member/settings_notification.lua Tue Feb 09 21:20:01 2021 +0100 7.3 @@ -164,9 +164,9 @@ 7.4 } 7.5 else 7.6 ui.link { 7.7 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 7.8 - module = "member", view = "settings", 7.9 - content = _"cancel" 7.10 + attr = { class = "mdl-button mdl-js-button" }, 7.11 + module = "member", view = "show", id = app.session.member_id, 7.12 + content = _"Cancel" 7.13 } 7.14 end 7.15
8.1 --- a/app/main/member/settings_password.lua Tue Feb 09 21:09:47 2021 +0100 8.2 +++ b/app/main/member/settings_password.lua Tue Feb 09 21:20:01 2021 +0100 8.3 @@ -66,8 +66,8 @@ 8.4 } 8.5 slot.put(" ") 8.6 ui.link { 8.7 - attr = { class = "mdl-button mdl-js-button mdl-button--raised" }, 8.8 - module = "member", view = "show", id = app.session.member_id, 8.9 + attr = { class = "mdl-button mdl-js-button" }, 8.10 + module = "member", view = "show", id = app.session.member_id, 8.11 content = _"Cancel" 8.12 } 8.13 end