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

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

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-24 17:42:22 +02:00
parent 2dc4589126 91f2920336
commit 32725832f1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Core/EventListener/ViewListener.php
View File

@@ -84,13 +84,13 @@ class ViewListener implements EventSubscriberInterface
$response = new Response($content, $parser->getStatus() ?: 200); $response = new Response($content, $parser->getStatus() ?: 200);
} }
$response->setCache(array( /* $response->setCache(array(
'last_modified' => new \DateTime(), 'last_modified' => new \DateTime(),
'max_age' => 600, 'max_age' => 600,
's_maxage' => 600, 's_maxage' => 600,
'private' => false, 'private' => false,
'public' => true, 'public' => true,
)); ));*/
$event->setResponse($response); $event->setResponse($response);
} catch (ResourceNotFoundException $e) { } catch (ResourceNotFoundException $e) {

4
templates/admin/default/configuration.html
View File

@@ -151,7 +151,7 @@
</tr> </tr>
{/loop} {/loop}
{loop type="auth" name="pcc6" role="ADMIN" resource="admin.configuration.mailing-system" access="VIEW"} {* {loop type="auth" name="pcc6" role="ADMIN" resource="admin.configuration.mailing-system" access="VIEW"}
<tr> <tr>
<td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td> <td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td>
<td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/mailing_system'}"><i class="glyphicon glyphicon-edit"></i></a></td> <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/mailing_system'}"><i class="glyphicon glyphicon-edit"></i></a></td>
@@ -170,7 +170,7 @@
<td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td> <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
<td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td> <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
</tr> </tr>
{/loop} {/loop}*}
{module_include location='system_configuration_bottom'} {module_include location='system_configuration_bottom'}
</table> </table>

2
templates/default/cart.html
View File

@@ -70,7 +70,7 @@
{/elseloop} {/elseloop}
</td> </td>
<td class="product" > <td class="product" >
<h3 class="name"><a href="{$URL}"> <h3 class="name"><a href="{$PRODUCT_URL}">
{$TITLE} {$TITLE}
</a></h3> </a></h3>
<div class="product-options"> <div class="product-options">