From 9b11ada8adfdfe888c50f799e6523c8df95d090f Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 6 Apr 2018 14:22:42 +0000 Subject: [PATCH] More refactoring. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/register.tpl | 22 +++++++++++----------- register.php | 10 +++++----- users.php | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a4b7a7d0..0fc36c1c 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.87.4234 | Copyright © Anuko | +  Anuko Time Tracker 1.17.87.4235 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl index 49fd2267..96687797 100644 --- a/WEB-INF/templates/register.tpl +++ b/WEB-INF/templates/register.tpl @@ -1,40 +1,40 @@ -{$forms.profileForm.open} +{$forms.groupForm.open}
- + - + - + - + - + - + - + - + @@ -42,10 +42,10 @@ - +
{$i18n.label.group_name}:{$forms.profileForm.team_name.control}{$forms.groupForm.group_name.control}
{$i18n.label.currency}:{$forms.profileForm.currency.control}{$forms.groupForm.currency.control}
{$i18n.label.language}:{$forms.profileForm.lang.control}{$forms.groupForm.lang.control}
 
{$i18n.label.manager_name} (*):{$forms.profileForm.manager_name.control}{$forms.groupForm.manager_name.control}
{$i18n.label.manager_login} (*):{$forms.profileForm.manager_login.control}{$forms.groupForm.manager_login.control}
{$i18n.label.password} (*):{$forms.profileForm.password1.control}{$forms.groupForm.password1.control}
{$i18n.label.confirm_password} (*):{$forms.profileForm.password2.control}{$forms.groupForm.password2.control}
{$i18n.label.email}:{$forms.profileForm.manager_email.control}{$forms.groupForm.manager_email.control}
 
{$forms.profileForm.btn_submit.control}{$forms.groupForm.btn_submit.control}
-{$forms.profileForm.close} +{$forms.groupForm.close} diff --git a/register.php b/register.php index d1e9ff90..4568e370 100644 --- a/register.php +++ b/register.php @@ -39,7 +39,7 @@ $auth->doLogout(); if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$'); if ($request->isPost()) { - $cl_team_name = trim($request->getParameter('team_name')); + $cl_group_name = trim($request->getParameter('group_name')); $cl_currency = trim($request->getParameter('currency')); if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT; $cl_lang = $request->getParameter('lang'); @@ -53,8 +53,8 @@ if ($request->isPost()) { $cl_lang = $i18n->lang; // Browser setting from initialize.php. } -$form = new Form('profileForm'); -$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team_name)); +$form = new Form('groupForm'); +$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group_name)); $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency)); // Prepare an array of available languages. @@ -90,7 +90,7 @@ if ($request->isPost()) { 'password1' => $cl_password1, 'password2' => $cl_password2, 'email' => $cl_manager_email, - 'group_name' => $cl_team_name, + 'group_name' => $cl_group_name, 'currency' => $cl_currency, 'lang' => $cl_lang); @@ -113,6 +113,6 @@ if ($request->isPost()) { $smarty->assign('title', $i18n->get('title.create_group')); $smarty->assign('forms', array($form->getName()=>$form->toArray())); -$smarty->assign('onload', 'onLoad="document.profileForm.team.focus()"'); +$smarty->assign('onload', 'onLoad="document.groupForm.group_name.focus()"'); $smarty->assign('content_page_name', 'register.tpl'); $smarty->display('index.tpl'); diff --git a/users.php b/users.php index af538902..d20617bc 100644 --- a/users.php +++ b/users.php @@ -52,7 +52,7 @@ if($user->can('manage_users')) { $inactive_users = $user->getUsers($options); } -// Check if the team is set to show indicators for uncompleted time entries. +// Check if the group is set to show indicators for uncompleted time entries. if ($user->uncompleted_indicators) { // Check each active user if they have an uncompleted time entry. foreach ($active_users as $key => $user) { -- 2.20.1