From: Nicolas Lœuillet Date: Mon, 24 Nov 2014 12:11:57 +0000 (+0100) Subject: failover if theme folder doesn't exist X-Git-Tag: 1.9beta~49^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=85c5a1ff8d919d3d36a8125c9bbd0d9220025729;p=github%2Fwallabag%2Fwallabag.git failover if theme folder doesn't exist --- diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php index 20e9c54a..4d0bfdbb 100644 --- a/inc/poche/Template.class.php +++ b/inc/poche/Template.class.php @@ -24,7 +24,7 @@ class Template extends Twig_Environment $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme')); - if ($themeDirectory === false) { + if ($themeDirectory === false || !is_dir(THEME . '/' . $themeDirectory)) { $themeDirectory = DEFAULT_THEME; } diff --git a/themes/courgette/README.md b/themes/courgette/README.md deleted file mode 100755 index e13d3900..00000000 --- a/themes/courgette/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Courgette Theme - -theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ \ No newline at end of file diff --git a/themes/courgette/_head.twig b/themes/courgette/_head.twig deleted file mode 100755 index 822c73ed..00000000 --- a/themes/courgette/_head.twig +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/courgette/_menu.twig b/themes/courgette/_menu.twig deleted file mode 100755 index 0e37660a..00000000 --- a/themes/courgette/_menu.twig +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig deleted file mode 100755 index 2d41db17..00000000 --- a/themes/courgette/_top.twig +++ /dev/null @@ -1,9 +0,0 @@ -
-

- {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} - {% elseif view == 'fav' %}{{ block('logo') }} Favoris - {% elseif view == 'archive' %}{{ block('logo') }} Archive - {% else %}{{ block('logo') }} - {% endif %} -

-
\ No newline at end of file diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig deleted file mode 100755 index 5234f766..00000000 --- a/themes/courgette/_view.twig +++ /dev/null @@ -1,47 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} -{% block content %} -
- -
-
-
-

{{ entry.title|raw }}

