restructure folders

51 files changed, 3 insertions, 3 deletions

diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index 3057cb75..213a4aca 100644
--- a/themes/default/_footer.twig
+++ b/themes/default/_footer.twig
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
-            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
         </footer>
\ No newline at end of file
diff --git a/themes/default/about.twig b/themes/default/about.twig
index 5ca3217c..50ffd8ef 100755
--- a/themes/default/about.twig
+++ b/themes/default/about.twig
@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <p>{% 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." %}</p>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index bac563cf..b7d91937 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -179,7 +179,7 @@
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
diff --git a/themes/default/css/images/animated-overlay.gif b/themes/default/public/css/images/animated-overlay.gif
index d441f75e..d441f75e 100644
--- a/themes/default/css/images/animated-overlay.gif
+++ b/themes/default/public/css/images/animated-overlay.gif
diff --git a/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
index 9f10cb65..9f10cb65 100644
--- a/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png b/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
index b89b914b..b89b914b 100644
--- a/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
index 780d3ffd..780d3ffd 100644
--- a/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png b/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
index da53255b..da53255b 100644
--- a/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png b/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
index f6306608..f6306608 100644
--- a/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png
+++ b/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
index 7d347065..7d347065 100644
--- a/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
index 533c4900..533c4900 100644
--- a/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index bf3a9481..bf3a9481 100644
--- a/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/themes/default/css/images/ui-icons_222222_256x240.png b/themes/default/public/css/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/themes/default/css/images/ui-icons_222222_256x240.png
+++ b/themes/default/public/css/images/ui-icons_222222_256x240.png
diff --git a/themes/default/css/images/ui-icons_2e83ff_256x240.png b/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
index 84b601bf..84b601bf 100644
--- a/themes/default/css/images/ui-icons_2e83ff_256x240.png
+++ b/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
diff --git a/themes/default/css/images/ui-icons_454545_256x240.png b/themes/default/public/css/images/ui-icons_454545_256x240.png
index b6db1acd..b6db1acd 100644
--- a/themes/default/css/images/ui-icons_454545_256x240.png
+++ b/themes/default/public/css/images/ui-icons_454545_256x240.png
diff --git a/themes/default/css/images/ui-icons_888888_256x240.png b/themes/default/public/css/images/ui-icons_888888_256x240.png
index feea0e20..feea0e20 100644
--- a/themes/default/css/images/ui-icons_888888_256x240.png
+++ b/themes/default/public/css/images/ui-icons_888888_256x240.png
diff --git a/themes/default/css/images/ui-icons_cd0a0a_256x240.png b/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
index ed5b6b09..ed5b6b09 100644
--- a/themes/default/css/images/ui-icons_cd0a0a_256x240.png
+++ b/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/themes/default/css/knacss.css b/themes/default/public/css/knacss.css
index ca0696b7..ca0696b7 100644
--- a/themes/default/css/knacss.css
+++ b/themes/default/public/css/knacss.css
diff --git a/themes/default/css/messages.css b/themes/default/public/css/messages.css
index 46b54795..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/public/css/messages.css
diff --git a/themes/default/css/print.css b/themes/default/public/css/print.css
index 625478e1..625478e1 100644
--- a/themes/default/css/print.css
+++ b/themes/default/public/css/print.css
diff --git a/themes/default/css/style-default.css b/themes/default/public/css/style-default.css
index 4406d48f..4406d48f 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/public/css/style-default.css
diff --git a/themes/default/css/style.css b/themes/default/public/css/style.css
index b25373d6..b25373d6 100755
--- a/themes/default/css/style.css
+++ b/themes/default/public/css/style.css
diff --git a/themes/default/fonts/Roboto.woff b/themes/default/public/fonts/Roboto.woff
index 1440b1be..1440b1be 100644
--- a/themes/default/fonts/Roboto.woff
+++ b/themes/default/public/fonts/Roboto.woff
diff --git a/themes/default/highlightjs/highlight.pack.js b/themes/default/public/highlightjs/highlight.pack.js
index 10a21c34..10a21c34 100644
--- a/themes/default/highlightjs/highlight.pack.js
+++ b/themes/default/public/highlightjs/highlight.pack.js
diff --git a/themes/default/highlightjs/styles/default.css b/themes/default/public/highlightjs/styles/default.css
index e5bd2801..e5bd2801 100644
--- a/themes/default/highlightjs/styles/default.css
+++ b/themes/default/public/highlightjs/styles/default.css
diff --git a/themes/default/highlightjs/styles/github.css b/themes/default/public/highlightjs/styles/github.css
index 47fc2651..47fc2651 100644
--- a/themes/default/highlightjs/styles/github.css
+++ b/themes/default/public/highlightjs/styles/github.css
diff --git a/themes/default/highlightjs/styles/googlecode.css b/themes/default/public/highlightjs/styles/googlecode.css
index fd237367..fd237367 100644
--- a/themes/default/highlightjs/styles/googlecode.css
+++ b/themes/default/public/highlightjs/styles/googlecode.css
diff --git a/themes/default/img/default/backtotop.png b/themes/default/public/img/default/backtotop.png
index 051238ef..051238ef 100644
--- a/themes/default/img/default/backtotop.png
+++ b/themes/default/public/img/default/backtotop.png
diff --git a/themes/default/img/default/bad-display.png b/themes/default/public/img/default/bad-display.png
index 6866799f..6866799f 100755
--- a/themes/default/img/default/bad-display.png
+++ b/themes/default/public/img/default/bad-display.png
diff --git a/themes/default/img/default/checkmark-off.png b/themes/default/public/img/default/checkmark-off.png
index 3db5a06d..3db5a06d 100644
--- a/themes/default/img/default/checkmark-off.png
+++ b/themes/default/public/img/default/checkmark-off.png
diff --git a/themes/default/img/default/checkmark-on.png b/themes/default/public/img/default/checkmark-on.png
index cd3abb2c..cd3abb2c 100644
--- a/themes/default/img/default/checkmark-on.png
+++ b/themes/default/public/img/default/checkmark-on.png
diff --git a/themes/default/img/default/down.png b/themes/default/public/img/default/down.png
index b9d536a7..b9d536a7 100644
--- a/themes/default/img/default/down.png
+++ b/themes/default/public/img/default/down.png
diff --git a/themes/default/img/default/envelop.png b/themes/default/public/img/default/envelop.png
index 6be1c886..6be1c886 100644
--- a/themes/default/img/default/envelop.png
+++ b/themes/default/public/img/default/envelop.png
diff --git a/themes/default/img/default/flattr.png b/themes/default/public/img/default/flattr.png
index 0404aaea..0404aaea 100755
--- a/themes/default/img/default/flattr.png
+++ b/themes/default/public/img/default/flattr.png
diff --git a/themes/default/img/default/left.png b/themes/default/public/img/default/left.png
index a0a53631..a0a53631 100644
--- a/themes/default/img/default/left.png
+++ b/themes/default/public/img/default/left.png
diff --git a/themes/default/img/default/link.png b/themes/default/public/img/default/link.png
index db62819d..db62819d 100755
--- a/themes/default/img/default/link.png
+++ b/themes/default/public/img/default/link.png
diff --git a/themes/default/img/default/print.png b/themes/default/public/img/default/print.png
index 83d6445b..83d6445b 100755
--- a/themes/default/img/default/print.png
+++ b/themes/default/public/img/default/print.png
diff --git a/themes/default/img/default/remove.png b/themes/default/public/img/default/remove.png
index f8ad56a3..f8ad56a3 100644
--- a/themes/default/img/default/remove.png
+++ b/themes/default/public/img/default/remove.png
diff --git a/themes/default/img/default/rss.png b/themes/default/public/img/default/rss.png
index 21bad1a1..21bad1a1 100644
--- a/themes/default/img/default/rss.png
+++ b/themes/default/public/img/default/rss.png
diff --git a/themes/default/img/default/shaarli.png b/themes/default/public/img/default/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/themes/default/img/default/shaarli.png
+++ b/themes/default/public/img/default/shaarli.png
diff --git a/themes/default/img/default/star-off.png b/themes/default/public/img/default/star-off.png
index 6a0133a7..6a0133a7 100644
--- a/themes/default/img/default/star-off.png
+++ b/themes/default/public/img/default/star-off.png
diff --git a/themes/default/img/default/star-on.png b/themes/default/public/img/default/star-on.png
index a9f96eaa..a9f96eaa 100644
--- a/themes/default/img/default/star-on.png
+++ b/themes/default/public/img/default/star-on.png
diff --git a/themes/default/img/default/top.png b/themes/default/public/img/default/top.png
index 954a8c0a..954a8c0a 100644
--- a/themes/default/img/default/top.png
+++ b/themes/default/public/img/default/top.png
diff --git a/themes/default/img/default/twitter.png b/themes/default/public/img/default/twitter.png
index cfcfe419..cfcfe419 100644
--- a/themes/default/img/default/twitter.png
+++ b/themes/default/public/img/default/twitter.png
diff --git a/themes/default/img/logo.svg b/themes/default/public/img/logo.svg
index 865da440..865da440 100644
--- a/themes/default/img/logo.svg
+++ b/themes/default/public/img/logo.svg
diff --git a/themes/default/img/messages/close.png b/themes/default/public/img/messages/close.png
index 731aa018..731aa018 100644
--- a/themes/default/img/messages/close.png
+++ b/themes/default/public/img/messages/close.png
diff --git a/themes/default/img/messages/cross.png b/themes/default/public/img/messages/cross.png
index 1514d51a..1514d51a 100644
--- a/themes/default/img/messages/cross.png
+++ b/themes/default/public/img/messages/cross.png
diff --git a/themes/default/img/messages/help.png b/themes/default/public/img/messages/help.png
index 5c870176..5c870176 100644
--- a/themes/default/img/messages/help.png
+++ b/themes/default/public/img/messages/help.png
diff --git a/themes/default/img/messages/tick.png b/themes/default/public/img/messages/tick.png
index a9925a06..a9925a06 100644
--- a/themes/default/img/messages/tick.png
+++ b/themes/default/public/img/messages/tick.png
diff --git a/themes/default/img/messages/warning.png b/themes/default/public/img/messages/warning.png
index 628cf2da..628cf2da 100644
--- a/themes/default/img/messages/warning.png
+++ b/themes/default/public/img/messages/warning.png
diff --git a/themes/default/js/closeMessage.js b/themes/default/public/js/closeMessage.js
index b57fe4a8..b57fe4a8 100644
--- a/themes/default/js/closeMessage.js
+++ b/themes/default/public/js/closeMessage.js