Merge pull request #1619 from wallabag/v2-themes-folder

Move public assets for themes

src/Wallabag/CoreBundle/Resources/config/services.yml

@@ -87,7 +87,7 @@ services:
         class: Wallabag\CoreBundle\Helper\EntriesExport
         arguments:
             - %wallabag_url%
-            - src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
+            - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
 
     wallabag.operator.array.matches:
         class: Wallabag\CoreBundle\Operator\PHP\Matches

src/Wallabag/CoreBundle/Resources/public/themes/material/js/materialize.js

@@ -1,8 +1,8 @@
-/*!
- * Materialize v0.97.1 (http://materializecss.com)
- * Copyright 2014-2015 Materialize
- * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
- */
+/*!
+ * Materialize v0.97.1 (http://materializecss.com)
+ * Copyright 2014-2015 Materialize
+ * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
+ */
 /*
  * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
  *

src/Wallabag/CoreBundle/Resources/views/base.html.twig

@@ -12,37 +12,37 @@
             <meta http-equiv="X-UA-Compatible" content="IE=10">
             <![endif]-->
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon.png') }}">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon.png') }}">
 
-            <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
+            <link rel="shortcut icon" type="image/x-icon" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/favicon.ico') }}">
 
             {% block css %}{% endblock %}
             {% block scripts %}
-                <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
-                <script src="{{ asset('themes/_global/js/jquery.cookie.js') }}"></script>
-                <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
+                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery-2.0.3.min.js') }}"></script>
+                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery.cookie.js') }}"></script>
+                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/bookmarklet.js') }}"></script>
             {% endblock %}
 
             <title>{% block title %}{% endblock %}</title>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig

@@ -39,7 +39,7 @@
             {{ entry.content | raw }}
         </article>
     </div>
-    <script src="{{ asset('themes/_global/js/restoreScroll.js')}}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script>
     <script type="text/javascript">
         $(document).ready(function() {
 

src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig

@@ -3,28 +3,28 @@
 {% block css %}
     {{ parent() }}
 
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/ratatouille.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/font.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/main.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/messages.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/print.css') }}" media="print">
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
 
-    <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/autoClose.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/saveLink.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/popupForm.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/closeMessage.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/autoClose.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/saveLink.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/popupForm.js') }}"></script>
 {% endblock %}
 
 {% block header %}
     <header class="w600p center mbm">
         <h1 class="logo">
             {% block logo %}
-                <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
+                <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
             {% endblock %}
         </h1>
     </header>

src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig

@@ -3,16 +3,16 @@
 {% block css %}
     {{ parent() }}
 
-    <link rel="stylesheet" href="{{ asset('themes/material/css/materialize.min.css') }}"  media="screen,projection"/>
-    <link rel="stylesheet" href="{{ asset('themes/material/css/main.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/material/css/print.css') }}" media="print">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/materialize.min.css') }}"  media="screen,projection"/>
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/main.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/print.css') }}" media="print">
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
 
-    <script src="{{ asset('themes/material/js/materialize.min.js') }}"></script>
-    <script src="{{ asset('themes/material/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
 {% endblock %}
 
 {% block header %}
@@ -32,7 +32,7 @@
             {% block logo %}
                 <li class="logo border-bottom">
                     <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
-                        <img src="{{ asset('themes/material/img/logo-square.png') }}" alt="wallabag logo" />
+                        <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" />
                     </a>
                 </li>
             {% endblock %}

src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig

@@ -11,7 +11,7 @@
 <main class="valign-wrapper">
     <div class="valign row">
         <div class="card sw">
-            <div class="center"><img src="{{ asset('themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
+            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>

web/themes/_global

@@ -1 +0,0 @@
-../../src/Wallabag/CoreBundle/Resources/views/themes/_global/public/

web/themes/baggy

@@ -1 +0,0 @@
-../../src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/

web/themes/material

@@ -1 +0,0 @@
-../../src/Wallabag/CoreBundle/Resources/views/themes/material/public/