Merge lp:~widelands-dev/widelands-website/django_staticfiles into lp:widelands-website
- django_staticfiles
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 511 | ||||
Proposed branch: | lp:~widelands-dev/widelands-website/django_staticfiles | ||||
Merge into: | lp:widelands-website | ||||
Diff against target: |
1563 lines (+226/-241) 48 files modified
.bzrignore (+1/-9) README.txt (+11/-0) documentation/conf.py (+1/-1) local_settings.py.sample (+4/-6) local_urls.py.sample (+11/-6) mainpage/templatetags/wl_markdown.py (+8/-3) media/js/jquery.sexy-vote.js (+0/-76) pybb/models.py (+7/-4) settings.py (+11/-7) templates/base.html (+9/-8) templates/django_messages/base.html (+4/-2) templates/django_messages/inbox.html (+3/-2) templates/django_messages/outbox.html (+2/-1) templates/django_messages/trash.html (+4/-3) templates/header.html (+6/-5) templates/mainpage.html (+4/-3) templates/mainpage/developers.html (+2/-2) templates/news/base_news.html (+2/-1) templates/news/post_detail.html (+3/-2) templates/notification/base.html (+2/-1) templates/privacy_policy.html (+2/-2) templates/pybb/base.html (+2/-1) templates/pybb/category.html (+3/-2) templates/pybb/forum.html (+8/-7) templates/pybb/index.html (+7/-6) templates/pybb/inlines/display_category.html (+9/-8) templates/pybb/inlines/forum_row.html (+4/-2) templates/pybb/inlines/post.html (+8/-7) templates/pybb/inlines/topic_row.html (+7/-5) templates/pybb/post_form.html (+5/-4) templates/pybb/topic.html (+28/-27) templates/registration/base.html (+0/-1) templates/search/search.html (+2/-1) templates/threadedcomments/preview_comment.html (+2/-1) templates/wiki/base.html (+2/-1) templates/wiki/edit.html (+2/-1) templates/wlhelp/base.html (+3/-2) templates/wlmaps/base.html (+2/-2) templates/wlmaps/edit_comment.html (+3/-2) templates/wlmaps/index.html (+2/-1) templates/wlmaps/map_detail.html (+4/-3) templates/wlmaps/upload.html (+3/-1) templates/wlpoll/base.html (+4/-2) templates/wlpoll/poll_list.html (+3/-1) templates/wlprofile/base.html (+3/-1) templates/wlscheduling/base.html (+6/-4) templates/wlscreens/base.html (+3/-1) templates/wlscreens/index.html (+4/-3) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands-website/django_staticfiles | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
GunChleoc | Approve | ||
kaputtnik (community) | Needs Resubmitting | ||
Review via email: mp+359345@code.launchpad.net |
Commit message
Implement django's default behavior for static files (css, js, images)
Description of the change
The problem i had when introducing django-star-ratings (https:/
Main concepts of new static files handling:
1. Setting STATIC_ROOT to an absolute path where static files will be collected using the management command 'collectstatic'. This command needs executed if settings.
2. Different urls for static files and user uploaded files.
3. Use of the 'static' template tag in the templates to refer to static content (this is the main reason why this diff is that big)
Differences to the current state on the server:
1. Using the collectstatic command from this branch collects static files in 'media/
Unchanged:
Files uploaded by a user where still uploaded to 'media/
Other things:
1. Moved own static files from 'media/' to 'mainpage/static/' or to the app (folder) where it belongs to. I am planning to do the same with the subfolders in 'templates/*' to have all things related to one app in one folder. So working e.g. on some things in pybb, pybb related css is found in 'pybb/static/css/' and templates will be in 'pybb/templates
2. I found also 2 issues if one wants to setup the website from scratch. Those are fixed in https:/
To get this in:
1. Set website maintenance
2. Remove the contents of 'media/
3. merge the branch
4. Remove setting of STATIC_ROOT or set it to the destination where you want to collect static files. Remove the lines containing 'bd' and set MEDIA_ROOT to the destination where uploaded media should be stored. Remove STATIC_MEDIA_PATH (this was useless at all, because prior only used in local_urls.py)
5. run 'python manage.py collectstatic -l' (the switch '-l' creates symlinks instead of copying the files)
6. Change the url which refers to static content to point to the folder of STATIC_ROOT
7. pybb posts containing a smiley needs resaving to exchange the url pointing to the new smiley directory for field 'body_html'. This can be done best in the management shell:
from pybb.models import Post
for post in Post.objects.
post.save()
This takes some time...
8. Unset website maintenance
I will setup the alpha site for testing.
kaputtnik (franku) wrote : | # |
kaputtnik (franku) wrote : | # |
I found some strange inconsistencies in the alpha database, which i want to fix. So alpha is down again.
kaputtnik (franku) wrote : | # |
Alpha is up again...
GunChleoc (gunchleoc) wrote : | # |
When clicking on a screenshot, it won't bring up the lightbox with the bigger version. I don't have admin rights on the Alpha site, so I can't add a new one to test if it's just an issue with old data.
I have added some diff comments.
We should also grep for "MEDIA_URL" and "foreign" to make sure it's clean - I can't do that right now, because bzr keeps crapping out on this machine.
kaputtnik (franku) wrote : | # |
Found what's was wrong with the screens :-) This is fixed.
> I have added some diff comments.
> We should also grep for "MEDIA_URL" and "foreign"
Oh you're so right... i grep'ed only for "{{ MEDIA_URL" to search for it in the templates but MEDIA_URL is also used in some python scripts. Searching for 'foreign' isn't needed.
Will push a fixed branch next week.
Many thanks for testing and your input :-). Currently i am feeling getting stupider with every day :-S
kaputtnik (franku) wrote : | # |
python scripts are fine, but pybb posts needs resaving to apply the new static directory for smileys.
kaputtnik (franku) : | # |
kaputtnik (franku) wrote : | # |
The latest changes are applied to alpha now.
GunChleoc (gunchleoc) wrote : | # |
Tested again. Looks good to me :)
kaputtnik (franku) wrote : | # |
Thanks :-)
kaputtnik (franku) wrote : | # |
Merged and deployed.
I had some errors when re-saving the posts, so i added an additional try clause.
A question: The additional try clause is not included in this branch, because i merged this branch, changed the code, and then commited into trunk. Should i push into this branch also?
GunChleoc (gunchleoc) wrote : | # |
For small fix-ups like that, I think it's OK to recycle the branch and merge it again.
Preview Diff
1 | === modified file '.bzrignore' | |||
2 | --- .bzrignore 2018-11-21 17:36:00 +0000 | |||
3 | +++ .bzrignore 2018-11-28 19:45:23 +0000 | |||
4 | @@ -13,12 +13,4 @@ | |||
5 | 13 | whoosh_index | 13 | whoosh_index |
6 | 14 | media/map_object_info | 14 | media/map_object_info |
7 | 15 | media/wlhelp | 15 | media/wlhelp |
17 | 16 | media/static_foreign/admin | 16 | media/static_collected/* |
9 | 17 | media/static_foreign/basic.css | ||
10 | 18 | media/static_foreign/black20.png | ||
11 | 19 | media/static_foreign/but1.png | ||
12 | 20 | media/static_foreign/parchment.png | ||
13 | 21 | media/static_foreign/pygments.css | ||
14 | 22 | media/static_foreign/star-ratings | ||
15 | 23 | media/static_foreign/widelands.css | ||
16 | 24 | media/static_foreign/wood.png | ||
18 | 25 | 17 | ||
19 | === modified file 'README.txt' | |||
20 | --- README.txt 2018-05-09 06:02:44 +0000 | |||
21 | +++ README.txt 2018-11-28 19:45:23 +0000 | |||
22 | @@ -99,6 +99,17 @@ | |||
23 | 99 | 99 | ||
24 | 100 | Now everything should work. | 100 | Now everything should work. |
25 | 101 | 101 | ||
26 | 102 | Runnning with DBUG=False | ||
27 | 103 | ------------------------ | ||
28 | 104 | In case you want to test the site with the setting DEBUG=False, you might | ||
29 | 105 | notice that at least the admin site is missing all css. To fix this run: | ||
30 | 106 | |||
31 | 107 | $ ./manage.py collectstatic -l | ||
32 | 108 | |||
33 | 109 | This will create symbolic links (-l) to static contents of third party apps in | ||
34 | 110 | the folder defined by STATIC_ROOT. See: | ||
35 | 111 | https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#collectstatic | ||
36 | 112 | |||
37 | 102 | Accessing the website from other machines | 113 | Accessing the website from other machines |
38 | 103 | ----------------------------------------- | 114 | ----------------------------------------- |
39 | 104 | 115 | ||
40 | 105 | 116 | ||
41 | === modified file 'documentation/conf.py' | |||
42 | --- documentation/conf.py 2018-05-09 16:31:18 +0000 | |||
43 | +++ documentation/conf.py 2018-11-28 19:45:23 +0000 | |||
44 | @@ -123,7 +123,7 @@ | |||
45 | 123 | # Add any paths that contain custom static files (such as style sheets) here, | 123 | # Add any paths that contain custom static files (such as style sheets) here, |
46 | 124 | # relative to this directory. They are copied after the builtin static files, | 124 | # relative to this directory. They are copied after the builtin static files, |
47 | 125 | # so a file named "default.css" will overwrite the builtin "default.css". | 125 | # so a file named "default.css" will overwrite the builtin "default.css". |
49 | 126 | html_static_path = ['static/'] | 126 | html_static_path = ['styles/'] |
50 | 127 | 127 | ||
51 | 128 | # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, | 128 | # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, |
52 | 129 | # using the given strftime format. | 129 | # using the given strftime format. |
53 | 130 | 130 | ||
54 | === renamed directory 'documentation/static' => 'documentation/styles' | |||
55 | === modified file 'local_settings.py.sample' | |||
56 | --- local_settings.py.sample 2018-10-01 16:01:40 +0000 | |||
57 | +++ local_settings.py.sample 2018-11-28 19:45:23 +0000 | |||
58 | @@ -8,11 +8,9 @@ | |||
59 | 8 | import os | 8 | import os |
60 | 9 | import re | 9 | import re |
61 | 10 | 10 | ||
67 | 11 | bd = os.getcwd() # Better make this a static path | 11 | # Absolute path for uploaded files, e.g.: |
68 | 12 | 12 | # images for avatars, wiki, wlscreens, news cathegories and also mapfiles | |
69 | 13 | STATIC_MEDIA_PATH = os.path.join(bd, 'media') | 13 | MEDIA_ROOT = os.path.join(os.getcwd(), 'media/') |
65 | 14 | MEDIA_ROOT = os.path.join(bd, 'media/') | ||
66 | 15 | |||
70 | 16 | 14 | ||
71 | 17 | # If you are using the developer version of widelands from Launchpad | 15 | # If you are using the developer version of widelands from Launchpad |
72 | 18 | # set WIDELANDS_SVN_DIR to the correct path. See also: | 16 | # set WIDELANDS_SVN_DIR to the correct path. See also: |
73 | @@ -89,7 +87,7 @@ | |||
74 | 89 | # 'logfile': { | 87 | # 'logfile': { |
75 | 90 | # 'level':'DEBUG', | 88 | # 'level':'DEBUG', |
76 | 91 | # 'class':'logging.FileHandler', | 89 | # 'class':'logging.FileHandler', |
78 | 92 | # 'filename': bd + "/log.txt", | 90 | # 'filename': os.getcwd() + "/log.txt", |
79 | 93 | # }, | 91 | # }, |
80 | 94 | # }, | 92 | # }, |
81 | 95 | # 'root': { | 93 | # 'root': { |
82 | 96 | 94 | ||
83 | === modified file 'local_urls.py.sample' | |||
84 | --- local_urls.py.sample 2018-05-24 07:23:08 +0000 | |||
85 | +++ local_urls.py.sample 2018-11-28 19:45:23 +0000 | |||
86 | @@ -6,16 +6,21 @@ | |||
87 | 6 | # Don't use this file on the server! | 6 | # Don't use this file on the server! |
88 | 7 | 7 | ||
89 | 8 | local_urlpatterns = [ | 8 | local_urlpatterns = [ |
90 | 9 | # Files uploaded by users | ||
91 | 9 | url(r'^wlmedia/(?P<path>.*)$', | 10 | url(r'^wlmedia/(?P<path>.*)$', |
92 | 10 | serve, | 11 | serve, |
94 | 11 | {'document_root': settings.STATIC_MEDIA_PATH}, | 12 | {'document_root': settings.MEDIA_ROOT}, |
95 | 12 | name='static_media'), | 13 | name='static_media'), |
97 | 13 | url(r'^media/(?P<path>.*)$', | 14 | # Static files if DEBUG=False. Use the 'collectstatic' command to fetch them |
98 | 15 | url(r'^static/(?P<path>.*)$', | ||
99 | 14 | serve, | 16 | serve, |
102 | 15 | {'document_root': settings.STATIC_MEDIA_PATH}, | 17 | {'document_root': settings.STATIC_ROOT}, |
103 | 16 | name='static_media_pybb'), | 18 | name='static_media_collected'), |
104 | 19 | # HTML documentation created by ./manage.py create_docs | ||
105 | 17 | url(r'^documentation/(?P<path>.*)$', | 20 | url(r'^documentation/(?P<path>.*)$', |
106 | 18 | serve, | 21 | serve, |
109 | 19 | {'document_root': path.join(settings.STATIC_MEDIA_PATH, 'documentation/html')}, | 22 | {'document_root': path.join( |
110 | 20 | name='documentation'), | 23 | settings.MEDIA_ROOT, 'documentation/html')}, |
111 | 24 | name='documentation') | ||
112 | 21 | ] | 25 | ] |
113 | 26 | |||
114 | 22 | 27 | ||
115 | === added directory 'mainpage/static' | |||
116 | === renamed directory 'media/css' => 'mainpage/static/css' | |||
117 | === renamed file 'media/favicon.ico' => 'mainpage/static/favicon.ico' | |||
118 | === renamed directory 'media/img' => 'mainpage/static/img' | |||
119 | === renamed directory 'media/js' => 'mainpage/static/js' | |||
120 | === modified file 'mainpage/templatetags/wl_markdown.py' | |||
121 | --- mainpage/templatetags/wl_markdown.py 2018-11-16 07:20:46 +0000 | |||
122 | +++ mainpage/templatetags/wl_markdown.py 2018-11-28 19:45:23 +0000 | |||
123 | @@ -102,15 +102,20 @@ | |||
124 | 102 | tag: classify for this tag | 102 | tag: classify for this tag |
125 | 103 | 103 | ||
126 | 104 | """ | 104 | """ |
127 | 105 | # No class change for image links | ||
128 | 106 | if tag.next_element.name == 'img': | ||
129 | 107 | return | ||
130 | 108 | 105 | ||
131 | 109 | try: | 106 | try: |
132 | 110 | href = tag['href'].lower() | 107 | href = tag['href'].lower() |
133 | 108 | if not tag.string: | ||
134 | 109 | # Apply href to empty linkname, e.g.: [](/some/link) | ||
135 | 110 | # Just to be sure tag.next_element is never None | ||
136 | 111 | tag.string = href | ||
137 | 111 | except KeyError: | 112 | except KeyError: |
138 | 112 | return | 113 | return |
139 | 113 | 114 | ||
140 | 115 | # No class change for image links | ||
141 | 116 | if tag.next_element.name == 'img': | ||
142 | 117 | return | ||
143 | 118 | |||
144 | 114 | # Check for external link | 119 | # Check for external link |
145 | 115 | if href.startswith('http'): | 120 | if href.startswith('http'): |
146 | 116 | for domain in LOCAL_DOMAINS: | 121 | for domain in LOCAL_DOMAINS: |
147 | 117 | 122 | ||
148 | === removed file 'media/css/register.css' | |||
149 | === removed file 'media/img/active_star.gif' | |||
150 | 118 | Binary files media/img/active_star.gif 2011-07-03 14:00:24 +0000 and media/img/active_star.gif 1970-01-01 00:00:00 +0000 differ | 123 | Binary files media/img/active_star.gif 2011-07-03 14:00:24 +0000 and media/img/active_star.gif 1970-01-01 00:00:00 +0000 differ |
151 | === removed file 'media/img/passive_star.gif' | |||
152 | 119 | Binary files media/img/passive_star.gif 2011-07-03 14:00:24 +0000 and media/img/passive_star.gif 1970-01-01 00:00:00 +0000 differ | 124 | Binary files media/img/passive_star.gif 2011-07-03 14:00:24 +0000 and media/img/passive_star.gif 1970-01-01 00:00:00 +0000 differ |
153 | === removed file 'media/js/jquery.sexy-vote.js' | |||
154 | --- media/js/jquery.sexy-vote.js 2017-09-23 08:52:36 +0000 | |||
155 | +++ media/js/jquery.sexy-vote.js 1970-01-01 00:00:00 +0000 | |||
156 | @@ -1,76 +0,0 @@ | |||
157 | 1 | jQuery.fn.sexyVote = function(config) { | ||
158 | 2 | config = config || {}; | ||
159 | 3 | var defaults = { | ||
160 | 4 | activeImageSrc: "active_star.gif", | ||
161 | 5 | passiveImageSrc: "passive_star.gif", | ||
162 | 6 | maxScore: 5, | ||
163 | 7 | fn: new Function(), | ||
164 | 8 | messages: [ | ||
165 | 9 | "Your vote have been saved.", | ||
166 | 10 | "Very bad", | ||
167 | 11 | "Bad", | ||
168 | 12 | "Good, but could be better", | ||
169 | 13 | "Good enough", | ||
170 | 14 | "Very good" | ||
171 | 15 | ] | ||
172 | 16 | }; | ||
173 | 17 | |||
174 | 18 | config = jQuery.extend(defaults, config); | ||
175 | 19 | |||
176 | 20 | |||
177 | 21 | |||
178 | 22 | return this.each(function() { | ||
179 | 23 | var $container = jQuery(this); | ||
180 | 24 | |||
181 | 25 | for (var i = 0, num = config.maxScore * 2; i < num; ++i) { | ||
182 | 26 | jQuery("<img />").appendTo($container); | ||
183 | 27 | } | ||
184 | 28 | |||
185 | 29 | jQuery("<span />").appendTo($container); | ||
186 | 30 | |||
187 | 31 | $container.find("img:even"). | ||
188 | 32 | attr("src", config.passiveImageSrc). | ||
189 | 33 | css({display: "inline"}). | ||
190 | 34 | on("mouseover", function(e) { | ||
191 | 35 | var len = $container.find("img:even").index(e.target) + 1; | ||
192 | 36 | |||
193 | 37 | $container.find("img:even").slice(0, len).css({display: "none"}); | ||
194 | 38 | |||
195 | 39 | $container.find("img:odd").slice(0, len).css({display: "inline"}); | ||
196 | 40 | |||
197 | 41 | $container.find("span").text(config.messages[len]); | ||
198 | 42 | |||
199 | 43 | |||
200 | 44 | }). | ||
201 | 45 | end(). | ||
202 | 46 | find("img:odd"). | ||
203 | 47 | attr("src", config.activeImageSrc). | ||
204 | 48 | css({display: "none"}). | ||
205 | 49 | on("mouseout", function(e) { | ||
206 | 50 | |||
207 | 51 | var len = $container.find("img:odd"). | ||
208 | 52 | index(e.target) + 1; | ||
209 | 53 | |||
210 | 54 | $container.find("img:odd") | ||
211 | 55 | .slice(0, len). | ||
212 | 56 | css({display: "none"}); | ||
213 | 57 | $container.find("img:even"). | ||
214 | 58 | slice(0, len). | ||
215 | 59 | css({display: "inline"}); | ||
216 | 60 | |||
217 | 61 | $container.find("span"). | ||
218 | 62 | text(""); | ||
219 | 63 | |||
220 | 64 | |||
221 | 65 | }). | ||
222 | 66 | on("click", function(e) { | ||
223 | 67 | $container.find("img"). | ||
224 | 68 | off("mouseover"). | ||
225 | 69 | off("mouseout"). | ||
226 | 70 | off("click"); | ||
227 | 71 | $container.find("span"). | ||
228 | 72 | text(config.messages[0]); | ||
229 | 73 | config.fn.call(this, e, $container.find("img:odd").index(e.target) + 1); | ||
230 | 74 | }); | ||
231 | 75 | }); | ||
232 | 76 | }; | ||
233 | 77 | 0 | ||
234 | === added directory 'media/static_collected' | |||
235 | === removed directory 'media/static_foreign' | |||
236 | === added directory 'news/static' | |||
237 | === added directory 'news/static/css' | |||
238 | === renamed file 'media/css/news.css' => 'news/static/css/news.css' | |||
239 | === added directory 'notification/static' | |||
240 | === added directory 'notification/static/css' | |||
241 | === renamed file 'media/css/notice.css' => 'notification/static/css/notice.css' | |||
242 | === modified file 'pybb/models.py' | |||
243 | --- pybb/models.py 2018-11-18 10:28:03 +0000 | |||
244 | +++ pybb/models.py 2018-11-28 19:45:23 +0000 | |||
245 | @@ -220,10 +220,13 @@ | |||
246 | 220 | self).get_queryset().filter(hidden=True) | 220 | self).get_queryset().filter(hidden=True) |
247 | 221 | 221 | ||
248 | 222 | hidden_topics = [] | 222 | hidden_topics = [] |
253 | 223 | for post in qs: | 223 | try: |
254 | 224 | if post.topic.is_hidden: | 224 | for post in qs: |
255 | 225 | hidden_topics.append(post.topic) | 225 | if post.topic.is_hidden: |
256 | 226 | return hidden_topics | 226 | hidden_topics.append(post.topic) |
257 | 227 | return hidden_topics | ||
258 | 228 | except: | ||
259 | 229 | return [] | ||
260 | 227 | 230 | ||
261 | 228 | 231 | ||
262 | 229 | class Post(RenderableItem): | 232 | class Post(RenderableItem): |
263 | 230 | 233 | ||
264 | === added directory 'pybb/static' | |||
265 | === added directory 'pybb/static/css' | |||
266 | === renamed file 'media/css/forum.css' => 'pybb/static/css/forum.css' | |||
267 | === renamed directory 'media/forum' => 'pybb/static/forum' | |||
268 | === modified file 'settings.py' | |||
269 | --- settings.py 2018-11-19 17:34:37 +0000 | |||
270 | +++ settings.py 2018-11-28 19:45:23 +0000 | |||
271 | @@ -48,6 +48,7 @@ | |||
272 | 48 | 48 | ||
273 | 49 | # Absolute path to the directory that holds media. | 49 | # Absolute path to the directory that holds media. |
274 | 50 | # Example: "/home/media/media.lawrence.com/" | 50 | # Example: "/home/media/media.lawrence.com/" |
275 | 51 | # Overwritten in local_settings.py | ||
276 | 51 | MEDIA_ROOT = '' | 52 | MEDIA_ROOT = '' |
277 | 52 | 53 | ||
278 | 53 | # URL that handles the media served from MEDIA_ROOT. Make sure to use a | 54 | # URL that handles the media served from MEDIA_ROOT. Make sure to use a |
279 | @@ -55,6 +56,15 @@ | |||
280 | 55 | # Examples: "http://media.lawrence.com", "http://example.com/media/" | 56 | # Examples: "http://media.lawrence.com", "http://example.com/media/" |
281 | 56 | MEDIA_URL = '/wlmedia/' | 57 | MEDIA_URL = '/wlmedia/' |
282 | 57 | 58 | ||
283 | 59 | # Absolute path where static files from thirdparty apps will be collected using | ||
284 | 60 | # the command: ./manage.py collectstatic | ||
285 | 61 | STATIC_ROOT = os.path.join(BASE_DIR, 'media/static_collected/') | ||
286 | 62 | |||
287 | 63 | # URL to use when referring to static files located in STATIC_ROOT. | ||
288 | 64 | # Must be different than MEDIA_URL! | ||
289 | 65 | # https://docs.djangoproject.com/en/1.8/howto/static-files/ | ||
290 | 66 | STATIC_URL = '/static/' | ||
291 | 67 | |||
292 | 58 | # Make this unique, and don't share it with anybody. | 68 | # Make this unique, and don't share it with anybody. |
293 | 59 | SECRET_KEY = '#*bc7*q0-br42fc&6l^x@zzk&(=-#gr!)fn@t30n54n05jkqcu' | 69 | SECRET_KEY = '#*bc7*q0-br42fc&6l^x@zzk&(=-#gr!)fn@t30n54n05jkqcu' |
294 | 60 | 70 | ||
295 | @@ -63,7 +73,6 @@ | |||
296 | 63 | # List of finder classes that know how to find static files in | 73 | # List of finder classes that know how to find static files in |
297 | 64 | # various locations. | 74 | # various locations. |
298 | 65 | STATICFILES_FINDERS = [ | 75 | STATICFILES_FINDERS = [ |
299 | 66 | 'django.contrib.staticfiles.finders.FileSystemFinder', | ||
300 | 67 | 'django.contrib.staticfiles.finders.AppDirectoriesFinder', | 76 | 'django.contrib.staticfiles.finders.AppDirectoriesFinder', |
301 | 68 | ] | 77 | ] |
302 | 69 | 78 | ||
303 | @@ -101,7 +110,6 @@ | |||
304 | 101 | # Modified 3rd party apps | 110 | # Modified 3rd party apps |
305 | 102 | 'wiki.apps.WikiConfig', # This is based on wikiapp, but has some local modifications | 111 | 'wiki.apps.WikiConfig', # This is based on wikiapp, but has some local modifications |
306 | 103 | 'news', # This is based on simple-blog, but has some local modifications | 112 | 'news', # This is based on simple-blog, but has some local modifications |
307 | 104 | 'news.managers', | ||
308 | 105 | 'pybb.apps.PybbConfig', # Feature enriched version of pybb | 113 | 'pybb.apps.PybbConfig', # Feature enriched version of pybb |
309 | 106 | 114 | ||
310 | 107 | # Thirdparty apps | 115 | # Thirdparty apps |
311 | @@ -149,10 +157,6 @@ | |||
312 | 149 | }, | 157 | }, |
313 | 150 | ] | 158 | ] |
314 | 151 | 159 | ||
315 | 152 | # Static files (CSS, JavaScript, Images) | ||
316 | 153 | # https://docs.djangoproject.com/en/1.8/howto/static-files/ | ||
317 | 154 | STATIC_URL = '/media/' | ||
318 | 155 | |||
319 | 156 | ############################ | 160 | ############################ |
320 | 157 | # Activation configuration # | 161 | # Activation configuration # |
321 | 158 | ############################ | 162 | ############################ |
322 | @@ -198,7 +202,7 @@ | |||
323 | 198 | 'xoops.widelands.org' | 202 | 'xoops.widelands.org' |
324 | 199 | ] | 203 | ] |
325 | 200 | 204 | ||
327 | 201 | SMILEY_DIR = MEDIA_URL + 'img/smileys/' | 205 | SMILEY_DIR = STATIC_URL + 'img/smileys/' |
328 | 202 | # Keep this list ordered by length of smileys | 206 | # Keep this list ordered by length of smileys |
329 | 203 | SMILEYS = [ | 207 | SMILEYS = [ |
330 | 204 | ('O:-)', 'face-angel.png'), | 208 | ('O:-)', 'face-angel.png'), |
331 | 205 | 209 | ||
332 | === modified file 'templates/base.html' | |||
333 | --- templates/base.html 2018-10-15 16:11:43 +0000 | |||
334 | +++ templates/base.html 2018-11-28 19:45:23 +0000 | |||
335 | @@ -5,6 +5,7 @@ | |||
336 | 5 | This file is extended by all other files which are not | 5 | This file is extended by all other files which are not |
337 | 6 | included here | 6 | included here |
338 | 7 | {% endcomment %} | 7 | {% endcomment %} |
339 | 8 | {% load static %} | ||
340 | 8 | <html lang="en"> | 9 | <html lang="en"> |
341 | 9 | 10 | ||
342 | 10 | <head> | 11 | <head> |
343 | @@ -14,20 +15,20 @@ | |||
344 | 14 | <meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" /> | 15 | <meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" /> |
345 | 15 | 16 | ||
346 | 16 | <title>{% block title %}Widelands.org{% endblock %}</title> | 17 | <title>{% block title %}Widelands.org{% endblock %}</title> |
348 | 17 | <link href="{{ MEDIA_URL }}favicon.ico" rel="icon" /> | 18 | <link href="{% static 'favicon.ico' %}" rel="icon" /> |
349 | 18 | 19 | ||
350 | 19 | <!-- CSS --> | 20 | <!-- CSS --> |
353 | 20 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/base.css?v1" /> | 21 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/base.css' %}?v1" /> |
354 | 21 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/navigation.css" /> | 22 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/navigation.css' %}" /> |
355 | 22 | <!--[if lt IE 9]> | 23 | <!--[if lt IE 9]> |
357 | 23 | <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/base_ielt9.css" /> | 24 | <link rel="stylesheet" type="text/css" href="{% static 'css/base_ielt9.css' %}" /> |
358 | 24 | <![endif]--> | 25 | <![endif]--> |
359 | 25 | 26 | ||
360 | 26 | <!-- Javascript Bread & Butter Scripts --> | 27 | <!-- Javascript Bread & Butter Scripts --> |
365 | 27 | <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-3.2.1.js"></script> | 28 | <script type="text/javascript" src="{% static 'js/jquery-3.2.1.js' %}"></script> |
366 | 28 | <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui.min.js"></script> | 29 | <script type="text/javascript" src="{% static 'js/jquery-ui.min.js' %}"></script> |
367 | 29 | <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery_csrf_ajax.js"></script> | 30 | <script type="text/javascript" src="{% static 'js/jquery_csrf_ajax.js' %}"></script> |
368 | 30 | <script type="text/javascript" src="{{ MEDIA_URL }}js/search.js"></script> | 31 | <script type="text/javascript" src="{% static 'js/search.js' %}"></script> |
369 | 31 | {% block extra_head %}{% endblock %} | 32 | {% block extra_head %}{% endblock %} |
370 | 32 | </head> | 33 | </head> |
371 | 33 | 34 | ||
372 | 34 | 35 | ||
373 | === modified file 'templates/django_messages/base.html' | |||
374 | --- templates/django_messages/base.html 2018-11-09 07:00:30 +0000 | |||
375 | +++ templates/django_messages/base.html 2018-11-28 19:45:23 +0000 | |||
376 | @@ -1,9 +1,11 @@ | |||
377 | 1 | {% extends "wlprofile/base.html" %} | 1 | {% extends "wlprofile/base.html" %} |
379 | 2 | {% load i18n %} | 2 | {% load i18n %} |
380 | 3 | {% load static %} | ||
381 | 4 | |||
382 | 3 | {% block bodyclass %}about{% endblock %} | 5 | {% block bodyclass %}about{% endblock %} |
383 | 4 | 6 | ||
384 | 5 | {% block extra_head %} | 7 | {% block extra_head %} |
386 | 6 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/messages.css" /> | 8 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/messages.css' %}" /> |
387 | 7 | {{ block.super}}{% endblock %} | 9 | {{ block.super}}{% endblock %} |
388 | 8 | 10 | ||
389 | 9 | {% block messages %}class="active"{% endblock %} | 11 | {% block messages %}class="active"{% endblock %} |
390 | 10 | 12 | ||
391 | === modified file 'templates/django_messages/inbox.html' | |||
392 | --- templates/django_messages/inbox.html 2018-09-08 09:44:03 +0000 | |||
393 | +++ templates/django_messages/inbox.html 2018-11-28 19:45:23 +0000 | |||
394 | @@ -2,6 +2,7 @@ | |||
395 | 2 | {% load i18n %} | 2 | {% load i18n %} |
396 | 3 | {% load custom_date %} | 3 | {% load custom_date %} |
397 | 4 | {% load wlprofile_extras %} | 4 | {% load wlprofile_extras %} |
398 | 5 | {% load static %} | ||
399 | 5 | 6 | ||
400 | 6 | {% block title %} | 7 | {% block title %} |
401 | 7 | Inbox - {{ block.super }} | 8 | Inbox - {{ block.super }} |
402 | @@ -25,14 +26,14 @@ | |||
403 | 25 | <td>{{ message.sender|user_link }}</td> | 26 | <td>{{ message.sender|user_link }}</td> |
404 | 26 | <td> | 27 | <td> |
405 | 27 | {% if message.replied %} | 28 | {% if message.replied %} |
407 | 28 | <img src="{{ MEDIA_URL }}img/replied.png" alt="replied" title="replied" /> | 29 | <img src="{% static 'img/replied.png' %}" alt="replied" title="replied" /> |
408 | 29 | {% endif %} | 30 | {% endif %} |
409 | 30 | <a href="{{message.get_absolute_url }}">{{ message.subject }}</a> | 31 | <a href="{{message.get_absolute_url }}">{{ message.subject }}</a> |
410 | 31 | </td> | 32 | </td> |
411 | 32 | <td>{{ message.sent_at|custom_date:user }}</td> | 33 | <td>{{ message.sent_at|custom_date:user }}</td> |
412 | 33 | <td> | 34 | <td> |
413 | 34 | <a href="{% url 'messages_delete' message.id %}?next={{ request.path|iriencode }}"> | 35 | <a href="{% url 'messages_delete' message.id %}?next={{ request.path|iriencode }}"> |
415 | 35 | <img src="{{ MEDIA_URL }}img/delete.png" alt="delete" title="delete" /> | 36 | <img src="{% static 'img/delete.png' %}" alt="delete" title="delete" /> |
416 | 36 | </a> | 37 | </a> |
417 | 37 | </td> | 38 | </td> |
418 | 38 | </tr> | 39 | </tr> |
419 | 39 | 40 | ||
420 | === modified file 'templates/django_messages/outbox.html' | |||
421 | --- templates/django_messages/outbox.html 2018-04-11 07:43:01 +0000 | |||
422 | +++ templates/django_messages/outbox.html 2018-11-28 19:45:23 +0000 | |||
423 | @@ -2,6 +2,7 @@ | |||
424 | 2 | {% load i18n %} | 2 | {% load i18n %} |
425 | 3 | {% load custom_date %} | 3 | {% load custom_date %} |
426 | 4 | {% load wlprofile_extras %} | 4 | {% load wlprofile_extras %} |
427 | 5 | {% load static %} | ||
428 | 5 | 6 | ||
429 | 6 | {% block title %} | 7 | {% block title %} |
430 | 7 | Outbox - {{ block.super }} | 8 | Outbox - {{ block.super }} |
431 | @@ -28,7 +29,7 @@ | |||
432 | 28 | <td>{{ message.sent_at|custom_date:user }}</td> | 29 | <td>{{ message.sent_at|custom_date:user }}</td> |
433 | 29 | <td> | 30 | <td> |
434 | 30 | <a href="{% url 'messages_delete' message.id %}?next={{ request.path|iriencode }}"> | 31 | <a href="{% url 'messages_delete' message.id %}?next={{ request.path|iriencode }}"> |
436 | 31 | <img src="{{ MEDIA_URL }}img/delete.png" alt="delete" title="delete" /> | 32 | <img src="{% static 'img/delete.png' %}" alt="delete" title="delete" /> |
437 | 32 | </a> | 33 | </a> |
438 | 33 | </td> | 34 | </td> |
439 | 34 | </tr> | 35 | </tr> |
440 | 35 | 36 | ||
441 | === modified file 'templates/django_messages/trash.html' | |||
442 | --- templates/django_messages/trash.html 2018-04-13 07:31:42 +0000 | |||
443 | +++ templates/django_messages/trash.html 2018-11-28 19:45:23 +0000 | |||
444 | @@ -2,6 +2,7 @@ | |||
445 | 2 | {% load i18n %} | 2 | {% load i18n %} |
446 | 3 | {% load custom_date %} | 3 | {% load custom_date %} |
447 | 4 | {% load wlprofile_extras %} | 4 | {% load wlprofile_extras %} |
448 | 5 | {% load static %} | ||
449 | 5 | 6 | ||
450 | 6 | {% block title %} | 7 | {% block title %} |
451 | 7 | Trash - {{ block.super }} | 8 | Trash - {{ block.super }} |
452 | @@ -27,7 +28,7 @@ | |||
453 | 27 | <td>{{ message.recipient|user_link }}</td> | 28 | <td>{{ message.recipient|user_link }}</td> |
454 | 28 | <td> | 29 | <td> |
455 | 29 | {% if message.replied %} | 30 | {% if message.replied %} |
457 | 30 | <img src="{{ MEDIA_URL }}img/replied.png" alt="replied" title="replied" /> | 31 | <img src="{% static 'img/replied.png' %}" alt="replied" title="replied" /> |
458 | 31 | {% endif %} | 32 | {% endif %} |
459 | 32 | <a href="{{message.get_absolute_url }}">{{ message.subject }}</a> | 33 | <a href="{{message.get_absolute_url }}">{{ message.subject }}</a> |
460 | 33 | </td> | 34 | </td> |
461 | @@ -35,11 +36,11 @@ | |||
462 | 35 | <td> | 36 | <td> |
463 | 36 | {% if message.sender == request.user %} | 37 | {% if message.sender == request.user %} |
464 | 37 | <a href="{% url 'messages_undelete' message.id %}?next=/messages/outbox/"> | 38 | <a href="{% url 'messages_undelete' message.id %}?next=/messages/outbox/"> |
466 | 38 | <img src="{{ MEDIA_URL }}img/undelete.png" alt="undelete" title="undelete" /> | 39 | <img src="{% static 'img/undelete.png' %}" alt="undelete" title="undelete" /> |
467 | 39 | </a> | 40 | </a> |
468 | 40 | {% else %} | 41 | {% else %} |
469 | 41 | <a href="{% url 'messages_undelete' message.id %}?next=/messages/inbox/"> | 42 | <a href="{% url 'messages_undelete' message.id %}?next=/messages/inbox/"> |
471 | 42 | <img src="{{ MEDIA_URL }}img/undelete.png" alt="undelete" title="undelete" /> | 43 | <img src="{% static 'img/undelete.png' %}" alt="undelete" title="undelete" /> |
472 | 43 | </a> | 44 | </a> |
473 | 44 | {% endif %} | 45 | {% endif %} |
474 | 45 | </td> | 46 | </td> |
475 | 46 | 47 | ||
476 | === modified file 'templates/header.html' | |||
477 | --- templates/header.html 2018-11-28 08:08:18 +0000 | |||
478 | +++ templates/header.html 2018-11-28 19:45:23 +0000 | |||
479 | @@ -1,31 +1,32 @@ | |||
480 | 1 | {% load wlprofile_extras %} | 1 | {% load wlprofile_extras %} |
481 | 2 | {% load wl_extras %} | 2 | {% load wl_extras %} |
482 | 3 | {% load static %} | ||
483 | 3 | 4 | ||
484 | 4 | <div id="logo"> | 5 | <div id="logo"> |
485 | 5 | <a href="{% url 'mainpage' %}"><img src= | 6 | <a href="{% url 'mainpage' %}"><img src= |
487 | 6 | "{{ MEDIA_URL }}img/{% wl_logo %}" alt= | 7 | "{% static 'img/'%}{% wl_logo %}" alt= |
488 | 7 | "Widelands Logo"></a> | 8 | "Widelands Logo"></a> |
489 | 8 | </div> | 9 | </div> |
490 | 9 | <ul class="header_boxes"> | 10 | <ul class="header_boxes"> |
491 | 10 | <li class="small"> | 11 | <li class="small"> |
492 | 11 | <a href="{% url 'wlscreens_index' %}" title="Screenshots">Screenshots<br /> | 12 | <a href="{% url 'wlscreens_index' %}" title="Screenshots">Screenshots<br /> |
494 | 12 | <img src="{{ MEDIA_URL }}/img/camera.png" alt="Screenshots" /> | 13 | <img src="{% static '/img/camera.png' %}" alt="Screenshots" /> |
495 | 13 | </a> | 14 | </a> |
496 | 14 | </li> | 15 | </li> |
497 | 15 | <li class="small"> | 16 | <li class="small"> |
498 | 16 | <a href="{% url 'wiki_article' "Download" %}" title="Download">Download<br /> | 17 | <a href="{% url 'wiki_article' "Download" %}" title="Download">Download<br /> |
500 | 17 | <img src="{{ MEDIA_URL }}/img/download.png" alt="Get Widelands" /> | 18 | <img src="{% static '/img/download.png' %}" alt="Get Widelands" /> |
501 | 18 | </a> | 19 | </a> |
502 | 19 | </li> | 20 | </li> |
503 | 20 | <li class="small"> | 21 | <li class="small"> |
504 | 21 | <a href="{% url 'wlmaps_index' %}" title="Get new maps">Maps<br /> | 22 | <a href="{% url 'wlmaps_index' %}" title="Get new maps">Maps<br /> |
506 | 22 | <img src="{{ MEDIA_URL }}img/maps.png" alt="Get Free Maps" /> | 23 | <img src="{% static 'img/maps.png' %}" alt="Get Free Maps" /> |
507 | 23 | </a> | 24 | </a> |
508 | 24 | </li> | 25 | </li> |
509 | 25 | <li class="small"> | 26 | <li class="small"> |
510 | 26 | <p>Social Media</p> | 27 | <p>Social Media</p> |
511 | 27 | <a href="https://www.facebook.com/WidelandsOfficial" target="_blank"> | 28 | <a href="https://www.facebook.com/WidelandsOfficial" target="_blank"> |
513 | 28 | <img src="{{ MEDIA_URL }}img/socialmedia/facebook.png" alt="Facebook" /> | 29 | <img src="{% static 'img/socialmedia/facebook.png' %}" alt="Facebook" /> |
514 | 29 | </a> | 30 | </a> |
515 | 30 | </li> | 31 | </li> |
516 | 31 | <li class="loginBox small"> | 32 | <li class="loginBox small"> |
517 | 32 | 33 | ||
518 | === modified file 'templates/mainpage.html' | |||
519 | --- templates/mainpage.html 2018-10-14 14:20:48 +0000 | |||
520 | +++ templates/mainpage.html 2018-11-28 19:45:23 +0000 | |||
521 | @@ -7,11 +7,12 @@ | |||
522 | 7 | they reach our homepage | 7 | they reach our homepage |
523 | 8 | 8 | ||
524 | 9 | {% endcomment %} | 9 | {% endcomment %} |
526 | 10 | 10 | {% load static %} | |
527 | 11 | {% load news_extras %} | 11 | {% load news_extras %} |
528 | 12 | |||
529 | 12 | {% block extra_head %} | 13 | {% block extra_head %} |
530 | 13 | <meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" /> | 14 | <meta name="google-site-verification" content="1A5uFV_zNuXazJ46-572-_lLzcCTEQ77iHaSPFZd53Y" /> |
532 | 14 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/news.css" /> | 15 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/news.css' %}" /> |
533 | 15 | <link rel="alternate" type="application/rss+xml" title="Widelands News" href="news/feed/" /> | 16 | <link rel="alternate" type="application/rss+xml" title="Widelands News" href="news/feed/" /> |
534 | 16 | 17 | ||
535 | 17 | {{ block.super}}{% endblock %} | 18 | {{ block.super}}{% endblock %} |
536 | @@ -20,7 +21,7 @@ | |||
537 | 20 | {% endblock %} | 21 | {% endblock %} |
538 | 21 | {% block content_main %} | 22 | {% block content_main %} |
539 | 22 | <div class="blogEntry" style="min-height: 380px;"> | 23 | <div class="blogEntry" style="min-height: 380px;"> |
541 | 23 | <img class="landing posRight" src="{{ MEDIA_URL }}img/welcome.jpg" alt="Welcome!" /> | 24 | <img class="landing posRight" src="{% static 'img/welcome.jpg' %}" alt="Welcome!" /> |
542 | 24 | <p> | 25 | <p> |
543 | 25 | <a href="{% url 'wiki_article' "Description" %}">Widelands</a> is a | 26 | <a href="{% url 'wiki_article' "Description" %}">Widelands</a> is a |
544 | 26 | <a href="{% url 'wiki_article' "The Widelands Project" %}">free, open source</a> | 27 | <a href="{% url 'wiki_article' "The Widelands Project" %}">free, open source</a> |
545 | 27 | 28 | ||
546 | === modified file 'templates/mainpage/developers.html' | |||
547 | --- templates/mainpage/developers.html 2018-10-14 14:20:48 +0000 | |||
548 | +++ templates/mainpage/developers.html 2018-11-28 19:45:23 +0000 | |||
549 | @@ -1,9 +1,9 @@ | |||
550 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
552 | 2 | 2 | {% load static %} | |
553 | 3 | {% block title %}Widelands Development Team - {{ block.super }}{% endblock %} | 3 | {% block title %}Widelands Development Team - {{ block.super }}{% endblock %} |
554 | 4 | 4 | ||
555 | 5 | {% block extra_head %} | 5 | {% block extra_head %} |
557 | 6 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" /> | 6 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/wiki.css' %}" /> |
558 | 7 | {{ block.super}} | 7 | {{ block.super}} |
559 | 8 | {% endblock %} | 8 | {% endblock %} |
560 | 9 | 9 | ||
561 | 10 | 10 | ||
562 | === modified file 'templates/news/base_news.html' | |||
563 | --- templates/news/base_news.html 2016-11-18 23:50:23 +0000 | |||
564 | +++ templates/news/base_news.html 2018-11-28 19:45:23 +0000 | |||
565 | @@ -1,8 +1,9 @@ | |||
566 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
567 | 2 | {% load static %} | ||
568 | 2 | 3 | ||
569 | 3 | {% block title %}News Archive {% endblock %} | 4 | {% block title %}News Archive {% endblock %} |
570 | 4 | 5 | ||
571 | 5 | {% block extra_head %} | 6 | {% block extra_head %} |
572 | 6 | <link rel="alternate" type="application/rss+xml" title="Widelands News" href="/feeds/news/" /> | 7 | <link rel="alternate" type="application/rss+xml" title="Widelands News" href="/feeds/news/" /> |
574 | 7 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/news.css" /> | 8 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/news.css' %}" /> |
575 | 8 | {{ block.super}}{% endblock %} | 9 | {{ block.super}}{% endblock %} |
576 | 9 | 10 | ||
577 | === modified file 'templates/news/post_detail.html' | |||
578 | --- templates/news/post_detail.html 2018-10-14 14:20:48 +0000 | |||
579 | +++ templates/news/post_detail.html 2018-11-28 19:45:23 +0000 | |||
580 | @@ -6,13 +6,14 @@ | |||
581 | 6 | 6 | ||
582 | 7 | 7 | ||
583 | 8 | {% load threadedcommentstags %} | 8 | {% load threadedcommentstags %} |
584 | 9 | {% load static %} | ||
585 | 9 | 10 | ||
586 | 10 | {% block title %}{{ object.title }} - {{ block.super }}{% endblock %} | 11 | {% block title %}{{ object.title }} - {{ block.super }}{% endblock %} |
587 | 11 | 12 | ||
588 | 12 | {% block extra_head %} | 13 | {% block extra_head %} |
589 | 13 | {{ block.super }} | 14 | {{ block.super }} |
592 | 14 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/news.css" /> | 15 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/news.css' %}" /> |
593 | 15 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" /> | 16 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/comments.css' %}" /> |
594 | 16 | {% endblock %} | 17 | {% endblock %} |
595 | 17 | 18 | ||
596 | 18 | {% block content_header %} | 19 | {% block content_header %} |
597 | 19 | 20 | ||
598 | === modified file 'templates/notification/base.html' | |||
599 | --- templates/notification/base.html 2018-10-15 16:11:43 +0000 | |||
600 | +++ templates/notification/base.html 2018-11-28 19:45:23 +0000 | |||
601 | @@ -1,5 +1,6 @@ | |||
602 | 1 | {% extends "wlprofile/base.html" %} | 1 | {% extends "wlprofile/base.html" %} |
603 | 2 | {% load static %} | ||
604 | 2 | 3 | ||
605 | 3 | {% block extra_head %} | 4 | {% block extra_head %} |
607 | 4 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/notice.css" />{{ block.super}} | 5 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/notice.css' %}" />{{ block.super}} |
608 | 5 | {% endblock %} | 6 | {% endblock %} |
609 | 6 | \ No newline at end of file | 7 | \ No newline at end of file |
610 | 7 | 8 | ||
611 | === modified file 'templates/privacy_policy.html' | |||
612 | --- templates/privacy_policy.html 2018-10-14 13:24:15 +0000 | |||
613 | +++ templates/privacy_policy.html 2018-11-28 19:45:23 +0000 | |||
614 | @@ -1,11 +1,11 @@ | |||
615 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
616 | 2 | {% load wl_markdown %} | 2 | {% load wl_markdown %} |
618 | 3 | 3 | {% load static %} | |
619 | 4 | {% block title %}Privacy policy {{ cur_lang }} {{ block.super }}{% endblock %} | 4 | {% block title %}Privacy policy {{ cur_lang }} {{ block.super }}{% endblock %} |
620 | 5 | 5 | ||
621 | 6 | {% block extra_head %} | 6 | {% block extra_head %} |
622 | 7 | {{ block.super}} | 7 | {{ block.super}} |
624 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" /> | 8 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/wiki.css' %}" /> |
625 | 9 | {% endblock %} | 9 | {% endblock %} |
626 | 10 | 10 | ||
627 | 11 | {% block content_header %} | 11 | {% block content_header %} |
628 | 12 | 12 | ||
629 | === modified file 'templates/pybb/base.html' | |||
630 | --- templates/pybb/base.html 2016-04-28 18:33:44 +0000 | |||
631 | +++ templates/pybb/base.html 2018-11-28 19:45:23 +0000 | |||
632 | @@ -1,12 +1,13 @@ | |||
633 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
634 | 2 | {% load i18n %} | 2 | {% load i18n %} |
635 | 3 | {% load static %} | ||
636 | 3 | 4 | ||
637 | 4 | {% block title %} | 5 | {% block title %} |
638 | 5 | Forum - {{ block.super }} | 6 | Forum - {{ block.super }} |
639 | 6 | {% endblock %} | 7 | {% endblock %} |
640 | 7 | 8 | ||
641 | 8 | {% block extra_head %} | 9 | {% block extra_head %} |
643 | 9 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/forum.css" /> | 10 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/forum.css' %}" /> |
644 | 10 | 11 | ||
645 | 11 | <link rel="alternate" type="application/atom+xml" title="Latest Posts on all forums" href="{% url 'pybb_feed_posts' %}" /> | 12 | <link rel="alternate" type="application/atom+xml" title="Latest Posts on all forums" href="{% url 'pybb_feed_posts' %}" /> |
646 | 12 | <link rel="alternate" type="application/atom+xml" title="Latest Topics on all forums" href="{% url 'pybb_feed_topics' %}" /> | 13 | <link rel="alternate" type="application/atom+xml" title="Latest Topics on all forums" href="{% url 'pybb_feed_topics' %}" /> |
647 | 13 | 14 | ||
648 | === modified file 'templates/pybb/category.html' | |||
649 | --- templates/pybb/category.html 2018-10-14 13:24:15 +0000 | |||
650 | +++ templates/pybb/category.html 2018-11-28 19:45:23 +0000 | |||
651 | @@ -1,5 +1,6 @@ | |||
652 | 1 | {% extends 'pybb/base.html' %} | 1 | {% extends 'pybb/base.html' %} |
653 | 2 | {% load pybb_extras %} | 2 | {% load pybb_extras %} |
654 | 3 | {% load static %} | ||
655 | 3 | 4 | ||
656 | 4 | {% block content_header %} | 5 | {% block content_header %} |
657 | 5 | <h1>Category: {{category.name}}</h1> | 6 | <h1>Category: {{category.name}}</h1> |
658 | @@ -13,9 +14,9 @@ | |||
659 | 13 | </div> | 14 | </div> |
660 | 14 | 15 | ||
661 | 15 | <div class="center green"> | 16 | <div class="center green"> |
663 | 16 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> | 17 | <img src="{% static 'forum/img/folder_big_work_star.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> |
664 | 17 | = Unread posts | 18 | = Unread posts |
666 | 18 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> | 19 | <img src="{% static 'forum/img/folder_big_work.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> |
667 | 19 | = No unread posts | 20 | = No unread posts |
668 | 20 | </div> | 21 | </div> |
669 | 21 | {% endblock %} | 22 | {% endblock %} |
670 | 22 | 23 | ||
671 | === modified file 'templates/pybb/forum.html' | |||
672 | --- templates/pybb/forum.html 2018-11-16 08:27:29 +0000 | |||
673 | +++ templates/pybb/forum.html 2018-11-28 19:45:23 +0000 | |||
674 | @@ -5,6 +5,7 @@ | |||
675 | 5 | {% load wlprofile_extras %} | 5 | {% load wlprofile_extras %} |
676 | 6 | {% load custom_date %} | 6 | {% load custom_date %} |
677 | 7 | {% load pagination_tags %} | 7 | {% load pagination_tags %} |
678 | 8 | {% load static %} | ||
679 | 8 | 9 | ||
680 | 9 | {% block extra_head %} | 10 | {% block extra_head %} |
681 | 10 | <link rel="alternate" type="application/atom+xml" title="Latest Posts on forum '{{ forum.name }}'" href="{% url 'pybb_feed_posts' %}{{forum.id}}/" /> | 11 | <link rel="alternate" type="application/atom+xml" title="Latest Posts on forum '{{ forum.name }}'" href="{% url 'pybb_feed_posts' %}{{forum.id}}/" /> |
682 | @@ -54,14 +55,14 @@ | |||
683 | 54 | {% if not topic.is_hidden %} | 55 | {% if not topic.is_hidden %} |
684 | 55 | <td class="forumIcon center"> | 56 | <td class="forumIcon center"> |
685 | 56 | {% if topic|pybb_has_unreads:user %} | 57 | {% if topic|pybb_has_unreads:user %} |
687 | 57 | <img src="{{ MEDIA_URL }}forum/img/doc_big_work_star.png" style="margin: 0px;" alt="" class="middle" /> | 58 | <img src="{% static 'forum/img/doc_big_work_star.png' %}" style="margin: 0px;" alt="" class="middle" /> |
688 | 58 | {% else %} | 59 | {% else %} |
690 | 59 | <img src="{{ MEDIA_URL }}forum/img/doc_big_work.png" style="margin: 0px;" alt="" class="middle" /> | 60 | <img src="{% static 'forum/img/doc_big_work.png' %}" style="margin: 0px;" alt="" class="middle" /> |
691 | 60 | {% endif %} | 61 | {% endif %} |
692 | 61 | </td> | 62 | </td> |
693 | 62 | <td class="forumTitle"> | 63 | <td class="forumTitle"> |
696 | 63 | {% if topic.sticky %}<img src="{{ MEDIA_URL }}forum/img/sticky.png" alt="Sticky" title="Sticky" />{% endif %} | 64 | {% if topic.sticky %}<img src="{% static 'forum/img/sticky.png' %}" alt="Sticky" title="Sticky" />{% endif %} |
697 | 64 | {% if topic.closed %}<img src="{{ MEDIA_URL }}forum/img/closed.png" alt="Closed" title="Closed" />{% endif %} | 65 | {% if topic.closed %}<img src="{% static 'forum/img/closed.png' %}" alt="Closed" title="Closed" />{% endif %} |
698 | 65 | <a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a><br /> | 66 | <a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a><br /> |
699 | 66 | <span class="small">Created by {{ topic.user|user_link }} on {{ topic.created|custom_date:user }}</span> | 67 | <span class="small">Created by {{ topic.user|user_link }} on {{ topic.created|custom_date:user }}</span> |
700 | 67 | </td> | 68 | </td> |
701 | @@ -83,16 +84,16 @@ | |||
702 | 83 | </tbody> | 84 | </tbody> |
703 | 84 | </table> | 85 | </table> |
704 | 85 | <a class="button posRight" href="{% url 'pybb_add_topic' forum.id %}"> | 86 | <a class="button posRight" href="{% url 'pybb_add_topic' forum.id %}"> |
706 | 86 | <img src="{{ MEDIA_URL }}forum/img/new_topic.png" alt ="{% trans "New Topic" %}" class="middle" /> | 87 | <img src="{% static 'forum/img/new_topic.png' %}" alt ="{% trans "New Topic" %}" class="middle" /> |
707 | 87 | <span class="middle">{% trans "New Topic" %}</span> | 88 | <span class="middle">{% trans "New Topic" %}</span> |
708 | 88 | </a> | 89 | </a> |
709 | 89 | {% paginate %} | 90 | {% paginate %} |
710 | 90 | </div> | 91 | </div> |
711 | 91 | 92 | ||
712 | 92 | <div class="center green"> | 93 | <div class="center green"> |
714 | 93 | <img src="{{ MEDIA_URL }}forum/img/doc_big_work_star.png" alt="" class="middle" /> | 94 | <img src="{% static 'forum/img/doc_big_work_star.png' %}" alt="" class="middle" /> |
715 | 94 | = Unread posts | 95 | = Unread posts |
717 | 95 | <img src="{{ MEDIA_URL }}forum/img/doc_big_work.png" alt="" class="middle" /> | 96 | <img src="{% static 'forum/img/doc_big_work.png' %}" alt="" class="middle" /> |
718 | 96 | = No unread posts | 97 | = No unread posts |
719 | 97 | </div> | 98 | </div> |
720 | 98 | {% endblock %} | 99 | {% endblock %} |
721 | 99 | 100 | ||
722 | === modified file 'templates/pybb/index.html' | |||
723 | --- templates/pybb/index.html 2018-10-14 13:24:15 +0000 | |||
724 | +++ templates/pybb/index.html 2018-11-28 19:45:23 +0000 | |||
725 | @@ -1,5 +1,6 @@ | |||
726 | 1 | {% extends 'pybb/base.html' %} | 1 | {% extends 'pybb/base.html' %} |
727 | 2 | {% load pybb_extras %} | 2 | {% load pybb_extras %} |
728 | 3 | {% load static %} | ||
729 | 3 | 4 | ||
730 | 4 | {% block content_header %} | 5 | {% block content_header %} |
731 | 5 | <h1>Forums</h1> | 6 | <h1>Forums</h1> |
732 | @@ -14,9 +15,9 @@ | |||
733 | 14 | {% endfor %} | 15 | {% endfor %} |
734 | 15 | 16 | ||
735 | 16 | <div class="center green"> | 17 | <div class="center green"> |
737 | 17 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> | 18 | <img src="{% static 'forum/img/folder_big_work_star.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> |
738 | 18 | = Unread posts | 19 | = Unread posts |
740 | 19 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> | 20 | <img src="{% static 'forum/img/folder_big_work.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" class="middle" /> |
741 | 20 | = No unread posts | 21 | = No unread posts |
742 | 21 | </div> | 22 | </div> |
743 | 22 | 23 | ||
744 | @@ -24,20 +25,20 @@ | |||
745 | 24 | <table class="legend"> | 25 | <table class="legend"> |
746 | 25 | <tr> | 26 | <tr> |
747 | 26 | <td> | 27 | <td> |
749 | 27 | <img src="{{ MEDIA_URL }}forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 28 | <img src="{% static 'forum/img/folder_new_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
750 | 28 | </td> | 29 | </td> |
751 | 29 | <td>= Unread posts</td> | 30 | <td>= Unread posts</td> |
752 | 30 | <td> | 31 | <td> |
754 | 31 | <img src="{{ MEDIA_URL }}forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 32 | <img src="{% static 'forum/img/folder_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
755 | 32 | </td><td>= No unread posts</td> | 33 | </td><td>= No unread posts</td> |
756 | 33 | </tr> | 34 | </tr> |
757 | 34 | 35 | ||
758 | 35 | <tr> | 36 | <tr> |
759 | 36 | <td> | 37 | <td> |
761 | 37 | <img src="{{ MEDIA_URL }}forum/img/folder_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 38 | <img src="{% static 'forum/img/folder_locked_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
762 | 38 | </td><td>= Locked topic</td> | 39 | </td><td>= Locked topic</td> |
763 | 39 | <td> | 40 | <td> |
765 | 40 | <img src="{{ MEDIA_URL }}forum/img/folder_new_locked_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 41 | <img src="{% static 'forum/img/folder_new_locked_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
766 | 41 | </td><td>= Unread posts in locked topic</td> | 42 | </td><td>= Unread posts in locked topic</td> |
767 | 42 | </tr> | 43 | </tr> |
768 | 43 | </table> | 44 | </table> |
769 | 44 | 45 | ||
770 | === modified file 'templates/pybb/inlines/display_category.html' | |||
771 | --- templates/pybb/inlines/display_category.html 2018-11-17 10:51:02 +0000 | |||
772 | +++ templates/pybb/inlines/display_category.html 2018-11-28 19:45:23 +0000 | |||
773 | @@ -8,6 +8,7 @@ | |||
774 | 8 | {% load pybb_extras %} | 8 | {% load pybb_extras %} |
775 | 9 | {% load wlprofile_extras %} | 9 | {% load wlprofile_extras %} |
776 | 10 | {% load custom_date %} | 10 | {% load custom_date %} |
777 | 11 | {% load static %} | ||
778 | 11 | 12 | ||
779 | 12 | <table class="forum"> | 13 | <table class="forum"> |
780 | 13 | {# List all forums #} | 14 | {# List all forums #} |
781 | @@ -15,9 +16,9 @@ | |||
782 | 15 | <tr class="{% cycle 'odd' 'even' %}"> | 16 | <tr class="{% cycle 'odd' 'even' %}"> |
783 | 16 | <td class="forumIcon center"> | 17 | <td class="forumIcon center"> |
784 | 17 | {% if forum|pybb_has_unreads:user %} | 18 | {% if forum|pybb_has_unreads:user %} |
786 | 18 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work_star.png" style="width: 48px; height:48px; margin: 0px;" alt="" /> | 19 | <img src="{% static 'forum/img/folder_big_work_star.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" /> |
787 | 19 | {% else %} | 20 | {% else %} |
789 | 20 | <img src="{{ MEDIA_URL }}forum/img/folder_big_work.png" style="width: 48px; height:48px; margin: 0px;" alt="" /> | 21 | <img src="{% static 'forum/img/folder_big_work.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" /> |
790 | 21 | {% endif %} | 22 | {% endif %} |
791 | 22 | </td> | 23 | </td> |
792 | 23 | <td class="forumTitle"> | 24 | <td class="forumTitle"> |
793 | @@ -30,15 +31,15 @@ | |||
794 | 30 | Posts: {{ forum.posts.count }} | 31 | Posts: {{ forum.posts.count }} |
795 | 31 | </td> | 32 | </td> |
796 | 32 | <td class="lastPost"> | 33 | <td class="lastPost"> |
802 | 33 | {% with last_post=forum.last_post %} | 34 | {% if forum.last_post %} |
803 | 34 | {% if last_post %} | 35 | {% with last_post=forum.last_post %} |
804 | 35 | <a href="{{last_post.get_absolute_url}}">{{ last_post.topic.name }}</a><br /> | 36 | <a href="{{last_post.get_absolute_url}}">{{ last_post.topic.name }}</a><br /> |
805 | 36 | <span class="small">by {{ last_post.user|user_link }}<br /> | 37 | <span class="small">by {{ last_post.user|user_link }}<br /> |
806 | 37 | on {{ last_post.created|custom_date:user}}</span> | 38 | on {{ last_post.created|custom_date:user}}</span> |
807 | 39 | {% endwith %} | ||
808 | 38 | {% else %} | 40 | {% else %} |
809 | 39 | | 41 | |
810 | 40 | {% endif %} | 42 | {% endif %} |
811 | 41 | {% endwith %} | ||
812 | 42 | </td> | 43 | </td> |
813 | 43 | </tr> | 44 | </tr> |
814 | 44 | {% endfor %} | 45 | {% endfor %} |
815 | 45 | 46 | ||
816 | === modified file 'templates/pybb/inlines/forum_row.html' | |||
817 | --- templates/pybb/inlines/forum_row.html 2017-01-21 19:06:19 +0000 | |||
818 | +++ templates/pybb/inlines/forum_row.html 2018-11-28 19:45:23 +0000 | |||
819 | @@ -5,12 +5,14 @@ | |||
820 | 5 | {% load pybb_extras %} | 5 | {% load pybb_extras %} |
821 | 6 | {% load wlprofile_extras %} | 6 | {% load wlprofile_extras %} |
822 | 7 | {% load custom_date %} | 7 | {% load custom_date %} |
823 | 8 | {% load static %} | ||
824 | 9 | |||
825 | 8 | <tr> | 10 | <tr> |
826 | 9 | <td class="even" align="center" valign="middle"> | 11 | <td class="even" align="center" valign="middle"> |
827 | 10 | {% if forum|pybb_has_unreads:user %} | 12 | {% if forum|pybb_has_unreads:user %} |
829 | 11 | <img src="{{ MEDIA_URL }}forum/img/folder_new_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 13 | <img src="{% static 'forum/img/folder_new_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
830 | 12 | {% else %} | 14 | {% else %} |
832 | 13 | <img src="{{ MEDIA_URL }}forum/img/folder_big.png" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> | 15 | <img src="{% static 'forum/img/folder_big.png' %}" style="width: 48px; height:48px; margin: 0px;" alt="" align="middle" /> |
833 | 14 | {% endif %} | 16 | {% endif %} |
834 | 15 | </td> | 17 | </td> |
835 | 16 | <td class="odd"> | 18 | <td class="odd"> |
836 | 17 | 19 | ||
837 | === modified file 'templates/pybb/inlines/post.html' | |||
838 | --- templates/pybb/inlines/post.html 2017-11-01 15:51:57 +0000 | |||
839 | +++ templates/pybb/inlines/post.html 2018-11-28 19:45:23 +0000 | |||
840 | @@ -8,6 +8,7 @@ | |||
841 | 8 | {% load wiki_extras %} | 8 | {% load wiki_extras %} |
842 | 9 | {% load wlprofile_extras %} | 9 | {% load wlprofile_extras %} |
843 | 10 | {% load custom_date %} | 10 | {% load custom_date %} |
844 | 11 | {% load static %} | ||
845 | 11 | <a name="post-{{ post.id }}"></a> | 12 | <a name="post-{{ post.id }}"></a> |
846 | 12 | <table class="{% cycle "odd" "even" %}" width="100%"> | 13 | <table class="{% cycle "odd" "even" %}" width="100%"> |
847 | 13 | <tr> | 14 | <tr> |
848 | @@ -17,7 +18,7 @@ | |||
849 | 17 | <tr> | 18 | <tr> |
850 | 18 | <td style="text-align: left; border: 0px;"> | 19 | <td style="text-align: left; border: 0px;"> |
851 | 19 | <a href="{{post.get_absolute_url}}"> | 20 | <a href="{{post.get_absolute_url}}"> |
853 | 20 | <img src="{{ MEDIA_URL }}forum/img/en/permalink.png" height="25" alt ="{% trans "Permalink" %}" /> | 21 | <img src="{% static 'forum/img/en/permalink.png' %}" height="25" alt ="{% trans "Permalink" %}" /> |
854 | 21 | </a> | 22 | </a> |
855 | 22 | </td> | 23 | </td> |
856 | 23 | <td style="text-align: right; border: 0px;"> | 24 | <td style="text-align: right; border: 0px;"> |
857 | @@ -39,7 +40,7 @@ | |||
858 | 39 | {% endif %} | 40 | {% endif %} |
859 | 40 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> | 41 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> |
860 | 41 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> | 42 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> |
862 | 42 | <img src="{{ MEDIA_URL }}img/{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /> | 43 | <img src="{% static 'img/{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /> |
863 | 43 | <br /> | 44 | <br /> |
864 | 44 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> | 45 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> |
865 | 45 | {% if post.user.wlprofile.location %} | 46 | {% if post.user.wlprofile.location %} |
866 | @@ -80,7 +81,7 @@ | |||
867 | 80 | <tr> | 81 | <tr> |
868 | 81 | <td class="toplink"> | 82 | <td class="toplink"> |
869 | 82 | <a href="#top"> | 83 | <a href="#top"> |
871 | 83 | <img src="{{ MEDIA_URL }}forum/img/en/top.png" height="25" alt ="{% trans "Top" %}" /> | 84 | <img src="{% static 'forum/img/en/top.png' %}" height="25" alt ="{% trans "Top" %}" /> |
872 | 84 | </a> | 85 | </a> |
873 | 85 | </td> | 86 | </td> |
874 | 86 | 87 | ||
875 | @@ -89,25 +90,25 @@ | |||
876 | 89 | {% if user.is_authenticated %} | 90 | {% if user.is_authenticated %} |
877 | 90 | {% ifnotequal user post.user %} | 91 | {% ifnotequal user post.user %} |
878 | 91 | <a href="{% url 'messages_compose_to' post.user %}"> | 92 | <a href="{% url 'messages_compose_to' post.user %}"> |
880 | 92 | <img src="{{ MEDIA_URL }}forum/img/en/send_pm.png" height="25" alt ="{% trans "Send PM" %}" /> | 93 | <img src="{% static 'forum/img/en/send_pm.png' %}" height="25" alt ="{% trans "Send PM" %}" /> |
881 | 93 | </a> | 94 | </a> |
882 | 94 | {% endifnotequal %} | 95 | {% endifnotequal %} |
883 | 95 | {% endif %} | 96 | {% endif %} |
884 | 96 | {% if moderator or post|pybb_posted_by:user %} | 97 | {% if moderator or post|pybb_posted_by:user %} |
885 | 97 | <a href="{% url 'pybb_edit_post' post.id %}"> | 98 | <a href="{% url 'pybb_edit_post' post.id %}"> |
887 | 98 | <img src="{{ MEDIA_URL }}forum/img/en/edit.png" height="25" alt ="{% trans "Edit" %}" /> | 99 | <img src="{% static 'forum/img/en/edit.png' %}" height="25" alt ="{% trans "Edit" %}" /> |
888 | 99 | </a> | 100 | </a> |
889 | 100 | {% endif %} | 101 | {% endif %} |
890 | 101 | {% if moderator or post|pybb_equal_to:last_post %} | 102 | {% if moderator or post|pybb_equal_to:last_post %} |
891 | 102 | {% if moderator or post.user|pybb_equal_to:user %} | 103 | {% if moderator or post.user|pybb_equal_to:user %} |
892 | 103 | <a href="{% url 'pybb_delete_post' post.id %}"> | 104 | <a href="{% url 'pybb_delete_post' post.id %}"> |
894 | 104 | <img src="{{ MEDIA_URL }}forum/img/en/delete.png" height="25" alt ="{% trans "Delete" %}" /> | 105 | <img src="{% static 'forum/img/en/delete.png' %}" height="25" alt ="{% trans "Delete" %}" /> |
895 | 105 | </a> | 106 | </a> |
896 | 106 | {% endif %} | 107 | {% endif %} |
897 | 107 | </div> | 108 | </div> |
898 | 108 | <div class="tools" style="float: right;"> | 109 | <div class="tools" style="float: right;"> |
899 | 109 | <a href="{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}"> | 110 | <a href="{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}"> |
901 | 110 | <img src="{{ MEDIA_URL }}forum/img/en/quote.png" height="25" alt ="{% trans "Quote" %}" /> | 111 | <img src="{% static 'forum/img/en/quote.png' %}" height="25" alt ="{% trans "Quote" %}" /> |
902 | 111 | </a> | 112 | </a> |
903 | 112 | {% endif %} | 113 | {% endif %} |
904 | 113 | </div> | 114 | </div> |
905 | 114 | 115 | ||
906 | === modified file 'templates/pybb/inlines/topic_row.html' | |||
907 | --- templates/pybb/inlines/topic_row.html 2016-03-02 21:02:38 +0000 | |||
908 | +++ templates/pybb/inlines/topic_row.html 2018-11-28 19:45:23 +0000 | |||
909 | @@ -5,12 +5,14 @@ | |||
910 | 5 | {% load pybb_extras %} | 5 | {% load pybb_extras %} |
911 | 6 | {% load wlprofile_extras %} | 6 | {% load wlprofile_extras %} |
912 | 7 | {% load custom_date %} | 7 | {% load custom_date %} |
913 | 8 | {% load static %} | ||
914 | 9 | |||
915 | 8 | <tr class="topic_description {% cycle "odd" "even" %}"> | 10 | <tr class="topic_description {% cycle "odd" "even" %}"> |
916 | 9 | <td align="center" valign="middle"> | 11 | <td align="center" valign="middle"> |
917 | 10 | {% if topic|pybb_has_unreads:user %} | 12 | {% if topic|pybb_has_unreads:user %} |
919 | 11 | <img src="{{ MEDIA_URL }}forum/img/folder_new.png" style="margin: 0px;" alt="" align="middle" /> | 13 | <img src="{% static 'forum/img/folder_new.png' %}" style="margin: 0px;" alt="" align="middle" /> |
920 | 12 | {% else %} | 14 | {% else %} |
922 | 13 | <img src="{{ MEDIA_URL }}forum/img/folder.png" style="margin: 0px;" alt="" align="middle" /> | 15 | <img src="{% static 'forum/img/folder.png' %}" style="margin: 0px;" alt="" align="middle" /> |
923 | 14 | {% endif %} | 16 | {% endif %} |
924 | 15 | </td> | 17 | </td> |
925 | 16 | <td id="name"> | 18 | <td id="name"> |
926 | @@ -19,9 +21,9 @@ | |||
927 | 19 | {% comment %} | 21 | {% comment %} |
928 | 20 | oehm ja, geht nicht weil ka muss ich guggn, die frage ist. soll es fuer alle gelten oder nur fuer eine topic | 22 | oehm ja, geht nicht weil ka muss ich guggn, die frage ist. soll es fuer alle gelten oder nur fuer eine topic |
929 | 21 | {% endcomment %} | 23 | {% endcomment %} |
933 | 22 | {% if subscribed %}<img src="{{ MEDIA_URL }}forum/img/en/subscribe_small.png" height="20" alt="subscribe" style="float:left" />{% endif %} | 24 | {% if subscribed %}<img src="{% static 'forum/img/en/subscribe_small.png' %}" height="20" alt="subscribe" style="float:left" />{% endif %} |
934 | 23 | {% if topic.sticky %}<img src="{{ MEDIA_URL }}forum/img/en/stick_topic_small.png" height="20" alt ="Sticky" style="float:left;" /> {% endif %} | 25 | {% if topic.sticky %}<img src="{% static 'forum/img/en/stick_topic_small.png' %}" height="20" alt ="Sticky" style="float:left;" /> {% endif %} |
935 | 24 | {% if topic.closed %}<img src="{{ MEDIA_URL }}forum/img/en/close_small.png" height="20" alt ="Closed" style="float:left; " /> {% endif %} | 26 | {% if topic.closed %}<img src="{% static 'forum/img/en/close_small.png' %}" height="20" alt ="Closed" style="float:left; " /> {% endif %} |
936 | 25 | {{ topic.name }} | 27 | {{ topic.name }} |
937 | 26 | </a> | 28 | </a> |
938 | 27 | </span> | 29 | </span> |
939 | 28 | 30 | ||
940 | === modified file 'templates/pybb/post_form.html' | |||
941 | --- templates/pybb/post_form.html 2016-04-24 19:30:03 +0000 | |||
942 | +++ templates/pybb/post_form.html 2018-11-28 19:45:23 +0000 | |||
943 | @@ -1,4 +1,5 @@ | |||
944 | 1 | {% load i18n %} | 1 | {% load i18n %} |
945 | 2 | {% load static %} | ||
946 | 2 | 3 | ||
947 | 3 | {% comment %} | 4 | {% comment %} |
948 | 4 | This template is used to prevent using same code | 5 | This template is used to prevent using same code |
949 | @@ -6,7 +7,7 @@ | |||
950 | 6 | {% endcomment %} | 7 | {% endcomment %} |
951 | 7 | 8 | ||
952 | 8 | {% block extra_head %} | 9 | {% block extra_head %} |
954 | 9 | <script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script> | 10 | <script type="text/javascript" src="{% static 'js/disableOnSubmit.js' %}"></script> |
955 | 10 | <script type="text/javascript"> | 11 | <script type="text/javascript"> |
956 | 11 | $(function() { | 12 | $(function() { |
957 | 12 | $('form').disableOnSubmit(); | 13 | $('form').disableOnSubmit(); |
958 | @@ -45,7 +46,7 @@ | |||
959 | 45 | 46 | ||
960 | 46 | <div class="posRight"> | 47 | <div class="posRight"> |
961 | 47 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> | 48 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> |
963 | 48 | <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle"> | 49 | <img src="{% static 'img/menu_help.png' %}" alt="Help on Syntax" class="middle"> |
964 | 49 | Help on Syntax | 50 | Help on Syntax |
965 | 50 | </a> | 51 | </a> |
966 | 51 | </div> | 52 | </div> |
967 | @@ -54,11 +55,11 @@ | |||
968 | 54 | {{ form.as_p }} | 55 | {{ form.as_p }} |
969 | 55 | {% csrf_token %} | 56 | {% csrf_token %} |
970 | 56 | <button type="submit"> | 57 | <button type="submit"> |
972 | 57 | <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" /> | 58 | <img src="{% static 'forum/img/send.png' %}" alt ="" class="middle" /> |
973 | 58 | <span class="middle">{% trans "Send" %}</span> | 59 | <span class="middle">{% trans "Send" %}</span> |
974 | 59 | </button> | 60 | </button> |
975 | 60 | <button type="button" class="preview-button"> | 61 | <button type="button" class="preview-button"> |
977 | 61 | <img src="{{ MEDIA_URL }}forum/img/preview.png" alt ="" class="middle" /> | 62 | <img src="{% static 'forum/img/preview.png' %}" alt ="" class="middle" /> |
978 | 62 | <span class="middle">{% trans "Preview" %}</span> | 63 | <span class="middle">{% trans "Preview" %}</span> |
979 | 63 | </button> | 64 | </button> |
980 | 64 | </form> | 65 | </form> |
981 | 65 | 66 | ||
982 | === modified file 'templates/pybb/topic.html' | |||
983 | --- templates/pybb/topic.html 2018-11-18 10:28:03 +0000 | |||
984 | +++ templates/pybb/topic.html 2018-11-28 19:45:23 +0000 | |||
985 | @@ -6,6 +6,7 @@ | |||
986 | 6 | {% load wlprofile_extras %} | 6 | {% load wlprofile_extras %} |
987 | 7 | {% load custom_date %} | 7 | {% load custom_date %} |
988 | 8 | {% load pagination_tags %} | 8 | {% load pagination_tags %} |
989 | 9 | {% load static %} | ||
990 | 9 | 10 | ||
991 | 10 | {% block title %} | 11 | {% block title %} |
992 | 11 | {{Â topic.name }} - {{ topic.forum.name }} - {{ block.super }} | 12 | {{Â topic.name }} - {{ topic.forum.name }} - {{ block.super }} |
993 | @@ -38,7 +39,7 @@ | |||
994 | 38 | <div class="posRight"> | 39 | <div class="posRight"> |
995 | 39 | {% if moderator %} | 40 | {% if moderator %} |
996 | 40 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> | 41 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> |
998 | 41 | <img src="{{ MEDIA_URL }}forum/img/topic_show.png" alt ="" class="middle" /> | 42 | <img src="{% static 'forum/img/topic_show.png' %}" alt ="" class="middle" /> |
999 | 42 | <span class="middle">{% trans "Toggle Visibility" %}</span> | 43 | <span class="middle">{% trans "Toggle Visibility" %}</span> |
1000 | 43 | </a> | 44 | </a> |
1001 | 44 | {% endif %} | 45 | {% endif %} |
1002 | @@ -46,28 +47,28 @@ | |||
1003 | 46 | <div class="posRight"> | 47 | <div class="posRight"> |
1004 | 47 | {% if moderator %} | 48 | {% if moderator %} |
1005 | 48 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> | 49 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> |
1007 | 49 | <img src="{{ MEDIA_URL }}forum/img/topic_hide.png" alt ="" class="middle" /> | 50 | <img src="{% static 'forum/img/topic_hide.png' %}" alt ="" class="middle" /> |
1008 | 50 | <span class="middle">{% trans "Toggle Visibility" %}</span> | 51 | <span class="middle">{% trans "Toggle Visibility" %}</span> |
1009 | 51 | </a> | 52 | </a> |
1010 | 52 | {% if topic.sticky %} | 53 | {% if topic.sticky %} |
1011 | 53 | <a class="button" href="{% url 'pybb_unstick_topic' topic.id %}"> | 54 | <a class="button" href="{% url 'pybb_unstick_topic' topic.id %}"> |
1013 | 54 | <img src="{{ MEDIA_URL }}forum/img/unstick.png" alt ="" class="middle" /> | 55 | <img src="{% static 'forum/img/unstick.png' %}" alt ="" class="middle" /> |
1014 | 55 | <span class="middle">{% trans "Unstick Topic" %}</span> | 56 | <span class="middle">{% trans "Unstick Topic" %}</span> |
1015 | 56 | </a> | 57 | </a> |
1016 | 57 | {% else %} | 58 | {% else %} |
1017 | 58 | <a class="button" href="{% url 'pybb_stick_topic' topic.id %}"> | 59 | <a class="button" href="{% url 'pybb_stick_topic' topic.id %}"> |
1019 | 59 | <img src="{{ MEDIA_URL }}forum/img/sticky.png" alt ="" class="middle" /> | 60 | <img src="{% static 'forum/img/sticky.png' %}" alt ="" class="middle" /> |
1020 | 60 | <span class="middle">{% trans "Stick Topic" %}</span> | 61 | <span class="middle">{% trans "Stick Topic" %}</span> |
1021 | 61 | </a> | 62 | </a> |
1022 | 62 | {% endif %} | 63 | {% endif %} |
1023 | 63 | {% if topic.closed %} | 64 | {% if topic.closed %} |
1024 | 64 | <a class="button" href="{% url 'pybb_open_topic' topic.id %}"> | 65 | <a class="button" href="{% url 'pybb_open_topic' topic.id %}"> |
1026 | 65 | <img src="{{ MEDIA_URL }}forum/img/open.png" alt ="" class="middle" /> | 66 | <img src="{% static 'forum/img/open.png' %}" alt ="" class="middle" /> |
1027 | 66 | <span class="middle">{% trans "Open Topic" %}</span> | 67 | <span class="middle">{% trans "Open Topic" %}</span> |
1028 | 67 | </a> | 68 | </a> |
1029 | 68 | {% else %} | 69 | {% else %} |
1030 | 69 | <a class="button" href="{% url 'pybb_close_topic' topic.id %}"> | 70 | <a class="button" href="{% url 'pybb_close_topic' topic.id %}"> |
1032 | 70 | <img src="{{ MEDIA_URL }}forum/img/closed.png" alt ="" class="middle" /> | 71 | <img src="{% static 'forum/img/closed.png' %}" alt ="" class="middle" /> |
1033 | 71 | <span class="middle">{% trans "Close Topic" %}</span> | 72 | <span class="middle">{% trans "Close Topic" %}</span> |
1034 | 72 | </a> | 73 | </a> |
1035 | 73 | {% endif %} | 74 | {% endif %} |
1036 | @@ -75,17 +76,17 @@ | |||
1037 | 75 | {% if user.is_authenticated %} | 76 | {% if user.is_authenticated %} |
1038 | 76 | {% if subscribed %} | 77 | {% if subscribed %} |
1039 | 77 | <a class="button" href="{% url 'pybb_delete_subscription' topic.id %}?from_topic"> | 78 | <a class="button" href="{% url 'pybb_delete_subscription' topic.id %}?from_topic"> |
1041 | 78 | <img src="{{ MEDIA_URL }}forum/img/unsubscribe.png" alt ="" class="middle" /> | 79 | <img src="{% static 'forum/img/unsubscribe.png' %}" alt ="" class="middle" /> |
1042 | 79 | <span class="middle">{% trans "Unsubscribe" %}</span> | 80 | <span class="middle">{% trans "Unsubscribe" %}</span> |
1043 | 80 | </a> | 81 | </a> |
1044 | 81 | {% else %} | 82 | {% else %} |
1045 | 82 | <a class="button" href="{% url 'pybb_add_subscription' topic.id %}"> | 83 | <a class="button" href="{% url 'pybb_add_subscription' topic.id %}"> |
1047 | 83 | <img src="{{ MEDIA_URL }}forum/img/subscribe.png" alt ="" class="middle" /> | 84 | <img src="{% static 'forum/img/subscribe.png' %}" alt ="" class="middle" /> |
1048 | 84 | <span class="middle">{% trans "Subscribe" %}</span> | 85 | <span class="middle">{% trans "Subscribe" %}</span> |
1049 | 85 | </a> | 86 | </a> |
1050 | 86 | {% endif %} | 87 | {% endif %} |
1051 | 87 | <a class="button" href="{% url 'pybb_add_post' topic.id %}"> | 88 | <a class="button" href="{% url 'pybb_add_post' topic.id %}"> |
1053 | 88 | <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" /> | 89 | <img src="{% static 'forum/img/send.png' %}" alt ="" class="middle" /> |
1054 | 89 | <span class="middle">{% trans "New Reply" %}</span> | 90 | <span class="middle">{% trans "New Reply" %}</span> |
1055 | 90 | </a> | 91 | </a> |
1056 | 91 | {% endif %} | 92 | {% endif %} |
1057 | @@ -110,7 +111,7 @@ | |||
1058 | 110 | <div class="authorStats"> | 111 | <div class="authorStats"> |
1059 | 111 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> | 112 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> |
1060 | 112 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> | 113 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> |
1062 | 113 | <img src="{{ MEDIA_URL }}img/{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /><br /> | 114 | <img src="{% static 'img/' %}{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /><br /> |
1063 | 114 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> | 115 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> |
1064 | 115 | {% if post.user.wlprofile.location %} | 116 | {% if post.user.wlprofile.location %} |
1065 | 116 | <strong>Location:</strong> {{ post.user.wlprofile.location }}<br /> | 117 | <strong>Location:</strong> {{ post.user.wlprofile.location }}<br /> |
1066 | @@ -148,22 +149,22 @@ | |||
1067 | 148 | {% endif %} | 149 | {% endif %} |
1068 | 149 | 150 | ||
1069 | 150 | <button onclick="window.location.href='#top';" class="posRight"> | 151 | <button onclick="window.location.href='#top';" class="posRight"> |
1071 | 151 | <img src="{{ MEDIA_URL }}forum/img/top.png" alt ="" class="middle" /> | 152 | <img src="{% static 'forum/img/top.png' %}" alt ="" class="middle" /> |
1072 | 152 | <span class="middle">{% trans "Top" %}</span> | 153 | <span class="middle">{% trans "Top" %}</span> |
1073 | 153 | </button> | 154 | </button> |
1074 | 154 | 155 | ||
1075 | 155 | <button onclick="window.location.href='{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}';"> | 156 | <button onclick="window.location.href='{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}';"> |
1077 | 156 | <img src="{{ MEDIA_URL }}forum/img/quote.png" alt ="" class="middle" /> | 157 | <img src="{% static 'forum/img/quote.png' %}" alt ="" class="middle" /> |
1078 | 157 | <span class="middle">{% trans "Quote" %}</span> | 158 | <span class="middle">{% trans "Quote" %}</span> |
1079 | 158 | </button> | 159 | </button> |
1080 | 159 | {% if moderator or post|pybb_posted_by:user %} | 160 | {% if moderator or post|pybb_posted_by:user %} |
1081 | 160 | <button onclick="window.location.href='{% url 'pybb_edit_post' post.id %}';"> | 161 | <button onclick="window.location.href='{% url 'pybb_edit_post' post.id %}';"> |
1083 | 161 | <img src="{{ MEDIA_URL }}forum/img/edit.png" alt ="" class="middle" /> | 162 | <img src="{% static 'forum/img/edit.png' %}" alt ="" class="middle" /> |
1084 | 162 | <span class="middle">{% trans "Edit" %}</span> | 163 | <span class="middle">{% trans "Edit" %}</span> |
1085 | 163 | </button> | 164 | </button> |
1086 | 164 | {% if moderator or post|pybb_equal_to:last_post %} | 165 | {% if moderator or post|pybb_equal_to:last_post %} |
1087 | 165 | <button onclick="window.location.href='{% url 'pybb_delete_post' post.id %}';"> | 166 | <button onclick="window.location.href='{% url 'pybb_delete_post' post.id %}';"> |
1089 | 166 | <img src="{{ MEDIA_URL }}forum/img/delete.png" alt ="" class="middle" /> | 167 | <img src="{% static 'forum/img/delete.png' %}" alt ="" class="middle" /> |
1090 | 167 | <span class="middle">{% trans "Delete" %}</span> | 168 | <span class="middle">{% trans "Delete" %}</span> |
1091 | 168 | </button> | 169 | </button> |
1092 | 169 | {% endif %} | 170 | {% endif %} |
1093 | @@ -195,7 +196,7 @@ | |||
1094 | 195 | <div class="authorStats"> | 196 | <div class="authorStats"> |
1095 | 196 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> | 197 | <strong>Joined:</strong> {{ post.user.date_joined|custom_date:user|title }}<br /> |
1096 | 197 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> | 198 | <strong>Posts:</strong> {{ post.user.wlprofile.post_count }}<br /> |
1098 | 198 | <img src="{{ MEDIA_URL }}img/{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /><br /> | 199 | <img src="{% static 'img/'%}{{ post.user.wlprofile.user_status.image }}" alt="Ranking" /><br /> |
1099 | 199 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> | 200 | <strong>{{ post.user.wlprofile.user_status.text }}</strong><br /> |
1100 | 200 | {% if post.user.wlprofile.location %} | 201 | {% if post.user.wlprofile.location %} |
1101 | 201 | <strong>Location:</strong> {{ post.user.wlprofile.location }}<br /> | 202 | <strong>Location:</strong> {{ post.user.wlprofile.location }}<br /> |
1102 | @@ -233,22 +234,22 @@ | |||
1103 | 233 | {% endif %} | 234 | {% endif %} |
1104 | 234 | 235 | ||
1105 | 235 | <a class="button posRight" href="#top"> | 236 | <a class="button posRight" href="#top"> |
1107 | 236 | <img src="{{ MEDIA_URL }}forum/img/top.png" alt ="" class="middle" /> | 237 | <img src="{% static 'forum/img/top.png' %}" alt ="" class="middle" /> |
1108 | 237 | <span class="middle">{% trans "Top" %}</span> | 238 | <span class="middle">{% trans "Top" %}</span> |
1109 | 238 | </a> | 239 | </a> |
1110 | 239 | 240 | ||
1111 | 240 | <a class="button" href="{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}"> | 241 | <a class="button" href="{% url 'pybb_add_post' topic.id %}?quote_id={{ post.id }}"> |
1113 | 241 | <img src="{{ MEDIA_URL }}forum/img/quote.png" alt ="" class="middle" /> | 242 | <img src="{% static 'forum/img/quote.png' %}" alt ="" class="middle" /> |
1114 | 242 | <span class="middle">{% trans "Quote" %}</span> | 243 | <span class="middle">{% trans "Quote" %}</span> |
1115 | 243 | </a> | 244 | </a> |
1116 | 244 | {% if moderator or post|pybb_posted_by:user %} | 245 | {% if moderator or post|pybb_posted_by:user %} |
1117 | 245 | <a class="button" href="{% url 'pybb_edit_post' post.id %}"> | 246 | <a class="button" href="{% url 'pybb_edit_post' post.id %}"> |
1119 | 246 | <img src="{{ MEDIA_URL }}forum/img/edit.png" alt ="" class="middle" /> | 247 | <img src="{% static 'forum/img/edit.png' %}" alt ="" class="middle" /> |
1120 | 247 | <span class="middle">{% trans "Edit" %}</span> | 248 | <span class="middle">{% trans "Edit" %}</span> |
1121 | 248 | </a> | 249 | </a> |
1122 | 249 | {% if moderator or post|pybb_equal_to:last_post %} | 250 | {% if moderator or post|pybb_equal_to:last_post %} |
1123 | 250 | <a class="button" href="{% url 'pybb_delete_post' post.id %}"> | 251 | <a class="button" href="{% url 'pybb_delete_post' post.id %}"> |
1125 | 251 | <img src="{{ MEDIA_URL }}forum/img/delete.png" alt ="" class="middle" /> | 252 | <img src="{% static 'forum/img/delete.png' %}" alt ="" class="middle" /> |
1126 | 252 | <span class="middle">{% trans "Delete" %}</span> | 253 | <span class="middle">{% trans "Delete" %}</span> |
1127 | 253 | </a> | 254 | </a> |
1128 | 254 | {% endif %} | 255 | {% endif %} |
1129 | @@ -269,28 +270,28 @@ | |||
1130 | 269 | <div class="posRight"> | 270 | <div class="posRight"> |
1131 | 270 | {% if moderator %} | 271 | {% if moderator %} |
1132 | 271 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> | 272 | <a class="button" href="{% url 'pybb_toggle_hid_topic' topic.id %}"> |
1134 | 272 | <img src="{{ MEDIA_URL }}forum/img/topic_hide.png" alt ="" class="middle" /> | 273 | <img src="{% static 'forum/img/topic_hide.png' %}" alt ="" class="middle" /> |
1135 | 273 | <span class="middle">{% trans "Toggle Visibility" %}</span> | 274 | <span class="middle">{% trans "Toggle Visibility" %}</span> |
1136 | 274 | </a> | 275 | </a> |
1137 | 275 | {% if topic.sticky %} | 276 | {% if topic.sticky %} |
1138 | 276 | <a class="button" href="{% url 'pybb_unstick_topic' topic.id %}"> | 277 | <a class="button" href="{% url 'pybb_unstick_topic' topic.id %}"> |
1140 | 277 | <img src="{{ MEDIA_URL }}forum/img/unstick.png" alt ="" class="middle" /> | 278 | <img src="{% static 'forum/img/unstick.png' %}" alt ="" class="middle" /> |
1141 | 278 | <span class="middle">{% trans "Unstick Topic" %}</span> | 279 | <span class="middle">{% trans "Unstick Topic" %}</span> |
1142 | 279 | </a> | 280 | </a> |
1143 | 280 | {% else %} | 281 | {% else %} |
1144 | 281 | <a class="button" href="{% url 'pybb_stick_topic' topic.id %}"> | 282 | <a class="button" href="{% url 'pybb_stick_topic' topic.id %}"> |
1146 | 282 | <img src="{{ MEDIA_URL }}forum/img/sticky.png" alt ="" class="middle" /> | 283 | <img src="{% static 'forum/img/sticky.png' %}" alt ="" class="middle" /> |
1147 | 283 | <span class="middle">{% trans "Stick Topic" %}</span> | 284 | <span class="middle">{% trans "Stick Topic" %}</span> |
1148 | 284 | </a> | 285 | </a> |
1149 | 285 | {% endif %} | 286 | {% endif %} |
1150 | 286 | {% if topic.closed %} | 287 | {% if topic.closed %} |
1151 | 287 | <a class="button" href="{% url 'pybb_open_topic' topic.id %}"> | 288 | <a class="button" href="{% url 'pybb_open_topic' topic.id %}"> |
1153 | 288 | <img src="{{ MEDIA_URL }}forum/img/open.png" alt ="" class="middle" /> | 289 | <img src="{% static 'forum/img/open.png' %}" alt ="" class="middle" /> |
1154 | 289 | <span class="middle">{% trans "Open Topic" %}</span> | 290 | <span class="middle">{% trans "Open Topic" %}</span> |
1155 | 290 | </a> | 291 | </a> |
1156 | 291 | {% else %} | 292 | {% else %} |
1157 | 292 | <a class="button" href="{% url 'pybb_close_topic' topic.id %}"> | 293 | <a class="button" href="{% url 'pybb_close_topic' topic.id %}"> |
1159 | 293 | <img src="{{ MEDIA_URL }}forum/img/closed.png" alt ="" class="middle" /> | 294 | <img src="{% static 'forum/img/closed.png' %}" alt ="" class="middle" /> |
1160 | 294 | <span class="middle">{% trans "Close Topic" %}</span> | 295 | <span class="middle">{% trans "Close Topic" %}</span> |
1161 | 295 | </a> | 296 | </a> |
1162 | 296 | {% endif %} | 297 | {% endif %} |
1163 | @@ -298,17 +299,17 @@ | |||
1164 | 298 | {% if user.is_authenticated %} | 299 | {% if user.is_authenticated %} |
1165 | 299 | {% if subscribed %} | 300 | {% if subscribed %} |
1166 | 300 | <a class="button" href="{% url 'pybb_delete_subscription' topic.id %}?from_topic"> | 301 | <a class="button" href="{% url 'pybb_delete_subscription' topic.id %}?from_topic"> |
1168 | 301 | <img src="{{ MEDIA_URL }}forum/img/unsubscribe.png" alt ="" class="middle" /> | 302 | <img src="{% static 'forum/img/unsubscribe.png' %}" alt ="" class="middle" /> |
1169 | 302 | <span class="middle">{% trans "Unsubscribe" %}</span> | 303 | <span class="middle">{% trans "Unsubscribe" %}</span> |
1170 | 303 | </a> | 304 | </a> |
1171 | 304 | {% else %} | 305 | {% else %} |
1172 | 305 | <a class="button" href="{% url 'pybb_add_subscription' topic.id %}"> | 306 | <a class="button" href="{% url 'pybb_add_subscription' topic.id %}"> |
1174 | 306 | <img src="{{ MEDIA_URL }}forum/img/subscribe.png" alt ="" class="middle" /> | 307 | <img src="{% static 'forum/img/subscribe.png' %}" alt ="" class="middle" /> |
1175 | 307 | <span class="middle">{% trans "Subscribe" %}</span> | 308 | <span class="middle">{% trans "Subscribe" %}</span> |
1176 | 308 | </a> | 309 | </a> |
1177 | 309 | {% endif %} | 310 | {% endif %} |
1178 | 310 | <a class="button" href="{% url 'pybb_add_post' topic.id %}"> | 311 | <a class="button" href="{% url 'pybb_add_post' topic.id %}"> |
1180 | 311 | <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="" class="middle" /> | 312 | <img src="{% static 'forum/img/send.png' %}" alt ="" class="middle" /> |
1181 | 312 | <span class="middle">{% trans "New Reply" %}</span> | 313 | <span class="middle">{% trans "New Reply" %}</span> |
1182 | 313 | </a> | 314 | </a> |
1183 | 314 | {% endif %} | 315 | {% endif %} |
1184 | 315 | 316 | ||
1185 | === modified file 'templates/registration/base.html' | |||
1186 | --- templates/registration/base.html 2016-06-03 14:22:24 +0000 | |||
1187 | +++ templates/registration/base.html 2018-11-28 19:45:23 +0000 | |||
1188 | @@ -4,6 +4,5 @@ | |||
1189 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1190 | 5 | 5 | ||
1191 | 6 | {% block extra_head %} | 6 | {% block extra_head %} |
1192 | 7 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/register.css" />{{ block.super}} | ||
1193 | 8 | <script src="https://www.google.com/recaptcha/api.js" async defer></script> | 7 | <script src="https://www.google.com/recaptcha/api.js" async defer></script> |
1194 | 9 | {% endblock %} | 8 | {% endblock %} |
1195 | 10 | 9 | ||
1196 | === modified file 'templates/search/search.html' | |||
1197 | --- templates/search/search.html 2018-10-14 13:24:15 +0000 | |||
1198 | +++ templates/search/search.html 2018-11-28 19:45:23 +0000 | |||
1199 | @@ -1,8 +1,9 @@ | |||
1200 | 1 | {% extends 'base.html' %} | 1 | {% extends 'base.html' %} |
1201 | 2 | {% load custom_date %} | 2 | {% load custom_date %} |
1202 | 3 | {% load static %} | ||
1203 | 3 | 4 | ||
1204 | 4 | {% block extra_head %} | 5 | {% block extra_head %} |
1206 | 5 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/search.css" /> | 6 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/search.css' %}" /> |
1207 | 6 | {{block.super}} | 7 | {{block.super}} |
1208 | 7 | {% endblock %} | 8 | {% endblock %} |
1209 | 8 | 9 | ||
1210 | 9 | 10 | ||
1211 | === modified file 'templates/threadedcomments/preview_comment.html' | |||
1212 | --- templates/threadedcomments/preview_comment.html 2018-10-14 14:20:48 +0000 | |||
1213 | +++ templates/threadedcomments/preview_comment.html 2018-11-28 19:45:23 +0000 | |||
1214 | @@ -1,10 +1,11 @@ | |||
1215 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
1216 | 2 | 2 | ||
1217 | 3 | {% load threadedcommentstags %} | 3 | {% load threadedcommentstags %} |
1218 | 4 | {% load static %} | ||
1219 | 4 | 5 | ||
1220 | 5 | {% block extra_head %} | 6 | {% block extra_head %} |
1221 | 6 | {{ block.super }} | 7 | {{ block.super }} |
1223 | 7 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" /> | 8 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/comments.css' %}" /> |
1224 | 8 | {% endblock %} | 9 | {% endblock %} |
1225 | 9 | 10 | ||
1226 | 10 | {% block content_header %} | 11 | {% block content_header %} |
1227 | 11 | 12 | ||
1228 | === modified file 'templates/wiki/base.html' | |||
1229 | --- templates/wiki/base.html 2018-06-03 15:33:37 +0000 | |||
1230 | +++ templates/wiki/base.html 2018-11-28 19:45:23 +0000 | |||
1231 | @@ -1,5 +1,6 @@ | |||
1232 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
1233 | 2 | {% load i18n %} | 2 | {% load i18n %} |
1234 | 3 | {% load static %} | ||
1235 | 3 | 4 | ||
1236 | 4 | {% block title %} | 5 | {% block title %} |
1237 | 5 | Wiki - {{ block.super }} | 6 | Wiki - {{ block.super }} |
1238 | @@ -9,7 +10,7 @@ | |||
1239 | 9 | {{ block.super}} | 10 | {{ block.super}} |
1240 | 10 | <link rel="alternate" type="application/rss+xml" title="Wiki History (RSS)" href="{% url 'wiki_history_feed_rss' %}" /> | 11 | <link rel="alternate" type="application/rss+xml" title="Wiki History (RSS)" href="{% url 'wiki_history_feed_rss' %}" /> |
1241 | 11 | <link rel="alternate" type="application/atom+xml" title="Wiki History (Atom)" href="{% url 'wiki_history_feed_atom' %}" /> | 12 | <link rel="alternate" type="application/atom+xml" title="Wiki History (Atom)" href="{% url 'wiki_history_feed_atom' %}" /> |
1243 | 12 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" /> | 13 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/wiki.css' %}" /> |
1244 | 13 | {% endblock %} | 14 | {% endblock %} |
1245 | 14 | 15 | ||
1246 | 15 | {# Define all(!) tabs for the wiki here (all in one place). | 16 | {# Define all(!) tabs for the wiki here (all in one place). |
1247 | 16 | 17 | ||
1248 | === modified file 'templates/wiki/edit.html' | |||
1249 | --- templates/wiki/edit.html 2018-10-09 18:23:07 +0000 | |||
1250 | +++ templates/wiki/edit.html 2018-11-28 19:45:23 +0000 | |||
1251 | @@ -1,13 +1,14 @@ | |||
1252 | 1 | {% extends 'wiki/base.html' %} | 1 | {% extends 'wiki/base.html' %} |
1253 | 2 | {% load i18n %} | 2 | {% load i18n %} |
1254 | 3 | {% load wlimages_extras %} | 3 | {% load wlimages_extras %} |
1255 | 4 | {% load static %} | ||
1256 | 4 | 5 | ||
1257 | 5 | {% block title %} | 6 | {% block title %} |
1258 | 6 | {% trans "Editing" %} {{ article.title }} - {{ block.super }} | 7 | {% trans "Editing" %} {{ article.title }} - {{ block.super }} |
1259 | 7 | {% endblock %} | 8 | {% endblock %} |
1260 | 8 | 9 | ||
1261 | 9 | {% block extra_head %} | 10 | {% block extra_head %} |
1263 | 10 | <script type="text/javascript" src="{{ MEDIA_URL }}js/disableOnSubmit.js"></script> | 11 | <script type="text/javascript" src="{% static 'js/disableOnSubmit.js' %}"></script> |
1264 | 11 | <script type="text/javascript"> | 12 | <script type="text/javascript"> |
1265 | 12 | $(function() { | 13 | $(function() { |
1266 | 13 | $('form').disableOnSubmit(); | 14 | $('form').disableOnSubmit(); |
1267 | 14 | 15 | ||
1268 | === modified file 'templates/wlhelp/base.html' | |||
1269 | --- templates/wlhelp/base.html 2018-03-09 12:12:02 +0000 | |||
1270 | +++ templates/wlhelp/base.html 2018-11-28 19:45:23 +0000 | |||
1271 | @@ -1,11 +1,12 @@ | |||
1272 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
1273 | 2 | {% load static %} | ||
1274 | 2 | 3 | ||
1275 | 3 | {% block title %} | 4 | {% block title %} |
1276 | 4 | Encyclopedia - {{ block.super }} | 5 | Encyclopedia - {{ block.super }} |
1277 | 5 | {% endblock %} | 6 | {% endblock %} |
1278 | 6 | 7 | ||
1279 | 7 | {% block extra_head %} | 8 | {% block extra_head %} |
1282 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/encyclopedia.css" /> | 9 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/encyclopedia.css' %}" /> |
1283 | 9 | <script src="{{ MEDIA_URL }}js/encyclopedia.js"></script> | 10 | <script src="{% static 'js/encyclopedia.js' %}"></script> |
1284 | 10 | {{ block.super}} | 11 | {{ block.super}} |
1285 | 11 | {% endblock %} | 12 | {% endblock %} |
1286 | 12 | \ No newline at end of file | 13 | \ No newline at end of file |
1287 | 13 | 14 | ||
1288 | === modified file 'templates/wlmaps/base.html' | |||
1289 | --- templates/wlmaps/base.html 2018-11-21 06:21:45 +0000 | |||
1290 | +++ templates/wlmaps/base.html 2018-11-28 19:45:23 +0000 | |||
1291 | @@ -5,8 +5,8 @@ | |||
1292 | 5 | {% endcomment %} | 5 | {% endcomment %} |
1293 | 6 | 6 | ||
1294 | 7 | {% block extra_head %} | 7 | {% block extra_head %} |
1297 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/forum.css" /> | 8 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/forum.css' %}" /> |
1298 | 9 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/maps.css" /> | 9 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/maps.css' %}" /> |
1299 | 10 | <link rel="stylesheet" href="{% static 'star-ratings/css/star-ratings.css' %}" /> | 10 | <link rel="stylesheet" href="{% static 'star-ratings/css/star-ratings.css' %}" /> |
1300 | 11 | <script type="text/javascript" src="{% static 'star-ratings/js/dist/star-ratings.min.js' %}"></script> | 11 | <script type="text/javascript" src="{% static 'star-ratings/js/dist/star-ratings.min.js' %}"></script> |
1301 | 12 | {{block.super}} | 12 | {{block.super}} |
1302 | 13 | 13 | ||
1303 | === modified file 'templates/wlmaps/edit_comment.html' | |||
1304 | --- templates/wlmaps/edit_comment.html 2018-10-14 13:24:15 +0000 | |||
1305 | +++ templates/wlmaps/edit_comment.html 2018-11-28 19:45:23 +0000 | |||
1306 | @@ -1,4 +1,5 @@ | |||
1307 | 1 | {% extends "wlmaps/base.html" %} | 1 | {% extends "wlmaps/base.html" %} |
1308 | 2 | {% load static %} | ||
1309 | 2 | 3 | ||
1310 | 3 | {% block content_header %} | 4 | {% block content_header %} |
1311 | 4 | <h1>Edit comment: {{ map.name }}</h1> | 5 | <h1>Edit comment: {{ map.name }}</h1> |
1312 | @@ -10,7 +11,7 @@ | |||
1313 | 10 | {{ form.uploader_comment.label_tag }} | 11 | {{ form.uploader_comment.label_tag }} |
1314 | 11 | <span class="posRight"> | 12 | <span class="posRight"> |
1315 | 12 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> | 13 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> |
1317 | 13 | <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle"> | 14 | <img src="{% static 'img/menu_help.png' %}" alt="Help on Syntax" class="middle"> |
1318 | 14 | Help on Syntax | 15 | Help on Syntax |
1319 | 15 | </a> | 16 | </a> |
1320 | 16 | </span> | 17 | </span> |
1321 | @@ -21,7 +22,7 @@ | |||
1322 | 21 | {% endif %} | 22 | {% endif %} |
1323 | 22 | {% csrf_token %} | 23 | {% csrf_token %} |
1324 | 23 | <button type="submit"> | 24 | <button type="submit"> |
1326 | 24 | <img src="{{ MEDIA_URL }}forum/img/send.png" alt ="Submit" class="middle" /> | 25 | <img src="{% static 'forum/img/send.png' %}" alt ="Submit" class="middle" /> |
1327 | 25 | <span class="middle">Submit</span> | 26 | <span class="middle">Submit</span> |
1328 | 26 | </button> | 27 | </button> |
1329 | 27 | </form> | 28 | </form> |
1330 | 28 | 29 | ||
1331 | === modified file 'templates/wlmaps/index.html' | |||
1332 | --- templates/wlmaps/index.html 2018-11-18 17:03:56 +0000 | |||
1333 | +++ templates/wlmaps/index.html 2018-11-28 19:45:23 +0000 | |||
1334 | @@ -8,6 +8,7 @@ | |||
1335 | 8 | {% load threadedcommentstags %} | 8 | {% load threadedcommentstags %} |
1336 | 9 | {% load pagination_tags %} | 9 | {% load pagination_tags %} |
1337 | 10 | {% load ratings %} | 10 | {% load ratings %} |
1338 | 11 | {% load static %} | ||
1339 | 11 | 12 | ||
1340 | 12 | {% block content_header %} | 13 | {% block content_header %} |
1341 | 13 | <h1>Maps</h1> | 14 | <h1>Maps</h1> |
1342 | @@ -82,7 +83,7 @@ | |||
1343 | 82 | <td class="spacer"></td> | 83 | <td class="spacer"></td> |
1344 | 83 | <td colspan="2"> | 84 | <td colspan="2"> |
1345 | 84 | <a class="button" href="{% url 'wlmaps_download' map.slug %}"> | 85 | <a class="button" href="{% url 'wlmaps_download' map.slug %}"> |
1347 | 85 | <img src="{{ MEDIA_URL }}img/arrow_down_short.png" alt ="" class="middle" /> | 86 | <img src="{% static 'img/arrow_down_short.png' %}" alt ="" class="middle" /> |
1348 | 86 | <span class="middle">Direct Download</span> | 87 | <span class="middle">Direct Download</span> |
1349 | 87 | </a> | 88 | </a> |
1350 | 88 | </td> | 89 | </td> |
1351 | 89 | 90 | ||
1352 | === modified file 'templates/wlmaps/map_detail.html' | |||
1353 | --- templates/wlmaps/map_detail.html 2018-11-18 17:22:39 +0000 | |||
1354 | +++ templates/wlmaps/map_detail.html 2018-11-28 19:45:23 +0000 | |||
1355 | @@ -8,12 +8,13 @@ | |||
1356 | 8 | {% load threadedcommentstags %} | 8 | {% load threadedcommentstags %} |
1357 | 9 | {% load wl_markdown %} | 9 | {% load wl_markdown %} |
1358 | 10 | {% load ratings %} | 10 | {% load ratings %} |
1359 | 11 | {% load static %} | ||
1360 | 11 | 12 | ||
1361 | 12 | {% block title %}{{ map.name }} - {{ block.super }}{% endblock %} | 13 | {% block title %}{{ map.name }} - {{ block.super }}{% endblock %} |
1362 | 13 | 14 | ||
1363 | 14 | {% block extra_head %} | 15 | {% block extra_head %} |
1364 | 15 | {{ block.super }} | 16 | {{ block.super }} |
1366 | 16 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" /> | 17 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/comments.css' %}" /> |
1367 | 17 | {% endblock %} | 18 | {% endblock %} |
1368 | 18 | 19 | ||
1369 | 19 | {% block content_header %} | 20 | {% block content_header %} |
1370 | @@ -41,7 +42,7 @@ | |||
1371 | 41 | <div>{{ map.uploader_comment|wl_markdown:"bleachit" }}</div> | 42 | <div>{{ map.uploader_comment|wl_markdown:"bleachit" }}</div> |
1372 | 42 | {% if user == map.uploader %} | 43 | {% if user == map.uploader %} |
1373 | 43 | <a class="button posLeft" href="{% url 'wlmaps_edit_comment' map.slug %}"> | 44 | <a class="button posLeft" href="{% url 'wlmaps_edit_comment' map.slug %}"> |
1375 | 44 | <img alt="Edit" title="Edit your comment" class="middle" src="{{ MEDIA_URL }}forum/img/edit.png"> | 45 | <img alt="Edit" title="Edit your comment" class="middle" src="{% static 'forum/img/edit.png' %}"> |
1376 | 45 | <span class="middle">Edit</span> | 46 | <span class="middle">Edit</span> |
1377 | 46 | </a> | 47 | </a> |
1378 | 47 | {% endif %} | 48 | {% endif %} |
1379 | @@ -102,7 +103,7 @@ | |||
1380 | 102 | 103 | ||
1381 | 103 | <div style="margin: 1em 0px 1em 0px"> | 104 | <div style="margin: 1em 0px 1em 0px"> |
1382 | 104 | <a class="button posLeft" href="{% url 'wlmaps_download' map.slug %}"> | 105 | <a class="button posLeft" href="{% url 'wlmaps_download' map.slug %}"> |
1384 | 105 | <img src="{{ MEDIA_URL }}img/arrow_down_short.png" alt ="" class="middle" /> | 106 | <img src="{% static 'img/arrow_down_short.png' %}" alt ="" class="middle" /> |
1385 | 106 | <span class="middle">Download this map</span> | 107 | <span class="middle">Download this map</span> |
1386 | 107 | </a> | 108 | </a> |
1387 | 108 | </div> | 109 | </div> |
1388 | 109 | 110 | ||
1389 | === modified file 'templates/wlmaps/upload.html' | |||
1390 | --- templates/wlmaps/upload.html 2018-10-14 13:24:15 +0000 | |||
1391 | +++ templates/wlmaps/upload.html 2018-11-28 19:45:23 +0000 | |||
1392 | @@ -3,6 +3,8 @@ | |||
1393 | 3 | vim:ft=htmldjango | 3 | vim:ft=htmldjango |
1394 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1395 | 5 | 5 | ||
1396 | 6 | {% load static %} | ||
1397 | 7 | |||
1398 | 6 | {% block title %}Upload - {{ block.super }}{% endblock %} | 8 | {% block title %}Upload - {{ block.super }}{% endblock %} |
1399 | 7 | 9 | ||
1400 | 8 | {% block content_header %} | 10 | {% block content_header %} |
1401 | @@ -22,7 +24,7 @@ | |||
1402 | 22 | {{ form.uploader_comment.label_tag }} | 24 | {{ form.uploader_comment.label_tag }} |
1403 | 23 | <span class="posRight"> | 25 | <span class="posRight"> |
1404 | 24 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> | 26 | <a href="/wiki/WikiSyntax" title="Opens new Tab/Window" target="_blank"> |
1406 | 25 | <img src="{{ MEDIA_URL }}img/menu_help.png" alt="Help on Syntax" class="middle"> | 27 | <img src="{% static 'img/menu_help.png' %}" alt="Help on Syntax" class="middle"> |
1407 | 26 | Help on Syntax | 28 | Help on Syntax |
1408 | 27 | </a> | 29 | </a> |
1409 | 28 | </span> | 30 | </span> |
1410 | 29 | 31 | ||
1411 | === modified file 'templates/wlpoll/base.html' | |||
1412 | --- templates/wlpoll/base.html 2017-09-23 08:52:36 +0000 | |||
1413 | +++ templates/wlpoll/base.html 2018-11-28 19:45:23 +0000 | |||
1414 | @@ -3,10 +3,12 @@ | |||
1415 | 3 | vim:ft=htmldjango | 3 | vim:ft=htmldjango |
1416 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1417 | 5 | 5 | ||
1418 | 6 | {% load static %} | ||
1419 | 7 | |||
1420 | 6 | {% block extra_head %} | 8 | {% block extra_head %} |
1421 | 7 | {{block.super}} | 9 | {{block.super}} |
1424 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/comments.css" /> | 10 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/comments.css' %}" /> |
1425 | 9 | <script src="{{ MEDIA_URL }}js/highcharts_v5/highcharts.js" type="text/javascript"></script> | 11 | <script src="{% static 'js/highcharts_v5/highcharts.js' %}" type="text/javascript"></script> |
1426 | 10 | {% endblock %} | 12 | {% endblock %} |
1427 | 11 | 13 | ||
1428 | 12 | {% block title %}Polls - {{ block.super }}{% endblock %} | 14 | {% block title %}Polls - {{ block.super }}{% endblock %} |
1429 | 13 | 15 | ||
1430 | === modified file 'templates/wlpoll/poll_list.html' | |||
1431 | --- templates/wlpoll/poll_list.html 2018-03-11 11:06:46 +0000 | |||
1432 | +++ templates/wlpoll/poll_list.html 2018-11-28 19:45:23 +0000 | |||
1433 | @@ -3,9 +3,11 @@ | |||
1434 | 3 | vim:ft=htmldjango | 3 | vim:ft=htmldjango |
1435 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1436 | 5 | 5 | ||
1437 | 6 | {% load static %} | ||
1438 | 7 | |||
1439 | 6 | {% block extra_head %} | 8 | {% block extra_head %} |
1440 | 7 | {{ block.super}} | 9 | {{ block.super}} |
1442 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/wiki.css" /> | 10 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/wiki.css' %}" /> |
1443 | 9 | {% endblock %} | 11 | {% endblock %} |
1444 | 10 | 12 | ||
1445 | 11 | {% load threadedcommentstags custom_date %} | 13 | {% load threadedcommentstags custom_date %} |
1446 | 12 | 14 | ||
1447 | === modified file 'templates/wlprofile/base.html' | |||
1448 | --- templates/wlprofile/base.html 2018-10-14 13:24:15 +0000 | |||
1449 | +++ templates/wlprofile/base.html 2018-11-28 19:45:23 +0000 | |||
1450 | @@ -4,12 +4,14 @@ | |||
1451 | 4 | vim:ft=htmldjango | 4 | vim:ft=htmldjango |
1452 | 5 | {% endcomment %} | 5 | {% endcomment %} |
1453 | 6 | 6 | ||
1454 | 7 | {% load static %} | ||
1455 | 8 | |||
1456 | 7 | {% block title %} | 9 | {% block title %} |
1457 | 8 | {{ block.super }} | 10 | {{ block.super }} |
1458 | 9 | {% endblock %} | 11 | {% endblock %} |
1459 | 10 | 12 | ||
1460 | 11 | {% block extra_head %} | 13 | {% block extra_head %} |
1462 | 12 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/profile.css" />{{ block.super}} | 14 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/profile.css' %}" />{{ block.super}} |
1463 | 13 | {% endblock %} | 15 | {% endblock %} |
1464 | 14 | 16 | ||
1465 | 15 | {% block content_tabbing %} | 17 | {% block content_tabbing %} |
1466 | 16 | 18 | ||
1467 | === modified file 'templates/wlscheduling/base.html' | |||
1468 | --- templates/wlscheduling/base.html 2018-10-15 16:11:43 +0000 | |||
1469 | +++ templates/wlscheduling/base.html 2018-11-28 19:45:23 +0000 | |||
1470 | @@ -1,10 +1,12 @@ | |||
1471 | 1 | {% extends "wlprofile/base.html" %} | 1 | {% extends "wlprofile/base.html" %} |
1472 | 2 | {% load static %} | ||
1473 | 3 | |||
1474 | 2 | {% block extra_head %} | 4 | {% block extra_head %} |
1477 | 3 | <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/jquery-ui.multidatespicker.css" > | 5 | <link rel="stylesheet" type="text/css" href="{% static 'css/jquery-ui.multidatespicker.css' %}" > |
1478 | 4 | <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/scheduling.css" > | 6 | <link rel="stylesheet" type="text/css" href="{% static 'css/scheduling.css' %}" > |
1479 | 5 | 7 | ||
1482 | 6 | <script src="{{ MEDIA_URL }}js/jquery-ui.multidatespicker.js" type="text/javascript"></script> | 8 | <script src="{% static 'js/jquery-ui.multidatespicker.js' %}" type="text/javascript"></script> |
1483 | 7 | <script src="{{ MEDIA_URL }}js/scheduling.js" type="text/javascript"></script> | 9 | <script src="{% static 'js/scheduling.js' %}" type="text/javascript"></script> |
1484 | 8 | {% endblock %} | 10 | {% endblock %} |
1485 | 9 | 11 | ||
1486 | 10 | {% block title %} | 12 | {% block title %} |
1487 | 11 | 13 | ||
1488 | === modified file 'templates/wlscreens/base.html' | |||
1489 | --- templates/wlscreens/base.html 2012-04-02 09:41:12 +0000 | |||
1490 | +++ templates/wlscreens/base.html 2018-11-28 19:45:23 +0000 | |||
1491 | @@ -3,9 +3,11 @@ | |||
1492 | 3 | vim:ft=htmldjango | 3 | vim:ft=htmldjango |
1493 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1494 | 5 | 5 | ||
1495 | 6 | {% load static %} | ||
1496 | 7 | |||
1497 | 6 | {% block extra_head %} | 8 | {% block extra_head %} |
1498 | 7 | {{ block.super }} | 9 | {{ block.super }} |
1500 | 8 | <link rel="stylesheet" type="text/css" media="all" href="{{ MEDIA_URL }}css/screens.css" /> | 10 | <link rel="stylesheet" type="text/css" media="all" href="{% static 'css/screens.css' %}" /> |
1501 | 9 | {% endblock %} | 11 | {% endblock %} |
1502 | 10 | 12 | ||
1503 | 11 | {% block title %}Screenshots - {{ block.super }}{% endblock %} | 13 | {% block title %}Screenshots - {{ block.super }}{% endblock %} |
1504 | 12 | 14 | ||
1505 | === modified file 'templates/wlscreens/index.html' | |||
1506 | --- templates/wlscreens/index.html 2018-10-14 13:24:15 +0000 | |||
1507 | +++ templates/wlscreens/index.html 2018-11-28 19:45:23 +0000 | |||
1508 | @@ -4,13 +4,14 @@ | |||
1509 | 4 | {% endcomment %} | 4 | {% endcomment %} |
1510 | 5 | 5 | ||
1511 | 6 | {% load wl_markdown %} | 6 | {% load wl_markdown %} |
1512 | 7 | {% load static %} | ||
1513 | 7 | 8 | ||
1514 | 8 | {% block extra_head %} | 9 | {% block extra_head %} |
1515 | 9 | {{ block.super }} | 10 | {{ block.super }} |
1518 | 10 | <link rel="stylesheet" href="{{ MEDIA_URL }}lightbox_v2/css/lightbox.css" type="text/css" media="screen" /> | 11 | <link rel="stylesheet" href="{% static 'lightbox_v2/css/lightbox.css' %}" type="text/css" media="screen" /> |
1519 | 11 | <link rel="stylesheet" href="{{ MEDIA_URL }}lightbox_v2/css/custom.css" type="text/css" media="screen" /> | 12 | <link rel="stylesheet" href="{% static 'lightbox_v2/css/custom.css' %}" type="text/css" media="screen" /> |
1520 | 12 | <!-- lightbox-plus-jquery.min.js supports also IE9+ --> | 13 | <!-- lightbox-plus-jquery.min.js supports also IE9+ --> |
1522 | 13 | <script type="text/javascript" src="{{ MEDIA_URL }}lightbox_v2/lightbox-plus-jquery.min.js"></script> | 14 | <script type="text/javascript" src="{% static 'lightbox_v2/lightbox-plus-jquery.min.js' %}"></script> |
1523 | 14 | <script type="text/javascript"> | 15 | <script type="text/javascript"> |
1524 | 15 | lightbox.option({ | 16 | lightbox.option({ |
1525 | 16 | 'resizeDuration': 400, | 17 | 'resizeDuration': 400, |
1526 | 17 | 18 | ||
1527 | === added directory 'threadedcomments/static' | |||
1528 | === added directory 'threadedcomments/static/css' | |||
1529 | === renamed file 'media/css/comments.css' => 'threadedcomments/static/css/comments.css' | |||
1530 | === added directory 'wiki/css' | |||
1531 | === added directory 'wiki/static' | |||
1532 | === added directory 'wiki/static/css' | |||
1533 | === renamed file 'media/css/wiki.css' => 'wiki/static/css/wiki.css' | |||
1534 | === added directory 'wlhelp/static' | |||
1535 | === added directory 'wlhelp/static/css' | |||
1536 | === renamed file 'media/css/encyclopedia.css' => 'wlhelp/static/css/encyclopedia.css' | |||
1537 | === added directory 'wlhelp/static/js' | |||
1538 | === renamed file 'media/js/encyclopedia.js' => 'wlhelp/static/js/encyclopedia.js' | |||
1539 | === added directory 'wlmaps/static' | |||
1540 | === added directory 'wlmaps/static/css' | |||
1541 | === renamed file 'media/css/maps.css' => 'wlmaps/static/css/maps.css' | |||
1542 | === added directory 'wlpoll/static' | |||
1543 | === added directory 'wlpoll/static/js' | |||
1544 | === renamed directory 'media/js/highcharts_v5' => 'wlpoll/static/js/highcharts_v5' | |||
1545 | === added directory 'wlprofile/static' | |||
1546 | === added directory 'wlprofile/static/css' | |||
1547 | === renamed file 'media/css/profile.css' => 'wlprofile/static/css/profile.css' | |||
1548 | === added directory 'wlscheduling/static' | |||
1549 | === added directory 'wlscheduling/static/css' | |||
1550 | === renamed file 'media/css/jquery-ui.multidatespicker.css' => 'wlscheduling/static/css/jquery-ui.multidatespicker.css' | |||
1551 | === renamed file 'media/css/scheduling.css' => 'wlscheduling/static/css/scheduling.css' | |||
1552 | === added directory 'wlscheduling/static/js' | |||
1553 | === renamed file 'media/js/jquery-ui.multidatespicker.js' => 'wlscheduling/static/js/jquery-ui.multidatespicker.js' | |||
1554 | === renamed file 'media/js/scheduling.js' => 'wlscheduling/static/js/scheduling.js' | |||
1555 | === added directory 'wlscreens/static' | |||
1556 | === added directory 'wlscreens/static/css' | |||
1557 | === renamed file 'media/css/screens.css' => 'wlscreens/static/css/screens.css' | |||
1558 | === renamed directory 'media/lightbox_v2' => 'wlscreens/static/lightbox_v2' | |||
1559 | === added directory 'wlsearch/static' | |||
1560 | === added directory 'wlsearch/static/css' | |||
1561 | === renamed file 'media/css/search.css' => 'wlsearch/static/css/search.css' | |||
1562 | === added directory 'wlsearch/static/js' | |||
1563 | === renamed file 'media/js/search.js' => 'wlsearch/static/js/search.js' |
Alpha is up and running :-)