Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
56e634dd
Commit
56e634dd
authored
4 years ago
by
echicken
Browse files
Options
Downloads
Patches
Plain Diff
WIP; quite broken in places at the moment.
parent
956c84e6
No related branches found
No related tags found
1 merge request
!463
MRC mods by Codefenix (2024-10-20)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
webv4/pages/001-forum.xjs
+48
-41
48 additions, 41 deletions
webv4/pages/001-forum.xjs
with
48 additions
and
41 deletions
webv4/pages/001-forum.xjs
+
48
−
41
View file @
56e634dd
<!--HIDDEN:XJS Forum-->
<script type="text/javascript" src="./js/xjs-forum.js"></script>
<?xjs
load(
settings.web_lib + 'request.js');
load(
settings.web_lib + 'forum.js');
var request = require({},
settings.web_lib + 'request.js'
, 'request'
);
var forum = require({},
settings.web_lib + 'forum.js'
, 'forum'
);
locale.section = 'page_forum';
?>
<script type="text/javascript" src="./js/xjs-forum.js"></script>
<script type="text/javascript" src="./js/cache.js"></script>
<!-- To do: Search (forum, group, sub, or thread), Sortation and data-attributes -->
<div data-loading-template hidden>
...
...
@@ -18,15 +19,15 @@
</div>
<!-- Viewing a thread (list of messages) -->
<? if (
R
equest.has_param('sub') &&
R
equest.has_param('thread')) { ?>
<? if (
r
equest.has_param('sub') &&
r
equest.has_param('thread')) { ?>
<? var thread = getMessageThreads(
R
equest.get_param('sub'), settings.max_messages).thread[
R
equest.get_param('thread')]; ?>
<? var thread = getMessageThreads(
r
equest.get_param('sub'), settings.max_messages).thread[
r
equest.get_param('thread')]; ?>
<script type="text/javascript" src="./js/graphics-converter.js"></script>
<script type="text/javascript" src="./js/avatars.js"></script>
<div hidden>
<li id="forum-message-template" class="list-group-item striped">
<li id="forum-message-template" class="list-group-item striped"
data-message
>
<a data-message-anchor></a>
<h4>
<strong data-message-subject></strong>
...
...
@@ -74,22 +75,22 @@
<ol class="breadcrumb">
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>">
<a href="./?page=<?
r
equest.write_param('page'); ?>">
<? locale.write('title'); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&group=<?
R
equest.write_param('group'); ?>">
<? write(msg_area.grp_list[msg_area.sub[
R
equest.get_param('sub')].grp_index].name); ?>
<a href="./?page=<?
r
equest.write_param('page'); ?>&group=<?
r
equest.write_param('group'); ?>">
<? write(msg_area.grp_list[msg_area.sub[
r
equest.get_param('sub')].grp_index].name); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&sub=<?
R
equest.write_param('sub'); ?>">
<? write(msg_area.sub[
R
equest.get_param('sub')].name); ?>
<a href="./?page=<?
r
equest.write_param('page'); ?>&sub=<?
r
equest.write_param('sub'); ?>">
<? write(msg_area.sub[
r
equest.get_param('sub')].name); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&sub=<?
R
equest.write_param('sub'); ?>&thread=<?
R
equest.write_param('thread'); ?>">
<a href="./?page=<?
r
equest.write_param('page'); ?>&sub=<?
r
equest.write_param('sub'); ?>&thread=<?
r
equest.write_param('thread'); ?>">
<? write(thread.subject); ?>
</a>
</li>
...
...
@@ -103,24 +104,24 @@
<div id="forum-list-container" class="list-group"></div>
<div id="forum-load-more-messages" class="text-center" hidden>
<button id="load-more-messages" class="btn btn-primary" aria-label="<? locale.write('button_load_more', 'main'); ?>" title="<? locale.write('button_load_more', 'main'); ?>" onclick="listMessages('<?
R
equest.write_param('sub'); ?>', '<?
R
equest.write_param('thread'); ?>', <? write(settings.page_size); ?>, true)">
<button id="load-more-messages" class="btn btn-primary" aria-label="<? locale.write('button_load_more', 'main'); ?>" title="<? locale.write('button_load_more', 'main'); ?>" onclick="listMessages('<?
r
equest.write_param('sub'); ?>', '<?
r
equest.write_param('thread'); ?>', <? write(settings.page_size); ?>, true)">
<? locale.write('button_load_more', 'main'); ?>
</button>
</div>
<script type="text/javascript">
listMessages('<?
R
equest.write_param('sub'); ?>', <?
R
equest.write_param('thread'); ?>, <? write(settings.page_size); ?>);
listMessages('<?
r
equest.write_param('sub'); ?>', <?
r
equest.write_param('thread'); ?>, <? write(settings.page_size); ?>);
// Should subscribe here for updates to the thread; need to add some functions to lib/forum.js, lib/events/forum.js, root/js/xjs-forum.js
</script>
<!-- get n messages of thread and append to forum-list-container -->
<!-- Viewing a sub (list of threads) -->
<? } else if (
R
equest.has_param('sub') && msg_area.sub[
R
equest.get_param('sub')] !== undefined) { ?>
<? } else if (
r
equest.has_param('sub') && msg_area.sub[
r
equest.get_param('sub')] !== undefined) { ?>
<!-- Template for a link to a thread -->
<div hidden>
<a id="forum-thread-link-template" href="./?page=<?
R
equest.write_param('page'); ?>&sub=<?
R
equest.write_param('sub'); ?>" class="list-group-item striped">
<a id="forum-thread-link-template" href="./?page=<?
r
equest.write_param('page'); ?>&sub=<?
r
equest.write_param('sub'); ?>" class="list-group-item striped"
data-thread
>
<div class="row">
<div class="col-sm-9">
<strong data-thread-subject></strong>
...
...
@@ -275,23 +276,23 @@
<ol class="breadcrumb">
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>">
<a href="./?page=<?
r
equest.write_param('page'); ?>">
<? locale.write('title'); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&group=<? write(msg_area.grp_list[msg_area.sub[
R
equest.get_param('sub')].grp_index].number); ?>">
<? write(msg_area.grp_list[msg_area.sub[
R
equest.get_param('sub')].grp_index].name); ?>
<a href="./?page=<?
r
equest.write_param('page'); ?>&group=<? write(msg_area.grp_list[msg_area.sub[
r
equest.get_param('sub')].grp_index].number); ?>">
<? write(msg_area.grp_list[msg_area.sub[
r
equest.get_param('sub')].grp_index].name); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&sub=<?
R
equest.write_param('sub'); ?>">
<? write(msg_area.sub[
R
equest.get_param('sub')].name); ?>
<a href="./?page=<?
r
equest.write_param('page'); ?>&sub=<?
r
equest.write_param('sub'); ?>">
<? write(msg_area.sub[
r
equest.get_param('sub')].name); ?>
</a>
</li>
</ol>
<? var sub = msg_area.sub[
R
equest.get_param('sub')]; ?>
<? var sub = msg_area.sub[
r
equest.get_param('sub')]; ?>
<button class="btn btn-default icon" aria-label="<? locale.write('button_post_message'); ?>" title="<? locale.write('button_post_message'); ?>" onclick="addNew('<? write(sub.code); ?>')">
<span class="glyphicon glyphicon-pencil"></span>
...
...
@@ -326,7 +327,7 @@
if (data.type != 'threads') return;
onThreadStats(data.data);
}, {
sub: '<?
R
equest.write_param("sub"); ?>',
sub: '<?
r
equest.write_param("sub"); ?>',
});
listThreads('<? write(sub.code); ?>', <? write(settings.page_size); ?>);
...
...
@@ -334,10 +335,10 @@
</script>
<!-- Viewing a group (list of subs) -->
<? } else if (
R
equest.has_param('group') && msg_area.grp_list[
R
equest.get_param('group')] !== undefined) { ?>
<? } else if (
r
equest.has_param('group') && msg_area.grp_list[
r
equest.get_param('group')] !== undefined) { ?>
<div hidden>
<a id="forum-sub-link-template" href="./?page=<?
R
equest.write_param('page'); ?>" class="list-group-item striped">
<a id="forum-sub-link-template" href="./?page=<?
r
equest.write_param('page'); ?>" class="list-group-item striped">
<h4>
<strong data-sub-name></strong>
</h4>
...
...
@@ -357,13 +358,13 @@
<ol class="breadcrumb">
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>">
<a href="./?page=<?
r
equest.write_param('page'); ?>">
<? locale.write('title'); ?>
</a>
</li>
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>&group=<?
R
equest.write_param('group'); ?>">
<? write(msg_area.grp_list[
R
equest.get_param('group')].name); ?>
<a href="./?page=<?
r
equest.write_param('page'); ?>&group=<?
r
equest.write_param('group'); ?>">
<? write(msg_area.grp_list[
r
equest.get_param('group')].name); ?>
</a>
</li>
</ol>
...
...
@@ -371,14 +372,18 @@
<div id="forum-list-container" class="list-group"></div>
<script type="text/javascript">
(async () => await listSubs('<? Request.write_param('group'); ?>'))();
getNewestMessagePerSub('<? Request.write_param('group'); ?>');
(async () => {
await listSubs('<? request.write_param('group'); ?>')
// getNewestMessagePerSub('<? request.write_param('group'); ?>');
})();
<? if (is_user()) { ?>
registerEventListener('forum', e => {
const data = JSON.parse(e.data);
if (data.type != 'subs_unread') return;
onSubUnreadCount(data.data);
}, { subs_unread: '<? Request.write_param("group"); ?>' });
}, {
subs_unread: '<? request.write_param("group"); ?>',
});
<? } ?>
</script>
...
...
@@ -386,7 +391,7 @@
<? } else { ?>
<div hidden>
<a id="forum-group-link-template" href="./?page=<?
R
equest.write_param('page'); ?>" class="list-group-item striped">
<a id="forum-group-link-template" href="./?page=<?
r
equest.write_param('page'); ?>" class="list-group-item striped">
<h3>
<strong data-group-name></strong>
</h3>
...
...
@@ -399,7 +404,7 @@
<ol class="breadcrumb">
<li>
<a href="./?page=<?
R
equest.write_param('page'); ?>">
<a href="./?page=<?
r
equest.write_param('page'); ?>">
<? locale.write('title'); ?>
</a>
</li>
...
...
@@ -407,15 +412,17 @@
<div id="forum-list-container" class="list-group"></div>
<? if (is_user()) { ?>
<script type="text/javascript">
(async () => await listGroups())();
registerEventListener('forum', e => {
const data = JSON.parse(e.data);
if (data.type != 'groups_unread') return;
onGroupUnreadCount(data.data);
}, { groups_unread: null });
<? if (is_user()) { ?>
registerEventListener('forum', e => {
const data = JSON.parse(e.data);
if (data.type != 'groups_unread') return;
onGroupUnreadCount(data.data);
}, {
groups_unread: null,
});
<? } ?>
</script>
<? } ?>
<? } ?>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment