diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index 007c73b4..c7735176 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -280,6 +280,8 @@ class acp_portal $result = $db->sql_query_limit($sql, 1); $module_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); + + $directory = $phpbb_root_path . 'portal/modules/'; if ($module_data !== false) { @@ -438,7 +440,7 @@ class acp_portal 'MODULE_NAME' => (isset($user->lang[$row['module_name']])) ? $user->lang[$row['module_name']] : $row['module_name'], 'MODULE_IMAGE' => ($row['module_image_src']) ? '' . $row['module_name'] . '' : '', - 'U_DELETE' => $this->u_action . '&module_id=' . $row['module_id'] . '&action=delete', + 'U_DELETE' => $this->u_action . '&module_id=' . $row['module_id'] . '&module_classname=' . $row['module_classname'] . '&action=delete', 'U_EDIT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=portal&mode=config&module_id=' . $row['module_id']), 'U_MOVE_UP' => $this->u_action . '&module_id=' . $row['module_id'] . '&action=move_up', 'U_MOVE_DOWN' => $this->u_action . '&module_id=' . $row['module_id'] . '&action=move_down', diff --git a/root/language/de/mods/portal/portal_announcements_module.php b/root/language/de/mods/portal/portal_announcements_module.php index 84198bb6..6c2045b1 100644 --- a/root/language/de/mods/portal/portal_announcements_module.php +++ b/root/language/de/mods/portal/portal_announcements_module.php @@ -46,6 +46,28 @@ $lang = array_merge($lang, array( 'JUMP_FIRST' => 'Zum ersten Beitrag springen', 'JUMP_TO_POST' => 'Rufe den Beitrag auf', 'BACK' => 'Zurück', + 'ACP_PORTAL_ANNOUNCE_SETTINGS' => 'Einstellungen für Bekanntmachungen', + 'ACP_PORTAL_ANNOUNCE_SETTINGS_EXPLAIN' => 'Hier kannst du die Einstellungen für die Bekanntmachungen ändern.', + 'PORTAL_ANNOUNCEMENTS' => 'Bekanntmachungen anzeigen', + 'PORTAL_ANNOUNCEMENTS_EXPLAIN' => 'Diesen Block auf dem Portal anzeigen.', + 'PORTAL_ANNOUNCEMENTS_STYLE' => 'Kompakter Bekanntmachungen-Block-Stil', + 'PORTAL_ANNOUNCEMENTS_STYLE_EXPLAIN' => 'Wenn "ja" ausgewählt ist, wird die kompakte Ansicht für die Bekanntmachungen angezeigt, bei "nein" die große Ansicht.', + 'PORTAL_NUMBER_OF_ANNOUNCEMENTS' => 'Anzahl der Bekanntmachungen auf dem Portal', + 'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXPLAIN' => '0 bedeutet unbegrenzt', + 'PORTAL_ANNOUNCEMENTS_DAY' => 'Die Anzahl der Tage, während der die Bekanntmachung angezeigt werden soll', + 'PORTAL_ANNOUNCEMENTS_DAY_EXPLAIN' => '0 bedeutet unbegrenzt', + 'PORTAL_ANNOUNCEMENTS_LENGTH' => 'Maximale Länge der Bekanntmachungen', + 'PORTAL_ANNOUNCEMENTS_LENGTH_EXPLAIN' => '0 bedeutet unbegrenzt', + 'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM' => 'Foren der Bekanntmachungen', + 'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM_EXPLAIN' => 'Die ID des Forums, aus welchem die Bekanntmachungen angezeigt werden sollen. Frei lassen, um aus allen Foren anzeigen zu lassen. Falls "Foren aussschließen" auf "Ja" steht, wähle die Foren die du ausschließen willst.
Falls "Foren aussschließen" auf "Nein" steht, wähle die Foren die du sehen willst.
Wähle mehrere Foren aus/ab, indem du beim Klicken die Strg-Taste drückst.', + 'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE' => 'Foren aussschließen', + 'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE_EXPLAIN'=> 'Wähle "Ja" wenn du die ausgewählten Foren vom Bekanntmachungen-Block ausschließen willst, und "Nein" wenn du nur die Bekanntmachungen aus den ausgewählten Foren im Bekanntmachungen-Block sehen willst.', + 'PORTAL_ANNOUNCEMENTS_PERMISSIONS' => 'Berechtigungen prüfen anschalten?', + 'PORTAL_ANNOUNCEMENTS_PERMISSIONS_EXPLAIN' => 'Berücksichtigt Berechtigungen beim Anzeigen der Bekanntmachungen', + 'PORTAL_ANNOUNCEMENTS_ARCHIVE' => 'Das Archivsystem für die Bekanntmachungen aktivieren', + 'PORTAL_ANNOUNCEMENTS_ARCHIVE_EXPLAIN' => 'Wenn aktiviert, wird das Archivsystem und ggf. Seitenzahlen angezeigt.', + 'PORTAL_SHOW_REPLIES_VIEWS' => '"Antworten" und "Zugriffe" in Extraspalten', + 'PORTAL_SHOW_REPLIES_VIEWS_EXPLAIN' => 'Einstellung für den kompakter Bekanntmachungen-Block-Stil.
Wenn aktiviert, wird die Anzahl der Antworten und Zugriffe in gesonderten Spalten angezeigt. Wenn deaktiviert gibt es nur zwei Spalten und die Antworten und Zugriffe werden neben "Forum" angezeigt. Bei Darstellungsproblemen mit z.B. schmalen Styles bitte deaktivieren.', )); ?> \ No newline at end of file diff --git a/root/language/en/mods/portal/portal_announcements_module.php b/root/language/en/mods/portal/portal_announcements_module.php index 154bc5ac..0f82e9e7 100644 --- a/root/language/en/mods/portal/portal_announcements_module.php +++ b/root/language/en/mods/portal/portal_announcements_module.php @@ -46,6 +46,28 @@ $lang = array_merge($lang, array( 'JUMP_FIRST' => 'Jump to first post', 'JUMP_TO_POST' => 'Jump to post', 'BACK' => 'Back', + 'ACP_PORTAL_ANNOUNCE_SETTINGS' => 'Global announcements settings', + 'ACP_PORTAL_ANNOUNCE_SETTINGS_EXPLAIN' => 'This is where you customize the global announcements block.', + 'PORTAL_ANNOUNCEMENTS' => 'Display global announcements', + 'PORTAL_ANNOUNCEMENTS_EXPLAIN' => 'Display this block on the portal.', + 'PORTAL_ANNOUNCEMENTS_STYLE' => 'Compact global announcements block style', + 'PORTAL_ANNOUNCEMENTS_STYLE_EXPLAIN' => '"Yes" means use the compact style for for global announcements. "No" means use the large style (text view).', + 'PORTAL_NUMBER_OF_ANNOUNCEMENTS' => 'Number of announcements on the portal', + 'PORTAL_NUMBER_OF_ANNOUNCEMENTS_EXPLAIN' => '0 means infinite', + 'PORTAL_ANNOUNCEMENTS_DAY' => 'Number of days to display the announcement', + 'PORTAL_ANNOUNCEMENTS_DAY_EXPLAIN' => '0 means infinite', + 'PORTAL_ANNOUNCEMENTS_LENGTH' => 'Maximum size/length of global announcements', + 'PORTAL_ANNOUNCEMENTS_LENGTH_EXPLAIN' => '0 means infinite', + 'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM' => 'Announcements forums', + 'PORTAL_GLOBAL_ANNOUNCEMENTS_FORUM_EXPLAIN' => 'Forum(s) from which we retrieve the announcements. Leave this blank to retrieve announcements from all the forums. If "Exclude forums" is set to "Yes", select the forums you want to exclude.
If "Exclude forums" is set to "No" select the forums you want to see.
Select/Deselect multiple forums by holding CTRL and clicking.', + 'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE' => 'Exclude forums', + 'PORTAL_ANNOUNCEMENTS_FORUM_EXCLUDE_EXPLAIN'=> 'Select "Yes" if you want to exlude the selected forums from the announcements block, and "No" if you want to see only the selected forums in the announcements block.', + 'PORTAL_ANNOUNCEMENTS_PERMISSIONS' => 'Enable/disable permissions', + 'PORTAL_ANNOUNCEMENTS_PERMISSIONS_EXPLAIN' => 'When displaying announcements, consider a user's forum-viewing permissions.', + 'PORTAL_ANNOUNCEMENTS_ARCHIVE' => 'Enable the announcements archive system', + 'PORTAL_ANNOUNCEMENTS_ARCHIVE_EXPLAIN' => 'If enabled the announcements archive system / page numbers will be displayed.', + 'PORTAL_SHOW_REPLIES_VIEWS' => 'Display the number of replies and views', + 'PORTAL_SHOW_REPLIES_VIEWS_EXPLAIN' => 'This setting pertains to the compact block.
When Yes, the number of replies and views are shown in 2 extra columns. When No, replies and views will be shown beside the forum name. Select No if you have problems with the display of the extra columns due to the extra width required.', )); ?> \ No newline at end of file diff --git a/root/portal.php b/root/portal.php index 51beb0cf..0b3fe7c3 100644 --- a/root/portal.php +++ b/root/portal.php @@ -33,7 +33,8 @@ if (!$config['portal_enable']) } $sql = 'SELECT * - FROM ' . PORTAL_MODULES_TABLE; + FROM ' . PORTAL_MODULES_TABLE . ' + ORDER BY module_order ASC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { diff --git a/root/portal/modules/portal_announcements.php b/root/portal/modules/portal_announcements.php index 143f981c..dbd714f6 100644 --- a/root/portal/modules/portal_announcements.php +++ b/root/portal/modules/portal_announcements.php @@ -435,7 +435,7 @@ class portal_announcements_module $selected = array(); if(isset($config[$key]) && strlen($config[$key]) > 0) { - $selected = explode(',', $[$key]); + $selected = explode(',', $config[$key]); } // Build forum options $s_forum_options = '

+ {L_PASSWORD}:
+ + +

+ + {L_UM_LOG_ME_IN}
+ + +
+ + +{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} + + \ No newline at end of file diff --git a/root/styles/prosilver/template/portal/modules/user_menu_side.html b/root/styles/prosilver/template/portal/modules/user_menu_side.html new file mode 100644 index 00000000..d31b004e --- /dev/null +++ b/root/styles/prosilver/template/portal/modules/user_menu_side.html @@ -0,0 +1,41 @@ + +{$LR_BLOCK_H_L} {L_USER_MENU}{$LR_BLOCK_H_R} +
+ {USERNAME_FULL}
+ + {B3P_AVATAR_IMG} + + + +
{B3P_RANK_TITLE} +
{B3P_RANK_IMG} +
+
+
+
{L_M_MENU}
+ +
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}