xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[11702] XoopsCore/branches/2.5.x/2.5.7/htdocs/ Frameworks/moduleclasses/moduleadmin/moduleadmin.php

[<ce...@us...>]

Revision: 11702
          http://sourceforge.net/p/xoops/svn/11702
Author:   cesag
Date:     2013-06-16 18:29:38 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fixed display of the description instead of the title (slider84).

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2013-06-16 18:28:42 UTC (rev 11701)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2013-06-16 18:29:38 UTC (rev 11702)
@@ -115,7 +115,7 @@
         $ret = "<div class=\"rmmenuicon\">\n";
         foreach (array_keys( $this->_obj->adminmenu) as $i) {
             if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
-                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . $this->_obj->adminmenu[$i]['title'] . "\">";
+                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . $this->_obj->adminmenu[$i]['desc'] . "\">";
                 $ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
                 $ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>";
                 $ret .= "</a>";

[xoops-svn] SF.net SVN: xoops-svn:[11798] XoopsCore/branches/2.5.x/2.5.7/htdocs/ Frameworks/moduleclasses/moduleadmin/moduleadmin.php

[<be...@us...>]

Revision: 11798
          http://sourceforge.net/p/xoops/svn/11798
Author:   beckmi
Date:     2013-06-29 10:14:37 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
Adding check for menu link description 

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2013-06-28 19:01:17 UTC (rev 11797)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2013-06-29 10:14:37 UTC (rev 11798)
@@ -115,7 +115,7 @@
         $ret = "<div class=\"rmmenuicon\">\n";
         foreach (array_keys( $this->_obj->adminmenu) as $i) {
             if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
-                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . $this->_obj->adminmenu[$i]['desc'] . "\">";
+                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">";
                 $ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
                 $ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>";
                 $ret .= "</a>";

[xoops-svn] SF.net SVN: xoops-svn:[12284] XoopsCore/branches/2.5.x/2.5.7/htdocs/ Frameworks/moduleclasses/moduleadmin/moduleadmin.php

[<be...@us...>]

Revision: 12284
          http://sourceforge.net/p/xoops/svn/12284
Author:   beckmi
Date:     2014-01-30 11:19:28 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
fix to correctly load the CSS file into the header (Bleekk, Alfred)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2014-01-30 11:11:43 UTC (rev 12283)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php	2014-01-30 11:19:28 UTC (rev 12284)
@@ -372,7 +372,8 @@
     {
         $ret['label'] = $label;
         $line = "";
-        switch ($type) {
+        switch ($type) 
+        {
             default:
             case "default":
                 $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");