1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 15:46:44 +02:00

a bit of legacy BULLET code review

This commit is contained in:
marj
2009-08-23 10:57:51 +00:00
parent 6eafcda674
commit 9863e49cdb
19 changed files with 277 additions and 128 deletions

View File

@@ -880,12 +880,27 @@ SC_END
SC_BEGIN CM_MENU_LINKS_ICON
global $content_pref, $bullet;
//TODO review bullet + use switch
//define icon
if($content_pref["content_menu_links_icon"] == "0"){ $ret = "";
}elseif($content_pref["content_menu_links_icon"] == "1"){ $ret = $bullet;
}elseif($content_pref["content_menu_links_icon"] == "2"){ $ret = "&middot";
}elseif($content_pref["content_menu_links_icon"] == "3"){ $ret = "º";
}elseif($content_pref["content_menu_links_icon"] == "4"){ $ret = "»";
if($content_pref["content_menu_links_icon"] == "0")
{
$ret = "";
}
elseif($content_pref["content_menu_links_icon"] == "1")
{
$ret = $bullet;
}
elseif($content_pref["content_menu_links_icon"] == "2")
{
$ret = "&middot";
}
elseif($content_pref["content_menu_links_icon"] == "3")
{
$ret = "º";
}
elseif($content_pref["content_menu_links_icon"] == "4")
{
$ret = "»";
}
return $ret;
SC_END
@@ -961,6 +976,7 @@ return ($content_pref["content_menu_cat_caption"] != "" ? $content_pref["content
SC_END
SC_BEGIN CM_MENU_CATEGORY_ICON
//TODO legacy bullet + use switch
global $content_pref, $row, $bullet;
$ret = "";
if($content_pref["content_menu_cat_icon"] == "0"){ $ret = "";

View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
| $Revision: 1.22 $
| $Date: 2007-04-18 21:41:58 $
| $Author: lisa_ $
| $Revision: 1.23 $
| $Date: 2009-08-23 10:57:51 $
| $Author: marj_nl_fr $
+---------------------------------------------------------------+
*/
@@ -1413,9 +1413,18 @@ class content{
$data .= "global \$tp;\n";
$data .= "\n";
$data .= "include_lan(e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content.php');\n";
$data .= "\n";
$data .= "\$bullet = (defined('BULLET') ? \"<img src='\".THEME_ABS.\"images/\".BULLET.\"' alt='' style='border:0;vertical-align: middle;' />\" : \"<img src='\".THEME_ABS.\"images/bullet2.gif' alt='bullet' style='border:0;vertical-align: middle;' />\");\n";
$data .= "\n";
$data .= '
$bullet = \'\';
if(defined(\'BULLET\'))
{
$bullet = \'<img src="\'.THEME.\'images/\'.BULLET.\'" alt="" class="icon" />\';
}
elseif(file_exists(THEME.\'images/bullet2.gif\'))
{
$bullet = \'<img src="\'.THEME.\'images/bullet2.gif" alt="" class="icon" />\';
}
';
$data .= "\$content_pref = \$aa -> getContentPref(\$menutypeid, true);\n";
$data .= "\n";
$data .= "// load the template --------------------------------------------------\n";