diff options
Diffstat (limited to 'src/Wallabag')
3 files changed, 3 insertions, 21 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index ffc5bec6..1c0430e8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -67,7 +67,7 @@ | |||
67 | 67 | ||
68 | <!-- Filter --> | 68 | <!-- Filter --> |
69 | {% if form is not null %} | 69 | {% if form is not null %} |
70 | <aside id="filter-form" class=""> | 70 | <div id="filters" class=""> |
71 | <form method="get" action="{{ path('all') }}"> | 71 | <form method="get" action="{{ path('all') }}"> |
72 | <h2>{{ 'entry.filters.title'|trans }}</h2> | 72 | <h2>{{ 'entry.filters.title'|trans }}</h2> |
73 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> | 73 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> |
@@ -147,6 +147,6 @@ | |||
147 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button> | 147 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button> |
148 | </div> | 148 | </div> |
149 | </form> | 149 | </form> |
150 | </aside> | 150 | </div> |
151 | {% endif %} | 151 | {% endif %} |
152 | {% endblock %} | 152 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index bec4b70f..be1e3647 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -82,22 +82,4 @@ | |||
82 | "entryId": "{{ entry.id }}" | 82 | "entryId": "{{ entry.id }}" |
83 | } | 83 | } |
84 | </script> | 84 | </script> |
85 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script> | ||
86 | <script type="text/javascript"> | ||
87 | $(document).ready(function() { | ||
88 | $(window).scroll(function(e){ | ||
89 | var scrollTop = $(window).scrollTop(); | ||
90 | var docHeight = $(document).height(); | ||
91 | var scrollPercent = (scrollTop) / (docHeight); | ||
92 | var scrollPercentRounded = Math.round(scrollPercent*100)/100; | ||
93 | savePercent({{ entry.id }}, scrollPercentRounded); | ||
94 | }); | ||
95 | |||
96 | retrievePercent({{ entry.id }}); | ||
97 | |||
98 | $(window).resize(function(){ | ||
99 | retrievePercent({{ entry.id }}); | ||
100 | }); | ||
101 | }); | ||
102 | </script> | ||
103 | {% endblock %} | 85 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index e889dea8..01fde953 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 67 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
68 | 68 | ||
69 | <ul class="card-entry-tags"> | 69 | <ul class="card-entry-labels-hidden"> |
70 | {% for tag in entry.tags %} | 70 | {% for tag in entry.tags %} |
71 | <li>{{ tag.label }}</li> | 71 | <li>{{ tag.label }}</li> |
72 | {% endfor %} | 72 | {% endfor %} |