Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Restructure template for Admin module

  • Loading branch information...
commit e1f0f712431ace0494be460a3dd7c302459a174a 1 parent 16cd4ae
Drak authored
Showing with 17 additions and 20 deletions.
  1. +2 −2 web/system/AdminModule/Api/AdminApi.php
  2. +1 −1  web/system/AdminModule/Block/AdminnavBlock.php
  3. +9 −12 web/system/AdminModule/Controller/AdminController.php
  4. 0  web/system/AdminModule/Resources/views/{admin_admin_adminpanel.tpl → Admin/adminpanel.tpl}
  5. 0  web/system/AdminModule/Resources/views/{admin_admin_ajaxAddCategory.tpl → Admin/ajaxAddCategory.tpl}
  6. +5 −5 web/system/AdminModule/Resources/views/{admin_admin_categorymenu.tpl → Admin/categorymenu.tpl}
  7. 0  web/system/AdminModule/Resources/views/{admin_admin_delete.tpl → Admin/delete.tpl}
  8. 0  web/system/AdminModule/Resources/views/{admin_admin_developernotices.tpl → Admin/developernotices.tpl}
  9. 0  web/system/AdminModule/Resources/views/{admin_admin_footer.tpl → Admin/footer.tpl}
  10. 0  web/system/AdminModule/Resources/views/{admin_admin_header.tpl → Admin/header.tpl}
  11. 0  web/system/AdminModule/Resources/views/{admin_admin_help.tpl → Admin/help.tpl}
  12. 0  web/system/AdminModule/Resources/views/{admin_admin_modify.tpl → Admin/modify.tpl}
  13. 0  web/system/AdminModule/Resources/views/{admin_admin_modifyconfig.tpl → Admin/modifyconfig.tpl}
  14. 0  web/system/AdminModule/Resources/views/{admin_admin_newcat.tpl → Admin/newcat.tpl}
  15. 0  web/system/AdminModule/Resources/views/{admin_admin_securityanalyzer.tpl → Admin/securityanalyzer.tpl}
  16. 0  web/system/AdminModule/Resources/views/{admin_admin_updatechecker.tpl → Admin/updatechecker.tpl}
  17. 0  web/system/AdminModule/Resources/views/{admin_admin_view.tpl → Admin/view.tpl}
  18. 0  web/system/AdminModule/Resources/views/{admin_admin_warning.tpl → Admin/warning.tpl}
  19. 0  web/system/AdminModule/Resources/views/{admin_block_adminnav.tpl → Block/adminnav.tpl}
