aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy <jeremy.benoist@gmail.com>2015-03-01 08:22:29 +0100
committerJeremy <jeremy.benoist@gmail.com>2015-03-01 10:49:17 +0100
commit495aecfe7417918c45d8ea32b1ee8903018449cd (patch)
treef79e2d133e66108b3e0e814dc206d09344e72df0 /src/Wallabag
parent71798e4ec428d03b1ce7116ae918a05a2d9b5044 (diff)
downloadwallabag-495aecfe7417918c45d8ea32b1ee8903018449cd.tar.gz
wallabag-495aecfe7417918c45d8ea32b1ee8903018449cd.tar.zst
wallabag-495aecfe7417918c45d8ea32b1ee8903018449cd.zip
Cleanup & simplify theme
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php25
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig13
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/Static/about.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_footer.html.twig3
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_head.html.twig16
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_menu.html.twig14
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_messages.html.twig9
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_save_form.html.twig10
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig9
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_top.html.twig5
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig115
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig27
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/layout.html.twig29
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig26
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js (renamed from src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js (renamed from src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig5
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig187
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig29
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig56
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig34
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig13
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini3
29 files changed, 158 insertions, 491 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 2a943bb7..2c742e6a 100644
--- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -6,13 +6,26 @@ use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
6use Symfony\Component\Security\Core\SecurityContextInterface; 6use Symfony\Component\Security\Core\SecurityContextInterface;
7use Wallabag\CoreBundle\Entity\User; 7use Wallabag\CoreBundle\Entity\User;
8 8
9/**
10 * This class intend to detect the active theme for the logged in user.
11 * It will retrieve the configured theme of the user.
12 *
13 * If no user where logged in, it will returne the default theme
14 */
15
9class DetectActiveTheme implements DeviceDetectionInterface 16class DetectActiveTheme implements DeviceDetectionInterface
10{ 17{
11 protected $securityContext; 18 protected $securityContext;
19 protected $defaultTheme;
12 20
13 public function __construct(SecurityContextInterface $securityContext) 21 /**
22 * @param SecurityContextInterface $securityContext Needed to retrieve the current user
23 * @param string $defaultTheme Default theme when user isn't logged in
24 */
25 public function __construct(SecurityContextInterface $securityContext, $defaultTheme)
14 { 26 {
15 $this->securityContext = $securityContext; 27 $this->securityContext = $securityContext;
28 $this->defaultTheme = $defaultTheme;
16 } 29 }
17 30
18 public function setUserAgent($userAgent) 31 public function setUserAgent($userAgent)
@@ -21,9 +34,10 @@ class DetectActiveTheme implements DeviceDetectionInterface
21 34
22 /** 35 /**
23 * This should return the active theme for the logged in user. 36 * This should return the active theme for the logged in user.
24 * No active theme for: 37 *
38 * Default theme for:
25 * - anonymous user 39 * - anonymous user
26 * - user without a config (shouldn't happen..) 40 * - user without a config (shouldn't happen ..)
27 * 41 *
28 * @return string 42 * @return string
29 */ 43 */
@@ -31,15 +45,14 @@ class DetectActiveTheme implements DeviceDetectionInterface
31 { 45 {
32 $user = $this->securityContext->getToken()->getUser(); 46 $user = $this->securityContext->getToken()->getUser();
33 47
34 // anon user don't deserve a theme
35 if (!$user instanceof User) { 48 if (!$user instanceof User) {
36 return false; 49 return $this->defaultTheme;
37 } 50 }
38 51
39 $config = $user->getConfig(); 52 $config = $user->getConfig();
40 53
41 if (!$config) { 54 if (!$config) {
42 return false; 55 return $this->defaultTheme;
43 } 56 }
44 57
45 return $config->getTheme(); 58 return $config->getTheme();
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 5437d1cf..c734a3a5 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -20,6 +20,7 @@ services:
20 class: Wallabag\CoreBundle\Helper\DetectActiveTheme 20 class: Wallabag\CoreBundle\Helper\DetectActiveTheme
21 arguments: 21 arguments:
22 - @security.context 22 - @security.context
23 - %theme% # default theme from parameters.yml
23 24
24 wallabag_core.form.type.config: 25 wallabag_core.form.type.config:
25 class: Wallabag\CoreBundle\Form\Type\ConfigType 26 class: Wallabag\CoreBundle\Form\Type\ConfigType
diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
index 051dafd6..1835d26e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
@@ -2,10 +2,6 @@
2 2
3{% block title %}{% trans %}Config{% endtrans %}{% endblock %} 3{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
4 4
5{% block menu %}
6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %}
8
9{% block content %} 5{% block content %}
10 <h2>{% trans %}Wallabag configuration{% endtrans %}</h2> 6 <h2>{% trans %}Wallabag configuration{% endtrans %}</h2>
11 7
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index dfce4b3c..acb96420 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -2,10 +2,6 @@
2 2
3{% block title "Unread" %} 3{% block title "Unread" %}
4 4
5{% block menu %}
6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %}
8
9{% block content %} 5{% block content %}
10 {% block pager %} 6 {% block pager %}
11 {% if entries is not empty %} 7 {% if entries is not empty %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index f0c00509..f23ab968 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -2,10 +2,6 @@
2 2
3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
4 4
5{% block menu %}
6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %}
8
9{% block content %} 5{% block content %}
10 <div id="article_toolbar"> 6 <div id="article_toolbar">
11 <ul class="links"> 7 <ul class="links">
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index b6de7d23..b11512a4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -2,10 +2,6 @@
2 2
3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} 3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
4 4
5{% block menu %}
6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %}
8
9{% block content %} 5{% block content %}
10 {{ form(form) }} 6 {{ form(form) }}
11{% endblock %} 7{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
index 2437e3b0..eb8f08c8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
@@ -1,6 +1,11 @@
1{% extends "WallabagCoreBundle::layout-login.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} 3{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
4
5{% block body_class %}login{% endblock %}
6
7{% block menu %}{% endblock %}
8
4{% block content %} 9{% block content %}
5 {% if error %} 10 {% if error %}
6 <div>{{ error.message }}</div> 11 <div>{{ error.message }}</div>
@@ -19,11 +24,7 @@
19 <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label> 24 <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label>
20 <input type="password" id="password" name="_password" /> 25 <input type="password" id="password" name="_password" />
21 </div> 26 </div>
22 {# 27
23 Si vous voulez contrôler l'URL vers laquelle l'utilisateur est redirigé en cas de succès
24 (plus de détails ci-dessous)
25 <input type="hidden" name="_target_path" value="/account" />
26 #}
27 <div class="row mts txtcenter"> 28 <div class="row mts txtcenter">
28 <button type="submit">login</button> 29 <button type="submit">login</button>
29 </div> 30 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index b8d3c7b6..9e188cd9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -1,9 +1,7 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}About{% endtrans %}{% endblock %} 3{% block title %}{% trans %}About{% endtrans %}{% endblock %}
4{% block menu %} 4
5{% include "WallabagCoreBundle::_menu.html.twig" %}
6{% endblock %}
7{% block content %} 5{% block content %}
8 <h2>{% trans %}About wallabag{% endtrans %}</h2> 6 <h2>{% trans %}About wallabag{% endtrans %}</h2>
9 7
diff --git a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
deleted file mode 100644
index 1b5f9a0f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
1<footer class="w600p center mt3 mb3 smaller txtright">
2 <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
3</footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
deleted file mode 100755
index b7ec3a83..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
1{% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
2
3<link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
4<link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
5<link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
6<link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
7<link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
8
9<script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
10<script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
11<script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script>
12<script src="{{ asset('themes/baggy/js/init.js') }}"></script>
13<script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
14<script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
15<script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
16<script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
deleted file mode 100644
index 9a3cf053..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
1<button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
2<ul id="links" class="links">
3 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
4 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
5 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
6 <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
7 <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
8 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
9 {% include "WallabagCoreBundle::_search_form.html.twig" %}
10 </li>
11 <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
12 <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
13 <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
14</ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
deleted file mode 100644
index 18e294c9..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
1
2{% if flashMessages %}
3<div class="messages success">
4 <a href="#" class="closeMessage">×</a>
5 {% for flashMessage in flashMessages %}
6 <p>{{ flashMessage }}</p>
7 {% endfor %}
8</div>
9{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
deleted file mode 100755
index acaa5dbc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
1<div id="bagit-form" class="messages info popup-form">
2 <form method="get" action="index.php" target="_blank" id="bagit-form-form">
3 <h2>{% trans %}Save a link{% endtrans %}</h2>
4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <span id="add-link-result"></span>
8 <input type="submit" value="{% trans %}save link!"{% endtrans %} />
9 </form>
10</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
deleted file mode 100644
index 1e6f327d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
1<div id="search-form" class="messages info popup-form">
2 <form method="get" action="index.php">
3 <h2>{% trans %}Search{% endtrans %}</h2>
4 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="view" value="search"></input>
6 <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
7 <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
8 </form>
9</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
deleted file mode 100755
index a4403c13..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
1<header class="w600p center mbm">
2 <h1 class="logo">
3 {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %}
4 </h1>
5</header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
new file mode 100644
index 00000000..4f27f413
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -0,0 +1,115 @@
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 <header class="w600p center mbm">
59 <h1 class="logo">
60 {% block logo %}
61 <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
62 {% endblock %}
63 </h1>
64 </header>
65 {% endblock %}
66
67 <div id="main">
68 {% block menu %}
69 <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
70 <ul id="links" class="links">
71 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
72 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
73 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
74 <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
75 <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
76 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
77 <div id="search-form" class="messages info popup-form">
78 <form method="get" action="index.php">
79 <h2>{% trans %}Search{% endtrans %}</h2>
80 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
81 <input type="hidden" name="view" value="search"></input>
82 <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
83 <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
84 </form>
85 </div>
86 </li>
87 <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
88 <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
89 <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
90 </ul>
91 {% endblock %}
92
93 {% block precontent %}{% endblock %}
94
95 {% block messages %}
96 {% for flashMessage in app.session.flashbag.get('notice') %}
97 <div class="messages success">
98 <a href="#" class="closeMessage">×</a>
99 <p>{{ flashMessage }}</p>
100 </div>
101 {% endfor %}
102 {% endblock %}
103
104 <div id="content" class="w600p center">
105 {% block content %}{% endblock %}
106 </div>
107 </div>
108
109 {% block footer %}
110 <footer class="w600p center mt3 mb3 smaller txtright">
111 <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
112 </footer>
113 {% endblock %}
114 </body>
115</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
deleted file mode 100644
index 45deee8f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ /dev/null
@@ -1,27 +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="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle::_head.html.twig" %}
15 </head>
16 <body class="login">
17 <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
18 {% include "WallabagCoreBundle::_top.html.twig" %}
19 <div id="main">
20 {% block menu %}{% endblock %}
21 <div id="content" class="w600p center">
22 {% block content %}{% endblock %}
23 </div>
24 </div>
25 {% include "WallabagCoreBundle::_footer.html.twig" %}
26 </body>
27</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
deleted file mode 100644
index 1cf871d6..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1,29 +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="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle::_head.html.twig" %}
15 </head>
16 <body>
17 <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
18 {% include "WallabagCoreBundle::_top.html.twig" %}
19 <div id="main">
20 {% block menu %}{% endblock %}
21 {% block precontent %}{% endblock %}
22 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
23 <div id="content" class="w600p center">
24 {% block content %}{% endblock %}
25 </div>
26 </div>
27 {% include "WallabagCoreBundle::_footer.html.twig" %}
28 </body>
29</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
deleted file mode 100644
index 175a4b3a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
1
2<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
3<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
4
5<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
6<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
7
8<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
9<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
10
11<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
12<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
13
14<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
15<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
16
17<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
18<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
19
20<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
21<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
22
23<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
24<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
25
26<link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
diff --git a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
index 2afdfc3c..2afdfc3c 100644
--- a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
index 527719d5..527719d5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js
index 92719000..92719000 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
deleted file mode 100755
index 382dd5f1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
+++ /dev/null
@@ -1,5 +0,0 @@
1<div id="display-mode">
2 <a href="javascript: void(null);" id="listmode" class="listmode">
3 <img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/blank.png" alt="{% trans "toggle view mode" %}" title="{% trans "toggle view mode" %}" width="16" height="16">
4 </a>
5</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
deleted file mode 100755
index c5c07d49..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
+++ /dev/null
@@ -1,187 +0,0 @@
1{% extends "layout.twig" %}
2
3{% block title %}{% trans "config" %}{% endblock %}
4{% block menu %}
5{% include '_menu.twig' %}
6{% endblock %}
7{% block content %}
8 <h2>{% trans "Saving articles" %}</h2>
9 <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
10 <p>
11 <form method="get" action="index.php">
12 <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
13 <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
14 <input type="submit" value="{% trans "bag it!" %}" />
15 </form>
16 </p>
17 <h3>Browser Plugins</h3>
18 <ul>
19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
20 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
21 </ul>
22 <h3>Mobile Apps</h3>
23 <ul>
24 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
25 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
26 <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
27 </ul>
28 <h3>{% trans "Bookmarklet" %}</h3>
29 <p>
30 {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
31 </p>
32
33 <h2>{% trans "Feeds" %}</h2>
34 {% if token == '' %}
35 <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
36 {% else %}
37 <ul>
38 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
39 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
40 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
41 </ul>
42 <p class="more-info">
43 {% trans "Your token:" %} <strong>{{token}}</strong><br>
44 {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
45 {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
46 </p>
47 {% endif %}
48
49 <h2>{% trans "Change your theme" %}</h2>
50 <form method="post" action="?updatetheme" name="changethemeform">
51 <fieldset class="w500p inline">
52 <div class="row">
53 <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
54 <select class="col" id="theme" name="theme">
55 {% for key, theme in themes %}
56 <option value="{{ key }}" {{ theme.current ? 'selected' : '' }}>{{ theme.name }}</option>
57 {% endfor %}
58 </select>
59 </div>
60 <div class="row mts txtcenter">
61 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
62 </div>
63 </fieldset>
64 <input type="hidden" name="returnurl" value="{{ referer }}">
65 <input type="hidden" name="token" value="{{ token }}">
66 </form>
67
68 <h2>{% trans "Change your language" %}</h2>
69 <form method="post" action="?updatelanguage" name="changelanguageform">
70 <fieldset class="w500p inline">
71 <div class="row">
72 <label class="col w150p" for="language">{% trans "Language:" %}</label>
73 <select class="col" id="language" name="language">
74 {% for language in languages %}
75 <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
76 {% endfor %}
77 </select>
78 </div>
79 <div class="row mts txtcenter">
80 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
81 </div>
82 </fieldset>
83 <input type="hidden" name="returnurl" value="{{ referer }}">
84 <input type="hidden" name="token" value="{{ token }}">
85 </form>
86
87 <h2><a name="import"></a>{% trans "Import" %}</h2>
88 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
89 <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
90 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
91 <fieldset class="w500p">
92 <div class="row">
93 <label class="col w150p" for="file">{% trans "File:" %}</label>
94 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
95 </div>
96 <div class="row mts txtcenter">
97 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
98 </div>
99 </fieldset>
100 </form>
101 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
102 <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
103
104 <h2>{% trans "Export your wallabag data" %}</h2>
105 <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
106 <span class="more-info">Data will be exported in a single JSON file.</span></p>
107
108 <h2>{% trans "Fancy an E-Book ?" %}</h2>
109 <p>{% trans "Click to get all your articles in one ebook :" %}
110 <ul>
111 <li><a href="./?epub&amp;method=all" title="{% trans 'Generate ePub file' %}">ePub 3</a></li>
112 <li><a href="./?mobi&amp;method=all" title="{% trans 'Generate Mobi file' %}">Mobi</a></li>
113 <li><a href="./?pdf&amp;method=all" title="{% trans 'Generate PDF file' %}">PDF</a></li>
114 </ul>
115
116 <span class="more-info">{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
117
118 <h2><a name="cache"></a>{% trans "Cache" %}</h2>
119 <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
120 <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
121
122 {% if http_auth == 0 %}
123 <h2>{% trans "Change your password" %}</h2>
124 <form method="post" action="?config" name="loginform">
125 <fieldset class="w500p">
126 <div class="row">
127 <label class="col w150p" for="password">{% trans "New password:" %}</label>
128 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2">
129 </div>
130 <div class="row">
131 <label class="col w150p" for="password_repeat">{% trans "Repeat your new password:" %}</label>
132 <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="{% trans "Password" %}" tabindex="3">
133 </div>
134 <div class="row mts txtcenter">
135 <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
136 </div>
137 </fieldset>
138 <input type="hidden" name="returnurl" value="{{ referer }}">
139 <input type="hidden" name="token" value="{{ token }}">
140 </form>
141 {% endif %}
142
143 <h2>{% trans 'Add user' %}</h2>
144 <form method="post" action="?newuser">
145 <fieldset class="w500p">
146 <div class="row">
147 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
148 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
149 </div>
150 <div class="row">
151 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
152 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
153 </div>
154 <div class="row">
155 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
156 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
157 </div>
158 <div class="row mts txtcenter">
159 <button type="submit">{% trans "Add user" %}</button>
160 </div>
161 </fieldset>
162 </form>
163
164 <h2>{% trans "Delete account" %}</h2>
165 {% if not only_user %}<form method="post" action="?deluser">
166 <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
167 <fieldset class="w500p">
168 <div class="row">
169 <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
170 <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
171 </div>
172 <div class="row mts txtcenter">
173 <button type="submit">{% trans "Delete account" %}</button>
174 </div>
175 </form>
176 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
177 <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
178
179 <h2>{% trans "Upgrading wallabag" %}</h2>
180 <ul>
181 <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
182 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
183 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
184 </ul>
185 <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
186
187{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
deleted file mode 100755
index 15f15560..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
+++ /dev/null
@@ -1,29 +0,0 @@
1{% extends "layout.twig" %}
2{% block title %}edit tags{% endblock %}
3{% block menu %}
4{% include '_menu.twig' %}
5{% endblock %}
6{% block content %}
7
8<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
9<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
10<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
11
12<div id="article">
13 <h2>{{ entry.title|raw }}</21>
14</div>
15{% if tags is empty %}
16<div class="notags">{% trans "no tags" %}</div>
17{% endif %}
18<ul>
19{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
20</ul>
21<form method="post" action="./?action=add_tag">
22 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
23 <label for="value">{% trans "Add tags:" %}</label><input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
24 <input type="submit" value="Tag" />
25 <p>{% trans "Start typing for auto complete." %}<br>
26 {% trans "You can enter multiple tags, separated by commas." %}</p>
27</form>
28<a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
29{% endblock %}
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 16070c7f..dffea036 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -1,43 +1,17 @@
1<!DOCTYPE html> 1{% extends "WallabagCoreBundle::base.html.twig" %}
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="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15 2
16 <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all"> 3{% block css %}
17 <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all"> 4 {{ parent() }}
18 <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
19 <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
20 <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
21 5
22 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script> 6 <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
23 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script> 7 <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
24 <script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script> 8 <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
25 <script src="{{ asset('themes/baggy/js/init.js') }}"></script> 9 <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
26 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script> 10 <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
27 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script> 11{% endblock %}
28 <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script> 12
29 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script> 13{% block scripts %}
30 </head> 14 {{ parent() }}
31 <body> 15
32 {% include "WallabagCoreBundle::_top.html.twig" %} 16 <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
33 <div id="main"> 17{% endblock %}
34 {% block menu %}{% endblock %}
35 {% block precontent %}{% endblock %}
36 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
37 <div id="content" class="w600p center">
38 {% block content %}{% endblock %}
39 </div>
40 </div>
41 {% include "WallabagCoreBundle::_footer.html.twig" %}
42 </body>
43</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
deleted file mode 100644
index 4a1dc05d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
1{% extends "layout-login.twig" %}
2
3{% block title %}{% trans "login to your wallabag" %}{% endblock %}
4{% block content %}
5 {% if http_auth == 0 %}
6 <form method="post" action="?login" name="loginform">
7 <fieldset class="w500p center">
8 <h2 class="mbs txtcenter">{% trans "Login to wallabag" %}</h2>
9 {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
10 <div class="row">
11 <label class="col w150p" for="login">{% trans "Username" %}</label>
12 <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
13 </div>
14
15 <div class="row">
16 <label class="col w150p" for="password">{% trans "Password" %}</label>
17 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
18 </div>
19 <div class="row">
20
21 <div class="col">
22 <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
23 <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
24 </div>
25 </div>
26 <div class="row mts txtcenter">
27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
28 </div>
29 </fieldset>
30 <input type="hidden" name="returnurl" value="{{ referer }}">
31 <input type="hidden" name="token" value="{{ token }}">
32 </form>
33 {% endif %}
34{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
deleted file mode 100755
index 65930eb2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
+++ /dev/null
@@ -1,13 +0,0 @@
1{% extends "layout.twig" %}
2{% block title %}Tags{% endblock %}
3{% block menu %}
4{% include '_menu.twig' %}
5{% endblock %}
6{% block content %}
7<h2>{% trans "Tags" %}</h2>
8<ul class="list-tags">
9{% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }})
10</li>
11{% endfor %}
12</ul>
13{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
deleted file mode 100644
index 31665e18..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
+++ /dev/null
@@ -1,3 +0,0 @@
1name = Baggy
2description = Responsive black and white theme especially adapted to smartphones.
3requirements[] = default
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 00:50:00 +0000