From ebe37a68d39dbc1cc4f6af1c05301d5a5fc29c13 Mon Sep 17 00:00:00 2001
From: "Jannis M. Hoffmann" <jannis.hoffmann@rwth-aachen.de>
Date: Sun, 1 May 2022 22:35:48 +0200
Subject: mostly renamed 'noaction' to 'login'

be carefult with GET vs POST
---
 templates/webmail/about.html.ep    |  2 +-
 templates/webmail/login.html.ep    | 60 ++++++++++++++++++++++++++++++++++++++
 templates/webmail/noaction.html.ep | 60 --------------------------------------
 3 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 templates/webmail/login.html.ep
 delete mode 100644 templates/webmail/noaction.html.ep

(limited to 'templates/webmail')

diff --git a/templates/webmail/about.html.ep b/templates/webmail/about.html.ep
index 60fe549..5cee603 100644
--- a/templates/webmail/about.html.ep
+++ b/templates/webmail/about.html.ep
@@ -64,7 +64,7 @@
   <tr>
     <td>
       <nav>
-        %= button_to login => 'noaction' => (class => 'link-btn')
+        %= button_to login => 'login' => (class => 'link-btn')
       </nav>
     </td>
   </tr>
diff --git a/templates/webmail/login.html.ep b/templates/webmail/login.html.ep
new file mode 100644
index 0000000..4b2da5d
--- /dev/null
+++ b/templates/webmail/login.html.ep
@@ -0,0 +1,60 @@
+% layout 'mainlayout';
+
+<table id=noaction>
+  <thead>
+    <tr>
+      <th id=top-section> JWebmail – <%= ucfirst l 'login' %> </th>
+    </tr>
+  </thead>
+
+  <tbody>
+% if (my $msg = flash('message') || stash('warning')) {
+    <tr>
+      <td class="warning flash-fade">
+        %= $msg
+      <td>
+    </tr>
+% }
+
+    <tr>
+      <td class=login-form>
+        %= form_for login => (name => 'login1') => (method => 'post') => begin
+
+          <table>
+            <tr>
+              <td class=label-cell>
+                %= label_for userid => ucfirst l 'userid'
+              </td> 
+              <td> 
+                %= text_field 'userid'
+              </td>
+            </tr>
+            <tr>
+              <td class=label-cell> 
+                %= label_for password => ucfirst l 'passwd'
+              </td> 
+              <td> 
+                %= password_field 'password'
+              </td> 
+            </tr>
+            <tr class=submit-row>
+              <td colspan=2> 
+                %= submit_button l 'login'
+              </td> 
+            </tr>
+          </table>
+
+        % end
+      </td>
+    </tr>
+
+  </tbody>
+</table>
+
+%= javascript begin
+  if (!document.login1.userid.value) {
+    document.login1.userid.focus();
+  } else {
+    document.login1.password.focus();
+  }
+% end
diff --git a/templates/webmail/noaction.html.ep b/templates/webmail/noaction.html.ep
deleted file mode 100644
index 2608bda..0000000
--- a/templates/webmail/noaction.html.ep
+++ /dev/null
@@ -1,60 +0,0 @@
-% layout 'mainlayout';
-
-<table id=noaction>
-  <thead>
-    <tr>
-      <th id=top-section> JWebmail – <%= ucfirst l 'login' %> </th>
-    </tr>
-  </thead>
-
-  <tbody>
-% if (my $msg = flash('message') || stash('warning')) {
-    <tr>
-      <td class="warning flash-fade">
-        %= $msg
-      <td>
-    </tr>
-% }
-
-    <tr>
-      <td class=login-form>
-        %= form_for login => (name => 'login1') => begin
-
-          <table>
-            <tr>
-              <td class=label-cell>
-                %= label_for userid => ucfirst l 'userid'
-              </td> 
-              <td> 
-                %= text_field 'userid'
-              </td>
-            </tr>
-            <tr>
-              <td class=label-cell> 
-                %= label_for password => ucfirst l 'passwd'
-              </td> 
-              <td> 
-                %= password_field 'password'
-              </td> 
-            </tr>
-            <tr class=submit-row>
-              <td colspan=2> 
-                %= submit_button l 'login'
-              </td> 
-            </tr>
-          </table>
-
-        % end
-      </td>
-    </tr>
-
-  </tbody>
-</table>
-
-%= javascript begin
-  if (!document.login1.userid.value) {
-    document.login1.userid.focus();
-  } else {
-    document.login1.password.focus();
-  }
-% end
-- 
cgit v1.2.3