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

Internal overhaul

Browse Source
This commit is contained in:
Deon George
2013-11-28 17:41:34 +11:00
parent 0ed5e5163d
commit f8a5b153cf
91 changed files with 1570 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/email/classes/Email/Template.php
View File

@@ -134,8 +134,8 @@ class Email_Template {
}
}
if (isset($this->_data['bcc']))
$sm->setBcc($this->bcc);
if ($x=Arr::merge($this->bcc,Kohana::$config->load('debug.email_bcc_admin')))
$sm->setBcc($x);
if ($admin OR ($admin = Config::testmail($this->_etto->template->name))) {
$sm->setTo($admin);

4
modules/email/classes/Model/Email/Template/Translate.php
View File

@@ -17,6 +17,10 @@ class Model_Email_Template_Translate extends ORM_OSB {
'template'=>array('model'=>'Email_Template','foreign_key'=>'email_template_id'),
);
protected $_has_one = array(
'language'=>array('foreign_key'=>'id'),
);
protected $_save_message = TRUE;
public function complete($data,$column) {

44
modules/email/views/email/admin/add_edit_template.php
View File

@@ -1,38 +1,30 @@
<div class="row">
<div class="span9 offset1">
<div class="row">
<div class="span3">
<?php echo Form::input('name',$o->name,array('label'=>'Name','class'=>'span3')); ?>
</div>
</div> <!-- /row -->
<div class="span11">
<fieldset>
<legend>Update Template</legend>
<div class="row">
<div class="span3">
<?php echo StaticList_YesNo::form('status',$o->status,FALSE,array('label'=>'Email Template Active','class'=>'span1')); ?>
</div>
<?php echo Form::input('name',$o->name,array('label'=>'Name','class'=>'span3')); ?>
</div>
<div class="row">
<div class="span8">
<?php echo Form::textarea('notes',$o->notes,array('label'=>'Notes','class'=>'span8')); ?>
</div>
</div> <!-- /row -->
<?php echo StaticList_YesNo::form('status',$o->status,FALSE,array('label'=>'Email Template Active','class'=>'span1')); ?>
</div>
<div class="row">
<div class="span5">
<?php echo Form::select('language_id',ORM::factory('Language')->list_select(TRUE),'',array('label'=>'Language','required')); ?>
</div>
</div> <!-- /row -->
<?php echo Form::textarea('notes',$o->notes,array('label'=>'Notes','class'=>'span8')); ?>
</div>
<div class="row">
<div id="translate"></div>
</div> <!-- /row -->
<?php echo Form::select('language_id',ORM::factory('Language')->list_select(TRUE),'',array('label'=>'Language','required')); ?>
</div>
</fieldset>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
<div id="translate"></div>
<div class="row">
<div class="offset2">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</div>
</div> <!-- /row -->
</div> <! -- /span -->

10
modules/email/views/email/admin/ajaxtemplatetranslate.php
View File

@@ -1,4 +1,7 @@
<div class="span9">
<fieldset>
<legend><?php echo __(':language description for email template :pid',array(':pid'=>$o->id,':language'=>$o->language->name)); ?></legend>
<div class="row">
<?php echo Form::input('translate[subject]',$o->subject,array(
'label'=>'Email Subject',
'placeholder'=>'Email Subject',
@@ -6,7 +9,7 @@
'required',
'help-block'=>sprintf('This is the subject line on the email. Uses variables: %s',implode(', ',array_values($o->variables('subject')))))); ?>
</div>
<div class="span9">
<div class="row">
<?php echo Form::textarea('translate[message_text]',$o->message_text,array(
'label'=>'Message Text',
'placeholder'=>'Message Text',
@@ -14,7 +17,7 @@
'required',
'help-block'=>sprintf('The message in plain text that is used in the email for email clients that cannot render HTML. Uses variables: %s',implode(', ',array_values($o->variables('message_text')))))); ?>
</div>
<div class="span9">
<div class="row">
<?php echo Form::textarea('translate[message_html]',$o->message_html,array(
'label'=>'Message HTML',
'placeholder'=>'Message HTML',
@@ -23,6 +26,7 @@
'editor'=>'tinymce',
'help-block'=>sprintf('The message in HTML that is used in the email. Uses variables: %s',implode(', ',array_values($o->variables('message_html')))))); ?>'
</div>
</fieldset>
<?php echo Style::factory()->render_all(); ?>
<?php echo Script::factory()->render_all(); ?>

62
modules/email/views/email/user/view.php
View File

@@ -1,32 +1,34 @@
<div class="row">
<div class="span11">
<div class="span11">
<table>
<tr>
<td><strong>To:</strong></td>
<td><?php printf('%s (%s)',$elo->account->name(),$elo->display('email')); ?></td>
</tr>
<tr>
<td><strong>Date:</strong></td>
<td><?php echo $elo->display('date_orig'); ?></td>
</tr>
<tr>
<td><strong>Subject:</strong></td>
<td><?php echo $elo->resolve('subject'); ?></td>
</tr>
<tr>
<td colspan="2"><hr/></td>
</tr>
<tr>
<td colspan="2">
<table>
<tr>
<td><?php echo $elo->resolve('message_html'); ?></td>
</tr>
</table>
</td>
</tr>
</table>
<table>
<tr>
<td><strong>To:</strong></td>
<td><?php printf('%s (%s)',$elo->account->name(),$elo->display('email')); ?></td>
</tr>
</div> <!-- /span -->
</div> <!-- /row -->
<tr>
<td><strong>Date:</strong></td>
<td><?php echo $elo->display('date_orig'); ?></td>
</tr>
<tr>
<td><strong>Subject:</strong></td>
<td><?php echo $elo->resolve('subject'); ?></td>
</tr>
<tr>
<td colspan="2"><hr/></td>
</tr>
<tr>
<td colspan="2">
<table>
<tr>
<td><?php echo $elo->resolve('message_html'); ?></td>
</tr>
</table>
</td>
</tr>
</table>
</div> <!-- /span -->