Skip to content
This repository
Browse code

Restructure template for Admin module

  • Loading branch information...
commit e1f0f712431ace0494be460a3dd7c302459a174a 1 parent 16cd4ae
Drak drak authored

Showing 19 changed files with 17 additions and 20 deletions. Show diff stats Hide diff stats

  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}
4 web/system/AdminModule/Api/AdminApi.php
@@ -383,7 +383,7 @@ public function countModsInCat($args)
383 383 public function adminheader()
384 384 {
385 385 $view = \Zikula_View::getInstance('Admin');
386   - return $view->fetch('admin_admin_header.tpl');
  386 + return $view->fetch('Admin/header.tpl');
387 387 }
388 388
389 389 /**
@@ -392,6 +392,6 @@ public function adminheader()
392 392 public function adminfooter()
393 393 {
394 394 $view = \Zikula_View::getInstance('Admin');
395   - return $view->fetch('admin_admin_footer.tpl');
  395 + return $view->fetch('Admin/footer.tpl');
396 396 }
397 397 }
2  web/system/AdminModule/Block/AdminnavBlock.php
@@ -108,7 +108,7 @@ public function display($blockinfo)
108 108 $this->view->assign('admincategories', $admincategories);
109 109
110 110 // Populate block info and pass to theme
111   - $blockinfo['content'] = $this->view->fetch('admin_block_adminnav.tpl');
  111 + $blockinfo['content'] = $this->view->fetch('Block/adminnav.tpl');
112 112
113 113 return \BlockUtil::themeBlock($blockinfo);
114 114 }
21 web/system/AdminModule/Controller/AdminController.php
@@ -76,7 +76,7 @@ public function viewAction($args = array())
76 76 'itemsperpage' => $itemsperpage));
77 77
78 78 // Return the output that has been generated by this function
79   - return $this->response($this->view->fetch('admin_admin_view.tpl'));
  79 + return $this->response($this->view->fetch('Admin/view.tpl'));
80 80 }
81 81
82 82 /**
@@ -92,7 +92,7 @@ public function newcatAction()
92 92 }
93 93
94 94 // Return the output that has been generated by this function
95   - return $this->response($this->view->fetch('admin_admin_newcat.tpl'));
  95 + return $this->response($this->view->fetch('Admin/newcat.tpl'));
96 96 }
97 97
98 98 /**
@@ -153,7 +153,7 @@ public function modifyAction(array $args = array())
153 153
154 154 $this->view->assign('category', $category);
155 155
156   - return $this->response($this->view->fetch('admin_admin_modify.tpl'));
  156 + return $this->response($this->view->fetch('Admin/modify.tpl'));
157 157 }
158 158
159 159 /**
@@ -232,7 +232,7 @@ public function deleteAction(array $args = array())
232 232 // No confirmation yet - display a suitable form to obtain confirmation
233 233 // of this action from the user
234 234 return $this->response($this->view->assign('category', $category)
235   - ->fetch('admin_admin_delete.tpl'));
  235 + ->fetch('Admin/delete.tpl'));
236 236 }
237 237
238 238 $this->checkCsrfToken();
@@ -268,7 +268,7 @@ public function adminpanelAction()
268 268 if ($zrcexists == true) {
269 269 return $this->response($this->view->assign('zrcexists', $zrcexists)
270 270 ->assign('adminpanellink', \ModUtil::url('AdminModule', 'admin', 'adminpanel'))
271   - ->fetch('admin_admin_warning.tpl'));
  271 + ->fetch('Admin/warning.tpl'));
272 272 }
273 273 }
274 274
@@ -342,9 +342,6 @@ public function adminpanelAction()
342 342 $modpath . '/' . $osmoddir . '/Resources/public/images/admin.png',
343 343 $modpath . '/' . $osmoddir . '/Resources/public/images/admin.jpg',
344 344 $modpath . '/' . $osmoddir . '/Resources/public/images/admin.gif',
345   - $modpath . '/' . $osmoddir . '/images/admin.png',
346   - $modpath . '/' . $osmoddir . '/images/admin.jpg',
347   - $modpath . '/' . $osmoddir . '/images/admin.gif',
348 345 'system/AdminModule/Resources/public/images/default.gif');
349 346
350 347 foreach ($adminicons as $adminicon) {
@@ -366,7 +363,7 @@ public function adminpanelAction()
366 363 usort($adminlinks, 'AdminModule\Controller\_sortAdminModsByOrder');
367 364 $this->view->assign('adminlinks', $adminlinks);
368 365
369   - return $this->response($this->view->fetch('admin_admin_adminpanel.tpl'));
  366 + return $this->response($this->view->fetch('Admin/adminpanel.tpl'));
370 367 }
371 368
372 369 /**
@@ -414,7 +411,7 @@ public function modifyconfigAction()
414 411 $this->view->assign('modulecategories', $modulecategories);
415 412
416 413 // Return the output that has been generated by this function
417   - return $this->response($this->view->fetch('admin_admin_modifyconfig.tpl'));
  414 + return $this->response($this->view->fetch('Admin/modifyconfig.tpl'));
418 415 }
419 416
420 417 /**
@@ -579,7 +576,7 @@ public function categorymenuAction(array $args = array())
579 576 $this->view->assign('notices', $notices);
580 577
581 578 // this should not return a response since it's being used as an API call for some odd reason... drak
582   - return $this->view->fetch('admin_admin_categorymenu.tpl');
  579 + return $this->view->fetch('Admin/categorymenu.tpl');
583 580 }
584 581
585 582 /**
@@ -592,7 +589,7 @@ public function helpAction()
592 589 throw new \Zikula\Framework\Exception\ForbiddenException();
593 590 }
594 591
595   - return $this->response($this->view->fetch('admin_admin_help.tpl'));
  592 + return $this->response($this->view->fetch('Admin/help.tpl'));
596 593 }
597 594
598 595 /**
0  ...Module/Resources/views/admin_admin_adminpanel.tpl → .../AdminModule/Resources/views/Admin/adminpanel.tpl
File renamed without changes
0  ...e/Resources/views/admin_admin_ajaxAddCategory.tpl → ...nModule/Resources/views/Admin/ajaxAddCategory.tpl
File renamed without changes
10 ...dule/Resources/views/admin_admin_categorymenu.tpl → ...dminModule/Resources/views/Admin/categorymenu.tpl
... ... @@ -1,4 +1,4 @@
1   -{ajaxheader modname='AdminModule' filename='admin_admin_ajax.js' ui=true}
  1 +{ajaxheader modname='AdminModule' filename='Admin/ajax.js' ui=true}
2 2
3 3 <script type="text/javascript">
4 4 /* <![CDATA[ */
@@ -38,9 +38,9 @@
38 38 </div>
39 39
40 40 <div id="admin-systemnotices">
41   -{include file='admin_admin_securityanalyzer.tpl'}
42   -{include file='admin_admin_developernotices.tpl'}
43   -{include file='admin_admin_updatechecker.tpl'}
  41 +{include file='Admin/securityanalyzer.tpl'}
  42 +{include file='Admin/developernotices.tpl'}
  43 +{include file='Admin/updatechecker.tpl'}
