diff --git a/root/adm/style/portal/acp_portal_links.html b/root/adm/style/portal/acp_portal_links.html index 6bafd0f6..d5c32209 100644 --- a/root/adm/style/portal/acp_portal_links.html +++ b/root/adm/style/portal/acp_portal_links.html @@ -95,14 +95,14 @@ {L_ACP_PORTAL_LINKS}

- +

- - + + diff --git a/root/adm/style/portal/acp_portal_menu.html b/root/adm/style/portal/acp_portal_menu.html index 6f8b9ed3..48a6c7c2 100644 --- a/root/adm/style/portal/acp_portal_menu.html +++ b/root/adm/style/portal/acp_portal_menu.html @@ -17,13 +17,13 @@
- {L_ACP_PORTAL_MENU_LINK} + {L_ACP_PORTAL_MENU_LINK_SETTINGS}
-
+
-
+
@@ -51,10 +51,10 @@ {L_ACP_PORTAL_MENU_PERMISSION_EXP}
- + + +
@@ -83,6 +83,18 @@
{L_MODULE_IMAGE}
+ +
+

{L_MODULE_PERMISSIONS_EXP}
+
+ +
+
+
@@ -90,14 +102,14 @@ {L_ACP_PORTAL_LINKS}

- +

{L_LINK_TITLE}{L_LINK_URL}{L_ACP_PORTAL_LINK_TITLE}{L_ACP_PORTAL_LINK_URL} {L_ACTION}
- - + + diff --git a/root/adm/style/portal/acp_portal_welcome.html b/root/adm/style/portal/acp_portal_welcome.html index 5d286bb8..fd5957fa 100644 --- a/root/adm/style/portal/acp_portal_welcome.html +++ b/root/adm/style/portal/acp_portal_welcome.html @@ -25,6 +25,18 @@
{L_MODULE_IMAGE}
+ +
+

