deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Consistency updates for use of viewpath()

Browse Source
This commit is contained in:
Deon George
2011-12-21 12:39:21 +11:00
parent a40ce27a16
commit a893527d77
42 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/email/classes/controller/admin/email.php
View File

@@ -50,12 +50,13 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
$eto = ORM::factory('email_template');
$output = '';
$output .= View::factory('email/admin/template/list_head');
// @todo Change this to use Table::
$output .= View::factory($this->viewpath().'/head');
foreach ($eto->find_all() as $et) {
$output .= View::factory('email/admin/template/list_body')
$output .= View::factory($this->viewpath().'/body')
->set('template',$et);
}
$output .= View::factory('email/admin/template/list_foot');
$output .= View::factory($this->viewpath().'/foot');
Block::add(array(
'title'=>_('Available Email Templates'),
@@ -85,8 +86,8 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
}
$output .= Form::open();
$output .= View::factory('email/admin/template/add');
$output .= View::factory('email/admin/template/translate/add');
$output .= View::factory($this->viewpath());
$output .= View::factory($this->viewpath().'/translate');
$output .= '<div>'.Form::submit('submit',_('Add'),array('class'=>'form_button')).'</div>';
$output .= Form::close();
@@ -99,6 +100,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
/**
* Edit Template Definition
* @todo Change this into an add_view function like payment()
*/
public function action_templateedit($id) {
$eto = ORM::factory('email_template',$id);
@@ -122,11 +124,11 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
$output .= Form::open();
$output .= View::factory('email/admin/template/edit')
$output .= View::factory($this->viewpath())
->set('template',$eto);
foreach ($eto->email_template_translate->find_all() as $to) {
$output .= View::factory('email/admin/template/translate/edit')
$output .= View::factory($this->viewpath().'/translate')
->set('translate',$to);
SystemMessage::add(array(

14
modules/email/classes/controller/user/email.php
View File

@@ -39,17 +39,7 @@ class Controller_User_Email extends Controller_TemplateDefault_User {
}
public function action_view() {
$output = '';
if (! $id = $this->request->param('id')) {
if (isset($_POST['id']) AND is_array($_POST['id']))
Table::post('email_view','id');
list($id,$output) = Table::page('email_view');
} else {
$id = $this->request->param('id');
}
list($id,$output) = Table::page(__METHOD__);
$elo = ORM::factory('email_log',$id);
@@ -58,7 +48,7 @@ class Controller_User_Email extends Controller_TemplateDefault_User {
return FALSE;
}
$output .= View::factory('email/user/view')
$output .= View::factory($this->viewpath())
->set('elo',$elo);
Block::add(array(