bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 07:30:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor webui fixes around the group handling

Browse Source
This commit is contained in:
SJ 2012-06-22 13:37:13 +02:00
parent e944852283
commit 16b01b9b37
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webui/controller/group/add.php
View File

@ -41,14 +41,10 @@ class ControllerGroupAdd extends Controller {
if($ret == 0) { if($ret == 0) {
//$this->data['post'] = $this->request->post; $this->data['post'] = $this->request->post;
//$this->data['next_group_id'] = $this->model_group_group->getNextUid();
} }
} }
else {
//$this->data['next_group_id'] = $this->model_group_group->getNextUid();
}
} }
else { else {
$this->template = "common/error.tpl"; $this->template = "common/error.tpl";
@ -68,6 +64,9 @@ class ControllerGroupAdd extends Controller {
$this->error['group'] = $this->data['text_missing_data']; $this->error['group'] = $this->data['text_missing_data'];
} }
if(!isset($this->request->post['email']) || $this->request->post['email'] == '') {
$this->error['email'] = $this->data['text_missing_data'];
}
if (!$this->error) { if (!$this->error) {
return true; return true;

3
webui/language/en/messages.php
View File

@ -76,13 +76,14 @@ $_['text_download_message2'] = "download message";
$_['text_edit'] = "Edit"; $_['text_edit'] = "Edit";
$_['text_edit_or_view'] = "Edit/view"; $_['text_edit_or_view'] = "Edit/view";
$_['text_email'] = "Email address"; $_['text_email'] = "Email address";
$_['text_email_addresses'] = "Email address(es)"; $_['text_email_addresses'] = "Email addresses";
$_['text_email_aliases'] = "Email aliases"; $_['text_email_aliases'] = "Email aliases";
$_['text_email_in_unknown_domain'] = "Email address is in an unknown domain"; $_['text_email_in_unknown_domain'] = "Email address is in an unknown domain";
$_['text_empty_search_criteria'] = "'Empty criteria'"; $_['text_empty_search_criteria'] = "'Empty criteria'";
$_['text_empty_search_result'] = "Empty search result"; $_['text_empty_search_result'] = "Empty search result";
$_['text_enable'] = "Enable"; $_['text_enable'] = "Enable";
$_['text_enabled'] = "enabled"; $_['text_enabled'] = "enabled";
$_['text_enter_one_email_address_per_line'] = "Enter one email address per line";
$_['text_enter_search_terms'] = "Enter your search terms"; $_['text_enter_search_terms'] = "Enter your search terms";
$_['text_error'] = "Error"; $_['text_error'] = "Error";
$_['text_exact_domain_name_or_email_address'] = "exact domain name or email address"; $_['text_exact_domain_name_or_email_address'] = "exact domain name or email address";

3
webui/language/hu/messages.iso-8859-2.php
View File

@ -76,13 +76,14 @@ $_['text_download_message2'] = "lev
$_['text_edit'] = "Szerkeszt"; $_['text_edit'] = "Szerkeszt";
$_['text_edit_or_view'] = "Szerkeszt/Megnéz"; $_['text_edit_or_view'] = "Szerkeszt/Megnéz";
$_['text_email'] = "Email cím"; $_['text_email'] = "Email cím";
$_['text_email_addresses'] = "Email cím(ek)"; $_['text_email_addresses'] = "Email címek";
$_['text_email_aliases'] = "Email álcímek"; $_['text_email_aliases'] = "Email álcímek";
$_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van"; $_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van";
$_['text_empty_search_criteria'] = "'Üres feltétel'"; $_['text_empty_search_criteria'] = "'Üres feltétel'";
$_['text_empty_search_result'] = "Nincs találat a keresésre"; $_['text_empty_search_result'] = "Nincs találat a keresésre";
$_['text_enable'] = "Engedélyez"; $_['text_enable'] = "Engedélyez";
$_['text_enabled'] = "engedélyezve"; $_['text_enabled'] = "engedélyezve";
$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email címet írjon";
$_['text_enter_search_terms'] = "Írja be a keresési feltételeket"; $_['text_enter_search_terms'] = "Írja be a keresési feltételeket";
$_['text_error'] = "Hiba"; $_['text_error'] = "Hiba";
$_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím"; $_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím";

3
webui/language/hu/messages.php
View File

@ -76,13 +76,14 @@ $_['text_download_message2'] = "levél letöltése";
$_['text_edit'] = "Szerkeszt"; $_['text_edit'] = "Szerkeszt";
$_['text_edit_or_view'] = "Szerkeszt/Megnéz"; $_['text_edit_or_view'] = "Szerkeszt/Megnéz";
$_['text_email'] = "Email cím"; $_['text_email'] = "Email cím";
$_['text_email_addresses'] = "Email cím(ek)"; $_['text_email_addresses'] = "Email címek";
$_['text_email_aliases'] = "Email álcímek"; $_['text_email_aliases'] = "Email álcímek";
$_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van"; $_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van";
$_['text_empty_search_criteria'] = "'Üres feltétel'"; $_['text_empty_search_criteria'] = "'Üres feltétel'";
$_['text_empty_search_result'] = "Nincs találat a keresésre"; $_['text_empty_search_result'] = "Nincs találat a keresésre";
$_['text_enable'] = "Engedélyez"; $_['text_enable'] = "Engedélyez";
$_['text_enabled'] = "engedélyezve"; $_['text_enabled'] = "engedélyezve";
$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email címet írjon";
$_['text_enter_search_terms'] = "Írja be a keresési feltételeket"; $_['text_enter_search_terms'] = "Írja be a keresési feltételeket";
$_['text_error'] = "Hiba"; $_['text_error'] = "Hiba";
$_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím"; $_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím";

10
webui/view/theme/default/templates/group/add.tpl
View File

@ -14,10 +14,16 @@
</div> </div>
<div class="domainrow"> <div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>:</div> <div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div> <div class="domaincell"><textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div>
</div> </div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
</div>
<div class="domainrow"> <div class="domainrow">
<div class="domaincell">&nbsp;</div> <div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" value="<?php print $text_add; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div> <div class="domaincell"><input type="submit" value="<?php print $text_add; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>

7
webui/view/theme/default/templates/group/edit.tpl
View File

@ -13,10 +13,15 @@
</div> </div>
<div class="domainrow"> <div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>:</div> <div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea></div> <div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea></div>
</div> </div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
</div>
<div class="domainrow"> <div class="domainrow">
<div class="domaincell">&nbsp;</div> <div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" value="<?php print $text_modify; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div> <div class="domaincell"><input type="submit" value="<?php print $text_modify; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>