TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/thelia/thelia

Browse Source 
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
This commit is contained in:
gmorel
2013-11-28 20:58:24 +01:00
parent ef818c19ce b3a3cb2e8f
commit ffc699fa7f
52 changed files with 3104 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Controller/Admin/AbstractCrudController.php
View File

@@ -411,9 +411,9 @@ abstract class AbstractCrudController extends BaseAdminController
} catch (FormValidationException $ex) {
// Form cannot be validated
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
} catch (\Exception $ex) {
/*} catch (\Exception $ex) {
// Any other error
$error_msg = $ex->getMessage();
$error_msg = $ex->getMessage();*/
}
$this->setupFormErrorContext(

57
core/lib/Thelia/Controller/Admin/MessageController.php
View File

@@ -30,6 +30,9 @@ use Thelia\Core\Event\Message\MessageCreateEvent;
use Thelia\Model\MessageQuery;
use Thelia\Form\MessageModificationForm;
use Thelia\Form\MessageCreationForm;
use Symfony\Component\Finder\Finder;
use Thelia\Model\ConfigQuery;
use Thelia\Core\Template\TemplateHelper;
/**
* Manages messages sent by mail
@@ -90,6 +93,10 @@ class MessageController extends AbstractCrudController
->setLocale($formData["locale"])
->setTitle($formData['title'])
->setSubject($formData['subject'])
->setHtmlLayoutFileName($formData['html_layout_file_name'])
->setHtmlTemplateFileName($formData['html_template_file_name'])
->setTextLayoutFileName($formData['text_layout_file_name'])
->setTextTemplateFileName($formData['text_template_file_name'])
->setHtmlMessage($formData['html_message'])
->setTextMessage($formData['text_message'])
;
@@ -111,14 +118,19 @@ class MessageController extends AbstractCrudController
{
// Prepare the data that will hydrate the form
$data = array(
'id' => $object->getId(),
'name' => $object->getName(),
'secured' => $object->getSecured(),
'locale' => $object->getLocale(),
'title' => $object->getTitle(),
'subject' => $object->getSubject(),
'html_message' => $object->getHtmlMessage(),
'text_message' => $object->getTextMessage()
'id' => $object->getId(),
'name' => $object->getName(),
'secured' => $object->getSecured(),
'locale' => $object->getLocale(),
'title' => $object->getTitle(),
'subject' => $object->getSubject(),
'html_message' => $object->getHtmlMessage(),
'text_message' => $object->getTextMessage(),
'html_layout_file_name' => $object->getHtmlLayoutFileName(),
'html_template_file_name' => $object->getHtmlTemplateFileName(),
'text_layout_file_name' => $object->getTextLayoutFileName(),
'text_template_file_name' => $object->getTextTemplateFileName(),
);
// Setup the object form
@@ -152,17 +164,36 @@ class MessageController extends AbstractCrudController
return $this->render('messages');
}
protected function listDirectoryContent($requiredExtension) {
$list = array();
$dir = TemplateHelper::getInstance()->getActiveMailTemplate()->getAbsolutePath();
$finder = Finder::create()->files()->in($dir)->ignoreDotFiles(true)->sortByName()->name("*.$requiredExtension");
foreach ($finder as $file) {
$list[] = $file->getBasename();
}
return $list;
}
protected function renderEditionTemplate()
{
return $this->render('message-edit', array('message_id' => $this->getRequest()->get('message_id')));
return $this->render('message-edit', array(
'message_id' => $this->getRequest()->get('message_id'),
'layout_list' => $this->listDirectoryContent('tpl'),
'html_template_list' => $this->listDirectoryContent('html'),
'text_template_list' => $this->listDirectoryContent('txt'),
));
}
protected function redirectToEditionTemplate()
{
$this->redirectToRoute(
"admin.configuration.messages.update",
array('message_id' => $this->getRequest()->get('message_id'))
);
$this->redirectToRoute("admin.configuration.messages.update", array(
'message_id' => $this->getRequest()->get('message_id')
));
}
protected function redirectToListTemplate()

8
core/lib/Thelia/Controller/Admin/TranslationsController.php
View File

@@ -71,8 +71,8 @@ class TranslationsController extends BaseAdminController
case 'mo' :
if (null !== $module = ModuleQuery::create()->findPk($item_id)) {
$directory = THELIA_MODULE_DIR . $module->getBaseDir();
$i18n_directory = THELIA_TEMPLATE_DIR . $module->getI18nPath();
$directory = $module->getAbsoluteBaseDir();
$i18n_directory = $module->getAbsoluteI18nPath();
$walkMode = TemplateHelper::WALK_MODE_PHP;
}
break;
@@ -97,8 +97,8 @@ class TranslationsController extends BaseAdminController
}
if ($template) {
$directory = THELIA_TEMPLATE_DIR . $template->getPath();
$i18n_directory = THELIA_TEMPLATE_DIR . $template->getI18nPath();
$directory = $template->getAbsolutePath();
$i18n_directory = $template->getAbsoluteI18nPath();
}
// Load strings to translate