use more tag helpers in templates

3 files changed, 17 insertions, 17 deletions

diff --git a/templates/webmail/about.html.ep b/templates/webmail/about.html.ep
index 49ecc1a..60fe549 100644
--- a/templates/webmail/about.html.ep
+++ b/templates/webmail/about.html.ep
@@ -47,7 +47,7 @@
         <li>Supported languages:
           <p class=languages>
 % foreach (@$languages) {
-            <a href="<%= url_for(lang => $_) %>"><%= $_ %></a>
+            %= link_to $_ => {lang => $_}
 % }
           </p>
         </li>
@@ -64,7 +64,7 @@
   <tr>
     <td>
       <nav>
-        <a href="<%= url_for('noaction') %>" class=btn>login</a>
+        %= button_to login => 'noaction' => (class => 'link-btn')
       </nav>
     </td>
   </tr>
diff --git a/templates/webmail/noaction.html.ep b/templates/webmail/noaction.html.ep
index 54a8106..2608bda 100644
--- a/templates/webmail/noaction.html.ep
+++ b/templates/webmail/noaction.html.ep
@@ -18,12 +18,12 @@
 
     <tr>
       <td class=login-form>
-        <form method=post name=login1 action="<%= url_for('login') %>">
+        %= form_for login => (name => 'login1') => begin
 
           <table>
             <tr>
               <td class=label-cell>
-                <label for=userid><%= ucfirst l 'userid' %></label>:
+                %= label_for userid => ucfirst l 'userid'
               </td> 
               <td> 
                 %= text_field 'userid'
@@ -31,7 +31,7 @@
             </tr>
             <tr>
               <td class=label-cell> 
-                <label for=password><%= ucfirst l 'passwd' %></label>:
+                %= label_for password => ucfirst l 'passwd'
               </td> 
               <td> 
                 %= password_field 'password'
@@ -39,12 +39,12 @@
             </tr>
             <tr class=submit-row>
               <td colspan=2> 
-                <input type=submit value="<%= l 'login' %>">
+                %= submit_button l 'login'
               </td> 
             </tr>
           </table>
 
-        </form>
+        % end
       </td>
     </tr>
 
diff --git a/templates/webmail/writemail.html.ep b/templates/webmail/writemail.html.ep
index ca69994..8375bdf 100644
--- a/templates/webmail/writemail.html.ep
+++ b/templates/webmail/writemail.html.ep
@@ -8,40 +8,40 @@
   <p class=warn> <%= $msg %> </p>
 % }
 
-<form method=post enctype=multipart/form-data id=write-form>
+%= form_for '' => (method => 'post') => (enctype => 'multipart/form-data') => (id => 'write-form') => begin
 
-  <label for=mail> <%= ucfirst l 'send_to' %> </label>
+  %= label_for mail => ucfirst l 'send_to'
   %= email_field 'to', id => 'mail', multiple => '', required => ''
   <br>
 
-  <label for=subject> <%= ucfirst l 'subject' %> </label>
+  %= label_for subject => ucfirst l 'subject'
   %= text_field 'subject', 'required' => ''
   <br>
 
-  <label for=cc>CC</label>
+  %= label_for cc => 'CC'
   %= email_field 'cc', 'multiple' => ''
   <br>
 
-  <label for=bcc>BCC</label>
+  %= label_for bcc => 'BCC'
   %= email_field 'bcc', 'multiple' => ''
   <br>
 
-  <label for=back_to> <%= ucfirst l 'answer_to' %> </label>
+  %= label_for back_to => ucfirst l 'answer_to'
   %= email_field 'back_to'
   <br>
 
-  <label for=txt> <%= ucfirst l 'content' %> </label>
-  %= text_area 'body', cols => 80, rows => 24, id => 'txt'
+  %= label_for txt => ucfirst l 'content'
+  %= text_area body => (cols => 80) => (rows => 24) => (id => 'txt')
   <br>
 
   %= file_field 'attach'
   <br>
 
-  <input type=submit value="send" />
+  %= submit_button l 'send'
 
   %= csrf_field
 
-</form>
+% end
 
 <nav>
   %#<a href="<%= url_for('displayheaders') %>" class=btn> <%= l 'home' %> </a>