mirror of
https://github.com/wallabag/wallabag.git
synced 2025-01-10 17:05:26 +00:00
webpack & views: replace bundles/wallabagcore with wallassets
This change will prevent composer from removing wallabagcore assets when installing assets. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
parent
1953a87293
commit
9ff628ca56
9 changed files with 32 additions and 32 deletions
|
@ -13,8 +13,8 @@ module.exports = function () {
|
|||
},
|
||||
output: {
|
||||
filename: '[name].js',
|
||||
path: path.resolve(rootDir, 'web/bundles/wallabagcore'),
|
||||
publicPath: '/bundles/wallabagcore/',
|
||||
path: path.resolve(rootDir, 'web/wallassets'),
|
||||
publicPath: '/wallassets/',
|
||||
},
|
||||
plugins: [
|
||||
new webpack.ProvidePlugin({
|
||||
|
|
|
@ -12,31 +12,31 @@
|
|||
<meta http-equiv="X-UA-Compatible" content="IE=10">
|
||||
<![endif]-->
|
||||
|
||||
<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('wallassets/themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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-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('wallassets/themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/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.png') }}">
|
||||
<link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon.png') }}">
|
||||
<link rel="apple-touch-icon" type="image/png" href="{{ asset('wallassets/themes/_global/img/appicon/apple-touch-icon.png') }}">
|
||||
<link rel="icon" type="image/png" href="{{ asset('wallassets/themes/_global/img/appicon/apple-touch-icon.png') }}">
|
||||
|
||||
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/favicon.ico') }}">
|
||||
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}">
|
||||
|
||||
{% block css %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<main class="valign-wrapper">
|
||||
<div class="valign row">
|
||||
<div class="card sw">
|
||||
<div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /></div>
|
||||
<div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /></div>
|
||||
<h2>{{ status_code }}: {{ status_text }}</h2>
|
||||
<p>{{ exception.message }}</p>
|
||||
</div>
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
{% block css %}
|
||||
{{ parent() }}
|
||||
{% if not app.debug %}
|
||||
<link rel="stylesheet" href="{{ asset('bundles/wallabagcore/baggy.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('wallassets/baggy.css') }}">
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
{{ parent() }}
|
||||
<script src="{{ asset('bundles/wallabagcore/baggy' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
||||
<script src="{{ asset('wallassets/baggy' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
|
@ -17,7 +17,7 @@
|
|||
<h1 class="logo">
|
||||
{% block logo %}
|
||||
<a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
|
||||
<img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" />
|
||||
<img width="100" height="100" src="{{ asset('wallassets/themes/_global/img/logo-w.png') }}" alt="wallabag logo" />
|
||||
</a>
|
||||
{% endblock %}
|
||||
</h1>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<meta property="og:title" content="{{ entry.title|e|raw }}" />
|
||||
<meta property="og:type" content="article" />
|
||||
<meta property="og:url" content="{{ app.request.uri }}" />
|
||||
{% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %}
|
||||
{% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-other_themes.png') %}
|
||||
{% if entry.previewPicture is not null %}
|
||||
{% set picturePath = entry.previewPicture %}
|
||||
{% endif %}
|
||||
|
@ -15,9 +15,9 @@
|
|||
<meta name="twitter:title" content="{{ entry.title|e|raw }}" />
|
||||
<meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" />
|
||||
{% if app.debug %}
|
||||
<script src="{{ asset('bundles/wallabagcore/public.dev.js') }}"></script>
|
||||
<script src="{{ asset('wallassets/public.dev.js') }}"></script>
|
||||
{% else %}
|
||||
<link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('wallassets/public.css') }}">
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<main class="valign-wrapper">
|
||||
<div class="valign row">
|
||||
<div class="card sw">
|
||||
<div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
|
||||
<div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
|
||||
<div class="card-content">
|
||||
<div class="row">
|
||||
<h5>{{ status_code }}: {{ status_text }}</h5>
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
{% block css %}
|
||||
{{ parent() }}
|
||||
{% if not app.debug %}
|
||||
<link rel="stylesheet" href="{{ asset('bundles/wallabagcore/material.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('wallassets/material.css') }}">
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
{{ parent() }}
|
||||
<script src="{{ asset('bundles/wallabagcore/material' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
||||
<script src="{{ asset('wallassets/material' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
|
@ -29,7 +29,7 @@
|
|||
{% block logo %}
|
||||
<li class="logo border-bottom">
|
||||
<a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
|
||||
<img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
|
||||
<img src="{{ asset('wallassets/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
|
||||
</a>
|
||||
</li>
|
||||
{% endblock %}
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
|
||||
<table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
|
||||
<tr>
|
||||
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ absolute_url(asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png')) }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
|
||||
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ absolute_url(asset('wallassets/themes/_global/img/logo-other_themes.png')) }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
|
||||
<td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc">
|
||||
<h1>wallabag</h1>
|
||||
<h5>{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}</h5>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<main class="valign-wrapper">
|
||||
<div class="valign row">
|
||||
<div class="card sw">
|
||||
<div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
|
||||
<div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
|
||||
{% block fos_user_content %}
|
||||
{% endblock fos_user_content %}
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue