From: Nicolas Lœuillet Date: Mon, 2 Mar 2015 20:23:19 +0000 (+0100) Subject: Merge pull request #1132 from wallabag/v2-theme X-Git-Tag: 2.0.0-alpha.0~75 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ba7b9d48d407f87690a3fdc199b37714d2a52897;hp=fca3c757233940cbe4c431e3e05fe74893225fe0;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1132 from wallabag/v2-theme V2 theme --- diff --git a/.gitignore b/.gitignore index 3fbe668c..72e5ffad 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,4 @@ # Data for wallabag data/assets/* -data/db/poche*.sqlite +data/db/wallabag*.sqlite diff --git a/app/AppKernel.php b/app/AppKernel.php index fe61b255..d134de3c 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -21,6 +21,7 @@ class AppKernel extends Kernel new JMS\SerializerBundle\JMSSerializerBundle(), new Nelmio\ApiDocBundle\NelmioApiDocBundle(), new Nelmio\CorsBundle\NelmioCorsBundle(), + new Liip\ThemeBundle\LiipThemeBundle(), new Wallabag\CoreBundle\WallabagCoreBundle() ); diff --git a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig b/app/Resources/views/.gitkeep similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/_messages.html.twig rename to app/Resources/views/.gitkeep diff --git a/app/Resources/views/baggy/_display-mode.twig b/app/Resources/views/baggy/_display-mode.twig deleted file mode 100755 index 382dd5f1..00000000 --- a/app/Resources/views/baggy/_display-mode.twig +++ /dev/null @@ -1,5 +0,0 @@ -

- -

diff --git a/app/Resources/views/baggy/_head.twig b/app/Resources/views/baggy/_head.twig deleted file mode 100755 index a88d4186..00000000 --- a/app/Resources/views/baggy/_head.twig +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/Resources/views/baggy/_menu.twig b/app/Resources/views/baggy/_menu.twig deleted file mode 100644 index 8b80f65d..00000000 --- a/app/Resources/views/baggy/_menu.twig +++ /dev/null @@ -1,17 +0,0 @@ - -

{% trans "unread" %}
{% trans "favorites" %}
{% trans "archive" %}
{% trans "tags" %}
{% trans "save a link" %} - {% include '_pocheit-form.twig' %} -
{% trans "search" %} - {% include '_search-form.twig' %} -
{% trans "config" %}
{% trans "about" %}
{% trans "logout" %}

- diff --git a/app/Resources/views/baggy/_pocheit-form.twig b/app/Resources/views/baggy/_pocheit-form.twig deleted file mode 100755 index bf2ae903..00000000 --- a/app/Resources/views/baggy/_pocheit-form.twig +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/app/Resources/views/baggy/_search-form.twig b/app/Resources/views/baggy/_search-form.twig deleted file mode 100644 index 73f7951f..00000000 --- a/app/Resources/views/baggy/_search-form.twig +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app/Resources/views/baggy/_top.twig b/app/Resources/views/baggy/_top.twig deleted file mode 100755 index a31c0925..00000000 --- a/app/Resources/views/baggy/_top.twig +++ /dev/null @@ -1,7 +0,0 @@ -

- {% if view == 'home' %}{% block logo %}{% endblock %} - {% else %}{{ block('logo') }} - {% endif %} -

diff --git a/app/Resources/views/baggy/about.twig b/app/Resources/views/baggy/about.twig deleted file mode 100755 index d18fe156..00000000 --- a/app/Resources/views/baggy/about.twig +++ /dev/null @@ -1,84 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "About" %}{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

{% trans "About wallabag" %}

- -

{% trans "Project website" %}: https://www.wallabag.org
{% trans "Main developer" %}: Nicolas LÅuillet â {% trans "website" %}
{% trans "Contributors:" %}: {% trans "on Github" %}
{% trans "Bug reports" %}: {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
{% trans "License" %}: MIT
{% trans "Version" %}: {{ constant('WALLABAG') }}

- -

{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

- -

{% trans "Getting help" %}

- -

{% trans "Documentation" %}: Offline documentation and online documentation (up to date)
{% trans "Support" %}: http://support.wallabag.org/

- -

{% trans "Helping wallabag" %}

- -

{% trans "wallabag is free and opensource. You can help us:" %}

- -

{% trans "via Paypal" %}
{% trans "via Flattr" %}

- -

{% trans "Credits" %}

PHP Readability: https://bitbucket.org/fivefilters/php-readability
Full Text RSS: http://code.fivefilters.org/full-text-rss/src
logo by Maylis Agniel: https://github.com/wallabag/logo
icons: http://icomoon.io
PHP Simple HTML DOM Parser: http://simplehtmldom.sourceforge.net/
Session: https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
Twig: http://twig.sensiolabs.org
Flash messages: https://github.com/plasticbrain/PHP-Flash-Messages
Pagination: https://github.com/daveismyname/pagination
PHPePub: https://github.com/Grandt/PHPePub/

-{% endblock %} diff --git a/app/Resources/views/baggy/config.twig b/app/Resources/views/baggy/config.twig deleted file mode 100755 index 6031f489..00000000 --- a/app/Resources/views/baggy/config.twig +++ /dev/null @@ -1,187 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "config" %}{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

{% trans "Saving articles" %}

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

Browser Plugins

Mobile Apps

Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
iOS: {% trans "download the application" %}
Windows Phone: {% trans "download the application" %}

{% trans "Bookmarklet" %}

- {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} -

- -

{% trans "Feeds" %}

- {% if token == '' %} -

{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." %}

- {% else %} -

- {% trans "Your token:" %} {{token}}
- {% trans "Your user id:" %} {{user_id}}
- {% trans "You can regenerate your token: generate!." %} -

- {% endif %} - -

{% trans "Change your theme" %}

- - -

{% trans "Change your language" %}

- - -

{% trans "Import" %}

{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

{% 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." %}

- -

{% trans "You can click here to fetch content for articles with no content." %}

{% 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)." %}

- -

{% trans "Export your wallabag data" %}

{% trans "Export JSON" %}
- Data will be exported in a single JSON file.

- -

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

{% trans "Click to get all your articles in one ebook :" %} -

ePub 3
Mobi
PDF

- - {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

- -

{% trans "Cache" %}

{% trans "Delete Cache" %}
- Deleting the cache may help with display or other problems.

- - {% if http_auth == 0 %} -

{% trans "Change your password" %}

- - {% endif %} - -

{% trans 'Add 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)." %}

- {% trans "Type here your password" %} - -

- -

- - {% 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 %} - -

{% trans "Upgrading wallabag" %}

{% trans "Installed version" %}: {{ constant('WALLABAG') }}
{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}{% trans "A more recent stable version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})
{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}{% trans "A more recent development version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}

{% trans "You can clear cache to check the latest release." %}

- -{% endblock %} diff --git a/app/Resources/views/baggy/edit-tags.twig b/app/Resources/views/baggy/edit-tags.twig deleted file mode 100755 index 15f15560..00000000 --- a/app/Resources/views/baggy/edit-tags.twig +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}edit tags{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} - - - - - -

{{ entry.title|raw }} -

-{% if tags is empty %} -

{% trans "no tags" %}

-{% endif %} -

{{ tag.value }} â

- -{% trans "return to article" %} -{% endblock %} diff --git a/app/Resources/views/baggy/home.twig b/app/Resources/views/baggy/home.twig deleted file mode 100755 index 93515080..00000000 --- a/app/Resources/views/baggy/home.twig +++ /dev/null @@ -1,81 +0,0 @@ -{% extends "layout.twig" %} -{% block title %} -{% if view == 'fav' %} -{% trans "favorites" %} -{% elseif view == 'archive' %} -{% trans "archive" %} -{% else %} -{% trans "unread" %} -{% endif %} -{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -

- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -

- {% block pager %} - {% if nb_results > 1 %} -

{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for Â« {{ search_term }} Â»{% endtrans %}{% endif %}

- {{ page_links | raw }} -

- {% elseif nb_results == 1 %} - {% if search_term is defined %} -

{% trans "Only one result found for " %} Â« {{ search_term }} Â»

- {% endif %} - {% endif %} - {% endblock %} -

- {% for entry in entries %} -

- {% if entry.content| getReadingTime > 0 %} -

{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min

- {% else %} -

{% trans "estimated reading time :" %} < 1 min

- {% endif %} -

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

- - {% endfor %} -

- {{ block('pager') }} - {% if view == 'home' %}{% if nb_results > 1 %}

{% trans "Mark all the entries as read" %}

- {% 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/app/Resources/views/baggy/layout.twig b/app/Resources/views/baggy/layout.twig deleted file mode 100755 index 8de12749..00000000 --- a/app/Resources/views/baggy/layout.twig +++ /dev/null @@ -1,34 +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' %} - {% if includeImport %} - {% include '_import.twig' %} - {% endif %} - {% endblock %} -

- {% block content %}{% endblock %} -

-{% include '_footer.twig' %} - - \ No newline at end of file diff --git a/app/Resources/views/baggy/login.twig b/app/Resources/views/baggy/login.twig deleted file mode 100644 index 58290e9c..00000000 --- a/app/Resources/views/baggy/login.twig +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "layout-login.twig" %} - -{% block title %}{% trans "login to your wallabag" %}{% endblock %} -{% block content %} - {% if http_auth == 0 %} - - {% endif %} -{% endblock %} diff --git a/app/Resources/views/baggy/tags.twig b/app/Resources/views/baggy/tags.twig deleted file mode 100755 index 65930eb2..00000000 --- a/app/Resources/views/baggy/tags.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}Tags{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

{% trans "Tags" %}

- -{% endblock %} diff --git a/app/Resources/views/baggy/theme.ini b/app/Resources/views/baggy/theme.ini deleted file mode 100644 index 31665e18..00000000 --- a/app/Resources/views/baggy/theme.ini +++ /dev/null @@ -1,3 +0,0 @@ -name = Baggy -description = Responsive black and white theme especially adapted to smartphones. -requirements[] = default diff --git a/app/Resources/views/baggy/view.twig b/app/Resources/views/baggy/view.twig deleted file mode 100755 index 1afd9df6..00000000 --- a/app/Resources/views/baggy/view.twig +++ /dev/null @@ -1,102 +0,0 @@ -{% extends "layout.twig" %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} -{% block content %} - {% include '_highlight.twig' %} -

{% trans "Back to top" %}
{{ entry.url | e | getDomain }}
{% trans "Toggle mark as read" %}
{% trans "Toggle favorite" %}
{% trans "Delete" %}
{% trans "Tweet" %}
{% trans "Email" %}
{% trans "shaarli" %}
{% trans "diaspora" %}
{% trans "flattr" %}
{% trans "flattr" %} ({{ flattr.numFlattrs }})
Carrot
{% trans "Print" %}
EPUB
MOBI
PDF
{% trans "Does this article appear wrong?" %}

- -

- {{ content | raw }} -

- - -{% endblock %} diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig deleted file mode 100644 index bafd28d3..00000000 --- a/app/Resources/views/base.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - diff --git a/app/Resources/views/dark/README.md b/app/Resources/views/dark/README.md deleted file mode 100644 index 92077994..00000000 --- a/app/Resources/views/dark/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# dark theme - -theme created by Nicolas LÅuillet aka nico_somb \ No newline at end of file diff --git a/app/Resources/views/dark/public/css/style-dark.css b/app/Resources/views/dark/public/css/style-dark.css deleted file mode 100644 index 41782c48..00000000 --- a/app/Resources/views/dark/public/css/style-dark.css +++ /dev/null @@ -1,74 +0,0 @@ -body { - color: #d4d4d4; - background-color: #262627; -} - -a, -a:hover, -a:visited { - color: #d4d4d4; -} - -a.back span { - background-image: url('../img/dark/left.png'); -} - -a.top span { - background-image: url('../img/dark/top.png'); -} - -a.fav span, -a.fav-off span:hover { - background-image: url('../img/dark/star-on.png'); -} - -a.fav span:hover, -a.fav-off span { - background-image: url('../img/dark/star-off.png'); -} - -a.archive span, -a.archive-off span:hover { - background-image: url('../img/dark/checkmark-on.png'); -} - -a.archive span:hover, -a.archive-off span { - background-image: url('../img/dark/checkmark-off.png'); -} - -a.twitter span { - background-image: url('../img/dark/twitter.png'); -} - -a.shaarli span { - background-image: url('../img/dark/shaarli.png'); -} - -a.flattr span { - background-image: url('../img/dark/flattr.png'); -} - -a.email span { - background-image: url('../img/dark/envelop.png'); -} - -a.delete span { - background-image: url('../img/dark/remove.png'); -} - -a.link span { - background-image: url('../img/dark/link.png'); -} - -a.bad-display span { - background-image: url('../img/dark/bad-display.png'); -} - -.pagination a { - color: #aaa; -} - -#article_toolbar { - background: #262627; -} \ No newline at end of file diff --git a/app/Resources/views/dark/public/img/dark/backtotop.png b/app/Resources/views/dark/public/img/dark/backtotop.png deleted file mode 100644 index c885086d..00000000 Binary files a/app/Resources/views/dark/public/img/dark/backtotop.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/bad-display.png b/app/Resources/views/dark/public/img/dark/bad-display.png deleted file mode 100644 index 66ea2e16..00000000 Binary files a/app/Resources/views/dark/public/img/dark/bad-display.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/checkmark-off.png b/app/Resources/views/dark/public/img/dark/checkmark-off.png deleted file mode 100644 index 661ea997..00000000 Binary files a/app/Resources/views/dark/public/img/dark/checkmark-off.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/checkmark-on.png b/app/Resources/views/dark/public/img/dark/checkmark-on.png deleted file mode 100644 index 5ee8c8d3..00000000 Binary files a/app/Resources/views/dark/public/img/dark/checkmark-on.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/down.png b/app/Resources/views/dark/public/img/dark/down.png deleted file mode 100644 index 4150e17c..00000000 Binary files a/app/Resources/views/dark/public/img/dark/down.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/envelop.png b/app/Resources/views/dark/public/img/dark/envelop.png deleted file mode 100644 index 73d9b0b9..00000000 Binary files a/app/Resources/views/dark/public/img/dark/envelop.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/flattr.png b/app/Resources/views/dark/public/img/dark/flattr.png deleted file mode 100644 index b457d080..00000000 Binary files a/app/Resources/views/dark/public/img/dark/flattr.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/left.png b/app/Resources/views/dark/public/img/dark/left.png deleted file mode 100644 index c2f7a20e..00000000 Binary files a/app/Resources/views/dark/public/img/dark/left.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/link.png b/app/Resources/views/dark/public/img/dark/link.png deleted file mode 100644 index a5b8d8d2..00000000 Binary files a/app/Resources/views/dark/public/img/dark/link.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/remove.png b/app/Resources/views/dark/public/img/dark/remove.png deleted file mode 100644 index 0c3dcfdf..00000000 Binary files a/app/Resources/views/dark/public/img/dark/remove.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/rss.png b/app/Resources/views/dark/public/img/dark/rss.png deleted file mode 100644 index 21bad1a1..00000000 Binary files a/app/Resources/views/dark/public/img/dark/rss.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/shaarli.png b/app/Resources/views/dark/public/img/dark/shaarli.png deleted file mode 100644 index e68ac8b5..00000000 Binary files a/app/Resources/views/dark/public/img/dark/shaarli.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/star-off.png b/app/Resources/views/dark/public/img/dark/star-off.png deleted file mode 100644 index 8194bc2d..00000000 Binary files a/app/Resources/views/dark/public/img/dark/star-off.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/star-on.png b/app/Resources/views/dark/public/img/dark/star-on.png deleted file mode 100644 index 109c3aec..00000000 Binary files a/app/Resources/views/dark/public/img/dark/star-on.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/top.png b/app/Resources/views/dark/public/img/dark/top.png deleted file mode 100644 index d137bd24..00000000 Binary files a/app/Resources/views/dark/public/img/dark/top.png and /dev/null differ diff --git a/app/Resources/views/dark/public/img/dark/twitter.png b/app/Resources/views/dark/public/img/dark/twitter.png deleted file mode 100644 index 6ce8a4d9..00000000 Binary files a/app/Resources/views/dark/public/img/dark/twitter.png and /dev/null differ diff --git a/app/Resources/views/dark/public/public b/app/Resources/views/dark/public/public deleted file mode 120000 index fd316b37..00000000 --- a/app/Resources/views/dark/public/public +++ /dev/null @@ -1 +0,0 @@ -../../themes/default/public \ No newline at end of file diff --git a/app/Resources/views/dark/screenshot.jpg b/app/Resources/views/dark/screenshot.jpg deleted file mode 100644 index daaad6c9..00000000 Binary files a/app/Resources/views/dark/screenshot.jpg and /dev/null differ diff --git a/app/Resources/views/dark/theme.ini b/app/Resources/views/dark/theme.ini deleted file mode 100644 index 4b020d36..00000000 --- a/app/Resources/views/dark/theme.ini +++ /dev/null @@ -1,2 +0,0 @@ -name = Dark -requirements[] = default diff --git a/app/Resources/views/default/_bookmarklet.twig b/app/Resources/views/default/_bookmarklet.twig deleted file mode 100644 index 61996353..00000000 --- a/app/Resources/views/default/_bookmarklet.twig +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/app/Resources/views/default/_footer.twig b/app/Resources/views/default/_footer.twig deleted file mode 100644 index 213a4aca..00000000 --- a/app/Resources/views/default/_footer.twig +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/app/Resources/views/default/_head.twig b/app/Resources/views/default/_head.twig deleted file mode 100755 index 277e3833..00000000 --- a/app/Resources/views/default/_head.twig +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/Resources/views/default/_highlight.twig b/app/Resources/views/default/_highlight.twig deleted file mode 100755 index cdb7c6bf..00000000 --- a/app/Resources/views/default/_highlight.twig +++ /dev/null @@ -1,4 +0,0 @@ - {# include excelent highlight.js library for code highligting, see http://highlightjs.org/ #} - - - diff --git a/app/Resources/views/default/_import.twig b/app/Resources/views/default/_import.twig deleted file mode 100755 index c59b7a15..00000000 --- a/app/Resources/views/default/_import.twig +++ /dev/null @@ -1,15 +0,0 @@ - -

{% trans "Download required for " %} {{ import.recordsDownloadRequired }} {% trans "records" %}.

{% trans "Downloading next " %} {{ import.recordsUnderDownload }} {% trans "articles, please wait" %}...

diff --git a/app/Resources/views/default/_menu.twig b/app/Resources/views/default/_menu.twig deleted file mode 100644 index eedf84f1..00000000 --- a/app/Resources/views/default/_menu.twig +++ /dev/null @@ -1,14 +0,0 @@ -

- {% include '_pocheit-form.twig' %} - {% include '_search-form.twig' %} - diff --git a/app/Resources/views/default/_messages.twig b/app/Resources/views/default/_messages.twig deleted file mode 100644 index 679aa098..00000000 --- a/app/Resources/views/default/_messages.twig +++ /dev/null @@ -1 +0,0 @@ - {{ messages | raw }} \ No newline at end of file diff --git a/app/Resources/views/default/_pocheit-form.twig b/app/Resources/views/default/_pocheit-form.twig deleted file mode 100755 index 8c982db0..00000000 --- a/app/Resources/views/default/_pocheit-form.twig +++ /dev/null @@ -1,8 +0,0 @@ -

- - -

diff --git a/app/Resources/views/default/_search-form.twig b/app/Resources/views/default/_search-form.twig deleted file mode 100755 index 0cf6097a..00000000 --- a/app/Resources/views/default/_search-form.twig +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app/Resources/views/default/_sorting.twig b/app/Resources/views/default/_sorting.twig deleted file mode 100755 index 3ce9b949..00000000 --- a/app/Resources/views/default/_sorting.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% if entries|length > 1 %} -

{% trans "by date" %}
{% trans "by title" %}

-{% endif %} diff --git a/app/Resources/views/default/_top.twig b/app/Resources/views/default/_top.twig deleted file mode 100755 index 45806f01..00000000 --- a/app/Resources/views/default/_top.twig +++ /dev/null @@ -1,7 +0,0 @@ -

- {% if view == 'home' %}{% block logo %}{% endblock %} - {% else %}{{ block('logo') }} - {% endif %} -

diff --git a/app/Resources/views/default/about.twig b/app/Resources/views/default/about.twig deleted file mode 100755 index 50ffd8ef..00000000 --- a/app/Resources/views/default/about.twig +++ /dev/null @@ -1,74 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "About wallabag" %}{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

{% trans "About wallabag" %}

- -

{% trans "Project website" %}: http://www.wallabag.org
{% trans "Main developer" %}: Nicolas LÅuillet â {% trans "website" %}
{% trans "Contributors:" %}: {% trans "on Github" %}
{% trans "Bug reports" %}: {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
{% trans "License" %}: MIT
{% trans "Version" %}: {{ constant('WALLABAG') }}

- -

{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

- -

{% trans "Helping wallabag" %}

- -

{% trans "wallabag is free and opensource. You can help us:" %}

- -

{% trans "via Paypal" %}
{% trans "via Flattr" %}

- -

{% trans "Credits" %}

PHP Readability: https://bitbucket.org/fivefilters/php-readability
Full Text RSS: http://code.fivefilters.org/full-text-rss/src
logo by Maylis Agniel: https://github.com/wallabag/logo
icons: http://icomoon.io
PHP Simple HTML DOM Parser: http://simplehtmldom.sourceforge.net/
Session: https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
Twig: http://twig.sensiolabs.org
Flash messages: https://github.com/plasticbrain/PHP-Flash-Messages
Pagination: https://github.com/daveismyname/pagination
PHPePub: https://github.com/Grandt/PHPePub/

-{% endblock %} diff --git a/app/Resources/views/default/config.twig b/app/Resources/views/default/config.twig deleted file mode 100755 index b7d91937..00000000 --- a/app/Resources/views/default/config.twig +++ /dev/null @@ -1,188 +0,0 @@ -{% extends "layout.twig" %} - -{% block title %}{% trans "config" %}{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -