widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #03718
[Merge] lp:~franku/widelands-website/fix-double-slashes into lp:widelands-website
kaputtnik has proposed merging lp:~franku/widelands-website/fix-double-slashes into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~franku/widelands-website/fix-double-slashes/+merge/250231
This branch fixes the double slashes we have on our media path. See https://code.launchpad.net/~franku/widelands-website/handle_big_images/+merge/247235/comments/619592 ff
I created this branch from branch https://code.launchpad.net/~franku/widelands-website/smiley-and-codeblock-enhancements
Don't know if this is the right way...
--
Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/fix-double-slashes into lp:widelands-website.
=== modified file 'templates/base.html'
--- templates/base.html 2013-06-30 12:53:49 +0000
+++ templates/base.html 2015-02-18 22:40:28 +0000
@@ -14,16 +14,16 @@
<meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" />
<title>{% block title %}Widelands.org{% endblock %}</title>
- <link href="{{MEDIA_URL}}/favicon.ico" rel="SHORTCUT ICON" />
+ <link href="{{ MEDIA_URL }}favicon.ico" rel="SHORTCUT ICON" />
<!-- CSS -->
- <link rel="stylesheet" type="text/css" media="all" href="{{MEDIA_URL}}/css/base.css" />
- <link rel="stylesheet" type="text/css" media="all" href="{{MEDIA_URL}}/css/navigation.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/base.css" />
+ <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/navigation.css" />
<!--[if lt IE 9]>
- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/base_ielt9.css" />
+ <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base_ielt9.css" />
<![endif]-->
<!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/base_ielt8.css" />
+ <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base_ielt8.css" />
<![endif]-->
{% if USE_GOOGLE_ANALYTICS %}
@@ -39,9 +39,9 @@
{% endif %}
<!-- Javascript Bread & Butter Scripts -->
- <script type="text/javascript" src="{{MEDIA_URL}}/js/jquery.js"></script>
- <script type="text/javascript" src="{{MEDIA_URL}}/js/jquery_csrf_ajax.js"></script>
- <script type="text/javascript" src="{{MEDIA_URL}}/js/scripts.js"></script>
+ <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.js"></script>
+ <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery_csrf_ajax.js"></script>
+ <script type="text/javascript" src="{{ MEDIA_URL }}js/scripts.js"></script>
{% block extra_head %}{% endblock %}
</head>
@@ -52,7 +52,7 @@
<div class="loginBox posRight">
{% include "login_box.html" %}
</div>
- <a href="{% url mainpage %}"><img src="{{MEDIA_URL}}/img/Logo.png" class="posLeft" alt="Widelands Logo" /></a>
+ <a href="{% url mainpage %}"><img src="{{ MEDIA_URL }}img/Logo.png" class="posLeft" alt="Widelands Logo" /></a>
</div>
<div id="topmenu">
<!-- Navigation -->
=== modified file 'templates/django_messages/base.html'
--- templates/django_messages/base.html 2012-05-06 20:52:08 +0000
+++ templates/django_messages/base.html 2015-02-18 22:40:28 +0000
@@ -2,7 +2,7 @@
{% load i18n %}
{% block bodyclass %}about{% endblock %}
-{% block extra_head %}<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/messages.css" />{{ block.super}}{% endblock %}
+{% block extra_head %}<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/messages.css" />{{ block.super}}{% endblock %}
{% block title %}
Messages - {{block.super}}
=== modified file 'templates/django_messages/inbox.html'
--- templates/django_messages/inbox.html 2012-05-06 20:52:08 +0000
+++ templates/django_messages/inbox.html 2015-02-18 22:40:28 +0000
@@ -25,14 +25,14 @@
<td>{{ message.sender|user_link }}</td>
<td>
{% if message.replied %}
- <img src="{{ MEDIA_URL }}/img/replied.png" alt="replied" title="replied" />
+ <img src="{{ MEDIA_URL }}img/replied.png" alt="replied" title="replied" />
{% endif %}
<a href="{{message.get_absolute_url }}">{{ message.subject }}</a>
</td>
<td>{{ message.sent_at|custom_date:user }}</td>
<td>
<a href="{% url django_messages.views.delete message.id %}">
- <img src="{{ MEDIA_URL }}/img/delete.png" alt="delete" title="delete" />
+ <img src="{{ MEDIA_URL }}img/delete.png" alt="delete" title="delete" />
</a>
</td>
</tr>
=== modified file 'templates/django_messages/outbox.html'
--- templates/django_messages/outbox.html 2012-05-06 20:52:08 +0000
+++ templates/django_messages/outbox.html 2015-02-18 22:40:28 +0000
@@ -28,7 +28,7 @@
<td>{{ message.sent_at|custom_date:user }}</td>
<td>
<a href="{% url django_messages.views.delete message.id %}">
- <img src="{{ MEDIA_URL }}/img/delete.png" alt="delete" title="delete" />
+ <img src="{{ MEDIA_URL }}img/delete.png" alt="delete" title="delete" />
</a>
</td>
</tr>
=== modified file 'templates/django_messages/trash.html'
--- templates/django_messages/trash.html 2012-05-08 21:52:15 +0000
+++ templates/django_messages/trash.html 2015-02-18 22:40:28 +0000
@@ -27,14 +27,14 @@
<td>{{ message.recipient|user_link }}</td>
<td>
{% if message.replied %}
- <img src="{{ MEDIA_URL }}/img/replied.png" alt="replied" title="replied" />
+ <img src="{{ MEDIA_URL }}img/replied.png" alt="replied" title="replied" />
{% endif %}
<a href="{{message.get_absolute_url }}">{{ message.subject }}</a>
</td>
<td>{{ message.sent_at|custom_date:user }}</td>
<td>
<a href="{% url django_messages.views.undelete message.id %}">
- <img src="{{ MEDIA_URL }}/img/undelete.png" alt="undelete" title="undelete" />
+ <img src="{{ MEDIA_URL }}img/undelete.png" alt="undelete" title="undelete" />
</a>
</td>
</tr>
=== modified file 'templates/mainpage.html'
--- templates/mainpage.html 2013-07-13 12:32:42 +0000
+++ templates/mainpage.html 2015-02-18 22:40:28 +0000
@@ -11,14 +11,14 @@
{% load news %}
{% block extra_head %}
<meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" />
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/news.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/news.css" />
<link rel="alternate" type="application/rss+xml" title="Widelands News" href="/feeds/news/" />
{{ block.super}}{% endblock %}
{% block content %}
<h1>Welcome to Widelands.org</h1>
<div class="blogEntry" style="min-height: 380px;">
- <img class="landing posRight" src="{{MEDIA_URL}}/img/welcome.jpg" alt="Welcome!" />
+ <img class="landing posRight" src="{{ MEDIA_URL }}img/welcome.jpg" alt="Welcome!" />
<p>
<a href="{% url wiki_article "Description" %}">Widelands</a> is a
<a href="{% url wiki_article "The Widelands Project" %}">free, open source</a>
=== modified file 'templates/news/post_detail.html'
--- templates/news/post_detail.html 2012-05-04 19:07:35 +0000
+++ templates/news/post_detail.html 2015-02-18 22:40:28 +0000
@@ -8,8 +8,8 @@
{% block extra_head %}
{{ block.super }}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/news.css" />
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/comments.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/news.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
{% endblock %}
{% block content %}
=== modified file 'templates/notification/base.html'
--- templates/notification/base.html 2012-05-08 21:52:15 +0000
+++ templates/notification/base.html 2015-02-18 22:40:28 +0000
@@ -2,5 +2,5 @@
{% block extra_head %}
<link rel="alternate" type="application/atom+xml" title="Notices Feed" href="{% url notification_feed_for_user %}" />
- <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/notice.css" />{{ block.super}}
+ <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/notice.css" />{{ block.super}}
{% endblock %}
\ No newline at end of file
=== modified file 'templates/pybb/add_post.html'
--- templates/pybb/add_post.html 2013-10-27 22:26:17 +0000
+++ templates/pybb/add_post.html 2015-02-18 22:40:28 +0000
@@ -17,7 +17,7 @@
{% block extra_head %}
{{ block.super }}
-<script type="text/javascript" src="{{MEDIA_URL}}/js/disableOnSubmit.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script>
<script type="text/javascript">
$(function() {
$('form').disableOnSubmit();
@@ -74,11 +74,11 @@
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
- <img src="{{MEDIA_URL}}/forum/img/send.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" />
<span class="middle">{% trans "Send" %}</span>
</button>
<button type="button" class="preview-button">
- <img src="{{MEDIA_URL}}/forum/img/preview.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/preview.png" alt ="" class="middle" />
<span class="middle">{% trans "Preview" %}</span>
</button>
</div>
=== modified file 'templates/pybb/base.html'
--- templates/pybb/base.html 2009-04-08 18:21:36 +0000
+++ templates/pybb/base.html 2015-02-18 22:40:28 +0000
@@ -6,7 +6,7 @@
{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/forum.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/forum.css" />
<link rel="alternate" type="application/atom+xml" title="Latest Posts on all forums" href="{% url pybb_feed "posts" %}" />
<link rel="alternate" type="application/atom+xml" title="Latest Topics on all forums" href="{% url pybb_feed "topics" %}" />
=== modified file 'templates/pybb/category.html'
--- templates/pybb/category.html 2012-04-22 12:51:33 +0000
+++ templates/pybb/category.html 2015-02-18 22:40:28 +0000
@@ -11,9 +11,9 @@
</div>
<div class="center green">
- <img src="{{MEDIA_URL}}/forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
= Unread posts
- <img src="{{MEDIA_URL}}/forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
= No unread posts
</div>
{% endblock %}
=== modified file 'templates/pybb/edit_post.html'
--- templates/pybb/edit_post.html 2013-10-27 22:26:17 +0000
+++ templates/pybb/edit_post.html 2015-02-18 22:40:28 +0000
@@ -8,7 +8,7 @@
{% block extra_head %}
{{ block.super }}
-<script type="text/javascript" src="{{MEDIA_URL}}/js/disableOnSubmit.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script>
<script type="text/javascript">
$(function() {
$('form').disableOnSubmit();
@@ -50,11 +50,11 @@
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
- <img src="{{MEDIA_URL}}/forum/img/send.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" />
<span class="middle">{% trans "Send" %}</span>
</button>
<button type="button" class="preview-button">
- <img src="{{MEDIA_URL}}/forum/img/preview.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/preview.png" alt ="" class="middle" />
<span class="middle">{% trans "Preview" %}</span>
</button>
</div>
=== modified file 'templates/pybb/forum.html'
--- templates/pybb/forum.html 2013-10-27 20:21:51 +0000
+++ templates/pybb/forum.html 2015-02-18 22:40:28 +0000
@@ -24,7 +24,7 @@
{{ forum }}
<br /><br />
<a class="button posRight" href="{% url pybb_add_topic forum.id %}">
- <img src="{{MEDIA_URL}}/forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" />
<span class="middle">{% trans "New Topic" %}</span>
</a>
{% pybb_pagination _('Topics') %}
@@ -44,14 +44,14 @@
<tr class="{% cycle 'odd' 'even' %}">
<td class="forumIcon center">
{% if topic|pybb_has_unreads:user %}
- <img src="{{ MEDIA_URL }}/forum/img/doc_big_work_star.png" style="margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/doc_big_work_star.png" style="margin: 0px;" alt="" class="middle" />
{% else %}
- <img src="{{ MEDIA_URL }}/forum/img/doc_big_work.png" style="margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/doc_big_work.png" style="margin: 0px;" alt="" class="middle" />
{% endif %}
</td>
<td class="forumTitle">
- {% if topic.sticky %}<img src="{{MEDIA_URL}}/forum/img/sticky.png" alt="Sticky" title="Sticky" />{% endif %}
- {% if topic.closed %}<img src="{{MEDIA_URL}}/forum/img/closed.png" alt="Closed" title="Closed" />{% endif %}
+ {% if topic.sticky %}<img src="{{ MEDIA_URL }}forum/img/sticky.png" alt="Sticky" title="Sticky" />{% endif %}
+ {% if topic.closed %}<img src="{{ MEDIA_URL }}forum/img/closed.png" alt="Closed" title="Closed" />{% endif %}
<a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a><br />
<span class="small">Created by {{ topic.user|user_link }} on {{ topic.created|custom_date:user }}</span>
</td>
@@ -72,7 +72,7 @@
<br />
<a class="button posRight" href="{% url pybb_add_topic forum.id %}">
- <img src="{{MEDIA_URL}}/forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" />
<span class="middle">{% trans "New Topic" %}</span>
</a>
{% pybb_pagination _('Topics') %}
@@ -80,9 +80,9 @@
</div>
<div class="center green">
- <img src="{{MEDIA_URL}}/forum/img/doc_big_work_star.png" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/doc_big_work_star.png" alt="" class="middle" />
= Unread posts
- <img src="{{MEDIA_URL}}/forum/img/doc_big_work.png" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/doc_big_work.png" alt="" class="middle" />
= No unread posts
</div>
{% endblock %}
=== modified file 'templates/pybb/index.html'
--- templates/pybb/index.html 2012-04-19 19:46:21 +0000
+++ templates/pybb/index.html 2015-02-18 22:40:28 +0000
@@ -12,9 +12,9 @@
{% endfor %}
<div class="center green">
- <img src="{{MEDIA_URL}}/forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
= Unread posts
- <img src="{{MEDIA_URL}}/forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" />
= No unread posts
</div>
@@ -22,20 +22,20 @@
<table class="legend">
<tr>
<td>
- <img src="{{MEDIA_URL}}/forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
</td>
<td>= Unread posts</td>
<td>
- <img src="{{MEDIA_URL}}/forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
</td><td>= No unread posts</td>
</tr>
<tr>
<td>
- <img src="{{MEDIA_URL}}/forum/img/folder_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
</td><td>= Locked topic</td>
<td>
- <img src="{{MEDIA_URL}}/forum/img/folder_new_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_new_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
</td><td>= Unread posts in locked topic</td>
</tr>
</table>
=== modified file 'templates/pybb/inlines/add_post_form.html'
--- templates/pybb/inlines/add_post_form.html 2012-09-09 18:03:59 +0000
+++ templates/pybb/inlines/add_post_form.html 2015-02-18 22:40:28 +0000
@@ -2,7 +2,7 @@
{% block extra_head %}
{# block.super #}
-<script type="text/javascript" src="{{MEDIA_URL}}/js/disableOnSubmit.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script>
<script type="text/javascript">
$(function() {
$('form').disableOnSubmit();
@@ -51,11 +51,11 @@
{{ form.as_p }}
{% csrf_token %}
<button type="submit">
- <img src="{{MEDIA_URL}}/forum/img/send.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" />
<span class="middle">{% trans "Send" %}</span>
</button>
<button type="button" class="preview-button">
- <img src="{{MEDIA_URL}}/forum/img/preview.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/preview.png" alt ="" class="middle" />
<span class="middle">{% trans "Preview" %}</span>
</button>
</div>
=== modified file 'templates/pybb/inlines/display_category.html'
--- templates/pybb/inlines/display_category.html 2012-04-19 19:46:21 +0000
+++ templates/pybb/inlines/display_category.html 2015-02-18 22:40:28 +0000
@@ -15,9 +15,9 @@
<tr class="{% cycle 'odd' 'even' %}">
<td class="forumIcon center">
{% if forum|pybb_has_unreads:user %}
- <img src="{{ MEDIA_URL }}/forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" />
{% else %}
- <img src="{{ MEDIA_URL }}/forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" />
{% endif %}
</td>
<td class="forumTitle">
=== modified file 'templates/pybb/inlines/forum_row.html'
--- templates/pybb/inlines/forum_row.html 2010-06-12 18:47:34 +0000
+++ templates/pybb/inlines/forum_row.html 2015-02-18 22:40:28 +0000
@@ -8,9 +8,9 @@
<tr>
<td class="even" align="center" valign="middle">
{% if forum|pybb_has_unreads:user %}
- <img src="{{ MEDIA_URL }}/forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
{% else %}
- <img src="{{ MEDIA_URL }}/forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" />
{% endif %}
</td>
<td class="odd">
=== modified file 'templates/pybb/inlines/post.html'
--- templates/pybb/inlines/post.html 2011-11-13 15:47:39 +0000
+++ templates/pybb/inlines/post.html 2015-02-18 22:40:28 +0000
@@ -17,7 +17,7 @@
<tr>
<td style="text-align: left; border: 0px;">
<a href="{{post.get_absolute_url}}">
- <img src="{{MEDIA_URL}}/forum/img/en/permalink.png" height="25" alt ="{% trans "Permalink" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/permalink.png" height="25" alt ="{% trans "Permalink" %}" />
</a>
</td>
<td style="text-align: right; border: 0px;">
@@ -86,7 +86,7 @@
<tr>
<td class="toplink">
<a href="#top">
- <img src="{{MEDIA_URL}}/forum/img/en/top.png" height="25" alt ="{% trans "Top" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/top.png" height="25" alt ="{% trans "Top" %}" />
</a>
</td>
@@ -95,25 +95,25 @@
{% if user.is_authenticated %}
{% ifnotequal user post.user %}
<a href="{% url messages_compose_to post.user %}">
- <img src="{{MEDIA_URL}}/forum/img/en/send_pm.png" height="25" alt ="{% trans "Send PM" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/send_pm.png" height="25" alt ="{% trans "Send PM" %}" />
</a>
{% endifnotequal %}
{% endif %}
{% if moderator or post|pybb_posted_by:user %}
<a href="{% url pybb_edit_post post.id %}">
- <img src="{{MEDIA_URL}}/forum/img/en/edit.png" height="25" alt ="{% trans "Edit" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/edit.png" height="25" alt ="{% trans "Edit" %}" />
</a>
{% endif %}
{% if moderator or post|pybb_equal_to:last_post %}
{% if moderator or post.user|pybb_equal_to:user %}
<a href="{% url pybb_delete_post post.id %}">
- <img src="{{MEDIA_URL}}/forum/img/en/delete.png" height="25" alt ="{% trans "Delete" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/delete.png" height="25" alt ="{% trans "Delete" %}" />
</a>
{% endif %}
</div>
<div class="tools" style="float: right;">
<a href="{% url pybb_add_post topic.id %}?quote_id={{ post.id }}">
- <img src="{{MEDIA_URL}}/forum/img/en/quote.png" height="25" alt ="{% trans "Quote" %}" />
+ <img src="{{ MEDIA_URL }}forum/img/en/quote.png" height="25" alt ="{% trans "Quote" %}" />
</a>
{% endif %}
</div>
=== modified file 'templates/pybb/inlines/topic_row.html'
--- templates/pybb/inlines/topic_row.html 2010-09-23 23:26:04 +0000
+++ templates/pybb/inlines/topic_row.html 2015-02-18 22:40:28 +0000
@@ -8,9 +8,9 @@
<tr class="topic_description {% cycle "odd" "even" %}">
<td align="center" valign="middle">
{% if topic|pybb_has_unreads:user %}
- <img src="{{ MEDIA_URL }}/forum/img/folder_new.png" style="margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder_new.png" style="margin: 0px;" alt="" align="middle" />
{% else %}
- <img src="{{ MEDIA_URL }}/forum/img/folder.png" style="margin: 0px;" alt="" align="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/folder.png" style="margin: 0px;" alt="" align="middle" />
{% endif %}
</td>
<td id="name">
@@ -19,9 +19,9 @@
{% comment %}
oehm ja, geht nicht weil ka muss ich guggn, die frage ist. soll es fuer alle gelten oder nur fuer eine topic
{% endcomment %}
- {% if subscribed %}<img src="{{MEDIA_URL}}/forum/img/en/subscribe_small.png" height="20" alt="subscribe" style="float:left" />{% endif %}
- {% if topic.sticky %}<img src="{{MEDIA_URL}}/forum/img/en/stick_topic_small.png" height="20" alt ="Sticky" style="float:left;" /> {% endif %}
- {% if topic.closed %}<img src="{{MEDIA_URL}}/forum/img/en/close_small.png" height="20" alt ="Closed" style="float:left; " /> {% endif %}
+ {% if subscribed %}<img src="{{ MEDIA_URL }}forum/img/en/subscribe_small.png" height="20" alt="subscribe" style="float:left" />{% endif %}
+ {% if topic.sticky %}<img src="{{ MEDIA_URL }}forum/img/en/stick_topic_small.png" height="20" alt ="Sticky" style="float:left;" /> {% endif %}
+ {% if topic.closed %}<img src="{{ MEDIA_URL }}forum/img/en/close_small.png" height="20" alt ="Closed" style="float:left; " /> {% endif %}
{{ topic.name }}
</a>
</span>
=== modified file 'templates/pybb/topic.html'
--- templates/pybb/topic.html 2013-10-27 20:21:51 +0000
+++ templates/pybb/topic.html 2015-02-18 22:40:28 +0000
@@ -28,23 +28,23 @@
{% if moderator %}
{% if topic.sticky %}
<a class="button" href="{% url pybb_unstick_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/unstick.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/unstick.png" alt ="" class="middle" />
<span class="middle">{% trans "Unstick Topic" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_stick_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/sticky.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/sticky.png" alt ="" class="middle" />
<span class="middle">{% trans "Stick Topic" %}</span>
</a>
{% endif %}
{% if topic.closed %}
<a class="button" href="{% url pybb_open_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/open.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/open.png" alt ="" class="middle" />
<span class="middle">{% trans "Open Topic" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_close_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/closed.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/closed.png" alt ="" class="middle" />
<span class="middle">{% trans "Close Topic" %}</span>
</a>
{% endif %}
@@ -52,17 +52,17 @@
{% if user.is_authenticated %}
{% if subscribed %}
<a class="button" href="{% url pybb_delete_subscription topic.id %}?from_topic">
- <img src="{{MEDIA_URL}}/forum/img/unsubscribe.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/unsubscribe.png" alt ="" class="middle" />
<span class="middle">{% trans "Unsubscribe" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_add_subscription topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/subscribe.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/subscribe.png" alt ="" class="middle" />
<span class="middle">{% trans "Subscribe" %}</span>
</a>
{% endif %}
<a class="button" href="{% url pybb_add_post topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/send.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" />
<span class="middle">{% trans "New Reply" %}</span>
</a>
{% endif %}
@@ -131,22 +131,22 @@
{% endif %}
<button onclick="window.location.href='#top';" class="posRight">
- <img src="{{MEDIA_URL}}/forum/img/top.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/top.png" alt ="" class="middle" />
<span class="middle">{% trans "Top" %}</span>
</button>
<button onclick="window.location.href='{% url pybb_add_post topic.id %}?quote_id={{ post.id }}';">
- <img src="{{MEDIA_URL}}/forum/img/quote.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/quote.png" alt ="" class="middle" />
<span class="middle">{% trans "Quote" %}</span>
</button>
{% if moderator or post|pybb_posted_by:user %}
<button onclick="window.location.href='{% url pybb_edit_post post.id %}';">
- <img src="{{MEDIA_URL}}/forum/img/edit.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/edit.png" alt ="" class="middle" />
<span class="middle">{% trans "Edit" %}</span>
</button>
{% if moderator or post|pybb_equal_to:last_post %}
<button onclick="window.location.href='{% url pybb_delete_post post.id %}';">
- <img src="{{MEDIA_URL}}/forum/img/delete.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/delete.png" alt ="" class="middle" />
<span class="middle">{% trans "Delete" %}</span>
</button>
{% endif %}
@@ -218,22 +218,22 @@
{% endif %}
<a class="button posRight" href="#top">
- <img src="{{MEDIA_URL}}/forum/img/top.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/top.png" alt ="" class="middle" />
<span class="middle">{% trans "Top" %}</span>
</a>
<a class="button" href="{% url pybb_add_post topic.id %}?quote_id={{ post.id }}">
- <img src="{{MEDIA_URL}}/forum/img/quote.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/quote.png" alt ="" class="middle" />
<span class="middle">{% trans "Quote" %}</span>
</a>
{% if moderator or post|pybb_posted_by:user %}
<a class="button" href="{% url pybb_edit_post post.id %}">
- <img src="{{MEDIA_URL}}/forum/img/edit.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/edit.png" alt ="" class="middle" />
<span class="middle">{% trans "Edit" %}</span>
</a>
{% if moderator or post|pybb_equal_to:last_post %}
<a class="button" href="{% url pybb_delete_post post.id %}">
- <img src="{{MEDIA_URL}}/forum/img/delete.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/delete.png" alt ="" class="middle" />
<span class="middle">{% trans "Delete" %}</span>
</a>
{% endif %}
@@ -252,23 +252,23 @@
{% if moderator %}
{% if topic.sticky %}
<a class="button" href="{% url pybb_unstick_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/unstick.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/unstick.png" alt ="" class="middle" />
<span class="middle">{% trans "Unstick Topic" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_stick_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/sticky.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/sticky.png" alt ="" class="middle" />
<span class="middle">{% trans "Stick Topic" %}</span>
</a>
{% endif %}
{% if topic.closed %}
<a class="button" href="{% url pybb_open_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/open.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/open.png" alt ="" class="middle" />
<span class="middle">{% trans "Open Topic" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_close_topic topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/closed.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/closed.png" alt ="" class="middle" />
<span class="middle">{% trans "Close Topic" %}</span>
</a>
{% endif %}
@@ -276,17 +276,17 @@
{% if user.is_authenticated %}
{% if subscribed %}
<a class="button" href="{% url pybb_delete_subscription topic.id %}?from_topic">
- <img src="{{MEDIA_URL}}/forum/img/unsubscribe.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/unsubscribe.png" alt ="" class="middle" />
<span class="middle">{% trans "Unsubscribe" %}</span>
</a>
{% else %}
<a class="button" href="{% url pybb_add_subscription topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/subscribe.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/subscribe.png" alt ="" class="middle" />
<span class="middle">{% trans "Subscribe" %}</span>
</a>
{% endif %}
<a class="button" href="{% url pybb_add_post topic.id %}">
- <img src="{{MEDIA_URL}}/forum/img/send.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" />
<span class="middle">{% trans "New Reply" %}</span>
</a>
{% endif %}
=== modified file 'templates/registration/base.html'
--- templates/registration/base.html 2010-06-11 14:54:50 +0000
+++ templates/registration/base.html 2015-02-18 22:40:28 +0000
@@ -4,5 +4,5 @@
{% endcomment %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/register.css" />{{ block.super}}
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/register.css" />{{ block.super}}
{% endblock %}
=== modified file 'templates/right_boxes.html'
--- templates/right_boxes.html 2013-06-11 20:47:58 +0000
+++ templates/right_boxes.html 2015-02-18 22:40:28 +0000
@@ -37,10 +37,10 @@
<h3>Social Media</h3>
<div class="columnModuleBox center">
<ul class="socialMediaList">
- <li><a href="https://www.facebook.com/WidelandsOfficial"; target="_blank"><img src="{{MEDIA_URL}}/img/socialmedia/facebook.png" alt="Facebook"></a></li>
- <li><a href="https://plus.google.com/108069355276040649622"; target="_blank"><img src="{{MEDIA_URL}}/img/socialmedia/googleplus.png" alt="Google+"></a></li>
- <li><a href="https://twitter.com/widelands"; target="_blank"><img src="{{MEDIA_URL}}/img/socialmedia/twitter.png" alt="Twitter"></a></li>
- <li><a href="http://www.youtube.com/WidelandsOfficial"; target="_blank"><img src="{{MEDIA_URL}}/img/socialmedia/youtube.png" alt="Youtube"></a></li>
+ <li><a href="https://www.facebook.com/WidelandsOfficial"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/facebook.png" alt="Facebook"></a></li>
+ <li><a href="https://plus.google.com/108069355276040649622"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/googleplus.png" alt="Google+"></a></li>
+ <li><a href="https://twitter.com/widelands"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/twitter.png" alt="Twitter"></a></li>
+ <li><a href="http://www.youtube.com/WidelandsOfficial"; target="_blank"><img src="{{ MEDIA_URL }}img/socialmedia/youtube.png" alt="Youtube"></a></li>
</ul>
</div>
</div>
=== modified file 'templates/sphinxdoc/base.html'
--- templates/sphinxdoc/base.html 2012-05-16 22:31:25 +0000
+++ templates/sphinxdoc/base.html 2015-02-18 22:40:28 +0000
@@ -5,7 +5,7 @@
{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/documentation.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/documentation.css" />
{{ block.super}}
{% endblock %}
=== modified file 'templates/threadedcomments/preview_comment.html'
--- templates/threadedcomments/preview_comment.html 2012-05-04 19:07:35 +0000
+++ templates/threadedcomments/preview_comment.html 2015-02-18 22:40:28 +0000
@@ -4,7 +4,7 @@
{% block extra_head %}
{{ block.super }}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/comments.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
{% endblock %}
{% block content %}
=== modified file 'templates/wiki/base.html'
--- templates/wiki/base.html 2012-05-04 16:29:36 +0000
+++ templates/wiki/base.html 2015-02-18 22:40:28 +0000
@@ -8,5 +8,5 @@
{{ block.super}}
<link rel="alternate" type="application/rss+xml" title="Wiki History (RSS)" href="{% url wiki_history_feed "rss" %}" />
<link rel="alternate" type="application/atom+xml" title="Wiki History (Atom)" href="{% url wiki_history_feed "atom" %}" />
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/wiki.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" />
{% endblock %}
=== modified file 'templates/wiki/edit.html'
--- templates/wiki/edit.html 2015-01-21 21:22:39 +0000
+++ templates/wiki/edit.html 2015-02-18 22:40:28 +0000
@@ -7,7 +7,7 @@
{% endblock %}
{% block extra_head %}
-<script type="text/javascript" src="{{ MEDIA_URL }}/js/disableOnSubmit.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script>
<script type="text/javascript">
$(function() {
$('form').disableOnSubmit();
=== modified file 'templates/wlggz/base.html'
--- templates/wlggz/base.html 2010-06-06 13:03:08 +0000
+++ templates/wlggz/base.html 2015-02-18 22:40:28 +0000
@@ -8,5 +8,5 @@
{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/ggz.css" />{{ block.super}}
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/ggz.css" />{{ block.super}}
{% endblock %}
=== modified file 'templates/wlhelp/base.html'
--- templates/wlhelp/base.html 2012-05-18 23:41:26 +0000
+++ templates/wlhelp/base.html 2015-02-18 22:40:28 +0000
@@ -5,6 +5,6 @@
{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/help.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/help.css" />
{{ block.super}}
{% endblock %}
\ No newline at end of file
=== modified file 'templates/wlmaps/base.html'
--- templates/wlmaps/base.html 2012-04-24 21:14:22 +0000
+++ templates/wlmaps/base.html 2015-02-18 22:40:28 +0000
@@ -5,8 +5,8 @@
{% endcomment %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/forum.css" />
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/maps.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/forum.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/maps.css" />
{{block.super}}
{% endblock %}
=== modified file 'templates/wlmaps/index.html'
--- templates/wlmaps/index.html 2015-01-21 21:22:39 +0000
+++ templates/wlmaps/index.html 2015-02-18 22:40:28 +0000
@@ -64,7 +64,7 @@
<td class="spacer"></td>
<td colspan="2">
<a class="button" href="{% url wlmaps_download map.slug %}">
- <img src="{{MEDIA_URL}}/img/download.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}img/download.png" alt ="" class="middle" />
<span class="middle">Direct Download</span>
</a>
</td>
=== modified file 'templates/wlmaps/map_detail.html'
--- templates/wlmaps/map_detail.html 2014-07-21 15:29:30 +0000
+++ templates/wlmaps/map_detail.html 2015-02-18 22:40:28 +0000
@@ -12,7 +12,7 @@
{% block extra_head %}
{{ block.super }}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/comments.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
{% if not user.is_anonymous %}
<script src="{{ MEDIA_URL}}/js/jquery.sexy-vote.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -100,7 +100,7 @@
{% endif %}
<br />
<a class="button" href="{% url wlmaps_download map.slug %}">
- <img src="{{MEDIA_URL}}/img/download.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}img/download.png" alt ="" class="middle" />
<span class="middle">Download this map</span>
</a>
<div style="clear: left;"></div>
=== modified file 'templates/wlpoll/base.html'
--- templates/wlpoll/base.html 2012-05-05 11:01:31 +0000
+++ templates/wlpoll/base.html 2015-02-18 22:40:28 +0000
@@ -5,9 +5,9 @@
{% block extra_head %}
{{block.super}}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/comments.css" />
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/poll.css" />
-<script src="{{ MEDIA_URL }}/js/highcharts_219/highcharts.js" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/poll.css" />
+<script src="{{ MEDIA_URL }}js/highcharts_219/highcharts.js" type="text/javascript"></script>
{% endblock %}
{% block title %}Polls - {{ block.super }}{% endblock %}
=== modified file 'templates/wlprofile/base.html'
--- templates/wlprofile/base.html 2012-05-05 08:27:46 +0000
+++ templates/wlprofile/base.html 2015-02-18 22:40:28 +0000
@@ -8,5 +8,5 @@
{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/profile.css" />{{ block.super}}
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/profile.css" />{{ block.super}}
{% endblock %}
=== modified file 'templates/wlprofile/view_profile.html'
--- templates/wlprofile/view_profile.html 2012-05-05 08:27:46 +0000
+++ templates/wlprofile/view_profile.html 2015-02-18 22:40:28 +0000
@@ -26,7 +26,7 @@
<td>
{% ifnotequal user profile.user %}
<button onclick="window.location.href='{% url messages_compose_to profile.user %}';">
- <img src="{{MEDIA_URL}}/forum/img/send_pm.png" alt ="" class="middle" />
+ <img src="{{ MEDIA_URL }}forum/img/send_pm.png" alt ="" class="middle" />
<span class="middle">{% trans "Send PM" %}</span>
</button>
{% endifnotequal %}
=== modified file 'templates/wlscreens/index.html'
--- templates/wlscreens/index.html 2012-04-24 13:30:24 +0000
+++ templates/wlscreens/index.html 2015-02-18 22:40:28 +0000
@@ -8,12 +8,12 @@
{% block extra_head %}
{{ block.super }}
<!-- Add fancyBox with button helper -->
-<link rel="stylesheet" href="{{ MEDIA_URL }}/fancybox/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
-<script type="text/javascript" src="{{ MEDIA_URL }}/fancybox/jquery.fancybox.pack.js?v=2.0.6"></script>
-<link rel="stylesheet" href="{{ MEDIA_URL }}/fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
-<script type="text/javascript" src="{{ MEDIA_URL }}/fancybox/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
-<link rel="stylesheet" href="{{ MEDIA_URL }}/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
-<script type="text/javascript" src="{{ MEDIA_URL }}/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
+<link rel="stylesheet" href="{{ MEDIA_URL }}fancybox/jquery.fancybox.css?v=2.0.6" type="text/css" media="screen" />
+<script type="text/javascript" src="{{ MEDIA_URL }}fancybox/jquery.fancybox.pack.js?v=2.0.6"></script>
+<link rel="stylesheet" href="{{ MEDIA_URL }}fancybox/helpers/jquery.fancybox-buttons.css?v=1.0.2" type="text/css" media="screen" />
+<script type="text/javascript" src="{{ MEDIA_URL }}fancybox/helpers/jquery.fancybox-buttons.js?v=1.0.2"></script>
+<link rel="stylesheet" href="{{ MEDIA_URL }}fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.6" type="text/css" media="screen" />
+<script type="text/javascript" src="{{ MEDIA_URL }}fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.6"></script>
<script type="text/javascript">
$(document).ready(function() {
$(".fancybox").fancybox({
=== modified file 'templates/wlsearch/search.html'
--- templates/wlsearch/search.html 2013-06-12 06:19:33 +0000
+++ templates/wlsearch/search.html 2015-02-18 22:40:28 +0000
@@ -4,7 +4,7 @@
{% block title %}Search - {{ block.super }}{% endblock %}
{% block extra_head %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}/css/search.css" />
+<link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/search.css" />
{{ block.super}}
{% endblock %}
=== modified file 'wlimages/models.py'
--- wlimages/models.py 2009-03-05 17:06:08 +0000
+++ wlimages/models.py 2015-02-18 22:40:28 +0000
@@ -37,8 +37,8 @@
im = self.create(content_type=content_type, object_id=object_id,
user=user,revision=1,name=name, editor_ip = ip)
- path = "%s/wlimages/%s" % (MEDIA_ROOT,image.name)
- url = "%s/wlimages/%s" % (MEDIA_URL,image.name)
+ path = "%swlimages/%s" % (MEDIA_ROOT,image.name)
+ url = "%swlimages/%s" % (MEDIA_URL,image.name)
destination = open(path,"wb")
for chunk in image.chunks():
Follow ups
