
";
if($reported_content) {
$text .= "
".CONTENT_LATEST_LAN_1." $reported_content";
} else {
diff --git a/e107_plugins/content/e_list.php b/e107_plugins/content/e_list.php
index b35457a67..3fe70f254 100644
--- a/e107_plugins/content/e_list.php
+++ b/e107_plugins/content/e_list.php
@@ -31,7 +31,7 @@ if (!defined('e107_INIT')) { exit; }
$CATEGORY = "";
$DATE = "";
$INFO = "";
- $LIST_CAPTION = $rowm['content_heading'];
+ $LIST_CAPTION = $rowm['content_heading'];
//global var for this main parent
$mainparent = $rowm['content_id'];
@@ -107,5 +107,4 @@ if (!defined('e107_INIT')) { exit; }
}
}
-
?>
\ No newline at end of file
diff --git a/e107_plugins/content/e_meta.php b/e107_plugins/content/e_meta.php
index 9cd5959de..0cf888262 100644
--- a/e107_plugins/content/e_meta.php
+++ b/e107_plugins/content/e_meta.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/e_meta.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:34:56 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
@@ -48,5 +48,4 @@ if(isset($qs[0]) && $qs[0] == "content" && isset($qs[1]) && is_numeric($qs[1]) )
}
}
-
?>
\ No newline at end of file
diff --git a/e107_plugins/content/handlers/content_class.php b/e107_plugins/content/handlers/content_class.php
index d85fdd092..6837f578a 100644
--- a/e107_plugins/content/handlers/content_class.php
+++ b/e107_plugins/content/handlers/content_class.php
@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
-| $Revision: 1.10 $
-| $Date: 2007-03-13 16:51:05 $
+| $Revision: 1.11 $
+| $Date: 2007-04-10 14:34:39 $
| $Author: lisa_ $
+---------------------------------------------------------------+
*/
@@ -1192,7 +1192,8 @@ class content{
".$rs -> form_close();
@@ -1296,17 +1299,19 @@ class content{
$menufile = "content_".$row['content_heading'];
$menuname = $row['content_heading'];
- $data = chr(60)."?php\n". chr(47)."*\n+---------------------------------------------------------------+\n| e107 website system\n| ".e_PLUGIN."content/menus/".$menufile."_menu.php\n|\n| ©Steve Dunstan 2001-2002\n| http://e107.org\n| jalist@e107.org\n|\n| Released under the terms and conditions of the\n| GNU General Public License (http://gnu.org).\n+---------------------------------------------------------------+\n\nThis file has been generated by ".e_PLUGIN."content/handlers/content_class.php.\n\n*". chr(47)."\n\n";
+ $data = chr(60)."?php\n". chr(47)."*\n+---------------------------------------------------------------+\n| e107 website system\n| ".e_PLUGIN."content/menus/".$menufile."_menu.php\n|\n| ©Steve Dunstan 2001-2002\n| http://e107.org\n| jalist@e107.org\n|\n| Released under the terms and conditions of the\n| GNU General Public License (http://gnu.org).\n+---------------------------------------------------------------+\n\nThis file has been generated by ".e_PLUGIN."content/handlers/content_class.php.\n\n*". chr(47)."\n";
$data .= "\n";
$data .= "unset(\$text);\n";
$data .= "\$text = \"\";\n";
- $data .= "\$menutypeid = \"$parentid\";\n";
- $data .= "\$menuname = \"$menuname\";\n";
+ $data .= "\$menutypeid = \"$parentid\";\n";
+ $data .= "\$menuname = \"$menuname\";\n";
$data .= "\n";
- $data .= "\$plugindir = e_PLUGIN.'content/';\n";
- $data .= "\$plugintable = \"pcontent\"; //name of the table used in this plugin (never remove this, as it's being used throughout the plugin !!)\n";
- $data .= "\$datequery = \" AND content_datestamp < \".time().\" AND (content_enddate=0 || content_enddate>\".time().\") \";\n";
+ $data .= "\$plugindir = e_PLUGIN.'content/';\n";
+ $data .= "\$plugintable = \"pcontent\"; //name of the table used in this plugin (never remove this, as it's being used throughout the plugin !!)\n";
+ $data .= "\$datequery = \" AND content_datestamp < \".time().\" AND (content_enddate=0 || content_enddate>\".time().\") \";\n";
$data .= "\n";
+ $data .= "global \$tp;\n";
+ $data .= "require_once(e_PLUGIN.'content/content_shortcodes.php');\n";
$data .= "require_once(e_PLUGIN.'content/handlers/content_class.php');\n";
$data .= "\$aa = new content;\n";
$data .= "require_once(e_HANDLER.'form_handler.php');\n";
@@ -1314,14 +1319,26 @@ class content{
$data .= "\$gen = new convert;\n";
$data .= "global \$tp;\n";
$data .= "\n";
- $data .= "\$lan_file = e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content.php';\n";
- $data .= "include_once(file_exists(\$lan_file) ? \$lan_file : e_PLUGIN.'content/languages/English/lan_content.php');\n";
+ $data .= "include_lan(e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content.php');\n";
$data .= "\n";
$data .= "\$bullet = (defined('BULLET') ? \"

\" : \"

\");\n";
$data .= "\n";
- $data .= "\$content_pref = \$aa -> getContentPref(\$menutypeid);\n";
- $data .= "\$content_icon_path = \$tp -> replaceConstants(\$content_pref[\"content_icon_path\"]);\n";
- $data .= "\$content_cat_icon_path_small = \$tp -> replaceConstants(\$content_pref[\"content_cat_icon_path_small\"]);\n";
+ $data .= "\$content_pref = \$aa -> getContentPref(\$menutypeid);\n";
+ $data .= "\$content_icon_path = \$tp -> replaceConstants(\$content_pref[\"content_icon_path\"]);\n";
+ $data .= "\$content_cat_icon_path_small = \$tp -> replaceConstants(\$content_pref[\"content_cat_icon_path_small\"]);\n";
+ $data .= "\n";
+ $data .= "// load the template --------------------------------------------------\n";
+ $data .= "if(!isset(\$CONTENT_MENU)){\n";
+ $data .= " if(!\$content_pref[\"content_theme\"]){\n";
+ $data .= " require_once(\$plugindir.\"templates/default/content_menu_template.php\");\n";
+ $data .= " }else{\n";
+ $data .= " if(is_readable(\$tp->replaceConstants(\$content_pref[\"content_theme\"]).\"content_menu_template.php\")){\n";
+ $data .= " require_once(\$tp->replaceConstants(\$content_pref[\"content_theme\"]).\"content_menu_template.php\");\n";
+ $data .= " }else{\n";
+ $data .= " require_once(\$plugindir.\"templates/default/content_menu_template.php\");\n";
+ $data .= " }\n";
+ $data .= " }\n";
+ $data .= "}\n";
$data .= "\n";
$data .= "//get category array\n";
$data .= "\$array = \$aa -> getCategoryTree(\"\", intval(\$menutypeid), TRUE);\n";
@@ -1362,69 +1379,14 @@ class content{
$data .= " }\n";
$data .= "}\n";
$data .= "// end menu visibility --------------------------------------------------\n";
-
- $data .= "\$break = FALSE;\n";
- $data .= "//##### SEARCH SELECT ORDER --------------------------------------------------\n";
- $data .= "//show search box\n";
- $data .= "if(\$content_pref[\"content_menu_search\"]){\n";
- $data .= " \$text .= \$aa -> showOptionsSearch(\"menu\", \$menutypeid);\n";
- $data .= " \$break = TRUE;\n";
- $data .= "}\n";
- $data .= "//show select box (with either links to other content pages, to categories, to both, or don't show at all)\n";
- $data .= "if( (\$content_pref[\"content_menu_links\"] && \$content_pref[\"content_menu_links_dropdown\"]) || (\$content_pref[\"content_menu_cat\"] && \$content_pref[\"content_menu_cat_dropdown\"]) ){\n";
- $data .= " \$text .= \$aa -> showOptionsSelect(\"menu\", \$menutypeid);\n";
- $data .= " \$break = TRUE;\n";
- $data .= "}\n";
- $data .= "//show order box\n";
- $data .= "if(\$content_pref[\"content_menu_sort\"]){\n";
- $data .= " \$text .= \$aa -> showOptionsOrder(\"menu\", \$menutypeid);\n";
- $data .= " \$break = TRUE;\n";
- $data .= "}\n";
$data .= "\n";
- $data .= "//show links list if chosen so\n";
- $data .= "if(\$content_pref[\"content_menu_links\"] && !\$content_pref[\"content_menu_links_dropdown\"]){\n";
- $data .= " if(\$break === TRUE){\n";
- $data .= " \$text .= \"
\";\n";
- $data .= " }\n";
- $data .= " \$text .= (\$content_pref[\"content_menu_links_caption\"] != \"\" ? \$content_pref[\"content_menu_links_caption\"] : CONTENT_MENU_LAN_4).\"
\";\n";
- $data .= "\n";
- $data .= " //define icon\n";
- $data .= " if(\$content_pref[\"content_menu_links_icon\"] == \"0\"){ \$linksicon = \"\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_links_icon\"] == \"1\"){ \$linksicon = \$bullet;\n";
- $data .= " }elseif(\$content_pref[\"content_menu_links_icon\"] == \"2\"){ \$linksicon = \"·\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_links_icon\"] == \"3\"){ \$linksicon = \"º\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_links_icon\"] == \"4\"){ \$linksicon = \"»\";\n";
- $data .= " }\n";
- $data .= "\n";
- $data .= " if(\$content_pref[\"content_menu_viewallcat\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_6.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewallauthor\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_7.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewallitems\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_83.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewtoprated\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_8.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewtopscore\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_12.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewrecent\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_61.\"\";\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_viewsubmit\"]){\n";
- $data .= " \$text .= \$linksicon.\"
\".CONTENT_LAN_75.\"\";\n";
- $data .= " }\n";
- $data .= " \$text .= \"
\";\n";
- $data .= "}\n";
+ $data .= "global \$icon, \$bullet, \$row, \$CMT_CATEGORY, \$CMT_RECENT;\n";
+ $data .= "\$icon = \$tp->parseTemplate(\"{CM_MENU_LINKS_ICON}\",TRUE,\$content_shortcodes);\n";
$data .= "\n";
$data .= "//##### CATEGORY LIST --------------------------------------------------\n";
+ $data .= "\$CMT_CATEGORY = '';\n";
$data .= "if(!\$content_pref[\"content_menu_cat_dropdown\"]){\n";
$data .= " if(\$content_pref[\"content_menu_cat\"]){\n";
- $data .= " \$text .= (\$content_pref[\"content_menu_cat_caption\"] != \"\" ? \$content_pref[\"content_menu_cat_caption\"] : CONTENT_MENU_LAN_3).\"
\";\n";
- $data .= "\n";
$data .= " \$newparent = \"\";\n";
$data .= " \$checkid = \"\";\n";
$data .= " \$newarray = array_merge_recursive(\$array);\n";
@@ -1439,121 +1401,36 @@ class content{
$data .= " }\n";
$data .= " \$checkid = substr(\$checkid,0,-3);\n";
$data .= " if(!is_object(\$sql)){ \$sql = new db; }\n";
-
$data .= " if(\$sql -> db_Select(\$plugintable, \"*\", \" \".\$checkid.\" ORDER BY SUBSTRING_INDEX(content_order, '.', 1)+0 \")){\n";
+ $data .= " \$CMT_CATEGORY .= \$tp->parseTemplate(\$CONTENT_MENU_CATEGORY_START,TRUE,\$content_shortcodes);\n";
$data .= " while(\$row = \$sql -> db_Fetch()){\n";
- $data .= "\n";
- $data .= " //define icon\n";
- $data .= " \$ICON = \"\";\n";
- $data .= " if(\$content_pref[\"content_menu_cat_icon\"] == \"0\"){ \$ICON = \"\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon\"] == \"1\"){ \$ICON = \$bullet;\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon\"] == \"2\"){ \$ICON = \"·\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon\"] == \"3\"){ \$ICON = \"º\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon\"] == \"4\"){ \$ICON = \"»\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon\"] == \"5\"){\n";
- $data .= " if(\$row['content_icon'] != \"\" && file_exists(\$content_cat_icon_path_small.\$row['content_icon']) ){\n";
- $data .= " \$ICON = \"

\";\n";
- $data .= " }else{\n";
- $data .= " //default category icon\n";
- $data .= " if(\$content_pref[\"content_menu_cat_icon_default\"] == \"0\"){ \$ICON = \"\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon_default\"] == \"1\"){ \$ICON = \$bullet;\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon_default\"] == \"2\"){ \$ICON = \"·\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon_default\"] == \"3\"){ \$ICON = \"º\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_cat_icon_default\"] == \"4\"){ \$ICON = \"»\";\n";
- $data .= " }\n";
- $data .= " }\n";
- $data .= " }\n";
- $data .= " //display category list\n";
- $data .= " \$text .= \"
\";\n";
- $data .= " \$text .= \"\";\n";
- $data .= " \$text .= (\$ICON ? \"\".\$ICON.\" | \" : \"\");\n";
- $data .= " \$text .= \"\";\n";
- $data .= " \$text .= \"\".\$row['content_heading'].\"\";\n";
- $data .= " \$text .= (\$content_pref[\"content_menu_cat_number\"] ? \" (\".\$aa -> countCatItems(\$row['content_id']).\")\" : \"\");\n";
- $data .= " \$text .= \" | \";\n";
- $data .= " \$text .= \"
\";\n";
- $data .= " \$text .= \"
\";\n";
+ $data .= " \$CMT_CATEGORY .= \$tp->parseTemplate(\$CONTENT_MENU_CATEGORY_TABLE,TRUE,\$content_shortcodes);\n";
$data .= " }\n";
+ $data .= " \$CMT_CATEGORY .= \$tp->parseTemplate(\$CONTENT_MENU_CATEGORY_END,TRUE,\$content_shortcodes);\n";
$data .= " }\n";
$data .= " }\n";
$data .= "}\n";
$data .= "\n";
$data .= "//##### RECENT --------------------------------------------------\n";
+ $data .= "\$CMT_RECENT = '';\n";
$data .= "if(\$content_pref[\"content_menu_recent\"]){\n";
- $data .= " \$text .= \"
\";\n";
- $data .= "\n";
$data .= " //prepare query paramaters\n";
$data .= " \$validparent = implode(\",\", array_keys(\$array));\n";
$data .= " \$qry = \" content_parent REGEXP '\".\$aa -> CONTENTREGEXP(\$validparent).\"' \";\n";
$data .= "\n";
- $data .= " \$sql1 = new db;\n";
- $data .= " \$contenttotal = \$sql1 -> db_Count(\$plugintable, \"(*)\", \"WHERE content_refer != 'sa' AND \".\$qry.\" \".\$datequery.\" AND content_class REGEXP '\".e_CLASS_REGEXP.\"' \" );\n";
+ $data .= " if(\$resultitem = \$sql -> db_Select(\$plugintable, \"*\", \"content_refer !='sa' AND \".\$qry.\" \".\$datequery.\" AND content_class REGEXP '\".e_CLASS_REGEXP.\"' ORDER BY content_datestamp DESC LIMIT 0,\".\$content_pref[\"content_menu_recent_number\"] )){\n";
$data .= "\n";
- $data .= " if(\$resultitem = \$sql1 -> db_Select(\$plugintable, \"*\", \"content_refer !='sa' AND \".\$qry.\" \".\$datequery.\" AND content_class REGEXP '\".e_CLASS_REGEXP.\"' ORDER BY content_datestamp DESC LIMIT 0,\".\$content_pref[\"content_menu_recent_number\"] )){\n";
- $data .= "\n";
- $data .= " \$text .= (\$content_pref[\"content_menu_recent_caption\"] != \"\" ? \$content_pref[\"content_menu_recent_caption\"] : CONTENT_MENU_LAN_2).\"
\";\n";
- $data .= " while(\$row = \$sql1 -> db_Fetch()){\n";
- $data .= "\n";
- $data .= " \$ICON = \"\";\n";
- $data .= " \$DATE = \"\";\n";
- $data .= " \$AUTHOR = \"\";\n";
- $data .= " \$SUBHEADING = \"\";\n";
- $data .= "\n";
- $data .= " if(\$content_pref[\"content_menu_recent_date\"]){\n";
- $data .= " \$datestyle = (\$content_pref[\"content_archive_datestyle\"] ? \$content_pref[\"content_archive_datestyle\"] : \"%d %b %Y\");\n";
- $data .= " \$DATE = strftime(\$datestyle, \$row['content_datestamp']);\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_recent_author\"]){\n";
- $data .= " \$authordetails = \$aa -> getAuthor(\$row['content_author']);\n";
- $data .= " \$AUTHOR = \$authordetails[1];\n";
- $data .= " }\n";
- $data .= "\n";
- $data .= " //subheading\n";
- $data .= " if(\$content_pref[\"content_menu_recent_subheading\"] && \$row['content_subheading']){\n";
- $data .= " if(\$content_pref[\"content_menu_recent_subheading_char\"] && \$content_pref[\"content_menu_recent_subheading_char\"] != \"\" && \$content_pref[\"content_menu_recent_subheading_char\"] != \"0\"){\n";
- $data .= " if(strlen(\$row['content_subheading']) > \$content_pref[\"content_menu_recent_subheading_char\"]) {\n";
- $data .= " \$row['content_subheading'] = substr(\$row['content_subheading'], 0, \$content_pref[\"content_menu_recent_subheading_char\"]).\$content_pref[\"content_menu_recent_subheading_post\"];\n";
- $data .= " }\n";
- $data .= " }\n";
- $data .= " \$SUBHEADING = \$row['content_subheading'];\n";
- $data .= " }\n";
- $data .= "\n";
- $data .= " //define icon\n";
- $data .= " \$recenticonwidth = \"\";\n";
- $data .= " if(\$content_pref[\"content_menu_recent_icon\"] == \"0\"){ \$ICON = \"\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_recent_icon\"] == \"1\"){ \$ICON = \$bullet;\n";
- $data .= " }elseif(\$content_pref[\"content_menu_recent_icon\"] == \"2\"){ \$ICON = \"·\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_recent_icon\"] == \"3\"){ \$ICON = \"º\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_recent_icon\"] == \"4\"){ \$ICON = \"»\";\n";
- $data .= " }elseif(\$content_pref[\"content_menu_recent_icon\"] == \"5\"){\n";
- $data .= " if(\$content_pref[\"content_menu_recent_icon\"] == \"5\"){\n";
- $data .= " if(\$content_pref[\"content_menu_recent_icon_width\"]){\n";
- $data .= " \$recenticonwidth = \" width:\".\$content_pref[\"content_menu_recent_icon_width\"].\"px; \";\n";
- $data .= " }else{\n";
- $data .= " \$recenticonwidth = \" width:50px; \";\n";
- $data .= " }\n";
- $data .= " }\n";
- $data .= " if(\$content_pref[\"content_menu_recent_icon\"] == \"5\" && \$row['content_icon'] != \"\" && file_exists(\$content_icon_path.\$row['content_icon'])){\n";
- $data .= " \$ICON = \"

\";\n";
- $data .= " }\n";
- $data .= " }\n";
- $data .= "\n";
- $data .= " //display recent list\n";
- $data .= " \$text .= \"
\";\n";
- $data .= " \$text .= \"\";\n";
- $data .= " \$text .= (\$ICON ? \"\".\$ICON.\" | \" : \"\");\n";
- $data .= " \$text .= \"\";\n";
- $data .= " \$text .= \"\".\$row['content_heading'].\" \";\n";
- $data .= " \$text .= (\$DATE ? \$DATE.\" \" : \"\" );\n";
- $data .= " \$text .= (\$AUTHOR ? \$AUTHOR.\" \" : \"\" );\n";
- $data .= " \$text .= (\$SUBHEADING ? \$SUBHEADING.\" \" : \"\" );\n";
- $data .= " \$text .= \" | \";\n";
- $data .= " \$text .= \"
\";\n";
- $data .= " \$text .= \"
\";\n";
+ $data .= " \$CMT_RECENT .= \$tp->parseTemplate(\$CONTENT_MENU_RECENT_START,TRUE,\$content_shortcodes);\n";
+ $data .= " while(\$row = \$sql -> db_Fetch()){\n";
+ $data .= " \$CMT_RECENT .= \$tp->parseTemplate(\$CONTENT_MENU_RECENT_TABLE,TRUE,\$content_shortcodes);\n";
$data .= " }\n";
+ $data .= " \$CMT_RECENT .= \$tp->parseTemplate(\$CONTENT_MENU_RECENT_END,TRUE,\$content_shortcodes);\n";
$data .= " }\n";
$data .= "}\n";
- $data .= "\n";
+ $data .= "\n";
+ $data .= "//##### PARSE THE MENU --------------------------------------------------\n";
+ $data .= "\$text = \$tp->parseTemplate(\$CONTENT_MENU,TRUE,\$content_shortcodes);\n";
+ $data .= "\n";
$data .= "if(!isset(\$text)){ \$text = CONTENT_MENU_LAN_1; }\n";
$data .= "\$caption = (\$content_pref[\"content_menu_caption\"] != \"\" ? \$content_pref[\"content_menu_caption\"] : CONTENT_MENU_LAN_0.\" \".\$menuname);\n";
$data .= "\$ns -> tablerender(\$caption, \$text, '$menufile');\n";
diff --git a/e107_plugins/content/languages/English/lan_content_admin.php b/e107_plugins/content/languages/English/lan_content_admin.php
index f400c69f7..b17044f43 100644
--- a/e107_plugins/content/languages/English/lan_content_admin.php
+++ b/e107_plugins/content/languages/English/lan_content_admin.php
@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/languages/English/lan_content_admin.php,v $
-| $Revision: 1.9 $
-| $Date: 2007-03-25 08:38:20 $
+| $Revision: 1.10 $
+| $Date: 2007-04-10 14:34:39 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
@@ -105,6 +105,7 @@ define("CONTENT_ADMIN_MANAGER_LAN_5", "users with this class are able to create
define("CONTENT_ADMIN_MANAGER_LAN_6", "submit content");
define("CONTENT_ADMIN_MANAGER_LAN_7", "users with this class are able to submit content items in this category");
define("CONTENT_ADMIN_MANAGER_LAN_8", "manager inherit preferences updated");
+define("CONTENT_ADMIN_MANAGER_LAN_9", "manage permissions");
define("CONTENT_ADMIN_ITEM_LAN_0", "required field(s) left blank");
diff --git a/e107_plugins/content/templates/content_admin_template.php b/e107_plugins/content/templates/content_admin_template.php
index f3343d9a6..895ea0945 100644
--- a/e107_plugins/content/templates/content_admin_template.php
+++ b/e107_plugins/content/templates/content_admin_template.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/content_admin_template.php,v $
-| $Revision: 1.3 $
-| $Date: 2007-03-13 16:51:05 $
+| $Revision: 1.4 $
+| $Date: 2007-04-10 14:34:39 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
@@ -189,9 +189,7 @@ if(!isset($CONTENT_ADMIN_MANAGER_CATEGORY)){
".$rs -> form_open("post", e_SELF."?".e_QUERY, "managerform", "", "enctype='multipart/form-data'")."
-
- manage permissions
- |
+ ".CONTENT_ADMIN_MANAGER_LAN_9." |
-
- {CONTENT_TYPE_TABLE_HEADING}{CONTENT_TYPE_TABLE_LINK} |
-
+
+ {CM_HEADING|type}{CONTENT_TYPE_TABLE_LINK} |
+
-
\n";
+
\n";
}
if(!isset($CONTENT_TYPE_TABLE_MANAGER)){
$CONTENT_TYPE_TABLE_MANAGER = "
-
- {CONTENT_TYPE_TABLE_MANAGER_HEADING} |
+
+ {CM_HEADING|manager_link} |
\n";
}
diff --git a/e107_plugins/content/templates/default/content_archive_template.php b/e107_plugins/content/templates/default/content_archive_template.php
index b39eaccdb..648885f1b 100644
--- a/e107_plugins/content/templates/default/content_archive_template.php
+++ b/e107_plugins/content/templates/default/content_archive_template.php
@@ -11,16 +11,16 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_archive_template.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:08 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_ARCHIVE_TABLE_AUTHOR']['pre'] = "
";
+$sc_style['CM_AUTHOR|archive']['pre'] = "
";
$sc_style['CONTENT_ARCHIVE_TABLE_LETTERS']['pre'] = "";
$sc_style['CONTENT_ARCHIVE_TABLE_LETTERS']['post'] = "
";
@@ -29,16 +29,15 @@ $sc_style['CONTENT_ARCHIVE_TABLE_LETTERS']['post'] = "";
if(!isset($CONTENT_ARCHIVE_TABLE_START)){
$CONTENT_ARCHIVE_TABLE_START = "
{CONTENT_ARCHIVE_TABLE_LETTERS}
-
- ";
+ ";
}
if(!isset($CONTENT_ARCHIVE_TABLE)){
$CONTENT_ARCHIVE_TABLE = "
- {CONTENT_ARCHIVE_TABLE_HEADING} |
- {CONTENT_ARCHIVE_TABLE_DATE} |
+ {CM_HEADING|archive} |
+ {CM_DATE|archive} |
- {CONTENT_ARCHIVE_TABLE_AUTHOR}
+ {CM_AUTHOR|archive}
\n";
}
if(!isset($CONTENT_ARCHIVE_TABLE_END)){
diff --git a/e107_plugins/content/templates/default/content_author_template.php b/e107_plugins/content/templates/default/content_author_template.php
index d414aa3da..11d9d7e9e 100644
--- a/e107_plugins/content/templates/default/content_author_template.php
+++ b/e107_plugins/content/templates/default/content_author_template.php
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_author_template.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:08 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
global $sc_style, $content_shortcodes;
@@ -21,8 +21,8 @@ global $sc_style, $content_shortcodes;
$sc_style['CONTENT_AUTHOR_TABLE_LASTITEM']['pre'] = "
";
-$sc_style['CONTENT_AUTHOR_TABLE_TOTAL']['pre'] = "(";
-$sc_style['CONTENT_AUTHOR_TABLE_TOTAL']['post'] = ")";
+$sc_style['CM_AMOUNT|author']['pre'] = "(";
+$sc_style['CM_AMOUNT|author']['post'] = ")";
// ##### CONTENT AUTHOR -------------------------------------------------------
if(!isset($CONTENT_AUTHOR_TABLE_START)){
@@ -32,7 +32,7 @@ if(!isset($CONTENT_AUTHOR_TABLE_START)){
if(!isset($CONTENT_AUTHOR_TABLE)){
$CONTENT_AUTHOR_TABLE = "
- {CONTENT_AUTHOR_TABLE_ICON} {CONTENT_AUTHOR_TABLE_NAME} {CONTENT_AUTHOR_TABLE_TOTAL} |
+ {CM_ICON|author} {CM_AUTHOR|author} {CM_AMOUNT|author} |
{CONTENT_AUTHOR_TABLE_LASTITEM}
";
diff --git a/e107_plugins/content/templates/default/content_cat_template.php b/e107_plugins/content/templates/default/content_cat_template.php
index 2c953fae9..50dfa6ab8 100644
--- a/e107_plugins/content/templates/default/content_cat_template.php
+++ b/e107_plugins/content/templates/default/content_cat_template.php
@@ -11,31 +11,31 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_cat_template.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:09 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_CAT_TABLE_ICON']['pre'] = "";
+$sc_style['CM_ICON|cat']['pre'] = "";
-$sc_style['CONTENT_CAT_TABLE_AUTHORDETAILS']['pre'] = " ";
-$sc_style['CONTENT_CAT_TABLE_AUTHORDETAILS']['post'] = " ";
+$sc_style['CM_AUTHOR|cat']['pre'] = " ";
+$sc_style['CM_AUTHOR|cat']['post'] = " ";
-$sc_style['CONTENT_CAT_TABLE_SUBHEADING']['pre'] = "
";
+$sc_style['CM_SUBHEADING|cat']['pre'] = "
";
-$sc_style['CONTENT_CAT_TABLE_TEXT']['pre'] = "
";
+$sc_style['CM_TEXT|cat']['pre'] = "
";
-$sc_style['CONTENT_CAT_TABLE_RATING']['pre'] = "
";
+$sc_style['CM_RATING|cat']['pre'] = "
";
-$sc_style['CONTENT_CAT_TABLE_AMOUNT']['pre'] = "(";
-$sc_style['CONTENT_CAT_TABLE_AMOUNT']['post'] = ")";
+$sc_style['CM_AMOUNT|cat']['pre'] = "(";
+$sc_style['CM_AMOUNT|cat']['post'] = ")";
$sc_style['CONTENT_CAT_TABLE_INFO_PRE']['pre'] = "";
+$sc_style['CM_SUBHEADING|catlist']['pre'] = "
";
-$sc_style['CONTENT_CAT_LIST_TABLE_ICON']['pre'] = "";
+$sc_style['CM_AUTHOR|catlist']['pre'] = " / ";
+$sc_style['CM_AUTHOR|catlist']['post'] = "";
-$sc_style['CONTENT_CAT_LIST_TABLE_SUBHEADING']['pre'] = "
";
+$sc_style['CM_RATING|catlist']['pre'] = "
";
-$sc_style['CONTENT_CAT_LIST_TABLE_AUTHORDETAILS']['pre'] = " / ";
-$sc_style['CONTENT_CAT_LIST_TABLE_AUTHORDETAILS']['post'] = "";
+$sc_style['CM_TEXT|catlist']['pre'] = "
";
-$sc_style['CONTENT_CAT_LIST_TABLE_RATING']['pre'] = "
";
-
-$sc_style['CONTENT_CAT_LIST_TABLE_TEXT']['pre'] = "
";
-
-$sc_style['CONTENT_CAT_LIST_TABLE_AMOUNT']['pre'] = "(";
-$sc_style['CONTENT_CAT_LIST_TABLE_AMOUNT']['post'] = ")";
+$sc_style['CM_AMOUNT|catlist']['pre'] = "(";
+$sc_style['CM_AMOUNT|catlist']['post'] = ")";
$sc_style['CONTENT_CAT_LIST_TABLE_INFO_PRE']['pre'] = "";
+$sc_style['CM_SUBHEADING|catlistsub']['pre'] = "
";
-$sc_style['CONTENT_CAT_LISTSUB_TABLE_ICON']['pre'] = "";
-
-$sc_style['CONTENT_CAT_LISTSUB_TABLE_SUBHEADING']['pre'] = "
";
-
-$sc_style['CONTENT_CAT_LISTSUB_TABLE_AMOUNT']['pre'] = "(";
-$sc_style['CONTENT_CAT_LISTSUB_TABLE_AMOUNT']['post'] = ")";
+$sc_style['CM_AMOUNT|catlistsub']['pre'] = "(";
+$sc_style['CM_AMOUNT|catlistsub']['post'] = ")";
// ##### CONTENT CAT_LIST SUB -------------------------------------------------
if(!isset($CONTENT_CAT_LISTSUB_TABLE_START)){
@@ -135,10 +126,10 @@ if(!isset($CONTENT_CAT_LISTSUB_TABLE)){
$CONTENT_CAT_LISTSUB_TABLE = "
- {CONTENT_CAT_LISTSUB_TABLE_ICON}
- {CONTENT_CAT_LISTSUB_TABLE_HEADING} {CONTENT_CAT_LISTSUB_TABLE_AMOUNT} |
+ {CM_ICON|catlistsub}
+ {CM_HEADING|catlistsub} {CM_AMOUNT|catlistsub} |
- {CONTENT_CAT_LISTSUB_TABLE_SUBHEADING}
+ {CM_SUBHEADING|catlistsub}
\n";
}
if(!isset($CONTENT_CAT_LISTSUB_TABLE_END)){
diff --git a/e107_plugins/content/templates/default/content_content_template.php b/e107_plugins/content/templates/default/content_content_template.php
index bbe772071..a0cccf5e7 100644
--- a/e107_plugins/content/templates/default/content_content_template.php
+++ b/e107_plugins/content/templates/default/content_content_template.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_content_template.php,v $
-| $Revision: 1.2 $
-| $Date: 2007-01-04 13:11:52 $
+| $Revision: 1.3 $
+| $Date: 2007-04-10 14:34:39 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
@@ -20,20 +20,20 @@
// ##### CONTENT CONTENT ------------------------------------------------------
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_CONTENT_TABLE_REFER']['pre'] = "
".CONTENT_LAN_44." ";
-$sc_style['CONTENT_CONTENT_TABLE_REFER']['post'] = "";
+$sc_style['CM_REFER|content']['pre'] = "
".CONTENT_LAN_44." ";
+$sc_style['CM_REFER|content']['post'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_COMMENT']['pre'] = "
".CONTENT_LAN_57." ";
-$sc_style['CONTENT_CONTENT_TABLE_COMMENT']['post'] = "";
+$sc_style['CM_COMMENT|content']['pre'] = "
".CONTENT_LAN_57." ";
+$sc_style['CM_COMMENT|content']['post'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_SCORE']['pre'] = "
".CONTENT_LAN_45." ";
-$sc_style['CONTENT_CONTENT_TABLE_SCORE']['post'] = "/100";
+$sc_style['CM_SCORE|content']['pre'] = "
".CONTENT_LAN_45." ";
+$sc_style['CM_SCORE|content']['post'] = "/100";
-$sc_style['CONTENT_CONTENT_TABLE_RATING']['pre'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_RATING']['post'] = "";
+$sc_style['CM_RATING|content']['pre'] = "
";
+$sc_style['CM_RATING|content']['post'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_AUTHORDETAILS']['pre'] = "
".CONTENT_LAN_11." ";
-$sc_style['CONTENT_CONTENT_TABLE_AUTHORDETAILS']['post'] = "";
+$sc_style['CM_AUTHOR|content']['pre'] = "
".CONTENT_LAN_11." ";
+$sc_style['CM_AUTHOR|content']['post'] = "";
$sc_style['CONTENT_CONTENT_TABLE_PAGENAMES']['pre'] = "
".CONTENT_LAN_46."
";
$sc_style['CONTENT_CONTENT_TABLE_PAGENAMES']['post'] = "
";
@@ -41,37 +41,29 @@ $sc_style['CONTENT_CONTENT_TABLE_PAGENAMES']['post'] = "";
$sc_style['CONTENT_CONTENT_TABLE_CUSTOM_TAGS']['pre'] = "
";
$sc_style['CONTENT_CONTENT_TABLE_CUSTOM_TAGS']['post'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_SUMMARY']['pre'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_SUMMARY']['post'] = "
";
+$sc_style['CM_SUMMARY|content']['pre'] = "";
+$sc_style['CM_SUMMARY|content']['post'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_TEXT']['pre'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_TEXT']['post'] = "
";
+$sc_style['CM_TEXT|content']['pre'] = "";
+$sc_style['CM_TEXT|content']['post'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_IMAGES']['pre'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_IMAGES']['post'] = "
";
+$sc_style['CM_IMAGES|content']['pre'] = "";
+$sc_style['CM_IMAGES|content']['post'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_SUBHEADING']['pre'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_SUBHEADING']['post'] = "
";
+$sc_style['CM_SUBHEADING|content']['pre'] = "";
+$sc_style['CM_SUBHEADING|content']['post'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_FILE']['pre'] = "
";
-$sc_style['CONTENT_CONTENT_TABLE_FILE']['post'] = "";
+$sc_style['CM_FILE|content']['pre'] = "
";
+$sc_style['CM_FILE|content']['post'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_DATE']['pre'] = CONTENT_LAN_10." ";
-$sc_style['CONTENT_CONTENT_TABLE_DATE']['post'] = "";
+$sc_style['CM_DATE|content']['pre'] = CONTENT_LAN_10." ";
+$sc_style['CM_DATE|content']['post'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_PARENT']['pre'] = "
".CONTENT_LAN_9." ";
-$sc_style['CONTENT_CONTENT_TABLE_PARENT']['post'] = "";
+$sc_style['CM_PARENT|content']['pre'] = "
".CONTENT_LAN_9." ";
+$sc_style['CM_PARENT|content']['post'] = "";
-//$sc_style['CONTENT_CONTENT_TABLE_INFO_PRE']['pre'] = "";
-//$sc_style['CONTENT_CONTENT_TABLE_INFO_PRE']['post'] = "";
-//$sc_style['CONTENT_CONTENT_TABLE_INFO_POST']['pre'] = "";
-//$sc_style['CONTENT_CONTENT_TABLE_INFO_POST']['post'] = "
";
-
-//$sc_style['CONTENT_CONTENT_TABLE_ICON']['pre'] = "";
-//$sc_style['CONTENT_CONTENT_TABLE_ICON']['post'] = "
";
-
-$sc_style['CONTENT_CONTENT_TABLE_ICON']['pre'] = "";
-$sc_style['CONTENT_CONTENT_TABLE_ICON']['post'] = " | ";
+$sc_style['CM_ICON|content']['pre'] = "";
+$sc_style['CM_ICON|content']['post'] = " | ";
$sc_style['CONTENT_CONTENT_TABLE_INFO_PRE']['pre'] = "";
$sc_style['CONTENT_CONTENT_TABLE_INFO_PRE']['post'] = "";
@@ -90,28 +82,26 @@ $sc_style['CONTENT_CONTENT_TABLE_INFO_POST_HEADDATA']['post'] = "";
$CONTENT_CONTENT_TABLE = "
-
{CONTENT_CONTENT_TABLE_INFO_PRE}
- {CONTENT_CONTENT_TABLE_ICON}
+ {CM_ICON|content}
{CONTENT_CONTENT_TABLE_INFO_PRE_HEADDATA}
- {CONTENT_CONTENT_TABLE_SUBHEADING}
- {CONTENT_CONTENT_TABLE_DATE} {CONTENT_CONTENT_TABLE_AUTHORDETAILS} {CONTENT_CONTENT_TABLE_EPICONS} {CONTENT_CONTENT_TABLE_EDITICON} {CONTENT_CONTENT_TABLE_PARENT} {CONTENT_CONTENT_TABLE_COMMENT} {CONTENT_CONTENT_TABLE_SCORE} {CONTENT_CONTENT_TABLE_REFER}
- {CONTENT_CONTENT_TABLE_RATING}
- {CONTENT_CONTENT_TABLE_FILE}
+ {CM_SUBHEADING|content}
+ {CM_DATE|content} {CM_AUTHOR|content} {CM_EPICONS|content} {CM_EDITICON|content} {CM_PARENT|content} {CM_COMMENT|content} {CM_SCORE|content} {CM_REFER|content}
+ {CM_RATING|content}
+ {CM_FILE|content}
{CONTENT_CONTENT_TABLE_INFO_POST_HEADDATA}
{CONTENT_CONTENT_TABLE_INFO_POST}
|
\n";
-
// ##### ----------------------------------------------------------------------
$CONTENT_CONTENT_TABLE_CUSTOM_START = "";
diff --git a/e107_plugins/content/templates/default/content_menu_template.php b/e107_plugins/content/templates/default/content_menu_template.php
new file mode 100644
index 000000000..89c201468
--- /dev/null
+++ b/e107_plugins/content/templates/default/content_menu_template.php
@@ -0,0 +1,137 @@
+";
+
+$sc_style['CM_MENU_LINKS_VIEWALLCAT']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWALLCAT']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWALLAUTHOR']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWALLAUTHOR']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWALLITEM']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWALLITEM']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWTOPRATED']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWTOPRATED']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWTOPSCORE']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWTOPSCORE']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWRECENT']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWRECENT']['post'] = "
";
+
+$sc_style['CM_MENU_LINKS_VIEWSUBMIT']['pre'] = "";
+$sc_style['CM_MENU_LINKS_VIEWSUBMIT']['post'] = "
";
+
+if(!isset($CONTENT_MENU)){
+ $CONTENT_MENU = "
+ {CM_MENU_SEARCH}
+ {CM_MENU_SELECT}
+ {CM_MENU_ORDER}
+ {CM_MENU_LINKCAPTION}
+ {CM_MENU_LINKS_VIEWALLCAT}
+ {CM_MENU_LINKS_VIEWALLAUTHOR}
+ {CM_MENU_LINKS_VIEWALLITEM}
+ {CM_MENU_LINKS_VIEWTOPRATED}
+ {CM_MENU_LINKS_VIEWTOPSCORE}
+ {CM_MENU_LINKS_VIEWRECENT}
+ {CM_MENU_LINKS_VIEWSUBMIT}
+
+ {CMT_CATEGORY}
+ {CMT_RECENT}";
+}
+
+//##### CATEGORY LIST --------------------------------------------------
+
+$sc_style['CM_MENU_CATEGORY_ICON']['pre'] = "";
+$sc_style['CM_MENU_CATEGORY_ICON']['post'] = " | ";
+
+$sc_style['CM_MENU_CATEGORY_COUNT']['pre'] = " (";
+$sc_style['CM_MENU_CATEGORY_COUNT']['post'] = ")";
+
+if(!isset($CONTENT_MENU_CATEGORY_START)){
+ $CONTENT_MENU_CATEGORY_START = "
{CM_MENU_CATEGORY_CAPTION}
";
+}
+
+if(!isset($CONTENT_MENU_CATEGORY_TABLE)){
+ $CONTENT_MENU_CATEGORY_TABLE = "
+
+
+ {CM_MENU_CATEGORY_ICON}
+ {CM_MENU_CATEGORY_HEADING} {CM_MENU_CATEGORY_COUNT} |
+
+
";
+}
+
+if(!isset($CONTENT_MENU_CATEGORY_END)){
+ $CONTENT_MENU_CATEGORY_END = "";
+}
+
+//##### RECENT --------------------------------------------------
+
+$sc_style['CM_MENU_RECENT_ICON']['pre'] = "";
+$sc_style['CM_MENU_RECENT_ICON']['post'] = " | ";
+
+$sc_style['CM_MENU_RECENT_HEADING']['pre'] = "";
+$sc_style['CM_MENU_RECENT_HEADING']['post'] = "
";
+
+$sc_style['CM_MENU_RECENT_DATE']['pre'] = "";
+$sc_style['CM_MENU_RECENT_DATE']['post'] = "
";
+
+$sc_style['CM_MENU_RECENT_AUTHOR']['pre'] = "";
+$sc_style['CM_MENU_RECENT_AUTHOR']['post'] = "
";
+
+$sc_style['CM_MENU_RECENT_SUBHEADING']['pre'] = "";
+$sc_style['CM_MENU_RECENT_SUBHEADING']['post'] = "
";
+
+if(!isset($CONTENT_MENU_RECENT_START)){
+ $CONTENT_MENU_RECENT_START = "
{CM_MENU_RECENT_CAPTION}
";
+}
+if(!isset($CONTENT_MENU_RECENT_TABLE)){
+ $CONTENT_MENU_RECENT_TABLE = "
+
+
+ {CM_MENU_RECENT_ICON}
+
+ {CM_MENU_RECENT_HEADING}
+ {CM_MENU_RECENT_DATE}
+ {CM_MENU_RECENT_AUTHOR}
+ {CM_MENU_RECENT_SUBHEADING}
+ |
+
+
";
+}
+if(!isset($CONTENT_MENU_RECENT_END)){
+ $CONTENT_MENU_RECENT_END = "";
+}
+
+// ##### ----------------------------------------------------------------------
+
+?>
\ No newline at end of file
diff --git a/e107_plugins/content/templates/default/content_recent_template.php b/e107_plugins/content/templates/default/content_recent_template.php
index 7be0b1ebb..d356e48da 100644
--- a/e107_plugins/content/templates/default/content_recent_template.php
+++ b/e107_plugins/content/templates/default/content_recent_template.php
@@ -11,43 +11,41 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_recent_template.php,v $
-| $Revision: 1.2 $
-| $Date: 2007-03-01 09:40:39 $
+| $Revision: 1.3 $
+| $Date: 2007-04-10 14:34:39 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
// ##### CONTENT RECENT LIST --------------------------------------------------
-
-
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_RECENT_TABLE_ICON']['pre'] = "";
+$sc_style['CM_ICON|recent']['pre'] = "";
-$sc_style['CONTENT_RECENT_TABLE_DATE']['pre'] = CONTENT_LAN_10." ";
-$sc_style['CONTENT_RECENT_TABLE_DATE']['post'] = "";
+$sc_style['CM_DATE|recent']['pre'] = CONTENT_LAN_10." ";
+$sc_style['CM_DATE|recent']['post'] = "";
-$sc_style['CONTENT_RECENT_TABLE_PARENT']['pre'] = CONTENT_LAN_9." ";
-$sc_style['CONTENT_RECENT_TABLE_PARENT']['post'] = "";
+$sc_style['CM_PARENT|recent']['pre'] = CONTENT_LAN_9." ";
+$sc_style['CM_PARENT|recent']['post'] = "";
-$sc_style['CONTENT_RECENT_TABLE_REFER']['pre'] = " (".CONTENT_LAN_44." ";
-$sc_style['CONTENT_RECENT_TABLE_REFER']['post'] = ")";
+$sc_style['CM_REFER|recent']['pre'] = " (".CONTENT_LAN_44." ";
+$sc_style['CM_REFER|recent']['post'] = ")";
-$sc_style['CONTENT_RECENT_TABLE_AUTHORDETAILS']['pre'] = CONTENT_LAN_11." ";
-$sc_style['CONTENT_RECENT_TABLE_AUTHORDETAILS']['post'] = "";
+$sc_style['CM_AUTHOR|recent']['pre'] = CONTENT_LAN_11." ";
+$sc_style['CM_AUTHOR|recent']['post'] = "";
-$sc_style['CONTENT_RECENT_TABLE_SUBHEADING']['pre'] = "
";
+$sc_style['CM_SUBHEADING|recent']['pre'] = "
";
-$sc_style['CONTENT_RECENT_TABLE_SUMMARY']['pre'] = "
";
+$sc_style['CM_SUMMARY|recent']['pre'] = "
";
-$sc_style['CONTENT_RECENT_TABLE_TEXT']['pre'] = "
";
+$sc_style['CM_TEXT|recent']['pre'] = "
";
-$sc_style['CONTENT_RECENT_TABLE_RATING']['pre'] = "
";
+$sc_style['CM_RATING|recent']['pre'] = "
";
$sc_style['CONTENT_RECENT_TABLE_INFOPRE']['pre'] = "";
+$sc_style['CM_ICON|score']['pre'] = "";
-$sc_style['CONTENT_SCORE_TABLE_HEADING']['pre'] = "";
-$sc_style['CONTENT_SCORE_TABLE_HEADING']['post'] = "";
+$sc_style['CM_HEADING|score']['pre'] = "";
+$sc_style['CM_HEADING|score']['post'] = "";
-$sc_style['CONTENT_SCORE_TABLE_AUTHOR']['pre'] = "
";
+$sc_style['CM_AUTHOR|score']['pre'] = "
";
-$sc_style['CONTENT_SCORE_TABLE_SCORE']['pre'] = "";
-$sc_style['CONTENT_SCORE_TABLE_SCORE']['post'] = " | ";
+$sc_style['CM_SCORE|score']['pre'] = "";
+$sc_style['CM_SCORE|score']['post'] = " | ";
// ##### CONTENT TOP --------------------------------------------------
if(!isset($CONTENT_SCORE_TABLE_START)){
@@ -39,11 +39,11 @@ if(!isset($CONTENT_SCORE_TABLE)){
$CONTENT_SCORE_TABLE = "
- {CONTENT_SCORE_TABLE_ICON}
- {CONTENT_SCORE_TABLE_HEADING} |
- {CONTENT_SCORE_TABLE_SCORE}
+ {CM_ICON|score}
+ {CM_HEADING|score} |
+ {CM_SCORE|score}
- {CONTENT_SCORE_TABLE_AUTHOR}
+ {CM_AUTHOR|score}
\n";
}
if(!isset($CONTENT_SCORE_TABLE_END)){
diff --git a/e107_plugins/content/templates/default/content_searchresult_template.php b/e107_plugins/content/templates/default/content_searchresult_template.php
index 0abab0500..d882faac9 100644
--- a/e107_plugins/content/templates/default/content_searchresult_template.php
+++ b/e107_plugins/content/templates/default/content_searchresult_template.php
@@ -11,31 +11,31 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_searchresult_template.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:09 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_SEARCHRESULT_TABLE_ICON']['pre'] = "";
+$sc_style['CM_ICON|searchresult']['pre'] = "";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_HEADING']['pre'] = "";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_HEADING']['post'] = " |
";
+$sc_style['CM_HEADING|searchresult']['pre'] = "";
+$sc_style['CM_HEADING|searchresult']['post'] = " |
";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_SUBHEADING']['pre'] = "
";
+$sc_style['CM_SUBHEADING|searchresult']['pre'] = "
";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_DATE']['pre'] = CONTENT_LAN_10." ";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_DATE']['post'] = "";
+$sc_style['CM_DATE|searchresult']['pre'] = CONTENT_LAN_10." ";
+$sc_style['CM_DATE|searchresult']['post'] = "";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_AUTHORDETAILS']['pre'] = CONTENT_LAN_11." ";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_AUTHORDETAILS']['post'] = "";
+$sc_style['CM_AUTHOR|searchresult']['pre'] = CONTENT_LAN_11." ";
+$sc_style['CM_AUTHOR|searchresult']['post'] = "";
-$sc_style['CONTENT_SEARCHRESULT_TABLE_TEXT']['pre'] = "
";
+$sc_style['CM_TEXT|searchresult']['pre'] = "
";
// ##### CONTENT SEARCHRESULT LIST --------------------------------------------------
if(!isset($CONTENT_SEARCHRESULT_TABLE_START)){
@@ -45,13 +45,13 @@ if(!isset($CONTENT_SEARCHRESULT_TABLE)){
$CONTENT_SEARCHRESULT_TABLE .= "
- {CONTENT_SEARCHRESULT_TABLE_ICON}
+ {CM_ICON|searchresult}
- {CONTENT_SEARCHRESULT_TABLE_HEADING}
- {CONTENT_SEARCHRESULT_TABLE_SUBHEADING}
-
- {CONTENT_SEARCHRESULT_TABLE_TEXT}
+ {CM_HEADING|searchresult}
+ {CM_SUBHEADING|searchresult}
+
+ {CM_TEXT|searchresult}
|
diff --git a/e107_plugins/content/templates/default/content_top_template.php b/e107_plugins/content/templates/default/content_top_template.php
index 683849c20..9a2d4ec7f 100644
--- a/e107_plugins/content/templates/default/content_top_template.php
+++ b/e107_plugins/content/templates/default/content_top_template.php
@@ -11,25 +11,25 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/templates/default/content_top_template.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:09 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2007-04-10 14:34:39 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
global $sc_style, $content_shortcodes;
-$sc_style['CONTENT_TOP_TABLE_ICON']['pre'] = "";
+$sc_style['CM_ICON|top']['pre'] = "";
-$sc_style['CONTENT_TOP_TABLE_HEADING']['pre'] = "";
-$sc_style['CONTENT_TOP_TABLE_HEADING']['post'] = "";
+$sc_style['CM_HEADING|top']['pre'] = "";
+$sc_style['CM_HEADING|top']['post'] = "";
-$sc_style['CONTENT_TOP_TABLE_AUTHOR']['pre'] = "
";
+$sc_style['CM_AUTHOR|top']['pre'] = "
";
-$sc_style['CONTENT_TOP_TABLE_RATING']['pre'] = "";
-$sc_style['CONTENT_TOP_TABLE_RATING']['post'] = " | ";
+$sc_style['CM_RATING|top']['pre'] = "";
+$sc_style['CM_RATING|top']['post'] = " | ";
// ##### CONTENT TOP --------------------------------------------------
if(!isset($CONTENT_TOP_TABLE_START)){
@@ -39,11 +39,11 @@ if(!isset($CONTENT_TOP_TABLE)){
$CONTENT_TOP_TABLE = "
- {CONTENT_TOP_TABLE_ICON}
- {CONTENT_TOP_TABLE_HEADING} |
- {CONTENT_TOP_TABLE_RATING}
+ {CM_ICON|top}
+ {CM_HEADING|top} |
+ {CM_RATING|top}
- {CONTENT_TOP_TABLE_AUTHOR}
+ {CM_AUTHOR|top}
\n";
}
if(!isset($CONTENT_TOP_TABLE_END)){