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

Merge pull request #55 from thelia/frontend

Browse Source 
Frontend
This commit is contained in:
Manuel Raynaud
2013-10-24 12:31:42 -07:00
parent b8751b26a5 29c7d077c6
commit a85c0a75cf
7 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Config/Resources/routing/front.xml
View File

@@ -95,6 +95,11 @@
<!-- end customer address routes -->
<!-- cart routes -->
<route id="cart.view" path="/cart">
<default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
<default key="_view">cart</default>
</route>
<route id="cart.add.process" path="/cart/add">
<default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
</route>

2
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -64,7 +64,7 @@ class BaseFrontController extends BaseController
{
$cart = $this->getSession()->getCart();
if ($cart===null || $cart->countCartItems() == 0) {
$this->redirectToRoute('default', array('view'=>'cart'));
$this->redirectToRoute('cart.view');
}
}

2
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -109,7 +109,7 @@ class CustomerController extends BaseFrontController
$cart = $this->getCart($this->getRequest());
if ($cart->getCartItems()->count() > 0) {
$this->redirectToRoute('default', array('view'=>'cart'));
$this->redirectToRoute('cart.view');
} else {
$this->redirectSuccess($customerCreation);
}

2
core/lib/Thelia/Controller/Front/OrderController.php
View File

@@ -197,7 +197,7 @@ class OrderController extends BaseFrontController
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute('order.placed', array('order_id' => $orderEvent->getPlacedOrder()->getId()))));
} else {
/* order has not been placed */
$this->redirectToRoute('default', array('view'=>'cart'));
$this->redirectToRoute('cart.view');
}
}

2
templates/admin/default/customer-edit.html
View File

@@ -29,7 +29,7 @@
<div class="form-container">
<div class="col-md-12">
{form name="thelia.admin.customer.modification"}
{form name="thelia.admin.customer.update"}
<form method="POST" action="{url path="/admin/customer/update/{$ID}"}" {form_enctype form=$form} class="clearfix">
<div class="row inner-toolbar clearfix">

2
templates/default/account.html
View File

@@ -58,7 +58,7 @@
<span class="email">{mailto address="{$EMAIL}" encode="hex"}</span>
</li>
<li class="group-btn">
<a href="{url path="/account/update"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account informations"}</a>
<a href="{url path="/account/update"}" class="btn btn-change-account"><i class="icon-pencil"></i> {intl l="Change my account information"}</a>
<a href="{url path="/account/password"}" class="btn btn-change-password"><i class="icon-lock"></i> {intl l="Change my password"}</a>
</li>
</ul>

21
templates/default/layout.tpl
View File

@@ -222,22 +222,29 @@ URL: http://www.thelia.net
</div>
<div class="col">
<section class="block block-default">
<div class="block-heading"><h3 class="block-title">Usefull links</h3></div>
<div class="block-heading"><h3 class="block-title">{intl l="Usefull links"}</h3></div>
<div class="block-content">
<ul>
{loop name="footer_links" type="content" folder="2"}
<li><a href="{$URL}">{$TITLE}</a></li>
{/loop}
<li><a href="{url path="/login"}">Login</a></li>
<li><a href="{url path="/register"}">Register</a></li>
<li><a href="{url path="/order/delivery"}">Checkout</a></li>
{loop type="auth" name="customer_is_logged" role="CUSTOMER" context="front"}
<li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
<li><a href="{url path="/account"}" class="account">{intl l="My Account"}</a></li>
{/loop}
{elseloop rel="customer_is_logged"}
<li><a href="{url path="/login"}">{intl l="Login"}</a></li>
<li><a href="{url path="/register"}">{intl l="Register"}</a></li>
{/elseloop}
<li><a href="{url path="/Cart"}">{intl l="Cart"}</a></li>
<li><a href="{url path="/order/delivery"}">{intl l="Checkout"}</a></li>
</ul>
</div>
</section>
</div>
<div class="col">
<section class="block block-social">
<div class="block-heading"><h3 class="block-title">Follow us</h3></div>
<div class="block-heading"><h3 class="block-title">{intl l="Follow us"}</h3></div>
<div class="block-content">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
<ul role="presentation">
@@ -315,7 +322,7 @@ URL: http://www.thelia.net
<div class="col">
<section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
<div class="block-heading"><h3 class="block-title">Contact Us</h3></div>
<div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
<div class="block-content">
<meta itemprop="name" content="{config key="company_name"}">
<ul>
@@ -351,7 +358,7 @@ URL: http://www.thelia.net
{/loop}
{*<li><a href="#">Site Map</a></li>
<li><a href="#">Terms & Conditions</a></li>*}
<li><a href="{url path="/contact"}">Contact Us</a></li>
<li><a href="{url path="/contact"}">{intl l="Contact Us"}</a></li>
</ul>
</nav>