aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-08 00:16:14 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-08 00:16:14 +0300
commita6523cfe86a4555df4f02622db74e4df77f895c2 (patch)
treeb4f2262cea0e071a13522867a3696b774c57b413
parentc54ea989a3cadf49dbb991a4a270ebee38ac18d9 (diff)
downloadwallabag-a6523cfe86a4555df4f02622db74e4df77f895c2.tar.gz
wallabag-a6523cfe86a4555df4f02622db74e4df77f895c2.tar.zst
wallabag-a6523cfe86a4555df4f02622db74e4df77f895c2.zip
fix #1281
Diffstat
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig28
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig140
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig69
3 files changed, 76 insertions, 161 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 4f27f413..f17feedd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -90,20 +90,22 @@
90 </ul> 90 </ul>
91 {% endblock %} 91 {% endblock %}
92 92
93 {% block precontent %}{% endblock %} 93 <main>
94 94 {% block precontent %}{% endblock %}
95 {% block messages %} 95
96 {% for flashMessage in app.session.flashbag.get('notice') %} 96 {% block messages %}
97 <div class="messages success"> 97 {% for flashMessage in app.session.flashbag.get('notice') %}
98 <a href="#" class="closeMessage">×</a> 98 <div class="messages success">
99 <p>{{ flashMessage }}</p> 99 <a href="#" class="closeMessage">×</a>
100 </div> 100 <p>{{ flashMessage }}</p>
101 {% endfor %} 101 </div>
102 {% endblock %} 102 {% endfor %}
103 {% endblock %}
103 104
104 <div id="content" class="w600p center"> 105 <div id="content" class="w600p">
105 {% block content %}{% endblock %} 106 {% block content %}{% endblock %}
106 </div> 107 </div>
108 </main>
107 </div> 109 </div>
108 110
109 {% block footer %} 111 {% block footer %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
deleted file mode 100644
index 773a3729..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ /dev/null
@@ -1,140 +0,0 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="fr">
7 <head>
8 {% block head %}
9 <meta name="viewport" content="initial-scale=1.0">
10 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
11 <!--[if IE]>
12 <meta http-equiv="X-UA-Compatible" content="IE=10">
13 <![endif]-->
14
15 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
16 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
17
18 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
19 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
20
21 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
22 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
23
24 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
25 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
26
27 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
28 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
29
30 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
31 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
32
33 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
34 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
35
36 <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
37 <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
38
39 <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
40
41 {% block css %}{% endblock %}
42 {% block scripts %}
43 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
44 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
45 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
46 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
47 <script src="{{ asset('themes/_global/js/jquery.cookie.js') }}"></script>
48 <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
49 <script src="{{ asset('themes/_global/js/closeMessage.js') }}"></script>
50 {% endblock %}
51
52 <title>{% block title %}{% endblock %} - wallabag</title>
53 {% endblock %}
54 </head>
55
56 <body class="{% block body_class %}{% endblock %}">
57 {% block header %}
58 {% endblock %}
59
60 <div id="main">
61 {% block menu %}
62 <nav class="cyan darken-1">
63 <ul id="slide-out" class="side-nav fixed">
64 {% block logo %}
65 <li class="logo border-bottom">
66 <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
67 <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
68 </a>
69 </li>
70 {% endblock %}
71
72 {% set currentRoute = app.request.attributes.get('_route') %}
73
74 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
75 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
76 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
77 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
78 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
79 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
80 </ul>
81 <div class="nav-wrapper nav-panels">
82 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
83 <div class="left action">
84 {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %}
85 {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %}
86 {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
87 {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
88 {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
89 </div>
90 <div class="input-field nav-panel-buttom">
91 <ul>
92 <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
93 <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
94 </ul>
95 </div>
96 <form method="get" action="index.php">
97 <div class="input-field nav-panel-search" style="display: none">
98 <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}">
99 <label for="search"><i class="mdi-action-search"></i></label>
100 <i class="mdi-navigation-close"></i>
101 </div>
102 </form>
103 <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
104 <div class="input-field nav-panel-add" style="display: none">
105 <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
106 <label for="add"><i class="mdi-content-add"></i></label>
107 <i class="mdi-navigation-close"></i>
108 </div>
109 </form>-->
110 </div>
111 </nav>
112 {% endblock %}
113
114 <main>
115
116 {% block precontent %}{% endblock %}
117
118 {% block messages %}
119 {% for flashMessage in app.session.flashbag.get('notice') %}
120 <div class="messages success">
121 <a href="#" class="closeMessage">×</a>
122 <p>{{ flashMessage }}</p>
123 </div>
124 {% endfor %}
125 {% endblock %}
126
127 <div id="content" class="w600p">
128 {% block content %}{% endblock %}
129 </div>
130
131 </main>
132 </div>
133
134 {% block footer %}
135 <footer class="w600p center mt3 mb3 smaller txtright">
136 <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
137 </footer>
138 {% endblock %}
139 </body>
140</html>
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 632f8c8b..8a49190e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -18,6 +18,67 @@
18{% block header %} 18{% block header %}
19{% endblock %} 19{% endblock %}
20 20
21{% block messages %}
22 {% for flashMessage in app.session.flashbag.get('notice') %}
23 <script>
24 Materialize.toast('{{ flashMessage }}', 4000);
25 </script>
26 {% endfor %}
27{% endblock %}
28
29{% block menu %}
30 <nav class="cyan darken-1">
31 <ul id="slide-out" class="side-nav fixed">
32 {% block logo %}
33 <li class="logo border-bottom">
34 <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
35 <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
36 </a>
37 </li>
38 {% endblock %}
39
40 {% set currentRoute = app.request.attributes.get('_route') %}
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>
43 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
44 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
45 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
46 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
47 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
48 </ul>
49 <div class="nav-wrapper nav-panels">
50 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
51 <div class="left action">
52 {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %}
53 {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %}
54 {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
55 {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
56 {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
57 </div>
58 <div class="input-field nav-panel-buttom">
59 <ul>
60 <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
61 <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
62 </ul>
63 </div>
64 <form method="get" action="index.php">
65 <div class="input-field nav-panel-search" style="display: none">
66 <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}">
67 <label for="search"><i class="mdi-action-search"></i></label>
68 <i class="mdi-navigation-close"></i>
69 </div>
70 </form>
71 <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
72 <div class="input-field nav-panel-add" style="display: none">
73 <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
74 <label for="add"><i class="mdi-content-add"></i></label>
75 <i class="mdi-navigation-close"></i>
76 </div>
77 </form>-->
78 </div>
79 </nav>
80{% endblock %}
81
21{% block footer %} 82{% block footer %}
22 <footer class="page-footer cyan darken-2"> 83 <footer class="page-footer cyan darken-2">
23 <div class="container"> 84 <div class="container">
@@ -51,12 +112,4 @@
51 </div> 112 </div>
52 </div> 113 </div>
53 </footer> 114 </footer>
54{% endblock %}
55
56{% block messages %}
57 {% for flashMessage in app.session.flashbag.get('notice') %}
58 <script>
59 Materialize.toast('{{ flashMessage }}', 4000);
60 </script>
61 {% endfor %}
62{% endblock %} \ No newline at end of file 115{% endblock %} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:55:11 +0000