@@ -148,8 +148,3 @@ label.confirmation,
color: red;
font-weight: bold;
}
-
-#news div p {
- max-height: 15em;
- overflow: auto;
-}
@@ -72,10 +72,45 @@ function collapseDependsList(list) {
});
}
+function collapseComment(div) {
+ var linkid = div.attr('id') + 'link',
+ par = div.find('p'),
+ height = par.height(),
+ maxheight = 200;
+
+ if (height <= maxheight)
+ return;
+
+ par.css({ 'overflow': 'hidden', 'height': maxheight + 'px' });
+ par.addClass('collapsed');
+ par.after('<p><a id="' + linkid + '" href="#">Show More…</a></p>');
+
+ $('#' + linkid).click(function(event) {
+ var newheight;
+
+ if (par.hasClass('collapsed')) {
+ par.css({ 'height': 'auto' });
+ newheight = par.height();
+ par.css({ 'height': maxheight });
+ $(this).text('Collapse');
+ } else {
+ newheight = maxheight;
+ $(this).text('Show More…');
+ }
+
+ par.animate({ 'height': newheight });
+ par.toggleClass('collapsed');
+ event.preventDefault();
+ });
+}
+
$(document).ready(function() {
collapseDependsList("#pkgdepslist");
collapseDependsList("#pkgreqslist");
collapseDependsList("#pkgsrcslist");
+ $(".article-content").each(function() {
+ collapseComment($(this));
+ });
});
</script>
@@ -102,7 +102,7 @@ if (!isset($count)) {
</form>
<?php endif; ?>
</h4>
- <div class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>">
+ <div id="<?= isset($pinned) ? "pinned-" : "comment-" ?><?= $row['ID'] ?>-content" class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>">
<p>
<?= parse_comment($row['Comments']) ?>
</p>
Instead of using CSS to limit the height of package comments as implemented in 7b13203 (Limit comment height to 15 lines, 2016-03-12), use JavaScript to collapse long comments and add a link to expand them. Clicking the same link twice results in the corresponding comment being collapsed again. If JavaScript is disabled, the full comments are shown (without any possibility to collapse or expand). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- web/html/css/aurweb.css | 5 ----- web/html/packages.php | 35 +++++++++++++++++++++++++++++++++++ web/template/pkg_comments.php | 2 +- 3 files changed, 36 insertions(+), 6 deletions(-)