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

Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module

Browse Source
This commit is contained in:
Franck Allimant
2013-10-31 11:36:56 +01:00
parent 1ce6dfe04d
commit a295fee0d3
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Command/BaseModuleGenerate.php
View File

@@ -42,7 +42,7 @@ abstract class BaseModuleGenerate extends ContainerAwareCommand
'Config',
'Model',
'Loop',
'AdminModule'
'AdminIncludes'
);
protected function verifyExistingModule()

2
core/lib/Thelia/Core/Template/Smarty/Plugins/Module.php
View File

@@ -47,7 +47,7 @@ class Module extends AbstractSmartyPlugin
foreach ($modules as $module) {
$file = THELIA_MODULE_DIR . "/". ucfirst($module->getCode()) . "/ModuleAdmin/".$location.".html";
$file = THELIA_MODULE_DIR . "/". ucfirst($module->getCode()) . "/AdminIncludes/".$location.".html";
if(file_exists($file)) {
$content .= file_get_contents($file);
}

2
local/modules/TheliaDebugBar/AdminIncludes/footer_js.html Normal file
View File

@@ -0,0 +1,2 @@
{debugbar_renderjs}
{debugbar_renderresult}

3
local/modules/TheliaDebugBar/AdminIncludes/head_css.html Normal file
View File

@@ -0,0 +1,3 @@
{* Include debug bar smarty calls *}
{debugbar_rendercss}

7
templates/admin/default/admin-layout.tpl
View File

@@ -26,8 +26,6 @@
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{debugbar_rendercss}
{block name="after-bootstrap-css"}{/block}
{* -- Admin CSS section ------------------------------------------------- *}
@@ -245,11 +243,6 @@
}
</script>
{debugbar_renderjs}
{debugbar_renderresult}
{block name="after-javascript-include"}{/block}
{javascripts file='assets/js/bootstrap/bootstrap.js'}

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

@@ -165,12 +165,12 @@
</tr>
{/loop}
{* {loop type="auth" name="pcc8" role="ADMIN" resource="admin.configuration.system-logs" access="VIEW"}
{loop type="auth" name="pcc8" role="ADMIN" resource="admin.configuration.system-logs" access="VIEW"}
<tr>
<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>
</tr>
{/loop}*}
{/loop}
{module_include location='system_configuration_bottom'}
</table>