44 44 </div>
45 45
46 46 {insert name="getstatusmsg"}
@@ -77,7 +77,7 @@
77 77 </ul>
78 78
79 79 {helplink}
80   - {include file='admin_admin_ajaxAddCategory.tpl'}
  80 + {include file='Admin/ajaxAddCategory.tpl'}
81 81 </div>
82 82
83 83 <div class="z-hide" id="admintabs-none"></div>
0  ...dminModule/Resources/views/admin_admin_delete.tpl → ...stem/AdminModule/Resources/views/Admin/delete.tpl
File renamed without changes
0  .../Resources/views/admin_admin_developernotices.tpl → ...Module/Resources/views/Admin/developernotices.tpl
File renamed without changes
0  ...dminModule/Resources/views/admin_admin_footer.tpl → ...stem/AdminModule/Resources/views/Admin/footer.tpl
File renamed without changes
0  ...dminModule/Resources/views/admin_admin_header.tpl → ...stem/AdminModule/Resources/views/Admin/header.tpl
File renamed without changes
0  .../AdminModule/Resources/views/admin_admin_help.tpl → ...system/AdminModule/Resources/views/Admin/help.tpl
File renamed without changes
0  ...dminModule/Resources/views/admin_admin_modify.tpl → ...stem/AdminModule/Resources/views/Admin/modify.tpl
File renamed without changes
0  ...dule/Resources/views/admin_admin_modifyconfig.tpl → ...dminModule/Resources/views/Admin/modifyconfig.tpl
File renamed without changes
0  ...dminModule/Resources/views/admin_admin_newcat.tpl → ...stem/AdminModule/Resources/views/Admin/newcat.tpl
File renamed without changes
0  .../Resources/views/admin_admin_securityanalyzer.tpl → ...Module/Resources/views/Admin/securityanalyzer.tpl
File renamed without changes
0  ...ule/Resources/views/admin_admin_updatechecker.tpl → ...minModule/Resources/views/Admin/updatechecker.tpl
File renamed without changes
0  .../AdminModule/Resources/views/admin_admin_view.tpl → ...system/AdminModule/Resources/views/Admin/view.tpl
File renamed without changes
0  ...minModule/Resources/views/admin_admin_warning.tpl → ...tem/AdminModule/Resources/views/Admin/warning.tpl
File renamed without changes
0  ...inModule/Resources/views/admin_block_adminnav.tpl → ...em/AdminModule/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.