-
-
- {{ content | raw }} -
-
- - -{% endblock %} \ No newline at end of file diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig deleted file mode 100755 index c4933794..00000000 --- a/themes/courgette/config.twig +++ /dev/null @@ -1,125 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "config" %}{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -
-

{% trans "Poching a link" %}

-

{% trans "There are several ways to save an article:" %} (?)

- - -

{% trans "Upgrading wallabag" %}

- - -

{% trans "Change your theme" %}

-
-
-
- - -
-
- -
-
- - -
- -

{% trans "Change your password" %}

-
-
-
- - -
-
- - -
-
- -
-
- - -
- -

{% trans "Import" %}

-

{% trans "Please execute the import script locally, it can take a very long time." %}

-

{% trans "More infos in the official doc:" %} wallabag.org

- - -

{% trans "Export your wallabag data" %}

-

{% trans "Click here" %} {% trans "to export your wallabag data." %}

- -

{% trans "Fancy an E-Book ?" %}

-

{% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} -
{% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

- -

{% trans 'Add user' %}

-

{% trans 'Add a new user :' %}

-
-
-
- - -
-
- - -
-
- - -
-
- -
-
-
- -

{% trans "Delete account" %}

- {% if not only_user %}
-

{% trans "You can delete your account by entering your password and validating." %}
{% trans "Be careful, data will be erased forever (that is a very long time)." %}

-
-
- - -
-
- -
- - {% else %}

{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

{% endif %} -
-{% endblock %} diff --git a/themes/courgette/css/font.css b/themes/courgette/css/font.css deleted file mode 100755 index 849ff85b..00000000 --- a/themes/courgette/css/font.css +++ /dev/null @@ -1,22 +0,0 @@ -@font-face { - font-family: 'fontello'; - src: url('../font/fontello.eot?97381924'); - src: url('../font/fontello.eot?97381924#iefix') format('embedded-opentype'), - url('../font/fontello.woff?97381924') format('woff'), - url('../font/fontello.ttf?97381924') format('truetype'), - url('../font/fontello.svg?97381924#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'icomoon'; - src:url('../font/icomoon.eot?-72nnzw'); - src:url('../font/icomoon.eot?#iefix-72nnzw') format('embedded-opentype'), - url('../font/icomoon.woff?-72nnzw') format('woff'), - url('../font/comoon.ttf?-72nnzw') format('truetype'), - url('../font/icomoon.svg?-72nnzw#icomoon') format('svg'); - font-weight: normal; - font-style: normal; -} - diff --git a/themes/courgette/css/knacss.css b/themes/courgette/css/knacss.css deleted file mode 100755 index e69de29b..00000000 diff --git a/themes/courgette/css/messages.css b/themes/courgette/css/messages.css deleted file mode 100755 index fe6fbbe8..00000000 --- a/themes/courgette/css/messages.css +++ /dev/null @@ -1,75 +0,0 @@ -.messages { - display: block; - clear: both; - width: 400px; - margin: 10px auto 10px; - padding: 10px 0; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.messages a.closeMessage { - display: none; - float: right; - width: 16px; - height: 16px; - margin: -14px -8px 0 0; - background: url(../img/messages/close.png) no-repeat; -} - -/*.messages:hover a.closeMessage { visibility:visible; }*/ - -.messages p { - margin: 3px 0 3px 10px !important; - padding: 0 10px 0 23px !important; - font-size: 14px; - line-height: 16px; -} - -.messages.error { - border: 1px solid #c42608; - color: #c00 !important; - background: #fff0ef; -} - -.messages.error p { - color: #c00 !important; - background: url(../img/messages/cross.png) no-repeat 0 50%; -} - -.messages.success { - border: 1px solid #6dc70c; - background: #e0fbcc; -} - -.messages.success p { - color: #2b6301 !important; - background: url(../img/messages/tick.png) no-repeat 0 50%; -} - -.messages.warning { - border: 1px solid #ebcd41; - color: #000; - background: #fffcd3; -} - -.messages.warning p { - color: #5f4e01; - background: url(../img/messages/warning.png) no-repeat 0 50%; -} - -.messages.information, -.messages.info { - border: 1px solid #82aee7; - background: #dfebfb; -} - -.messages.information p, -.messages.info p { - color: #064393; - background: url(../img/messages/help.png) no-repeat 0 50%; -} - -.messages.information a { - text-decoration: underline; -} \ No newline at end of file diff --git a/themes/courgette/css/print.css b/themes/courgette/css/print.css deleted file mode 100755 index 9aefa779..00000000 --- a/themes/courgette/css/print.css +++ /dev/null @@ -1,48 +0,0 @@ -/* ### Layout ### */ - -body { - font-family: Serif; - background-color: #fff; -} - -@page { - margin: 1cm; -} - -img { - max-width: 100% !important; -} - -/* ### Content ### */ - -/* Hide useless blocks */ -body > header, -#links, -#sort, -body > footer, -.top_link, -div.tools, -header div, -.messages, -.entrie + .results { - display: none !important; -} - -article { - border: none !important; -} - -/* Add URL after links */ -.vieworiginal a:after { - content: " (" attr(href) ")"; -} - -/* Add explanation after abbr */ -abbr[title]:after { - content: " (" attr(title) ")"; -} - -/* Change border on current pager item */ -.pagination span.current { - border-style: dashed; -} diff --git a/themes/courgette/css/style-default.css b/themes/courgette/css/style-default.css deleted file mode 100755 index 297f86ae..00000000 --- a/themes/courgette/css/style-default.css +++ /dev/null @@ -1,63 +0,0 @@ -a.back span { - background-image: url('../img/default/left.png'); -} - -a.top span { - background-image: url('../img/default/top.png'); -} - -a.fav span, -a.fav-off span:hover { - background-image: url('../img/default/star-on.png'); -} - -a.fav span:hover, -a.fav-off span { - background-image: url('../img/default/star-off.png'); -} - -a.archive span, -a.archive-off span:hover { - background-image: url('../img/default/checkmark-on.png'); -} - -a.archive span:hover, -a.archive-off span { - background-image: url('../img/default/checkmark-off.png'); -} - -a.twitter span { - background-image: url('../img/default/twitter.png'); -} - -a.shaarli span { - background-image: url('../img/default/shaarli.png'); -} - -a.flattr span { - background-image: url('../img/default/flattr.png'); -} - -a.carrot span { - background-image: url('../img/default/carrot.png') -} - -a.email span { - background-image: url('../img/default/envelop.png'); -} - -a.delete span { - background-image: url('../img/default/remove.png'); -} - -a.link span { - background-image: url('../img/default/link.png'); -} - -a.bad-display span { - background-image: url('../img/default/bad-display.png'); -} - -a.reading-time span { - background-image: url('../img/default/clock.png'); -} \ No newline at end of file diff --git a/themes/courgette/css/style.css b/themes/courgette/css/style.css deleted file mode 100755 index edd09c78..00000000 --- a/themes/courgette/css/style.css +++ /dev/null @@ -1,684 +0,0 @@ -* { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 10px; - font-family: 'Roboto',Verdana,Geneva,sans-serif; - font-size: 16px; - color: #000; -} - -h1 span { - color #FFF; - background: #000; - display: inline-block; - padding: 0.2em 1em 0.2em 1.2em; - font-size: 0.7em; - position: relative; - top: -1em; - left: -1em; -} - -h1 a { - color: #FFF; - text-decoration: none; -} - -#menu { - font-family: 'fontello'; - position:fixed; - z-index: 11; - top: 0.7em; - right: 0.5em; - border:0; - font-size: 2em; - background: #000; - color:#FFF; - height: 58px; - width: 58px; - line-height:58px; - border-radius:120px; -} - -#menu:hover, #menu:focus { - background: #FFF; - color:#000; - cursor: pointer; -} - -#menu span { - position: absolute; - top: -99999px; -} - -#menuContainer ul, #article_toolbar ul { - position:fixed; - top: 0; - left:0; - width: 100%; - padding: 0; - margin: 0; - text-align:center; - height:80px; -} - -/*Inspired by http://tympanus.net/Tutorials/AnimatedBorderMenus/index.html */ - -#menuContainer, #article_toolbar { - position: fixed; - top: 0; - left:0; - width: 100%; - height: 0; - overflow: hidden; - border-width:0; - border-style: solid; - border-color:#000; - background-color: transparent; - -webkit-transition: border-width 0.3s, background-color 0.3s, height 0s 0.3s; - -moz-transition: border-width 0.3s, background-color 0.3s, height 0s 0.3s; - transition: border-width 0.3s, background-color 0.3s, height 0s 0.3s; -} - -#article_toolbar ul { - padding: 1.7em; -} - -#menuContainer.open, #article_toolbar.open { - border-width:80px; - height: 100%; - background: rgba(0,0,0,0.5); - -webkit-transition: border-width 0.3s, background-color 0.3s; - -moz-transition: border-width 0.3s, background-color 0.3s; - transition: border-width 0.3s, background-color 0.3s; - z-index: 1; -} - -#links li, #article_toolbar li { - list-style: none; - display: inline-block; -} - -#links li a, #article_toolbar a { - color:#FFF; - display: block; - position:relative; - top: -200px; - -webkit-transition: top 0.3s ease; - -moz-transition: top 0.3s ease; - transition: top 0.3s ease; - padding:1.85em 1em; -} - -#links li a { - text-decoration:none; - text-transform:uppercase; -} - -#links li a:hover, #links li a:focus { - background: #FFF; - color:#000; -} - -#menuContainer.open li a, #article_toolbar.open a { - top: 0; - -webkit-transition: top 0.3s ease; - -moz-transition: top 0.3s ease; - transition: top 0.3s ease; - -webkit-transition-delay:0.25ms; - -moz-transition-delay:0.25ms; - transition-delay:0.25ms; -} - -#menuContainer.open li:nth-child(2) a { - -webkit-transition-delay:0.50ms; - -moz-transition-delay:0.50ms; - transition-delay:0.50ms; -} - -#menuContainer.open li:nth-child(3) a { - -webkit-transition-delay:1ms; - -moz-transition-delay:1ms; - transition-delay:1ms; -} - -#menuContainer.open li:nth-child(4) a { - -webkit-transition-delay:1.25ms; - -moz-transition-delay:1.25ms; - transition-delay:1.25ms; -} - -#menuContainer.open li:nth-child(5) a { - -webkit-transition-delay:1.55ms; - -moz-transition-delay:1.55ms; - transition-delay:1.55ms; -} - -#article_toolbar li:nth-child(2) { display: none; } - -#menu:before { - content: "\e801"; - display: block; - text-indent: 0; -} - -body > header { - position: fixed; - top: 0; - left: 1em; - z-index: 10; -} - -#main { - padding:6em; -} - -/* ========================================================================== - entrie - ========================================================================== */ - -.entrie, #article { - width: 45em; - margin: auto; - position:relative; - padding: 0 0 1em 0; - margin-bottom: 1.5em; -} - -#article a { - text-decoration: underline; - color:#000; -} - -#article a:hover, #article a:focus { - text-decoration: none; -} - -.entrie:after { - content:""; - position: absolute; - width: 100%; - height: 4px; - background: #000; - bottom:0; - left: -1em; -} - -.entrie p { - padding:0 0 0 1.5em; -} - -.entrie:before { - content:''; - position: absolute; - top: 0; - left: -1em; - width: 4px; - height: 100%; - background: #000; -} - -.entrie h2:after { - content:""; - display: block; - width: 0; - height: 0; - border-color: #000; - border-width:7px; - border-color:transparent transparent transparent #000; - border-style: solid; - position: absolute; - top: 0.8em; - right: -0.58em; -} - -.entrie h2 { - margin:0; - display: inline-block; - position: relative; - max-width: 78%; -} - -.entrie h2 a { - color:#000; - text-decoration:none; - display: block; - background: #000; - padding: 0.4em 1em; - color:#FFF; - margin-left: -0.5em; - -webkit-transition: all 0.3s ease-out; - -moz-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; -} - -.entrie h2 a:hover, .entrie h2 a:focus { - padding:0.4em 1em 0.4em 2em; -} - -ul { - padding:0; - margin:0; -} - -ul li { - list-style: none; -} - -.tools { - display: inline-block; - margin-left: 1em; - vertical-align: top; - padding-top: 1em; -} - -.tools a span { - position:absolute; - top: -99999px; -} - -.tools li { - display: inline-block; -} - -.tools a { - display: block; - color:#FFF; - background: #000; - text-decoration:none; - height: 1.5em; - width: 1.5em; - text-align: center; - line-height:1.5em; - border-radius: 90px; -} - -.tools a:hover, .tools a:focus { - background: #FFF; - color:#000; -} - -.tools a:before { display: block; font-family: 'icomoon'; } - - -.fav-off:before, .fav:before { content: '\e805'; } /* '' */ -.archive-off:before, .archive:before { content: '\e804'; } /* '' */ -.tools .archive, .tools .fav { - background: #FFF; - color:#000; -} -.link:before { content: '\e801'; } /* '' */ -.delete:before { content: '\e80c'; } /* '' */ -.reading-time:before { content: '\e803'; } /* '' */ - -#article_toolbar a:before { - display: block; - font-family: 'icomoon'; -} - -#article_toolbar a { - display: block; - color:#000; - background: #FFF; - text-decoration:none; - height: 1.5em; - width: 1.5em; - text-align: center; - line-height:1.5em; - border-radius: 90px; - padding: 0; -} - -#article_toolbar a:hover, #article_toolbar a:focus { - background: #000; - color:#FFF; -} - -#article_toolbar span { - position: absolute; - top: -99999px; -} - -.email:before { content: '\e80a'; } /* '' */ -.icon-check:before { content: '\e804'; } /* '' */ -.back:before { content: '\e806'; } /* '' */ -.flattr:before { content: '\e800'; } /* '' */ -.bad-display:before { content: '\e600'; } /* '' */ -.twitter:before { content: '\e807'; } /* '' */ - -#article_toolbar .flattrli { - display: none; -} - -#article_toolbar li { - margin: 0 0 0 1em; -} - - -footer { - position: fixed; - bottom: 0; - width: 100%; - padding: 0 2%; - left: 0; - text-align:right; - font-size: 0.8em; - font-style: italic; - background: rgba(255,255,255,0.5); -} - -footer a { - color:#000; -} - -footer a:hover,footer a:focus { - text-decoration: none; -} - -footer p:first-child { - float:left; -} - -#loginForm fieldset { - border:5px solid #000; - padding: 1.5em; -} - -fieldset { - border:0; - padding: 0; -} - -#loginForm { - max-width: 25em; - margin: auto; -} - -#loginForm .row { - margin-bottom: 0.5em; -} - -form h2 { - margin-top: 0; -} - -form label { - width: 40%; - display: inline-block; -} - -form input[type="text"], form input[type="password"], form input[type='url'], form select { - border:1px solid #000; - padding:0.5em 1em; -} - -@media screen and (-webkit-min-device-pixel-ratio:0){ - form select{ - -webkit-appearance: none; - background: url(../img/bg-select.png) no-repeat right center; - padding-right: 2.2em; - border-radius: 0; - } -} - -form button, form input[type="submit"] { - background: #000; - color:#FFF; - border:0; - font-size:1em; - padding:0.5em 1em; - margin-top: 1em; - cursor: pointer; -} - -form button:hover, form button:focus, form input[type="submit"]:hover, form input[type="submit"]:focus { - background: #FFF; - color: #000; -} - -/* ========================================================================== - Config - ========================================================================== */ - -#config { - max-width: 60%; - margin: auto; -} - -#config a { - background: #000; - text-decoration: none; - color:#FFF; - padding: 0.2em 1em; -} - -#config .special { - background: none; - padding:0; - color: #000; -} - -#config a:hover, #config a:focus { - background: #FFF; - color:#000; -} - -#config li { - margin-bottom: 1em; -} - -#plainurl { - font-size: 1em; -} - -#config label { - width: 20%; -} - -.results { - max-width: 62.5%; - font-style:italic; - margin: 1em auto 2.5em; -} - -#sort { - max-width: 62.5%; - margin: 0 auto -2.5em; - text-align: right; - border-bottom:1px dotted #000; -} - -#sort li { - display: inline-block; - vertical-align: top; - position: relative; - top: -0.1em; - margin-left: 1em; -} - -#sort li img { - display: none; -} - -#sort a { - display: inline-block; - font-family: 'fontello'; - color:#000; - text-decoration: none; -} - -#sort a:hover, #sort a:focus { - text-decoration: underline; -} - -#sort a:before { - display: block; -} - -#sort li a:first-child:before { - content: '\e809'; -} - -#sort li a:first-child + a:before { - content: '\e80b'; -} - -@media screen and (max-width: 860px) { - .entrie, #article { - width: 30em; - } -} - -@media screen and (max-width: 650px) { - #menuContainer ul, #article_toolbar ul { - width: 120px; - height: 100%; - } - - body > header { - position: static; - } - - #main { - padding: 0 0.5em 6em; - } - - #menu { - display: none; - } - - #main:before { - content:none; - } - - #menuContainer, #article_toolbar, #menuContainer ul, #article_toolbar ul { - position: static; - width: 100%; - height: auto; - } - - #links li a, #article_toolbar a { - position: static; - color: #000; - } - - #links li a { - padding: 1em; - min-width: 120px; - text-align: left; - } - - #article_toolbar li { - margin-bottom: 1em; - margin-left: 0.5em; - } - -} - -@media screen and (max-width: 500px) { - .entrie, #article { - width: 17em; - } - .entrie h2 { - width: 100%; - max-width: none; - } - .entrie h2 a:hover, .entrie h2 a:focus { - padding-left: 1em; - background: #FFF; - color: #000; - } - .entrie h2:after { - content:none; - } - - .messages { - width: 100%!important; - } - - #sort { - margin: 3em auto 0; - max-width: none; - text-align: center; - } - #config { - margin: 7em auto 0; - max-width: none; - } - #config label { width: 100%; } - .results { - max-width: none; - margin-bottom: 1em; - } - - footer p:first-child { - float: none; - } - footer { - position:static; - } -} - - -.w600p { - width: 70%; - margin: auto; -} - -.tagForm { - margin: 1em 0; -} - -.tagForm p { - font-style: italic; - margin: 0; - font-size: 0.8em; - color: #999; -} - -.tagForm label { - width: auto; - margin-right: 1em; -} - -.back:before { - font-family: "icomoon"; -} - -.back.link { - color: #000; - text-decoration: none; -} - -.back.link:before { - margin-right: 0.5em; -} - -.tag-list a { - color: #000; - text-decoration: none; -} - -.tag-list li { - display: inline-block; - margin-right: 1em; -} - -a:hover { - text-decoration: underline; -} - -.tag { - background: #000; - color: #FFF; - padding: 0.5em 1em; - text-decoration: none; -} - -.tag:hover, .tag:focus { - background: #FFF; - color: #000; -} \ No newline at end of file diff --git a/themes/courgette/edit-tags.twig b/themes/courgette/edit-tags.twig deleted file mode 100644 index bcddbe46..00000000 --- a/themes/courgette/edit-tags.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}edit tags{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -{% if tags is empty %} -no tags -{% endif %} - -
- -

{% trans "You can enter multiple tags, separated by commas." %}

- - -
-{% trans "return to article" %} -{% endblock %} diff --git a/themes/courgette/error.twig b/themes/courgette/error.twig deleted file mode 100755 index 4d4db1f3..00000000 --- a/themes/courgette/error.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{% trans "plop" %}{% endblock %} -{% block content %} - {{ msg|raw }} -

Don't forget the documentation.

-{% endblock %} \ No newline at end of file diff --git a/themes/courgette/font/icomoon.eot b/themes/courgette/font/icomoon.eot deleted file mode 100755 index ff2d109d..00000000 Binary files a/themes/courgette/font/icomoon.eot and /dev/null differ diff --git a/themes/courgette/font/icomoon.svg b/themes/courgette/font/icomoon.svg deleted file mode 100755 index 8968452d..00000000 --- a/themes/courgette/font/icomoon.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/themes/courgette/font/icomoon.ttf b/themes/courgette/font/icomoon.ttf deleted file mode 100755 index 52463a87..00000000 Binary files a/themes/courgette/font/icomoon.ttf and /dev/null differ diff --git a/themes/courgette/font/icomoon.woff b/themes/courgette/font/icomoon.woff deleted file mode 100755 index ddb96f29..00000000 Binary files a/themes/courgette/font/icomoon.woff and /dev/null differ diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig deleted file mode 100755 index ff27db43..00000000 --- a/themes/courgette/home.twig +++ /dev/null @@ -1,64 +0,0 @@ -{% extends "layout.twig" %} -{% block title %} -{% if view == 'fav' %} -{% trans "favoris" %} -{% elseif view == 'archive' %} -{% trans "archive" %} -{% else %} -{% trans "unread" %} -{% endif %} -{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block precontent %} - {% if entries|length > 1 %} - - {% endif %} -{% endblock %} -{% block content %} - {% if entries is empty %} -

{% trans "No link available here!" %}

- {% else %} - {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
- {{ page_links | raw }} -
- {% elseif nb_results == 1 %} - {% if searchterm is defined %} -
-
{% trans "Only one result found for " %} « {{ searchterm }} »
-
- {% endif %} - {% endif %} - {% endblock %} - {% for entry in entries %} -
-

{{ entry.title|raw }}

- -

{{ entry.content|striptags|slice(0, 300) }}...

-
- {% endfor %} - - {{ block('pager') }} - - {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %} - - {% if tag %}{% trans "Download the articles from this tag in an epub" %} - {% elseif searchterm is defined %}{% trans "Download the articles from this search in an epub" %} - {% else %}{% trans "Download the articles from this category in an epub" %}{% endif %} - - {% endif %} - -{% endblock %} diff --git a/themes/courgette/img/bg-select.png b/themes/courgette/img/bg-select.png deleted file mode 100644 index 3a77d0eb..00000000 Binary files a/themes/courgette/img/bg-select.png and /dev/null differ diff --git a/themes/courgette/img/default/backtotop.png b/themes/courgette/img/default/backtotop.png deleted file mode 100755 index 051238ef..00000000 Binary files a/themes/courgette/img/default/backtotop.png and /dev/null differ diff --git a/themes/courgette/img/default/bad-display.png b/themes/courgette/img/default/bad-display.png deleted file mode 100755 index 6866799f..00000000 Binary files a/themes/courgette/img/default/bad-display.png and /dev/null differ diff --git a/themes/courgette/img/default/carrot.png b/themes/courgette/img/default/carrot.png deleted file mode 100644 index 5fc17273..00000000 Binary files a/themes/courgette/img/default/carrot.png and /dev/null differ diff --git a/themes/courgette/img/default/checkmark-off.png b/themes/courgette/img/default/checkmark-off.png deleted file mode 100755 index 3db5a06d..00000000 Binary files a/themes/courgette/img/default/checkmark-off.png and /dev/null differ diff --git a/themes/courgette/img/default/checkmark-on.png b/themes/courgette/img/default/checkmark-on.png deleted file mode 100755 index cd3abb2c..00000000 Binary files a/themes/courgette/img/default/checkmark-on.png and /dev/null differ diff --git a/themes/courgette/img/default/clock.png b/themes/courgette/img/default/clock.png deleted file mode 100755 index 6164e92b..00000000 Binary files a/themes/courgette/img/default/clock.png and /dev/null differ diff --git a/themes/courgette/img/default/down.png b/themes/courgette/img/default/down.png deleted file mode 100755 index b9d536a7..00000000 Binary files a/themes/courgette/img/default/down.png and /dev/null differ diff --git a/themes/courgette/img/default/envelop.png b/themes/courgette/img/default/envelop.png deleted file mode 100755 index 6be1c886..00000000 Binary files a/themes/courgette/img/default/envelop.png and /dev/null differ diff --git a/themes/courgette/img/default/flattr.png b/themes/courgette/img/default/flattr.png deleted file mode 100755 index 0404aaea..00000000 Binary files a/themes/courgette/img/default/flattr.png and /dev/null differ diff --git a/themes/courgette/img/default/left.png b/themes/courgette/img/default/left.png deleted file mode 100755 index a0a53631..00000000 Binary files a/themes/courgette/img/default/left.png and /dev/null differ diff --git a/themes/courgette/img/default/link.png b/themes/courgette/img/default/link.png deleted file mode 100755 index db62819d..00000000 Binary files a/themes/courgette/img/default/link.png and /dev/null differ diff --git a/themes/courgette/img/default/remove.png b/themes/courgette/img/default/remove.png deleted file mode 100755 index f8ad56a3..00000000 Binary files a/themes/courgette/img/default/remove.png and /dev/null differ diff --git a/themes/courgette/img/default/shaarli.png b/themes/courgette/img/default/shaarli.png deleted file mode 100755 index 1eb30f60..00000000 Binary files a/themes/courgette/img/default/shaarli.png and /dev/null differ diff --git a/themes/courgette/img/default/star-off.png b/themes/courgette/img/default/star-off.png deleted file mode 100755 index 6a0133a7..00000000 Binary files a/themes/courgette/img/default/star-off.png and /dev/null differ diff --git a/themes/courgette/img/default/star-on.png b/themes/courgette/img/default/star-on.png deleted file mode 100755 index a9f96eaa..00000000 Binary files a/themes/courgette/img/default/star-on.png and /dev/null differ diff --git a/themes/courgette/img/default/top.png b/themes/courgette/img/default/top.png deleted file mode 100755 index 954a8c0a..00000000 Binary files a/themes/courgette/img/default/top.png and /dev/null differ diff --git a/themes/courgette/img/default/twitter.png b/themes/courgette/img/default/twitter.png deleted file mode 100755 index cfcfe419..00000000 Binary files a/themes/courgette/img/default/twitter.png and /dev/null differ diff --git a/themes/courgette/img/logo.png b/themes/courgette/img/logo.png deleted file mode 100755 index 5305c77d..00000000 Binary files a/themes/courgette/img/logo.png and /dev/null differ diff --git a/themes/courgette/img/logo.svg b/themes/courgette/img/logo.svg deleted file mode 100644 index 865da440..00000000 --- a/themes/courgette/img/logo.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/themes/courgette/img/messages/close.png b/themes/courgette/img/messages/close.png deleted file mode 100755 index 731aa018..00000000 Binary files a/themes/courgette/img/messages/close.png and /dev/null differ diff --git a/themes/courgette/img/messages/cross.png b/themes/courgette/img/messages/cross.png deleted file mode 100755 index 1514d51a..00000000 Binary files a/themes/courgette/img/messages/cross.png and /dev/null differ diff --git a/themes/courgette/img/messages/help.png b/themes/courgette/img/messages/help.png deleted file mode 100755 index 5c870176..00000000 Binary files a/themes/courgette/img/messages/help.png and /dev/null differ diff --git a/themes/courgette/img/messages/tick.png b/themes/courgette/img/messages/tick.png deleted file mode 100755 index a9925a06..00000000 Binary files a/themes/courgette/img/messages/tick.png and /dev/null differ diff --git a/themes/courgette/img/messages/warning.png b/themes/courgette/img/messages/warning.png deleted file mode 100755 index 628cf2da..00000000 Binary files a/themes/courgette/img/messages/warning.png and /dev/null differ diff --git a/themes/courgette/js/init.js b/themes/courgette/js/init.js deleted file mode 100755 index dca83906..00000000 --- a/themes/courgette/js/init.js +++ /dev/null @@ -1,6 +0,0 @@ -$.fn.ready(function () { - $('#menu').on('click', function(){ - $('body').toggleClass('menuOpen'); - $('#menuContainer, #article_toolbar').toggleClass('open'); - }); -}) \ No newline at end of file diff --git a/themes/courgette/js/restoreScroll.js b/themes/courgette/js/restoreScroll.js deleted file mode 100755 index 331c9e19..00000000 --- a/themes/courgette/js/restoreScroll.js +++ /dev/null @@ -1,25 +0,0 @@ -function supportsLocalStorage() { - try { - return 'localStorage' in window && window['localStorage'] !== null; - } catch (e) { - return false; - } -} - -function savePercent(id, percent) { - if (!supportsLocalStorage()) { return false; } - localStorage["poche.article." + id + ".percent"] = percent; - return true; -} - -function retrievePercent(id) { - if (!supportsLocalStorage()) { return false; } - - var bheight = $(document).height(); - var percent = localStorage["poche.article." + id + ".percent"]; - var scroll = bheight * percent; - - $('html,body').animate({scrollTop: scroll}, 'fast'); - - return true; -} \ No newline at end of file diff --git a/themes/courgette/layout.twig b/themes/courgette/layout.twig deleted file mode 100755 index 57c2cc98..00000000 --- a/themes/courgette/layout.twig +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - {% block title %}{% endblock %} - wallabag -{% include '_head.twig' %} -{% include '_bookmarklet.twig' %} - - - {% include '_top.twig' %} -
- - {% block menu %}{% endblock %} - {% block precontent %}{% endblock %} - {% block messages %} - {% include '_messages.twig' %} - {% endblock %} -
- {% block content %}{% endblock %} -
-
-{% include '_footer.twig' %} - - \ No newline at end of file diff --git a/themes/courgette/login.twig b/themes/courgette/login.twig deleted file mode 100755 index 1fec0fc9..00000000 --- a/themes/courgette/login.twig +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "login to your wallabag" %}{% endblock %} -{% block content %} -
-
-

{% trans "login to your wallabag" %}

- {% if constant('MODE_DEMO') == 1 %}

{% trans "you are in demo mode, some features may be disabled." %}

{% endif %} -
- - -
- -
- - -
-
- -
- - {% trans "(Do not check on public computers)" %} -
-
-
- -
-
- - -
-{% endblock %} \ No newline at end of file diff --git a/themes/courgette/screenshot.jpg b/themes/courgette/screenshot.jpg deleted file mode 100755 index 44ee4b63..00000000 Binary files a/themes/courgette/screenshot.jpg and /dev/null differ diff --git a/themes/courgette/tags.twig b/themes/courgette/tags.twig deleted file mode 100755 index b11dce28..00000000 --- a/themes/courgette/tags.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}tags{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -{% for tag in tags %}{{ tag.value }} {% if token != '' %}{% endif %} {% endfor %} -{% endblock %} \ No newline at end of file diff --git a/themes/courgette/theme.ini b/themes/courgette/theme.ini deleted file mode 100644 index 996d171f..00000000 --- a/themes/courgette/theme.ini +++ /dev/null @@ -1,3 +0,0 @@ -name = Courgette -description = Responsive black and white theme especially adapted to smartphones. -requirements[] = default