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

[<du...@us...>]

Revision: 10251
          http://sourceforge.net/p/xoops/svn/10251
Author:   dugris
Date:     2012-11-09 13:19:32 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix : module renderindex

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-08 08:17:07 UTC (rev 10250)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-09 13:19:32 UTC (rev 10251)
@@ -258,16 +258,17 @@
         $xoops = Xoops::getInstance();
         $this->_obj->loadAdminMenu();
         foreach (array_keys($this->_obj->adminmenu) as $i) {
-//            if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') {
-                //$this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/" . $this->_obj->adminmenu[$i]['icon'];
-                $this->_obj->adminmenu[$i]['icon'] = XOOPS_URL . "/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon'];
-                $xoops->tpl->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
-//            }
+            if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']) ) ) {
+                $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+            } else {
+                $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+            }
+            $xoops->tpl->append('xo_admin_index_menu', $this->_obj->adminmenu[$i]);
         }
         if ($this->_obj->getInfo('help')) {
             $help = array();
             $help['link'] = '../system/help.php?mid=' . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help');
-            $help['icon'] = XOOPS_URL . "/media/xoops/images/icons/32/help.png";
+            $help['icon'] = $xoops->url("/media/xoops/images/icons/32/help.png");
             $help['title'] = _AM_SYSTEM_HELP;
             $xoops->tpl->append('xo_admin_index_menu', $help);
         }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css	2012-11-08 08:17:07 UTC (rev 10250)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css	2012-11-09 13:19:32 UTC (rev 10251)
@@ -147,7 +147,7 @@
     font-family: arial,helvetica,sans-serif;
     margin: 3px 3px 5px;
     overflow: hidden;
-    width: 250px;
+    width: 244px;
 }
 .xo-module-list .system {
     background: none repeat scroll 0 0 #faeaea;