forked from wallabag/wallabag
Add new Ignore Origin rules tab, update ConfigController
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Brugeroplysninger'
|
||||
password: 'Adgangskode'
|
||||
# rules: 'Tagging rules'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Tilføj bruger'
|
||||
# reset: 'Reset area'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
# entry_already_saved: 'Entry already saved on %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Benutzerinformation'
|
||||
password: 'Kennwort'
|
||||
rules: 'Tagging-Regeln'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Benutzer hinzufügen'
|
||||
reset: 'Zurücksetzen'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Eintrag bereits am %date% gespeichert'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'User information'
|
||||
password: 'Password'
|
||||
rules: 'Tagging rules'
|
||||
ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Add a user'
|
||||
reset: 'Reset area'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
otp_disabled: Two-factor authentication disabled
|
||||
tagging_rules_imported: Tagging rules imported
|
||||
tagging_rules_not_imported: Error while importing tagging rules
|
||||
ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Entry already saved on %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Información de usuario'
|
||||
password: 'Contraseña'
|
||||
rules: 'Reglas de etiquetado automáticas'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Añadir un usuario'
|
||||
reset: 'Reiniciar mi cuenta'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
tagging_rules_imported: Reglas de etiquetado importadas
|
||||
tagging_rules_not_imported: Un error se ha producico en la importación de las reglas de etiquetado
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Artículo ya guardado el %fecha%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'اطلاعات کاربر'
|
||||
password: 'رمز'
|
||||
rules: 'برچسبگذاری خودکار'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'افزودن کاربر'
|
||||
# reset: 'Reset area'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: "Mon compte"
|
||||
password: "Mot de passe"
|
||||
rules: "Règles de tag automatiques"
|
||||
ignore_origin: "Règles d'omission d'origine"
|
||||
new_user: "Créer un compte"
|
||||
reset: "Réinitialisation"
|
||||
form:
|
||||
@ -618,6 +619,11 @@ flashes:
|
||||
otp_disabled: "Authentification à double-facteur désactivée"
|
||||
tagging_rules_imported: Règles bien importées
|
||||
tagging_rules_not_imported: Impossible d'importer les règles
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
ignore_origin_rules_deleted: "Règle d'omission d'origine supprimée"
|
||||
ignore_origin_rules_updated: "Règle d'omission d'origine mise à jour"
|
||||
>>>>>>> 4c595340... fixup! Add new Ignore Origin rules tab, update ConfigController
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: "Article déjà sauvegardé le %date%"
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Informazioni utente'
|
||||
password: 'Password'
|
||||
rules: 'Regole di etichettatura'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Aggiungi utente'
|
||||
reset: 'Area di reset'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Contenuto già salvato in data %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Mon compte'
|
||||
password: 'Senhal'
|
||||
rules: "Règlas d'etiquetas automaticas"
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Crear un compte'
|
||||
reset: 'Zòna de reïnicializacion'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
tagging_rules_imported: Règlas d’etiquetatge importadas
|
||||
tagging_rules_not_imported: Error en important las règlas d’etiquetatge
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Article ja salvagardat lo %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Informacje o użytkowniku'
|
||||
password: 'Hasło'
|
||||
rules: 'Zasady tagowania'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Dodaj użytkownika'
|
||||
reset: 'Reset'
|
||||
form:
|
||||
@ -617,6 +618,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Wpis już został dodany %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Informação do Usuário'
|
||||
password: 'Senha'
|
||||
rules: 'Regras de tags'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Adicionar um usuário'
|
||||
reset: 'Reiniciar minha conta'
|
||||
form:
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Informații despre utilizator'
|
||||
password: 'Parolă'
|
||||
# rules: 'Tagging rules'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Crează un utilizator'
|
||||
# reset: 'Reset area'
|
||||
form:
|
||||
@ -616,6 +617,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
# entry_already_saved: 'Entry already saved on %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Информация о пользователе'
|
||||
password: 'Пароль'
|
||||
rules: 'Правила настройки простановки тегов'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Добавить пользователя'
|
||||
reset: 'Сброс данных'
|
||||
form:
|
||||
@ -616,6 +617,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Запись была сохранена ранее %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'ข้อมูลผู้ใช้'
|
||||
password: 'รหัสผ่าน'
|
||||
rules: 'การแท็กข้อบังคับ'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'เพิ่มผู้ใช้'
|
||||
reset: 'รีเซ็ตพื้นที่ '
|
||||
form:
|
||||
@ -616,6 +617,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'รายการพร้อมบันทึกที่ %date%'
|
||||
|
||||
@ -59,6 +59,7 @@ config:
|
||||
user_info: 'Kullanıcı bilgileri'
|
||||
password: 'Şifre'
|
||||
rules: 'Etiketleme kuralları'
|
||||
# ignore_origin: 'Ignore origin rules'
|
||||
new_user: 'Bir kullanıcı ekle'
|
||||
# reset: 'Reset area'
|
||||
form:
|
||||
@ -616,6 +617,8 @@ flashes:
|
||||
# otp_disabled: Two-factor authentication disabled
|
||||
# tagging_rules_imported: Tagging rules imported
|
||||
# tagging_rules_not_imported: Error while importing tagging rules
|
||||
# ignore_origin_rules_deleted: 'Ignore origin rule deleted'
|
||||
# ignore_origin_rules_updated: 'Ignore origin rule updated'
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Entry already saved on %date%'
|
||||
|
||||
@ -404,6 +404,33 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2>{{ 'config.tab_menu.ignore_origin'|trans }}</h2>
|
||||
|
||||
<ul>
|
||||
{% for ignore_origin_rule in app.user.config.ignoreOriginRules %}
|
||||
<li>
|
||||
{{ 'config.form_rules.if_label'|trans }}
|
||||
« {{ ignore_origin_rule.rule }} »
|
||||
<a href="{{ path('edit_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="tool mode_edit">✎</a>
|
||||
<a href="{{ path('delete_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{{ form_start(form.new_ignore_origin_user_rule) }}
|
||||
{{ form_errors(form.new_ignore_origin_user_rule) }}
|
||||
|
||||
<fieldset class="w500p inline">
|
||||
<div class="row">
|
||||
{{ form_label(form.new_ignore_origin_user_rule.rule) }}
|
||||
{{ form_errors(form.new_ignore_origin_user_rule.rule) }}
|
||||
{{ form_widget(form.new_ignore_origin_user_rule.rule) }}
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
{{ form_rest(form.new_ignore_origin_user_rule) }}
|
||||
</form>
|
||||
|
||||
<h2>{{ 'config.reset.title'|trans }}</h2>
|
||||
<fieldset class="w500p inline">
|
||||
<p>{{ 'config.reset.description'|trans }}</p>
|
||||
|
||||
@ -16,7 +16,8 @@
|
||||
<li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
|
||||
<li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
|
||||
<li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
|
||||
<li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.reset'|trans }}</a></li>
|
||||
<li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.ignore_origin'|trans }}</a></li>
|
||||
<li class="tab col s12 m6 l3"><a href="#set7">{{ 'config.tab_menu.reset'|trans }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -294,11 +295,11 @@
|
||||
« {{ tagging_rule.rule }} »
|
||||
{{ 'config.form_rules.then_tag_as_label'|trans }}
|
||||
« {{ tagging_rule.tags|join(', ') }} »
|
||||
<a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}">
|
||||
<i class="tool grey-text mode_edit material-icons">mode_edit</i>
|
||||
<a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="mode_edit">
|
||||
<i class="tool grey-text material-icons">mode_edit</i>
|
||||
</a>
|
||||
<a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}">
|
||||
<i class="tool grey-text delete material-icons">delete</i>
|
||||
<a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="delete">
|
||||
<i class="tool grey-text material-icons">delete</i>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
@ -466,6 +467,44 @@
|
||||
</div>
|
||||
|
||||
<div id="set6" class="col s12">
|
||||
{% if app.user.config.ignoreOriginRules is not empty %}
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
<ul>
|
||||
{% for ignore_origin_rule in app.user.config.ignoreOriginRules %}
|
||||
<li>
|
||||
{{ 'config.form_rules.if_label'|trans }}
|
||||
« {{ ignore_origin_rule.rule }} »
|
||||
<a href="{{ path('edit_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="mode_edit">
|
||||
<i class="tool grey-text material-icons">mode_edit</i>
|
||||
</a>
|
||||
<a href="{{ path('delete_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="delete">
|
||||
<i class="tool grey-text material-icons">delete</i>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{{ form_start(form.new_ignore_origin_user_rule) }}
|
||||
{{ form_errors(form.new_ignore_origin_user_rule) }}
|
||||
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
{{ form_label(form.new_ignore_origin_user_rule.rule) }}
|
||||
{{ form_errors(form.new_ignore_origin_user_rule.rule) }}
|
||||
{{ form_widget(form.new_ignore_origin_user_rule.rule) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ form_widget(form.new_ignore_origin_user_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
|
||||
{{ form_rest(form.new_ignore_origin_user_rule) }}
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="set7" class="col s12">
|
||||
<div class="row">
|
||||
<h5>{{ 'config.reset.title'|trans }}</h5>
|
||||
<p>{{ 'config.reset.description'|trans }}</p>
|
||||
|
||||
Reference in New Issue
Block a user