Refactored quotes template.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 473df20c4c74b5b63bcf80d3fa1d3e887e09c062..bb0054356be53916d51082253bc4d2ba8769e431 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.9.27.3514 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.27.3515 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/quotas.tpl b/WEB-INF/templates/quotas.tpl
index d8a59cef0abd2c4a695fcc05e3887b1b339e57ca..eebeea517e56dfcdccb465710a295dd3423ee9e7 100644 (file)
--- a/WEB-INF/templates/quotas.tpl
+++ b/WEB-INF/templates/quotas.tpl
@@ -1,59 +1,61 @@
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr><td valign="top">{$i18n.form.quota.hint}</td></tr>
+</table>
+

 {$forms.monthlyQuotaForm.open}
 <div style="padding: 0 0 10 0">
 {$forms.monthlyQuotaForm.open}
 <div style="padding: 0 0 10 0">

-    <table border="0" class="divider">
-        <tr>
-            <td align="center">
-                <table>
-                    <tr>
-                        <td>{$i18n.form.quota.workdayHours}</td>
-                        <td>{$forms.monthlyQuotaForm.dailyWorkingHours.control}</td>
-                        <td><input type="submit" name="dailyHours" value="{$i18n.button.save}"></td>
-                    </tr>
-                </table>
-            </td>
-        </tr>        
-    </table>
-</div>
-<table>
-    <tr>
-        <td>{$i18n.form.quota.year}:</td>
-        <td>{$forms.monthlyQuotaForm.years.control}</td>
-    </tr>
+  <table border="0" class="divider">

     <tr>
     <tr>

-        <td colspan="2">
-            <table> 
-            <tr>
-                <td class="tableHeader">{$i18n.form.quota.month}</td>
-                <td class="tableHeader">{$i18n.form.quota.quota}</td>
-            </tr>
- {foreach $months as $month}
-                <tr>
-                    <td>{$month}</td>
-                    <td>{$forms.monthlyQuotaForm.$month.control}</td>
-                </tr>
- {/foreach}     
-                <tr>
-                    <td colspan="2" style="text-align:center;">
-                        <input type="submit" name="quotas" value="{$i18n.button.save}*">
-                    </td>
-                </tr>
-            </table>
-        </td>
+      <td align="center">
+        <table>
+          <tr>
+            <td>{$i18n.form.quota.workdayHours}:</td>
+            <td>{$forms.monthlyQuotaForm.dailyWorkingHours.control}</td>
+            <td><input type="submit" name="dailyHours" value="{$i18n.button.save}"></td>
+          </tr>
+        </table>
+      </td>

     </tr>
     </tr>

+  </table>
+</div>
+<table>
+  <tr>
+    <td>{$i18n.form.quota.year}:</td>
+    <td>{$forms.monthlyQuotaForm.years.control}</td>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
+  <tr>
+    <td colspan="2">
+      <table>
+        <tr>
+          <td class="tableHeaderCentered">{$i18n.form.quota.month}</td>
+          <td class="tableHeaderCentered">{$i18n.form.quota.quota}</td>
+        </tr>
+{foreach $months as $month}
+        <tr>
+          <td>{$month}:</td>
+          <td>{$forms.monthlyQuotaForm.$month.control}</td>
+        </tr>
+{/foreach}
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr><td colspan="2" style="text-align:center;"><input type="submit" name="quotas" value="{$i18n.button.save}"></td></tr>
+      </table>
+    </td>
+  </tr>

 </table>
 </table>

-<div>* - {$i18n.form.quota.hint}</div>

 {$forms.monthlyQuotaForm.close}
 {$forms.monthlyQuotaForm.close}

+

 <script>
 function yearChange(value){
     var url = window.location.href;
 <script>
 function yearChange(value){
     var url = window.location.href;

-    
+

     if (url.indexOf('?') > 0){
         var parameter = url.substring(url.indexOf('?') + 1, url.length);
         url = url.replace(parameter, 'year=' + value);
     } else {
         url = '?year=' + value;
     }
     if (url.indexOf('?') > 0){
         var parameter = url.substring(url.indexOf('?') + 1, url.length);
         url = url.replace(parameter, 'year=' + value);
     } else {
         url = '?year=' + value;
     }

-    
+

     window.location = url;
 }
     window.location = url;
 }

-</script>
\ No newline at end of file
+</script>