diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-09 08:59:08 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-20 21:12:22 +0100 |
commit | 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc (patch) | |
tree | 4cf8b97ed3c06def270e9172c7b17c5c86048585 /src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |
parent | d2b4f01d7435e8a8f99b15a2487916427c04e58d (diff) | |
download | wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.gz wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.zst wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.zip |
Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
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 | 119 |
1 files changed, 81 insertions, 38 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 f5d03084..48eaca81 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -31,7 +31,7 @@ | |||
31 | <ul id="slide-out" class="side-nav fixed"> | 31 | <ul id="slide-out" class="side-nav fixed"> |
32 | {% block logo %} | 32 | {% block logo %} |
33 | <li class="logo border-bottom"> | 33 | <li class="logo border-bottom"> |
34 | <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}"> | 34 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> |
35 | <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> | 35 | <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> |
36 | </a> | 36 | </a> |
37 | </li> | 37 | </li> |
@@ -39,19 +39,41 @@ | |||
39 | 39 | ||
40 | {% set currentRoute = app.request.attributes.get('_route') %} | 40 | {% set currentRoute = app.request.attributes.get('_route') %} |
41 | 41 | ||
42 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | 42 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"> |
43 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li> | 43 | <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a> |
44 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> | 44 | </li> |
45 | <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li> | 45 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"> |
46 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> | 46 | <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a> |
47 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | 47 | </li> |
48 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> | ||
49 | <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a> | ||
50 | </li> | ||
51 | <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"> | ||
52 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a> | ||
53 | </li> | ||
54 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> | ||
55 | <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a> | ||
56 | </li> | ||
57 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> | ||
58 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> | ||
59 | </li> | ||
48 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 60 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
49 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"><a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{% trans %}internal settings{% endtrans %}</a></li> | 61 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> |
62 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> | ||
63 | </li> | ||
50 | {% endif %} | 64 | {% endif %} |
51 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"><a class="waves-effect" href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li> | 65 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> |
52 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> | 66 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> |
53 | <li class="bold {% if currentRoute == 'developer' %}active{% endif %}"><a class="waves-effect" href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}</a></li> | 67 | </li> |
54 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | 68 | <li class="bold {% if currentRoute == 'developer' %}active{% endif %}"> |
69 | <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a> | ||
70 | </li> | ||
71 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"> | ||
72 | <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a> | ||
73 | </li> | ||
74 | <li class="bold"> | ||
75 | <a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a> | ||
76 | </li> | ||
55 | </ul> | 77 | </ul> |
56 | <div class="nav-wrapper nav-panels"> | 78 | <div class="nav-wrapper nav-panels"> |
57 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> | 79 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> |
@@ -61,21 +83,37 @@ | |||
61 | </div> | 83 | </div> |
62 | <div class="input-field nav-panel-buttom"> | 84 | <div class="input-field nav-panel-buttom"> |
63 | <ul> | 85 | <ul> |
64 | <li class="bold"><a title="{% trans %}Add a new entry{% endtrans %}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> | 86 | <li class="bold"> |
65 | <li><a title="{% trans %}Search{% endtrans %}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a> | 87 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> |
66 | <li id="button_filters"><a title="{% trans %}Filter entries{% endtrans %}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"><i class="mdi-content-filter-list"></i></a></li> | 88 | <i class="mdi-content-add"></i> |
67 | <li id="button_export"><a title="{% trans %}Export{% endtrans %}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right"><i class="mdi-file-file-download"></i></a></li> | 89 | </a> |
90 | </li> | ||
91 | <li> | ||
92 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | ||
93 | <i class="mdi-action-search"></i> | ||
94 | </a> | ||
95 | </li> | ||
96 | <li id="button_filters"> | ||
97 | <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> | ||
99 | </a> | ||
100 | </li> | ||
101 | <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"> | ||
103 | <i class="mdi-file-file-download"></i> | ||
104 | </a> | ||
105 | </li> | ||
68 | </ul> | 106 | </ul> |
69 | </div> | 107 | </div> |
70 | <form method="get" action="index.php"> | 108 | <form method="get" action="index.php"> |
71 | <div class="input-field nav-panel-search" style="display: none"> | 109 | <div class="input-field nav-panel-search" style="display: none"> |
72 | <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}"> | 110 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> |
73 | <label for="search"><i class="mdi-action-search"></i></label> | 111 | <label for="search"><i class="mdi-action-search"></i></label> |
74 | <i class="mdi-navigation-close"></i> | 112 | <i class="mdi-navigation-close"></i> |
75 | </div> | 113 | </div> |
76 | </form> | 114 | </form> |
77 | <div class="input-field nav-panel-add" style="display: none"> | 115 | <div class="input-field nav-panel-add" style="display: none"> |
78 | {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} | 116 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
79 | <label for="add" class="active"><i class="mdi-content-add"></i></label> | 117 | <label for="add" class="active"><i class="mdi-content-add"></i></label> |
80 | <i class="mdi-navigation-close"></i> | 118 | <i class="mdi-navigation-close"></i> |
81 | </div> | 119 | </div> |
@@ -88,35 +126,40 @@ | |||
88 | <div class="container"> | 126 | <div class="container"> |
89 | <div class="row"> | 127 | <div class="row"> |
90 | <div class="col l6 s12"> | 128 | <div class="col l6 s12"> |
91 | <h5 class="white-text">{% trans %}Take wallabag with you{% endtrans %}</h5> | 129 | <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5> |
92 | <p class="grey-text text-lighten-4"> | 130 | <p class="grey-text text-lighten-4"> |
93 | 131 | <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="Android"> | |
94 | <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="android"><span class="icon-android"></span></a> | 132 | <span class="icon-android"></span> |
95 | 133 | </a> | |
96 | <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"><span class="icon-apple"></a> | 134 | <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"> |
97 | 135 | <span class="icon-apple"></span> | |
98 | <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/" title="Firefox"><span class="icon-firefox"></span></a> | 136 | </a> |
99 | 137 | <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/" title="Firefox"> | |
100 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"><span class="icon-chrome"></a> | 138 | <span class="icon-firefox"></span> |
101 | 139 | </a> | |
140 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"> | ||
141 | <span class="icon-chrome"></span> | ||
142 | </a> | ||
102 | </p> | 143 | </p> |
103 | </div> | 144 | </div> |
104 | <div class="col l4 offset-l2 s12"> | 145 | <div class="col l4 offset-l2 s12"> |
105 | <h5 class="white-text">{% trans %}Social{% endtrans %}</h5> | 146 | <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5> |
106 | 147 | <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter"> | |
107 | <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter"><span class="icon-twitter"></span></a> | 148 | <span class="icon-twitter"></span> |
108 | 149 | </a> | |
109 | <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+"><span class="icon-google-plus2"></span></a> | 150 | <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+"> |
110 | 151 | <span class="icon-google-plus2"></span> | |
111 | <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook"><span class="icon-facebook2"></span></a> | 152 | </a> |
112 | 153 | <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook"> | |
154 | <span class="icon-facebook2"></span> | ||
155 | </a> | ||
113 | </div> | 156 | </div> |
114 | </div> | 157 | </div> |
115 | </div> | 158 | </div> |
116 | <div class="footer-copyright"> | 159 | <div class="footer-copyright"> |
117 | <div class="container"> | 160 | <div class="container"> |
118 | <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> | 161 | <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> |
119 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a> | 162 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a> |
120 | </div> | 163 | </div> |
121 | </div> | 164 | </div> |
122 | </footer> | 165 | </footer> |