aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy <jeremy.benoist@gmail.com>2015-02-23 22:55:06 +0100
committerJeremy <jeremy.benoist@gmail.com>2015-03-01 10:49:16 +0100
commit32da2a70ef278bd42f66eb82c3fbf1905a417b87 (patch)
tree587ef3bae1f4881047eb1ceb0c005e7a8287bb71
parentfca3c757233940cbe4c431e3e05fe74893225fe0 (diff)
downloadwallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.gz
wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.zst
wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.zip
Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal. ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle Force sqlite for test In case of people use a different driver in parameter.yml (yes I do :))
-rw-r--r--.gitignore2
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml21
-rw-r--r--app/config/config_test.yml4
-rw-r--r--app/config/routing.yml6
-rw-r--r--composer.json1
-rw-r--r--composer.lock71
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php9
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/User.php27
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php25
-rw-r--r--src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php47
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml16
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_head.html.twig26
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_messages.html.twig9
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_top.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig31
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/baggy/login.twig34
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/layout.html.twig21
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig26
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.css (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css447
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-114.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png)bin2281 -> 2281 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-120.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png)bin2318 -> 2318 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-144.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png)bin2718 -> 2718 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png)bin2835 -> 2835 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-57.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png)bin1582 -> 1582 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-72.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png)bin1709 -> 1709 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-76.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png)bin1838 -> 1838 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png)bin1579 -> 1579 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/favicon.ico (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico)bin34494 -> 34494 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--black.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png)bin1538 -> 1538 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--white.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png)bin1605 -> 1605 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--black.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png)bin1555 -> 1555 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--white.png (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png)bin612 -> 612 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoClose.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-2.0.3.min.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/restoreScroll.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/saveLink.js (renamed from src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/README.md)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/config.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig43
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig34
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/messages.css (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/print.css (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/ratatouille.css (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.eot (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot)bin3896 -> 3896 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.svg (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.ttf (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf)bin3732 -> 3732 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.woff (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff)bin3664 -> 3664 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/ptsans.woff (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff)bin24816 -> 24816 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/blank.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png)bin141 -> 141 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png)bin216 -> 216 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/list.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png)bin201 -> 201 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/table.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png)bin229 -> 229 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png)bin212 -> 212 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/bg-select.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png)bin1095 -> 1095 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-other_themes.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png)bin3922 -> 3922 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-w.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png)bin4916 -> 4916 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-wallabag.svg (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.png (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png)bin1350 -> 1350 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/restoreScroll.js (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg)bin256315 -> 256315 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/README.md (renamed from src/Wallabag/CoreBundle/Resources/views/dark/README.md)0
l---------src/Wallabag/CoreBundle/Resources/views/themes/dark/dark (renamed from src/Wallabag/CoreBundle/Resources/views/dark/dark)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig38
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/css/style-dark.css (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/backtotop.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png)bin250 -> 250 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/bad-display.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png)bin403 -> 403 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png)bin339 -> 339 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png)bin269 -> 269 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/envelop.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png)bin361 -> 361 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/flattr.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png)bin331 -> 331 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/left.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png)bin264 -> 264 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/link.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png)bin404 -> 404 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/remove.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png)bin300 -> 300 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/rss.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/shaarli.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png)bin841 -> 841 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png)bin382 -> 382 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png)bin327 -> 327 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png)bin250 -> 250 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/twitter.png (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png)bin375 -> 375 bytes
l---------src/Wallabag/CoreBundle/Resources/views/themes/dark/public/public (renamed from src/Wallabag/CoreBundle/Resources/views/dark/public/public)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/screenshot.jpg (renamed from src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg)bin664859 -> 664859 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dark/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/dark/theme.ini)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/_bookmarklet.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/_footer.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_footer.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_head.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_head.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_highlight.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_import.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_import.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/_menu.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_menu.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/_messages.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_messages.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_pocheit-form.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_search-form.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_sorting.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/_top.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/_top.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/about.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/about.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/config.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/config.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/edit-tags.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/error.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/error.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/export.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/export.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/home.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/home.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/install.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/install.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/layout.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/layout.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/login.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/login.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/animated-overlay.gif (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif)bin1738 -> 1738 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png)bin212 -> 212 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png)bin208 -> 208 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png)bin335 -> 335 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png)bin207 -> 207 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png)bin262 -> 262 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png)bin262 -> 262 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png)bin332 -> 332 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png)bin280 -> 280 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_222222_256x240.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png)bin6922 -> 6922 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_2e83ff_256x240.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png)bin4549 -> 4549 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_454545_256x240.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png)bin6992 -> 6992 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_888888_256x240.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png)bin6999 -> 6999 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png)bin4549 -> 4549 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/knacss.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/messages.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/print.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style-default.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/fonts/Roboto.woff (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff)bin22172 -> 22172 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/highlight.pack.js (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/default.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/github.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/googlecode.css (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/backtotop.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png)bin326 -> 326 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/bad-display.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png)bin343 -> 343 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png)bin277 -> 277 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png)bin235 -> 235 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png)bin216 -> 216 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/envelop.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png)bin285 -> 285 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/flattr.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png)bin270 -> 270 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/left.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png)bin196 -> 196 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/link.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png)bin341 -> 341 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/print.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png)bin321 -> 321 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/remove.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png)bin252 -> 252 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/rss.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/shaarli.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png)bin729 -> 729 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png)bin314 -> 314 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png)bin281 -> 281 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png)bin212 -> 212 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/twitter.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png)bin297 -> 297 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/logo.svg (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/close.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png)bin662 -> 662 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/cross.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png)bin655 -> 655 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/help.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png)bin786 -> 786 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/tick.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png)bin537 -> 537 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/warning.png (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png)bin666 -> 666 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/public/js/closeMessage.js (renamed from src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/tags.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/tags.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/default/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/default/theme.ini)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/default/view.twig (renamed from src/Wallabag/CoreBundle/Resources/views/default/view.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/README.md (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig38
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/css/style-dmagenta.css (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/backtotop.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png)bin326 -> 326 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/bad-display.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png)bin343 -> 343 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png)bin277 -> 277 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png)bin235 -> 235 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png)bin216 -> 216 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/envelop.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png)bin285 -> 285 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/flattr.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png)bin270 -> 270 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/left.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png)bin196 -> 196 bytes
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/link.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png)bin341 -> 341 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/remove.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png)bin252 -> 252 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/rss.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/shaarli.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png)bin729 -> 729 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png)bin314 -> 314 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png)bin281 -> 281 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png)bin212 -> 212 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/twitter.png (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png)bin297 -> 297 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/screenshot.jpg (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg)bin731866 -> 731866 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/README.md (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/Solarized-LICENSE.txt (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig38
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/css/style-solarized-dark.css (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/backtotop.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png)bin242 -> 242 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/bad-display.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png)bin419 -> 419 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png)bin464 -> 464 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png)bin164 -> 164 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png)bin186 -> 186 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/envelop.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png)bin335 -> 335 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/flattr.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png)bin314 -> 314 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/left.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png)bin148 -> 148 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/link.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png)bin424 -> 424 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/remove.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png)bin329 -> 329 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/rss.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/shaarli.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png)bin729 -> 729 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png)bin441 -> 441 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png)bin327 -> 327 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png)bin173 -> 173 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/twitter.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png)bin388 -> 388 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/screenshot.jpg (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg)bin230456 -> 230456 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/README.md (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/README.md)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/Solarized-LICENSE.txt (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig38
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/css/style-solarized.css (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/backtotop.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png)bin249 -> 249 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/bad-display.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png)bin434 -> 434 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png)bin475 -> 475 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png)bin163 -> 163 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/down.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png)bin189 -> 189 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/envelop.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png)bin340 -> 340 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/flattr.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png)bin315 -> 315 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/left.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png)bin139 -> 139 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/link.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png)bin425 -> 425 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/remove.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png)bin332 -> 332 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/rss.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png)bin288 -> 288 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/shaarli.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png)bin729 -> 729 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-off.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png)bin455 -> 455 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-on.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png)bin332 -> 332 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/top.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png)bin172 -> 172 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/twitter.png (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png)bin407 -> 407 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/screenshot.jpg (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg)bin245928 -> 245928 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/solarized/theme.ini (renamed from src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini)0
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php8
l---------web/themes/_global2
l---------web/themes/baggy2
l---------web/themes/dark2
l---------web/themes/default2
l---------web/themes/dmagenta2
l---------web/themes/solarized2
l---------web/themes/solarized-dark2
247 files changed, 938 insertions, 143 deletions
diff --git a/.gitignore b/.gitignore
index 3fbe668c..72e5ffad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,4 @@
35 35
36# Data for wallabag 36# Data for wallabag
37data/assets/* 37data/assets/*
38data/db/poche*.sqlite 38data/db/wallabag*.sqlite
diff --git a/app/AppKernel.php b/app/AppKernel.php
index fe61b255..d134de3c 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -21,6 +21,7 @@ class AppKernel extends Kernel
21 new JMS\SerializerBundle\JMSSerializerBundle(), 21 new JMS\SerializerBundle\JMSSerializerBundle(),
22 new Nelmio\ApiDocBundle\NelmioApiDocBundle(), 22 new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
23 new Nelmio\CorsBundle\NelmioCorsBundle(), 23 new Nelmio\CorsBundle\NelmioCorsBundle(),
24 new Liip\ThemeBundle\LiipThemeBundle(),
24 new Wallabag\CoreBundle\WallabagCoreBundle() 25 new Wallabag\CoreBundle\WallabagCoreBundle()
25 ); 26 );
26 27
diff --git a/app/config/config.yml b/app/config/config.yml
index 8e7258ea..1bd93d64 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -128,3 +128,24 @@ nelmio_cors:
128 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 128 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
129 max_age: 3600 129 max_age: 3600
130 hosts: ['^api\.'] 130 hosts: ['^api\.']
131
132liip_theme:
133 load_controllers: false
134 themes:
135 - baggy
136 - dark
137 - default
138 - dmagenta
139 - solarized
140 - solarized-dark
141 autodetect_theme: wallabag_core.helper.detect_active_theme
142
143 path_patterns:
144 app_resource:
145 - %%app_path%%/views/themes/%%current_theme%%/%%template%%
146 - %%app_path%%/views/%%template%%
147 bundle_resource:
148 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
149 bundle_resource_dir:
150 - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
151 - %%dir%%/views/%%bundle_name%%/%%override_path%%
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 83e2922a..a6ead1e8 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -17,4 +17,6 @@ swiftmailer:
17 17
18doctrine: 18doctrine:
19 dbal: 19 dbal:
20 path: %kernel.root_dir%/../data/db/poche_test.sqlite 20 driver: pdo_sqlite
21 path: %kernel.root_dir%/../data/db/wallabag_test.sqlite
22 host: localhost
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 20f6979a..d681b39b 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -19,6 +19,6 @@ logout:
19 path: /logout 19 path: /logout
20 20
21rest : 21rest :
22 type : rest 22 type : rest
23 resource : "routing_rest.yml" 23 resource : "routing_rest.yml"
24 prefix : /api \ No newline at end of file 24 prefix : /api
diff --git a/composer.json b/composer.json
index d49f3df3..0b162c02 100644
--- a/composer.json
+++ b/composer.json
@@ -75,6 +75,7 @@
75 "tecnick.com/tcpdf": "~6.2", 75 "tecnick.com/tcpdf": "~6.2",
76 "simplepie/simplepie": "~1.3.1", 76 "simplepie/simplepie": "~1.3.1",
77 "htmlawed/htmlawed": "dev-master", 77 "htmlawed/htmlawed": "dev-master",
78 "liip/theme-bundle": "1.1.3",
78 "wallabag/PHP-Flash-Messages": "dev-master", 79 "wallabag/PHP-Flash-Messages": "dev-master",
79 "wallabag/kriss_php5": "dev-master", 80 "wallabag/kriss_php5": "dev-master",
80 "wallabag/pagination": "dev-master", 81 "wallabag/pagination": "dev-master",
diff --git a/composer.lock b/composer.lock
index 8fd4b2ab..a6102a81 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "4cbcfeafb3c1dc4ed8c364e93969808f", 7 "hash": "fd56c671d70f498ccc1996450479fbdc",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "doctrine/annotations", 10 "name": "doctrine/annotations",
@@ -1283,6 +1283,61 @@
1283 "time": "2014-12-12 05:04:05" 1283 "time": "2014-12-12 05:04:05"
1284 }, 1284 },
1285 { 1285 {
1286 "name": "liip/theme-bundle",
1287 "version": "1.1.3",
1288 "target-dir": "Liip/ThemeBundle",
1289 "source": {
1290 "type": "git",
1291 "url": "https://github.com/liip/LiipThemeBundle.git",
1292 "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b"
1293 },
1294 "dist": {
1295 "type": "zip",
1296 "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b",
1297 "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b",
1298 "shasum": ""
1299 },
1300 "require": {
1301 "php": ">=5.3.3",
1302 "symfony/framework-bundle": "~2.0"
1303 },
1304 "require-dev": {
1305 "symfony/console": "~2.0",
1306 "symfony/expression-language": "~2.6"
1307 },
1308 "type": "symfony-bundle",
1309 "extra": {
1310 "branch-alias": {
1311 "dev-master": "1.1-dev"
1312 }
1313 },
1314 "autoload": {
1315 "psr-0": {
1316 "Liip\\ThemeBundle": ""
1317 }
1318 },
1319 "notification-url": "https://packagist.org/downloads/",
1320 "license": [
1321 "MIT"
1322 ],
1323 "authors": [
1324 {
1325 "name": "Community contributions",
1326 "homepage": "https://github.com/liip/LiipThemeBundle/contributors"
1327 },
1328 {
1329 "name": "Liip AG",
1330 "homepage": "http://www.liip.ch/"
1331 }
1332 ],
1333 "description": "Provides theming support for #Symfony2 Bundles",
1334 "keywords": [
1335 "themes",
1336 "theming"
1337 ],
1338 "time": "2015-02-02 15:55:54"
1339 },
1340 {
1286 "name": "mgargano/simplehtmldom", 1341 "name": "mgargano/simplehtmldom",
1287 "version": "1.5", 1342 "version": "1.5",
1288 "source": { 1343 "source": {
@@ -2590,7 +2645,7 @@
2590 "description": "Libraries from @fivefilters.", 2645 "description": "Libraries from @fivefilters.",
2591 "homepage": "https://github.com/wallabag/Fivefilters_Libraries", 2646 "homepage": "https://github.com/wallabag/Fivefilters_Libraries",
2592 "support": { 2647 "support": {
2593 "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/master", 2648 "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/1.0.0",
2594 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues" 2649 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues"
2595 }, 2650 },
2596 "time": "2015-01-19 20:19:28" 2651 "time": "2015-01-19 20:19:28"
@@ -2635,7 +2690,7 @@
2635 "description": "PHP Classes for dynamically generating EPub files.", 2690 "description": "PHP Classes for dynamically generating EPub files.",
2636 "homepage": "https://github.com/wallabag/PHPePub", 2691 "homepage": "https://github.com/wallabag/PHPePub",
2637 "support": { 2692 "support": {
2638 "source": "https://github.com/wallabag/PHPePub/tree/master" 2693 "source": "https://github.com/wallabag/PHPePub/tree/2.1.0"
2639 }, 2694 },
2640 "time": "2015-01-19 11:44:19" 2695 "time": "2015-01-19 11:44:19"
2641 }, 2696 },
@@ -2672,7 +2727,7 @@
2672 "description": "A simple and smart (or stupid) php5 snippets repository", 2727 "description": "A simple and smart (or stupid) php5 snippets repository",
2673 "homepage": "https://github.com/wallabag/kriss_php5", 2728 "homepage": "https://github.com/wallabag/kriss_php5",
2674 "support": { 2729 "support": {
2675 "source": "https://github.com/wallabag/kriss_php5/tree/master" 2730 "source": "https://github.com/wallabag/kriss_php5/tree/1.0.0"
2676 }, 2731 },
2677 "time": "2015-01-18 21:21:43" 2732 "time": "2015-01-18 21:21:43"
2678 }, 2733 },
@@ -2709,7 +2764,7 @@
2709 "description": "Paginate record sets, not tied in directly to a database.", 2764 "description": "Paginate record sets, not tied in directly to a database.",
2710 "homepage": "https://github.com/wallabag/pagination", 2765 "homepage": "https://github.com/wallabag/pagination",
2711 "support": { 2766 "support": {
2712 "source": "https://github.com/wallabag/pagination/tree/master" 2767 "source": "https://github.com/wallabag/pagination/tree/1.0.0"
2713 }, 2768 },
2714 "time": "2015-01-19 09:24:39" 2769 "time": "2015-01-19 09:24:39"
2715 }, 2770 },
@@ -2755,7 +2810,7 @@
2755 "sessions" 2810 "sessions"
2756 ], 2811 ],
2757 "support": { 2812 "support": {
2758 "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/master" 2813 "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/1.0.0"
2759 }, 2814 },
2760 "time": "2015-01-18 19:51:55" 2815 "time": "2015-01-18 19:51:55"
2761 }, 2816 },
@@ -2809,7 +2864,7 @@
2809 "html" 2864 "html"
2810 ], 2865 ],
2811 "support": { 2866 "support": {
2812 "source": "https://github.com/wallabag/php-readability/tree/master", 2867 "source": "https://github.com/wallabag/php-readability/tree/1.0.0",
2813 "issues": "https://github.com/wallabag/php-readability/issues" 2868 "issues": "https://github.com/wallabag/php-readability/issues"
2814 }, 2869 },
2815 "time": "2015-01-19 12:25:38" 2870 "time": "2015-01-19 12:25:38"
@@ -2847,7 +2902,7 @@
2847 "description": "An experimental Mobipocket file creator in PHP.", 2902 "description": "An experimental Mobipocket file creator in PHP.",
2848 "homepage": "https://github.com/wallabag/phpMobi", 2903 "homepage": "https://github.com/wallabag/phpMobi",
2849 "support": { 2904 "support": {
2850 "source": "https://github.com/wallabag/phpMobi/tree/master" 2905 "source": "https://github.com/wallabag/phpMobi/tree/1.0.0"
2851 }, 2906 },
2852 "time": "2015-01-19 12:43:17" 2907 "time": "2015-01-19 12:43:17"
2853 }, 2908 },
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 68e034fa..4e895875 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -7,7 +7,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Wallabag\CoreBundle\Entity\Config; 8use Wallabag\CoreBundle\Entity\Config;
9use Wallabag\CoreBundle\Entity\User; 9use Wallabag\CoreBundle\Entity\User;
10use Wallabag\CoreBundle\Form\Type\ConfigType;
11use Wallabag\CoreBundle\Form\Type\ChangePasswordType; 10use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
12use Wallabag\CoreBundle\Form\Type\UserType; 11use Wallabag\CoreBundle\Form\Type\UserType;
13use Wallabag\CoreBundle\Form\Type\NewUserType; 12use Wallabag\CoreBundle\Form\Type\NewUserType;
@@ -25,14 +24,18 @@ class ConfigController extends Controller
25 $config = $this->getConfig(); 24 $config = $this->getConfig();
26 $user = $this->getUser(); 25 $user = $this->getUser();
27 26
28 // handle basic config detail 27 // handle basic config detail (this form is defined as a service)
29 $configForm = $this->createForm(new ConfigType(), $config); 28 $configForm = $this->createForm('config', $config);
30 $configForm->handleRequest($request); 29 $configForm->handleRequest($request);
31 30
32 if ($configForm->isValid()) { 31 if ($configForm->isValid()) {
33 $em->persist($config); 32 $em->persist($config);
34 $em->flush(); 33 $em->flush();
35 34
35 // switch active theme
36 $activeTheme = $this->get('liip_theme.active_theme');
37 $activeTheme->setName($config->getTheme());
38
36 $this->get('session')->getFlashBag()->add( 39 $this->get('session')->getFlashBag()->add(
37 'notice', 40 'notice',
38 'Config saved' 41 'Config saved'
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 7b4464a1..91f9bfe8 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -48,7 +48,7 @@ class Config
48 private $language; 48 private $language;
49 49
50 /** 50 /**
51 * @ORM\ManyToOne(targetEntity="User", inversedBy="config") 51 * @ORM\OneToOne(targetEntity="User", inversedBy="config")
52 */ 52 */
53 private $user; 53 private $user;
54 54
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php
index 193dfebc..ed5cfe53 100644
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@ -92,6 +92,11 @@ class User implements AdvancedUserInterface, \Serializable
92 */ 92 */
93 private $entries; 93 private $entries;
94 94
95 /**
96 * @ORM\OneToOne(targetEntity="Config", mappedBy="user")
97 */
98 private $config;
99
95 public function __construct() 100 public function __construct()
96 { 101 {
97 $this->salt = md5(uniqid(null, true)); 102 $this->salt = md5(uniqid(null, true));
@@ -320,4 +325,26 @@ class User implements AdvancedUserInterface, \Serializable
320 { 325 {
321 return $this->isActive; 326 return $this->isActive;
322 } 327 }
328 /**
329 * Set config
330 *
331 * @param \Wallabag\CoreBundle\Entity\Config $config
332 * @return User
333 */
334 public function setConfig(\Wallabag\CoreBundle\Entity\Config $config = null)
335 {
336 $this->config = $config;
337
338 return $this;
339 }
340
341 /**
342 * Get config
343 *
344 * @return \Wallabag\CoreBundle\Entity\Config
345 */
346 public function getConfig()
347 {
348 return $this->config;
349 }
323} 350}
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index a1e0ce47..0c8706e2 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -7,20 +7,23 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
7 7
8class ConfigType extends AbstractType 8class ConfigType extends AbstractType
9{ 9{
10 private $themes = array();
11
12 /**
13 * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
14 */
15 public function __construct($themes)
16 {
17 $this->themes = array_combine(
18 $themes,
19 array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
20 );
21 }
22
10 public function buildForm(FormBuilderInterface $builder, array $options) 23 public function buildForm(FormBuilderInterface $builder, array $options)
11 { 24 {
12 $builder 25 $builder
13 ->add('theme', 'choice', array( 26 ->add('theme', 'choice', array('choices' => $this->themes))
14 'choices' => array(
15 'baggy' => 'Baggy',
16 'courgette' => 'Courgette',
17 'dark' => 'Dark',
18 'default' => 'Default',
19 'dmagenta' => 'Dmagenta',
20 'solarized' => 'Solarized',
21 'solarized_dark' => 'Solarized Dark',
22 ),
23 ))
24 ->add('items_per_page', 'text') 27 ->add('items_per_page', 'text')
25 ->add('language') 28 ->add('language')
26 ->add('save', 'submit') 29 ->add('save', 'submit')
diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
new file mode 100644
index 00000000..2a943bb7
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -0,0 +1,47 @@
1<?php
2
3namespace Wallabag\CoreBundle\Helper;
4
5use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
6use Symfony\Component\Security\Core\SecurityContextInterface;
7use Wallabag\CoreBundle\Entity\User;
8
9class DetectActiveTheme implements DeviceDetectionInterface
10{
11 protected $securityContext;
12
13 public function __construct(SecurityContextInterface $securityContext)
14 {
15 $this->securityContext = $securityContext;
16 }
17
18 public function setUserAgent($userAgent)
19 {
20 }
21
22 /**
23 * This should return the active theme for the logged in user.
24 * No active theme for:
25 * - anonymous user
26 * - user without a config (shouldn't happen..)
27 *
28 * @return string
29 */
30 public function getType()
31 {
32 $user = $this->securityContext->getToken()->getUser();
33
34 // anon user don't deserve a theme
35 if (!$user instanceof User) {
36 return false;
37 }
38
39 $config = $user->getConfig();
40
41 if (!$config) {
42 return false;
43 }
44
45 return $config->getTheme();
46 }
47}
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index b066c1a3..5437d1cf 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -1,15 +1,29 @@
1services: 1services:
2 wallabag_core.twig.wallabag: 2 wallabag_core.twig.extension:
3 class: Wallabag\CoreBundle\Twig\Extension\WallabagExtension 3 class: Wallabag\CoreBundle\Twig\Extension\WallabagExtension
4 tags: 4 tags:
5 - { name: twig.extension } 5 - { name: twig.extension }
6
6 wsse.security.authentication.provider: 7 wsse.security.authentication.provider:
7 class: Wallabag\CoreBundle\Security\Authentication\Provider\WsseProvider 8 class: Wallabag\CoreBundle\Security\Authentication\Provider\WsseProvider
8 public: false 9 public: false
9 arguments: ['', '%kernel.cache_dir%/security/nonces'] 10 arguments: ['', '%kernel.cache_dir%/security/nonces']
11
10 wsse.security.authentication.listener: 12 wsse.security.authentication.listener:
11 class: Wallabag\CoreBundle\Security\Firewall\WsseListener 13 class: Wallabag\CoreBundle\Security\Firewall\WsseListener
12 public: false 14 public: false
13 tags: 15 tags:
14 - { name: monolog.logger, channel: wsse } 16 - { name: monolog.logger, channel: wsse }
15 arguments: ['@security.context', '@security.authentication.manager', '@logger'] 17 arguments: ['@security.context', '@security.authentication.manager', '@logger']
18
19 wallabag_core.helper.detect_active_theme:
20 class: Wallabag\CoreBundle\Helper\DetectActiveTheme
21 arguments:
22 - @security.context
23
24 wallabag_core.form.type.config:
25 class: Wallabag\CoreBundle\Form\Type\ConfigType
26 arguments:
27 - %liip_theme.themes%
28 tags:
29 - { name: form.type, alias: config }
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index 3bdbe812..b7ec3a83 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
@@ -1,28 +1,4 @@
1<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152"> 1{% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
2<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
3
4<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
5<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
6
7<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
8<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
9
10<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
11<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
12
13<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
14<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
15
16<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
17<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
18
19<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
20<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
21
22<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
23<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
24
25<link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
26 2
27<link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all"> 3<link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
28<link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all"> 4<link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
diff --git a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
index e69de29b..18e294c9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
@@ -0,0 +1,9 @@
1
2{% if flashMessages %}
3<div class="messages success">
4 <a href="#" class="closeMessage">×</a>
5 {% for flashMessage in flashMessages %}
6 <p>{{ flashMessage }}</p>
7 {% endfor %}
8</div>
9{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
index 9313071d..a4403c13 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
@@ -1,5 +1,5 @@
1<header class="w600p center mbm"> 1<header class="w600p center mbm">
2 <h1> 2 <h1 class="logo">
3 {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %} 3 {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %}
4 </h1> 4 </h1>
5</header> 5</header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
deleted file mode 100644
index ae3f086c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
+++ /dev/null
@@ -1,31 +0,0 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="{{ lang }}"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="{{ lang }}"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="{{ lang }}"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="{{ lang }}"><![endif]-->
6<html lang="{{ lang }}">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14{% include '_head.twig' %}
15{% include '_bookmarklet.twig' %}
16 </head>
17 <body class="login">
18 {% include '_top.twig' %}
19 <div id="main">
20 {% block menu %}{% endblock %}
21 {% block precontent %}{% endblock %}
22 {% block messages %}
23 {% include '_messages.twig' %}
24 {% endblock %}
25 <div id="content" class="w600p center">
26 {% block content %}{% endblock %}
27 </div>
28 </div>
29{% include '_footer.twig' %}
30 </body>
31</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
deleted file mode 100644
index d4eb46d2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
1{% extends "layout-login.twig" %}
2
3{% block title %}{% trans "login to your wallabag" %}{% endblock %}
4{% block content %}
5 {% if http_auth == 0 %}
6 <form method="post" action="?login" name="loginform">
7 <fieldset class="w500p center">
8 <h2 class="mbs txtcenter">{% trans "Login to wallabag" %}</h2>
9 {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
10 <div class="row">
11 <label class="col w150p" for="login">{% trans "Username" %}</label>
12 <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
13 </div>
14
15 <div class="row">
16 <label class="col w150p" for="password">{% trans "Password" %}</label>
17 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
18 </div>
19 <div class="row">
20
21 <div class="col">
22 <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
23 <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
24 </div>
25 </div>
26 <div class="row mts txtcenter">
27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
28 </div>
29 </fieldset>
30 <input type="hidden" name="returnurl" value="{{ referer }}">
31 <input type="hidden" name="token" value="{{ token }}">
32 </form>
33 {% endif %}
34{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
index d1aacc47..45deee8f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
@@ -14,6 +14,7 @@
14 {% include "WallabagCoreBundle::_head.html.twig" %} 14 {% include "WallabagCoreBundle::_head.html.twig" %}
15 </head> 15 </head>
16 <body class="login"> 16 <body class="login">
17 <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
17 {% include "WallabagCoreBundle::_top.html.twig" %} 18 {% include "WallabagCoreBundle::_top.html.twig" %}
18 <div id="main"> 19 <div id="main">
19 {% block menu %}{% endblock %} 20 {% block menu %}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index e9ccc58c..1cf871d6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -14,19 +14,16 @@
14 {% include "WallabagCoreBundle::_head.html.twig" %} 14 {% include "WallabagCoreBundle::_head.html.twig" %}
15 </head> 15 </head>
16 <body> 16 <body>
17 {% include "WallabagCoreBundle::_top.html.twig" %} 17 <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
18 <div id="main"> 18 {% include "WallabagCoreBundle::_top.html.twig" %}
19 {% block menu %}{% endblock %} 19 <div id="main">
20 {% block precontent %}{% endblock %} 20 {% block menu %}{% endblock %}
21 {% for flashMessage in app.session.flashbag.get('notice') %} 21 {% block precontent %}{% endblock %}
22 <div class="flash-notice"> 22 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
23 {{ flashMessage }} 23 <div id="content" class="w600p center">
24 {% block content %}{% endblock %}
24 </div> 25 </div>
25 {% endfor %}
26 <div id="content" class="w600p center">
27 {% block content %}{% endblock %}
28 </div> 26 </div>
29 </div> 27 {% include "WallabagCoreBundle::_footer.html.twig" %}
30 {% include "WallabagCoreBundle::_footer.html.twig" %}
31 </body> 28 </body>
32</html> 29</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
new file mode 100644
index 00000000..175a4b3a
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
@@ -0,0 +1,26 @@
1
2<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
3<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
4
5<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
6<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
7
8<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
9<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
10
11<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
12<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
13
14<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
15<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
16
17<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
18<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
19
20<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
21<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
22
23<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
24<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
25
26<link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.css
index 5690172f..5690172f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
index 4dba92a8..4dba92a8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
new file mode 100644
index 00000000..9e68300a
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
@@ -0,0 +1 @@
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}}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
new file mode 100644
index 00000000..e3069b86
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
@@ -0,0 +1,447 @@
1@font-face {
2 font-family: 'Roboto';
3 font-style: normal;
4 font-weight: 400;
5 src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
6}
7
8
9
10body {
11 margin: 10px;
12 font-family: 'Roboto',Verdana,Geneva,sans-serif;
13 font-size: 16px;
14 color: #000;
15}
16
17header {
18 text-align: center;
19}
20
21header h1 {
22 font-size: 1.3em;
23}
24
25a,
26a:hover,
27a:visited {
28 color: #000;
29}
30
31.bouton {
32 border: none;
33 border-radius: 2px;
34 color: #fff;
35 background-color: #000;
36}
37
38.bouton:hover {
39 color: #f1f1f1;
40 background-color: #222;
41 cursor: pointer;
42}
43
44#main {
45 margin: 0 auto;
46}
47
48#main #links {
49 padding: 0;
50 text-align: center;
51 font-size: 0.9em;
52 list-style-type: none;
53}
54
55#main #links li {
56 display: inline;
57}
58
59#main #links li .current {
60 -webkit-border-radius: 2px;
61 border-radius: 2px;
62 color: #fff;
63 background-color: #000;
64}
65
66#main #sort {
67 padding: 0;
68 text-align: center;
69 list-style-type: none;
70 opacity: 0.5;
71}
72
73#main #sort li {
74 display: inline;
75 font-size: 0.9em;
76}
77
78#main #sort li + li {
79 margin-left: 10px;
80}
81
82#main #sort a {
83 padding: 2px 2px 0;
84 vertical-align: middle;
85}
86
87#main #sort img {
88 vertical-align: baseline;
89}
90#main #sort img:hover {
91 cursor: pointer;
92}
93
94#links a {
95 padding: 5px 10px;
96 text-decoration: none;
97}
98
99#links a:hover {
100 -webkit-border-radius: 2px;
101 border-radius: 2px;
102 color: #f1f1f1;
103 background-color: #040707;
104}
105
106/*** ***/
107
108/*** LINKS DISPLAY ***/
109
110#main .tool {
111 text-decoration: none;
112 cursor: pointer;
113}
114
115#main #content {
116 margin-top: 20px;
117}
118
119#main #content h2 {
120 text-decoration: none;
121 font-size: 1.3em;
122}
123
124#main #content .entrie {
125 margin-top: 15px;
126 padding-bottom: 15px;
127 border-bottom: 1px dashed #222;
128 overflow: hidden;
129}
130
131/* First entry */
132#main #content .results + .entrie {
133 clear: both;
134 margin-top: 0;
135}
136
137#main .entrie .tools {
138 float: right;
139 text-align: right;
140 list-style-type: none;
141 opacity: 0.5;
142}
143
144#main .entrie .tools .tool span {
145 display: inline-block;
146 width: 16px;
147 height: 16px;
148 /* Hide textual content */
149 overflow: hidden;
150 text-align: left;
151 text-indent: -9999px;
152}
153
154/*** ***/
155
156/*** ARTICLE PAGE ***/
157
158#article {
159 margin: 0 auto;
160}
161
162#article header {
163 border-bottom: 1px solid #222;
164}
165
166#article header {
167 text-align: left;
168}
169
170#article header h1 small {
171 float: right;
172 font-size: 0.6em;
173}
174
175#article header a {
176 text-decoration: none;
177}
178
179#article .tags {
180 font-size: 0.8em;
181 color: #888;
182 padding-bottom: 5px;
183}
184
185.backhome {
186 display: inline;
187}
188
189.results {
190 padding: 15px 0;
191 overflow: hidden;
192}
193
194.nb-results {
195 float: left;
196 font-size: 0.9em;
197 line-height: 24px;
198 vertical-align: middle;
199}
200
201#article_toolbar {
202 position: fixed;
203 bottom: 0;
204 left: 0;
205 width: 100%;
206 min-height: 50px;
207 padding-top: 17px;
208 text-align: center;
209 color: #fff;
210 opacity: 0.8;
211 background: #fff;
212}
213
214#article_toolbar li {
215 display: inline;
216 padding-right: 30px;
217}
218
219#article_toolbar .tool {
220 padding: 0 2px;
221}
222
223#article_toolbar .tool span {
224 display: inline-block;
225 width: 16px;
226 height: 16px;
227 /* Hide textual content */
228 overflow: hidden;
229 text-align: left;
230 text-indent: -9999px;
231}
232
233/*** ***/
234
235/*** PAGINATION ***/
236
237.pagination {
238 float: right;
239 text-align: right;
240}
241
242.pagination a {
243 height: 25px;
244 margin: 2px;
245 padding: 4px 8px;
246 border: 1px solid #d5d5d5;
247 text-decoration: none;
248 font-size: 11px;
249 font-weight: bold;
250 color: #333;
251}
252
253.pagination a:hover,
254.pagination a:active {
255 background-color: #efefef;
256}
257
258.pagination .current {
259 height: 25px;
260 margin: 2px;
261 padding: 4px 8px;
262 border: 1px solid #d5d5d5;
263 text-decoration: none;
264 font-size: 11px;
265 font-weight: bold;
266 color: #000;
267 background-color: #ccc;
268}
269
270.pagination .disabled {
271 display: none;
272}
273
274#bookmarklet {
275 padding: 5px;
276 border: 1px dashed #808080;
277 background: #fff;
278 cursor: move;
279}
280
281.top_link {
282 display: none;
283 z-index: 2000;
284 position: fixed;
285 right: 15px;
286 bottom: 15px;
287 padding: 20px;
288 -webkit-border-radius: 40px;
289 -moz-border-radius: 40px;
290 border-radius: 40px;
291 opacity: 0.9;
292 background: #ccc;
293}
294
295footer {
296 clear: both;
297}
298
299.reading-time {
300 font-size: 0.8em;
301}
302
303#inputform {
304 display: none;
305 margin-top: 5px;
306 margin-right: auto;
307 margin-left: auto;
308 padding-bottom: 5px;
309 max-width: 300px;
310 border-radius: 3px;
311 text-align: center;
312 color: #fff;
313 opacity: 0.8;
314 background-color: rgba(0,0,0,0.9);
315}
316
317a.back span,
318a.top span,
319a.fav span,
320a.fav span:hover,
321a.fav-off span,
322a.fav-off span:hover,
323a.archive span,
324a.archive span:hover,
325a.archive-off span,
326a.archive-off span:hover,
327a.twitter span,
328a.shaarli span,
329a.flattr span,
330a.email span,
331a.delete span,
332a.link span,
333a.bad-display span,
334a.reading-time span,
335a.print span {
336 background-repeat: no-repeat;
337}
338
339.arrow-down {
340 width: 0px;
341 height: 0px;
342 border-style: solid;
343 border-width: 10px 10px 0 10px;
344 border-color: #000 transparent transparent transparent;
345
346 position: absolute;
347 margin-top: 1.5em;
348 margin-left: -30px;
349}
350
351.two-column {
352 display: block;
353 width: 50%;
354 paddig-right: 20px;
355 float: left;
356 vertical-align: top;
357}
358
359
360/* ==========================================================================
361 "save a link" popup div related styles
362 ========================================================================== */
363
364#bagit-form {
365 display: none;
366 padding-left: 30px;
367 width: 450px;
368
369}
370
371a#bagit-form-close {
372 color: #FFF;
373 display: inline-block;
374 float: right;
375 background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
376 height: 16px;
377 margin: -14px -8px 0 0;
378 width: 16px;
379 text-decoration: none;
380}
381
382
383.add-to-wallabag-link-after {
384 background-color: #000;
385 color: #fff;
386 padding: 0 4px 1px 3px;
387 font-weight: bold;
388 font-size: 0.7em;
389 border-radius: 4px;
390}
391.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
392 color: #fff;
393}
394.add-to-wallabag-link-after:visited {
395 color: #999;
396}
397a.add-to-wallabag-link-after {
398 visibility: hidden;
399 position: absolute;
400 opacity: 0;
401 transition-duration: 2s;
402 transition-timing-function: ease-out;
403}
404#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
405 opacity: 1;
406 visibility: visible;
407 transition-duration: .3s;
408 transition-timing-function: ease-in;
409}
410a.add-to-wallabag-link-after:after {
411 content: "w";
412}
413
414
415#add-link-result {
416 display: inline;
417 padding-left: 10px;
418}
419
420/* ==========================================================================
421 "Search" popup div related styles
422 ========================================================================== */
423
424/* Search form message needs a little more width, depending on translations */
425#search-form {
426 width: 420px;
427}
428
429.opacity03 {
430 /*opacity: 0.3;*/
431}
432
433#readLeftPercent {
434 display: inline-block;
435 /* Show textual content */
436 overflow: visible;
437 text-align: left;
438 text-indent: 0;
439 color: black;
440 width: 50px;
441}
442
443pre code {
444 font-family: "Courier New", Courier, monospace;
445 border: 1px solid #ddd;
446 font-size: 0.96em;
447}
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-114.png
index 0e96edd5..0e96edd5 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-114.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-120.png
index dc5aab1c..dc5aab1c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-120.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-144.png
index 1d005db6..1d005db6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-144.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
index f915231f..f915231f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-57.png
index 5aa19ed9..5aa19ed9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-57.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-72.png
index b8b48e1b..b8b48e1b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-72.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-76.png
index 9f9dba27..9f9dba27 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-76.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon.png
index 9cf29e2b..9cf29e2b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/favicon.ico
index 0346558b..0346558b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/favicon.ico
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--black.png
index 6da7925b..6da7925b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--black.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--white.png
index a70044b6..a70044b6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--white.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--black.png
index 32bca194..32bca194 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--black.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--white.png
index fc48d47c..fc48d47c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--white.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoClose.js
index e9145b7e..e9145b7e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoClose.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.js
index 90bc982c..90bc982c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-2.0.3.min.js
index a4dd0a2f..a4dd0a2f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-2.0.3.min.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.js
index 6f599fca..6f599fca 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
index 31635026..31635026 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js
index d233e600..d233e600 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/restoreScroll.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/saveLink.js
index a7acd84c..a7acd84c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/saveLink.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
index 1f0054a4..1f0054a4 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
index 382dd5f1..382dd5f1 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
index c5c07d49..c5c07d49 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
index 15f15560..15f15560 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
new file mode 100644
index 00000000..16070c7f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -0,0 +1,43 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15
16 <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
17 <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
18 <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
19 <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
20 <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
21
22 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
23 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
24 <script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script>
25 <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
26 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
27 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
28 <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
29 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
30 </head>
31 <body>
32 {% include "WallabagCoreBundle::_top.html.twig" %}
33 <div id="main">
34 {% block menu %}{% endblock %}
35 {% block precontent %}{% endblock %}
36 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
37 <div id="content" class="w600p center">
38 {% block content %}{% endblock %}
39 </div>
40 </div>
41 {% include "WallabagCoreBundle::_footer.html.twig" %}
42 </body>
43</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
new file mode 100644
index 00000000..4a1dc05d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
@@ -0,0 +1,34 @@
1{% extends "layout-login.twig" %}
2
3{% block title %}{% trans "login to your wallabag" %}{% endblock %}
4{% block content %}
5 {% if http_auth == 0 %}
6 <form method="post" action="?login" name="loginform">
7 <fieldset class="w500p center">
8 <h2 class="mbs txtcenter">{% trans "Login to wallabag" %}</h2>
9 {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
10 <div class="row">
11 <label class="col w150p" for="login">{% trans "Username" %}</label>
12 <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
13 </div>
14
15 <div class="row">
16 <label class="col w150p" for="password">{% trans "Password" %}</label>
17 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
18 </div>
19 <div class="row">
20
21 <div class="col">
22 <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
23 <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
24 </div>
25 </div>
26 <div class="row mts txtcenter">
27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
28 </div>
29 </fieldset>
30 <input type="hidden" name="returnurl" value="{{ referer }}">
31 <input type="hidden" name="token" value="{{ token }}">
32 </form>
33 {% endif %}
34{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css
index 7c02a16f..7c02a16f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 1df82910..1df82910 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/messages.css
index 42da70b3..42da70b3 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/messages.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/print.css
index 9dd6d295..9dd6d295 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/print.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/ratatouille.css
index b203cbb8..b203cbb8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/ratatouille.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.eot
index 56323516..56323516 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.eot
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.svg
index b4586136..b4586136 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.ttf
index bb1f21f8..bb1f21f8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.ttf
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.woff
index bab13779..bab13779 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.woff
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/ptsans.woff
index cf7c62e1..cf7c62e1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/ptsans.woff
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/blank.png
index 63e09844..63e09844 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/blank.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/down.png
index b9d536a7..b9d536a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/list.png
index bd5aff5a..bd5aff5a 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/list.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/table.png
index 859c4cd8..859c4cd8 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/table.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/top.png
index 954a8c0a..954a8c0a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/bg-select.png
index 95120441..95120441 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/bg-select.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-other_themes.png
index 32543a44..32543a44 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-other_themes.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-w.png
index 65dc607b..65dc607b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-w.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-wallabag.svg
index 40193e1c..40193e1c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-wallabag.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.png
index 5305c77d..5305c77d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg
index 865da440..865da440 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
index 527719d5..527719d5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js
index 74cbae68..74cbae68 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
index 92719000..92719000 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/restoreScroll.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
index 19cd24bb..19cd24bb 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
index 65930eb2..65930eb2 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
index 31665e18..31665e18 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/dark/README.md
index 92077994..92077994 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/dark b/src/Wallabag/CoreBundle/Resources/views/themes/dark/dark
index 5743bc49..5743bc49 120000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/dark
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/dark
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig
new file mode 100644
index 00000000..e17c1392
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig
@@ -0,0 +1,38 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15
16 <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
17 <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
18 <link rel="stylesheet" href="{{ asset('themes/dark/css/style-dark.css') }}" media="all">
19
20 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
21 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
22 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
23 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
24 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
25 </head>
26 <body>
27 {% include "WallabagCoreBundle::_top.html.twig" %}
28 <div id="main">
29 {% block menu %}{% endblock %}
30 {% block precontent %}{% endblock %}
31 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
32 <div id="content" class="w600p center">
33 {% block content %}{% endblock %}
34 </div>
35 </div>
36 {% include "WallabagCoreBundle::_footer.html.twig" %}
37 </body>
38</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/css/style-dark.css
index 41782c48..41782c48 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/css/style-dark.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/backtotop.png
index c885086d..c885086d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/backtotop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/bad-display.png
index 66ea2e16..66ea2e16 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/bad-display.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-off.png
index 661ea997..661ea997 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-on.png
index 5ee8c8d3..5ee8c8d3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/down.png
index 4150e17c..4150e17c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/envelop.png
index 73d9b0b9..73d9b0b9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/envelop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/flattr.png
index b457d080..b457d080 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/flattr.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/left.png
index c2f7a20e..c2f7a20e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/left.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/link.png
index a5b8d8d2..a5b8d8d2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/link.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/remove.png
index 0c3dcfdf..0c3dcfdf 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/remove.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/rss.png
index 21bad1a1..21bad1a1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/rss.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/shaarli.png
index e68ac8b5..e68ac8b5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/shaarli.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-off.png
index 8194bc2d..8194bc2d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-on.png
index 109c3aec..109c3aec 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/top.png
index d137bd24..d137bd24 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/twitter.png
index 6ce8a4d9..6ce8a4d9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/twitter.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/public b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/public
index fd316b37..fd316b37 120000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/public
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/public
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/dark/screenshot.jpg
index daaad6c9..daaad6c9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/screenshot.jpg
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/dark/theme.ini
index 4b020d36..4b020d36 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_bookmarklet.twig
index c7e2f66e..c7e2f66e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_bookmarklet.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_footer.twig
index 25539f6b..25539f6b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_footer.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_head.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_head.twig
index 277e3833..277e3833 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_head.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_head.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_highlight.twig
index cdb7c6bf..cdb7c6bf 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_highlight.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_import.twig
index 63a2d3e2..63a2d3e2 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_import.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_menu.twig
index 83fa3717..83fa3717 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_menu.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_messages.twig
index b8481494..b8481494 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_messages.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_pocheit-form.twig
index 8c982db0..8c982db0 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_pocheit-form.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_search-form.twig
index 70f97356..70f97356 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_search-form.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_sorting.twig
index 3ce9b949..3ce9b949 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_sorting.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_top.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_top.twig
index 45806f01..45806f01 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_top.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/_top.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/about.twig
index 7ddb19d6..7ddb19d6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/about.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/about.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/config.twig
index 6769da74..6769da74 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/config.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/edit-tags.twig
index c29427e0..c29427e0 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/edit-tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/error.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/error.twig
index 528a0985..528a0985 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/error.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/error.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/export.twig
index 18a98a87..18a98a87 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/export.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/export.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/home.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/home.twig
index b9000559..b9000559 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/home.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/home.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/install.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/install.twig
index c89c7e47..c89c7e47 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/install.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/install.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/layout.twig
index d32395a2..d32395a2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/layout.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/login.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/login.twig
index b9f8b497..b9f8b497 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/login.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/login.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/animated-overlay.gif
index d441f75e..d441f75e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/animated-overlay.gif
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
index 9f10cb65..9f10cb65 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
index b89b914b..b89b914b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
index 780d3ffd..780d3ffd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
index da53255b..da53255b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
index f6306608..f6306608 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
index 7d347065..7d347065 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
index 533c4900..533c4900 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index bf3a9481..bf3a9481 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_222222_256x240.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
index 84b601bf..84b601bf 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_454545_256x240.png
index b6db1acd..b6db1acd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_454545_256x240.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_888888_256x240.png
index feea0e20..feea0e20 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_888888_256x240.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
index ed5b6b09..ed5b6b09 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/knacss.css
index ca0696b7..ca0696b7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/knacss.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/messages.css
index 46b54795..46b54795 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/messages.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/print.css
index 625478e1..625478e1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/print.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style-default.css
index 4406d48f..4406d48f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style-default.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style.css
index b25373d6..b25373d6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/fonts/Roboto.woff
index 1440b1be..1440b1be 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/fonts/Roboto.woff
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/highlight.pack.js
index 10a21c34..10a21c34 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/highlight.pack.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/default.css
index e5bd2801..e5bd2801 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/default.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/github.css
index 47fc2651..47fc2651 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/github.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/googlecode.css
index fd237367..fd237367 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/googlecode.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/backtotop.png
index 051238ef..051238ef 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/backtotop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/bad-display.png
index 6866799f..6866799f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/bad-display.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-off.png
index 3db5a06d..3db5a06d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-on.png
index cd3abb2c..cd3abb2c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/down.png
index b9d536a7..b9d536a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/envelop.png
index 6be1c886..6be1c886 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/envelop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/flattr.png
index 0404aaea..0404aaea 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/flattr.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/left.png
index a0a53631..a0a53631 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/left.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/link.png
index db62819d..db62819d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/link.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/print.png
index 83d6445b..83d6445b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/print.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/remove.png
index f8ad56a3..f8ad56a3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/remove.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/rss.png
index 21bad1a1..21bad1a1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/rss.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/shaarli.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-off.png
index 6a0133a7..6a0133a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-on.png
index a9f96eaa..a9f96eaa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/top.png
index 954a8c0a..954a8c0a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/twitter.png
index cfcfe419..cfcfe419 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/twitter.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/logo.svg
index 865da440..865da440 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/logo.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/close.png
index 731aa018..731aa018 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/close.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/cross.png
index 1514d51a..1514d51a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/cross.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/help.png
index 5c870176..5c870176 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/help.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/tick.png
index a9925a06..a9925a06 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/tick.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/warning.png
index 628cf2da..628cf2da 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/warning.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/js/closeMessage.js
index b57fe4a8..b57fe4a8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/js/closeMessage.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/tags.twig
index 47359ed1..47359ed1 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/default/theme.ini
index 9f3cfb6a..9f3cfb6a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/view.twig
index 154de1e4..154de1e4 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/view.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/default/view.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/README.md
index 6abc37e3..6abc37e3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig
new file mode 100644
index 00000000..0816e9dc
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig
@@ -0,0 +1,38 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15
16 <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
17 <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
18 <link rel="stylesheet" href="{{ asset('themes/dmagenta/css/style-dmagenta.css') }}" media="all">
19
20 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
21 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
22 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
23 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
24 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
25 </head>
26 <body>
27 {% include "WallabagCoreBundle::_top.html.twig" %}
28 <div id="main">
29 {% block menu %}{% endblock %}
30 {% block precontent %}{% endblock %}
31 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
32 <div id="content" class="w600p center">
33 {% block content %}{% endblock %}
34 </div>
35 </div>
36 {% include "WallabagCoreBundle::_footer.html.twig" %}
37 </body>
38</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/css/style-dmagenta.css
index 4dc592d2..4dc592d2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/css/style-dmagenta.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/backtotop.png
index 051238ef..051238ef 100755
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/backtotop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/bad-display.png
index 6866799f..6866799f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/bad-display.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-off.png
index 3db5a06d..3db5a06d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-on.png
index cd3abb2c..cd3abb2c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/down.png
index b9d536a7..b9d536a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/envelop.png
index 6be1c886..6be1c886 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/envelop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/flattr.png
index 0404aaea..0404aaea 100755
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/flattr.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/left.png
index a0a53631..a0a53631 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/left.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/link.png
index db62819d..db62819d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/link.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/remove.png
index f8ad56a3..f8ad56a3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/remove.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/rss.png
index 21bad1a1..21bad1a1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/rss.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/shaarli.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-off.png
index 6a0133a7..6a0133a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-on.png
index a9f96eaa..a9f96eaa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/top.png
index 954a8c0a..954a8c0a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/twitter.png
index cfcfe419..cfcfe419 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/twitter.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/screenshot.jpg
index ab8f1ec2..ab8f1ec2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/screenshot.jpg
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/theme.ini
index 78fa3a9c..78fa3a9c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/README.md
index 81be1f8c..81be1f8c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/Solarized-LICENSE.txt
index a842f663..a842f663 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/Solarized-LICENSE.txt
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig
new file mode 100644
index 00000000..8d62a31b
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig
@@ -0,0 +1,38 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15
16 <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
17 <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
18 <link rel="stylesheet" href="{{ asset('themes/solarized-dark/css/style-solarized-dark.css') }}" media="all">
19
20 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
21 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
22 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
23 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
24 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
25 </head>
26 <body>
27 {% include "WallabagCoreBundle::_top.html.twig" %}
28 <div id="main">
29 {% block menu %}{% endblock %}
30 {% block precontent %}{% endblock %}
31 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
32 <div id="content" class="w600p center">
33 {% block content %}{% endblock %}
34 </div>
35 </div>
36 {% include "WallabagCoreBundle::_footer.html.twig" %}
37 </body>
38</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/css/style-solarized-dark.css
index 77a97d38..77a97d38 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/css/style-solarized-dark.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/backtotop.png
index 1501c2a5..1501c2a5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/backtotop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/bad-display.png
index b2c3ca17..b2c3ca17 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/bad-display.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
index fd7d92fa..fd7d92fa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
index 592965dd..592965dd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/down.png
index 5de30315..5de30315 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/envelop.png
index d3468885..d3468885 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/envelop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/flattr.png
index 73e3f421..73e3f421 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/flattr.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/left.png
index a953d831..a953d831 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/left.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/link.png
index 5e859a0e..5e859a0e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/link.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/remove.png
index 66a5c1ab..66a5c1ab 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/remove.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/rss.png
index 21bad1a1..21bad1a1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/rss.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/shaarli.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-off.png
index 1c603ecc..1c603ecc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-on.png
index bc37772a..bc37772a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/top.png
index b3f44f31..b3f44f31 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/twitter.png
index c4a25334..c4a25334 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/twitter.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/screenshot.jpg
index 2ad87943..2ad87943 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/screenshot.jpg
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/theme.ini
index c9948146..c9948146 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/README.md
index 255e3cdd..255e3cdd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/Solarized-LICENSE.txt
index a842f663..a842f663 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/Solarized-LICENSE.txt
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig
new file mode 100644
index 00000000..bdb1a6fa
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig
@@ -0,0 +1,38 @@
1<!DOCTYPE html>
2<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
3<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
4<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
5<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
6<html lang="en">
7 <head>
8 <meta name="viewport" content="initial-scale=1.0">
9 <meta charset="utf-8">
10 <!--[if IE]>
11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
15
16 <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
17 <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
18 <link rel="stylesheet" href="{{ asset('themes/solarized/css/style-solarized.css') }}" media="all">
19
20 <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
21 <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
22 <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
23 <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
24 <script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
25 </head>
26 <body>
27 {% include "WallabagCoreBundle::_top.html.twig" %}
28 <div id="main">
29 {% block menu %}{% endblock %}
30 {% block precontent %}{% endblock %}
31 {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
32 <div id="content" class="w600p center">
33 {% block content %}{% endblock %}
34 </div>
35 </div>
36 {% include "WallabagCoreBundle::_footer.html.twig" %}
37 </body>
38</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/css/style-solarized.css
index cf16338f..cf16338f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/css/style-solarized.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/backtotop.png
index a3e52318..a3e52318 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/backtotop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/bad-display.png
index ae99ab37..ae99ab37 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/bad-display.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-off.png
index 20cd26b3..20cd26b3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-on.png
index 87a2b799..87a2b799 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/down.png
index 622ff87b..622ff87b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/down.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/envelop.png
index 1caf7d43..1caf7d43 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/envelop.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/flattr.png
index 18e00f86..18e00f86 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/flattr.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/left.png
index 9780faee..9780faee 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/left.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/link.png
index d0e12862..d0e12862 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/link.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/remove.png
index d5113d17..d5113d17 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/remove.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/rss.png
index 21bad1a1..21bad1a1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/rss.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/shaarli.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-off.png
index afd7d80c..afd7d80c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-off.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-on.png
index 3a772512..3a772512 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-on.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/top.png
index d20001a4..d20001a4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/top.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/twitter.png
index 109d7151..109d7151 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/twitter.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/screenshot.jpg
index 07d402e3..07d402e3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/screenshot.jpg
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/theme.ini
index 703997b9..703997b9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/theme.ini
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 9b1a0986..d7d341aa 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -53,7 +53,7 @@ class ConfigControllerTest extends WallabagTestCase
53 53
54 $crawler = $client->followRedirect(); 54 $crawler = $client->followRedirect();
55 55
56 $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text'))); 56 $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
57 $this->assertContains('Config saved', $alert[0]); 57 $this->assertContains('Config saved', $alert[0]);
58 } 58 }
59 59
@@ -178,7 +178,7 @@ class ConfigControllerTest extends WallabagTestCase
178 178
179 $crawler = $client->followRedirect(); 179 $crawler = $client->followRedirect();
180 180
181 $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text'))); 181 $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
182 $this->assertContains('Password updated', $alert[0]); 182 $this->assertContains('Password updated', $alert[0]);
183 } 183 }
184 184
@@ -257,7 +257,7 @@ class ConfigControllerTest extends WallabagTestCase
257 257
258 $crawler = $client->followRedirect(); 258 $crawler = $client->followRedirect();
259 259
260 $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text'))); 260 $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
261 $this->assertContains('Information updated', $alert[0]); 261 $this->assertContains('Information updated', $alert[0]);
262 } 262 }
263 263
@@ -344,7 +344,7 @@ class ConfigControllerTest extends WallabagTestCase
344 344
345 $crawler = $client->followRedirect(); 345 $crawler = $client->followRedirect();
346 346
347 $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text'))); 347 $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
348 $this->assertContains('User "wallace" added', $alert[0]); 348 $this->assertContains('User "wallace" added', $alert[0]);
349 } 349 }
350} 350}
diff --git a/web/themes/_global b/web/themes/_global
index 56b6a955..e22d7846 120000
--- a/web/themes/_global
+++ b/web/themes/_global
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/_global/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/_global/public/ \ No newline at end of file
diff --git a/web/themes/baggy b/web/themes/baggy
index c36c831a..77cce5ed 120000
--- a/web/themes/baggy
+++ b/web/themes/baggy
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/baggy/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/ \ No newline at end of file
diff --git a/web/themes/dark b/web/themes/dark
index fa4ed880..d0f303e8 120000
--- a/web/themes/dark
+++ b/web/themes/dark
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/dark/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/dark/public \ No newline at end of file
diff --git a/web/themes/default b/web/themes/default
index ee26b90d..7404d328 120000
--- a/web/themes/default
+++ b/web/themes/default
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/default/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/default/public \ No newline at end of file
diff --git a/web/themes/dmagenta b/web/themes/dmagenta
index bcd8ef75..65877a0e 120000
--- a/web/themes/dmagenta
+++ b/web/themes/dmagenta
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/dmagenta/public/ \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/ \ No newline at end of file
diff --git a/web/themes/solarized b/web/themes/solarized
index c44d5cef..4cd35fd8 120000
--- a/web/themes/solarized
+++ b/web/themes/solarized
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/solarized/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/solarized/public \ No newline at end of file
diff --git a/web/themes/solarized-dark b/web/themes/solarized-dark
index 0d548c41..06f67e2b 120000
--- a/web/themes/solarized-dark
+++ b/web/themes/solarized-dark
@@ -1 +1 @@
../../src/Wallabag/CoreBundle/Resources/views/solarized-dark/public \ No newline at end of file ../../src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public \ No newline at end of file