Shortcuts for adding labels (#7274)

* add shortcut in config

* open my labels menu with shortcut

* the first 9 items are selectable + input field

* i18n

* Update app/i18n/nl/conf.php

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* index.menu.mylabels

* order fixed

---------

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

8 files changed, 15 insertions, 6 deletions

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 1f2828f82..995d54006 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -188,7 +188,7 @@
 							<th> </th>
 							<th title="<?= _t('conf.shortcut.mark_read') ?>"><?= _i('read') ?></th>
 							<th title="<?= _t('conf.shortcut.mark_favorite') ?>"><?= _i('starred') ?></th>
-							<th title="<?= _t('index.menu.tags') ?>"><?= _i('label') ?></th>
+							<th title="<?= _t('index.menu.mylabels') ?>"><?= _i('label') ?></th>
 							<th title="<?= _t('conf.display.icon.related_tags') ?>"><?= _i('tag') ?></th>
 							<th title="<?= _t('conf.display.icon.sharing') ?>"><?= _i('share') ?></th>
 							<th><?= _t('conf.display.icon.summary') ?></th>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 822bcf6b3..2e9a4fa8c 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -159,6 +159,14 @@
 			</div>
 
 			<div class="form-group">
+				<label class="group-name" for="mylabels_shortcut"><?= _t('index.menu.mylabels') ?></label>
+				<div class="group-controls">
+					<input type="text" id="mylabels_shortcut" name="shortcuts[mylabels]" list="keys" value="<?= $s['mylabels'] ?>"
+						data-leave-validation="<?= $s['mylabels'] ?>"/>
+				</div>
+			</div>
+
+			<div class="form-group">
 				<label class="group-name" for="collapse_entry"><?= _t('conf.shortcut.collapse_article') ?></label>
 				<div class="group-controls">
 					<input type="text" id="collapse_entry" name="shortcuts[collapse_entry]" list="keys" value="<?= $s['collapse_entry'] ?>"
diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml
index f0f339276..b078e1ed1 100644
--- a/app/views/helpers/configure/query.phtml
+++ b/app/views/helpers/configure/query.phtml
@@ -126,7 +126,7 @@
 						<option value="a" <?= in_array($this->query->getGet(), ['', 'a'], true) ? 'selected="selected"' : '' ?>><?= _t('index.feed.title') ?></option>
 						<option value="i" <?= 'i' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.important') ?></option>
 						<option value="s" <?= 's' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.feed.title_fav') ?></option>
-						<option value="T" <?= 'T' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.tags') ?></option>
+						<option value="T" <?= 'T' === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= _t('index.menu.mylabels') ?></option>
 						<optgroup label="<?= _t('conf.query.filter.tags') ?>">
 							<?php foreach ($this->tags as $tag): ?>
 								<option value="t_<?= $tag->id() ?>" <?= "t_{$tag->id()}" === $this->query->getGet() ? 'selected="selected"' : '' ?>><?= $tag->name() ?></option>
diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 0394405ad..f3c363275 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -39,7 +39,7 @@
 		<div class="item-element dropdown dynamictags">
 			<div id="dropdown-labels-<?= $this->entry->id() ?>" class="dropdown-target"></div>
 			<a class="dropdown-toggle" href="#dropdown-labels-<?= $this->entry->id() ?>">
-				<?= _i('label') ?><span class="dropdown-label"><?= _t('index.menu.tags') ?></span>
+				<?= _i('label') ?><span class="dropdown-label"><?= _t('index.menu.mylabels') ?></span>
 			</a>
 		</div>
 	</li><?php
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index 459e4d180..0f90d8949 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -72,7 +72,7 @@
 		<li class="item labels">
 			<div class="item-element dropdown dynamictags">
 				<div id="dropdown-labels2-<?= $this->entry->id() ?>" class="dropdown-target"></div>
-				<a class="dropdown-toggle" href="#dropdown-labels2-<?= $this->entry->id() ?>" title="<?= _t('index.menu.tags') ?>">
+				<a class="dropdown-toggle" href="#dropdown-labels2-<?= $this->entry->id() ?>" title="<?= _t('index.menu.mylabels') ?>">
 					<?= _i('label') ?>
 				</a>
 				<?php /* labels_article_template */ ?>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 14af408a6..cadaf9331 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -46,6 +46,7 @@ echo htmlspecialchars(json_encode([
 		'last_entry' => @$s['last_entry'],
 		'collapse_entry' => @$s['collapse_entry'],
 		'load_more' => @$s['load_more'],
+		'mylabels' => @$s['mylabels'],
 		'auto_share' => @$s['auto_share'],
 		'focus_search' => @$s['focus_search'],
 		'user_filter' => @$s['user_filter'],
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 527c0b9c4..4be568fd0 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -25,7 +25,7 @@
 	<div class="dropdown-menu">
 		<ul class="dropdown-menu-scrollable scrollbar-thin">
 			<li class="dropdown-header">
-				<?= _t('index.menu.tags') ?>
+				<?= _t('index.menu.mylabels') ?>
 				<?php if (FreshRSS_Auth::hasAccess()) { ?>
 					<a href="<?= _url('tag', 'index') ?>"><?= _i('configure') ?></a>
 				<?php } ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index aca3b8f0a..a5e973e1b 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -27,7 +27,7 @@ $today = @strtotime('today');
 	<div class="dropdown-menu">
 		<ul class="dropdown-menu-scrollable scrollbar-thin">
 			<li class="dropdown-header">
-				<?= _t('index.menu.tags') ?>
+				<?= _t('index.menu.mylabels') ?>
 				<?php if (FreshRSS_Auth::hasAccess()) { ?>
 					<a href="<?= _url('tag', 'index') ?>"><?= _i('configure') ?></a>
 				<?php } ?>