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

1
install/insert.sql
View File

@@ -10,6 +10,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
('active-front-template', 'default', 0, 0, NOW(), NOW()),
('active-admin-template', 'default', 0, 0, NOW(), NOW()),
('active-pdf-template', 'default', 0, 0, NOW(), NOW()),
('active-mail-template', 'default', 0, 0, NOW(), NOW()),
('default_lang_without_translation', '1', 1, 1, NOW(), NOW()),
('rewriting_enable', '0', 0, 0, NOW(), NOW()),
('imagine_graphic_driver', 'gd', 0, 0, NOW(), NOW()),

11
install/thelia.sql
View File

@@ -1060,6 +1060,10 @@ CREATE TABLE `message`
`id` INTEGER NOT NULL AUTO_INCREMENT,
`name` VARCHAR(255) NOT NULL,
`secured` TINYINT,
`text_layout_file_name` VARCHAR(255),
`text_template_file_name` VARCHAR(255),
`html_layout_file_name` VARCHAR(255),
`html_template_file_name` VARCHAR(255),
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0,
@@ -1652,6 +1656,9 @@ CREATE TABLE `product_i18n`
`description` LONGTEXT,
`chapo` TEXT,
`postscriptum` TEXT,
`meta_title` VARCHAR(255),
`meta_description` TEXT,
`meta_keyword` TEXT,
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `product_i18n_FK_1`
FOREIGN KEY (`id`)
@@ -2342,6 +2349,10 @@ CREATE TABLE `message_version`
`id` INTEGER NOT NULL,
`name` VARCHAR(255) NOT NULL,
`secured` TINYINT,
`text_layout_file_name` VARCHAR(255),
`text_template_file_name` VARCHAR(255),
`html_layout_file_name` VARCHAR(255),
`html_template_file_name` VARCHAR(255),
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0 NOT NULL,