{L_MODULE_PERMISSIONS_EXP}
+
+ +
+
+ diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index 6dfa7f2a..f33be8ae 100644 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -94,6 +94,7 @@ $lang = array_merge($lang, array( 'MODULE_PERMISSIONS_EXP' => 'Select the groups that should be authorized to view the module. If you want all users to be able to view the module, don’t select anything.
Select/Deselect multiple groups by holding CTRL and clicking.', // Manage links + /* 'ACP_EXPRESS_LINKS_EXPLAIN' => 'Using this form you can add, edit, view and delete navigation links on the index page. You can also create special navigation links as categories which aren’t clickable links.', 'ADD_LINK' => 'Add new navigation link', 'ACP_PORTAL_MANAGE_LINKS' => 'Links verwalten', @@ -114,7 +115,7 @@ $lang = array_merge($lang, array( 'NO_LINK_URL' => 'You have created clickable navigation link but haven’t entered the URL for this navigation link.', 'SELECT_LINK_ICON' => 'Select an icon…', - + */ // Logs 'LOG_PORTAL_CONFIG' => 'Altered Portal settings
» %s', diff --git a/root/language/en/mods/portal/portal_links_module.php b/root/language/en/mods/portal/portal_links_module.php index b0b384c4..437a55cc 100644 --- a/root/language/en/mods/portal/portal_links_module.php +++ b/root/language/en/mods/portal/portal_links_module.php @@ -42,6 +42,7 @@ $lang = array_merge($lang, array( 'ACP_PORTAL_LINK_TYPE_EXP' => 'If you have a link to a page of your board, choose "Internal link" in order to prevent unwanted logouts.', 'ACP_PORTAL_LINK_INT' => 'Internal link', 'ACP_PORTAL_LINK_EXT' => 'External link', + 'ACP_PORTAL_LINK_ADD' => 'Add new navigation link', 'ACP_PORTAL_LINK_URL' => 'Link URL', 'ACP_PORTAL_LINK_URL_EXP' => 'External links:
All links should be entered with a http://

Internal links:
Only enter the php file as link url, i.e. index.php?style=4.', 'ACP_PORTAL_LINK_PERMISSION' => 'Link permissions', diff --git a/root/language/en/mods/portal/portal_main_menu_module.php b/root/language/en/mods/portal/portal_main_menu_module.php index 3ca5d771..b98e537f 100644 --- a/root/language/en/mods/portal/portal_main_menu_module.php +++ b/root/language/en/mods/portal/portal_main_menu_module.php @@ -43,14 +43,17 @@ $lang = array_merge($lang, array( // ACP 'ACP_PORTAL_MENU' => 'Menu settings', + 'ACP_PORTAL_MENU_LINK_SETTINGS' => 'Link Settings', 'ACP_PORTAL_MENU_EXP' => 'Manage your main menu', 'ACP_PORTAL_MENU_MANAGE' => 'Manage menu', 'ACP_PORTAL_MENU_MANAGE_EXP' => 'You can manage the links of your main menu here.
Change the type of link by changing the selected option in the drop-down list next to the link.', 'ACP_PORTAL_MENU_CAT' => 'Category', + 'ACP_PORTAL_MENU_IS_CAT' => 'Set as special link category', 'ACP_PORTAL_MENU_INT' => 'Internal link', 'ACP_PORTAL_MENU_EXT' => 'External link', 'ACP_PORTAL_MENU_TITLE' => 'Title', 'ACP_PORTAL_MENU_URL' => 'Link URL', + 'ACP_PORTAL_MENU_ADD' => 'Add new navigation link', 'ACP_PORTAL_MENU_TYPE' => 'Link type', 'ACP_PORTAL_MENU_TYPE_EXP' => 'If you have a link to a page of your board, choose "Internal link" in order to prevent unwanted logouts.', 'ACP_PORTAL_MENU_CREATE_CAT' => 'You need to create a category first.', diff --git a/root/portal/modules/portal_main_menu.php b/root/portal/modules/portal_main_menu.php index 8ee8e1d4..bed6b005 100644 --- a/root/portal/modules/portal_main_menu.php +++ b/root/portal/modules/portal_main_menu.php @@ -265,7 +265,7 @@ class portal_main_menu_module $link_type = (!$link_is_cat) ? request_var('link_type', 0) : B3_LINKS_CAT; $link_url = ($link_is_cat) ? ' ' : request_var('link_url', ' '); $link_url = str_replace('&', '&', $link_url); - $link_permission = request_var('permission-setting', array(0 => '')); + $link_permission = request_var('permission-setting-menu', array(0 => '')); $groups_ary = array(); // get groups and check if the selected groups actually exist @@ -431,7 +431,7 @@ class portal_main_menu_module $result = $db->sql_query($sql); while($row = $db->sql_fetchrow($result)) { - $template->assign_block_vars('permission_setting', array( + $template->assign_block_vars('permission_setting_menu', array( 'SELECTED' => (in_array($row['group_id'], $groups_ary)) ? true : false, 'GROUP_NAME' => (isset($user->lang['G_' . $row['group_name']])) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], 'GROUP_ID' => $row['group_id'], diff --git a/root/portal/modules/portal_welcome.php b/root/portal/modules/portal_welcome.php index ca1c997a..53d11d6e 100644 --- a/root/portal/modules/portal_welcome.php +++ b/root/portal/modules/portal_welcome.php @@ -153,9 +153,6 @@ class portal_welcome_module set_portal_config('board3_welcome_message_' . $module_id, $welcome_message); set_config('board3_welcome_message_uid_' . $module_id, $uid); set_config('board3_welcome_message_bitfield_' . $module_id, $bitfield); - - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link(($module_id) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=portal&mode=modules') : $u_action)); - break; case 'preview':
{L_LINK_TITLE}{L_LINK_URL}{L_ACP_PORTAL_MENU_TITLE}{L_ACP_PORTAL_MENU_URL} {L_ACTION}