[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Rename sidebar icon
GeorgeBarnick has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371703 ) Change subject: Rename sidebar icon .. Rename sidebar icon Not sure why it was ever called "rightbar" when by default it's on the left, but it's a nondescriptive filename nonetheless and doesn't make a difference whether Refreshed is in ltr or rtl mode, so here's a more descriptive and relevant filename. Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c --- R refreshed/images/icon-sidebar-toggle.png M refreshed/styles/screen/main.css 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: GeorgeBarnick: Verified; Looks good to me, approved MacFan4000: Looks good to me, but someone else must approve diff --git a/refreshed/images/icon-rightbar.png b/refreshed/images/icon-sidebar-toggle.png similarity index 100% rename from refreshed/images/icon-rightbar.png rename to refreshed/images/icon-sidebar-toggle.png Binary files differ diff --git a/refreshed/styles/screen/main.css b/refreshed/styles/screen/main.css index 0db40e9..4fa3a5f 100755 --- a/refreshed/styles/screen/main.css +++ b/refreshed/styles/screen/main.css @@ -172,7 +172,7 @@ top: 0; right: -3em; background-color: #194a8d; - background-image: url(../../images/icon-rightbar.png); + background-image: url(../../images/icon-sidebar-toggle.png); background-size: 3em; display: none; -ms-transition: right 0.2s ease 0s; -- To view, visit https://gerrit.wikimedia.org/r/371703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed Gerrit-Branch: master Gerrit-Owner: GeorgeBarnickGerrit-Reviewer: GeorgeBarnick Gerrit-Reviewer: MacFan4000 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Rename sidebar icon
GeorgeBarnick has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371703 ) Change subject: Rename sidebar icon .. Rename sidebar icon Not sure why it was ever called "rightbar" when by default it's on the left, but it's a nondescriptive filename nonetheless and doesn't make a difference whether Refreshed is in ltr or rtl mode, so here's a more descriptive and relevant filename. Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c --- R refreshed/images/icon-sidebar-toggle.png M refreshed/styles/screen/main.css 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed refs/changes/03/371703/1 diff --git a/refreshed/images/icon-rightbar.png b/refreshed/images/icon-sidebar-toggle.png similarity index 100% rename from refreshed/images/icon-rightbar.png rename to refreshed/images/icon-sidebar-toggle.png Binary files differ diff --git a/refreshed/styles/screen/main.css b/refreshed/styles/screen/main.css index 0db40e9..4fa3a5f 100755 --- a/refreshed/styles/screen/main.css +++ b/refreshed/styles/screen/main.css @@ -172,7 +172,7 @@ top: 0; right: -3em; background-color: #194a8d; - background-image: url(../../images/icon-rightbar.png); + background-image: url(../../images/icon-sidebar-toggle.png); background-size: 3em; display: none; -ms-transition: right 0.2s ease 0s; -- To view, visit https://gerrit.wikimedia.org/r/371703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2a7da57cf0acaf1f2577b5705e9cb4363c94b9c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt to fix wAvatar class errors - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/210854 Change subject: Attempt to fix wAvatar class errors .. Attempt to fix wAvatar class errors Change-Id: I78cdb1f094c444d3affedb044d96a25a7cc8081b --- M MediaWikiChatClass.php 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/54/210854/1 diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php index f3b3082..8542b47 100644 --- a/MediaWikiChatClass.php +++ b/MediaWikiChatClass.php @@ -31,12 +31,15 @@ * @param $id Integer: user ID * @return String: avatar image path */ + static function getAvatar( $id ) { - global $wgUploadPath; + if ( class_exists( 'SocialProfileHooks' ) ) { // is SocialProfile installed? + global $wgUploadPath; - $avatar = new wAvatar( $id, 's' ); + $avatar = new wAvatar( $id, 's' ); - return $wgUploadPath . '/avatars/' . $avatar-getAvatarImage(); + return $wgUploadPath . '/avatars/' . $avatar-getAvatarImage(); + } } /** -- To view, visit https://gerrit.wikimedia.org/r/210854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78cdb1f094c444d3affedb044d96a25a7cc8081b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick georgebarn...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding a border to the bottom of the chat-topic - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/132496 Change subject: Adding a border to the bottom of the chat-topic .. Adding a border to the bottom of the chat-topic This aesthetic change makes the chat topic and the chat table have a division between each other so that they don't feel like one thing. Also in this change are some CSS cleanup per https://www.mediawiki.org/wiki/CC/CSS though these changes in no way change the functionality or appearance of the extension. Change-Id: Ibc98b2436ed37c91f9199cfe4ce321a12ef6c76e --- M MediaWikiChat.css 1 file changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/96/132496/1 diff --git a/MediaWikiChat.css b/MediaWikiChat.css index d46d794..2759c39 100644 --- a/MediaWikiChat.css +++ b/MediaWikiChat.css @@ -2,24 +2,29 @@ position: relative; width: 100%; } + #mwchat-main { width: 67%; } + #mwchat-content { height: 450px; overflow-y: scroll; resize: vertical; } + #mwchat-table { width: 100%; table-layout: fixed; resize: none; } + .mwchat-useritem-content { height: 200px; overflow-y: scroll; border-left: 1px #eee solid; /* only left, bottom is input, right scrollbar, and top header */ } + #mwchat-users { width: 33%; position: absolute; @@ -29,6 +34,7 @@ overflow-y: auto; overflow-x: hidden; } + #mwchat-me { width: 33%; position: absolute; @@ -36,16 +42,20 @@ top: 450px; padding-left: 10px; } + #mwchat-type input, .mwchat-useritem input { width: 100%; } + .mwchat-useritem input { margin-top: 0; width: 99%; /* keeps input in line, otherwise it sticks out */ } + .mwchat-item-messagecell { width: 77%; } + .mwchat-item-timestamp-container { float: right; margin-left: 6px; @@ -53,10 +63,12 @@ position: relative; text-align: right; } + .mwchat-item-timestamp { color: #CCC; text-transform: lowercase; } + .mwchat-item-timestamp.real { width: 8em; position: absolute; @@ -66,6 +78,7 @@ padding-bottom: 5px; white-space: nowrap; } + .mwchat-item-user { margin: 5px; width: 20%; @@ -74,9 +87,11 @@ text-align: right; vertical-align: top; } + .mwchat-useritem-content .mwchat-item-user { width: 90px; } + .mwchat-useritem { /*padding: 3px 0 3px 3px;*/ padding: 3px; @@ -85,60 +100,81 @@ -webkit-transition: background-color 0.5s; position: relative; } -.mwchat-useritem[data-read=true], .mwchat-useritem[data-read=true] .mwchat-useritem-header, .mwchat-item-message[data-read=true] { + +.mwchat-useritem[data-read=true], +.mwchat-useritem[data-read=true] .mwchat-useritem-header, +.mwchat-item-message[data-read=true] { background-color: #FDD !important; } + .mwchat-item-message { transition: background-color 0.5s; -webkit-transition: background-color 0.5s; } + .mwchat-useritem-header { background-color: #eee; cursor: pointer; padding: 2px; } + .mwchat-item-avatar { width: 26px; vertical-align: top; } + .mwchat-item-avatar img { margin-left: 5px; margin-right: 5px; } + .mwchat-item-message * { display: inline; } + .mwchat-useritem-header-links { top: 5px; right: 5px; position: absolute; } + .mwchat-useritem-blocklink, .mwchat-useritem-kicklink { color: #000 !important; } + .mwchat-message.system .mwchat-item-message { word-break: break-all; color: #888; } + .mwchat-message.system td { padding-left: 3em; } + .mwchat-useritem-window .mwchat-avatar { margin-right: 2px; } + .mwchat-useritem img { margin-left: 3px; margin-right: 2px; } + #mwchat-no-other-users { padding: 1em; } + #mwchat-topic { text-align: center; + border-bottom: 1px solid #aaa; + padding-bottom: .5em; + margin-bottom: .5em; } + #mwchat-options { margin-top: 10px; } + #mwchat-type { position: relative; -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/132496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc98b2436ed37c91f9199cfe4ce321a12ef6c76e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix cu_away_new.sql - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/129711 Change subject: Fix cu_away_new.sql .. Fix cu_away_new.sql Currently if a MediaWiki installation is running on a prefixed database, MWC will fail since this table doesn't include the /*_*/ hint for prefixed tables. This commit fixes that. Thanks to Krusher on MediaWiki.org for pointing this out. Change-Id: I1e3355135ef98dfb57ba39d63faa56ce7c906182 --- M cu_away_new.sql 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/11/129711/1 diff --git a/cu_away_new.sql b/cu_away_new.sql index a7f8c85..037555c 100644 --- a/cu_away_new.sql +++ b/cu_away_new.sql @@ -1 +1 @@ -ALTER TABLE `chat_users` MODIFY cu_away binary(12) \ No newline at end of file +ALTER TABLE /*_*/chat_users MODIFY cu_away binary(12) -- To view, visit https://gerrit.wikimedia.org/r/129711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e3355135ef98dfb57ba39d63faa56ce7c906182 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing private message links so they open in new tabs - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/129734 Change subject: Fixing private message links so they open in new tabs .. Fixing private message links so they open in new tabs For some reason, links, both internal and external, in private messages don't open in new tabs. This can be frustrating especially if when you click a link and it loads in the same tab as Chat, causing you to lose the entire chat conversation. This commit fixes this in the same way I fixed links in chat-topic. Change-Id: Icda3ef7de5ed6063201b7e30e899324ec83ca167 --- M MediaWikiChat.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/34/129734/1 diff --git a/MediaWikiChat.js b/MediaWikiChat.js index 2a111b8..564a7af 100644 --- a/MediaWikiChat.js +++ b/MediaWikiChat.js @@ -678,6 +678,9 @@ // Open any link in chat-topic in a new tab $( '#mwchat-topic a').attr( 'target', '_blank'); + + // Open any link in private messages in a new tab + $( '#mwchat-useritem-window a' ).attr( 'target', '_blank' ); } ); $( window ).blur( function() { -- To view, visit https://gerrit.wikimedia.org/r/129734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icda3ef7de5ed6063201b7e30e899324ec83ca167 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding configuration for #brickimedia - change (labs...grrrit)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/129610 Change subject: Adding configuration for #brickimedia .. Adding configuration for #brickimedia I've added mediawiki/extensions/MediaWikiChat to be fed to the #brickimedia IRC channel. MediaWikiChat is an extension by Brickimedia so we'd like to have its changes fed to our channel like our other repos are (however those are on GitHub). Change-Id: I8609c619073075da49b5ababb58e6f66f32a6f6c --- M config.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit refs/changes/10/129610/1 diff --git a/config.yaml b/config.yaml index c3e1480..a6327a0 100644 --- a/config.yaml +++ b/config.yaml @@ -126,3 +126,6 @@ #wmt: { labs/tools/WMT } +#brickimedia: { +mediawiki/extensions/MediaWikiChat +} -- To view, visit https://gerrit.wikimedia.org/r/129610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8609c619073075da49b5ababb58e6f66f32a6f6c Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setting it so any links in chat-topic open in new tab - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/129619 Change subject: Setting it so any links in chat-topic open in new tab .. Setting it so any links in chat-topic open in new tab Using jQuery .attr() to set target=_blank on any links in MediaWikiChat's chat topic. A similar code had been manually added in enbricki's Common.js, however this patch should be available for any MediaWikiChat users without the need for an addition to Common.js. Change-Id: Ic577aaa9d489a55b14d197c229a2e05f5d483e52 --- M MediaWikiChat.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/19/129619/1 diff --git a/MediaWikiChat.js b/MediaWikiChat.js index 3ae7f10..2a111b8 100644 --- a/MediaWikiChat.js +++ b/MediaWikiChat.js @@ -675,6 +675,9 @@ $( '#mwchat-users' ).animate( { 'height': height }, 'fast' ); $( '#mwchat-me' ).animate( { 'top': height }, 'fast' ); } ); + + // Open any link in chat-topic in a new tab + $( '#mwchat-topic a').attr( 'target', '_blank'); } ); $( window ).blur( function() { -- To view, visit https://gerrit.wikimedia.org/r/129619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic577aaa9d489a55b14d197c229a2e05f5d483e52 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changing audio/ directory to assets/ - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/123425 Change subject: Changing audio/ directory to assets/ .. Changing audio/ directory to assets/ What this does is allows for a directory for assets in general, not just for audio. In the assets directory, there is a new chatmod.png file. This is the new default chat-mod-image by default instead of having chat-mod-image being an external resource from images.brickimedia.org. It is no longer Brickimedia-specific and is a generic star icon instead of a golden LEGO minifigure. Not changed in this commit is all the i18n files. The en.json file is changed to reflect the new icon URL, but I have not changed the other i18n files as I assume they will be adjusted on translatewiki.net Change-Id: Ibcfd9ae334dcc5a0454ef00a1acdf40d6cd42fa2 --- M MediaWikiChat.js A assets/chatmod.png R assets/mention.mp3 R assets/mention.ogg R assets/message.mp3 R assets/message.ogg R assets/pm.mp3 R assets/pm.ogg M i18n/en.json 9 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/25/123425/1 diff --git a/MediaWikiChat.js b/MediaWikiChat.js index 2bd161e..3ae7f10 100644 --- a/MediaWikiChat.js +++ b/MediaWikiChat.js @@ -600,7 +600,7 @@ audio: function( filename ) { var audio = document.createElement( 'audio' ); - var path = mw.config.get( 'wgScriptPath') + '/extensions/MediaWikiChat/audio/' + filename; + var path = mw.config.get( 'wgScriptPath') + '/extensions/MediaWikiChat/assets/' + filename; var source = document.createElement( 'source' ); source.type = 'audio/ogg'; @@ -684,4 +684,4 @@ $( window ).focus( function() { MediaWikiChat.focussed = true; document.title = MediaWikiChat.title; // restore title -} ); \ No newline at end of file +} ); diff --git a/assets/chatmod.png b/assets/chatmod.png new file mode 100644 index 000..eb34914 --- /dev/null +++ b/assets/chatmod.png Binary files differ diff --git a/audio/mention.mp3 b/assets/mention.mp3 similarity index 100% rename from audio/mention.mp3 rename to assets/mention.mp3 Binary files differ diff --git a/audio/mention.ogg b/assets/mention.ogg similarity index 100% rename from audio/mention.ogg rename to assets/mention.ogg Binary files differ diff --git a/audio/message.mp3 b/assets/message.mp3 similarity index 100% rename from audio/message.mp3 rename to assets/message.mp3 Binary files differ diff --git a/audio/message.ogg b/assets/message.ogg similarity index 100% rename from audio/message.ogg rename to assets/message.ogg Binary files differ diff --git a/audio/pm.mp3 b/assets/pm.mp3 similarity index 100% rename from audio/pm.mp3 rename to assets/pm.mp3 Binary files differ diff --git a/audio/pm.ogg b/assets/pm.ogg similarity index 100% rename from audio/pm.ogg rename to assets/pm.ogg Binary files differ diff --git a/i18n/en.json b/i18n/en.json index 2a1cd8d..7ae0756 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -37,7 +37,7 @@ chat-change-preferences: Change your chat preferences (fullscreen and sounds), chat-sidebar-online: Online users in chat:, chat-sidebar-join: Join the chat, -chat-mod-image: http://images.brickimedia.org/c/cb/Golden-minifigure.png;, +chat-mod-image: /extensions/MediaWikiChat/assets/chatmod.png, chat-smileys: , log-name-chat: Chat log, log-description-chat: Messages sent by MediaWikiChat, as well as user kicks, -- To view, visit https://gerrit.wikimedia.org/r/123425 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcfd9ae334dcc5a0454ef00a1acdf40d6cd42fa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding English messages for chat actions (rights) - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/122876 Change subject: Adding English messages for chat actions (rights) .. Adding English messages for chat actions (rights) Change-Id: I599c1f7af1f680a3119a2a9131c260961d73 --- M i18n/en.json 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/76/122876/1 diff --git a/i18n/en.json b/i18n/en.json index 29b77f6..2a1cd8d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,7 +1,8 @@ { @metadata: { authors: [ -Adam Carter +Adam Carter, +George Barnick ] }, chat: Chat, @@ -63,5 +64,8 @@ prefs-chat: Chat, chat-idle-minutes: This user has been idle for {{PLURAL:$1|a minute|$1 minutes}}, chat-idle-hours: This user has been idle for {{PLURAL:$1|an hour|$1 hours}}, -chat-idle-more: This user has been idle for over 24 hours -} \ No newline at end of file +chat-idle-more: This user has been idle for over 24 hours, +action-chat: chat with other users, +action-modchat: moderate chat, +action-viewpmlog: view the private chat messages log +} -- To view, visit https://gerrit.wikimedia.org/r/122876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I599c1f7af1f680a3119a2a9131c260961d73 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding documentation of action messages - change (mediawiki...MediaWikiChat)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/122878 Change subject: Adding documentation of action messages .. Adding documentation of action messages Change-Id: I5037129835eb6da8bf5b954bad0df5ce3c6c6f2d --- M i18n/qqq.json 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat refs/changes/78/122878/1 diff --git a/i18n/qqq.json b/i18n/qqq.json index 19569ac..6d171fd 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -5,7 +5,8 @@ Beta16, Liuxinyu970226, Raymond, -Shirayuki +Shirayuki, +George Barnick ] }, chat: {{doc-special|Chat}}\n{{Identical|Chat}}, @@ -63,5 +64,8 @@ prefs-chat: Header for the chat preferences at [[Special:Preferences]].\n{{Identical|Chat}}, chat-idle-minutes: Tooltip for users who have been away for over 10 minutes. Parameters:\n* $1 - the number of minutes\n{{Related|Chat-idle}}, chat-idle-hours: Tooltip for users who have been away for over 1 hour. Parameters:\n* $1 - the number of hours\n{{Related|Chat-idle}}, -chat-idle-more: Tooltip for users who have been away for over 24 hours.\n{{Related|Chat-idle}} -} \ No newline at end of file +chat-idle-more: Tooltip for users who have been away for over 24 hours.\n{{Related|Chat-idle}}, +action-chat: Description of chat right, +action-modchat: Description of chatmod right, +action-viewpmlog: Description of right to view private chat messages +} -- To view, visit https://gerrit.wikimedia.org/r/122878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5037129835eb6da8bf5b954bad0df5ce3c6c6f2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding config variable to toggle tracking category - change (mediawiki...AJAXPoll)
GeorgeBarnick has uploaded a new change for review. https://gerrit.wikimedia.org/r/117254 Change subject: Adding config variable to toggle tracking category .. Adding config variable to toggle tracking category This commit adds a configuration variable $wgEnableAJAXPollTracking to allow users to enable/disable the automatic addition of the tracking category. Setting the config variable to true enables the automatic addition of the category (default). Setting the config variable to false disables the automatic addition of the category. By default $wgEnableAJAXPollTracking is set to true so that users of the extension won't have to change any configuration upon updating if they want to keep the automatic addition of the category. Change-Id: I7c1afa49d7c4201265d4dfa9a5b27d588718e416 --- M AJAXPoll.php M AJAXPoll_body.php 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll refs/changes/54/117254/1 diff --git a/AJAXPoll.php b/AJAXPoll.php index 3de2fd3..c5f8a7b 100644 --- a/AJAXPoll.php +++ b/AJAXPoll.php @@ -109,3 +109,7 @@ # default: users can vote and can see poll results - when they have voted $wgGroupPermissions['user']['ajaxpoll-vote'] = true; $wgGroupPermissions['user']['ajaxpoll-view-results'] = true; + +# config variable to enable/disable tracking category +# default: enabled +$wgEnableAJAXPollTracking = true; diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php index ede2ed0..1bac9c6 100644 --- a/AJAXPoll_body.php +++ b/AJAXPoll_body.php @@ -30,11 +30,12 @@ # The callback function for converting the input text to HTML output static function AJAXPollRender( $input, $args = array(), Parser $parser, $frame ) { - global $wgUser, $wgScriptPath, $wgUseAjax; + global $wgUser, $wgScriptPath, $wgUseAjax, $wgEnableAJAXPollTracking; $parser-disableCache(); - $parser-addTrackingCategory( 'ajaxpoll-tracking-category' ); - + if ( $wgEnableAJAXPollTracking == true ) { + $parser-addTrackingCategory( 'ajaxpoll-tracking-category' ); + } if ( $wgUser-getName() == '' ) { $userName = wfGetIP(); } else { -- To view, visit https://gerrit.wikimedia.org/r/117254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c1afa49d7c4201265d4dfa9a5b27d588718e416 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AJAXPoll Gerrit-Branch: master Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits