aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xapp/Controllers/configureController.php1
-rw-r--r--app/Models/ConfigurationSetter.php3
-rw-r--r--app/i18n/cz/conf.php1
-rw-r--r--app/i18n/de/conf.php1
-rw-r--r--app/i18n/en/conf.php1
-rwxr-xr-xapp/i18n/es/conf.php1
-rw-r--r--app/i18n/fr/conf.php1
-rw-r--r--app/i18n/he/conf.php1
-rw-r--r--app/i18n/it/conf.php1
-rw-r--r--app/i18n/kr/conf.php1
-rw-r--r--app/i18n/nl/conf.php1
-rw-r--r--app/i18n/oc/conf.php1
-rw-r--r--app/i18n/pt-br/conf.php1
-rw-r--r--app/i18n/ru/conf.php1
-rw-r--r--app/i18n/tr/conf.php1
-rw-r--r--app/i18n/zh-cn/conf.php1
-rw-r--r--app/views/configure/display.phtml3
-rw-r--r--app/views/helpers/index/normal/entry_header.phtml17
-rw-r--r--config-user.default.php1
-rw-r--r--p/themes/base-theme/template.css6
20 files changed, 44 insertions, 1 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 6d3c4dcce..a839f0005 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -48,6 +48,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
FreshRSS_Context::$user_conf->topline_favorite = Minz_Request::param('topline_favorite', false);
FreshRSS_Context::$user_conf->topline_date = Minz_Request::param('topline_date', false);
FreshRSS_Context::$user_conf->topline_link = Minz_Request::param('topline_link', false);
+ FreshRSS_Context::$user_conf->topline_display_authors = Minz_Request::param('topline_display_authors', false);
FreshRSS_Context::$user_conf->bottomline_read = Minz_Request::param('bottomline_read', false);
FreshRSS_Context::$user_conf->bottomline_favorite = Minz_Request::param('bottomline_favorite', false);
FreshRSS_Context::$user_conf->bottomline_sharing = Minz_Request::param('bottomline_sharing', false);
diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
index ec6380df4..778513f17 100644
--- a/app/Models/ConfigurationSetter.php
+++ b/app/Models/ConfigurationSetter.php
@@ -257,6 +257,9 @@ class FreshRSS_ConfigurationSetter {
private function _topline_read(&$data, $value) {
$data['topline_read'] = $this->handleBool($value);
}
+ private function _topline_display_authors(&$data, $value) {
+ $data['topline_display_authors'] = $this->handleBool($value);
+ }
/**
* The (not so long) list of setters for system configuration.
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
index ce3a4e418..8a21067ee 100644
--- a/app/i18n/cz/conf.php
+++ b/app/i18n/cz/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Datum vydání',
'related_tags' => 'Související tagy', //TODO - Translation
'sharing' => 'Sdílení',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Horní řádek',
),
'language' => 'Jazyk',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index b73d76f72..37a67eb15 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Datum der Veröffentlichung',
'related_tags' => 'Verwandte Tags',
'sharing' => 'Teilen',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Kopfzeile',
),
'language' => 'Sprache',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index b21061513..8193233ce 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Date of publication',
'related_tags' => 'Article tags',
'sharing' => 'Sharing',
+ 'display_authors' => 'Authors',
'top_line' => 'Top line',
),
'language' => 'Language',
diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.php
index 612d81a1b..2eeeee052 100755
--- a/app/i18n/es/conf.php
+++ b/app/i18n/es/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Fecha de publicación',
'related_tags' => 'Etiquetas relacionadas',
'sharing' => 'Compartir',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Línea superior',
),
'language' => 'Idioma',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index 5d1bb1a90..5f6730b53 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Date de publication',
'related_tags' => 'Tags de l’article',
'sharing' => 'Partage',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Ligne du haut',
),
'language' => 'Langue',
diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.php
index 08769aeb0..1da5c292c 100644
--- a/app/i18n/he/conf.php
+++ b/app/i18n/he/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'תאריך הפרסום',
'related_tags' => 'תגיות קשורות', //TODO - Translation
'sharing' => 'שיתוף',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'שורה עליונה',
),
'language' => 'שפה',
diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
index c66644446..f3c59ed8c 100644
--- a/app/i18n/it/conf.php
+++ b/app/i18n/it/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Data di pubblicazione',
'related_tags' => 'Tags correlati', //TODO - Translation
'sharing' => 'Condivisione',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Barra in alto',
),
'language' => 'Lingua',
diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
index 0307ac455..1efaee88b 100644
--- a/app/i18n/kr/conf.php
+++ b/app/i18n/kr/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => '발행일',
'related_tags' => '관련 태그',
'sharing' => '공유',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => '상단',
),
'language' => '언어',
diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index aed4e352e..b7ba7bbeb 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Publicatie datum',
'related_tags' => 'Gerelateerde labels',
'sharing' => 'Delen',
+ 'display_authors' => 'Auteurs',
'top_line' => 'Bovenaan',
),
'language' => 'Taal',
diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php
index 2f08bfc1c..b37785a7e 100644
--- a/app/i18n/oc/conf.php
+++ b/app/i18n/oc/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Data de publicacion',
'related_tags' => 'Etiquetas ligadas',
'sharing' => 'Partatge',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Linha amont',
),
'language' => 'Lenga',
diff --git a/app/i18n/pt-br/conf.php b/app/i18n/pt-br/conf.php
index e4da7a729..082027328 100644
--- a/app/i18n/pt-br/conf.php
+++ b/app/i18n/pt-br/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Data da publicação',
'related_tags' => 'Tags relacionadas', //TODO - Translation
'sharing' => 'Compartilhar',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Linha superior',
),
'language' => 'Ídioma',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index cea7c2f63..48ce4b9f3 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Date of publication', //TODO - Translation
'related_tags' => 'Related tags', //TODO - Translation
'sharing' => 'Sharing', //TODO - Translation
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Top line', //TODO - Translation
),
'language' => 'Язык',
diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
index 16ff8b7d5..855bca6c8 100644
--- a/app/i18n/tr/conf.php
+++ b/app/i18n/tr/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => 'Yayınlama Tarihi',
'related_tags' => 'İlgili etiketler', //TODO - Translation
'sharing' => 'Paylaşım',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => 'Üst çizgi',
),
'language' => 'Dil',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 21f9a920c..ebe069c2c 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -21,6 +21,7 @@ return array(
'publication_date' => '更新日期',
'related_tags' => '相关标签',
'sharing' => '分享',
+ 'display_authors' => 'Authors', //TODO - Translation
'top_line' => '顶栏',
),
'language' => '语言',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 58c4e219a..60b7748c5 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -81,6 +81,7 @@
<th title="<?php echo _t('gen.action.mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
<th><?php echo _t('conf.display.icon.related_tags'); ?></th>
<th><?php echo _t('conf.display.icon.sharing'); ?></th>
+ <th><?php echo _t('conf.display.icon.display_authors'); ?></th>
<th><?php echo _t('conf.display.icon.publication_date'); ?></th>
<th><?php echo _i('link'); ?></th>
</tr>
@@ -92,6 +93,7 @@
<td><input type="checkbox" name="topline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->topline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_favorite; ?>"/></td>
<td><input type="checkbox" disabled="disabled" /></td>
<td><input type="checkbox" disabled="disabled" /></td>
+ <td><input type="checkbox" name="topline_display_authors" value="1"<?php echo FreshRSS_Context::$user_conf->topline_display_authors ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_display_authors; ?>"/></td>
<td><input type="checkbox" name="topline_date" value="1"<?php echo FreshRSS_Context::$user_conf->topline_date ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_date; ?>"/></td>
<td><input type="checkbox" name="topline_link" value="1"<?php echo FreshRSS_Context::$user_conf->topline_link ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->topline_link; ?>"/></td>
</tr><tr>
@@ -100,6 +102,7 @@
<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_favorite; ?>"/></td>
<td><input type="checkbox" name="bottomline_tags" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_tags ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_tags; ?>"/></td>
<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_sharing ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_sharing; ?>"/></td>
+ <td><input type="checkbox" disabled="disabled" /></td>
<td><input type="checkbox" name="bottomline_date" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_date ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_date; ?>"/></td>
<td><input type="checkbox" name="bottomline_link" value="1"<?php echo FreshRSS_Context::$user_conf->bottomline_link ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->bottomline_link; ?>"/></td>
</tr>
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index 86298e59f..7873b16e4 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -1,6 +1,7 @@
<?php
$topline_read = FreshRSS_Context::$user_conf->topline_read;
$topline_favorite = FreshRSS_Context::$user_conf->topline_favorite;
+ $topline_display_authors = FreshRSS_Context::$user_conf->topline_display_authors;
$topline_date = FreshRSS_Context::$user_conf->topline_date;
$topline_link = FreshRSS_Context::$user_conf->topline_link;
?><ul class="horizontal-list flux_header"><?php
@@ -27,7 +28,21 @@
}
}
?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><img class="favicon" src="<?php echo $this->feed->favicon(); ?>" alt="✇" /> <span><?php echo $this->feed->name(); ?></span></a></li>
- <li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></li>
+ <li class="item title"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a><?php
+ if ($topline_display_authors) {
+ ?><div class="item author">
+ <?php
+ $authors = $this->entry->authors();
+ if (is_array($authors)):
+ $first = true;
+ foreach ($authors as $author):
+ echo $first ? $author : ', ' . $author;
+ $first = false;
+ endforeach;
+ endif;
+ ?></div><?php
+ }
+ ?></li>
<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
<?php if ($topline_link) { ?><li class="item link"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
</ul>
diff --git a/config-user.default.php b/config-user.default.php
index 08f3af720..077ea70d9 100644
--- a/config-user.default.php
+++ b/config-user.default.php
@@ -67,6 +67,7 @@ return array (
),
'topline_read' => true,
'topline_favorite' => true,
+ 'topline_display_authors' => false,
'topline_date' => true,
'topline_link' => true,
'bottomline_read' => true,
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 226d06f59..42e08be65 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -569,6 +569,12 @@ a.btn {
color: #000;
text-decoration: none;
}
+.flux .item.author {
+ color: #555;
+ font-size: .7rem;
+ font-weight: normal;
+ white-space: normal;
+}
.flux .item.date {
width: 155px;
text-align: right;
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 07:30:08 +0000