# HG changeset patch
# User bsw
# Date 1612902001 -3600
# Node ID 678c7146f27b0212923f21ec721e7da83a5e51ca
# Parent  d0a85bdf78ae263b1c6f8d8ce9a5768a0385dbaa
Fixed cancel links in member setting views

diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/edit.lua
--- a/app/main/member/edit.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/edit.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -97,12 +97,10 @@
                 content = ""
               }
               slot.put("   ")
-              ui.link{
-                attr = {
-                  class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect",
-                },
-                content = _"cancel",
-                module = "member", view = "show", id = app.session.member.id
+              ui.link {
+                attr = { class = "mdl-button mdl-js-button" },
+                module = "member", view = "show", id = app.session.member_id,
+                content = _"Cancel"
               }
             end }
           end
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/edit_images.lua
--- a/app/main/member/edit_images.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/edit_images.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -65,10 +65,10 @@
               content = ""
             }
             slot.put("   ")
-            ui.link{
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-              content = _"cancel",
-              module = "member", view = "settings"
+            ui.link {
+              attr = { class = "mdl-button mdl-js-button" },
+              module = "member", view = "show", id = app.session.member_id,
+              content = _"Cancel"
             }
           end
         }
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_agent.lua
--- a/app/main/member/settings_agent.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_agent.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -94,8 +94,15 @@
               content = ""
             }
             slot.put("   ")
+              ui.link{
+                attr = {
+                  class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect",
+                },
+                content = _"cancel",
+                module = "member", view = "show", id = app.session.member.id
+              }
             ui.link {
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
+              attr = { class = "mdl-button mdl-js-button" },
               module = "member", view = "show", id = app.session.member_id,
               content = _"Cancel"
             }
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_email.lua
--- a/app/main/member/settings_email.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_email.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -50,10 +50,10 @@
               content = ""
             }
             slot.put("   ")
-            ui.link{
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-              content = _"Cancel",
-              module = "member", view = "settings"
+            ui.link {
+              attr = { class = "mdl-button mdl-js-button" },
+              module = "member", view = "show", id = app.session.member_id,
+              content = _"Cancel"
             }
           end
         }
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_login.lua
--- a/app/main/member/settings_login.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_login.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -45,8 +45,8 @@
             slot.put("  ")
 
             ui.link {
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-              module = "member", view = "settings", 
+              attr = { class = "mdl-button mdl-js-button" },
+              module = "member", view = "show", id = app.session.member_id,
               content = _"Cancel"
             }
           end
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_name.lua
--- a/app/main/member/settings_name.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_name.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -43,8 +43,8 @@
             }
             slot.put("   ")
             ui.link {
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-              module = "member", view = "show", 
+              attr = { class = "mdl-button mdl-js-button" },
+              module = "member", view = "show", id = app.session.member_id,
               content = _"Cancel"
             }
           end
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_notification.lua
--- a/app/main/member/settings_notification.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_notification.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -164,9 +164,9 @@
               }
             else
               ui.link {
-                attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-                module = "member", view = "settings", 
-                content = _"cancel"
+                attr = { class = "mdl-button mdl-js-button" },
+                module = "member", view = "show", id = app.session.member_id,
+                content = _"Cancel"
               }
             end
             
diff -r d0a85bdf78ae -r 678c7146f27b app/main/member/settings_password.lua
--- a/app/main/member/settings_password.lua	Tue Feb 09 21:09:47 2021 +0100
+++ b/app/main/member/settings_password.lua	Tue Feb 09 21:20:01 2021 +0100
@@ -66,8 +66,8 @@
             }
             slot.put("   ")
             ui.link {
-              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
-              module = "member", view = "show", id = app.session.member_id, 
+              attr = { class = "mdl-button mdl-js-button" },
+              module = "member", view = "show", id = app.session.member_id,
               content = _"Cancel"
             }
           end