FreshRSS · sjeon87 · Jun 10, 2017 · Jun 10, 2017 · Jun 10, 2017 · Jun 10, 2017
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
@@ -111,6 +111,7 @@ public function readingAction() {
 			FreshRSS_Context::$user_conf->lazyload = Minz_Request::param('lazyload', false);
 			FreshRSS_Context::$user_conf->sides_close_article = Minz_Request::param('sides_close_article', false);
 			FreshRSS_Context::$user_conf->sticky_post = Minz_Request::param('sticky_post', false);
+			FreshRSS_Context::$user_conf->full_title = Minz_Request::param('full_title', false);
 			FreshRSS_Context::$user_conf->reading_confirm = Minz_Request::param('reading_confirm', false);
 			FreshRSS_Context::$user_conf->auto_remove_article = Minz_Request::param('auto_remove_article', false);
 			FreshRSS_Context::$user_conf->mark_updated_article_unread = Minz_Request::param('mark_updated_article_unread', false);

diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php
@@ -223,6 +223,10 @@ private function _sticky_post(&$data, $value) {
 		$data['sticky_post'] = $this->handleBool($value);
 	}
 
+	private function _full_title(&$data, $value) {
+		$data['full_title'] = $this->handleBool($value);
+	}
+
 	private function _bottomline_date(&$data, $value) {
 		$data['bottomline_date'] = $this->handleBool($value);
 	}

diff --git a/app/Models/Context.php b/app/Models/Context.php
@@ -323,4 +323,14 @@ public static function isStickyPostEnabled() {
 		return false;
 	}
 
+	/**
+	 * Determine if the 'full title of active article" option is enabled.
+	 */
+	public static function isFullTitleEnabled() {
+		if (self::$user_conf->full_title) {
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/app/i18n/cz/conf.php b/app/i18n/cz/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Vyžadovat potvrzení pro akci “označit vše jako přečtené”',
 		'display_articles_unfolded' => 'Ve výchozím stavu zobrazovat články otevřené',
 		'display_categories_unfolded' => 'Ve výchozím stavu zobrazovat kategorie zavřené',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might look thicker)</small>',// TODO
 		'hide_read_feeds' => 'Schovat kategorie a kanály s nulovým počtem nepřečtených článků (nefunguje s nastavením “Zobrazit všechny články”)',
 		'img_with_lazyload' => 'Použít "lazy load" mód pro načítaní obrázků',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO

diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Bei der Aktion „Alle als gelesen markieren“ einen Bestätigungsdialog anzeigen',
 		'display_articles_unfolded' => 'Artikel standardmäßig ausgeklappt zeigen',
 		'display_categories_unfolded' => 'Kategorien standardmäßig eingeklappt zeigen',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might look thicker)</small>',// TODO
 		'hide_read_feeds' => 'Kategorien & Feeds ohne ungelesene Artikel verstecken (funktioniert nicht mit der Einstellung „Alle Artikel zeigen“)',
 		'img_with_lazyload' => 'Verwende die "träges Laden"-Methode zum Laden von Bildern',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
 		'display_articles_unfolded' => 'Show articles unfolded by default',
 		'display_categories_unfolded' => 'Show categories folded by default',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might look thicker)</small>',
 		'hide_read_feeds' => 'Hide categories & feeds with no unread articles (does not work with “Show all articles” configuration)',
 		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',

diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 		'display_articles_unfolded' => 'Afficher les articles dépliés par défaut',
 		'display_categories_unfolded' => 'Afficher les catégories pliées par défaut',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 		'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 		'sides_close_article' => 'Cliquer hors de la zone de texte ferme l’article',

diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Mostra una conferma per “segna tutto come letto”',
 		'display_articles_unfolded' => 'Mostra articoli aperti di predefinito',
 		'display_categories_unfolded' => 'Mostra categorie aperte di predefinito',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => 'Nascondi categorie e feeds con articoli già letti (non funziona se “Mostra tutti gli articoli” è selezionato)',
 		'img_with_lazyload' => 'Usa la modalità "caricamento ritardato" per le immagini',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO

diff --git a/app/i18n/kr/conf.php b/app/i18n/kr/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => '“모두 읽음으로 표시” 실행시 확인 창 표시',
 		'display_articles_unfolded' => '글을 펼쳐진 상태로 보여주기',
 		'display_categories_unfolded' => '카테고리를 접힌 상태로 보여주기',
