diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-03-08 17:02:34 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-06-09 17:12:51 +0200 |
commit | 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 (patch) | |
tree | 03ee1eab0d89d1857daca9e273fd8c9ca47e33c2 /src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |
parent | 9f95b14dec88cf083cefa38d5fbd84189e07acac (diff) | |
download | wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.gz wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.zst wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.zip |
manage assets through npm
first draft
remote assetic totally
work
nearly there
use at least nodejs > 0.12
use proper version of grunt
bump nodejs version for travis
update npm
workaround for materialize
install node 5.0
add grunt-cli
baggy theme & cache node modules
cache bower & npm
make travis build assets on php7 only
exclude installing node & npm if not needed & use bash
clean & try to make icomoon work on baggy
ready
config for travis
rebase
make travis work
more travis work
impove travis & update deps
add missing pixrem deps
add module through oddly lost
ui updates
install latest nodejs
add install_dev.sh, link local binaries for npm/bower/grunt
ui improvements (mostly baggy)
fix travis build
no need to install on travis
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
Improve English translation
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Update installation instructions
-Fix grammar
-Add SELinux section
add screenshots of android docu in English
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Move fixtures to the right place
Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
Prepare wallabag 2.0.5
enforce older materialize version
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 25ad23dd..ed0ad2f6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -2,17 +2,12 @@ | |||
2 | 2 | ||
3 | {% block css %} | 3 | {% block css %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | 5 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}" media="screen,projection,print"/> | |
6 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/materialize.min.css') }}" media="screen,projection"/> | ||
7 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/main.css') }}" media="all"> | ||
8 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/print.css') }}" media="print"> | ||
9 | {% endblock %} | 6 | {% endblock %} |
10 | 7 | ||
11 | {% block scripts %} | 8 | {% block scripts %} |
12 | {{ parent() }} | 9 | {{ parent() }} |
13 | 10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script> | |
14 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script> | ||
15 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script> | ||
16 | {% endblock %} | 11 | {% endblock %} |
17 | 12 | ||
18 | {% block header %} | 13 | {% block header %} |
@@ -31,8 +26,8 @@ | |||
31 | <ul id="slide-out" class="side-nav fixed"> | 26 | <ul id="slide-out" class="side-nav fixed"> |
32 | {% block logo %} | 27 | {% block logo %} |
33 | <li class="logo border-bottom"> | 28 | <li class="logo border-bottom"> |
34 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> | 29 | <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}"> |
35 | <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> | 30 | <img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" /> |
36 | </a> | 31 | </a> |
37 | </li> | 32 | </li> |
38 | {% endblock %} | 33 | {% endblock %} |
@@ -76,7 +71,7 @@ | |||
76 | </li> | 71 | </li> |
77 | </ul> | 72 | </ul> |
78 | <div class="nav-wrapper nav-panels"> | 73 | <div class="nav-wrapper nav-panels"> |
79 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> | 74 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a> |
80 | <div class="left action"> | 75 | <div class="left action"> |
81 | {% block title %} | 76 | {% block title %} |
82 | {% endblock %} | 77 | {% endblock %} |
@@ -85,22 +80,22 @@ | |||
85 | <ul> | 80 | <ul> |
86 | <li class="bold"> | 81 | <li class="bold"> |
87 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> | 82 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> |
88 | <i class="mdi-content-add"></i> | 83 | <i class="material-icons">add</i> |
89 | </a> | 84 | </a> |
90 | </li> | 85 | </li> |
91 | <!--<li> | 86 | <!--<li> |
92 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 87 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> |
93 | <i class="mdi-action-search"></i> | 88 | <i class="material-icons">search</i> |
94 | </a> | 89 | </a> |
95 | </li>--> | 90 | </li>--> |
96 | <li id="button_filters"> | 91 | <li id="button_filters"> |
97 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> | 92 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> |
98 | <i class="mdi-content-filter-list"></i> | 93 | <i class="material-icons">filter_list</i> |
99 | </a> | 94 | </a> |
100 | </li> | 95 | </li> |
101 | <li id="button_export"> | 96 | <li id="button_export"> |
102 | <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right"> | 97 | <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export"> |
103 | <i class="mdi-file-file-download"></i> | 98 | <i class="material-icons">file_download</i> |
104 | </a> | 99 | </a> |
105 | </li> | 100 | </li> |
106 | </ul> | 101 | </ul> |
@@ -108,14 +103,14 @@ | |||
108 | <form method="get" action="index.php"> | 103 | <form method="get" action="index.php"> |
109 | <div class="input-field nav-panel-search" style="display: none"> | 104 | <div class="input-field nav-panel-search" style="display: none"> |
110 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> | 105 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> |
111 | <label for="search"><i class="mdi-action-search"></i></label> | 106 | <label for="search"><i class="material-icons search">search</i></label> |
112 | <i class="mdi-navigation-close"></i> | 107 | <i class="material-icons close">clear</i> |
113 | </div> | 108 | </div> |
114 | </form> | 109 | </form> |
115 | <div class="input-field nav-panel-add" style="display: none"> | 110 | <div class="input-field nav-panel-add" style="display: none"> |
116 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 111 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
117 | <label for="add" class="active"><i class="mdi-content-add"></i></label> | 112 | <label for="add" class="active"><i class="material-icons add">add</i></label> |
118 | <i class="mdi-navigation-close"></i> | 113 | <i class="material-icons close">clear</i> |
119 | </div> | 114 | </div> |
120 | </div> | 115 | </div> |
121 | </nav> | 116 | </nav> |