From 953445584436b079eaa7e4b7d43eb82aa7d4cd29 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Mon, 6 Jul 2009 09:28:02 +0000
Subject: [PATCH] Changed "Required plugins" in Theme Manager, to "Suggested
Plugins". If required, the theme creator can make mention of it. For
everything else, they are optional
---
e107_handlers/theme_handler.php | 10 +++++-----
e107_languages/English/admin/lan_theme.php | 6 +++---
e107_themes/e107v4a/e107v4a_config.php | 10 +++++-----
e107_themes/e107v4a/theme.xml | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 52915b633..2181088d5 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
-| $Revision: 1.22 $
-| $Date: 2009-07-06 09:17:27 $
+| $Revision: 1.23 $
+| $Date: 2009-07-06 09:28:02 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -371,7 +371,7 @@ class themeHandler{
$itext .= ($val['@attributes']['previewFull']) ? "</a>" : "";
$itext .= ($pref['sitetheme_deflayout'] == $key) ? " (default)" : "";
$itext .= "</td>
- <td style='vertical-align:top'>".$val['@attributes']['requiredPlugins']." </td>
+ <td style='vertical-align:top'>".$val['@attributes']['plugins']." </td>
<td style='vertical-align:top;text-align:center'>";
$itext .= ($val['menuPresets']) ? ADMIN_TRUE_ICON: " ";
$itext .= "</td>
@@ -537,7 +537,7 @@ class themeHandler{
$itext .= ($val['@attributes']['previewFull']) ? "</a>" : "";
$itext .= ($pref['sitetheme_deflayout'] == $key) ? " (default)" : "";
$itext .= "</td>
- <td style='vertical-align:top'>".$this->renderRequiredPlugins($val['@attributes']['requiredPlugins'])." </td>
+ <td style='vertical-align:top'>".$this->renderPlugins($val['@attributes']['plugins'])." </td>
<td style='vertical-align:top;text-align:center'>";
$itext .= ($val['menuPresets']) ? ADMIN_TRUE_ICON : " ";
$itext .= "</td>
@@ -660,7 +660,7 @@ class themeHandler{
return $text;
}
- function renderRequiredPlugins($val)
+ function renderPlugins($val)
{
$tmp = explode(",",$val);
$tmp = array_filter($tmp);
diff --git a/e107_languages/English/admin/lan_theme.php b/e107_languages/English/admin/lan_theme.php
index ca72c3577..f523eb04f 100644
--- a/e107_languages/English/admin/lan_theme.php
+++ b/e107_languages/English/admin/lan_theme.php
@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_theme.php,v $
-| $Revision: 1.5 $
-| $Date: 2009-07-06 06:33:29 $
+| $Revision: 1.6 $
+| $Date: 2009-07-06 09:28:02 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -70,7 +70,7 @@ define("TPVLAN_49", "Compliance");
define("TPVLAN_50", "Layouts");
define("TPVLAN_51", "Change Theme");
define("TPVLAN_52", "Name");
-define("TPVLAN_53", "Requirements");
+define("TPVLAN_53", "Suggested Plugins");
define("TPVLAN_54", "Menu Preset");
define("TPVLAN_55", "Default");
diff --git a/e107_themes/e107v4a/e107v4a_config.php b/e107_themes/e107v4a/e107v4a_config.php
index a45ced5e6..7eb80ad0c 100644
--- a/e107_themes/e107v4a/e107v4a_config.php
+++ b/e107_themes/e107v4a/e107v4a_config.php
@@ -5,8 +5,8 @@
function e107v4a_process()
{
global $theme_pref;
- $theme_pref['something'] = $_POST['e1074a_something'];
- $theme_pref['something2'] = $_POST['e1074a_something2'];
+ $theme_pref['example'] = $_POST['e1074a_example'];
+ $theme_pref['example2'] = $_POST['e1074a_example2'];
save_prefs('theme');
return "Custom Settings Saved Successfully";
}
@@ -16,11 +16,11 @@ function e107v4a_config()
{
global $theme_pref;
- $var[0]['caption'] = "This is a sample theme configuration page";
- $var[0]['html'] = "<input type='text' name='e1074a_something' value='".$theme_pref['something']."' />";
+ $var[0]['caption'] = "Sample configuration field";
+ $var[0]['html'] = "<input type='text' name='e1074a_example' value='".$theme_pref['example']."' />";
$var[1]['caption'] = "Another Example";
- $var[1]['html'] = "<input type='text' name='e1074a_something2' value='".$theme_pref['something2']."' />";
+ $var[1]['html'] = "<input type='text' name='e1074a_example' value='".$theme_pref['example2']."' />";
return $var;
}
diff --git a/e107_themes/e107v4a/theme.xml b/e107_themes/e107v4a/theme.xml
index 3c112b83b..57331dc42 100644
--- a/e107_themes/e107v4a/theme.xml
+++ b/e107_themes/e107v4a/theme.xml
@@ -4,7 +4,7 @@
<description>Classic e107 theme</description>
<compliance xhtml="true" css="true"/>
<layouts>
- <layout name='3_column' title='3 Columns' preview='preview.jpg' previewFull='preview_full.png' requiredPlugins='chatbox_menu,poll' default='true' >
+ <layout name='3_column' title='3 Columns' preview='preview.jpg' previewFull='preview_full.png' plugins='chatbox_menu,poll' default='true' >
<menuPresets>
<area id='1' >
<menu name='login' />
@@ -25,7 +25,7 @@
<menu name='online' />
</area>
<area id='2'>
- <menu name='powered_by' />
+ <menu name='powered_by' />
</area>
</menuPresets>
</layout>