- {% block content %}{% endblock %}
-
- -
-
- {% 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" %} -
- {% if view == 'home' %}{% block logo %}
{% endblock %}
- {% else %}{{ block('logo') }}
- {% endif %}
-
- {% 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 "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/ -
{% 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!." %}
-
{% 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 :" %} -
- - {% 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.
{% trans "Change your password" %}
- - {% endif %} - -{% trans 'Add user' %}
- - -{% trans "Delete account" %}
- {% if not only_user %} - {% 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 }}) - {% if constant('DEBUG_POCHE') == 1 %}
- {% 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 15f15560f..000000000 --- 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 %} - - - - - -
-
-{% if tags is empty %}
-
-{% endif %}
--
-{% for tag in tags %}
- {{ tag.value }} ✘ {% endfor %} -
{% trans "Tag" %}: {{ tag.value }}
- {% endif %} - {% if entries is empty %} - - {% else %} -
- {% include '_display-mode.twig' %}
- {% include '_sorting.twig' %}
-
- {% block pager %}
- {% if nb_results > 1 %}
-
-
- {% elseif nb_results == 1 %}
- {% if search_term is defined %}
- {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}
- {{ page_links | raw }}
-
-
- {% endif %}
- {% endif %}
- {% endblock %}
- {% trans "Only one result found for " %} « {{ search_term }} »
-
- {% for entry in entries %}
-
- {{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}
-
-
- {% endfor %}
- {{ entry.title|raw }}
- {% if entry.content| getReadingTime > 0 %} -{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %}
- {% trans "estimated reading time :" %} < 1 min
- {% endif %}
- -
-
- {% trans "Toggle mark as read" %} -
- {% trans "toggle favorite" %} -
- {% trans "delete" %} -
- {{ entry.url | e | getDomain }} -
{{ entry.content|striptags|slice(0, 300) }}...
-{% trans "Mark all the entries as read" %}
{% endif %}{% endif %} - {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}- - {% if searchterm is defined %}{% trans "Delete results matching" %} {{ searchterm }}{% endif %}
- - {% if tag %}{% trans "Mark all articles from this tag as read" %}
{% endif %} - - {% if tag %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% elseif searchterm is defined %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% else %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% endif %} -{% endif %} -{% endblock %} diff --git a/app/Resources/views/baggy/layout-login.twig b/app/Resources/views/baggy/layout-login.twig deleted file mode 100644 index 4078fbb08..000000000 --- a/app/Resources/views/baggy/layout-login.twig +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - -
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% 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 8de12749f..000000000
--- a/app/Resources/views/baggy/layout.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% if includeImport %}
- {% include '_import.twig' %}
- {% endif %}
- {% 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 58290e9c6..000000000
--- 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/public/css/font.css b/app/Resources/views/baggy/public/css/font.css
deleted file mode 100755
index 7c02a16fb..000000000
--- a/app/Resources/views/baggy/public/css/font.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
- font-family: 'PT Sans';
- font-style: normal;
- font-weight: 700;
- src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
-}
diff --git a/app/Resources/views/baggy/public/css/main.css b/app/Resources/views/baggy/public/css/main.css
deleted file mode 100755
index 1df829101..000000000
--- a/app/Resources/views/baggy/public/css/main.css
+++ /dev/null
@@ -1,1071 +0,0 @@
-/* ==========================================================================
- Sommaire
-
- 1 = Style Guide
- 2 = Layout
- 3 = Pictos
- 4 = Messages
- 5 = Article
- 6 = Media queries
-
- ========================================================================== */
-
-html {
- min-height: 100%;
-}
-
-body {
- background-color: #EEE;
-}
-
-.login {
- background-color: #333;
-}
-
-.login #main {
- padding: 0;
- margin: 0;
-}
-
-.login form {
- background-color: #FFF;
- padding: 1.5em;
- box-shadow: 0 1px 8px rgba(0,0,0,0.9);
- width: 20em;
- position: absolute;
- top: 8em;
- left: 50%;
- margin-left: -10em;
-}
-
-.login .logo {
- position: absolute;
- top: 2em;
- left: 50%;
- margin-left: -55px;
-}
-
-/* ==========================================================================
- 1 = Style Guide
- ========================================================================== */
-
-::selection {
- color: #FFF;
- background-color: #000;
-}
-
-.desktopHide {
- display: none;
-}
-
-.logo {
- position: fixed;
- z-index: 20;
- top: 0.4em;
- left: 0.6em;
-}
-
-h2, h3, h4 {
- font-family: 'PT Sans', sans-serif;
- text-transform: uppercase;
-}
-
-p, li, label {
- color: #666;
-}
-
-a {
- color: #000;
- font-weight: bold;
-}
-
-a:hover, a:focus {
- text-decoration: none;
-}
-
-form fieldset {
- border:0;
- padding: 0;
- margin: 0;
-}
-
-form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
- border: 1px solid #999;
- padding: 0.5em 1em;
- min-width: 12em;
- color: #666;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0){
- select{
- -webkit-appearance: none;
- border-radius: 0;
- background: #FFF url(../img/bg-select.png) no-repeat right center;
- }
-}
-
-.inline .row {
- display: inline-block;
- margin-right: 0.5em;
-}
-
-.inline label {
- min-width: 6em;
-}
-
-fieldset label {
- display: inline-block;
- min-width: 12.5em;
- color: #666;
-}
-
-label {
- margin-right: 0.5em;
-}
-
-form .row {
- margin-bottom: 0.5em;
-}
-
-form button, input[type="submit"] {
- cursor:pointer;
- background-color: #000;
- color: #FFF;
- border:0;
- padding: 0.5em 1em;
- display: inline-block;
- border:1px solid #000;
-}
-
- form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus {
- background-color: #FFF;
- color: #000;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
- }
-
-#bookmarklet {
- cursor: move;
-}
-
-h2:after {
- content: "";
- height: 4px;
- width: 70px;
- background-color: #000;
- display: block;
-}
-
-.links {
- padding: 0;
- margin: 0;
-}
- .links li {
- list-style: none;
- margin: 0;
- padding: 0;
- }
-
-
-#links {
- position: fixed;
- top: 0;
- width: 10em;
- left: 0;
- text-align: right;
- background-color: #333;
- padding-top: 9.5em;
- height: 100%;
- box-shadow:inset -4px 0 20px rgba(0,0,0,0.6);
- z-index: 15;
-}
-
-#main {
- margin-left: 13em;
- position: relative;
- z-index: 10;
- padding-right: 5%;
- padding-bottom: 1em;
-}
-
- #links > li > a {
- display: block;
- padding: 0.5em 2em 0.5em 1em;
- color: #FFF;
- position: relative;
- text-transform: uppercase;
- text-decoration: none;
- font-weight: normal;
- font-family: 'PT Sans', sans-serif;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
- }
-
- #links > li > a:hover, #links > li > a:focus {
- background-color: #999;
- color: #000;
- }
-
- #links .current:after {
- content: "";
- width: 0;
- height: 0;
- position: absolute;
- border-style: solid;
- border-width: 10px;
- border-color: transparent #EEE transparent transparent;
- right: 0;
- top: 50%;
- margin-top: -10px;
- }
-
- #links li:last-child {
- position: fixed;
- bottom: 1em;
- width: 10em;
- }
-
- #links li:last-child a:before {
- font-size: 1.2em;
- position: relative;
- top: 2px;
- }
-
-
-#sort {
- padding: 0;
- list-style-type: none;
- opacity: 0.5;
- display: inline-block;
-}
-
-#sort li {
- display: inline;
- font-size: 0.9em;
-}
-
-#sort li + li {
- margin-left: 10px;
-}
-
-#sort a {
- padding: 2px 2px 0;
- vertical-align: middle;
-}
-
-#sort img {
- vertical-align: baseline;
-}
-#sort img:hover {
- cursor: pointer;
-}
-
-#display-mode {
- float: right;
- vertical-align: middle;
- margin-top: 10px;
- margin-bottom: 10px;
- opacity: 0.5;
-}
-#listmode {
- width: 16px;
- display: inline-block;
- text-decoration: none;
-}
-#listmode a:hover {
- opacity: 1;
-}
-#listmode.tablemode {
- background-image: url("../img/baggy/table.png");
- background-repeat: no-repeat;
- background-position: bottom;
-}
-#listmode.listmode {
- background-image: url("../img/baggy/list.png");
- background-repeat: no-repeat;
- background-position: bottom;
-}
-
-
-/* ==========================================================================
- 2 = Layout
- ========================================================================== */
-
-#content {
- margin-top: 5em;
- min-height: 30em;
-}
-
-footer {
- text-align: right;
- position: relative;
- bottom: 0;
- right: 5em;
- color: #999;
- font-size: 0.8em;
- font-style: italic;
- z-index: 20;
-}
-
-footer a {
- color: #999;
- font-weight: normal;
-}
-
-.list-entries {
- letter-spacing:-5px;
-}
-
-.listmode .entrie {
- width: 100%!important;
- margin-left: 0!important;
-}
-
-.list-entries + .results {
- margin-bottom: 2em;
-}
-
-.estimatedTime .reading-time {
- color: #999;
- font-style: italic;
- font-weight: normal;
- font-size: 0.9em;
-}
-
-.estimatedTime small {
- position: relative;
- top: -1px;
-}
-
-.entrie {
- background-color: #FFF;
- letter-spacing:normal;
- box-shadow: 0 3px 7px rgba(0,0,0,0.3);
- display: inline-block;
- width: 32%;
- margin-bottom: 1.5em;
- vertical-align: top;
- margin-left: 1.5%;
- position: relative;
- overflow: hidden;
- padding: 1.5em 1.5em 3em 1.5em;
-
- /* Removing CSS transitions because they make the switch from list view to
- * table view jerky
- */
- /* -webkit-transition: all 0.5s ease; */
- /* -moz-transition: all 0.5s ease; */
- /* -ms-transition: all 0.5s ease; */
- /* -o-transition: all 0.5s ease; */
- /* transition: all 0.5s ease; */
-}
-
-.entrie:before {
- content: "";
- width: 0;
- height: 0;
- border-style:solid;
- border-color: transparent transparent #000 transparent;
- border-width: 10px;
- position: absolute;
- bottom: 0.3em;
- z-index: 10;
- right: 1.5em;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
-.entrie:after {
- content: "";
- position: absolute;
- height: 7px;
- width: 100%;
- bottom: 0;
- left: 0;
- background-color: #000;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
-.entrie:hover {
- box-shadow: 0 3px 10px rgba(0,0,0,1);
-}
-
-.entrie:hover:after {
- height: 40px;
-}
-
-.entrie:hover:before {
- bottom: 2.4em;
-}
-
-.entrie:hover h2 a {
- color: #666;
-}
-
-.entrie h2 {
- text-transform: none;
- margin-bottom: 0;
- line-height: 1.2;
-}
-
- .entrie h2:after {
- content: none;
- }
-
-
-.entrie h2 a {
- display: block;
- text-decoration: none;
- color: #000;
- word-wrap: break-word;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-/*
-.entrie h2 a:after {
- content: "";
- position: absolute;
- top: 0;
- width: 100%;
- height: 100%;
- left: 0;
-}
-*/
-
-.entrie p {
- color: #666;
- font-size: 0.9em;
- line-height: 1.7;
-}
-
- .entrie h2 a:first-letter {
- text-transform: uppercase;
- }
-
-.entrie:hover .tools {
- bottom: 0;
-}
-
-.entrie .tools {
- position: absolute;
- bottom: -50px;
- left: 0;
- width: 100%;
- z-index: 10;
- padding-right: 0.5em;
- text-align: right;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
- .entrie .tools a {
- color: #666;
- text-decoration: none;
- display: block;
- padding: 0.4em;
- }
-
- .entrie .tools a:hover {
- color: #FFF;
- }
-
- .entrie .tools li {
- display: inline-block;
- }
-
-.entrie:nth-child(3n+1) {
- margin-left: 0;
-}
-
-.results {
- letter-spacing: -5px;
- padding: 0 0 0.5em;
-}
-
-.results > * {
- display: inline-block;
- vertical-align: top;
- letter-spacing: normal;
- width: 50%;
-}
-
-.pagination {
- text-align: right;
- margin-bottom:50px;
-}
-
-.nb-results {
- text-align: left;
- font-style: italic;
- color: #999;
-}
-
-.pagination > * {
- display: inline-block;
- margin-left: 0.5em;
-}
-
-.pagination a {
- color: #999;
- text-decoration: none;
-}
-
- .pagination a:hover, .pagination a:focus {
- text-decoration: underline;
- }
-
-.pagination .disabled {
- display: none;
-}
-
-/* ==========================================================================
- 2.1 = "save a link" related styles
- ========================================================================== */
-
-.popup-form {
- background: rgba(0,0,0,0.5);
- position: absolute;
- top: 0;
- left: 10em;
- z-index: 20;
- height: 100%;
- width: 100%;
- margin: 0;
- margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
- padding: 2em;
- display: none;
- border-left: 1px #EEE solid;
-}
-
- .popup-form form {
- background-color: #FFF;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 20;
- border: 10px solid #000;
- width: 400px;
- height: 200px;
- padding: 2em;
- }
-
-#bagit-form-form .addurl {
- margin-left: 0;
-}
-
-.closeMessage,
-.close-button {
- background-color: #000;
- color: #FFF;
- font-size: 1.2em;
- line-height: 1.6;
- width: 1.6em;
- height: 1.6em;
- text-align: center;
- text-decoration: none;
-}
- .closeMessage:hover,
- .closeMessage:focus,
- .close-button:hover,
- .close-button:focus {
- background-color: #999;
- color: #000;
- }
-
-.close-button--popup {
- display: inline-block;
- position: absolute;
- top: 0;
- right: 0;
- font-size: 1.4em;
-}
-
-.active-current {
- background-color: #999;
-}
-
-.active-current:after {
- content: "";
- width: 0;
- height: 0;
- position: absolute;
- border-style: solid;
- border-width: 10px;
- border-color: transparent #EEE transparent transparent;
- right: 0;
- top: 50%;
- margin-top: -10px;
-}
-
-.opacity03 {
- opacity: 0.3;
-}
-
-.add-to-wallabag-link-after {
- background-color: #000;
- color: #fff;
- padding: 0 3px 2px 3px;
-}
-
-a.add-to-wallabag-link-after {
- visibility: hidden;
- position: absolute;
- opacity: 0;
- transition-duration: 2s;
- transition-timing-function: ease-out;
-}
-
-#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
- opacity: 1;
- visibility: visible;
- transition-duration: .3s;
- transition-timing-function: ease-in;
-}
-
-a.add-to-wallabag-link-after:after {
- content: "w";
-}
-
-#add-link-result {
- font-weight: bold;
- font-size: 0.9em;
-}
-
-/* ==========================================================================
- 3 = Pictos
- ========================================================================== */
-
-@font-face {
- font-family: 'icomoon';
- src:url('../fonts/icomoon.eot?-s0mcsx');
- src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
- url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
- url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
- url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-.icon span,
-.icon-image span {
- position: absolute;
- top: -9999px;
-}
-
-[class^="icon-"]:before, [class*=" icon-"]:before {
- font-family: 'icomoon';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
-
- /* Better Font Rendering =========== */
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-flattr:before {
- content: "\e800";
-}
-.icon-mail:before {
- content: "\e80a";
-}
-.icon-up-open:before {
- content: "\e80b";
-}
-.icon-star:before {
- content: "\e805";
-}
-.icon-check:before {
- content: "\e804";
-}
-.icon-link:before {
- content: "\e801";
-}
-.icon-reply:before {
- content: "\e806";
-}
-.icon-menu:before {
- content: "\e802";
-}
-.icon-clock:before {
- content: "\e803";
-}
-.icon-twitter:before {
- content: "\e807";
-}
-.icon-down-open:before {
- content: "\e809";
-}
-.icon-trash:before {
- content: "\e80c";
-}
-.icon-delete:before {
- content: "\e600";
-}
-.icon-power:before {
- content: "\e601";
-}
-.icon-arrow-up-thick:before {
- content: "\e602";
-}
-.icon-rss:before {
- content: "\e808";
-}
-.icon-print:before {
- content: "\e80d";
-}
-
-
-/* .icon-image class, for image-based icons
- ========================================================================== */
-
-.icon-image {
- background-size: 16px 16px;
- background-repeat: no-repeat;
- background-position: center;
- padding-right: 1em !important;
- padding-left: 1em !important;
-}
-
-/* Carrot (http://carrot.org) */
-.icon-image--carrot {
- background-image: url('../../_global/img/icons/carrot-icon--white.png');
-}
-
-/* Diaspora */
-.icon-image--diaspora {
- background-image: url('../../_global/img/icons/diaspora-icon--black.png');
-}}
-
-/* ==========================================================================
- Icon selected
- ========================================================================== */
-
-.icon-star.fav:before {
- color: #FFF;
-}
-
-.icon-check.archive:before {
- color: #FFF;
-}
-
-/* ==========================================================================
- 4 = Messages
- ========================================================================== */
-
-.messages {
- text-align: left;
- margin-top: 1em;
-}
-
-.messages > * { display: inline-block;}
-
-.warning {
- /* font-size: 3em;
- color: #999;
- font-style: italic;
- position: absolute;
- top: 50%;
- left: 0;
- width: 100%;
- text-align: center;
- padding-right: 5%;
- margin-top: -2em;*/
- font-weight: bold;
- display: block;
- width: 100%;
-}
-
-.more-info {
- font-size: 0.85em;
- line-height: 1.5;
- color: #aaa;
-}
-
- .more-info a {
- color: #aaa;
- }
-
-/* ==========================================================================
- 5 = Article
- ========================================================================== */
-
-#article {
- width: 70%;
- margin-bottom: 3em;
- text-align: justify;
-}
-
-#article .tags {
- margin-bottom: 1em;
-}
-
-#article i {
- font-style: normal;
-}
-
-blockquote {
- border:1px solid #999;
- background-color: #FFF;
- padding: 1em;
- margin: 0;
-}
-
-#article h1 {
- text-align: left;
-}
-
-#article h2, #article h3, #article h4 {
- text-transform: none;
-}
-
-#article h2:after {
- content: none;
-}
-
-.topPosF {
- position: fixed;
- right: 20%;
- bottom: 2em;
- font-size: 1.5em;
-}
-
-#article_toolbar {
- margin-bottom: 1em;
-}
-
-#article_toolbar li {
- display: inline-block;
-}
-
-#article_toolbar a {
- background-color: #000;
- padding: 0.3em 0.5em 0.2em;
- color: #FFF;
- text-decoration: none;
-}
-
- #article_toolbar a:hover, #article_toolbar a:focus {
- background-color: #999;
- }
-
-.shaarli:before {
- content: "*";
-}
-
-.return {
- text-decoration: none;
- margin-top: 1em;
- display: block;
-}
-
-.return:before {
- margin-right: 0.5em;
-}
-
-.notags {
- font-style: italic;
- color: #999;
-}
-
-.icon-rss {
- background-color: #000;
- color: #FFF;
- padding: 0.2em 0.5em;
-}
-
-.icon-rss:before {
- position: relative;
- top: 2px;
-}
-
-.list-tags li {
- margin-bottom: 0.5em;
-}
-
-.list-tags .icon-rss:hover, .list-tags .icon-rss:focus {
- background-color: #FFF;
- color: #000;
- text-decoration: none;
-}
-
-.list-tags a {
- text-decoration: none;
-}
-
-.list-tags a:hover, .list-tags a:focus {
- text-decoration: underline;
-}
-
-pre code {
- font-family: "Courier New", Courier, monospace;
- border: 1px solid #ccc;
- font-size: 0.96em;
-}
-
-
-/* ==========================================================================
- 6 = Media Queries
- ========================================================================== */
-
-@media screen and (max-width: 1050px) {
- .entrie {
- width: 49%;
- }
- .entrie:nth-child(3n+1) {
- margin-left: 1.5%;
- }
- .entrie:nth-child(2n+1) {
- margin-left: 0;
- }
-}
-
-@media screen and (max-width: 900px) {
- #article {
- width: 80%;
- }
- .topPosF {
- right: 2.5em;
- }
-}
-
-@media screen and (max-width: 700px) {
- .entrie {
- width: 100%;
- margin-left: 0;
- }
- #display-mode {
- display: none;
- }
-}
-
-@media screen and (max-width: 500px) {
- .entrie {
- width: 100%;
- margin-left: 0;
- }
- body > header {
- background-color: #333;
- position: fixed;
- top: 0;
- width: 100%;
- height: 3em;
- z-index: 11;
- }
- #links li:last-child {
- position: static;
- width: auto;
- }
- #links li:last-child a:before {
- content: none;
- }
- .logo {
- width: 1.25em;
- height: 1.25em;
- left: 0;
- top: 0;
- }
- .login > header {
- position: static;
- }
- .login form {
- width: 100%;
- position: static;
- margin-left: 0;
- }
- .login .logo {
- width: auto;
- height: auto;
- top: 0.5em;
- width: 75px;
- height: 75px;
- margin-left: -37.5px;
- }
- .desktopHide {
- display: block;
- position: fixed;
- z-index: 20;
- top: 0;
- right: 0;
- border:0;
- width: 2.5em;
- height: 2.5em;
- cursor: pointer;
- background-color: #999;
- font-size: 1.2em;
- }
- .desktopHide:hover, .desktopHide:focus {
- background-color: #FFF;
- }
- #links {
- display: none;
- width: 100%;
- height: auto;
- padding-top: 3em;
- }
- #links.menu--open {
- display: block;
- }
- footer {
- position: static;
- margin-right: 3em;
- }
- #main {
- margin-left: 1.5em;
- padding-right: 1.5em;
- position: static;
- margin-top: 3em;
- }
- #article_toolbar .topPosF {
- display: none;
- }
-
- #article {
- width: 100%;
- }
-
- #article h1 {
- font-size: 1.5em;
- }
- #article_toolbar a {
- padding: 0.3em 0.4em 0.2em;
- }
-
- #display-mode {
- display: none;
- }
-
- .popup-form, #bagit-form, #search-form {
- left: 0;
- width: 100%;
- border-left: none;
- }
-
- .popup-form form,
- #bagit-form form,
- #search-form form {
- width: 100%;
- }
-}
diff --git a/app/Resources/views/baggy/public/css/messages.css b/app/Resources/views/baggy/public/css/messages.css
deleted file mode 100755
index 42da70b30..000000000
--- a/app/Resources/views/baggy/public/css/messages.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.messages.error.install {
- border: 1px solid #c42608;
- color: #c00 !important;
- background: #fff0ef;
- text-align: left;
-}
-
-.messages.notice.install {
- border: 1px solid #ebcd41;
- color: #000;
- background: #fffcd3;
- text-align: left;
-}
-
-.messages.success.install {
- border: 1px solid #6dc70c;
- background: #e0fbcc !important;
- text-align: left;
-}
\ No newline at end of file
diff --git a/app/Resources/views/baggy/public/css/print.css b/app/Resources/views/baggy/public/css/print.css
deleted file mode 100755
index 9dd6d295c..000000000
--- a/app/Resources/views/baggy/public/css/print.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ### Layout ### */
-
-body {
- font-family: Serif;
- background-color: #fff;
-}
-
-@page {
- margin: 1cm;
-}
-
-img {
- max-width: 100% !important;
-}
-
-/* ### Content ### */
-
-/* Hide useless blocks */
-body > header,
-#article_toolbar,
-#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;
-}
-
-#main {
- width: 100%;
- padding: 0;
- margin: 0;
- margin-left: 0;
- padding-right: 0;
- padding-bottom: 0;
-}
-
-#article {
- width: 100%;
-}
diff --git a/app/Resources/views/baggy/public/css/ratatouille.css b/app/Resources/views/baggy/public/css/ratatouille.css
deleted file mode 100644
index b203cbb89..000000000
--- a/app/Resources/views/baggy/public/css/ratatouille.css
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- Ratatouille mini Framework css by Thomas LEBEAU
- Base on KNACSS => www.KNACSS.com (2013-10) @author: Raphael Goetter, Alsacreations
- and normalize.css
-*/
-
-* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-html {
- font-family: sans-serif; /* 1 */
- -ms-text-size-adjust: 100%; /* 2 */
- -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-body {
- font-size: 1em;
- line-height:1.5;
- margin: 0;
-}
-
-/* ==========================================================================
- Mise en forme
- ========================================================================== */
-
-h1:first-child,
-h2:first-child,
-h3:first-child,
-h4:first-child,
-h5:first-child,
-h6:first-child,
-p:first-child,
-ul:first-child,
-ol:first-child,
-dl:first-child{
- margin-top: 0;
-}
-
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, serif;
-}
-
-pre {
- white-space: pre-wrap;
-}
-
-
-.upper {
- text-transform: uppercase;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.inner {
- margin: 0 auto;
- max-width: 61.25em;/*980px*/
-}
-
-table, img {
- max-width: 100%;
- height :auto;
-}
-
-iframe {
- max-width: 100%;
-}
-
-.fl {
- float: left;
-}
-
-.fr {
- float: right;
-}
-
-table {
- border-collapse: collapse;
-}
-
-figure {
- margin: 0;
-}
-
-button,
-input,
-select,
-textarea {
- font-family: inherit;
- font-size: 100%;
- margin: 0;
-}
-
-input[type="search"] {
- -webkit-appearance: textfield;
-}
-
-/* ==========================================================================
- Mise en page
- ========================================================================== */
-
-.dib {
- display: inline-block;
- vertical-align: middle;
-}
-
-.dnone {
- display: none;
-}
-
-.dtable { display:table }
-
- .dtable > * { display:table-row; }
-
- .dtable > * > * { display:table-cell; }
-
-.element-invisible {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
-}
-
-.small {
- font-size:0.8em;
-}
-
-.big {
- font-size: 1.2em;
-}
-
-/*Width*/
-
-.w100 { width:100%; }
-.w90 { width:90%; }
-.w80 { width:80%; }
-.w70 { width:70%; }
-.w60 { width:60%; }
-.w50 { width:50%; }
-.w40 { width:40%; }
-.w30 { width:30%; }
-.w20 { width:20%; }
-.w10 { width:10%; }
-
-
-/* ==========================================================================
- Internet Explorer
- ========================================================================== */
-
-/*IE8 and IE9*/
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
- display: block;
-}
-
-/*IE8 and IE9*/
-
-audio,
-canvas,
-video {
- display: inline-block;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0){
- select{
- -webkit-appearance: none;
- border-radius: 0;
- }
-}
-
-/* ==========================================================================
- Medias Queries
- ========================================================================== */
-
-/*Desktop 1080px*/
-
-@media screen and (max-width: 67.50em) {
-}
-
-/*Tablet 800px*/
-
-@media screen and (max-width: 50em) {
-}
-
-/*Mobile 640px*/
-
-@media screen and (max-width: 40em) {
-}
-
diff --git a/app/Resources/views/baggy/public/fonts/icomoon.eot b/app/Resources/views/baggy/public/fonts/icomoon.eot
deleted file mode 100644
index 563235166..000000000
Binary files a/app/Resources/views/baggy/public/fonts/icomoon.eot and /dev/null differ
diff --git a/app/Resources/views/baggy/public/fonts/icomoon.svg b/app/Resources/views/baggy/public/fonts/icomoon.svg
deleted file mode 100644
index b45861363..000000000
--- a/app/Resources/views/baggy/public/fonts/icomoon.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/Resources/views/baggy/public/fonts/icomoon.ttf b/app/Resources/views/baggy/public/fonts/icomoon.ttf
deleted file mode 100644
index bb1f21f88..000000000
Binary files a/app/Resources/views/baggy/public/fonts/icomoon.ttf and /dev/null differ
diff --git a/app/Resources/views/baggy/public/fonts/icomoon.woff b/app/Resources/views/baggy/public/fonts/icomoon.woff
deleted file mode 100644
index bab137795..000000000
Binary files a/app/Resources/views/baggy/public/fonts/icomoon.woff and /dev/null differ
diff --git a/app/Resources/views/baggy/public/fonts/ptsans.woff b/app/Resources/views/baggy/public/fonts/ptsans.woff
deleted file mode 100644
index cf7c62e10..000000000
Binary files a/app/Resources/views/baggy/public/fonts/ptsans.woff and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/baggy/blank.png b/app/Resources/views/baggy/public/img/baggy/blank.png
deleted file mode 100755
index 63e09844e..000000000
Binary files a/app/Resources/views/baggy/public/img/baggy/blank.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/baggy/down.png b/app/Resources/views/baggy/public/img/baggy/down.png
deleted file mode 100644
index b9d536a7c..000000000
Binary files a/app/Resources/views/baggy/public/img/baggy/down.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/baggy/list.png b/app/Resources/views/baggy/public/img/baggy/list.png
deleted file mode 100755
index bd5aff5ae..000000000
Binary files a/app/Resources/views/baggy/public/img/baggy/list.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/baggy/table.png b/app/Resources/views/baggy/public/img/baggy/table.png
deleted file mode 100755
index 859c4cd8f..000000000
Binary files a/app/Resources/views/baggy/public/img/baggy/table.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/baggy/top.png b/app/Resources/views/baggy/public/img/baggy/top.png
deleted file mode 100644
index 954a8c0ac..000000000
Binary files a/app/Resources/views/baggy/public/img/baggy/top.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/bg-select.png b/app/Resources/views/baggy/public/img/bg-select.png
deleted file mode 100644
index 951204412..000000000
Binary files a/app/Resources/views/baggy/public/img/bg-select.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/logo-other_themes.png b/app/Resources/views/baggy/public/img/logo-other_themes.png
deleted file mode 100755
index 32543a449..000000000
Binary files a/app/Resources/views/baggy/public/img/logo-other_themes.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/logo-w.png b/app/Resources/views/baggy/public/img/logo-w.png
deleted file mode 100755
index 65dc607b7..000000000
Binary files a/app/Resources/views/baggy/public/img/logo-w.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/logo-wallabag.svg b/app/Resources/views/baggy/public/img/logo-wallabag.svg
deleted file mode 100644
index 40193e1c5..000000000
--- a/app/Resources/views/baggy/public/img/logo-wallabag.svg
+++ /dev/null
@@ -1,300 +0,0 @@
-
-
-
-]>
-
diff --git a/app/Resources/views/baggy/public/img/logo.png b/app/Resources/views/baggy/public/img/logo.png
deleted file mode 100755
index 5305c77da..000000000
Binary files a/app/Resources/views/baggy/public/img/logo.png and /dev/null differ
diff --git a/app/Resources/views/baggy/public/img/logo.svg b/app/Resources/views/baggy/public/img/logo.svg
deleted file mode 100644
index 865da440d..000000000
--- a/app/Resources/views/baggy/public/img/logo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/app/Resources/views/baggy/public/js/init.js b/app/Resources/views/baggy/public/js/init.js
deleted file mode 100755
index 74cbae683..000000000
--- a/app/Resources/views/baggy/public/js/init.js
+++ /dev/null
@@ -1,51 +0,0 @@
-$.fn.ready(function() {
-
- var $listmode = $('#listmode'),
- $listentries = $("#list-entries");
-
- /* ==========================================================================
- Menu
- ========================================================================== */
-
- $("#menu").click(function(){
- $("#links").toggleClass('menu--open');
- if ($('#content').hasClass('opacity03')) {
- $('#content').removeClass('opacity03');
- }
- });
-
- /* ==========================================================================
- List mode or Table Mode
- ========================================================================== */
-
- $listmode.click(function(){
- if ( $.cookie("listmode") == 1 ) {
- // Cookie
- $.removeCookie("listmode");
-
- $listentries.removeClass("listmode");
- $listmode.removeClass("tablemode");
- $listmode.addClass("listmode");
- }
- else {
- // Cookie
- $.cookie("listmode", 1, {expires: 365});
-
- $listentries.addClass("listmode");
- $listmode.removeClass("listmode");
- $listmode.addClass("tablemode");
- }
-
- });
-
- /* ==========================================================================
- Cookie listmode
- ========================================================================== */
-
- if ( $.cookie("listmode") == 1 ) {
- $listentries.addClass("listmode");
- $listmode.removeClass("listmode");
- $listmode.addClass("tablemode");
- }
-
-});
diff --git a/app/Resources/views/baggy/public/js/restoreScroll.js b/app/Resources/views/baggy/public/js/restoreScroll.js
deleted file mode 100644
index 331c9e196..000000000
--- a/app/Resources/views/baggy/public/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/app/Resources/views/baggy/screenshot.jpg b/app/Resources/views/baggy/screenshot.jpg
deleted file mode 100755
index 19cd24bb3..000000000
Binary files a/app/Resources/views/baggy/screenshot.jpg and /dev/null differ
diff --git a/app/Resources/views/baggy/tags.twig b/app/Resources/views/baggy/tags.twig
deleted file mode 100755
index 65930eb25..000000000
--- 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 %}
-
- {% block content %}{% endblock %}
-
- {% trans "Tags" %}
- -{% endblock %} diff --git a/app/Resources/views/baggy/theme.ini b/app/Resources/views/baggy/theme.ini deleted file mode 100644 index 31665e18e..000000000 --- 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 1afd9df6a..000000000 --- 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" %} - {% if constant('SHARE_TWITTER') == 1 %}
- {% trans "Tweet" %} {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
- {% trans "Email" %} {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
- {% trans "shaarli" %} {% endif %} - {% if constant('SHARE_DIASPORA') == 1 %}
- {% trans "diaspora" %} {% endif %} - {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
- {% trans "flattr" %} {% elseif flattr.status == constant('FLATTRED') %}
- {% trans "flattr" %} ({{ flattr.numFlattrs }}) {% endif %}{% endif %} - {% if constant('CARROT') == 1 %}
- Carrot {% endif %} - {% if constant('SHOW_PRINTLINK') == 1 %}
- {% trans "Print" %} {% endif %} - {% if constant('EPUB') == 1 %}
- EPUB {% endif %} - {% if constant('MOBI') == 1 %}
- MOBI {% endif %} - {% if constant('PDF') == 1 %}
- {% 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 bafd28d3b..000000000
--- a/app/Resources/views/base.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- {{ entry.title|raw }}
--
-
- {% trans "unread" %} -
- {% trans "favorites" %} -
- {% trans "archive" %} -
- {% trans "tags" %} -
- {% trans "save a link" %} -
- {% trans "search" %} -
- {% trans "config" %} -
- {% trans "about" %} -
- {% trans "logout" %} -
-
-
{% trans "by date" %} 
- - {% trans "by title" %}
-
- {% if view == 'home' %}{% block logo %}
{% endblock %}
- {% else %}{{ block('logo') }}
- {% endif %}
-
- {% 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 "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/ -
{% 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!." %}
-
{% 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 :" %} -
- - - {% 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.
{% trans "Change your password" %}
- - {% endif %} - -{% trans 'Add user' %}
- - -{% trans "Delete account" %}
- {% if not only_user %} - {% 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 }}) - {% if constant('DEBUG_POCHE') == 1 %}
- {% 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/default/edit-tags.twig b/app/Resources/views/default/edit-tags.twig deleted file mode 100755 index c29427e0a..000000000 --- a/app/Resources/views/default/edit-tags.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}edit tags{% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} - - - - - -
-
-
-
-
-{% if tags is empty %}
-{% trans "no tags" %}
-{% endif %}
-{{ entry.title|raw }}
--
-{% for tag in tags %}
- {{ tag.value }} ✘ {% endfor %} -
-« {% trans "return to article" %} -{% endblock %} diff --git a/app/Resources/views/default/error.twig b/app/Resources/views/default/error.twig deleted file mode 100644 index 528a09858..000000000 --- a/app/Resources/views/default/error.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{% trans "plop" %}{% endblock %} -{% block content %} -
Errors
--
- {% for message in msg %}
-
- {{message}} - {% endfor %} -
Don't forget the documentation.
-- {% trans "You can check your configuration here." %} -
-{% endblock %} diff --git a/app/Resources/views/default/export.twig b/app/Resources/views/default/export.twig deleted file mode 100644 index 4adb95402..000000000 --- a/app/Resources/views/default/export.twig +++ /dev/null @@ -1 +0,0 @@ -{{ export }} \ No newline at end of file diff --git a/app/Resources/views/default/home.twig b/app/Resources/views/default/home.twig deleted file mode 100755 index b90005598..000000000 --- a/app/Resources/views/default/home.twig +++ /dev/null @@ -1,82 +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 %} - -{% include '_sorting.twig' %} -{% endblock %} -{% block content %} - - {% if includeImport %} - {% include '_import.twig' %} - {% endif %} - - {% if tag %} -{% trans "Tag" %}: {{ tag.value }}
- {% endif %} - - {% if entries is empty %} - - {% else %} - {% block pager %} - {% if nb_results > 1 %} -
-
- {% elseif nb_results == 1 %}
- {% if searchterm is defined %}
- {{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
- {{ page_links | raw }}
-
-
- {% endif %}
- {% endif %}
- {% endblock %}
- {% for entry in entries %}
- {% trans "Only one result found for " %} « {{ searchterm }} »
-
-
- {% endfor %}
-
- {{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}{{ entry.title|raw }}
--
-
- {% trans "Toggle mark as read" %} -
- {% trans "toggle favorite" %} -
- {% trans "delete" %} -
- {{ entry.url | e | getDomain }} -
- {{ entry.content| getReadingTime }} min -
{{ entry.content|striptags|slice(0, 300) }}...
-{% trans "Mark all the entries as read" %}
{% endif %}{% endif %} - {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}- - {% if searchterm is defined %}{% trans "Delete results matching" %} {{ searchterm }}{% endif %}
- - {% if tag %}{% trans "Mark all articles from this tag as read" %}
{% endif %} - - {% if tag %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% elseif searchterm is defined %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% else %} - {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} - {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} - {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} - {% endif %} - - {% endif %} -{% endblock %} diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig deleted file mode 100644 index ed261498c..000000000 --- a/app/Resources/views/default/index.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - Homepage. -{% endblock %} diff --git a/app/Resources/views/default/install.twig b/app/Resources/views/default/install.twig deleted file mode 100644 index c89c7e47e..000000000 --- a/app/Resources/views/default/install.twig +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{% trans "installation" %}{% endblock %} -{% block content %} - -{% endblock %} diff --git a/app/Resources/views/default/layout.twig b/app/Resources/views/default/layout.twig deleted file mode 100644 index dfebc3eac..000000000 --- a/app/Resources/views/default/layout.twig +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - -
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% endblock %}
-
-{% include '_footer.twig' %}
-
-
\ No newline at end of file
diff --git a/app/Resources/views/default/login.twig b/app/Resources/views/default/login.twig
deleted file mode 100644
index b9f8b497c..000000000
--- a/app/Resources/views/default/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "login to your wallabag" %}{% endblock %}
-{% block content %}
- {% if http_auth == 0 %}
-
- {% endif %}
-{% endblock %}
diff --git a/app/Resources/views/default/public/css/images/animated-overlay.gif b/app/Resources/views/default/public/css/images/animated-overlay.gif
deleted file mode 100644
index d441f75eb..000000000
Binary files a/app/Resources/views/default/public/css/images/animated-overlay.gif and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 9f10cb65d..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/app/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index b89b914b9..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/app/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 780d3ffdc..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/app/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index da53255b3..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png b/app/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index f6306608b..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/app/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 7d3470653..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/app/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index 533c49006..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/app/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index bf3a9481a..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-icons_222222_256x240.png b/app/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
deleted file mode 100644
index c1cb1170c..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png b/app/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 84b601bf0..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-icons_454545_256x240.png b/app/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b6db1acdd..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-icons_888888_256x240.png b/app/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
deleted file mode 100644
index feea0e202..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png b/app/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index ed5b6b093..000000000
Binary files a/app/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/app/Resources/views/default/public/css/knacss.css b/app/Resources/views/default/public/css/knacss.css
deleted file mode 100644
index ca0696b7a..000000000
--- a/app/Resources/views/default/public/css/knacss.css
+++ /dev/null
@@ -1 +0,0 @@
-html{font-size:62.5%}body{font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:1.4em;line-height:1.5;color:#000;background-color:#FFF}p,ul,ol,dl,blockquote,pre,td,th,label,textarea,caption,details,figure,hgroup{margin:.75em 0 0;font-size:1em;line-height:1.5}h1,.h1-like{margin:.8077em 0 0 0;font-size:1.8571em;font-weight:normal;line-height:1.6154em}h2,.h2-like{margin:.875em 0 0 0;font-size:1.7143em;font-weight:normal;line-height:1.75em}h3,.h3-like{margin:.9545em 0 0 0;font-size:1.5714em;font-weight:normal;line-height:1.909em}h4,.h4-like{margin:1.05em 0 0 0;font-size:1.4286em;font-weight:normal;line-height:1.05em}h5,.h5-like{margin:1.1667em 0 0 0;font-size:1.2857em;font-weight:normal;line-height:1.1667em}h6,.h6-like{margin:1.3125em 0 0 0;font-size:1.1429em;font-weight:normal;line-height:1.3125em}.smaller{font-size:.7143em}.small{font-size:.8571em}.big{font-size:1.1429em}.bigger{font-size:1.2857em}.biggest{font-size:1.4286em}html,body,textarea,figure,label{margin:0;padding:0}ul,ol{padding-left:2em}code,pre,samp,kbd{font-family:consolas,'DejaVu Sans Mono',courier,monospace;line-height:1em;white-space:pre-wrap}code,kbd,mark{border-radius:2px}em{font-style:italic}strong{font-weight:bold}kbd{padding:0 2px;border:1px solid #999}code{padding:2px 4px;color:#B11;background:rgba(0,0,0,.04)}mark{padding:2px 4px;background:#FF0}table{margin-bottom:1.5em}p:first-child,ul:first-child,ol:first-child,dl:first-child,blockquote:first-child,pre:first-child,h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0}li p,li ul,li ol{margin-top:0;margin-bottom:0}img,table,td,blockquote,code,pre,textarea,input,video{max-width:100%}div,textarea,table,td,th,code,pre,samp{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;-o-hyphens:auto;hyphens:auto}img{height:auto;vertical-align:middle}#map_canvas img,.gmnoprint img{max-width:none}a img{border:0}body > script{display:none !important}.skip-links{position:absolute}.skip-links a{position:absolute;left:-7000px;padding:.5em;text-decoration:none;color:#FFF;background:#000}.skip-links a:focus{position:static}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.mod,.item{overflow:hidden}.row{display:table;width:100%;table-layout:fixed}.row > *,.col{display:table-cell;vertical-align:top}.clear,.line,.row{clear:both}.clearfix:after,.line:after,.mod:after{content:"";display:table;clear:both}.left{float:left}img.left{margin-right:1em}.right{float:right}img.right{margin-left:1em}img.left,img.right{margin-bottom:5px}.center{margin-right:auto;margin-left:auto}.txtleft{text-align:left}.txtright{text-align:right}.txtcenter{text-align:center}.inbl{display:inline-block;margin-right:-.25em;vertical-align:top}.w10{width:10%}.w20{width:20%}.w25{width:25%}.w30{width:30%}.w33{width:33.333%}.w40{width:40%}.w50{width:50%}.w60{width:60%}.w66{width:66.666%}.w70{width:70%}.w75{width:75%}.w80{width:80%}.w90{width:90%}.w100{width:100%}.w50p{width:50px}.w100p{width:100px}.w150p{width:150px}.w200p{width:200px}.w300p{width:300px}.w400p{width:400px}.w500p{width:500px}.w600p{width:600px}.w700p{width:700px}.w800p{width:800px}.w960p{width:960px}.mw960p{max-width:960px}.m-reset,.ma0{margin:0 !important}.p-reset,.pa0{padding:0 !important}.ma1,.mas{margin:10px !important}.ma2,.mam{margin:20px !important}.ma3,.mal{margin:30px !important}.pa1,.pas{padding:10px}.pa2,.pam{padding:20px}.pa3,.pal{padding:30px}.mt0,.mtn{margin-top:0 !important}.mt1,.mts{margin-top:10px !important}.mt2,.mtm{margin-top:20px !important}.mt3,.mtl{margin-top:30px !important}.mr0,.mrn{margin-right:0}.mr1,.mrs{margin-right:10px}.mr2,.mrm{margin-right:20px}.mr3,.mrl{margin-right:30px}.mb0,.mbn{margin-bottom:0 !important}.mb1,.mbs{margin-bottom:10px !important}.mb2,.mbm{margin-bottom:20px !important}.mb3,.mbl{margin-bottom:30px !important}.ml0,.mln{margin-left:0}.ml1,.mls{margin-left:10px}.ml2,.mlm{margin-left:20px}.ml3,.mll{margin-left:30px}.pt0,.ptn{padding-top:0}.pt1,.pts{padding-top:10px}.pt2,.ptm{padding-top:20px}.pt3,.ptl{padding-top:30px}.pr0,.prn{padding-right:0}.pr1,.prs{padding-right:10px}.pr2,.prm{padding-right:20px}.pr3,.prl{padding-right:30px}.pb0,.pbn{padding-bottom:0}.pb1,.pbs{padding-bottom:10px}.pb2,.pbm{padding-bottom:20px}.pb3,.pbl{padding-bottom:30px}.pl0,.pln{padding-left:0}.pl1,.pls{padding-left:10px}.pl2,.plm{padding-left:20px}.pl3,.pll{padding-left:30px}.visually-hidden{position:absolute;left:-7000px;overflow:hidden}[dir=rtl] .visually-hidden{right:-7000px;left:auto}.desktop-hidden{display:none}form,fieldset{border:none}input,button,select,label,.btn{font-family:inherit;vertical-align:middle}textarea{font-family:inherit;resize:vertical}.ie67 .clearfix,.ie67 .line,.ie67 .mod,.ie67 .row,.ie67 .col{zoom:1}.ie67 .btn,.ie67 .col,.ie67 .inbl{display:inline;zoom:1}.ie8 img{width:auto}@media print{p,blockquote{orphans:2;widows:2}blockquote,ul,ol{page-break-inside:avoid}h1,h2,h3,caption{page-break-after:avoid}}@media(orientation:landscape)and(max-device-width:768px){html,body{-webkit-text-size-adjust:100%}}[class*=grid] > *{float:left}[class*=grid] > * + *{margin-left:2%}.grid2 > *{width:49%}.grid3 > *{width:32%}.grid4 > *{width:23.5%}.grid5 > *{width:18.4%}.grid6 > *{width:15%}.grid2-1 > *:first-child,.grid1-2 > * + *{width:66%}.grid1-2 > *:first-child,.grid2-1 > * + *{width:32%}.grid1-3 > *:first-child,.grid3-1 > * + *{width:23.5%}.grid3-1 > *:first-child,.grid1-3 > * + *{width:74.5%}table,.table{max-width:100%;border-collapse:collapse;table-layout:fixed;vertical-align:top}table{width:100%}.table{display:table}caption{padding:10px;font-style:italic;color:#555}table{border:1px solid #CCC}tr > * + *{border-left:1px solid #CCC}th,td{padding:.3em .8em;border-bottom:1px solid #CCC;text-align:left}td{color:#333}.alternate{border:0}.alternate tbody{border:1px solid #CCC}.alternate thead tr > * + *{border-left:0}.alternate tbody tr > * + *{border-left:1px solid #CCC}.alternate-vert{border:0;border-right:1px solid #CCC}.alternate-vert tr >:first-child{border-bottom:0}.alternate-vert tr > * + *{border-top:1px solid #CCC}.striped tbody tr:nth-child(odd){background:#EEE;background:rgba(0,0,0,.05)}.striped-vert tr >:first-child{background:#EEE;background:rgba(0,0,0,.05)}.btn{display:inline-block}label{display:inline-block;vertical-align:middle;cursor:pointer}legend{border:0;white-space:normal}button,input,select{margin:0;font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:100%;vertical-align:middle}textarea{min-height:5em;overflow:auto;font-size:1.75em;vertical-align:top;resize:vertical}}ol.styled{counter-reset:styled}ol.styled > li{counter-increment:styled;margin-bottom:.3em;list-style-type:none}ol.styled > li:before{content:counter(styled);display:inline-block;width:1em;height:1em;margin-right:.4em;padding:2px;border-radius:50%;text-align:center;text-indent:-.1em;font-size:.9em;line-height:1;vertical-align:middle;color:#FFF;background:rgba(0,0,0,.5)}@media(min-width:1280px){.large-hidden,.tablet-hidden{display:none !important}.large-visible{display:block !important}.large-no-float{float:none}.large-inbl{display:inline-block;float:none;vertical-align:top}.large-row{display:table;width:100% !important;table-layout:fixed}.large-col{display:table-cell;vertical-align:top}.large-w25{width:25% !important}.large-w33{width:33.3333% !important}.large-w50{width:50% !important}.large-w66{width:66.6666% !important}.large-w75{width:75% !important}.large-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.large-ma0,.large-man{margin:0 !important}}@media(max-width:768px){.w60,.w66,.w70,.w75,.w80,.w90,.w100,.w600p,.w700p,.w800p,.w960p,.mw960p,.medium-wauto{width:auto}.medium-hidden,.tablet-hidden{display:none !important}.medium-visible{display:block !important}.medium-no-float{float:none}.medium-inbl{display:inline-block;float:none;vertical-align:top}.medium-row{display:table;width:100% !important;table-layout:fixed}.medium-col{display:table-cell;vertical-align:top}.medium-w25{width:25% !important}.medium-w33{width:33.3333% !important}.medium-w50{width:50% !important}.medium-w66{width:66.6666% !important}.medium-w75{width:75% !important}.medium-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.medium-ma0,.medium-man{margin:0 !important}.grid4 > *{width:49% !important}.grid4 >:first-child + * + *{margin-left:0 !important}.grid6 > *{width:32% !important}.grid6 >:first-child + * + * + *{margin-left:0 !important}}@media(max-width:640px){.mod,.item,.col,fieldset{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.w30,.w33,.w40,.w50,.w300p,.w400p,.w500p{width:auto}.row{display:block !important;width:100% !important}.tiny-hidden,.phone-hidden{display:none !important}.tiny-visible{display:block !important}.tiny-no-float{float:none}.tiny-inbl{display:inline-block;float:none;vertical-align:top}.tiny-row{display:table;width:100% !important;table-layout:fixed}.tiny-col{display:table-cell;vertical-align:top}th,td{display:block !important;width:auto !important;text-align:left !important}thead{display:none}.tiny-w25{width:25% !important}.tiny-w33{width:33.3333% !important}.tiny-w50{width:50% !important}.tiny-w66{width:66.6666% !important}.tiny-w75{width:75% !important}.tiny-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.tiny-ma0,.tiny-man{margin:0 !important}}
\ No newline at end of file
diff --git a/app/Resources/views/default/public/css/messages.css b/app/Resources/views/default/public/css/messages.css
deleted file mode 100644
index 46b547956..000000000
--- a/app/Resources/views/default/public/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;
-}
diff --git a/app/Resources/views/default/public/css/print.css b/app/Resources/views/default/public/css/print.css
deleted file mode 100644
index 625478e19..000000000
--- a/app/Resources/views/default/public/css/print.css
+++ /dev/null
@@ -1,53 +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,
-#article_toolbar {
- display: none !important;
-}
-
-article {
- border: none !important;
-}
-
-pre code {
- line-height: 1.6em;
-}
-
-/* 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/app/Resources/views/default/public/css/style-default.css b/app/Resources/views/default/public/css/style-default.css
deleted file mode 100755
index 4406d48f4..000000000
--- a/app/Resources/views/default/public/css/style-default.css
+++ /dev/null
@@ -1,69 +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('../../_global/img/icons/carrot-icon--black.png');
- background-size: 16px 16px;
-}
-
-a.diaspora span {
- background-image: url('../../_global/img/icons/diaspora-icon--black.png');
- background-size: 16px 16px;
-}
-
-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.print span {
- background-image: url('../img/default/print.png');
-}
diff --git a/app/Resources/views/default/public/css/style.css b/app/Resources/views/default/public/css/style.css
deleted file mode 100755
index b25373d6c..000000000
--- a/app/Resources/views/default/public/css/style.css
+++ /dev/null
@@ -1,447 +0,0 @@
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
-}
-
-
-
-body {
- margin: 10px;
- font-family: 'Roboto',Verdana,Geneva,sans-serif;
- font-size: 16px;
- color: #000;
-}
-
-header {
- text-align: center;
-}
-
-header h1 {
- font-size: 1.3em;
-}
-
-a,
-a:hover,
-a:visited {
- color: #000;
-}
-
-.bouton {
- border: none;
- border-radius: 2px;
- color: #fff;
- background-color: #000;
-}
-
-.bouton:hover {
- color: #f1f1f1;
- background-color: #222;
- cursor: pointer;
-}
-
-#main {
- margin: 0 auto;
-}
-
-#main #links {
- padding: 0;
- text-align: center;
- font-size: 0.9em;
- list-style-type: none;
-}
-
-#main #links li {
- display: inline;
-}
-
-#main #links li .current {
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color: #fff;
- background-color: #000;
-}
-
-#main #sort {
- padding: 0;
- text-align: center;
- list-style-type: none;
- opacity: 0.5;
-}
-
-#main #sort li {
- display: inline;
- font-size: 0.9em;
-}
-
-#main #sort li + li {
- margin-left: 10px;
-}
-
-#main #sort a {
- padding: 2px 2px 0;
- vertical-align: middle;
-}
-
-#main #sort img {
- vertical-align: baseline;
-}
-#main #sort img:hover {
- cursor: pointer;
-}
-
-#links a {
- padding: 5px 10px;
- text-decoration: none;
-}
-
-#links a:hover {
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color: #f1f1f1;
- background-color: #040707;
-}
-
-/*** ***/
-
-/*** LINKS DISPLAY ***/
-
-#main .tool {
- text-decoration: none;
- cursor: pointer;
-}
-
-#main #content {
- margin-top: 20px;
-}
-
-#main #content h2 {
- text-decoration: none;
- font-size: 1.3em;
-}
-
-#main #content .entrie {
- margin-top: 15px;
- padding-bottom: 15px;
- border-bottom: 1px dashed #222;
- overflow: hidden;
-}
-
-/* First entry */
-#main #content .results + .entrie {
- clear: both;
- margin-top: 0;
-}
-
-#main .entrie .tools {
- float: right;
- text-align: right;
- list-style-type: none;
- opacity: 0.5;
-}
-
-#main .entrie .tools .tool span {
- display: inline-block;
- width: 16px;
- height: 16px;
- /* Hide textual content */
- overflow: hidden;
- text-align: left;
- text-indent: -9999px;
-}
-
-/*** ***/
-
-/*** ARTICLE PAGE ***/
-
-#article {
- margin: 0 auto;
-}
-
-#article header {
- border-bottom: 1px solid #222;
-}
-
-#article header {
- text-align: left;
-}
-
-#article header h1 small {
- float: right;
- font-size: 0.6em;
-}
-
-#article header a {
- text-decoration: none;
-}
-
-#article .tags {
- font-size: 0.8em;
- color: #888;
- padding-bottom: 5px;
-}
-
-.backhome {
- display: inline;
-}
-
-.results {
- padding: 15px 0;
- overflow: hidden;
-}
-
-.nb-results {
- float: left;
- font-size: 0.9em;
- line-height: 24px;
- vertical-align: middle;
-}
-
-#article_toolbar {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- min-height: 50px;
- padding-top: 17px;
- text-align: center;
- color: #fff;
- opacity: 0.8;
- background: #fff;
-}
-
-#article_toolbar li {
- display: inline;
- padding-right: 30px;
-}
-
-#article_toolbar .tool {
- padding: 0 2px;
-}
-
-#article_toolbar .tool span {
- display: inline-block;
- width: 16px;
- height: 16px;
- /* Hide textual content */
- overflow: hidden;
- text-align: left;
- text-indent: -9999px;
-}
-
-/*** ***/
-
-/*** PAGINATION ***/
-
-.pagination {
- float: right;
- text-align: right;
-}
-
-.pagination a {
- height: 25px;
- margin: 2px;
- padding: 4px 8px;
- border: 1px solid #d5d5d5;
- text-decoration: none;
- font-size: 11px;
- font-weight: bold;
- color: #333;
-}
-
-.pagination a:hover,
-.pagination a:active {
- background-color: #efefef;
-}
-
-.pagination .current {
- height: 25px;
- margin: 2px;
- padding: 4px 8px;
- border: 1px solid #d5d5d5;
- text-decoration: none;
- font-size: 11px;
- font-weight: bold;
- color: #000;
- background-color: #ccc;
-}
-
-.pagination .disabled {
- display: none;
-}
-
-#bookmarklet {
- padding: 5px;
- border: 1px dashed #808080;
- background: #fff;
- cursor: move;
-}
-
-.top_link {
- display: none;
- z-index: 2000;
- position: fixed;
- right: 15px;
- bottom: 15px;
- padding: 20px;
- -webkit-border-radius: 40px;
- -moz-border-radius: 40px;
- border-radius: 40px;
- opacity: 0.9;
- background: #ccc;
-}
-
-footer {
- clear: both;
-}
-
-.reading-time {
- font-size: 0.8em;
-}
-
-#inputform {
- display: none;
- margin-top: 5px;
- margin-right: auto;
- margin-left: auto;
- padding-bottom: 5px;
- max-width: 300px;
- border-radius: 3px;
- text-align: center;
- color: #fff;
- opacity: 0.8;
- background-color: rgba(0,0,0,0.9);
-}
-
-a.back span,
-a.top span,
-a.fav span,
-a.fav span:hover,
-a.fav-off span,
-a.fav-off span:hover,
-a.archive span,
-a.archive span:hover,
-a.archive-off span,
-a.archive-off span:hover,
-a.twitter span,
-a.shaarli span,
-a.flattr span,
-a.email span,
-a.delete span,
-a.link span,
-a.bad-display span,
-a.reading-time span,
-a.print span {
- background-repeat: no-repeat;
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #000 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
-
-.two-column {
- display: block;
- width: 50%;
- paddig-right: 20px;
- float: left;
- vertical-align: top;
-}
-
-
-/* ==========================================================================
- "save a link" popup div related styles
- ========================================================================== */
-
-#bagit-form {
- display: none;
- padding-left: 30px;
- width: 450px;
-
-}
-
-a#bagit-form-close {
- color: #FFF;
- display: inline-block;
- float: right;
- background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
- height: 16px;
- margin: -14px -8px 0 0;
- width: 16px;
- text-decoration: none;
-}
-
-
-.add-to-wallabag-link-after {
- background-color: #000;
- color: #fff;
- padding: 0 4px 1px 3px;
- font-weight: bold;
- font-size: 0.7em;
- border-radius: 4px;
-}
-.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
- color: #fff;
-}
-.add-to-wallabag-link-after:visited {
- color: #999;
-}
-a.add-to-wallabag-link-after {
- visibility: hidden;
- position: absolute;
- opacity: 0;
- transition-duration: 2s;
- transition-timing-function: ease-out;
-}
-#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
- opacity: 1;
- visibility: visible;
- transition-duration: .3s;
- transition-timing-function: ease-in;
-}
-a.add-to-wallabag-link-after:after {
- content: "w";
-}
-
-
-#add-link-result {
- display: inline;
- padding-left: 10px;
-}
-
-/* ==========================================================================
- "Search" popup div related styles
- ========================================================================== */
-
-/* Search form message needs a little more width, depending on translations */
-#search-form {
- width: 420px;
-}
-
-.opacity03 {
- /*opacity: 0.3;*/
-}
-
-#readLeftPercent {
- display: inline-block;
- /* Show textual content */
- overflow: visible;
- text-align: left;
- text-indent: 0;
- color: black;
- width: 50px;
-}
-
-pre code {
- font-family: "Courier New", Courier, monospace;
- border: 1px solid #ddd;
- font-size: 0.96em;
-}
diff --git a/app/Resources/views/default/public/fonts/Roboto.woff b/app/Resources/views/default/public/fonts/Roboto.woff
deleted file mode 100644
index 1440b1be6..000000000
Binary files a/app/Resources/views/default/public/fonts/Roboto.woff and /dev/null differ
diff --git a/app/Resources/views/default/public/highlightjs/highlight.pack.js b/app/Resources/views/default/public/highlightjs/highlight.pack.js
deleted file mode 100644
index 10a21c34b..000000000
--- a/app/Resources/views/default/public/highlightjs/highlight.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function j(v){return v.replace(/&/gm,"&").replace(//gm,">")}function t(v){return v.nodeName.toLowerCase()}function h(w,x){var v=w&&w.exec(x);return v&&v.index==0}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^lang(uage)?-/,"")});return v.filter(function(x){return i(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset
- {% block content %}{% endblock %}
-
- ")}return v}function p(z){var y=b.useBR?z.innerHTML.replace(/\n/g,"").replace(/
|
]*>/g,"\n").replace(/<[^>]*>/g,""):z.textContent;var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):e(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=g(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function d(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function k(){return Object.keys(f)}function i(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=e;this.fixMarkup=g;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=d;this.listLanguages=k;this.getLanguage=i;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]};this.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/};this.CLCM={cN:"comment",b:"//",e:"$",c:[this.PWM]};this.CBCM={cN:"comment",b:"/\\*",e:"\\*/",c:[this.PWM]};this.HCM={cN:"comment",b:"#",e:"$",c:[this.PWM]};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.CSSNM={cN:"number",b:this.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0};this.RM={cN:"regexp",b:/\//,e:/\/[gim]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]};this.TM={cN:"title",b:this.IR,r:0};this.UTM={cN:"title",b:this.UIR,r:0}}();hljs.registerLanguage("bash",function(b){var a={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)\}/}]};var d={cN:"string",b:/"/,e:/"/,c:[b.BE,a,{cN:"variable",b:/\$\(/,e:/\)/,c:[b.BE]}]};var c={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for break continue while in do done exit return set declare case esac export exec",literal:"true false",built_in:"printf echo read cd pwd pushd popd dirs let eval unset typeset readonly getopts source shopt caller type hash bind help sudo",operator:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"shebang",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:true,c:[b.inherit(b.TM,{b:/\w[\w\d_]*/})],r:0},b.HCM,b.NM,d,c,a]}});hljs.registerLanguage("cs",function(b){var a="abstract as base bool break byte case catch char checked const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async await ascending descending from get group into join let orderby partial select set value var where yield";return{aliases:["csharp"],k:a,i:/::/,c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]},b.CLCM,b.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},b.ASM,b.QSM,b.CNM,{bK:"protected public private internal",e:/[{;=]/,k:a,c:[{bK:"class namespace interface",starts:{c:[b.TM]}},{b:b.IR+"\\s*\\(",rB:true,c:[b.TM]}]}]}});hljs.registerLanguage("ruby",function(f){var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var i="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor";var b={cN:"yardoctag",b:"@[A-Za-z]+"};var c={cN:"value",b:"#<",e:">"};var k={cN:"comment",v:[{b:"#",e:"$",c:[b]},{b:"^\\=begin",e:"^\\=end",c:[b],r:10},{b:"^__END__",e:"\\n$"}]};var d={cN:"subst",b:"#\\{",e:"}",k:i};var e={cN:"string",c:[f.BE,d],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:"%[qw]?\\(",e:"\\)"},{b:"%[qw]?\\[",e:"\\]"},{b:"%[qw]?{",e:"}"},{b:"%[qw]?<",e:">"},{b:"%[qw]?/",e:"/"},{b:"%[qw]?%",e:"%"},{b:"%[qw]?-",e:"-"},{b:"%[qw]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]};var a={cN:"params",b:"\\(",e:"\\)",k:i};var h=[e,c,k,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[f.inherit(f.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+f.IR+"::)?"+f.IR}]},k]},{cN:"function",bK:"def",e:" |$|;",r:0,c:[f.inherit(f.TM,{b:j}),a,k]},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[e,{b:j}],r:0},{cN:"symbol",b:f.UIR+"(\\!|\\?)?:",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+f.RSR+")\\s*",c:[c,k,{cN:"regexp",c:[f.BE,d],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];d.c=h;a.c=h;var g=[{r:1,cN:"output",b:"^\\s*=> ",e:"$",rB:true,c:[{cN:"status",b:"^\\s*=>"},{b:" ",e:"$",c:h}]},{r:1,cN:"input",b:"^[^ ][^=>]*>+ ",e:"$",rB:true,c:[{cN:"prompt",b:"^[^ ][^=>]*>+"},{b:" ",e:"$",c:h}]}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:i,c:g.concat(h)}});hljs.registerLanguage("diff",function(a){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^\@\@ +\-\d+,\d+ +\+\d+,\d+ +\@\@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}});hljs.registerLanguage("javascript",function(a){return{aliases:["js"],k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:10},a.ASM,a.QSM,a.CLCM,a.CBCM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBCM,a.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:true,c:[a.inherit(a.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[a.CLCM,a.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+a.IR,r:0}]}});hljs.registerLanguage("xml",function(a){var c="[A-Za-z0-9\\._:-]+";var d={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"};var b={eW:true,i:/]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:true,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"
- {% for tag in tags %}
- {{ tag.value }} ({{ tag.entriescount }}) {% if token != '' %}
{% endif %}
-
- - {% if loop.index == '%d'|format(loop.length/2 + 0.5) %} -
{% endif %}
- - - {% if loop.index == '%d'|format(loop.length/2 + 0.5) %} -
- {% endif %}
-
- {% endfor %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/default/theme.ini b/app/Resources/views/default/theme.ini
deleted file mode 100644
index 9f3cfb6a3..000000000
--- a/app/Resources/views/default/theme.ini
+++ /dev/null
@@ -1 +0,0 @@
-name = Default
\ No newline at end of file
diff --git a/app/Resources/views/default/view.twig b/app/Resources/views/default/view.twig
deleted file mode 100755
index 8f3a26c3d..000000000
--- a/app/Resources/views/default/view.twig
+++ /dev/null
@@ -1,124 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
-{% block content %}
- {% include '_highlight.twig' %}
- {% include '_pocheit-form.twig' %}
-
-
- -
-
- {% trans "Return home" %} -
- {% trans "Back to top" %} -
- {{ entry.url | e | getDomain }} -
- {% trans "Toggle mark as read" %} -
- {% trans "Toggle favorite" %} -
- {% trans "Delete" %} - {% if constant('SHARE_TWITTER') == 1 %}
- {% trans "Tweet" %} {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
- {% trans "Email" %} {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
- {% trans "shaarli" %} {% endif %} - {% if constant('SHARE_DIASPORA') == 1 %}
- {% trans "diaspora" %} {% endif %} - {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
- {% trans "flattr" %} {% elseif flattr.status == constant('FLATTRED') %}
- {% trans "flattr" %}{{ flattr.numFlattrs }} {% endif %}{% endif %} - {% if constant('CARROT') == 1 %}
- {% trans "carrot" %} {% endif %} - {% if constant('SHOW_PRINTLINK') == 1 %}
- {% trans "Print" %} {% endif %} - {% if constant('EPUB') == 1 %}
- EPUB {% endif %} - {% if constant('MOBI') == 1 %}
- MOBI {% endif %} - {% if constant('PDF') == 1 %}
- {% trans "Does this article appear wrong?" %} - {% if constant('SHOW_READPERCENT') == 1 %}
- 0%{% endif %}
-
-
-
- {% block tags %}
-
- {% endblock %}
-
- {{ content | raw }}
-
- {{ block('tags') }}
-
-
-
-{% endblock %}
diff --git a/app/Resources/views/dmagenta/README.md b/app/Resources/views/dmagenta/README.md
deleted file mode 100644
index 6abc37e37..000000000
--- a/app/Resources/views/dmagenta/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dmagenta (dark magenta) theme
-
-theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/app/Resources/views/dmagenta/public/css/style-dmagenta.css b/app/Resources/views/dmagenta/public/css/style-dmagenta.css
deleted file mode 100644
index 4dc592d21..000000000
--- a/app/Resources/views/dmagenta/public/css/style-dmagenta.css
+++ /dev/null
@@ -1,78 +0,0 @@
-body {
- color: #d4d4d4;
- background-color: #372d37;
-}
-
-a,
-a:hover,
-a:visited {
- color: #8d748d;
-}
-
-a.back span {
- background-image: url('../img/dmagenta/left.png');
-}
-
-a.top span {
- background-image: url('../img/dmagenta/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/dmagenta/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/dmagenta/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/dmagenta/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/dmagenta/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/dmagenta/twitter.png');
-}
-
-a.flattr span {
- background-image: url('../img/dmagenta/flattr.png');
-}
-
-a.shaarli span {
- background-image: url('../img/dmagenta/shaarli.png');
-}
-
-a.email span {
- background-image: url('../img/dmagenta/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/dmagenta/remove.png');
-}
-
-a.link span {
- background-image: url('../img/dmagenta/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/dmagenta/bad-display.png');
-}
-
-.pagination a {
- color: #aaa;
-}
-
-#main #links li .current {
- background-color: #2d372d;
-}
-
-#article_toolbar {
- background: #372d37;
-}
\ No newline at end of file
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/backtotop.png b/app/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
deleted file mode 100755
index 051238ef9..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/backtotop.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/bad-display.png b/app/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
deleted file mode 100755
index 6866799fc..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/bad-display.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png b/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
deleted file mode 100644
index 3db5a06dc..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png b/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
deleted file mode 100644
index cd3abb2c0..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/down.png b/app/Resources/views/dmagenta/public/img/dmagenta/down.png
deleted file mode 100644
index b9d536a7c..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/down.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/envelop.png b/app/Resources/views/dmagenta/public/img/dmagenta/envelop.png
deleted file mode 100644
index 6be1c8864..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/envelop.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/flattr.png b/app/Resources/views/dmagenta/public/img/dmagenta/flattr.png
deleted file mode 100755
index 0404aaeaf..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/flattr.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/left.png b/app/Resources/views/dmagenta/public/img/dmagenta/left.png
deleted file mode 100644
index a0a53631e..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/left.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/link.png b/app/Resources/views/dmagenta/public/img/dmagenta/link.png
deleted file mode 100755
index db62819d5..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/link.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/remove.png b/app/Resources/views/dmagenta/public/img/dmagenta/remove.png
deleted file mode 100644
index f8ad56a3e..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/remove.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/rss.png b/app/Resources/views/dmagenta/public/img/dmagenta/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/rss.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/shaarli.png b/app/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/shaarli.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/star-off.png b/app/Resources/views/dmagenta/public/img/dmagenta/star-off.png
deleted file mode 100644
index 6a0133a79..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/star-off.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/star-on.png b/app/Resources/views/dmagenta/public/img/dmagenta/star-on.png
deleted file mode 100644
index a9f96eaac..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/star-on.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/top.png b/app/Resources/views/dmagenta/public/img/dmagenta/top.png
deleted file mode 100644
index 954a8c0ac..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/top.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/public/img/dmagenta/twitter.png b/app/Resources/views/dmagenta/public/img/dmagenta/twitter.png
deleted file mode 100644
index cfcfe4195..000000000
Binary files a/app/Resources/views/dmagenta/public/img/dmagenta/twitter.png and /dev/null differ
diff --git a/app/Resources/views/dmagenta/screenshot.jpg b/app/Resources/views/dmagenta/screenshot.jpg
deleted file mode 100644
index ab8f1ec22..000000000
Binary files a/app/Resources/views/dmagenta/screenshot.jpg and /dev/null differ
diff --git a/app/Resources/views/dmagenta/theme.ini b/app/Resources/views/dmagenta/theme.ini
deleted file mode 100644
index 78fa3a9c9..000000000
--- a/app/Resources/views/dmagenta/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Dmagenta
-requirements[] = default
diff --git a/app/Resources/views/solarized-dark/README.md b/app/Resources/views/solarized-dark/README.md
deleted file mode 100644
index 81be1f8cd..000000000
--- a/app/Resources/views/solarized-dark/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized-dark (Solarized Dark) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/app/Resources/views/solarized-dark/Solarized-LICENSE.txt b/app/Resources/views/solarized-dark/Solarized-LICENSE.txt
deleted file mode 100644
index a842f6638..000000000
--- a/app/Resources/views/solarized-dark/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/app/Resources/views/solarized-dark/public/css/style-solarized-dark.css b/app/Resources/views/solarized-dark/public/css/style-solarized-dark.css
deleted file mode 100644
index 77a97d382..000000000
--- a/app/Resources/views/solarized-dark/public/css/style-solarized-dark.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized Dark - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background: #002b36 base 03
- * Highlight: #073642 base 02
- * Primary content: #839496 base 0
- * Intermediate: #657b83 base 00
- * Emphasized content: #93a1a1 base 1
- * Secondary content: #586e75 base 01
- * Green: #859900
- * Orange: #cb4b16
- * Red: #dc322f
- * Blue: #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
- background-color: #002b36;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
- background-color: #073642;
-}
-::selection {
- background-color: #073642;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
- color: #839496;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
- color: #586e75;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
- border-bottom-color: #586e75;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
- color: #93a1a1;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
- background-color: #073642;
-}
-
-#main .messages.success {
- border-color: #859900;
-}
-
-#main .messages.success p {
- color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
- border-color: #cb4b16;
-}
-
-#main .messages.warning p {
- color: #cb4b16;
-}
-
-#main .messages.error {
- border-color: #dc322f;
-}
-
-#main .messages.error p {
- color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
- border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
- color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
- color: #002b36;
- background-color: #586e75;
-}
-
-.bouton:hover {
- background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
- background-color: #073642;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
- padding: 5px;
- border: 1px solid #586e75;
- color: #839496;
-}
-
-#bookmarklet {
- border-style: dashed;
-}
-
-.pagination a {
- border-color: #586e75;
- color: #586e75;
-}
-
-.pagination span.current {
- border-color: #073642;
-}
-
-/* Images */
-
-a.back span {
- background-image: url('../img/solarized-dark/left.png');
-}
-
-a.top span {
- background-image: url('../img/solarized-dark/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/solarized-dark/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/solarized-dark/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/solarized-dark/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/solarized-dark/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/solarized-dark/twitter.png');
-}
-
-a.flattr span {
- background-image: url('../img/solarized-dark/flattr.png');
-}
-
-a.shaarli span {
- background-image: url('../img/solarized-dark/shaarli.png');
-}
-
-a.email span {
- background-image: url('../img/solarized-dark/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/solarized-dark/remove.png');
-}
-
-a.link span {
- background-image: url('../img/solarized-dark/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/solarized-dark/bad-display.png');
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #586E75 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
\ No newline at end of file
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
deleted file mode 100644
index 1501c2a5d..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
deleted file mode 100644
index b2c3ca173..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
deleted file mode 100644
index fd7d92fa9..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
deleted file mode 100644
index 592965dd4..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/down.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/down.png
deleted file mode 100644
index 5de303157..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/down.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
deleted file mode 100644
index d34688859..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
deleted file mode 100644
index 73e3f4218..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/left.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/left.png
deleted file mode 100644
index a953d831d..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/left.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/link.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/link.png
deleted file mode 100644
index 5e859a0e3..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/link.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/remove.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
deleted file mode 100644
index 66a5c1ab4..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/remove.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/rss.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/rss.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
deleted file mode 100644
index 1c603ecca..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
deleted file mode 100644
index bc37772a5..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/top.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/top.png
deleted file mode 100644
index b3f44f31d..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/top.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png b/app/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
deleted file mode 100644
index c4a253341..000000000
Binary files a/app/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/screenshot.jpg b/app/Resources/views/solarized-dark/screenshot.jpg
deleted file mode 100644
index 2ad879435..000000000
Binary files a/app/Resources/views/solarized-dark/screenshot.jpg and /dev/null differ
diff --git a/app/Resources/views/solarized-dark/theme.ini b/app/Resources/views/solarized-dark/theme.ini
deleted file mode 100644
index c99481464..000000000
--- a/app/Resources/views/solarized-dark/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized Dark
-requirements[] = default
diff --git a/app/Resources/views/solarized/README.md b/app/Resources/views/solarized/README.md
deleted file mode 100644
index 255e3cddf..000000000
--- a/app/Resources/views/solarized/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized (Solarized) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/app/Resources/views/solarized/Solarized-LICENSE.txt b/app/Resources/views/solarized/Solarized-LICENSE.txt
deleted file mode 100644
index a842f6638..000000000
--- a/app/Resources/views/solarized/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/app/Resources/views/solarized/public/css/style-solarized.css b/app/Resources/views/solarized/public/css/style-solarized.css
deleted file mode 100644
index cf16338f4..000000000
--- a/app/Resources/views/solarized/public/css/style-solarized.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background: #fdf6e3 base 3
- * Highlight: #eee8d5 base 2
- * Primary content: #657b83 base 00
- * Intermediate: #839496 base 0
- * Emphasized content: #586e75 base 01
- * Secondary content: #93a1a1 base 1
- * Green: #859900
- * Orange: #cb4b16
- * Red: #dc322f
- * Blue: #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
- background-color: #fdf6e3;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
- background-color: #eee8d5;
-}
-::selection {
- background-color: #eee8d5;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
- color: #657b83;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
- color: #93a1a1;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
- border-bottom-color: #93a1a1;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
- color: #586e75;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
- background-color: #eee8d5;
-}
-
-#main .messages.success {
- border-color: #859900;
-}
-
-#main .messages.success p {
- color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
- border-color: #cb4b16;
-}
-
-#main .messages.warning p {
- color: #cb4b16;
-}
-
-#main .messages.error {
- border-color: #dc322f;
-}
-
-#main .messages.error p {
- color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
- border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
- color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
- color: #fdf6e3;
- background-color: #93a1a1;
-}
-
-.bouton:hover {
- background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
- background-color: #eee8d5;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
- padding: 5px;
- border: 1px solid #93a1a1;
- color: #657b83;
-}
-
-#bookmarklet {
- border-style: dashed;
-}
-
-.pagination a {
- border-color: #93a1a1;
- color: #93a1a1;
-}
-
-.pagination span.current {
- border-color: #eee8d5;
-}
-
-/* Images */
-
-a.back span {
- background-image: url('../img/solarized/left.png');
-}
-
-a.top span {
- background-image: url('../img/solarized/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/solarized/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/solarized/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/solarized/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/solarized/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/solarized/twitter.png');
-}
-
-a.shaarli span {
- background-image: url('../img/solarized/shaarli.png');
-}
-
-a.flattr span {
- background-image: url('../img/solarized/flattr.png');
-}
-
-a.email span {
- background-image: url('../img/solarized/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/solarized/remove.png');
-}
-
-a.link span {
- background-image: url('../img/solarized/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/solarized/bad-display.png');
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #93A1A1 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
\ No newline at end of file
diff --git a/app/Resources/views/solarized/public/img/solarized/backtotop.png b/app/Resources/views/solarized/public/img/solarized/backtotop.png
deleted file mode 100644
index a3e523187..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/backtotop.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/bad-display.png b/app/Resources/views/solarized/public/img/solarized/bad-display.png
deleted file mode 100644
index ae99ab378..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/bad-display.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/checkmark-off.png b/app/Resources/views/solarized/public/img/solarized/checkmark-off.png
deleted file mode 100644
index 20cd26b3e..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/checkmark-off.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/checkmark-on.png b/app/Resources/views/solarized/public/img/solarized/checkmark-on.png
deleted file mode 100644
index 87a2b799e..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/checkmark-on.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/down.png b/app/Resources/views/solarized/public/img/solarized/down.png
deleted file mode 100644
index 622ff87b5..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/down.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/envelop.png b/app/Resources/views/solarized/public/img/solarized/envelop.png
deleted file mode 100644
index 1caf7d435..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/envelop.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/flattr.png b/app/Resources/views/solarized/public/img/solarized/flattr.png
deleted file mode 100644
index 18e00f86c..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/flattr.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/left.png b/app/Resources/views/solarized/public/img/solarized/left.png
deleted file mode 100644
index 9780faeec..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/left.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/link.png b/app/Resources/views/solarized/public/img/solarized/link.png
deleted file mode 100644
index d0e12862d..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/link.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/remove.png b/app/Resources/views/solarized/public/img/solarized/remove.png
deleted file mode 100644
index d5113d176..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/remove.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/rss.png b/app/Resources/views/solarized/public/img/solarized/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/rss.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/shaarli.png b/app/Resources/views/solarized/public/img/solarized/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/shaarli.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/star-off.png b/app/Resources/views/solarized/public/img/solarized/star-off.png
deleted file mode 100644
index afd7d80c8..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/star-off.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/star-on.png b/app/Resources/views/solarized/public/img/solarized/star-on.png
deleted file mode 100644
index 3a7725123..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/star-on.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/top.png b/app/Resources/views/solarized/public/img/solarized/top.png
deleted file mode 100644
index d20001a49..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/top.png and /dev/null differ
diff --git a/app/Resources/views/solarized/public/img/solarized/twitter.png b/app/Resources/views/solarized/public/img/solarized/twitter.png
deleted file mode 100644
index 109d71516..000000000
Binary files a/app/Resources/views/solarized/public/img/solarized/twitter.png and /dev/null differ
diff --git a/app/Resources/views/solarized/screenshot.jpg b/app/Resources/views/solarized/screenshot.jpg
deleted file mode 100644
index 07d402e38..000000000
Binary files a/app/Resources/views/solarized/screenshot.jpg and /dev/null differ
diff --git a/app/Resources/views/solarized/theme.ini b/app/Resources/views/solarized/theme.ini
deleted file mode 100644
index 703997b9e..000000000
--- a/app/Resources/views/solarized/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 2a943bb7d..2c742e6a2 100644
--- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -6,13 +6,26 @@ use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
use Symfony\Component\Security\Core\SecurityContextInterface;
use Wallabag\CoreBundle\Entity\User;
+/**
+ * This class intend to detect the active theme for the logged in user.
+ * It will retrieve the configured theme of the user.
+ *
+ * If no user where logged in, it will returne the default theme
+ */
+
class DetectActiveTheme implements DeviceDetectionInterface
{
protected $securityContext;
+ protected $defaultTheme;
- public function __construct(SecurityContextInterface $securityContext)
+ /**
+ * @param SecurityContextInterface $securityContext Needed to retrieve the current user
+ * @param string $defaultTheme Default theme when user isn't logged in
+ */
+ public function __construct(SecurityContextInterface $securityContext, $defaultTheme)
{
$this->securityContext = $securityContext;
+ $this->defaultTheme = $defaultTheme;
}
public function setUserAgent($userAgent)
@@ -21,9 +34,10 @@ class DetectActiveTheme implements DeviceDetectionInterface
/**
* This should return the active theme for the logged in user.
- * No active theme for:
+ *
+ * Default theme for:
* - anonymous user
- * - user without a config (shouldn't happen..)
+ * - user without a config (shouldn't happen ..)
*
* @return string
*/
@@ -31,15 +45,14 @@ class DetectActiveTheme implements DeviceDetectionInterface
{
$user = $this->securityContext->getToken()->getUser();
- // anon user don't deserve a theme
if (!$user instanceof User) {
- return false;
+ return $this->defaultTheme;
}
$config = $user->getConfig();
if (!$config) {
- return false;
+ return $this->defaultTheme;
}
return $config->getTheme();
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 5437d1cf8..c734a3a57 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -20,6 +20,7 @@ services:
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- @security.context
+ - %theme% # default theme from parameters.yml
wallabag_core.form.type.config:
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 051dafd6b..1835d26e2 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 @@
{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
-{% block menu %}
- {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
{% block content %}
{{ entry.title|raw }}
-{% trans %}Wallabag configuration{% endtrans %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig index dfce4b3ce..acb964205 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 @@ {% block title "Unread" %} -{% block menu %} - {% include "WallabagCoreBundle::_menu.html.twig" %} -{% endblock %} - {% block content %} {% block pager %} {% 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 f0c005094..f23ab968e 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 @@ {% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %} -{% block menu %} - {% include "WallabagCoreBundle::_menu.html.twig" %} -{% endblock %} - {% block content %}-
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index b6de7d236..b11512a40 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 @@
{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
-{% block menu %}
- {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
{% block content %}
{{ form(form) }}
{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
index 2437e3b0d..eb8f08c82 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 @@
-{% extends "WallabagCoreBundle::layout-login.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+
{% block content %}
{% if error %}
{{ error.message }}
@@ -19,11 +24,7 @@
{% trans %}About wallabag{% endtrans %}
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 1b5f9a0fd..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - 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 b7ec3a830..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %} - - - - - - - - - - - - - - - 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 9a3cf053e..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig +++ /dev/null @@ -1,14 +0,0 @@ - --
-
- {% trans %}unread{% endtrans %} -
- {% trans %}favorites{% endtrans %} -
- {% trans %}archive{% endtrans %} -
- {% trans %}tags{% endtrans %} -
- {% trans %}save a link{% endtrans %} -
- {% trans %}search{% endtrans %} - {% include "WallabagCoreBundle::_search_form.html.twig" %} - -
- {% trans %}config{% endtrans %} -
- {% trans %}about{% endtrans %} -
- {% trans %}logout{% endtrans %} -
- {% block logo %} }})
{% endblock %}
-
-
+ {% block logo %}
+
+ {% endblock %}
+
+
+ {% block menu %}
+
+
+
+ {% block footer %}
+
+ {% endblock %}
+
+
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 45deee8f4..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- -
+
- {% trans %}unread{% endtrans %} +
- {% trans %}favorites{% endtrans %} +
- {% trans %}archive{% endtrans %} +
- {% trans %}tags{% endtrans %} +
- {% trans %}save a link{% endtrans %} +
- {% trans %}search{% endtrans %} + + +
- {% trans %}config{% endtrans %} +
- {% trans %}about{% endtrans %} +
- {% trans %}logout{% endtrans %} +
+ {% block content %}{% endblock %}
+
+ DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT
- {% include "WallabagCoreBundle::_top.html.twig" %} -
- {% block menu %}{% endblock %}
-
- {% include "WallabagCoreBundle::_footer.html.twig" %}
-
-
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 1cf871d63..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {% block content %}{% endblock %}
-
- DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT
- {% include "WallabagCoreBundle::_top.html.twig" %} -
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
-
- {% include "WallabagCoreBundle::_footer.html.twig" %}
-
-
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 175a4b3a2..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
diff --git a/app/Resources/views/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
similarity index 100%
rename from app/Resources/views/baggy/public/js/closeMessage.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
diff --git a/app/Resources/views/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js
similarity index 100%
rename from app/Resources/views/baggy/public/js/jquery.cookie.js
rename to 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 382dd5f1c..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-
- {% block content %}{% endblock %}
-
-
-
- 
-
-
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 c5c07d492..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/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!." %}
-
{% 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 :" %} -
- - {% 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.
{% trans "Change your password" %}
- - {% endif %} - -{% trans 'Add user' %}
- - -{% trans "Delete account" %}
- {% if not only_user %} - {% 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 }}) - {% if constant('DEBUG_POCHE') == 1 %}
- {% 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/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 15f15560f..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/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 %} - - - - - -
-
-{% if tags is empty %}
-
-{% endif %}
-{{ entry.title|raw }} -
-
-{% for tag in tags %}
- {{ tag.value }} ✘ {% endfor %} -
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
-
- {% include "WallabagCoreBundle::_footer.html.twig" %}
-
-
+
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+ {{ parent() }}
+
+
+{% endblock %}
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 4a1dc05dc..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/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/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
deleted file mode 100644
index 527719d5a..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$(function(){
- //---------------------------------------------------------------------------
- // Show the close icon when the user hover over a message
- //---------------------------------------------------------------------------
- // $('.messages').on('mouseenter', function(){
- // $(this).find('a.closeMessage').stop(true, true).show();
- // }).on('mouseleave', function(){
- // $(this).find('a.closeMessage').stop(true, true).hide();
- // });
- //---------------------------------------------------------------------------
- // Close the message box when the user clicks the close icon
- //---------------------------------------------------------------------------
- $('a.closeMessage').on('click', function(){
- $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); });
- return false;
- });
-});
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
deleted file mode 100755
index 927190008..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.0
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
- if (typeof define === 'function' && define.amd) {
- // AMD. Register as anonymous module.
- define(['jquery'], factory);
- } else {
- // Browser globals.
- factory(jQuery);
- }
-}(function ($) {
-
- var pluses = /\+/g;
-
- function encode(s) {
- return config.raw ? s : encodeURIComponent(s);
- }
-
- function decode(s) {
- return config.raw ? s : decodeURIComponent(s);
- }
-
- function stringifyCookieValue(value) {
- return encode(config.json ? JSON.stringify(value) : String(value));
- }
-
- function parseCookieValue(s) {
- if (s.indexOf('"') === 0) {
- // This is a quoted cookie as according to RFC2068, unescape...
- s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
- }
-
- try {
- // Replace server-side written pluses with spaces.
- // If we can't decode the cookie, ignore it, it's unusable.
- s = decodeURIComponent(s.replace(pluses, ' '));
- } catch(e) {
- return;
- }
-
- try {
- // If we can't parse the cookie, ignore it, it's unusable.
- return config.json ? JSON.parse(s) : s;
- } catch(e) {}
- }
-
- function read(s, converter) {
- var value = config.raw ? s : parseCookieValue(s);
- return $.isFunction(converter) ? converter(value) : value;
- }
-
- var config = $.cookie = function (key, value, options) {
-
- // Write
- if (value !== undefined && !$.isFunction(value)) {
- options = $.extend({}, config.defaults, options);
-
- if (typeof options.expires === 'number') {
- var days = options.expires, t = options.expires = new Date();
- t.setDate(t.getDate() + days);
- }
-
- return (document.cookie = [
- encode(key), '=', stringifyCookieValue(value),
- options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
- options.path ? '; path=' + options.path : '',
- options.domain ? '; domain=' + options.domain : '',
- options.secure ? '; secure' : ''
- ].join(''));
- }
-
- // Read
-
- var result = key ? undefined : {};
-
- // To prevent the for loop in the first place assign an empty array
- // in case there are no cookies at all. Also prevents odd result when
- // calling $.cookie().
- var cookies = document.cookie ? document.cookie.split('; ') : [];
-
- for (var i = 0, l = cookies.length; i < l; i++) {
- var parts = cookies[i].split('=');
- var name = decode(parts.shift());
- var cookie = parts.join('=');
-
- if (key && key === name) {
- // If second argument (value) is a function it's a converter...
- result = read(cookie, value);
- break;
- }
-
- // Prevent storing a cookie that we couldn't decode.
- if (!key && (cookie = read(cookie)) !== undefined) {
- result[name] = cookie;
- }
- }
-
- return result;
- };
-
- config.defaults = {};
-
- $.removeCookie = function (key, options) {
- if ($.cookie(key) !== undefined) {
- // Must not alter options, thus extending a fresh object...
- $.cookie(key, '', $.extend({}, options, { expires: -1 }));
- return true;
- }
- return false;
- };
-
-}));
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 65930eb25..000000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}Tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-
- {% block content %}{% endblock %}
-
-