From 46a55c202ee6a3c924defb1dbcafe697af022343 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 29 Jul 2011 21:23:54 +0200 Subject: [PATCH] Hide module image settings in center, top & bottom column --- root/adm/style/portal/acp_portal_calendar.html | 2 ++ root/adm/style/portal/acp_portal_config.html | 2 ++ root/adm/style/portal/acp_portal_custom.html | 2 ++ root/adm/style/portal/acp_portal_links.html | 2 ++ root/adm/style/portal/acp_portal_menu.html | 2 ++ root/adm/style/portal/acp_portal_welcome.html | 2 ++ root/includes/acp/acp_portal.php | 1 + root/includes/acp/info/acp_portal.php | 2 +- 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/root/adm/style/portal/acp_portal_calendar.html b/root/adm/style/portal/acp_portal_calendar.html index 12f7b3fd..fabd8944 100644 --- a/root/adm/style/portal/acp_portal_calendar.html +++ b/root/adm/style/portal/acp_portal_calendar.html @@ -102,6 +102,7 @@

{L_MODULE_NAME_EXP}
+

{L_MODULE_IMAGE_EXP}
@@ -117,6 +118,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/adm/style/portal/acp_portal_config.html b/root/adm/style/portal/acp_portal_config.html index ba281440..60f0e1c9 100644 --- a/root/adm/style/portal/acp_portal_config.html +++ b/root/adm/style/portal/acp_portal_config.html @@ -48,6 +48,7 @@
+

{L_MODULE_IMAGE_EXP}
@@ -63,6 +64,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/adm/style/portal/acp_portal_custom.html b/root/adm/style/portal/acp_portal_custom.html index 0c1c0f87..3abedbf6 100644 --- a/root/adm/style/portal/acp_portal_custom.html +++ b/root/adm/style/portal/acp_portal_custom.html @@ -20,6 +20,7 @@

{L_MODULE_NAME_EXP}
+

{L_MODULE_IMAGE_EXP}
@@ -35,6 +36,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/adm/style/portal/acp_portal_links.html b/root/adm/style/portal/acp_portal_links.html index c3db8dcd..40d74f8a 100644 --- a/root/adm/style/portal/acp_portal_links.html +++ b/root/adm/style/portal/acp_portal_links.html @@ -71,6 +71,7 @@

{L_MODULE_NAME_EXP}
+

{L_MODULE_IMAGE_EXP}
@@ -86,6 +87,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/adm/style/portal/acp_portal_menu.html b/root/adm/style/portal/acp_portal_menu.html index 687d3d9c..05f782df 100644 --- a/root/adm/style/portal/acp_portal_menu.html +++ b/root/adm/style/portal/acp_portal_menu.html @@ -78,6 +78,7 @@

{L_MODULE_NAME_EXP}
+

{L_MODULE_IMAGE_EXP}
@@ -93,6 +94,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/adm/style/portal/acp_portal_welcome.html b/root/adm/style/portal/acp_portal_welcome.html index f5d2a21f..bb3cb593 100644 --- a/root/adm/style/portal/acp_portal_welcome.html +++ b/root/adm/style/portal/acp_portal_welcome.html @@ -20,6 +20,7 @@

{L_MODULE_NAME_EXP}
+

{L_MODULE_IMAGE_EXP}
@@ -35,6 +36,7 @@
px
+

{L_MODULE_RESET_EXP}
diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index d1536913..1262da89 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -110,6 +110,7 @@ class acp_portal 'MODULE_IMAGE_HEIGHT' => $module_data['module_image_height'], 'MODULE_IMAGE_SRC' => ($module_data['module_image_src']) ? $phpbb_root_path . 'styles/' . $user->theme['theme_path'] . '/theme/images/portal/' . $module_data['module_image_src'] : '', 'MODULE_ENABLED' => ($module_data['module_status']) ? true : false, + 'MODULE_SHOW_IMAGE' => (in_array(column_num_string($module_data['module_column']), array('center', 'top', 'bottom'))) ? false : true, )); if($module_data['module_classname'] != 'custom') diff --git a/root/includes/acp/info/acp_portal.php b/root/includes/acp/info/acp_portal.php index 304b7d03..d743f8ab 100644 --- a/root/includes/acp/info/acp_portal.php +++ b/root/includes/acp/info/acp_portal.php @@ -22,7 +22,7 @@ class acp_portal_info return array( 'filename' => 'acp_portal', 'title' => 'ACP_PORTAL', - 'version' => '2.0.0-a1', + 'version' => '2.0.0b2', 'modes' => array( 'config' => array('title' => 'ACP_PORTAL_GENERAL_INFO', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), 'modules' => array('title' => 'ACP_PORTAL_MODULES', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')),