[xoops-svn] SF.net SVN: xoops:[9662] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system

[<ma...@us...>]

Revision: 9662
          http://xoops.svn.sourceforge.net/xoops/?rev=9662&view=rev
Author:   mageg
Date:     2012-06-16 20:45:34 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
Use moduleadmin for system/preferences

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php	2012-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php	2012-06-16 20:45:34 UTC (rev 9662)
@@ -66,10 +66,12 @@
         if (!is_object($confcat)) {
             $xoops->redirect('admin.php?fct=preferences', 1);
         }
-        $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, system_adminVersion('preferences', 'adminpath'));
-        $system_breadcrumb->addLink(constant($confcat->getVar('confcat_name')));
-        $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
-        $system_breadcrumb->render();
+        // Define Breadcrumb and tips
+        $admin_page = new XoopsModuleAdmin();
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('preferences', 'adminpath'));
+        $admin_page->addBreadcrumbLink(constant($confcat->getVar('confcat_name')));
+        $admin_page->renderBreadcrumb();
         /* @var $form SystemPreferenceForm */
         $form = $xoops->getModuleForm(null, 'preference');
         $form->getForm($confcat);
@@ -94,10 +96,12 @@
         $module = $module_handler->getById($mod);
         $xoops->loadLanguage('modinfo', $module->getVar('dirname'));
 
-        $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, system_adminVersion('preferences', 'adminpath'));
-        $system_breadcrumb->addLink($module->getVar('name'));
-        $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
-        $system_breadcrumb->render();
+        // Define Breadcrumb and tips
+        $admin_page = new XoopsModuleAdmin();
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('plugins', 'adminpath'));
+        $admin_page->addBreadcrumbLink($module->getVar('name'));
+        $admin_page->renderBreadcrumb();
 
         /* @var $form SystemPreferenceForm */
         $form = $xoops->getModuleForm(null, 'preference');
@@ -175,10 +179,14 @@
 
     default:
         // Display setting cats
-        $system_breadcrumb->addLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN);
-        $system_breadcrumb->addTips(_AM_SYSTEM_PREFERENCES_NAV_TIPS);
-        $system_breadcrumb->addHelp(system_adminVersion('preferences', 'help'));
-        $system_breadcrumb->render();
+        // Define Breadcrumb and tips
+        $admin_page = new XoopsModuleAdmin();
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('plugins', 'adminpath'));
+        $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_MAIN);
+        $admin_page->addTips(_AM_SYSTEM_PREFERENCES_NAV_TIPS);
+        $admin_page->renderBreadcrumb();
+        $admin_page->renderTips();
 
         $confcat_handler = $xoops->getHandlerConfigcategory();
         $confcats = $confcat_handler->getCategoryObjects();

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php	2012-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php	2012-06-16 20:45:34 UTC (rev 9662)
@@ -12,6 +12,7 @@
 
 //Nav
 define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
+define("_AM_SYSTEM_PREFERENCES_MAIN","Main");
 /*define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_GENERAL","General Settings");
 define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_USERSETTINGS","User Info Settings");
 define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_METAFOOTER","Meta Tags and Footer");

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html	2012-06-16 18:12:06 UTC (rev 9661)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html	2012-06-16 20:45:34 UTC (rev 9662)
@@ -1,4 +1,6 @@
-<{includeq file="admin:system|system_header.html"}>
+<{includeq file="admin:system|admin_breadcrumb.html"}>
+<{includeq file="admin:system|admin_tips.html"}>
+
 <!--Preferences-->
 <{if $menu}>
 <div class="xo-catsetting">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.