makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13713] Make mentions globally available

Browse source 
PHPBB3-13713
This commit is contained in:
lavigor 2018-06-06 12:39:51 +03:00 • committed by Marc Alexander
parent ac8adcb9a6
commit 8817e23474
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/adm/style/acp_posting_buttons.html
View file

@ -1,5 +1,7 @@
<script> <script>
// <![CDATA[ // <![CDATA[
var mention_url = '{UA_MENTION_URL}';
var mention_topic_id = '{S_TOPIC_ID}';
// Define the bbCode tags // Define the bbCode tags
var bbcode = new Array(); var bbcode = new Array();
@ -8,6 +10,9 @@
// ]]> // ]]>
</script> </script>
<!-- INCLUDECSS {T_ASSETS_PATH}/css/jquery.atwho.min.css -->
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.caret.min.js -->
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/jquery.atwho.min.js -->
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js --> <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
<!-- EVENT acp_posting_buttons_before --> <!-- EVENT acp_posting_buttons_before -->

46
phpBB/adm/style/admin.css
View file

@ -1670,6 +1670,52 @@ fieldset.submit-buttons legend {
} }
} }
/* Mentions and mention dropdown
---------------------------------------- */
.mention {
font-weight: bold;
}
.atwho-container .atwho-view {
font-size: 12px;
min-width: 260px;
}
.atwho-container .atwho-view ul li {
position: relative;
padding: 15px 5px 15px 45px;
}
.atwho-container .atwho-view ul li:hover,
.atwho-container .atwho-view ul li.cur {
background-color: #0077b3;
color: #ffffff;
}
.mention-avatar {
font-size: 14px;
line-height: 30px;
text-align: center;
vertical-align: middle;
background-color: #0077b3;
border: 1px solid #ffffff;
border-radius: 100%;
color: #ffffff;
position: absolute;
top: 50%;
left: 7px;
display: inline-block;
width: 30px;
height: 30px;
margin-top: -16px;
}
.mention-rank {
font-size: 10px;
display: block;
margin-top: 2px;
}
/* Input field styles /* Input field styles
---------------------------------------- */ ---------------------------------------- */
input.radio, input.radio,

2
phpBB/includes/functions.php
View file

@ -3943,6 +3943,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
'U_FEED' => $controller_helper->route('phpbb_feed_index'), 'U_FEED' => $controller_helper->route('phpbb_feed_index'),
'UA_MENTION_URL' => $controller_helper->route('phpbb_mention_controller'),
'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false, 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false,
'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false, 'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false,

5
phpBB/includes/functions_acp.php
View file

@ -66,6 +66,9 @@ function adm_page_header($page_title)
} }
} }
/** @var \phpbb\controller\helper $controller_helper */
$controller_helper = $phpbb_container->get('controller.helper');
$phpbb_version_parts = explode('.', PHPBB_VERSION, 3); $phpbb_version_parts = explode('.', PHPBB_VERSION, 3);
$phpbb_major = $phpbb_version_parts[0] . '.' . $phpbb_version_parts[1]; $phpbb_major = $phpbb_version_parts[0] . '.' . $phpbb_version_parts[1];
@ -86,6 +89,8 @@ function adm_page_header($page_title)
'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"),
'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"),
'UA_MENTION_URL' => $controller_helper->route('phpbb_mention_controller'),
'T_IMAGES_PATH' => "{$phpbb_root_path}images/", 'T_IMAGES_PATH' => "{$phpbb_root_path}images/",
'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/",
'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/", 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/",

1
phpBB/posting.php
View file

@ -1905,7 +1905,6 @@ $page_data = array(
'U_VIEW_TOPIC' => ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") : '', 'U_VIEW_TOPIC' => ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") : '',
'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup"), 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup"),
'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup")), 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&amp;mode=popup")),
'UA_MENTION_URL' => $controller_helper->route('phpbb_mention_controller'),
'S_PRIVMSGS' => false, 'S_PRIVMSGS' => false,
'S_CLOSE_PROGRESS_WINDOW' => (isset($_POST['add_file'])) ? true : false, 'S_CLOSE_PROGRESS_WINDOW' => (isset($_POST['add_file'])) ? true : false,