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

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

Browse Source 
* 'master' of git://github.com/thelia/thelia:
  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
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
This commit is contained in:
gmorel
2013-11-27 19:16:17 +01:00
parent 95c4113ca8 1cd07603d3
commit 59932078fc
23 changed files with 518 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -118,6 +118,7 @@
<form name="thelia.lang.defaultBehavior" class="Thelia\Form\Lang\LangDefaultBehaviorForm"/>
<form name="thelia.lang.url" class="Thelia\Form\Lang\LangUrlForm"/>
<form name="thelia.configuration.store" class="Thelia\Form\ConfigStoreForm"/>
<form name="thelia.system-logs.configuration" class="Thelia\Form\SystemLogConfigurationForm"/>
<form name="thelia.admin.module.modification" class="Thelia\Form\ModuleModificationForm"/>

11
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -512,6 +512,17 @@
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>
<!-- Routes to the ConfigStore controller -->
<route id="admin.configuration.store.default" path="/admin/configuration/store">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::defaultAction</default>
</route>
<route id="admin.configuration.store.save" path="/admin/configuration/store/save">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::saveAction</default>
</route>
<!-- Routes to the SystemLog controller -->
<route id="admin.configuration.system-logs.default" path="/admin/configuration/system-logs">