Replaced favorite word/icon with star one

Fix #2041
This commit is contained in:
Nicolas Lœuillet 2016-08-18 11:58:35 +02:00
parent e408d7e895
commit 519ba0b5e7
16 changed files with 22 additions and 22 deletions

View file

@ -357,7 +357,7 @@ class EntryController extends Controller
} }
/** /**
* Changes favorite status for an entry. * Changes star status for an entry.
* *
* @param Request $request * @param Request $request
* @param Entry $entry * @param Entry $entry

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Tilbage' back_to_homepage: 'Tilbage'
set_as_read: 'Marker som læst' set_as_read: 'Marker som læst'
# set_as_unread: 'Mark as unread' # set_as_unread: 'Mark as unread'
set_as_favorite: 'Marker som favorit' set_as_starred: 'Marker som favorit'
view_original_article: 'Originalartikel' view_original_article: 'Originalartikel'
# re_fetch_content: 'Re-fetch content' # re_fetch_content: 'Re-fetch content'
delete: 'Slet' delete: 'Slet'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Zurück' back_to_homepage: 'Zurück'
set_as_read: 'Als gelesen markieren' set_as_read: 'Als gelesen markieren'
set_as_unread: 'Als ungelesen markieren' set_as_unread: 'Als ungelesen markieren'
set_as_favorite: 'Favorisieren' set_as_starred: 'Favorisieren'
view_original_article: 'Original-Artikel' view_original_article: 'Original-Artikel'
re_fetch_content: 'Inhalt neu laden' re_fetch_content: 'Inhalt neu laden'
delete: 'Löschen' delete: 'Löschen'

View file

@ -146,7 +146,7 @@ entry:
reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min' reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
original_article: 'original' original_article: 'original'
toogle_as_read: 'Toggle mark as read' toogle_as_read: 'Toggle mark as read'
toogle_as_star: 'Toggle favorite' toogle_as_star: 'Toggle star'
delete: 'Delete' delete: 'Delete'
export_title: 'Export' export_title: 'Export'
filters: filters:
@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Back' back_to_homepage: 'Back'
set_as_read: 'Mark as read' set_as_read: 'Mark as read'
set_as_unread: 'Mark as unread' set_as_unread: 'Mark as unread'
set_as_favorite: 'Favorite' set_as_starred: 'Toggle star'
view_original_article: 'Original article' view_original_article: 'Original article'
re_fetch_content: 'Re-fetch content' re_fetch_content: 'Re-fetch content'
delete: 'Delete' delete: 'Delete'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Regrese a la página principal' back_to_homepage: 'Regrese a la página principal'
set_as_read: 'Marcar como leído' set_as_read: 'Marcar como leído'
set_as_unread: 'Marcar como no leído' set_as_unread: 'Marcar como no leído'
set_as_favorite: 'Marcar como favorito' set_as_starred: 'Marcar como favorito'
view_original_article: 'Artículo original' view_original_article: 'Artículo original'
re_fetch_content: 'Redescargar el contenido' re_fetch_content: 'Redescargar el contenido'
delete: 'Suprimir' delete: 'Suprimir'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'بازگشت' back_to_homepage: 'بازگشت'
set_as_read: 'خوانده‌شده' set_as_read: 'خوانده‌شده'
set_as_unread: 'به عنوان خوانده‌نشده علامت بزن' set_as_unread: 'به عنوان خوانده‌نشده علامت بزن'
set_as_favorite: 'برگزیده' set_as_starred: 'برگزیده'
view_original_article: 'مقالهٔ اصلی' view_original_article: 'مقالهٔ اصلی'
re_fetch_content: 'مقاله‌ها را دوباره دریافت کن' re_fetch_content: 'مقاله‌ها را دوباره دریافت کن'
delete: 'پاک کردن' delete: 'پاک کردن'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Retour' back_to_homepage: 'Retour'
set_as_read: 'Marquer comme lu' set_as_read: 'Marquer comme lu'
set_as_unread: 'Marquer comme non lu' set_as_unread: 'Marquer comme non lu'
set_as_favorite: 'Mettre en favori' set_as_starred: 'Mettre en favori'
view_original_article: 'Article original' view_original_article: 'Article original'
re_fetch_content: 'Recharger le contenu' re_fetch_content: 'Recharger le contenu'
delete: 'Supprimer' delete: 'Supprimer'

View file

@ -175,7 +175,7 @@ entry:
back_to_homepage: 'Indietro' back_to_homepage: 'Indietro'
set_as_read: 'Segna come già letto' set_as_read: 'Segna come già letto'
set_as_unread: 'Segna come da leggere' set_as_unread: 'Segna come da leggere'
set_as_favorite: 'Segna come preferito' set_as_starred: 'Segna come preferito'
view_original_article: 'Contenuto originale' view_original_article: 'Contenuto originale'
re_fetch_content: 'Ri-ottieni pagina' re_fetch_content: 'Ri-ottieni pagina'
delete: 'Elimina' delete: 'Elimina'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Tornar' back_to_homepage: 'Tornar'
set_as_read: 'Marcar coma legit' set_as_read: 'Marcar coma legit'
set_as_unread: 'Marcar coma pas legit' set_as_unread: 'Marcar coma pas legit'
set_as_favorite: 'Metre en favori' set_as_starred: 'Metre en favori'
view_original_article: 'Article original' view_original_article: 'Article original'
re_fetch_content: 'Tornar cargar lo contengut' re_fetch_content: 'Tornar cargar lo contengut'
delete: 'Suprimir' delete: 'Suprimir'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Cofnij' back_to_homepage: 'Cofnij'
set_as_read: 'Oznacz jako przeczytane' set_as_read: 'Oznacz jako przeczytane'
set_as_unread: 'Oznacz jako nieprzeczytane' set_as_unread: 'Oznacz jako nieprzeczytane'
set_as_favorite: 'Ulubione' set_as_starred: 'Ulubione'
view_original_article: 'Oryginalny artykuł' view_original_article: 'Oryginalny artykuł'
re_fetch_content: 'Pobierz ponownie treść' re_fetch_content: 'Pobierz ponownie treść'
delete: 'Usuń' delete: 'Usuń'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Înapoi' back_to_homepage: 'Înapoi'
set_as_read: 'Marchează ca citit' set_as_read: 'Marchează ca citit'
# set_as_unread: 'Mark as unread' # set_as_unread: 'Mark as unread'
set_as_favorite: 'Favorit' set_as_starred: 'Favorit'
view_original_article: 'Articol original' view_original_article: 'Articol original'
# re_fetch_content: 'Re-fetch content' # re_fetch_content: 'Re-fetch content'
delete: 'Șterge' delete: 'Șterge'

View file

@ -176,7 +176,7 @@ entry:
back_to_homepage: 'Back' back_to_homepage: 'Back'
set_as_read: 'Okundu olarak işaretle' set_as_read: 'Okundu olarak işaretle'
set_as_unread: 'Okunmadı olarak işaretle' set_as_unread: 'Okunmadı olarak işaretle'
set_as_favorite: 'Favorilere ekle/çıkar' set_as_starred: 'Favorilere ekle/çıkar'
view_original_article: 'Orijinal makale' view_original_article: 'Orijinal makale'
re_fetch_content: 'İçeriği yenile' re_fetch_content: 'İçeriği yenile'
delete: 'Sil' delete: 'Sil'

View file

@ -14,7 +14,7 @@
<li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
<li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
<li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li>
<li><a title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span></a></li> <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
<li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
<li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
{% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
@ -72,7 +72,7 @@
$("body").css("cursor", "auto"); $("body").css("cursor", "auto");
});*/ });*/
// toggle favorite property of current article // toggle star property of current article
/* $('#setFav').click(function(){ /* $('#setFav').click(function(){
$("body").css("cursor", "wait"); $("body").css("cursor", "wait");
$.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done(

View file

@ -77,7 +77,7 @@
<ul class="tools links right"> <ul class="tools links right">
<li> <li>
<a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a>
<a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a>
<a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a>
</li> </li>
</ul> </ul>

View file

@ -24,8 +24,8 @@
</a> </a>
</li> </li>
<li> <li>
<a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
<i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i>
</a> </a>
</li> </li>
<li> <li>
@ -70,9 +70,9 @@
</li> </li>
<li class="bold hide-on-med-and-down"> <li class="bold hide-on-med-and-down">
<a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
<i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i>
<span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span> <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span>
</a> </a>
<div class="collapsible-body"></div> <div class="collapsible-body"></div>
</li> </li>

View file

@ -226,7 +226,7 @@ class PocketImport implements ImportInterface
$entry->setArchived(true); $entry->setArchived(true);
} }
// 0 or 1 - 1 If the item is favorited // 0 or 1 - 1 If the item is starred
if ($pocketEntry['favorite'] == 1) { if ($pocketEntry['favorite'] == 1) {
$entry->setStarred(true); $entry->setStarred(true);
} }