diff options
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 52 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | 51 |
2 files changed, 56 insertions, 47 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index b9184f45..152c5c28 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -50,54 +50,15 @@ | |||
50 | </head> | 50 | </head> |
51 | 51 | ||
52 | <body class="{% block body_class %}{% endblock %}"> | 52 | <body class="{% block body_class %}{% endblock %}"> |
53 | {% block header %} | 53 | {% block header %}{% endblock %} |
54 | <header class="w600p center mbm"> | ||
55 | <h1 class="logo"> | ||
56 | {% block logo %} | ||
57 | <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" /> | ||
58 | {% endblock %} | ||
59 | </h1> | ||
60 | </header> | ||
61 | {% endblock %} | ||
62 | 54 | ||
63 | <div id="main"> | 55 | <div id="main"> |
64 | {% block menu %} | 56 | {% block menu %}{% endblock %} |
65 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> | ||
66 | <ul id="links" class="links"> | ||
67 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | ||
68 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | ||
69 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | ||
70 | <li><a href="{{ path('all') }}"}>{% trans %}all{% endtrans %}</a></li> | ||
71 | <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li> | ||
72 | <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> | ||
73 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | ||
74 | <div id="search-form" class="messages info popup-form"> | ||
75 | <form method="get" action="index.php"> | ||
76 | <h2>{% trans %}Search{% endtrans %}</h2> | ||
77 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | ||
78 | <input type="hidden" name="view" value="search"></input> | ||
79 | <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br> | ||
80 | <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input> | ||
81 | </form> | ||
82 | </div> | ||
83 | </li> | ||
84 | <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | ||
85 | <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li> | ||
86 | <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | ||
87 | </ul> | ||
88 | {% endblock %} | ||
89 | 57 | ||
90 | <main> | 58 | <main> |
91 | {% block precontent %}{% endblock %} | 59 | {% block precontent %}{% endblock %} |
92 | 60 | ||
93 | {% block messages %} | 61 | {% block messages %}{% endblock %} |
94 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
95 | <div class="messages success"> | ||
96 | <a href="#" class="closeMessage">×</a> | ||
97 | <p>{{ flashMessage }}</p> | ||
98 | </div> | ||
99 | {% endfor %} | ||
100 | {% endblock %} | ||
101 | 62 | ||
102 | <div id="content" class="w600p"> | 63 | <div id="content" class="w600p"> |
103 | {% block content %}{% endblock %} | 64 | {% block content %}{% endblock %} |
@@ -105,11 +66,8 @@ | |||
105 | </main> | 66 | </main> |
106 | </div> | 67 | </div> |
107 | 68 | ||
108 | {% block footer %} | 69 | {% block footer %}{% endblock %} |
109 | <footer class="w600p center mt3 mb3 smaller txtright"> | 70 | |
110 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> | ||
111 | </footer> | ||
112 | {% endblock %} | ||
113 | {% if warning_message %} | 71 | {% if warning_message %} |
114 | <div id="warning_message"> | 72 | <div id="warning_message"> |
115 | {{ warning_message | raw }} | 73 | {{ warning_message | raw }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 229c5a34..3d573eaa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -19,3 +19,54 @@ | |||
19 | <script src="{{ asset('themes/baggy/js/saveLink.js') }}"></script> | 19 | <script src="{{ asset('themes/baggy/js/saveLink.js') }}"></script> |
20 | <script src="{{ asset('themes/baggy/js/popupForm.js') }}"></script> | 20 | <script src="{{ asset('themes/baggy/js/popupForm.js') }}"></script> |
21 | {% endblock %} | 21 | {% endblock %} |
22 | |||
23 | {% block header %} | ||
24 | <header class="w600p center mbm"> | ||
25 | <h1 class="logo"> | ||
26 | {% block logo %} | ||
27 | <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" /> | ||
28 | {% endblock %} | ||
29 | </h1> | ||
30 | </header> | ||
31 | {% endblock %} | ||
32 | |||
33 | {% block menu %} | ||
34 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> | ||
35 | <ul id="links" class="links"> | ||
36 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | ||
37 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | ||
38 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | ||
39 | <li><a href="{{ path('all') }}"}>{% trans %}all{% endtrans %}</a></li> | ||
40 | <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> | ||
41 | <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> | ||
42 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | ||
43 | <div id="search-form" class="messages info popup-form"> | ||
44 | <form method="get" action="index.php"> | ||
45 | <h2>{% trans %}Search{% endtrans %}</h2> | ||
46 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | ||
47 | <input type="hidden" name="view" value="search"></input> | ||
48 | <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br> | ||
49 | <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input> | ||
50 | </form> | ||
51 | </div> | ||
52 | </li> | ||
53 | <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | ||
54 | <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li> | ||
55 | <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | ||
56 | </ul> | ||
57 | {% endblock %} | ||
58 | |||
59 | {% block messages %} | ||
60 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
61 | <div class="messages success"> | ||
62 | <a href="#" class="closeMessage">×</a> | ||
63 | <p>{{ flashMessage }}</p> | ||
64 | </div> | ||
65 | {% endfor %} | ||
66 | {% endblock %} | ||
67 | |||
68 | {% block footer %} | ||
69 | <footer class="w600p center mt3 mb3 smaller txtright"> | ||
70 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> | ||
71 | </footer> | ||
72 | {% endblock %} | ||