Skip to content

Sync news item layout and style #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sy-records merged 1 commit into from
Oct 1, 2025
+12 −9
Merged

Sync news item layout and style #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/layout.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ function print_image($file, $alt = false, $align = false, $extras = false,

// Shortcut to usual news image printing (right floating
// image from the news dir with an alt and an URL)
function news_image($URL, $image, $alt, $print = true)
function news_image($URL, $image, $alt, $print = true, $align = 'right')
{
$str = "<a href=\"$URL\">" . make_image("news/$image", $alt, "right") . "</a>";
$str = "<a href=\"$URL\">" . make_image("news/$image", $alt, $align) . "</a>";
if ($print) {
echo $str;
}
Expand Down Expand Up @@ -372,7 +372,7 @@ function print_news($news, $dog, $max = 5, $return = false) {

$image = "";
if (isset($item["newsImage"])) {
$image = news_image($item["newsImage"]["link"], $item["newsImage"]["content"], $item["newsImage"]["title"], false);
$image = news_image($item["newsImage"]["link"], $item["newsImage"]["content"], $item["newsImage"]["title"], false, '');
}

$id = parse_url($item["id"]);
Expand Down Expand Up @@ -405,12 +405,12 @@ function print_news($news, $dog, $max = 5, $return = false) {

echo <<<EOT
<article class="newsItem">
<header>
<div class="newsImage">{$image}</div>
<header class="title">
<time class="newsdate" datetime="{$item["published"]}">{$newsdate}</time>
<h2 class="newstitle"><a id="{$id}" href="{$permlink}" rel="bookmark" class="bookmark">{$item["title"]}</a></h2>
</header>
<time class="newsdate" datetime="{$item["published"]}">{$newsdate}</time>
<div class="newscontent">
<div class="newsImage">{$image}</div>
{$item["content"]}
</div>
</article>
Expand Down
9 changes: 6 additions & 3 deletions styles/theme-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,8 @@ aside.tips div.inner {
/* }}} */

/* {{{ News */
.newsentry header h2 {
.newsentry header h2,
.newsItem header h2 {
margin:0;
}
.newsentry {
Expand All @@ -1427,7 +1428,8 @@ aside.tips div.inner {
float: right;
opacity: 0.8;
}
.newsentry header time {
.newsentry header time,
.newsItem header time {
float:right;
line-height:3rem;
}
Expand All @@ -1436,7 +1438,8 @@ aside.tips div.inner {
line-height: 1.7rem;
}

.newsentry .newsimage a {
.newsentry .newsimage a,
.newsItem .newsImage a {
float: right;
border: 0;
padding: 10px;
Expand Down