View
4 web/system/AdminModule/Api/AdminApi.php
@@ -383,7 +383,7 @@ public function countModsInCat($args)
public function adminheader()
{
$view = \Zikula_View::getInstance('Admin');
- return $view->fetch('admin_admin_header.tpl');
+ return $view->fetch('Admin/header.tpl');
}
/**
@@ -392,6 +392,6 @@ public function adminheader()
public function adminfooter()
{
$view = \Zikula_View::getInstance('Admin');
- return $view->fetch('admin_admin_footer.tpl');
+ return $view->fetch('Admin/footer.tpl');
}
}
View
2  web/system/AdminModule/Block/AdminnavBlock.php
@@ -108,7 +108,7 @@ public function display($blockinfo)
$this->view->assign('admincategories', $admincategories);
// Populate block info and pass to theme
- $blockinfo['content'] = $this->view->fetch('admin_block_adminnav.tpl');
+ $blockinfo['content'] = $this->view->fetch('Block/adminnav.tpl');
return \BlockUtil::themeBlock($blockinfo);
}
View
21 web/system/AdminModule/Controller/AdminController.php
@@ -76,7 +76,7 @@ public function viewAction($args = array())
'itemsperpage' => $itemsperpage));
// Return the output that has been generated by this function
- return $this->response($this->view->fetch('admin_admin_view.tpl'));
+ return $this->response($this->view->fetch('Admin/view.tpl'));
}
/**
@@ -92,7 +92,7 @@ public function newcatAction()
}
// Return the output that has been generated by this function
- return $this->response($this->view->fetch('admin_admin_newcat.tpl'));
+ return $this->response($this->view->fetch('Admin/newcat.tpl'));
}
/**
@@ -153,7 +153,7 @@ public function modifyAction(array $args = array())
$this->view->assign('category', $category);
- return $this->response($this->view->fetch('admin_admin_modify.tpl'));
+ return $this->response($this->view->fetch('Admin/modify.tpl'));
}
/**
@@ -232,7 +232,7 @@ public function deleteAction(array $args = array())
// No confirmation yet - display a suitable form to obtain confirmation
// of this action from the user
return $this->response($this->view->assign('category', $category)
- ->fetch('admin_admin_delete.tpl'));
+ ->fetch('Admin/delete.tpl'));
}
$this->checkCsrfToken();
@@ -268,7 +268,7 @@ public function adminpanelAction()
if ($zrcexists == true) {
return $this->response($this->view->assign('zrcexists', $zrcexists)
->assign('adminpanellink', \ModUtil::url('AdminModule', 'admin', 'adminpanel'))
- ->fetch('admin_admin_warning.tpl'));
+ ->fetch('Admin/warning.tpl'));
}
}
@@ -342,9 +342,6 @@ public function adminpanelAction()
$modpath . '/' . $osmoddir . '/Resources/public/images/admin.png',
$modpath . '/' . $osmoddir . '/Resources/public/images/admin.jpg',
$modpath . '/' . $osmoddir . '/Resources/public/images/admin.gif',
- $modpath . '/' . $osmoddir . '/images/admin.png',
- $modpath . '/' . $osmoddir . '/images/admin.jpg',
- $modpath . '/' . $osmoddir . '/images/admin.gif',
'system/AdminModule/Resources/public/images/default.gif');
foreach ($adminicons as $adminicon) {
@@ -366,7 +363,7 @@ public function adminpanelAction()
usort($adminlinks, 'AdminModule\Controller\_sortAdminModsByOrder');
$this->view->assign('adminlinks', $adminlinks);
- return $this->response($this->view->fetch('admin_admin_adminpanel.tpl'));
+ return $this->response($this->view->fetch('Admin/adminpanel.tpl'));
}
/**
@@ -414,7 +411,7 @@ public function modifyconfigAction()
$this->view->assign('modulecategories', $modulecategories);
// Return the output that has been generated by this function
- return $this->response($this->view->fetch('admin_admin_modifyconfig.tpl'));
+ return $this->response($this->view->fetch('Admin/modifyconfig.tpl'));
}
/**
@@ -579,7 +576,7 @@ public function categorymenuAction(array $args = array())
$this->view->assign('notices', $notices);
// this should not return a response since it's being used as an API call for some odd reason... drak
- return $this->view->fetch('admin_admin_categorymenu.tpl');
+ return $this->view->fetch('Admin/categorymenu.tpl');
}
/**
@@ -592,7 +589,7 @@ public function helpAction()
throw new \Zikula\Framework\Exception\ForbiddenException();
}
- return $this->response($this->view->fetch('admin_admin_help.tpl'));
+ return $this->response($this->view->fetch('Admin/help.tpl'));
}
/**
View
0  ...esources/views/admin_admin_adminpanel.tpl → ...dule/Resources/views/Admin/adminpanel.tpl
File renamed without changes
View
0  ...ces/views/admin_admin_ajaxAddCategory.tpl → ...Resources/views/Admin/ajaxAddCategory.tpl
File renamed without changes
View
10 ...ources/views/admin_admin_categorymenu.tpl → ...le/Resources/views/Admin/categorymenu.tpl
@@ -1,4 +1,4 @@
-{ajaxheader modname='AdminModule' filename='admin_admin_ajax.js' ui=true}
+{ajaxheader modname='AdminModule' filename='Admin/ajax.js' ui=true}
<script type="text/javascript">
/* <![CDATA[ */
@@ -38,9 +38,9 @@
</div>
<div id="admin-systemnotices">
-{include file='admin_admin_securityanalyzer.tpl'}
-{include file='admin_admin_developernotices.tpl'}
-{include file='admin_admin_updatechecker.tpl'}
+{include file='Admin/securityanalyzer.tpl'}
+{include file='Admin/developernotices.tpl'}
+{include file='Admin/updatechecker.tpl'}
</div>
{insert name="getstatusmsg"}
@@ -77,7 +77,7 @@
</ul>
{helplink}
- {include file='admin_admin_ajaxAddCategory.tpl'}
+ {include file='Admin/ajaxAddCategory.tpl'}
</div>
<div class="z-hide" id="admintabs-none"></div>
View
0  ...le/Resources/views/admin_admin_delete.tpl → ...inModule/Resources/views/Admin/delete.tpl
File renamed without changes
View
0  ...es/views/admin_admin_developernotices.tpl → ...esources/views/Admin/developernotices.tpl
File renamed without changes
View
0  ...le/Resources/views/admin_admin_footer.tpl → ...inModule/Resources/views/Admin/footer.tpl
File renamed without changes
View
0  ...le/Resources/views/admin_admin_header.tpl → ...inModule/Resources/views/Admin/header.tpl
File renamed without changes
View
0  ...dule/Resources/views/admin_admin_help.tpl → ...dminModule/Resources/views/Admin/help.tpl
File renamed without changes
View
0  ...le/Resources/views/admin_admin_modify.tpl → ...inModule/Resources/views/Admin/modify.tpl
File renamed without changes
View
0  ...ources/views/admin_admin_modifyconfig.tpl → ...le/Resources/views/Admin/modifyconfig.tpl
File renamed without changes
View
0  ...le/Resources/views/admin_admin_newcat.tpl → ...inModule/Resources/views/Admin/newcat.tpl
File renamed without changes
View
0  ...es/views/admin_admin_securityanalyzer.tpl → ...esources/views/Admin/securityanalyzer.tpl
File renamed without changes
View
0  ...urces/views/admin_admin_updatechecker.tpl → ...e/Resources/views/Admin/updatechecker.tpl
File renamed without changes
View
0  ...dule/Resources/views/admin_admin_view.tpl → ...dminModule/Resources/views/Admin/view.tpl
File renamed without changes
View
0  ...e/Resources/views/admin_admin_warning.tpl → ...nModule/Resources/views/Admin/warning.tpl
File renamed without changes
View
0  .../Resources/views/admin_block_adminnav.tpl → ...Module/Resources/views/Block/adminnav.tpl
File renamed without changes

0 comments on commit e1f0f71

Please sign in to comment.
Something went wrong with that request. Please try again.