+		'full_title' => '펼쳐진 글의 제목을 모두 표시 <small>(제목이 두껍게 표시될 수 있습니다)</small>',
 		'hide_read_feeds' => '읽지 않은 글이 없는 카테고리와 피드 감추기 (“모든 글 표시”가 설정된 경우 동작하지 않습니다)',
 		'img_with_lazyload' => '그림을 불러오는 데에 "lazy load" 모드 사용하기',
 		'sides_close_article' => '글 영역 바깥을 클릭하면 글 접기',

diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
@@ -90,6 +90,7 @@
 		'confirm_enabled' => 'Toon een bevestigings dialoog op “markeer alles als gelezen” acties',
 		'display_articles_unfolded' => 'Toon artikelen uitgeklapt als standaard',
 		'display_categories_unfolded' => 'Toon categoriën ingeklapt als standaard',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => 'Verberg categoriën en feeds zonder ongelezen artikelen (werkt niet met “Toon alle artikelen” configuratie)',
 		'img_with_lazyload' => 'Gebruik "lazy load" methode om afbeeldingen te laden',
 		'sides_close_article' => 'Sluit het artikel door buiten de artikeltekst te klikken',

diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
 		'display_articles_unfolded' => 'Show articles unfolded by default',
 		'display_categories_unfolded' => 'Show categories folded by default',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO

diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => '"Hepsini okundu say" eylemi için onay iste',
 		'display_articles_unfolded' => 'Show articles unfolded by default',
 		'display_categories_unfolded' => 'Show categories folded by default',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => 'Okunmamış makalesi olmayan kategori veya akışı gizle ("Tüm makaleleri göster" komutunda çalışmaz)',
 		'img_with_lazyload' => 'Resimleri yüklemek için "tembel modu" kullan',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO

diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
@@ -91,6 +91,7 @@
 		'confirm_enabled' => '“全部设为已读”时显示确认对话框',
 		'display_articles_unfolded' => '默认展开文章',
 		'display_categories_unfolded' => '默认展开分类',
+		'full_title' => 'Show the full title of the article when opened <small>(Title bar might be thicker)</small>',// TODO
 		'hide_read_feeds' => '隐藏没有未读文章的分类或 RSS 源 (启用“显示所有文章”时不生效))',
 		'img_with_lazyload' => '使用 "lazy load" 模式加载图片',
 		'sides_close_article' => '点击文章外区域以关闭文章',

diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
@@ -86,6 +86,16 @@
 			</div>
 		</div>
 
+		<div class="form-group">
+			<div class="group-controls">
+				<label class="checkbox" for="full_title">
+					<input type="checkbox" name="full_title" id="full_title" value="1"<?php echo FreshRSS_Context::$user_conf->full_title ? ' checked="checked"' : ''; ?> data-leave-validation="<?php echo FreshRSS_Context::$user_conf->full_title; ?>"/>
+					<?php echo _t('conf.reading.full_title'); ?>
+					<!--<noscript> — <strong><?php echo _t('gen.js.should_be_activated'); ?></strong></noscript>-->
+				</label>
+			</div>
+		</div>
+
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">

diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
@@ -3,6 +3,7 @@
 	$topline_favorite = FreshRSS_Context::$user_conf->topline_favorite;
 	$topline_date = FreshRSS_Context::$user_conf->topline_date;
 	$topline_link = FreshRSS_Context::$user_conf->topline_link;
+	$class_full_title = FreshRSS_Context::$user_conf->full_title ? "full" : "";
 ?><ul class="horizontal-list flux_header"><?php
 	if (FreshRSS_Auth::hasAccess()) {
 		if ($topline_read) {
@@ -27,7 +28,7 @@
 		}
 	}
 	?><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 <?php echo $class_full_title; ?>"><a target="_blank" rel="noreferrer" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></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/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
@@ -15,6 +15,7 @@ echo htmlspecialchars(json_encode(array(
 		'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
 		'sides_close_article' => !!FreshRSS_Context::$user_conf->sides_close_article,
 		'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
+		'full_title' => !!FreshRSS_Context::isFullTitleEnabled(),
 		'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
 		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
 		'current_view' => Minz_Request::actionName(),

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
@@ -512,6 +512,10 @@ a.btn {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
+.flux.active .item.title.full > a {
+	white-space: normal;
+	overflow: visible;
+}
 .flux .item.share > a,
 .item.query > a {
 	display: list-item;