Merge branch 'master' of https://github.com/thelia/thelia into coupon

* 'master' of https://github.com/thelia/thelia: (121 commits)
  set cartItem in cart add and update events
  need to unescape breadcrumb strings after been in array
  update readme file
  update insert.sql with new release version
  change changelog file format
  Prevent product and content création at catalog root
  dynamic delivery modules on delivery front template
  complete changelog
  Finished merging modules with master
  Revert "Merge branch 'cleanmaster' into modules"
  use TaxEngine::getDeliveryCountry in delivery loop
  refacto getTaxCountry which is actually getDeliveryCountry
  make it magic last stand
  change loop in shipping zone template using module insteadof delivery
  Fixed template loop
  Refactored templates processing
  complete readme file
  change email address of core contributors
  fix getPosition folder test
  add coupon tests
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
This commit is contained in:
gmorel
2013-12-25 14:14:20 +01:00
199 changed files with 7036 additions and 2625 deletions

View File

@@ -0,0 +1,9 @@
<routes xmlns="http://symfony.com/schema/routing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
<!-- Route to administration base -->
<route id="theliadebugbar.main" path="/admin/module/TheliaDebugBar">
<default key="_controller">TheliaDebugBar\Controller\Admin\TheliaDebugBarController::indexAction</default>
</route>
</routes>

View File

@@ -0,0 +1,18 @@
<?php
namespace TheliaDebugBar\Controller\Admin;
use Thelia\Controller\Admin\BaseAdminController;
use Thelia\Core\Security\AccessManager;
class TheliaDebugBarController extends BaseAdminController
{
const RESOURCE_CODE = 'module.TheliaDebugBar';
public function indexAction()
{
if (null !== $response = $this->checkAuth(self::RESOURCE_CODE, array(), AccessManager::VIEW)) return $response;
// Render the edition template.
return $this->render('tdb-index');
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -0,0 +1,61 @@
{extends file="admin-layout.tpl"}
{block name="page-title"}{intl l='Debug Bar'}{/block}
{block name="check-resource"}module.TheliaDebugBar{/block}
{block name="check-access"}view{/block}
{block name="main-content"}
<div class="modules">
<div id="wrapper" class="container">
<div class="clearfix">
<ul class="breadcrumb pull-left">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/modules'}">{intl l="Modules"}</a></li>
<li><a href="#">{intl l="Thelia Debug Bar"}</a></li>
</ul>
</div>
<div class="row">
<div class="col-md-12">
<div class="general-block-decorator">
<h1>Hello World !</h1>
<div>
<p>Here is a general asset :</p>
<p>
{images file='assets/img/logo-thelia-34px.png'}
<img src="{$asset_url}" />
{/images}
</p>
</div>
<div>
<p>Here is a module asset :</p>
<p>
{images source="TheliaDebugBar" file='assets/img/db-loader.gif'}
<img src="{$asset_url}" />
{/images}
</p>
</div>
</div>
</div>
</div>
</div>
</div>
{/block}
{block name="javascript-initialization"}
<script>
</script>
{/block}