Renamed admin templates.

diff --git a/WEB-INF/templates/admin_group_add.tpl b/WEB-INF/templates/admin_group_add.tpl
new file mode 100644 (file)
index 0000000..364b599
--- /dev/null
+++ b/WEB-INF/templates/admin_group_add.tpl
@@ -0,0 +1,49 @@
+{$forms.teamForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right" nowrap>{$i18n.label.group_name}:</td>
+          <td>{$forms.teamForm.team_name.control}</td>
+        </tr>
+        <tr>
+           <td align="right" nowrap>{$i18n.label.language}:</td>
+           <td>{$forms.teamForm.lang.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
+          <td>{$forms.teamForm.manager_name.control}</td>
+        </tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
+          <td>{$forms.teamForm.manager_login.control}</td>
+        </tr>
+{if !$auth_external}
+        <tr>
+          <td align="right" nowrap>{$i18n.label.password} (*):</td>
+          <td>{$forms.teamForm.password1.control}</td>
+        </tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
+          <td>{$forms.teamForm.password2.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right" nowrap>{$i18n.label.email}:</td>
+          <td>{$forms.teamForm.manager_email.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_submit.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_group_delete.tpl b/WEB-INF/templates/admin_group_delete.tpl
new file mode 100644 (file)
index 0000000..a8b0712
--- /dev/null
+++ b/WEB-INF/templates/admin_group_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.teamForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$team_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.teamForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.teamForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_group_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
new file mode 100644 (file)
index 0000000..fb79204
--- /dev/null
+++ b/WEB-INF/templates/admin_group_edit.tpl
@@ -0,0 +1,45 @@
+{$forms.teamForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right" nowrap>{$i18n.label.group_name}:</td>
+          <td>{$forms.teamForm.team_name.control}</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
+          <td>{$forms.teamForm.manager_name.control}</td>
+        </tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
+          <td>{$forms.teamForm.manager_login.control}</td>
+        </tr>
+{if !$auth_external}
+        <tr>
+          <td align="right" nowrap>{$i18n.label.password} (*):</td>
+          <td>{$forms.teamForm.password1.control}</td>
+        </tr>
+        <tr>
+          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
+          <td>{$forms.teamForm.password2.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right" nowrap>{$i18n.label.email}:</td>
+          <td>{$forms.teamForm.manager_email.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_save.control}&nbsp;{$forms.teamForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_groups.tpl b/WEB-INF/templates/admin_groups.tpl
new file mode 100644 (file)
index 0000000..ebe8899
--- /dev/null
+++ b/WEB-INF/templates/admin_groups.tpl
@@ -0,0 +1,42 @@
+<script>
+  function chLocation(newLocation) { document.location = newLocation; }
+</script>
+
+<table cellspacing="0" cellpadding="7" border="0" width="720">
+  <tr><td valign="top">{$i18n.form.groups.hint}</td></tr>
+</table>
+
+<table cellspacing="1" cellpadding="3" border="0" width="720">
+  <tr>
+    <td width="3%" class="tableHeader">{$i18n.label.id}</td>
+    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td class="tableHeader">{$i18n.label.date}</td>
+    <td class="tableHeader">{$i18n.label.language}</td>
+    <td class="tableHeader">{$i18n.label.edit}</td>
+    <td class="tableHeader">{$i18n.label.delete}</td>
+  </tr>
+{if $teams}
+  {foreach $teams as $team}
+  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+    <td>{$team.id}</td>
+    <td>{$team.name|escape}</td>
+    <td nowrap>{$team.date}</td>
+    <td align="center">{$team.lang}</td>
+    <td><a href="admin_group_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
+    <td><a href="admin_group_delete.php?id={$team.id}">{$i18n.label.delete}</a></td>
+  </tr>
+  {/foreach}
+{/if}
+</table>
+
+<table width="100%">
+  <tr>
+    <td align="center">
+      <br>
+      <form>
+        <input type="button" onclick="chLocation('admin_group_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
+        <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
+      </form>
+    </td>
+  </tr>
+</table>

diff --git a/WEB-INF/templates/admin_team_add.tpl b/WEB-INF/templates/admin_team_add.tpl
deleted file mode 100644 (file)
index 364b599..0000000
--- a/WEB-INF/templates/admin_team_add.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{$forms.teamForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right" nowrap>{$i18n.label.group_name}:</td>
-          <td>{$forms.teamForm.team_name.control}</td>
-        </tr>
-        <tr>
-           <td align="right" nowrap>{$i18n.label.language}:</td>
-           <td>{$forms.teamForm.lang.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.teamForm.manager_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.teamForm.manager_login.control}</td>
-        </tr>
-{if !$auth_external}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.teamForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.teamForm.password2.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.teamForm.manager_email.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_submit.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_team_delete.tpl
deleted file mode 100644 (file)
index a8b0712..0000000
--- a/WEB-INF/templates/admin_team_delete.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{$forms.teamForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td colspan="2" align="center"><b>{$team_to_delete|escape}</b></td>
-        </tr>
-        <tr>
-          <td colspan="2" align="center">&nbsp;</td>
-        </tr>
-        <tr>
-          <td align="right">{$forms.teamForm.btn_delete.control}&nbsp;</td>
-          <td align="left">&nbsp;{$forms.teamForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_team_edit.tpl b/WEB-INF/templates/admin_team_edit.tpl
deleted file mode 100644 (file)
index fb79204..0000000
--- a/WEB-INF/templates/admin_team_edit.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{$forms.teamForm.open}
-<table cellspacing="4" cellpadding="7" border="0">
-  <tr>
-    <td>
-      <table cellspacing="1" cellpadding="2" border="0">
-        <tr>
-          <td align="right" nowrap>{$i18n.label.group_name}:</td>
-          <td>{$forms.teamForm.team_name.control}</td>
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_name} (*):</td>
-          <td>{$forms.teamForm.manager_name.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.manager_login} (*):</td>
-          <td>{$forms.teamForm.manager_login.control}</td>
-        </tr>
-{if !$auth_external}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.password} (*):</td>
-          <td>{$forms.teamForm.password1.control}</td>
-        </tr>
-        <tr>
-          <td align="right" nowrap>{$i18n.label.confirm_password} (*):</td>
-          <td>{$forms.teamForm.password2.control}</td>
-        </tr>
-{/if}
-        <tr>
-          <td align="right" nowrap>{$i18n.label.email}:</td>
-          <td>{$forms.teamForm.manager_email.control}</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>{$i18n.label.required_fields}</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-          <td colspan="2" height="50" align="center">{$forms.teamForm.btn_save.control}&nbsp;{$forms.teamForm.btn_cancel.control}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-{$forms.teamForm.close}

diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
deleted file mode 100644 (file)
index 40207c8..0000000
--- a/WEB-INF/templates/admin_teams.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<script>
-  function chLocation(newLocation) { document.location = newLocation; }
-</script>
-
-<table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td valign="top">{$i18n.form.groups.hint}</td></tr>
-</table>
-
-<table cellspacing="1" cellpadding="3" border="0" width="720">
-  <tr>
-    <td width="3%" class="tableHeader">{$i18n.label.id}</td>
-    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
-    <td class="tableHeader">{$i18n.label.date}</td>
-    <td class="tableHeader">{$i18n.label.language}</td>
-    <td class="tableHeader">{$i18n.label.edit}</td>
-    <td class="tableHeader">{$i18n.label.delete}</td>
-  </tr>
-{if $teams}
-  {foreach $teams as $team}
-  <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
-    <td>{$team.id}</td>
-    <td>{$team.name|escape}</td>
-    <td nowrap>{$team.date}</td>
-    <td align="center">{$team.lang}</td>
-    <td><a href="admin_group_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
-    <td><a href="admin_group_delete.php?id={$team.id}">{$i18n.label.delete}</a></td>
-  </tr>
-  {/foreach}
-{/if}
-</table>
-
-<table width="100%">
-  <tr>
-    <td align="center">
-      <br>
-      <form>
-        <input type="button" onclick="chLocation('admin_group_add.php');" value="{$i18n.button.create_group}">&nbsp;{$i18n.label.or}&nbsp;
-        <input type="button" onclick="chLocation('import.php');" value="{$i18n.button.import}">
-      </form>
-    </td>
-  </tr>
-</table>
-      
\ No newline at end of file

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b526292a3ff58a0abbd406837f453fffe883e484..5cc7edc4789936f70912cb1792365d985e39cd1c 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.17.86.4226 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.86.4227 | 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/admin_group_add.php b/admin_group_add.php
index 7904d9f213c71ad02fdc9d4164a08db2cd2c659b..3684d6cd48ff0b1236a0780d14a2768468a32220 100644 (file)
--- a/admin_group_add.php
+++ b/admin_group_add.php
@@ -115,6 +115,6 @@ if ($request->isPost()) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');

-$smarty->assign('content_page_name', 'admin_team_add.tpl');
+$smarty->assign('content_page_name', 'admin_group_add.tpl');

 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->display('index.tpl');
 $smarty->assign('title', $i18n->get('title.create_group'));
 $smarty->display('index.tpl');

diff --git a/admin_group_delete.php b/admin_group_delete.php
index 99d508fbdde3ecbe82377690dc82935ba3c4cb93..48e60c31c25543f3a6d5e223d688250d01f2ab33 100644 (file)
--- a/admin_group_delete.php
+++ b/admin_group_delete.php
@@ -66,5 +66,5 @@ if ($request->isPost()) {
 $smarty->assign('team_to_delete', $team_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
 $smarty->assign('team_to_delete', $team_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));

-$smarty->assign('content_page_name', 'admin_team_delete.tpl');
+$smarty->assign('content_page_name', 'admin_group_delete.tpl');

 $smarty->display('index.tpl');
 $smarty->display('index.tpl');

diff --git a/admin_group_edit.php b/admin_group_edit.php
index 0efca4f6fb879cee6f8a6c637d5b678131e427cc..317624ab1c609d1d598b9454607de7aec67771cf 100644 (file)
--- a/admin_group_edit.php
+++ b/admin_group_edit.php
@@ -105,5 +105,5 @@ $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_group'));

-$smarty->assign('content_page_name', 'admin_team_edit.tpl');
+$smarty->assign('content_page_name', 'admin_group_edit.tpl');

 $smarty->display('index.tpl');
 $smarty->display('index.tpl');

diff --git a/admin_groups.php b/admin_groups.php
index a5521ad99a0ec34baaa06164b2344bca581bf7b3..bccbb058346669c5dec591a8064c0cce72d8cab2 100644 (file)
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -37,5 +37,5 @@ if (!ttAccessAllowed('administer_site')) {
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->get('title.groups'));
 
 $smarty->assign('teams', ttGroupHelper::getTopGroups());
 $smarty->assign('title', $i18n->get('title.groups'));

-$smarty->assign('content_page_name', 'admin_teams.tpl');
+$smarty->assign('content_page_name', 'admin_groups.tpl');

 $smarty->display('index.tpl');
 $smarty->display('index.tpl');