summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-09 19:33:36 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-02-09 19:33:36 -0500
commitee38739d3b681f7d9fb61b650368d08e290a46bb (patch)
tree65c88de11dd5c766e100fe3bcd4aad344e771186
parent7575e18525c9eb0ac12e7a30b1c1a22de5a2efd5 (diff)
downloadaskbot-ee38739d3b681f7d9fb61b650368d08e290a46bb.tar.gz
askbot-ee38739d3b681f7d9fb61b650368d08e290a46bb.tar.bz2
askbot-ee38739d3b681f7d9fb61b650368d08e290a46bb.zip
moved templates/content --> forum/media, templates --> forum/templates, fixed up urls
-rw-r--r--forum/media/images/blue-up-arrow-h18px.png (renamed from forum/templates/content/images/blue-up-arrow-h18px.png)bin593 -> 593 bytes
-rw-r--r--forum/media/images/box-arrow.gif (renamed from forum/templates/content/images/box-arrow.gif)bin69 -> 69 bytes
-rw-r--r--forum/media/images/bullet_green.gif (renamed from forum/templates/content/images/bullet_green.gif)bin64 -> 64 bytes
-rw-r--r--forum/media/images/cc-88x31.png (renamed from forum/templates/content/images/cc-88x31.png)bin5460 -> 5460 bytes
-rw-r--r--forum/media/images/cc-wiki.png (renamed from forum/templates/content/images/cc-wiki.png)bin2333 -> 2333 bytes
-rw-r--r--forum/media/images/close-small-dark.png (renamed from forum/templates/content/images/close-small-dark.png)bin226 -> 226 bytes
-rw-r--r--forum/media/images/close-small-hover.png (renamed from forum/templates/content/images/close-small-hover.png)bin337 -> 337 bytes
-rw-r--r--forum/media/images/close-small.png (renamed from forum/templates/content/images/close-small.png)bin293 -> 293 bytes
-rw-r--r--forum/media/images/dash.gif (renamed from forum/templates/content/images/dash.gif)bin44 -> 44 bytes
-rw-r--r--forum/media/images/djangomade124x25_grey.gif (renamed from forum/templates/content/images/djangomade124x25_grey.gif)bin2035 -> 2035 bytes
-rw-r--r--forum/media/images/dot-g.gif (renamed from forum/templates/content/images/dot-g.gif)bin61 -> 61 bytes
-rw-r--r--forum/media/images/dot-list.gif (renamed from forum/templates/content/images/dot-list.gif)bin56 -> 56 bytes
-rw-r--r--forum/media/images/edit.png (renamed from forum/templates/content/images/edit.png)bin758 -> 758 bytes
-rw-r--r--forum/media/images/expander-arrow-hide.gif (renamed from forum/templates/content/images/expander-arrow-hide.gif)bin126 -> 126 bytes
-rw-r--r--forum/media/images/expander-arrow-show.gif (renamed from forum/templates/content/images/expander-arrow-show.gif)bin135 -> 135 bytes
-rw-r--r--forum/media/images/favicon.gif (renamed from forum/templates/content/images/favicon.gif)bin3918 -> 3918 bytes
-rw-r--r--forum/media/images/feed-icon-small.png (renamed from forum/templates/content/images/feed-icon-small.png)bin689 -> 689 bytes
-rw-r--r--forum/media/images/gray-up-arrow-h18px.png (renamed from forum/templates/content/images/gray-up-arrow-h18px.png)bin383 -> 383 bytes
-rw-r--r--forum/media/images/grippie.png (renamed from forum/templates/content/images/grippie.png)bin162 -> 162 bytes
-rw-r--r--forum/media/images/indicator.gif (renamed from forum/templates/content/images/indicator.gif)bin2545 -> 2545 bytes
-rw-r--r--forum/media/images/logo.gif (renamed from forum/templates/content/images/logo.gif)bin2114 -> 2114 bytes
-rw-r--r--forum/media/images/logo.png (renamed from forum/templates/content/images/logo.png)bin2081 -> 2081 bytes
-rw-r--r--forum/media/images/logo1.png (renamed from forum/templates/content/images/logo1.png)bin2752 -> 2752 bytes
-rw-r--r--forum/media/images/logo2.png (renamed from forum/templates/content/images/logo2.png)bin2124 -> 2124 bytes
-rw-r--r--forum/media/images/medala.gif (renamed from forum/templates/content/images/medala.gif)bin801 -> 801 bytes
-rw-r--r--forum/media/images/medala_on.gif (renamed from forum/templates/content/images/medala_on.gif)bin957 -> 957 bytes
-rw-r--r--forum/media/images/new.gif (renamed from forum/templates/content/images/new.gif)bin635 -> 635 bytes
-rw-r--r--forum/media/images/nophoto.png (renamed from forum/templates/content/images/nophoto.png)bin696 -> 696 bytes
-rw-r--r--forum/media/images/openid.gif (renamed from forum/templates/content/images/openid.gif)bin910 -> 910 bytes
-rw-r--r--forum/media/images/openid/aol.gif (renamed from forum/templates/content/images/openid/aol.gif)bin2205 -> 2205 bytes
-rw-r--r--forum/media/images/openid/blogger.ico (renamed from forum/templates/content/images/openid/blogger.ico)bin3638 -> 3638 bytes
-rw-r--r--forum/media/images/openid/claimid.ico (renamed from forum/templates/content/images/openid/claimid.ico)bin3638 -> 3638 bytes
-rw-r--r--forum/media/images/openid/facebook.gif (renamed from forum/templates/content/images/openid/facebook.gif)bin2075 -> 2075 bytes
-rw-r--r--forum/media/images/openid/flickr.ico (renamed from forum/templates/content/images/openid/flickr.ico)bin1150 -> 1150 bytes
-rw-r--r--forum/media/images/openid/google.gif (renamed from forum/templates/content/images/openid/google.gif)bin1596 -> 1596 bytes
-rw-r--r--forum/media/images/openid/livejournal.ico (renamed from forum/templates/content/images/openid/livejournal.ico)bin5222 -> 5222 bytes
-rw-r--r--forum/media/images/openid/myopenid.ico (renamed from forum/templates/content/images/openid/myopenid.ico)bin2862 -> 2862 bytes
-rw-r--r--forum/media/images/openid/openid-inputicon.gif (renamed from forum/templates/content/images/openid/openid-inputicon.gif)bin237 -> 237 bytes
-rw-r--r--forum/media/images/openid/openid.gif (renamed from forum/templates/content/images/openid/openid.gif)bin740 -> 740 bytes
-rw-r--r--forum/media/images/openid/technorati.ico (renamed from forum/templates/content/images/openid/technorati.ico)bin2294 -> 2294 bytes
-rw-r--r--forum/media/images/openid/verisign.ico (renamed from forum/templates/content/images/openid/verisign.ico)bin4710 -> 4710 bytes
-rw-r--r--forum/media/images/openid/vidoop.ico (renamed from forum/templates/content/images/openid/vidoop.ico)bin1406 -> 1406 bytes
-rw-r--r--forum/media/images/openid/wordpress.ico (renamed from forum/templates/content/images/openid/wordpress.ico)bin1150 -> 1150 bytes
-rw-r--r--forum/media/images/openid/yahoo.gif (renamed from forum/templates/content/images/openid/yahoo.gif)bin1682 -> 1682 bytes
-rw-r--r--forum/media/images/quest-bg.gif (renamed from forum/templates/content/images/quest-bg.gif)bin294 -> 294 bytes
-rw-r--r--forum/media/images/vote-accepted-on.png (renamed from forum/templates/content/images/vote-accepted-on.png)bin1124 -> 1124 bytes
-rw-r--r--forum/media/images/vote-accepted.png (renamed from forum/templates/content/images/vote-accepted.png)bin1058 -> 1058 bytes
-rw-r--r--forum/media/images/vote-arrow-down-on.png (renamed from forum/templates/content/images/vote-arrow-down-on.png)bin905 -> 905 bytes
-rw-r--r--forum/media/images/vote-arrow-down.png (renamed from forum/templates/content/images/vote-arrow-down.png)bin876 -> 876 bytes
-rw-r--r--forum/media/images/vote-arrow-up-on.png (renamed from forum/templates/content/images/vote-arrow-up-on.png)bin906 -> 906 bytes
-rw-r--r--forum/media/images/vote-arrow-up.png (renamed from forum/templates/content/images/vote-arrow-up.png)bin843 -> 843 bytes
-rw-r--r--forum/media/images/vote-favorite-off.png (renamed from forum/templates/content/images/vote-favorite-off.png)bin930 -> 930 bytes
-rw-r--r--forum/media/images/vote-favorite-on.png (renamed from forum/templates/content/images/vote-favorite-on.png)bin1023 -> 1023 bytes
-rw-r--r--forum/media/jquery-openid/images/aol.gif (renamed from forum/templates/content/jquery-openid/images/aol.gif)bin2205 -> 2205 bytes
-rw-r--r--forum/media/jquery-openid/images/blogger-1.png (renamed from forum/templates/content/jquery-openid/images/blogger-1.png)bin432 -> 432 bytes
-rw-r--r--forum/media/jquery-openid/images/blogger.ico (renamed from forum/templates/content/jquery-openid/images/blogger.ico)bin3638 -> 3638 bytes
-rw-r--r--forum/media/jquery-openid/images/claimid-0.png (renamed from forum/templates/content/jquery-openid/images/claimid-0.png)bin629 -> 629 bytes
-rw-r--r--forum/media/jquery-openid/images/claimid.ico (renamed from forum/templates/content/jquery-openid/images/claimid.ico)bin3638 -> 3638 bytes
-rw-r--r--forum/media/jquery-openid/images/facebook.gif (renamed from forum/templates/content/jquery-openid/images/facebook.gif)bin2075 -> 2075 bytes
-rw-r--r--forum/media/jquery-openid/images/flickr.ico (renamed from forum/templates/content/jquery-openid/images/flickr.ico)bin1150 -> 1150 bytes
-rw-r--r--forum/media/jquery-openid/images/flickr.png (renamed from forum/templates/content/jquery-openid/images/flickr.png)bin426 -> 426 bytes
-rw-r--r--forum/media/jquery-openid/images/google.gif (renamed from forum/templates/content/jquery-openid/images/google.gif)bin1596 -> 1596 bytes
-rw-r--r--forum/media/jquery-openid/images/livejournal-1.png (renamed from forum/templates/content/jquery-openid/images/livejournal-1.png)bin713 -> 713 bytes
-rw-r--r--forum/media/jquery-openid/images/livejournal.ico (renamed from forum/templates/content/jquery-openid/images/livejournal.ico)bin5222 -> 5222 bytes
-rw-r--r--forum/media/jquery-openid/images/myopenid-2.png (renamed from forum/templates/content/jquery-openid/images/myopenid-2.png)bin511 -> 511 bytes
-rw-r--r--forum/media/jquery-openid/images/myopenid.ico (renamed from forum/templates/content/jquery-openid/images/myopenid.ico)bin2862 -> 2862 bytes
-rw-r--r--forum/media/jquery-openid/images/openid-inputicon.gif (renamed from forum/templates/content/jquery-openid/images/openid-inputicon.gif)bin237 -> 237 bytes
-rw-r--r--forum/media/jquery-openid/images/openid.gif (renamed from forum/templates/content/jquery-openid/images/openid.gif)bin740 -> 740 bytes
-rw-r--r--forum/media/jquery-openid/images/openidico.png (renamed from forum/templates/content/jquery-openid/images/openidico.png)bin654 -> 654 bytes
-rw-r--r--forum/media/jquery-openid/images/openidico16.png (renamed from forum/templates/content/jquery-openid/images/openidico16.png)bin554 -> 554 bytes
-rw-r--r--forum/media/jquery-openid/images/technorati-1.png (renamed from forum/templates/content/jquery-openid/images/technorati-1.png)bin606 -> 606 bytes
-rw-r--r--forum/media/jquery-openid/images/technorati.ico (renamed from forum/templates/content/jquery-openid/images/technorati.ico)bin2294 -> 2294 bytes
-rw-r--r--forum/media/jquery-openid/images/verisign-2.png (renamed from forum/templates/content/jquery-openid/images/verisign-2.png)bin859 -> 859 bytes
-rw-r--r--forum/media/jquery-openid/images/verisign.ico (renamed from forum/templates/content/jquery-openid/images/verisign.ico)bin4710 -> 4710 bytes
-rw-r--r--forum/media/jquery-openid/images/vidoop.ico (renamed from forum/templates/content/jquery-openid/images/vidoop.ico)bin1406 -> 1406 bytes
-rw-r--r--forum/media/jquery-openid/images/vidoop.png (renamed from forum/templates/content/jquery-openid/images/vidoop.png)bin499 -> 499 bytes
-rw-r--r--forum/media/jquery-openid/images/wordpress.ico (renamed from forum/templates/content/jquery-openid/images/wordpress.ico)bin1150 -> 1150 bytes
-rw-r--r--forum/media/jquery-openid/images/wordpress.png (renamed from forum/templates/content/jquery-openid/images/wordpress.png)bin566 -> 566 bytes
-rw-r--r--forum/media/jquery-openid/images/yahoo.gif (renamed from forum/templates/content/jquery-openid/images/yahoo.gif)bin1682 -> 1682 bytes
-rw-r--r--forum/media/jquery-openid/jquery.openid.js (renamed from forum/templates/content/jquery-openid/jquery.openid.js)0
-rw-r--r--forum/media/jquery-openid/openid.css (renamed from forum/templates/content/jquery-openid/openid.css)0
-rw-r--r--forum/media/js/com.cnprog.admin.js (renamed from forum/templates/content/js/com.cnprog.admin.js)0
-rw-r--r--forum/media/js/com.cnprog.editor.js (renamed from forum/templates/content/js/com.cnprog.editor.js)0
-rw-r--r--forum/media/js/com.cnprog.i18n.js (renamed from forum/templates/content/js/com.cnprog.i18n.js)0
-rw-r--r--forum/media/js/com.cnprog.post.js (renamed from forum/templates/content/js/com.cnprog.post.js)28
-rw-r--r--forum/media/js/com.cnprog.tag_selector.js (renamed from forum/templates/content/js/com.cnprog.tag_selector.js)6
-rw-r--r--forum/media/js/com.cnprog.utils.js (renamed from forum/templates/content/js/com.cnprog.utils.js)2
-rw-r--r--forum/media/js/compress.bat (renamed from forum/templates/content/js/compress.bat)0
-rw-r--r--forum/media/js/excanvas.pack.js (renamed from forum/templates/content/js/excanvas.pack.js)0
-rw-r--r--forum/media/js/flot-build.bat (renamed from forum/templates/content/js/flot-build.bat)0
-rw-r--r--forum/media/js/jquery-1.2.6.js (renamed from forum/templates/content/js/jquery-1.2.6.js)0
-rw-r--r--forum/media/js/jquery-1.2.6.min.js (renamed from forum/templates/content/js/jquery-1.2.6.min.js)0
-rw-r--r--forum/media/js/jquery.ajaxfileupload.js (renamed from forum/templates/content/js/jquery.ajaxfileupload.js)0
-rw-r--r--forum/media/js/jquery.flot.js (renamed from forum/templates/content/js/jquery.flot.js)0
-rw-r--r--forum/media/js/jquery.flot.pack.js (renamed from forum/templates/content/js/jquery.flot.pack.js)0
-rw-r--r--forum/media/js/jquery.form.js (renamed from forum/templates/content/js/jquery.form.js)0
-rw-r--r--forum/media/js/jquery.i18n.js (renamed from forum/templates/content/js/jquery.i18n.js)0
-rw-r--r--forum/media/js/jquery.openid.js (renamed from forum/templates/content/js/jquery.openid.js)2
-rw-r--r--forum/media/js/jquery.validate.pack.js (renamed from forum/templates/content/js/jquery.validate.pack.js)0
-rw-r--r--forum/media/js/se_hilite.js (renamed from forum/templates/content/js/se_hilite.js)0
-rw-r--r--forum/media/js/se_hilite_src.js (renamed from forum/templates/content/js/se_hilite_src.js)0
-rw-r--r--forum/media/js/wmd/images/wmd-buttons.png (renamed from forum/templates/content/js/wmd/images/wmd-buttons.png)bin7465 -> 7465 bytes
-rw-r--r--forum/media/js/wmd/showdown-min.js (renamed from forum/templates/content/js/wmd/showdown-min.js)0
-rw-r--r--forum/media/js/wmd/showdown.js (renamed from forum/templates/content/js/wmd/showdown.js)0
-rw-r--r--forum/media/js/wmd/wmd-min.js1
-rw-r--r--forum/media/js/wmd/wmd-test.html (renamed from forum/templates/content/js/wmd/wmd-test.html)0
-rw-r--r--forum/media/js/wmd/wmd.css (renamed from forum/templates/content/js/wmd/wmd.css)0
-rw-r--r--forum/media/js/wmd/wmd.js (renamed from forum/templates/content/js/wmd/wmd.js)2
-rw-r--r--forum/media/js/yuicompressor-2.4.2.jar (renamed from forum/templates/content/js/yuicompressor-2.4.2.jar)bin851219 -> 851219 bytes
-rw-r--r--forum/media/style/default.css (renamed from forum/templates/content/style/default.css)6
-rw-r--r--forum/media/style/jquery.autocomplete.css (renamed from forum/templates/content/style/jquery.autocomplete.css)0
-rw-r--r--forum/media/style/openid.css (renamed from forum/templates/content/style/openid.css)0
-rw-r--r--forum/media/style/prettify.css (renamed from forum/templates/content/style/prettify.css)0
-rw-r--r--forum/media/style/style.css (renamed from forum/templates/content/style/style.css)0
-rw-r--r--forum/templates/answer_edit.html12
-rw-r--r--forum/templates/ask.html12
-rwxr-xr-xforum/templates/authopenid/signin.html36
-rwxr-xr-xforum/templates/base.html10
-rw-r--r--forum/templates/base_content.html10
-rw-r--r--forum/templates/book.html4
-rw-r--r--forum/templates/content/js/wmd/wmd-min.js1
-rw-r--r--forum/templates/footer.html2
-rw-r--r--forum/templates/header.html2
-rw-r--r--forum/templates/index.html4
-rw-r--r--forum/templates/question.html40
-rw-r--r--forum/templates/question_edit.html12
-rw-r--r--forum/templates/question_retag.html6
-rw-r--r--forum/templates/questions.html4
-rw-r--r--forum/templates/revisions_answer.html8
-rw-r--r--forum/templates/revisions_question.html8
-rw-r--r--forum/templates/tag_selector.html4
-rw-r--r--forum/templates/user.html4
-rw-r--r--forum/templates/user_edit.html2
-rw-r--r--forum/templates/user_reputation.html4
-rw-r--r--forum/templates/user_stats.html4
-rw-r--r--forum/templates/user_votes.html4
-rw-r--r--forum/templates/users_questions.html4
-rw-r--r--forum/upfiles/README2
-rw-r--r--forum/urls.py10
139 files changed, 129 insertions, 127 deletions
diff --git a/forum/templates/content/images/blue-up-arrow-h18px.png b/forum/media/images/blue-up-arrow-h18px.png
index e1f29e86..e1f29e86 100644
--- a/forum/templates/content/images/blue-up-arrow-h18px.png
+++ b/forum/media/images/blue-up-arrow-h18px.png
Binary files differ
diff --git a/forum/templates/content/images/box-arrow.gif b/forum/media/images/box-arrow.gif
index 89dcf5b3..89dcf5b3 100644
--- a/forum/templates/content/images/box-arrow.gif
+++ b/forum/media/images/box-arrow.gif
Binary files differ
diff --git a/forum/templates/content/images/bullet_green.gif b/forum/media/images/bullet_green.gif
index fa530910..fa530910 100644
--- a/forum/templates/content/images/bullet_green.gif
+++ b/forum/media/images/bullet_green.gif
Binary files differ
diff --git a/forum/templates/content/images/cc-88x31.png b/forum/media/images/cc-88x31.png
index 0f2a0f10..0f2a0f10 100644
--- a/forum/templates/content/images/cc-88x31.png
+++ b/forum/media/images/cc-88x31.png
Binary files differ
diff --git a/forum/templates/content/images/cc-wiki.png b/forum/media/images/cc-wiki.png
index 3e680538..3e680538 100644
--- a/forum/templates/content/images/cc-wiki.png
+++ b/forum/media/images/cc-wiki.png
Binary files differ
diff --git a/forum/templates/content/images/close-small-dark.png b/forum/media/images/close-small-dark.png
index 280c1fc7..280c1fc7 100644
--- a/forum/templates/content/images/close-small-dark.png
+++ b/forum/media/images/close-small-dark.png
Binary files differ
diff --git a/forum/templates/content/images/close-small-hover.png b/forum/media/images/close-small-hover.png
index 7899aec7..7899aec7 100644
--- a/forum/templates/content/images/close-small-hover.png
+++ b/forum/media/images/close-small-hover.png
Binary files differ
diff --git a/forum/templates/content/images/close-small.png b/forum/media/images/close-small.png
index 5a99d31f..5a99d31f 100644
--- a/forum/templates/content/images/close-small.png
+++ b/forum/media/images/close-small.png
Binary files differ
diff --git a/forum/templates/content/images/dash.gif b/forum/media/images/dash.gif
index d1ddc507..d1ddc507 100644
--- a/forum/templates/content/images/dash.gif
+++ b/forum/media/images/dash.gif
Binary files differ
diff --git a/forum/templates/content/images/djangomade124x25_grey.gif b/forum/media/images/djangomade124x25_grey.gif
index d34bb311..d34bb311 100644
--- a/forum/templates/content/images/djangomade124x25_grey.gif
+++ b/forum/media/images/djangomade124x25_grey.gif
Binary files differ
diff --git a/forum/templates/content/images/dot-g.gif b/forum/media/images/dot-g.gif
index 5d6bb28e..5d6bb28e 100644
--- a/forum/templates/content/images/dot-g.gif
+++ b/forum/media/images/dot-g.gif
Binary files differ
diff --git a/forum/templates/content/images/dot-list.gif b/forum/media/images/dot-list.gif
index f6a6b865..f6a6b865 100644
--- a/forum/templates/content/images/dot-list.gif
+++ b/forum/media/images/dot-list.gif
Binary files differ
diff --git a/forum/templates/content/images/edit.png b/forum/media/images/edit.png
index dcb09be0..dcb09be0 100644
--- a/forum/templates/content/images/edit.png
+++ b/forum/media/images/edit.png
Binary files differ
diff --git a/forum/templates/content/images/expander-arrow-hide.gif b/forum/media/images/expander-arrow-hide.gif
index feb6a618..feb6a618 100644
--- a/forum/templates/content/images/expander-arrow-hide.gif
+++ b/forum/media/images/expander-arrow-hide.gif
Binary files differ
diff --git a/forum/templates/content/images/expander-arrow-show.gif b/forum/media/images/expander-arrow-show.gif
index 6825c56e..6825c56e 100644
--- a/forum/templates/content/images/expander-arrow-show.gif
+++ b/forum/media/images/expander-arrow-show.gif
Binary files differ
diff --git a/forum/templates/content/images/favicon.gif b/forum/media/images/favicon.gif
index 910c2666..910c2666 100644
--- a/forum/templates/content/images/favicon.gif
+++ b/forum/media/images/favicon.gif
Binary files differ
diff --git a/forum/templates/content/images/feed-icon-small.png b/forum/media/images/feed-icon-small.png
index b3c949d2..b3c949d2 100644
--- a/forum/templates/content/images/feed-icon-small.png
+++ b/forum/media/images/feed-icon-small.png
Binary files differ
diff --git a/forum/templates/content/images/gray-up-arrow-h18px.png b/forum/media/images/gray-up-arrow-h18px.png
index 78767445..78767445 100644
--- a/forum/templates/content/images/gray-up-arrow-h18px.png
+++ b/forum/media/images/gray-up-arrow-h18px.png
Binary files differ
diff --git a/forum/templates/content/images/grippie.png b/forum/media/images/grippie.png
index 6524d416..6524d416 100644
--- a/forum/templates/content/images/grippie.png
+++ b/forum/media/images/grippie.png
Binary files differ
diff --git a/forum/templates/content/images/indicator.gif b/forum/media/images/indicator.gif
index 1c72ebb5..1c72ebb5 100644
--- a/forum/templates/content/images/indicator.gif
+++ b/forum/media/images/indicator.gif
Binary files differ
diff --git a/forum/templates/content/images/logo.gif b/forum/media/images/logo.gif
index ab690de2..ab690de2 100644
--- a/forum/templates/content/images/logo.gif
+++ b/forum/media/images/logo.gif
Binary files differ
diff --git a/forum/templates/content/images/logo.png b/forum/media/images/logo.png
index 6a250e35..6a250e35 100644
--- a/forum/templates/content/images/logo.png
+++ b/forum/media/images/logo.png
Binary files differ
diff --git a/forum/templates/content/images/logo1.png b/forum/media/images/logo1.png
index d79a6271..d79a6271 100644
--- a/forum/templates/content/images/logo1.png
+++ b/forum/media/images/logo1.png
Binary files differ
diff --git a/forum/templates/content/images/logo2.png b/forum/media/images/logo2.png
index bd3cccd9..bd3cccd9 100644
--- a/forum/templates/content/images/logo2.png
+++ b/forum/media/images/logo2.png
Binary files differ
diff --git a/forum/templates/content/images/medala.gif b/forum/media/images/medala.gif
index 93dd1a39..93dd1a39 100644
--- a/forum/templates/content/images/medala.gif
+++ b/forum/media/images/medala.gif
Binary files differ
diff --git a/forum/templates/content/images/medala_on.gif b/forum/media/images/medala_on.gif
index a18f9e85..a18f9e85 100644
--- a/forum/templates/content/images/medala_on.gif
+++ b/forum/media/images/medala_on.gif
Binary files differ
diff --git a/forum/templates/content/images/new.gif b/forum/media/images/new.gif
index 8a220b53..8a220b53 100644
--- a/forum/templates/content/images/new.gif
+++ b/forum/media/images/new.gif
Binary files differ
diff --git a/forum/templates/content/images/nophoto.png b/forum/media/images/nophoto.png
index 2daf0ffd..2daf0ffd 100644
--- a/forum/templates/content/images/nophoto.png
+++ b/forum/media/images/nophoto.png
Binary files differ
diff --git a/forum/templates/content/images/openid.gif b/forum/media/images/openid.gif
index 8540e12b..8540e12b 100644
--- a/forum/templates/content/images/openid.gif
+++ b/forum/media/images/openid.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/aol.gif b/forum/media/images/openid/aol.gif
index decc4f12..decc4f12 100644
--- a/forum/templates/content/images/openid/aol.gif
+++ b/forum/media/images/openid/aol.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/blogger.ico b/forum/media/images/openid/blogger.ico
index 1b9730b0..1b9730b0 100644
--- a/forum/templates/content/images/openid/blogger.ico
+++ b/forum/media/images/openid/blogger.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/claimid.ico b/forum/media/images/openid/claimid.ico
index 2b80f491..2b80f491 100644
--- a/forum/templates/content/images/openid/claimid.ico
+++ b/forum/media/images/openid/claimid.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/facebook.gif b/forum/media/images/openid/facebook.gif
index b997b358..b997b358 100644
--- a/forum/templates/content/images/openid/facebook.gif
+++ b/forum/media/images/openid/facebook.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/flickr.ico b/forum/media/images/openid/flickr.ico
index 11f6e07f..11f6e07f 100644
--- a/forum/templates/content/images/openid/flickr.ico
+++ b/forum/media/images/openid/flickr.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/google.gif b/forum/media/images/openid/google.gif
index 1b6cd07b..1b6cd07b 100644
--- a/forum/templates/content/images/openid/google.gif
+++ b/forum/media/images/openid/google.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/livejournal.ico b/forum/media/images/openid/livejournal.ico
index f3d21ec5..f3d21ec5 100644
--- a/forum/templates/content/images/openid/livejournal.ico
+++ b/forum/media/images/openid/livejournal.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/myopenid.ico b/forum/media/images/openid/myopenid.ico
index ceb06e6a..ceb06e6a 100644
--- a/forum/templates/content/images/openid/myopenid.ico
+++ b/forum/media/images/openid/myopenid.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/openid-inputicon.gif b/forum/media/images/openid/openid-inputicon.gif
index cde836c8..cde836c8 100644
--- a/forum/templates/content/images/openid/openid-inputicon.gif
+++ b/forum/media/images/openid/openid-inputicon.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/openid.gif b/forum/media/images/openid/openid.gif
index c718b0e6..c718b0e6 100644
--- a/forum/templates/content/images/openid/openid.gif
+++ b/forum/media/images/openid/openid.gif
Binary files differ
diff --git a/forum/templates/content/images/openid/technorati.ico b/forum/media/images/openid/technorati.ico
index fa1083c1..fa1083c1 100644
--- a/forum/templates/content/images/openid/technorati.ico
+++ b/forum/media/images/openid/technorati.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/verisign.ico b/forum/media/images/openid/verisign.ico
index 3953af93..3953af93 100644
--- a/forum/templates/content/images/openid/verisign.ico
+++ b/forum/media/images/openid/verisign.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/vidoop.ico b/forum/media/images/openid/vidoop.ico
index bbd9a0d5..bbd9a0d5 100644
--- a/forum/templates/content/images/openid/vidoop.ico
+++ b/forum/media/images/openid/vidoop.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/wordpress.ico b/forum/media/images/openid/wordpress.ico
index 31b7d2c2..31b7d2c2 100644
--- a/forum/templates/content/images/openid/wordpress.ico
+++ b/forum/media/images/openid/wordpress.ico
Binary files differ
diff --git a/forum/templates/content/images/openid/yahoo.gif b/forum/media/images/openid/yahoo.gif
index 42adbfa5..42adbfa5 100644
--- a/forum/templates/content/images/openid/yahoo.gif
+++ b/forum/media/images/openid/yahoo.gif
Binary files differ
diff --git a/forum/templates/content/images/quest-bg.gif b/forum/media/images/quest-bg.gif
index b7540238..b7540238 100644
--- a/forum/templates/content/images/quest-bg.gif
+++ b/forum/media/images/quest-bg.gif
Binary files differ
diff --git a/forum/templates/content/images/vote-accepted-on.png b/forum/media/images/vote-accepted-on.png
index 2026f3bc..2026f3bc 100644
--- a/forum/templates/content/images/vote-accepted-on.png
+++ b/forum/media/images/vote-accepted-on.png
Binary files differ
diff --git a/forum/templates/content/images/vote-accepted.png b/forum/media/images/vote-accepted.png
index ecd18551..ecd18551 100644
--- a/forum/templates/content/images/vote-accepted.png
+++ b/forum/media/images/vote-accepted.png
Binary files differ
diff --git a/forum/templates/content/images/vote-arrow-down-on.png b/forum/media/images/vote-arrow-down-on.png
index 048dbb44..048dbb44 100644
--- a/forum/templates/content/images/vote-arrow-down-on.png
+++ b/forum/media/images/vote-arrow-down-on.png
Binary files differ
diff --git a/forum/templates/content/images/vote-arrow-down.png b/forum/media/images/vote-arrow-down.png
index e4fdec0a..e4fdec0a 100644
--- a/forum/templates/content/images/vote-arrow-down.png
+++ b/forum/media/images/vote-arrow-down.png
Binary files differ
diff --git a/forum/templates/content/images/vote-arrow-up-on.png b/forum/media/images/vote-arrow-up-on.png
index 56ad0c25..56ad0c25 100644
--- a/forum/templates/content/images/vote-arrow-up-on.png
+++ b/forum/media/images/vote-arrow-up-on.png
Binary files differ
diff --git a/forum/templates/content/images/vote-arrow-up.png b/forum/media/images/vote-arrow-up.png
index 6e9a51c7..6e9a51c7 100644
--- a/forum/templates/content/images/vote-arrow-up.png
+++ b/forum/media/images/vote-arrow-up.png
Binary files differ
diff --git a/forum/templates/content/images/vote-favorite-off.png b/forum/media/images/vote-favorite-off.png
index c1bef074..c1bef074 100644
--- a/forum/templates/content/images/vote-favorite-off.png
+++ b/forum/media/images/vote-favorite-off.png
Binary files differ
diff --git a/forum/templates/content/images/vote-favorite-on.png b/forum/media/images/vote-favorite-on.png
index 1f9c14ab..1f9c14ab 100644
--- a/forum/templates/content/images/vote-favorite-on.png
+++ b/forum/media/images/vote-favorite-on.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/aol.gif b/forum/media/jquery-openid/images/aol.gif
index decc4f12..decc4f12 100644
--- a/forum/templates/content/jquery-openid/images/aol.gif
+++ b/forum/media/jquery-openid/images/aol.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/blogger-1.png b/forum/media/jquery-openid/images/blogger-1.png
index 8b360ea5..8b360ea5 100644
--- a/forum/templates/content/jquery-openid/images/blogger-1.png
+++ b/forum/media/jquery-openid/images/blogger-1.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/blogger.ico b/forum/media/jquery-openid/images/blogger.ico
index 1b9730b0..1b9730b0 100644
--- a/forum/templates/content/jquery-openid/images/blogger.ico
+++ b/forum/media/jquery-openid/images/blogger.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/claimid-0.png b/forum/media/jquery-openid/images/claimid-0.png
index 4a0ea1b3..4a0ea1b3 100644
--- a/forum/templates/content/jquery-openid/images/claimid-0.png
+++ b/forum/media/jquery-openid/images/claimid-0.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/claimid.ico b/forum/media/jquery-openid/images/claimid.ico
index 2b80f491..2b80f491 100644
--- a/forum/templates/content/jquery-openid/images/claimid.ico
+++ b/forum/media/jquery-openid/images/claimid.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/facebook.gif b/forum/media/jquery-openid/images/facebook.gif
index b997b358..b997b358 100644
--- a/forum/templates/content/jquery-openid/images/facebook.gif
+++ b/forum/media/jquery-openid/images/facebook.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/flickr.ico b/forum/media/jquery-openid/images/flickr.ico
index 11f6e07f..11f6e07f 100644
--- a/forum/templates/content/jquery-openid/images/flickr.ico
+++ b/forum/media/jquery-openid/images/flickr.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/flickr.png b/forum/media/jquery-openid/images/flickr.png
index 142405a6..142405a6 100644
--- a/forum/templates/content/jquery-openid/images/flickr.png
+++ b/forum/media/jquery-openid/images/flickr.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/google.gif b/forum/media/jquery-openid/images/google.gif
index 1b6cd07b..1b6cd07b 100644
--- a/forum/templates/content/jquery-openid/images/google.gif
+++ b/forum/media/jquery-openid/images/google.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/livejournal-1.png b/forum/media/jquery-openid/images/livejournal-1.png
index e6436081..e6436081 100644
--- a/forum/templates/content/jquery-openid/images/livejournal-1.png
+++ b/forum/media/jquery-openid/images/livejournal-1.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/livejournal.ico b/forum/media/jquery-openid/images/livejournal.ico
index f3d21ec5..f3d21ec5 100644
--- a/forum/templates/content/jquery-openid/images/livejournal.ico
+++ b/forum/media/jquery-openid/images/livejournal.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/myopenid-2.png b/forum/media/jquery-openid/images/myopenid-2.png
index f64fb8e8..f64fb8e8 100644
--- a/forum/templates/content/jquery-openid/images/myopenid-2.png
+++ b/forum/media/jquery-openid/images/myopenid-2.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/myopenid.ico b/forum/media/jquery-openid/images/myopenid.ico
index ceb06e6a..ceb06e6a 100644
--- a/forum/templates/content/jquery-openid/images/myopenid.ico
+++ b/forum/media/jquery-openid/images/myopenid.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/openid-inputicon.gif b/forum/media/jquery-openid/images/openid-inputicon.gif
index cde836c8..cde836c8 100644
--- a/forum/templates/content/jquery-openid/images/openid-inputicon.gif
+++ b/forum/media/jquery-openid/images/openid-inputicon.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/openid.gif b/forum/media/jquery-openid/images/openid.gif
index c718b0e6..c718b0e6 100644
--- a/forum/templates/content/jquery-openid/images/openid.gif
+++ b/forum/media/jquery-openid/images/openid.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/openidico.png b/forum/media/jquery-openid/images/openidico.png
index ab622669..ab622669 100644
--- a/forum/templates/content/jquery-openid/images/openidico.png
+++ b/forum/media/jquery-openid/images/openidico.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/openidico16.png b/forum/media/jquery-openid/images/openidico16.png
index ad718ac5..ad718ac5 100644
--- a/forum/templates/content/jquery-openid/images/openidico16.png
+++ b/forum/media/jquery-openid/images/openidico16.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/technorati-1.png b/forum/media/jquery-openid/images/technorati-1.png
index f7195240..f7195240 100644
--- a/forum/templates/content/jquery-openid/images/technorati-1.png
+++ b/forum/media/jquery-openid/images/technorati-1.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/technorati.ico b/forum/media/jquery-openid/images/technorati.ico
index fa1083c1..fa1083c1 100644
--- a/forum/templates/content/jquery-openid/images/technorati.ico
+++ b/forum/media/jquery-openid/images/technorati.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/verisign-2.png b/forum/media/jquery-openid/images/verisign-2.png
index c1467008..c1467008 100644
--- a/forum/templates/content/jquery-openid/images/verisign-2.png
+++ b/forum/media/jquery-openid/images/verisign-2.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/verisign.ico b/forum/media/jquery-openid/images/verisign.ico
index 3953af93..3953af93 100644
--- a/forum/templates/content/jquery-openid/images/verisign.ico
+++ b/forum/media/jquery-openid/images/verisign.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/vidoop.ico b/forum/media/jquery-openid/images/vidoop.ico
index bbd9a0d5..bbd9a0d5 100644
--- a/forum/templates/content/jquery-openid/images/vidoop.ico
+++ b/forum/media/jquery-openid/images/vidoop.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/vidoop.png b/forum/media/jquery-openid/images/vidoop.png
index 032c9e98..032c9e98 100644
--- a/forum/templates/content/jquery-openid/images/vidoop.png
+++ b/forum/media/jquery-openid/images/vidoop.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/wordpress.ico b/forum/media/jquery-openid/images/wordpress.ico
index 31b7d2c2..31b7d2c2 100644
--- a/forum/templates/content/jquery-openid/images/wordpress.ico
+++ b/forum/media/jquery-openid/images/wordpress.ico
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/wordpress.png b/forum/media/jquery-openid/images/wordpress.png
index ee29f0cf..ee29f0cf 100644
--- a/forum/templates/content/jquery-openid/images/wordpress.png
+++ b/forum/media/jquery-openid/images/wordpress.png
Binary files differ
diff --git a/forum/templates/content/jquery-openid/images/yahoo.gif b/forum/media/jquery-openid/images/yahoo.gif
index 42adbfa5..42adbfa5 100644
--- a/forum/templates/content/jquery-openid/images/yahoo.gif
+++ b/forum/media/jquery-openid/images/yahoo.gif
Binary files differ
diff --git a/forum/templates/content/jquery-openid/jquery.openid.js b/forum/media/jquery-openid/jquery.openid.js
index 8d1cd204..8d1cd204 100644
--- a/forum/templates/content/jquery-openid/jquery.openid.js
+++ b/forum/media/jquery-openid/jquery.openid.js
diff --git a/forum/templates/content/jquery-openid/openid.css b/forum/media/jquery-openid/openid.css
index 1b7aaf82..1b7aaf82 100644
--- a/forum/templates/content/jquery-openid/openid.css
+++ b/forum/media/jquery-openid/openid.css
diff --git a/forum/templates/content/js/com.cnprog.admin.js b/forum/media/js/com.cnprog.admin.js
index 39dff48c..39dff48c 100644
--- a/forum/templates/content/js/com.cnprog.admin.js
+++ b/forum/media/js/com.cnprog.admin.js
diff --git a/forum/templates/content/js/com.cnprog.editor.js b/forum/media/js/com.cnprog.editor.js
index 18cc5166..18cc5166 100644
--- a/forum/templates/content/js/com.cnprog.editor.js
+++ b/forum/media/js/com.cnprog.editor.js
diff --git a/forum/templates/content/js/com.cnprog.i18n.js b/forum/media/js/com.cnprog.i18n.js
index da9bf396..da9bf396 100644
--- a/forum/templates/content/js/com.cnprog.i18n.js
+++ b/forum/media/js/com.cnprog.i18n.js
diff --git a/forum/templates/content/js/com.cnprog.post.js b/forum/media/js/com.cnprog.post.js
index 668c80fe..5469a374 100644
--- a/forum/templates/content/js/com.cnprog.post.js
+++ b/forum/media/js/com.cnprog.post.js
@@ -153,17 +153,17 @@ var Vote = function(){
var setVoteImage = function(voteType, undo, object){
var flag = undo ? "" : "-on";
var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
- object.attr("src", scriptUrl + "content/images/vote-arrow-"+ arrow + flag +".png");
+ object.attr("src", scriptUrl + "media/images/vote-arrow-"+ arrow + flag +".png");
// if undo voting, then undo the pair of arrows.
if(undo){
if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
- $(getQuestionVoteUpButton()).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
- $(getQuestionVoteDownButton()).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
+ $(getQuestionVoteUpButton()).attr("src", scriptUrl + "media/images/vote-arrow-up.png");
+ $(getQuestionVoteDownButton()).attr("src", scriptUrl + "media/images/vote-arrow-down.png");
}
else{
- $(getAnswerVoteUpButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
- $(getAnswerVoteDownButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
+ $(getAnswerVoteUpButton(postId)).attr("src", scriptUrl + "media/images/vote-arrow-up.png");
+ $(getAnswerVoteDownButton(postId)).attr("src", scriptUrl + "media/images/vote-arrow-down.png");
}
}
};
@@ -259,19 +259,19 @@ var Vote = function(){
showMessage(object, acceptOwnAnswerMessage);
}
else if(data.status == "1"){
- object.attr("src", scriptUrl + "content/images/vote-accepted.png");
+ object.attr("src", scriptUrl + "media/images/vote-accepted.png");
$("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
$("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
}
else if(data.success == "1"){
var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
- $(acceptedButtons).attr("src", scriptUrl + "content/images/vote-accepted.png");
+ $(acceptedButtons).attr("src", scriptUrl + "media/images/vote-accepted.png");
var answers = ("div[id^="+answerContainerIdPrefix +"]");
$(answers).removeClass("accepted-answer");
var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
$(commentLinks).removeClass("comment-link-accepted");
- object.attr("src", scriptUrl + "content/images/vote-accepted-on.png");
+ object.attr("src", scriptUrl + "media/images/vote-accepted-on.png");
$("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
$("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
}
@@ -285,7 +285,7 @@ var Vote = function(){
showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
}
else if(data.status == "1"){
- object.attr("src", scriptUrl + "content/images/vote-favorite-off.png");
+ object.attr("src", scriptUrl + "media/images/vote-favorite-off.png");
var fav = getFavoriteNumber();
fav.removeClass("my-favorite-number");
if(data.count === 0){
@@ -294,7 +294,7 @@ var Vote = function(){
fav.text(data.count);
}
else if(data.success == "1"){
- object.attr("src", scriptUrl + "content/images/vote-favorite-on.png");
+ object.attr("src", scriptUrl + "media/images/vote-favorite-on.png");
var fav = getFavoriteNumber();
fav.text(data.count);
fav.addClass("my-favorite-number");
@@ -538,8 +538,8 @@ function createComments(type) {
var renderDeleteCommentIcon = function(post_id, delete_url){
if (canPostComments(post_id)){
var html = '';
- var img = scriptUrl + "content/images/close-small.png";
- var imgHover = scriptUrl + "content/images/close-small-hover.png";
+ var img = scriptUrl + "media/images/close-small.png";
+ var imgHover = scriptUrl + "media/images/close-small-hover.png";
html += '<img class="delete-icon" onclick="' + objectType + 'Comments.deleteComment($(this), ' + post_id + ', \'' + delete_url + '\')" src="' + img;
html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img;
html += '\')" title="' + $.i18n._('delete this comment') + '" />';
@@ -624,12 +624,12 @@ function createComments(type) {
delete_icon.click(function(){CommentsClass.deleteComment($(this),comment_id,delete_url);});
delete_icon.unbind('mouseover').bind('mouseover',
function(){
- $(this).attr('src',scriptUrl + 'content/images/close-small-hover.png');
+ $(this).attr('src',scriptUrl + 'media/images/close-small-hover.png');
}
);
delete_icon.unbind('mouseout').bind('mouseout',
function(){
- $(this).attr('src',scriptUrl + 'content/images/close-small.png');
+ $(this).attr('src',scriptUrl + 'media/images/close-small.png');
}
);
}
diff --git a/forum/templates/content/js/com.cnprog.tag_selector.js b/forum/media/js/com.cnprog.tag_selector.js
index 06aefcfc..5cfc3561 100644
--- a/forum/templates/content/js/com.cnprog.tag_selector.js
+++ b/forum/media/js/com.cnprog.tag_selector.js
@@ -45,10 +45,10 @@ function pickedTags(){
var setupTagDeleteEvents = function(obj,tag_store,tagname,reason,send_ajax){
obj.unbind('mouseover').bind('mouseover', function(){
- $(this).attr('src', scriptUrl + 'content/images/close-small-hover.png');
+ $(this).attr('src', scriptUrl + 'media/images/close-small-hover.png');
});
obj.unbind('mouseout').bind('mouseout', function(){
- $(this).attr('src', scriptUrl + 'content/images/close-small-dark.png');
+ $(this).attr('src', scriptUrl + 'media/images/close-small-dark.png');
});
obj.click( function(){
unpickTag(tag_store,tagname,reason,send_ajax);
@@ -88,7 +88,7 @@ function pickedTags(){
tag_link.html(tagname);
var del_link = $('<img></img>');
del_link.addClass('delete-icon');
- del_link.attr('src', scriptUrl + 'content/images/close-small-dark.png');
+ del_link.attr('src', scriptUrl + 'media/images/close-small-dark.png');
setupTagDeleteEvents(del_link, to_target, tagname, reason, true);
diff --git a/forum/templates/content/js/com.cnprog.utils.js b/forum/media/js/com.cnprog.utils.js
index 4c3aafba..7d8ea1f8 100644
--- a/forum/templates/content/js/com.cnprog.utils.js
+++ b/forum/media/js/com.cnprog.utils.js
@@ -37,7 +37,7 @@ var notify = function() {
function appendLoader(containerSelector) {
$(containerSelector).append('<img class="ajax-loader" ' +
- 'src="' + scriptUrl + 'content/images/indicator.gif" title="' +
+ 'src="' + scriptUrl + 'media/images/indicator.gif" title="' +
$.i18n._('loading...') +
'" alt="' +
$.i18n._('loading...') +
diff --git a/forum/templates/content/js/compress.bat b/forum/media/js/compress.bat
index 5b2673cf..5b2673cf 100644
--- a/forum/templates/content/js/compress.bat
+++ b/forum/media/js/compress.bat
diff --git a/forum/templates/content/js/excanvas.pack.js b/forum/media/js/excanvas.pack.js
index 71d6fbd9..71d6fbd9 100644
--- a/forum/templates/content/js/excanvas.pack.js
+++ b/forum/media/js/excanvas.pack.js
diff --git a/forum/templates/content/js/flot-build.bat b/forum/media/js/flot-build.bat
index f9f32cb7..f9f32cb7 100644
--- a/forum/templates/content/js/flot-build.bat
+++ b/forum/media/js/flot-build.bat
diff --git a/forum/templates/content/js/jquery-1.2.6.js b/forum/media/js/jquery-1.2.6.js
index 88e661ee..88e661ee 100644
--- a/forum/templates/content/js/jquery-1.2.6.js
+++ b/forum/media/js/jquery-1.2.6.js
diff --git a/forum/templates/content/js/jquery-1.2.6.min.js b/forum/media/js/jquery-1.2.6.min.js
index 82b98e1d..82b98e1d 100644
--- a/forum/templates/content/js/jquery-1.2.6.min.js
+++ b/forum/media/js/jquery-1.2.6.min.js
diff --git a/forum/templates/content/js/jquery.ajaxfileupload.js b/forum/media/js/jquery.ajaxfileupload.js
index 75292776..75292776 100644
--- a/forum/templates/content/js/jquery.ajaxfileupload.js
+++ b/forum/media/js/jquery.ajaxfileupload.js
diff --git a/forum/templates/content/js/jquery.flot.js b/forum/media/js/jquery.flot.js
index 83b61929..83b61929 100644
--- a/forum/templates/content/js/jquery.flot.js
+++ b/forum/media/js/jquery.flot.js
diff --git a/forum/templates/content/js/jquery.flot.pack.js b/forum/media/js/jquery.flot.pack.js
index a5714f12..a5714f12 100644
--- a/forum/templates/content/js/jquery.flot.pack.js
+++ b/forum/media/js/jquery.flot.pack.js
diff --git a/forum/templates/content/js/jquery.form.js b/forum/media/js/jquery.form.js
index 443114fd..443114fd 100644
--- a/forum/templates/content/js/jquery.form.js
+++ b/forum/media/js/jquery.form.js
diff --git a/forum/templates/content/js/jquery.i18n.js b/forum/media/js/jquery.i18n.js
index 0a155a31..0a155a31 100644
--- a/forum/templates/content/js/jquery.i18n.js
+++ b/forum/media/js/jquery.i18n.js
diff --git a/forum/templates/content/js/jquery.openid.js b/forum/media/js/jquery.openid.js
index 17e58e04..af7d8cb9 100644
--- a/forum/templates/content/js/jquery.openid.js
+++ b/forum/media/js/jquery.openid.js
@@ -81,7 +81,7 @@ var openid = {
cookie_name: 'openid_provider',
cookie_path: '/',
- img_path: '/content/images/openid/',
+ img_path: '/media/images/openid/',
input_id: null,
provider_url: null,
diff --git a/forum/templates/content/js/jquery.validate.pack.js b/forum/media/js/jquery.validate.pack.js
index 49134500..49134500 100644
--- a/forum/templates/content/js/jquery.validate.pack.js
+++ b/forum/media/js/jquery.validate.pack.js
diff --git a/forum/templates/content/js/se_hilite.js b/forum/media/js/se_hilite.js
index 42e99c8e..42e99c8e 100644
--- a/forum/templates/content/js/se_hilite.js
+++ b/forum/media/js/se_hilite.js
diff --git a/forum/templates/content/js/se_hilite_src.js b/forum/media/js/se_hilite_src.js
index b604f156..b604f156 100644
--- a/forum/templates/content/js/se_hilite_src.js
+++ b/forum/media/js/se_hilite_src.js
diff --git a/forum/templates/content/js/wmd/images/wmd-buttons.png b/forum/media/js/wmd/images/wmd-buttons.png
index 50b37090..50b37090 100644
--- a/forum/templates/content/js/wmd/images/wmd-buttons.png
+++ b/forum/media/js/wmd/images/wmd-buttons.png
Binary files differ
diff --git a/forum/templates/content/js/wmd/showdown-min.js b/forum/media/js/wmd/showdown-min.js
index 073613b1..073613b1 100644
--- a/forum/templates/content/js/wmd/showdown-min.js
+++ b/forum/media/js/wmd/showdown-min.js
diff --git a/forum/templates/content/js/wmd/showdown.js b/forum/media/js/wmd/showdown.js
index 3f4b9947..3f4b9947 100644
--- a/forum/templates/content/js/wmd/showdown.js
+++ b/forum/media/js/wmd/showdown.js
diff --git a/forum/media/js/wmd/wmd-min.js b/forum/media/js/wmd/wmd-min.js
new file mode 100644
index 00000000..aa643f1a
--- /dev/null
+++ b/forum/media/js/wmd/wmd-min.js
@@ -0,0 +1 @@
+var Attacklab=Attacklab||{};Attacklab.wmdBase=function(){var y=top.Attacklab;var E=top.document;var s=top.RegExp;var l=top.navigator;y.Util={};y.Position={};y.Command={};y.Global={};var a=y.Util;var C=y.Position;var h=y.Command;var v=y.Global;v.isIE=/msie/.test(l.userAgent.toLowerCase());v.isIE_5or6=/msie 6/.test(l.userAgent.toLowerCase())||/msie 5/.test(l.userAgent.toLowerCase());v.isIE_7plus=v.isIE&&!v.isIE_5or6;v.isOpera=/opera/.test(l.userAgent.toLowerCase());v.isKonqueror=/konqueror/.test(l.userAgent.toLowerCase());var c="粗体 <strong> Ctrl-B";var f="斜体 <em> Ctrl-I";var z="超链接 <a> Ctrl-L";var u="引用 <blockquote> Ctrl-.";var e="代码 <pre><code> Ctrl-K";var d="图片 <img> Ctrl-G";var q="数字编号列表 <ol> Ctrl-O";var t="项目符号列表 <ul> Ctrl-U";var i="标题 <h1>/<h2> Ctrl-H";var p="水平线 <hr> Ctrl-R";var m="撤销 Ctrl-Z";var j="重做 Ctrl-Y";var B="<p style='margin-top: 0px'><b>输入图片地址</b></p><p>示例:<br />http://www.cnprog.com/images/temp.jpg \"我的截图\"</p>";var D="<p style='margin-top: 0px'><b>输入Web地址</b></p><p>示例:<br />http://www.cnprog.com/ \"我的网站\"</p>";var n='<div>或者上传本地图片:</div><input type="file" name="file-upload" id="file-upload" size="26" onchange="return ajaxFileUpload($(\'#image-url\'));"/><br><img id="loading" src="/media/images/indicator.gif" style="display:none;"/>';var b="http://";var g="http://";var o="images/";var A=500;var x=100;var k="http://wmd-editor.com/";var r="WMD website";var w="_blank";y.PanelCollection=function(){this.buttonBar=E.getElementById("wmd-button-bar");this.preview=E.getElementById("previewer");this.output=E.getElementById("wmd-output");this.input=E.getElementById("editor")};y.panels=undefined;y.ieCachedRange=null;y.ieRetardedClick=false;a.isVisible=function(F){if(window.getComputedStyle){return window.getComputedStyle(F,null).getPropertyValue("display")!=="none"}else{if(F.currentStyle){return F.currentStyle.display!=="none"}}};a.addEvent=function(G,F,H){if(G.attachEvent){G.attachEvent("on"+F,H)}else{G.addEventListener(F,H,false)}};a.removeEvent=function(G,F,H){if(G.detachEvent){G.detachEvent("on"+F,H)}else{G.removeEventListener(F,H,false)}};a.fixEolChars=function(F){F=F.replace(/\r\n/g,"\n");F=F.replace(/\r/g,"\n");return F};a.extendRegExp=function(H,J,G){if(J===null||J===undefined){J=""}if(G===null||G===undefined){G=""}var I=H.toString();var F;I=I.replace(/\/([gim]*)$/,"");F=s.$1;I=I.replace(/(^\/|\/$)/g,"");I=J+I+G;return new s(I,F)};a.createImage=function(F){var H=o+F;var G=E.createElement("img");G.className="wmd-button";G.src=H;return G};a.prompt=function(M,P,H){var I;var F;var K;var J=0;if(arguments.length==4){J=arguments[3]}if(P===undefined){P=""}var L=function(Q){var R=(Q.charCode||Q.keyCode);if(R===27){N(true)}};var N=function(Q){a.removeEvent(E.body,"keydown",L);var R=K.value;if(Q){R=null}else{R=R.replace("http://http://","http://");R=R.replace("http://https://","https://");R=R.replace("http://ftp://","ftp://");if(R.indexOf("http://")===-1&&R.indexOf("ftp://")===-1){R="http://"+R}}I.parentNode.removeChild(I);F.parentNode.removeChild(F);H(R);return false};var G=function(){F=E.createElement("div");F.className="wmd-prompt-background";style=F.style;style.position="absolute";style.top="0";style.zIndex="1000";if(v.isKonqueror){style.backgroundColor="transparent"}else{if(v.isIE){style.filter="alpha(opacity=50)"}else{style.opacity="0.5"}}var Q=C.getPageSize();style.height=Q[1]+"px";if(v.isIE){style.left=E.documentElement.scrollLeft;style.width=E.documentElement.clientWidth}else{style.left="0";style.width="100%"}E.body.appendChild(F)};var O=function(){I=E.createElement("div");I.className="wmd-prompt-dialog";I.style.padding="10px;";I.style.position="fixed";I.style.width="400px";I.style.zIndex="1001";var Q=E.createElement("div");Q.innerHTML=M;Q.style.padding="5px";I.appendChild(Q);var S=E.createElement("form");S.onsubmit=function(){return N(false)};style=S.style;style.padding="0";style.margin="0";style.cssFloat="left";style.width="100%";style.textAlign="center";style.position="relative";I.appendChild(S);K=E.createElement("input");if(J==1){K.id="image-url"}K.type="text";K.value=P;style=K.style;style.display="block";style.width="80%";style.marginLeft=style.marginRight="auto";S.appendChild(K);if(J==1){var R=E.createElement("div");R.innerHTML=n;R.style.padding="5px";S.appendChild(R)}var U=E.createElement("input");U.type="button";U.onclick=function(){return N(false)};U.value="OK";style=U.style;style.margin="10px";style.display="inline";style.width="7em";var T=E.createElement("input");T.type="button";T.onclick=function(){return N(true)};T.value="Cancel";style=T.style;style.margin="10px";style.display="inline";style.width="7em";if(/mac/.test(l.platform.toLowerCase())){S.appendChild(T);S.appendChild(U)}else{S.appendChild(U);S.appendChild(T)}a.addEvent(E.body,"keydown",L);I.style.top="50%";I.style.left="50%";I.style.display="block";if(v.isIE_5or6){I.style.position="absolute";I.style.top=E.documentElement.scrollTop+200+"px";I.style.left="50%"}E.body.appendChild(I);I.style.marginTop=-(C.getHeight(I)/2)+"px";I.style.marginLeft=-(C.getWidth(I)/2)+"px"};G();top.setTimeout(function(){O();var R=P.length;if(K.selectionStart!==undefined){K.selectionStart=0;K.selectionEnd=R}else{if(K.createTextRange){var Q=K.createTextRange();Q.collapse(false);Q.moveStart("character",-R);Q.moveEnd("character",R);Q.select()}}K.focus()},0)};C.getTop=function(H,G){var F=H.offsetTop;if(!G){while(H=H.offsetParent){F+=H.offsetTop}}return F};C.getHeight=function(F){return F.offsetHeight||F.scrollHeight};C.getWidth=function(F){return F.offsetWidth||F.scrollWidth};C.getPageSize=function(){var G,H;var F,K;if(self.innerHeight&&self.scrollMaxY){G=E.body.scrollWidth;H=self.innerHeight+self.scrollMaxY}else{if(E.body.scrollHeight>E.body.offsetHeight){G=E.body.scrollWidth;H=E.body.scrollHeight}else{G=E.body.offsetWidth;H=E.body.offsetHeight}}if(self.innerHeight){F=self.innerWidth;K=self.innerHeight}else{if(E.documentElement&&E.documentElement.clientHeight){F=E.documentElement.clientWidth;K=E.documentElement.clientHeight}else{if(E.body){F=E.body.clientWidth;K=E.body.clientHeight}}}var J=Math.max(G,F);var I=Math.max(H,K);return[J,I,F,K]};y.inputPoller=function(O,H){var F=this;var K=y.panels.input;var G;var I;var L;var J;this.tick=function(){if(!a.isVisible(K)){return}if(K.selectionStart||K.selectionStart===0){var Q=K.selectionStart;var P=K.selectionEnd;if(Q!=G||P!=I){G=Q;I=P;if(L!=K.value){L=K.value;return true}}}return false};var N=function(){if(!a.isVisible(K)){return}if(F.tick()){O()}};var M=function(){J=top.setInterval(N,H)};this.destroy=function(){top.clearInterval(J)};M()};y.undoManager=function(Q){var U=this;var O=[];var M=0;var L="none";var G;var R;var H;var K;var F=function(W,V){if(L!=W){L=W;if(!V){I()}}if(!v.isIE||L!="moving"){H=top.setTimeout(N,1)}else{K=null}};var N=function(){K=new y.TextareaState();R.tick();H=undefined};this.setCommandMode=function(){L="command";I();H=top.setTimeout(N,0)};this.canUndo=function(){return M>1};this.canRedo=function(){if(O[M+1]){return true}return false};this.undo=function(){if(U.canUndo()){if(G){G.restore();G=null}else{O[M]=new y.TextareaState();O[--M].restore();if(Q){Q()}}}L="none";y.panels.input.focus();N()};this.redo=function(){if(U.canRedo()){O[++M].restore();if(Q){Q()}}L="none";y.panels.input.focus();N()};var I=function(){var V=K||new y.TextareaState();if(!V){return false}if(L=="moving"){if(!G){G=V}return}if(G){if(O[M-1].text!=G.text){O[M++]=G}G=null}O[M++]=V;O[M+1]=null;if(Q){Q()}};var P=function(V){var X=false;if(V.ctrlKey||V.metaKey){var W=V.charCode||V.keyCode;var Y=String.fromCharCode(W);switch(Y){case"y":U.redo();X=true;break;case"z":if(!V.shiftKey){U.undo()}else{U.redo()}X=true;break}}if(X){if(V.preventDefault){V.preventDefault()}if(top.event){top.event.returnValue=false}return}};var T=function(V){if(!V.ctrlKey&&!V.metaKey){var W=V.keyCode;if((W>=33&&W<=40)||(W>=63232&&W<=63235)){F("moving")}else{if(W==8||W==46||W==127){F("deleting")}else{if(W==13){F("newlines")}else{if(W==27){F("escape")}else{if((W<16||W>20)&&W!=91){F("typing")}}}}}}};var J=function(){a.addEvent(y.panels.input,"keypress",function(W){if((W.ctrlKey||W.metaKey)&&(W.keyCode==89||W.keyCode==90)){W.preventDefault()}});var V=function(){if(v.isIE||(K&&K.text!=y.panels.input.value)){if(H==undefined){L="paste";I();N()}}};R=new y.inputPoller(V,x);a.addEvent(y.panels.input,"keydown",P);a.addEvent(y.panels.input,"keydown",T);a.addEvent(y.panels.input,"mousedown",function(){F("moving")});y.panels.input.onpaste=V;y.panels.input.ondrop=V};var S=function(){J();N();I()};this.destroy=function(){if(R){R.destroy()}};S()};y.editor=function(O){if(!O){O=function(){}}var L=y.panels.input;var I=0;var P=this;var K;var R;var G;var M;var N;var U=function(W){L.focus();if(W.textOp){if(N){N.setCommandMode()}var Y=new y.TextareaState();if(!Y){return}var Z=Y.getChunks();var V=function(){L.focus();if(Z){Y.setChunks(Z)}Y.restore();O()};var X=W.textOp(Z,V);if(!X){V()}}if(W.execute){W.execute(P)}};var S=function(){if(N){F(document.getElementById("wmd-undo-button"),N.canUndo());F(document.getElementById("wmd-redo-button"),N.canRedo())}};var F=function(V,X){var Y="0px";var Z="-20px";var W="-40px";if(X){V.style.backgroundPosition=V.XShift+" "+Y;V.onmouseover=function(){this.style.backgroundPosition=this.XShift+" "+W};V.onmouseout=function(){this.style.backgroundPosition=this.XShift+" "+Y};if(v.isIE){V.onmousedown=function(){y.ieRetardedClick=true;y.ieCachedRange=document.selection.createRange()}}if(!V.isHelp){V.onclick=function(){if(this.onmouseout){this.onmouseout()}U(this);return false}}}else{V.style.backgroundPosition=V.XShift+" "+Z;V.onmouseover=V.onmouseout=V.onclick=function(){}}};var J=function(){var Z=document.getElementById("wmd-button-bar");var W="0px";var Y="-20px";var ae="-40px";var ak=document.createElement("ul");ak.id="wmd-button-row";ak=Z.appendChild(ak);var ad=document.createElement("li");ad.className="wmd-button";ad.id="wmd-bold-button";ad.title=c;ad.XShift="0px";ad.textOp=h.doBold;F(ad,true);ak.appendChild(ad);var ac=document.createElement("li");ac.className="wmd-button";ac.id="wmd-italic-button";ac.title=f;ac.XShift="-20px";ac.textOp=h.doItalic;F(ac,true);ak.appendChild(ac);var ah=document.createElement("li");ah.className="wmd-spacer";ah.id="wmd-spacer1";ak.appendChild(ah);var ai=document.createElement("li");ai.className="wmd-button";ai.id="wmd-link-button";ai.title=z;ai.XShift="-40px";ai.textOp=function(ap,aq){return h.doLinkOrImage(ap,aq,false)};F(ai,true);ak.appendChild(ai);var al=document.createElement("li");al.className="wmd-button";al.id="wmd-quote-button";al.title=u;al.XShift="-60px";al.textOp=h.doBlockquote;F(al,true);ak.appendChild(al);var am=document.createElement("li");am.className="wmd-button";am.id="wmd-code-button";am.title=e;am.XShift="-80px";am.textOp=h.doCode;F(am,true);ak.appendChild(am);var aa=document.createElement("li");aa.className="wmd-button";aa.id="wmd-image-button";aa.title=d;aa.XShift="-100px";aa.textOp=function(ap,aq){return h.doLinkOrImage(ap,aq,true)};F(aa,true);ak.appendChild(aa);var ag=document.createElement("li");ag.className="wmd-spacer";ag.id="wmd-spacer2";ak.appendChild(ag);var ab=document.createElement("li");ab.className="wmd-button";ab.id="wmd-olist-button";ab.title=q;ab.XShift="-120px";ab.textOp=function(ap,aq){h.doList(ap,aq,true)};F(ab,true);ak.appendChild(ab);var ao=document.createElement("li");ao.className="wmd-button";ao.id="wmd-ulist-button";ao.title=t;ao.XShift="-140px";ao.textOp=function(ap,aq){h.doList(ap,aq,false)};F(ao,true);ak.appendChild(ao);var aj=document.createElement("li");aj.className="wmd-button";aj.id="wmd-heading-button";aj.title=i;aj.XShift="-160px";aj.textOp=h.doHeading;F(aj,true);ak.appendChild(aj);var X=document.createElement("li");X.className="wmd-button";X.id="wmd-hr-button";X.title=p;X.XShift="-180px";X.textOp=h.doHorizontalRule;F(X,true);ak.appendChild(X);var af=document.createElement("li");af.className="wmd-spacer";af.id="wmd-spacer3";ak.appendChild(af);var V=document.createElement("li");V.className="wmd-button";V.id="wmd-undo-button";V.title=m;V.XShift="-200px";V.execute=function(ap){ap.undo()};F(V,true);ak.appendChild(V);var an=document.createElement("li");an.className="wmd-button";an.id="wmd-redo-button";an.title=j;if(/win/.test(l.platform.toLowerCase())){an.title=j}else{an.title="重做 - Ctrl+Shift+Z"}an.XShift="-220px";an.execute=function(ap){ap.redo()};F(an,true);ak.appendChild(an);S()};var H=function(){if(/\?noundo/.test(E.location.href)){y.nativeUndo=true}if(!y.nativeUndo){N=new y.undoManager(function(){O();S()})}J();var W="keydown";if(v.isOpera){W="keypress"}a.addEvent(L,W,function(Y){if(Y.ctrlKey||Y.metaKey){var Z=Y.charCode||Y.keyCode;var X=String.fromCharCode(Z).toLowerCase();if(Z===46){X=""}if(Z===190){X="."}switch(X){case"b":U(document.getElementById("wmd-bold-button"));break;case"i":U(document.getElementById("wmd-italic-button"));break;case"l":U(document.getElementById("wmd-link-button"));break;case".":U(document.getElementById("wmd-quote-button"));break;case"k":U(document.getElementById("wmd-code-button"));break;case"g":U(document.getElementById("wmd-image-button"));break;case"o":U(document.getElementById("wmd-olist-button"));break;case"u":U(document.getElementById("wmd-ulist-button"));break;case"h":U(document.getElementById("wmd-heading-button"));break;case"r":U(document.getElementById("wmd-hr-button"));break;case"y":U(document.getElementById("wmd-redo-button"));break;case"z":if(Y.shiftKey){U(document.getElementById("wmd-redo-button"))}else{U(document.getElementById("wmd-undo-button"))}break;default:return}if(Y.preventDefault){Y.preventDefault()}if(top.event){top.event.returnValue=false}}});a.addEvent(L,"keyup",function(X){if(X.shiftKey&&!X.ctrlKey&&!X.metaKey){var Y=X.charCode||X.keyCode;if(Y===13){fakeButton={};fakeButton.textOp=h.doAutoindent;U(fakeButton)}}});if(L.form){var V=L.form.onsubmit;L.form.onsubmit=function(){Q();if(V){return V.apply(this,arguments)}}}};var Q=function(){if(y.showdown){var V=new y.showdown.converter()}var W=L.value;var X=function(){L.value=W};if(!/markdown/.test(y.wmd_env.output.toLowerCase())){if(V){L.value=V.makeHtml(W);top.setTimeout(X,0)}}return true};this.undo=function(){if(N){N.undo()}};this.redo=function(){if(N){N.redo()}};var T=function(){H()};this.destroy=function(){if(N){N.destroy()}if(G.parentNode){G.parentNode.removeChild(G)}if(L){L.style.marginTop=""}top.clearInterval(M)};T()};y.TextareaState=function(){var F=this;var G=y.panels.input;this.init=function(){if(!a.isVisible(G)){return}this.setInputAreaSelectionStartEnd();this.scrollTop=G.scrollTop;if(!this.text&&G.selectionStart||G.selectionStart===0){this.text=G.value}};this.setInputAreaSelection=function(){if(!a.isVisible(G)){return}if(G.selectionStart!==undefined&&!v.isOpera){G.focus();G.selectionStart=F.start;G.selectionEnd=F.end;G.scrollTop=F.scrollTop}else{if(E.selection){if(E.activeElement&&E.activeElement!==G){return}G.focus();var H=G.createTextRange();H.moveStart("character",-G.value.length);H.moveEnd("character",-G.value.length);H.moveEnd("character",F.end);H.moveStart("character",F.start);H.select()}}};this.setInputAreaSelectionStartEnd=function(){if(G.selectionStart||G.selectionStart===0){F.start=G.selectionStart;F.end=G.selectionEnd}else{if(E.selection){F.text=a.fixEolChars(G.value);var K;if(y.ieRetardedClick&&y.ieCachedRange){K=y.ieCachedRange;y.ieRetardedClick=false}else{K=E.selection.createRange()}var L=a.fixEolChars(K.text);var J="\x07";var I=J+L+J;K.text=I;var M=a.fixEolChars(G.value);K.moveStart("character",-I.length);K.text=L;F.start=M.indexOf(J);F.end=M.lastIndexOf(J)-J.length;var H=F.text.length-a.fixEolChars(G.value).length;if(H){K.moveStart("character",-L.length);while(H--){L+="\n";F.end+=1}K.text=L}this.setInputAreaSelection()}}};this.restore=function(){if(F.text!=undefined&&F.text!=G.value){G.value=F.text}this.setInputAreaSelection();G.scrollTop=F.scrollTop};this.getChunks=function(){var H=new y.Chunks();H.before=a.fixEolChars(F.text.substring(0,F.start));H.startTag="";H.selection=a.fixEolChars(F.text.substring(F.start,F.end));H.endTag="";H.after=a.fixEolChars(F.text.substring(F.end));H.scrollTop=F.scrollTop;return H};this.setChunks=function(H){H.before=H.before+H.startTag;H.after=H.endTag+H.after;if(v.isOpera){H.before=H.before.replace(/\n/g,"\r\n");H.selection=H.selection.replace(/\n/g,"\r\n");H.after=H.after.replace(/\n/g,"\r\n")}this.start=H.before.length;this.end=H.before.length+H.selection.length;this.text=H.before+H.selection+H.after;this.scrollTop=H.scrollTop};this.init()};y.Chunks=function(){};y.Chunks.prototype.findTags=function(G,I){var F=this;var H;if(G){H=a.extendRegExp(G,"","$");this.before=this.before.replace(H,function(J){F.startTag=F.startTag+J;return""});H=a.extendRegExp(G,"^","");this.selection=this.selection.replace(H,function(J){F.startTag=F.startTag+J;return""})}if(I){H=a.extendRegExp(I,"","$");this.selection=this.selection.replace(H,function(J){F.endTag=J+F.endTag;return""});H=a.extendRegExp(I,"^","");this.after=this.after.replace(H,function(J){F.endTag=J+F.endTag;return""})}};y.Chunks.prototype.trimWhitespace=function(F){this.selection=this.selection.replace(/^(\s*)/,"");if(!F){this.before+=s.$1}this.selection=this.selection.replace(/(\s*)$/,"");if(!F){this.after=s.$1+this.after}};y.Chunks.prototype.skipLines=function(H,G,F){if(H===undefined){H=1}if(G===undefined){G=1}H++;G++;var I;var J;this.selection=this.selection.replace(/(^\n*)/,"");this.startTag=this.startTag+s.$1;this.selection=this.selection.replace(/(\n*$)/,"");this.endTag=this.endTag+s.$1;this.startTag=this.startTag.replace(/(^\n*)/,"");this.before=this.before+s.$1;this.endTag=this.endTag.replace(/(\n*$)/,"");this.after=this.after+s.$1;if(this.before){I=J="";while(H--){I+="\\n?";J+="\n"}if(F){I="\\n*"}this.before=this.before.replace(new s(I+"$",""),J)}if(this.after){I=J="";while(G--){I+="\\n?";J+="\n"}if(F){I="\\n*"}this.after=this.after.replace(new s(I,""),J)}};h.prefixes="(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)";h.unwrap=function(G){var F=new s("([^\\n])\\n(?!(\\n|"+h.prefixes+"))","g");G.selection=G.selection.replace(F,"$1 $2")};h.wrap=function(G,F){h.unwrap(G);var H=new s("(.{1,"+F+"})( +|$\\n?)","gm");G.selection=G.selection.replace(H,function(I,J){if(new s("^"+h.prefixes,"").test(I)){return I}return J+"\n"});G.selection=G.selection.replace(/\s+$/,"")};h.doBold=function(F,G){return h.doBorI(F,G,2,"strong text")};h.doItalic=function(F,G){return h.doBorI(F,G,1,"emphasized text")};h.doBorI=function(L,J,K,F){L.trimWhitespace();L.selection=L.selection.replace(/\n{2,}/g,"\n");L.before.search(/(\**$)/);var I=s.$1;L.after.search(/(^\**)/);var G=s.$1;var M=Math.min(I.length,G.length);if((M>=K)&&(M!=2||K!=1)){L.before=L.before.replace(s("[*]{"+K+"}$",""),"");L.after=L.after.replace(s("^[*]{"+K+"}",""),"")}else{if(!L.selection&&G){L.after=L.after.replace(/^([*_]*)/,"");L.before=L.before.replace(/(\s?)$/,"");var H=s.$1;L.before=L.before+G+H}else{if(!L.selection&&!G){L.selection=F}var N=K<=1?"*":"**";L.before=L.before+N;L.after=N+L.after}}return};h.stripLinkDefs=function(G,F){G=G.replace(/^[ ]{0,3}\[(\d+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|$)/gm,function(K,L,H,I,J){F[L]=K.replace(/\s*$/,"");if(I){F[L]=K.replace(/["(](.+?)[")]$/,"");return I+J}return""});return G};h.addLinkDef=function(M,I){var F=0;var H={};M.before=h.stripLinkDefs(M.before,H);M.selection=h.stripLinkDefs(M.selection,H);M.after=h.stripLinkDefs(M.after,H);var G="";var L=/(\[(?:\[[^\]]*\]|[^\[\]])*\][ ]?(?:\n[ ]*)?\[)(\d+)(\])/g;var K=function(O){F++;O=O.replace(/^[ ]{0,3}\[(\d+)\]:/," ["+F+"]:");G+="\n"+O};var J=function(P,Q,R,O){if(H[R]){K(H[R]);return Q+F+O}return P};M.before=M.before.replace(L,J);if(I){K(I)}else{M.selection=M.selection.replace(L,J)}var N=F;M.after=M.after.replace(L,J);if(M.after){M.after=M.after.replace(/\n*$/,"")}if(!M.after){M.selection=M.selection.replace(/\n*$/,"")}M.after+="\n\n"+G;return N};h.doLinkOrImage=function(F,G,I){F.trimWhitespace();F.findTags(/\s*!?\[/,/\][ ]?(?:\n[ ]*)?(\[.*?\])?/);if(F.endTag.length>1){F.startTag=F.startTag.replace(/!?\[/,"");F.endTag="";h.addLinkDef(F,null)}else{if(/\n\n/.test(F.selection)){h.addLinkDef(F,null);return}var H=function(L){if(L!==null){F.startTag=F.endTag="";var K=" [999]: "+L;var J=h.addLinkDef(F,K);F.startTag=I?"![":"[";F.endTag="]["+J+"]";if(!F.selection){if(I){F.selection="alt text"}else{F.selection="link text"}}}G()};if(I){a.prompt(B,b,H,1)}else{a.prompt(D,g,H)}return true}};a.makeAPI=function(){y.wmd={};y.wmd.editor=y.editor;y.wmd.previewManager=y.previewManager};a.startEditor=function(){if(y.wmd_env.autostart===false){a.makeAPI();return}var G;var F;var H=function(){y.panels=new y.PanelCollection();F=new y.previewManager();var I=F.refresh;G=new y.editor(I);F.refresh(true)};a.addEvent(top,"load",H)};y.previewManager=function(){var H=this;var V;var F;var N;var M;var S;var O;var I=3000;var P="delayed";var K=function(X,Y){a.addEvent(X,"input",Y);X.onpaste=Y;X.ondrop=Y;a.addEvent(X,"keypress",Y);a.addEvent(X,"keydown",Y);F=new y.inputPoller(Y,A)};var R=function(){var X=0;if(top.innerHeight){X=top.pageYOffset}else{if(E.documentElement&&E.documentElement.scrollTop){X=E.documentElement.scrollTop}else{if(E.body){X=E.body.scrollTop}}}return X};var L=function(){if(!y.panels.preview&&!y.panels.output){return}var Z=y.panels.input.value;if(Z&&Z==S){return}else{S=Z}var Y=new Date().getTime();if(!V&&y.showdown){V=new y.showdown.converter()}if(V){Z=V.makeHtml(Z)}var X=new Date().getTime();M=X-Y;G(Z);O=Z};var U=function(){if(N){top.clearTimeout(N);N=undefined}if(P!=="manual"){var X=0;if(P==="delayed"){X=M}if(X>I){X=I}N=top.setTimeout(L,X)}};var J=function(X){if(X.scrollHeight<=X.clientHeight){return 1}return X.scrollTop/(X.scrollHeight-X.clientHeight)};var W=function(){if(y.panels.preview){y.panels.preview.scrollTop=(y.panels.preview.scrollHeight-y.panels.preview.clientHeight)*J(y.panels.preview)}if(y.panels.output){y.panels.output.scrollTop=(y.panels.output.scrollHeight-y.panels.output.clientHeight)*J(y.panels.output)}};this.refresh=function(X){if(X){S="";L()}else{U()}};this.processingTime=function(){return M};this.output=function(){return O};this.setUpdateMode=function(X){P=X;H.refresh()};var Q=true;var G=function(aa){var X=C.getTop(y.panels.input)-R();if(y.panels.output){if(y.panels.output.value!==undefined){y.panels.output.value=aa;y.panels.output.readOnly=true}else{var Z=aa.replace(/&/g,"&amp;");Z=Z.replace(/</g,"&lt;");y.panels.output.innerHTML="<pre><code>"+Z+"</code></pre>"}}if(y.panels.preview){y.panels.preview.innerHTML=aa}W();if(Q){Q=false;return}var Y=C.getTop(y.panels.input)-R();if(v.isIE){top.setTimeout(function(){top.scrollBy(0,Y-X)},0)}else{top.scrollBy(0,Y-X)}};var T=function(){K(y.panels.input,U);L();if(y.panels.preview){y.panels.preview.scrollTop=0}if(y.panels.output){y.panels.output.scrollTop=0}};this.destroy=function(){if(F){F.destroy()}};T()};h.doAutoindent=function(F,G){F.before=F.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/,"\n\n");F.before=F.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/,"\n\n");F.before=F.before.replace(/(\n|^)[ \t]+\n$/,"\n\n");if(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(F.before)){if(h.doList){h.doList(F)}}if(/(\n|^)[ ]{0,3}>[ \t]+.*\n$/.test(F.before)){if(h.doBlockquote){h.doBlockquote(F)}}if(/(\n|^)(\t|[ ]{4,}).*\n$/.test(F.before)){if(h.doCode){h.doCode(F)}}};h.doBlockquote=function(F,G){F.selection=F.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,function(L,K,J,I){F.before+=K;F.after=I+F.after;return J});F.before=F.before.replace(/(>[ \t]*)$/,function(J,I){F.selection=I+F.selection;return""});F.selection=F.selection.replace(/^(\s|>)+$/,"");F.selection=F.selection||"Blockquote";if(F.before){F.before=F.before.replace(/\n?$/,"\n")}if(F.after){F.after=F.after.replace(/^\n?/,"\n")}F.before=F.before.replace(/(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*$)/,function(I){F.startTag=I;return""});F.after=F.after.replace(/^(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*)/,function(I){F.endTag=I;return""});var H=function(J){var I=J?"> ":"";if(F.startTag){F.startTag=F.startTag.replace(/\n((>|\s)*)\n$/,function(L,K){return"\n"+K.replace(/^[ ]{0,3}>?[ \t]*$/gm,I)+"\n"})}if(F.endTag){F.endTag=F.endTag.replace(/^\n((>|\s)*)\n/,function(L,K){return"\n"+K.replace(/^[ ]{0,3}>?[ \t]*$/gm,I)+"\n"})}};if(/^(?![ ]{0,3}>)/m.test(F.selection)){h.wrap(F,y.wmd_env.lineLength-2);F.selection=F.selection.replace(/^/gm,"> ");H(true);F.skipLines()}else{F.selection=F.selection.replace(/^[ ]{0,3}> ?/gm,"");h.unwrap(F);H(false);if(!/^(\n|^)[ ]{0,3}>/.test(F.selection)&&F.startTag){F.startTag=F.startTag.replace(/\n{0,2}$/,"\n\n")}if(!/(\n|^)[ ]{0,3}>.*$/.test(F.selection)&&F.endTag){F.endTag=F.endTag.replace(/^\n{0,2}/,"\n\n")}}if(!/\n/.test(F.selection)){F.selection=F.selection.replace(/^(> *)/,function(I,J){F.startTag+=J;return""})}};h.doCode=function(F,G){var I=/\S[ ]*$/.test(F.before);var K=/^[ ]*\S/.test(F.after);if((!K&&!I)||/\n/.test(F.selection)){F.before=F.before.replace(/[ ]{4}$/,function(L){F.selection=L+F.selection;return""});var J=1;var H=1;if(/\n(\t|[ ]{4,}).*\n$/.test(F.before)){J=0}if(/^\n(\t|[ ]{4,})/.test(F.after)){H=0}F.skipLines(J,H);if(!F.selection){F.startTag=" ";F.selection="enter code here"}else{if(/^[ ]{0,3}\S/m.test(F.selection)){F.selection=F.selection.replace(/^/gm," ")}else{F.selection=F.selection.replace(/^[ ]{4}/gm,"")}}}else{F.trimWhitespace();F.findTags(/`/,/`/);if(!F.startTag&&!F.endTag){F.startTag=F.endTag="`";if(!F.selection){F.selection="enter code here"}}else{if(F.endTag&&!F.startTag){F.before+=F.endTag;F.endTag=""}else{F.startTag=F.endTag=""}}}};h.doList=function(Q,J,I){var S=/(\n|^)(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*$/;var R=/^\n*(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*/;var F="-";var N=1;var L=function(){var T;if(I){T=" "+N+". ";N++}else{T=" "+F+" "}return T};var M=function(T){if(I===undefined){I=/^\s*\d/.test(T)}T=T.replace(/^[ ]{0,3}([*+-]|\d+[.])\s/gm,function(U){return L()});return T};Q.findTags(/(\n|^)*[ ]{0,3}([*+-]|\d+[.])\s+/,null);if(Q.before&&!/\n$/.test(Q.before)&&!/^\n/.test(Q.startTag)){Q.before+=Q.startTag;Q.startTag=""}if(Q.startTag){var H=/\d+[.]/.test(Q.startTag);Q.startTag="";Q.selection=Q.selection.replace(/\n[ ]{4}/g,"\n");h.unwrap(Q);Q.skipLines();if(H){Q.after=Q.after.replace(R,M)}if(I==H){return}}var K=1;Q.before=Q.before.replace(S,function(T){if(/^\s*([*+-])/.test(T)){F=s.$1}K=/[^\n]\n\n[^\n]/.test(T)?1:0;return M(T)});if(!Q.selection){Q.selection="List item"}var O=L();var G=1;Q.after=Q.after.replace(R,function(T){G=/[^\n]\n\n[^\n]/.test(T)?1:0;return M(T)});Q.trimWhitespace(true);Q.skipLines(K,G,true);Q.startTag=O;var P=O.replace(/./g," ");h.wrap(Q,y.wmd_env.lineLength-P.length);Q.selection=Q.selection.replace(/\n/g,"\n"+P)};h.doHeading=function(H,I){H.selection=H.selection.replace(/\s+/g," ");H.selection=H.selection.replace(/(^\s+|\s+$)/g,"");if(!H.selection){H.startTag="## ";H.selection="Heading";H.endTag=" ##";return}var J=0;H.findTags(/#+[ ]*/,/[ ]*#+/);if(/#+/.test(H.startTag)){J=s.lastMatch.length}H.startTag=H.endTag="";H.findTags(null,/\s?(-+|=+)/);if(/=+/.test(H.endTag)){J=1}if(/-+/.test(H.endTag)){J=2}H.startTag=H.endTag="";H.skipLines(1,1);var K=J==0?2:J-1;if(K>0){var G=K>=2?"-":"=";var F=H.selection.length;if(F>y.wmd_env.lineLength){F=y.wmd_env.lineLength}H.endTag="\n";while(F--){H.endTag+=G}}};h.doHorizontalRule=function(F,G){F.startTag="----------\n";F.selection="";F.skipLines(2,1,true)}};Attacklab.wmd_env={};Attacklab.account_options={};Attacklab.wmd_defaults={version:1,output:"Markdown",lineLength:40,delayLoad:false};if(!Attacklab.wmd){Attacklab.wmd=function(){Attacklab.loadEnv=function(){var b=function(d){if(!d){return}for(var c in d){Attacklab.wmd_env[c]=d[c]}};b(Attacklab.wmd_defaults);b(Attacklab.account_options);b(top.wmd_options);Attacklab.full=true;var a="bold italic link blockquote code image ol ul heading hr";Attacklab.wmd_env.buttons=Attacklab.wmd_env.buttons||a};Attacklab.loadEnv()};Attacklab.wmd();Attacklab.wmdBase();Attacklab.Util.startEditor()}; \ No newline at end of file
diff --git a/forum/templates/content/js/wmd/wmd-test.html b/forum/media/js/wmd/wmd-test.html
index d748501a..d748501a 100644
--- a/forum/templates/content/js/wmd/wmd-test.html
+++ b/forum/media/js/wmd/wmd-test.html
diff --git a/forum/templates/content/js/wmd/wmd.css b/forum/media/js/wmd/wmd.css
index 80c226c8..80c226c8 100644
--- a/forum/templates/content/js/wmd/wmd.css
+++ b/forum/media/js/wmd/wmd.css
diff --git a/forum/templates/content/js/wmd/wmd.js b/forum/media/js/wmd/wmd.js
index e396d3cb..6277de90 100644
--- a/forum/templates/content/js/wmd/wmd.js
+++ b/forum/media/js/wmd/wmd.js
@@ -54,7 +54,7 @@ Attacklab.wmdBase = function(){
var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" +
"<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
"onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" +
- "<img id=\"loading\" src=\"" + scriptUrl + "content/images/indicator.gif\" style=\"display:none;\"/>";
+ "<img id=\"loading\" src=\"" + scriptUrl + "media/images/indicator.gif\" style=\"display:none;\"/>";
// The default text that appears in the dialog input box when entering
// links.
diff --git a/forum/templates/content/js/yuicompressor-2.4.2.jar b/forum/media/js/yuicompressor-2.4.2.jar
index c29470bd..c29470bd 100644
--- a/forum/templates/content/js/yuicompressor-2.4.2.jar
+++ b/forum/media/js/yuicompressor-2.4.2.jar
Binary files differ
diff --git a/forum/templates/content/style/default.css b/forum/media/style/default.css
index 2bc185ad..27da1dab 100644
--- a/forum/templates/content/style/default.css
+++ b/forum/media/style/default.css
@@ -7,9 +7,9 @@ Style sheet for cnprog.com
All rights reserved. 2008 CNPROG.COM
*/
-@import url(content/style/jquery.autocomplete.css);
-@import url(content/style/openid.css);
-@import url(content/style/prettify.css);
+@import url(media/style/jquery.autocomplete.css);
+@import url(media/style/openid.css);
+@import url(media/style/prettify.css);
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, form, label, table, caption, tbody, tfoot, thead, tr, th, td
{
diff --git a/forum/templates/content/style/jquery.autocomplete.css b/forum/media/style/jquery.autocomplete.css
index 3bf2c2d9..3bf2c2d9 100644
--- a/forum/templates/content/style/jquery.autocomplete.css
+++ b/forum/media/style/jquery.autocomplete.css
diff --git a/forum/templates/content/style/openid.css b/forum/media/style/openid.css
index 0d201df2..0d201df2 100644
--- a/forum/templates/content/style/openid.css
+++ b/forum/media/style/openid.css
diff --git a/forum/templates/content/style/prettify.css b/forum/media/style/prettify.css
index 10a37577..10a37577 100644
--- a/forum/templates/content/style/prettify.css
+++ b/forum/media/style/prettify.css
diff --git a/forum/templates/content/style/style.css b/forum/media/style/style.css
index 175fcb66..175fcb66 100644
--- a/forum/templates/content/style/style.css
+++ b/forum/media/style/style.css
diff --git a/forum/templates/answer_edit.html b/forum/templates/answer_edit.html
index 44b52c5f..2d736f30 100644
--- a/forum/templates/answer_edit.html
+++ b/forum/templates/answer_edit.html
@@ -4,12 +4,12 @@
{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/showdown.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/wmd.js" %}'></script>
- <link rel="stylesheet" type="text/css" href="{% media "/content/js/wmd/wmd.css" %}" />
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/showdown.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/wmd.js" %}'></script>
+ <link rel="stylesheet" type="text/css" href="{% media "/media/js/wmd/wmd.css" %}" />
<script type="text/javascript">
$().ready(function(){
diff --git a/forum/templates/ask.html b/forum/templates/ask.html
index df5580a6..083b01d9 100644
--- a/forum/templates/ask.html
+++ b/forum/templates/ask.html
@@ -4,12 +4,12 @@
{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/showdown.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/wmd.js" %}'></script>
- <link rel="stylesheet" type="text/css" href="{% media "/content/js/wmd/wmd.css" %}" />
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/showdown.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/wmd.js" %}'></script>
+ <link rel="stylesheet" type="text/css" href="{% media "/media/js/wmd/wmd.css" %}" />
<script type="text/javascript">
$().ready(function(){
//set current module button style
diff --git a/forum/templates/authopenid/signin.html b/forum/templates/authopenid/signin.html
index 679253da..4e060d0f 100755
--- a/forum/templates/authopenid/signin.html
+++ b/forum/templates/authopenid/signin.html
@@ -4,10 +4,10 @@
{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
- <link rel="stylesheet" type="text/css" media="screen" href="{% media "/content/jquery-openid/openid.css" %}"/>
- <script type="text/javascript" src="{% media "/content/jquery-openid/jquery.openid.js" %}"></script>
+ <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/jquery-openid/openid.css" %}"/>
+ <script type="text/javascript" src="{% media "/media/jquery-openid/jquery.openid.js" %}"></script>
<script type="text/javascript"> $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
<!--<script type="text/javascript">
$().ready(function(){
@@ -44,30 +44,30 @@
<ul class="providers">
<li class="local" title="Local login">
<div class="logo_box local_login_box">
- <img src="{% media "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" />
+ <img src="{% media "/media/jquery-openid/images/local-login.png" %}" alt="your icon here" />
</div>
<span></span>
</li>
<li class="direct" title="Google">
<div class="logo_box google_box">
- <img src="{% media "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+ <img src="{% media "/media/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
</div>
</li>
<li class="direct" title="Yahoo">
<div class="logo_box yahoo_box">
- <img src="{% media "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
+ <img src="{% media "/media/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
</div>
</li>
<li class="username" title="AOL screen name">
<div class="logo_box aol_box">
- <img src="{% media "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+ <img src="{% media "/media/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
</div>
</li>
</ul>
<ul id="openid_small_providers" class="providers">
<!--<li class="openid" title="OpenID">
<div class="logo_box openid_box">
- <img src="/content/jquery-openid/images/openid.gif" alt="icon" />
+ <img src="/media/jquery-openid/images/openid.gif" alt="icon" />
</div>
<span><strong>http://{your-openid-url}</strong></span>
</li>-->
@@ -83,43 +83,43 @@
{% endif %}
</li>
<li class="openid" title="OpenID URL">
- <img src="{% media "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/openidico16.png" %}" alt="icon" />
<span>http://{your-openid-url}</span>
</li>
<li class="username" title="MyOpenID user name">
- <img src="{% media "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
<span>http://<strong>username</strong>.myopenid.com/</span>
</li>
<li class="username" title="Flickr user name">
- <img src="{% media "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/flickr.png" %}" alt="icon" />
<span>http://flickr.com/<strong>username</strong>/</span>
</li>
<li class="username" title="Technorati user name">
- <img src="{% media "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/technorati-1.png" %}" alt="icon" />
<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
</li>
<li class="username" title="Wordpress blog name">
- <img src="{% media "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/wordpress.png" %}" alt="icon" />
<span>http://<strong>username</strong>.wordpress.com</span>
</li>
<li class="username" title="Blogger blog name">
- <img src="{% media "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/blogger-1.png" %}" alt="icon" />
<span>http://<strong>username</strong>.blogspot.com/</span>
</li>
<li class="username" title="LiveJournal blog name">
- <img src="{% media "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
<span>http://<strong>username</strong>.livejournal.com</span>
</li>
<li class="username" title="ClaimID user name">
- <img src="{% media "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/claimid-0.png" %}" alt="icon" />
<span>http://claimid.com/<strong>username</strong></span>
</li>
<li class="username" title="Vidoop user name">
- <img src="{% media "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/vidoop.png" %}" alt="icon" />
<span>http://<strong>username</strong>.myvidoop.com/</span>
</li>
<li class="username" title="Verisign user name">
- <img src="{% media "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
+ <img src="{% media "/media/jquery-openid/images/verisign-2.png" %}" alt="icon" />
<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
</li>
</ul>
diff --git a/forum/templates/base.html b/forum/templates/base.html
index fdaef153..9fabe7a1 100755
--- a/forum/templates/base.html
+++ b/forum/templates/base.html
@@ -13,17 +13,17 @@
{% if settings.GOOGLE_SITEMAP_CODE %}
<meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
{% endif %}
- <link rel="shortcut icon" href="{% media "/content/images/favicon.ico" %}" />
- <link href="{% media "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="{% media "/media/images/favicon.ico" %}" />
+ <link href="{% media "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">google.load("jquery", "1.2.6");</script>
<script type="text/javascript">
var i18nLang = '{{settings.LANGUAGE_CODE}}';
var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
</script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.i18n.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.i18n.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.utils.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.utils.js" %}'></script>
<!--<script type="text/javascript">
var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
diff --git a/forum/templates/base_content.html b/forum/templates/base_content.html
index 800785c7..7f1ddf22 100644
--- a/forum/templates/base_content.html
+++ b/forum/templates/base_content.html
@@ -9,8 +9,8 @@
{% if settings.GOOGLE_SITEMAP_CODE %}
<meta name="google-site-verification" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
{% endif %}
- <link rel="shortcut icon" href="{% media "/content/images/favicon.ico" %}" />
- <link href="{% media "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="{% media "/media/images/favicon.ico" %}" />
+ <link href="{% media "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
{% spaceless %}
{% block forestyle %}{% endblock %}
{% endspaceless %}
@@ -20,9 +20,9 @@
var i18nLang = '{{ settings.LANGUAGE_CODE }}';
var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
</script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.i18n.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.i18n.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.utils.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.utils.js" %}'></script>
<!-- <script type="text/javascript">
var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
diff --git a/forum/templates/book.html b/forum/templates/book.html
index 128f6668..683f13cf 100644
--- a/forum/templates/book.html
+++ b/forum/templates/book.html
@@ -85,12 +85,12 @@
{% if question.favourite_count %}
{% if question.favorited_myself %}
<div class="favorites-count">
- <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media "/content/images/vote-favorite-on.png" %}">
+ <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media "/media/images/vote-favorite-on.png" %}">
<div><b>{{question.favourite_count|intcomma}}</b></div>
</div>
{% else %}
<div class="favorites-count-off">
- <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media "/content/images/vote-favorite-off.png" %}">
+ <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media "/media/images/vote-favorite-off.png" %}">
<div><b>{{question.favourite_count|intcomma}}</b></div>
</div>
{% endif %}
diff --git a/forum/templates/content/js/wmd/wmd-min.js b/forum/templates/content/js/wmd/wmd-min.js
deleted file mode 100644
index 85cbd907..00000000
--- a/forum/templates/content/js/wmd/wmd-min.js
+++ /dev/null
@@ -1 +0,0 @@
-var Attacklab=Attacklab||{};Attacklab.wmdBase=function(){var y=top.Attacklab;var E=top.document;var s=top.RegExp;var l=top.navigator;y.Util={};y.Position={};y.Command={};y.Global={};var a=y.Util;var C=y.Position;var h=y.Command;var v=y.Global;v.isIE=/msie/.test(l.userAgent.toLowerCase());v.isIE_5or6=/msie 6/.test(l.userAgent.toLowerCase())||/msie 5/.test(l.userAgent.toLowerCase());v.isIE_7plus=v.isIE&&!v.isIE_5or6;v.isOpera=/opera/.test(l.userAgent.toLowerCase());v.isKonqueror=/konqueror/.test(l.userAgent.toLowerCase());var c="粗体 <strong> Ctrl-B";var f="斜体 <em> Ctrl-I";var z="超链接 <a> Ctrl-L";var u="引用 <blockquote> Ctrl-.";var e="代码 <pre><code> Ctrl-K";var d="图片 <img> Ctrl-G";var q="数字编号列表 <ol> Ctrl-O";var t="项目符号列表 <ul> Ctrl-U";var i="标题 <h1>/<h2> Ctrl-H";var p="水平线 <hr> Ctrl-R";var m="撤销 Ctrl-Z";var j="重做 Ctrl-Y";var B="<p style='margin-top: 0px'><b>输入图片地址</b></p><p>示例:<br />http://www.cnprog.com/images/temp.jpg \"我的截图\"</p>";var D="<p style='margin-top: 0px'><b>输入Web地址</b></p><p>示例:<br />http://www.cnprog.com/ \"我的网站\"</p>";var n='<div>或者上传本地图片:</div><input type="file" name="file-upload" id="file-upload" size="26" onchange="return ajaxFileUpload($(\'#image-url\'));"/><br><img id="loading" src="/content/images/indicator.gif" style="display:none;"/>';var b="http://";var g="http://";var o="images/";var A=500;var x=100;var k="http://wmd-editor.com/";var r="WMD website";var w="_blank";y.PanelCollection=function(){this.buttonBar=E.getElementById("wmd-button-bar");this.preview=E.getElementById("previewer");this.output=E.getElementById("wmd-output");this.input=E.getElementById("editor")};y.panels=undefined;y.ieCachedRange=null;y.ieRetardedClick=false;a.isVisible=function(F){if(window.getComputedStyle){return window.getComputedStyle(F,null).getPropertyValue("display")!=="none"}else{if(F.currentStyle){return F.currentStyle.display!=="none"}}};a.addEvent=function(G,F,H){if(G.attachEvent){G.attachEvent("on"+F,H)}else{G.addEventListener(F,H,false)}};a.removeEvent=function(G,F,H){if(G.detachEvent){G.detachEvent("on"+F,H)}else{G.removeEventListener(F,H,false)}};a.fixEolChars=function(F){F=F.replace(/\r\n/g,"\n");F=F.replace(/\r/g,"\n");return F};a.extendRegExp=function(H,J,G){if(J===null||J===undefined){J=""}if(G===null||G===undefined){G=""}var I=H.toString();var F;I=I.replace(/\/([gim]*)$/,"");F=s.$1;I=I.replace(/(^\/|\/$)/g,"");I=J+I+G;return new s(I,F)};a.createImage=function(F){var H=o+F;var G=E.createElement("img");G.className="wmd-button";G.src=H;return G};a.prompt=function(M,P,H){var I;var F;var K;var J=0;if(arguments.length==4){J=arguments[3]}if(P===undefined){P=""}var L=function(Q){var R=(Q.charCode||Q.keyCode);if(R===27){N(true)}};var N=function(Q){a.removeEvent(E.body,"keydown",L);var R=K.value;if(Q){R=null}else{R=R.replace("http://http://","http://");R=R.replace("http://https://","https://");R=R.replace("http://ftp://","ftp://");if(R.indexOf("http://")===-1&&R.indexOf("ftp://")===-1){R="http://"+R}}I.parentNode.removeChild(I);F.parentNode.removeChild(F);H(R);return false};var G=function(){F=E.createElement("div");F.className="wmd-prompt-background";style=F.style;style.position="absolute";style.top="0";style.zIndex="1000";if(v.isKonqueror){style.backgroundColor="transparent"}else{if(v.isIE){style.filter="alpha(opacity=50)"}else{style.opacity="0.5"}}var Q=C.getPageSize();style.height=Q[1]+"px";if(v.isIE){style.left=E.documentElement.scrollLeft;style.width=E.documentElement.clientWidth}else{style.left="0";style.width="100%"}E.body.appendChild(F)};var O=function(){I=E.createElement("div");I.className="wmd-prompt-dialog";I.style.padding="10px;";I.style.position="fixed";I.style.width="400px";I.style.zIndex="1001";var Q=E.createElement("div");Q.innerHTML=M;Q.style.padding="5px";I.appendChild(Q);var S=E.createElement("form");S.onsubmit=function(){return N(false)};style=S.style;style.padding="0";style.margin="0";style.cssFloat="left";style.width="100%";style.textAlign="center";style.position="relative";I.appendChild(S);K=E.createElement("input");if(J==1){K.id="image-url"}K.type="text";K.value=P;style=K.style;style.display="block";style.width="80%";style.marginLeft=style.marginRight="auto";S.appendChild(K);if(J==1){var R=E.createElement("div");R.innerHTML=n;R.style.padding="5px";S.appendChild(R)}var U=E.createElement("input");U.type="button";U.onclick=function(){return N(false)};U.value="OK";style=U.style;style.margin="10px";style.display="inline";style.width="7em";var T=E.createElement("input");T.type="button";T.onclick=function(){return N(true)};T.value="Cancel";style=T.style;style.margin="10px";style.display="inline";style.width="7em";if(/mac/.test(l.platform.toLowerCase())){S.appendChild(T);S.appendChild(U)}else{S.appendChild(U);S.appendChild(T)}a.addEvent(E.body,"keydown",L);I.style.top="50%";I.style.left="50%";I.style.display="block";if(v.isIE_5or6){I.style.position="absolute";I.style.top=E.documentElement.scrollTop+200+"px";I.style.left="50%"}E.body.appendChild(I);I.style.marginTop=-(C.getHeight(I)/2)+"px";I.style.marginLeft=-(C.getWidth(I)/2)+"px"};G();top.setTimeout(function(){O();var R=P.length;if(K.selectionStart!==undefined){K.selectionStart=0;K.selectionEnd=R}else{if(K.createTextRange){var Q=K.createTextRange();Q.collapse(false);Q.moveStart("character",-R);Q.moveEnd("character",R);Q.select()}}K.focus()},0)};C.getTop=function(H,G){var F=H.offsetTop;if(!G){while(H=H.offsetParent){F+=H.offsetTop}}return F};C.getHeight=function(F){return F.offsetHeight||F.scrollHeight};C.getWidth=function(F){return F.offsetWidth||F.scrollWidth};C.getPageSize=function(){var G,H;var F,K;if(self.innerHeight&&self.scrollMaxY){G=E.body.scrollWidth;H=self.innerHeight+self.scrollMaxY}else{if(E.body.scrollHeight>E.body.offsetHeight){G=E.body.scrollWidth;H=E.body.scrollHeight}else{G=E.body.offsetWidth;H=E.body.offsetHeight}}if(self.innerHeight){F=self.innerWidth;K=self.innerHeight}else{if(E.documentElement&&E.documentElement.clientHeight){F=E.documentElement.clientWidth;K=E.documentElement.clientHeight}else{if(E.body){F=E.body.clientWidth;K=E.body.clientHeight}}}var J=Math.max(G,F);var I=Math.max(H,K);return[J,I,F,K]};y.inputPoller=function(O,H){var F=this;var K=y.panels.input;var G;var I;var L;var J;this.tick=function(){if(!a.isVisible(K)){return}if(K.selectionStart||K.selectionStart===0){var Q=K.selectionStart;var P=K.selectionEnd;if(Q!=G||P!=I){G=Q;I=P;if(L!=K.value){L=K.value;return true}}}return false};var N=function(){if(!a.isVisible(K)){return}if(F.tick()){O()}};var M=function(){J=top.setInterval(N,H)};this.destroy=function(){top.clearInterval(J)};M()};y.undoManager=function(Q){var U=this;var O=[];var M=0;var L="none";var G;var R;var H;var K;var F=function(W,V){if(L!=W){L=W;if(!V){I()}}if(!v.isIE||L!="moving"){H=top.setTimeout(N,1)}else{K=null}};var N=function(){K=new y.TextareaState();R.tick();H=undefined};this.setCommandMode=function(){L="command";I();H=top.setTimeout(N,0)};this.canUndo=function(){return M>1};this.canRedo=function(){if(O[M+1]){return true}return false};this.undo=function(){if(U.canUndo()){if(G){G.restore();G=null}else{O[M]=new y.TextareaState();O[--M].restore();if(Q){Q()}}}L="none";y.panels.input.focus();N()};this.redo=function(){if(U.canRedo()){O[++M].restore();if(Q){Q()}}L="none";y.panels.input.focus();N()};var I=function(){var V=K||new y.TextareaState();if(!V){return false}if(L=="moving"){if(!G){G=V}return}if(G){if(O[M-1].text!=G.text){O[M++]=G}G=null}O[M++]=V;O[M+1]=null;if(Q){Q()}};var P=function(V){var X=false;if(V.ctrlKey||V.metaKey){var W=V.charCode||V.keyCode;var Y=String.fromCharCode(W);switch(Y){case"y":U.redo();X=true;break;case"z":if(!V.shiftKey){U.undo()}else{U.redo()}X=true;break}}if(X){if(V.preventDefault){V.preventDefault()}if(top.event){top.event.returnValue=false}return}};var T=function(V){if(!V.ctrlKey&&!V.metaKey){var W=V.keyCode;if((W>=33&&W<=40)||(W>=63232&&W<=63235)){F("moving")}else{if(W==8||W==46||W==127){F("deleting")}else{if(W==13){F("newlines")}else{if(W==27){F("escape")}else{if((W<16||W>20)&&W!=91){F("typing")}}}}}}};var J=function(){a.addEvent(y.panels.input,"keypress",function(W){if((W.ctrlKey||W.metaKey)&&(W.keyCode==89||W.keyCode==90)){W.preventDefault()}});var V=function(){if(v.isIE||(K&&K.text!=y.panels.input.value)){if(H==undefined){L="paste";I();N()}}};R=new y.inputPoller(V,x);a.addEvent(y.panels.input,"keydown",P);a.addEvent(y.panels.input,"keydown",T);a.addEvent(y.panels.input,"mousedown",function(){F("moving")});y.panels.input.onpaste=V;y.panels.input.ondrop=V};var S=function(){J();N();I()};this.destroy=function(){if(R){R.destroy()}};S()};y.editor=function(O){if(!O){O=function(){}}var L=y.panels.input;var I=0;var P=this;var K;var R;var G;var M;var N;var U=function(W){L.focus();if(W.textOp){if(N){N.setCommandMode()}var Y=new y.TextareaState();if(!Y){return}var Z=Y.getChunks();var V=function(){L.focus();if(Z){Y.setChunks(Z)}Y.restore();O()};var X=W.textOp(Z,V);if(!X){V()}}if(W.execute){W.execute(P)}};var S=function(){if(N){F(document.getElementById("wmd-undo-button"),N.canUndo());F(document.getElementById("wmd-redo-button"),N.canRedo())}};var F=function(V,X){var Y="0px";var Z="-20px";var W="-40px";if(X){V.style.backgroundPosition=V.XShift+" "+Y;V.onmouseover=function(){this.style.backgroundPosition=this.XShift+" "+W};V.onmouseout=function(){this.style.backgroundPosition=this.XShift+" "+Y};if(v.isIE){V.onmousedown=function(){y.ieRetardedClick=true;y.ieCachedRange=document.selection.createRange()}}if(!V.isHelp){V.onclick=function(){if(this.onmouseout){this.onmouseout()}U(this);return false}}}else{V.style.backgroundPosition=V.XShift+" "+Z;V.onmouseover=V.onmouseout=V.onclick=function(){}}};var J=function(){var Z=document.getElementById("wmd-button-bar");var W="0px";var Y="-20px";var ae="-40px";var ak=document.createElement("ul");ak.id="wmd-button-row";ak=Z.appendChild(ak);var ad=document.createElement("li");ad.className="wmd-button";ad.id="wmd-bold-button";ad.title=c;ad.XShift="0px";ad.textOp=h.doBold;F(ad,true);ak.appendChild(ad);var ac=document.createElement("li");ac.className="wmd-button";ac.id="wmd-italic-button";ac.title=f;ac.XShift="-20px";ac.textOp=h.doItalic;F(ac,true);ak.appendChild(ac);var ah=document.createElement("li");ah.className="wmd-spacer";ah.id="wmd-spacer1";ak.appendChild(ah);var ai=document.createElement("li");ai.className="wmd-button";ai.id="wmd-link-button";ai.title=z;ai.XShift="-40px";ai.textOp=function(ap,aq){return h.doLinkOrImage(ap,aq,false)};F(ai,true);ak.appendChild(ai);var al=document.createElement("li");al.className="wmd-button";al.id="wmd-quote-button";al.title=u;al.XShift="-60px";al.textOp=h.doBlockquote;F(al,true);ak.appendChild(al);var am=document.createElement("li");am.className="wmd-button";am.id="wmd-code-button";am.title=e;am.XShift="-80px";am.textOp=h.doCode;F(am,true);ak.appendChild(am);var aa=document.createElement("li");aa.className="wmd-button";aa.id="wmd-image-button";aa.title=d;aa.XShift="-100px";aa.textOp=function(ap,aq){return h.doLinkOrImage(ap,aq,true)};F(aa,true);ak.appendChild(aa);var ag=document.createElement("li");ag.className="wmd-spacer";ag.id="wmd-spacer2";ak.appendChild(ag);var ab=document.createElement("li");ab.className="wmd-button";ab.id="wmd-olist-button";ab.title=q;ab.XShift="-120px";ab.textOp=function(ap,aq){h.doList(ap,aq,true)};F(ab,true);ak.appendChild(ab);var ao=document.createElement("li");ao.className="wmd-button";ao.id="wmd-ulist-button";ao.title=t;ao.XShift="-140px";ao.textOp=function(ap,aq){h.doList(ap,aq,false)};F(ao,true);ak.appendChild(ao);var aj=document.createElement("li");aj.className="wmd-button";aj.id="wmd-heading-button";aj.title=i;aj.XShift="-160px";aj.textOp=h.doHeading;F(aj,true);ak.appendChild(aj);var X=document.createElement("li");X.className="wmd-button";X.id="wmd-hr-button";X.title=p;X.XShift="-180px";X.textOp=h.doHorizontalRule;F(X,true);ak.appendChild(X);var af=document.createElement("li");af.className="wmd-spacer";af.id="wmd-spacer3";ak.appendChild(af);var V=document.createElement("li");V.className="wmd-button";V.id="wmd-undo-button";V.title=m;V.XShift="-200px";V.execute=function(ap){ap.undo()};F(V,true);ak.appendChild(V);var an=document.createElement("li");an.className="wmd-button";an.id="wmd-redo-button";an.title=j;if(/win/.test(l.platform.toLowerCase())){an.title=j}else{an.title="重做 - Ctrl+Shift+Z"}an.XShift="-220px";an.execute=function(ap){ap.redo()};F(an,true);ak.appendChild(an);S()};var H=function(){if(/\?noundo/.test(E.location.href)){y.nativeUndo=true}if(!y.nativeUndo){N=new y.undoManager(function(){O();S()})}J();var W="keydown";if(v.isOpera){W="keypress"}a.addEvent(L,W,function(Y){if(Y.ctrlKey||Y.metaKey){var Z=Y.charCode||Y.keyCode;var X=String.fromCharCode(Z).toLowerCase();if(Z===46){X=""}if(Z===190){X="."}switch(X){case"b":U(document.getElementById("wmd-bold-button"));break;case"i":U(document.getElementById("wmd-italic-button"));break;case"l":U(document.getElementById("wmd-link-button"));break;case".":U(document.getElementById("wmd-quote-button"));break;case"k":U(document.getElementById("wmd-code-button"));break;case"g":U(document.getElementById("wmd-image-button"));break;case"o":U(document.getElementById("wmd-olist-button"));break;case"u":U(document.getElementById("wmd-ulist-button"));break;case"h":U(document.getElementById("wmd-heading-button"));break;case"r":U(document.getElementById("wmd-hr-button"));break;case"y":U(document.getElementById("wmd-redo-button"));break;case"z":if(Y.shiftKey){U(document.getElementById("wmd-redo-button"))}else{U(document.getElementById("wmd-undo-button"))}break;default:return}if(Y.preventDefault){Y.preventDefault()}if(top.event){top.event.returnValue=false}}});a.addEvent(L,"keyup",function(X){if(X.shiftKey&&!X.ctrlKey&&!X.metaKey){var Y=X.charCode||X.keyCode;if(Y===13){fakeButton={};fakeButton.textOp=h.doAutoindent;U(fakeButton)}}});if(L.form){var V=L.form.onsubmit;L.form.onsubmit=function(){Q();if(V){return V.apply(this,arguments)}}}};var Q=function(){if(y.showdown){var V=new y.showdown.converter()}var W=L.value;var X=function(){L.value=W};if(!/markdown/.test(y.wmd_env.output.toLowerCase())){if(V){L.value=V.makeHtml(W);top.setTimeout(X,0)}}return true};this.undo=function(){if(N){N.undo()}};this.redo=function(){if(N){N.redo()}};var T=function(){H()};this.destroy=function(){if(N){N.destroy()}if(G.parentNode){G.parentNode.removeChild(G)}if(L){L.style.marginTop=""}top.clearInterval(M)};T()};y.TextareaState=function(){var F=this;var G=y.panels.input;this.init=function(){if(!a.isVisible(G)){return}this.setInputAreaSelectionStartEnd();this.scrollTop=G.scrollTop;if(!this.text&&G.selectionStart||G.selectionStart===0){this.text=G.value}};this.setInputAreaSelection=function(){if(!a.isVisible(G)){return}if(G.selectionStart!==undefined&&!v.isOpera){G.focus();G.selectionStart=F.start;G.selectionEnd=F.end;G.scrollTop=F.scrollTop}else{if(E.selection){if(E.activeElement&&E.activeElement!==G){return}G.focus();var H=G.createTextRange();H.moveStart("character",-G.value.length);H.moveEnd("character",-G.value.length);H.moveEnd("character",F.end);H.moveStart("character",F.start);H.select()}}};this.setInputAreaSelectionStartEnd=function(){if(G.selectionStart||G.selectionStart===0){F.start=G.selectionStart;F.end=G.selectionEnd}else{if(E.selection){F.text=a.fixEolChars(G.value);var K;if(y.ieRetardedClick&&y.ieCachedRange){K=y.ieCachedRange;y.ieRetardedClick=false}else{K=E.selection.createRange()}var L=a.fixEolChars(K.text);var J="\x07";var I=J+L+J;K.text=I;var M=a.fixEolChars(G.value);K.moveStart("character",-I.length);K.text=L;F.start=M.indexOf(J);F.end=M.lastIndexOf(J)-J.length;var H=F.text.length-a.fixEolChars(G.value).length;if(H){K.moveStart("character",-L.length);while(H--){L+="\n";F.end+=1}K.text=L}this.setInputAreaSelection()}}};this.restore=function(){if(F.text!=undefined&&F.text!=G.value){G.value=F.text}this.setInputAreaSelection();G.scrollTop=F.scrollTop};this.getChunks=function(){var H=new y.Chunks();H.before=a.fixEolChars(F.text.substring(0,F.start));H.startTag="";H.selection=a.fixEolChars(F.text.substring(F.start,F.end));H.endTag="";H.after=a.fixEolChars(F.text.substring(F.end));H.scrollTop=F.scrollTop;return H};this.setChunks=function(H){H.before=H.before+H.startTag;H.after=H.endTag+H.after;if(v.isOpera){H.before=H.before.replace(/\n/g,"\r\n");H.selection=H.selection.replace(/\n/g,"\r\n");H.after=H.after.replace(/\n/g,"\r\n")}this.start=H.before.length;this.end=H.before.length+H.selection.length;this.text=H.before+H.selection+H.after;this.scrollTop=H.scrollTop};this.init()};y.Chunks=function(){};y.Chunks.prototype.findTags=function(G,I){var F=this;var H;if(G){H=a.extendRegExp(G,"","$");this.before=this.before.replace(H,function(J){F.startTag=F.startTag+J;return""});H=a.extendRegExp(G,"^","");this.selection=this.selection.replace(H,function(J){F.startTag=F.startTag+J;return""})}if(I){H=a.extendRegExp(I,"","$");this.selection=this.selection.replace(H,function(J){F.endTag=J+F.endTag;return""});H=a.extendRegExp(I,"^","");this.after=this.after.replace(H,function(J){F.endTag=J+F.endTag;return""})}};y.Chunks.prototype.trimWhitespace=function(F){this.selection=this.selection.replace(/^(\s*)/,"");if(!F){this.before+=s.$1}this.selection=this.selection.replace(/(\s*)$/,"");if(!F){this.after=s.$1+this.after}};y.Chunks.prototype.skipLines=function(H,G,F){if(H===undefined){H=1}if(G===undefined){G=1}H++;G++;var I;var J;this.selection=this.selection.replace(/(^\n*)/,"");this.startTag=this.startTag+s.$1;this.selection=this.selection.replace(/(\n*$)/,"");this.endTag=this.endTag+s.$1;this.startTag=this.startTag.replace(/(^\n*)/,"");this.before=this.before+s.$1;this.endTag=this.endTag.replace(/(\n*$)/,"");this.after=this.after+s.$1;if(this.before){I=J="";while(H--){I+="\\n?";J+="\n"}if(F){I="\\n*"}this.before=this.before.replace(new s(I+"$",""),J)}if(this.after){I=J="";while(G--){I+="\\n?";J+="\n"}if(F){I="\\n*"}this.after=this.after.replace(new s(I,""),J)}};h.prefixes="(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)";h.unwrap=function(G){var F=new s("([^\\n])\\n(?!(\\n|"+h.prefixes+"))","g");G.selection=G.selection.replace(F,"$1 $2")};h.wrap=function(G,F){h.unwrap(G);var H=new s("(.{1,"+F+"})( +|$\\n?)","gm");G.selection=G.selection.replace(H,function(I,J){if(new s("^"+h.prefixes,"").test(I)){return I}return J+"\n"});G.selection=G.selection.replace(/\s+$/,"")};h.doBold=function(F,G){return h.doBorI(F,G,2,"strong text")};h.doItalic=function(F,G){return h.doBorI(F,G,1,"emphasized text")};h.doBorI=function(L,J,K,F){L.trimWhitespace();L.selection=L.selection.replace(/\n{2,}/g,"\n");L.before.search(/(\**$)/);var I=s.$1;L.after.search(/(^\**)/);var G=s.$1;var M=Math.min(I.length,G.length);if((M>=K)&&(M!=2||K!=1)){L.before=L.before.replace(s("[*]{"+K+"}$",""),"");L.after=L.after.replace(s("^[*]{"+K+"}",""),"")}else{if(!L.selection&&G){L.after=L.after.replace(/^([*_]*)/,"");L.before=L.before.replace(/(\s?)$/,"");var H=s.$1;L.before=L.before+G+H}else{if(!L.selection&&!G){L.selection=F}var N=K<=1?"*":"**";L.before=L.before+N;L.after=N+L.after}}return};h.stripLinkDefs=function(G,F){G=G.replace(/^[ ]{0,3}\[(\d+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|$)/gm,function(K,L,H,I,J){F[L]=K.replace(/\s*$/,"");if(I){F[L]=K.replace(/["(](.+?)[")]$/,"");return I+J}return""});return G};h.addLinkDef=function(M,I){var F=0;var H={};M.before=h.stripLinkDefs(M.before,H);M.selection=h.stripLinkDefs(M.selection,H);M.after=h.stripLinkDefs(M.after,H);var G="";var L=/(\[(?:\[[^\]]*\]|[^\[\]])*\][ ]?(?:\n[ ]*)?\[)(\d+)(\])/g;var K=function(O){F++;O=O.replace(/^[ ]{0,3}\[(\d+)\]:/," ["+F+"]:");G+="\n"+O};var J=function(P,Q,R,O){if(H[R]){K(H[R]);return Q+F+O}return P};M.before=M.before.replace(L,J);if(I){K(I)}else{M.selection=M.selection.replace(L,J)}var N=F;M.after=M.after.replace(L,J);if(M.after){M.after=M.after.replace(/\n*$/,"")}if(!M.after){M.selection=M.selection.replace(/\n*$/,"")}M.after+="\n\n"+G;return N};h.doLinkOrImage=function(F,G,I){F.trimWhitespace();F.findTags(/\s*!?\[/,/\][ ]?(?:\n[ ]*)?(\[.*?\])?/);if(F.endTag.length>1){F.startTag=F.startTag.replace(/!?\[/,"");F.endTag="";h.addLinkDef(F,null)}else{if(/\n\n/.test(F.selection)){h.addLinkDef(F,null);return}var H=function(L){if(L!==null){F.startTag=F.endTag="";var K=" [999]: "+L;var J=h.addLinkDef(F,K);F.startTag=I?"![":"[";F.endTag="]["+J+"]";if(!F.selection){if(I){F.selection="alt text"}else{F.selection="link text"}}}G()};if(I){a.prompt(B,b,H,1)}else{a.prompt(D,g,H)}return true}};a.makeAPI=function(){y.wmd={};y.wmd.editor=y.editor;y.wmd.previewManager=y.previewManager};a.startEditor=function(){if(y.wmd_env.autostart===false){a.makeAPI();return}var G;var F;var H=function(){y.panels=new y.PanelCollection();F=new y.previewManager();var I=F.refresh;G=new y.editor(I);F.refresh(true)};a.addEvent(top,"load",H)};y.previewManager=function(){var H=this;var V;var F;var N;var M;var S;var O;var I=3000;var P="delayed";var K=function(X,Y){a.addEvent(X,"input",Y);X.onpaste=Y;X.ondrop=Y;a.addEvent(X,"keypress",Y);a.addEvent(X,"keydown",Y);F=new y.inputPoller(Y,A)};var R=function(){var X=0;if(top.innerHeight){X=top.pageYOffset}else{if(E.documentElement&&E.documentElement.scrollTop){X=E.documentElement.scrollTop}else{if(E.body){X=E.body.scrollTop}}}return X};var L=function(){if(!y.panels.preview&&!y.panels.output){return}var Z=y.panels.input.value;if(Z&&Z==S){return}else{S=Z}var Y=new Date().getTime();if(!V&&y.showdown){V=new y.showdown.converter()}if(V){Z=V.makeHtml(Z)}var X=new Date().getTime();M=X-Y;G(Z);O=Z};var U=function(){if(N){top.clearTimeout(N);N=undefined}if(P!=="manual"){var X=0;if(P==="delayed"){X=M}if(X>I){X=I}N=top.setTimeout(L,X)}};var J=function(X){if(X.scrollHeight<=X.clientHeight){return 1}return X.scrollTop/(X.scrollHeight-X.clientHeight)};var W=function(){if(y.panels.preview){y.panels.preview.scrollTop=(y.panels.preview.scrollHeight-y.panels.preview.clientHeight)*J(y.panels.preview)}if(y.panels.output){y.panels.output.scrollTop=(y.panels.output.scrollHeight-y.panels.output.clientHeight)*J(y.panels.output)}};this.refresh=function(X){if(X){S="";L()}else{U()}};this.processingTime=function(){return M};this.output=function(){return O};this.setUpdateMode=function(X){P=X;H.refresh()};var Q=true;var G=function(aa){var X=C.getTop(y.panels.input)-R();if(y.panels.output){if(y.panels.output.value!==undefined){y.panels.output.value=aa;y.panels.output.readOnly=true}else{var Z=aa.replace(/&/g,"&amp;");Z=Z.replace(/</g,"&lt;");y.panels.output.innerHTML="<pre><code>"+Z+"</code></pre>"}}if(y.panels.preview){y.panels.preview.innerHTML=aa}W();if(Q){Q=false;return}var Y=C.getTop(y.panels.input)-R();if(v.isIE){top.setTimeout(function(){top.scrollBy(0,Y-X)},0)}else{top.scrollBy(0,Y-X)}};var T=function(){K(y.panels.input,U);L();if(y.panels.preview){y.panels.preview.scrollTop=0}if(y.panels.output){y.panels.output.scrollTop=0}};this.destroy=function(){if(F){F.destroy()}};T()};h.doAutoindent=function(F,G){F.before=F.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/,"\n\n");F.before=F.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/,"\n\n");F.before=F.before.replace(/(\n|^)[ \t]+\n$/,"\n\n");if(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(F.before)){if(h.doList){h.doList(F)}}if(/(\n|^)[ ]{0,3}>[ \t]+.*\n$/.test(F.before)){if(h.doBlockquote){h.doBlockquote(F)}}if(/(\n|^)(\t|[ ]{4,}).*\n$/.test(F.before)){if(h.doCode){h.doCode(F)}}};h.doBlockquote=function(F,G){F.selection=F.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,function(L,K,J,I){F.before+=K;F.after=I+F.after;return J});F.before=F.before.replace(/(>[ \t]*)$/,function(J,I){F.selection=I+F.selection;return""});F.selection=F.selection.replace(/^(\s|>)+$/,"");F.selection=F.selection||"Blockquote";if(F.before){F.before=F.before.replace(/\n?$/,"\n")}if(F.after){F.after=F.after.replace(/^\n?/,"\n")}F.before=F.before.replace(/(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*$)/,function(I){F.startTag=I;return""});F.after=F.after.replace(/^(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*)/,function(I){F.endTag=I;return""});var H=function(J){var I=J?"> ":"";if(F.startTag){F.startTag=F.startTag.replace(/\n((>|\s)*)\n$/,function(L,K){return"\n"+K.replace(/^[ ]{0,3}>?[ \t]*$/gm,I)+"\n"})}if(F.endTag){F.endTag=F.endTag.replace(/^\n((>|\s)*)\n/,function(L,K){return"\n"+K.replace(/^[ ]{0,3}>?[ \t]*$/gm,I)+"\n"})}};if(/^(?![ ]{0,3}>)/m.test(F.selection)){h.wrap(F,y.wmd_env.lineLength-2);F.selection=F.selection.replace(/^/gm,"> ");H(true);F.skipLines()}else{F.selection=F.selection.replace(/^[ ]{0,3}> ?/gm,"");h.unwrap(F);H(false);if(!/^(\n|^)[ ]{0,3}>/.test(F.selection)&&F.startTag){F.startTag=F.startTag.replace(/\n{0,2}$/,"\n\n")}if(!/(\n|^)[ ]{0,3}>.*$/.test(F.selection)&&F.endTag){F.endTag=F.endTag.replace(/^\n{0,2}/,"\n\n")}}if(!/\n/.test(F.selection)){F.selection=F.selection.replace(/^(> *)/,function(I,J){F.startTag+=J;return""})}};h.doCode=function(F,G){var I=/\S[ ]*$/.test(F.before);var K=/^[ ]*\S/.test(F.after);if((!K&&!I)||/\n/.test(F.selection)){F.before=F.before.replace(/[ ]{4}$/,function(L){F.selection=L+F.selection;return""});var J=1;var H=1;if(/\n(\t|[ ]{4,}).*\n$/.test(F.before)){J=0}if(/^\n(\t|[ ]{4,})/.test(F.after)){H=0}F.skipLines(J,H);if(!F.selection){F.startTag=" ";F.selection="enter code here"}else{if(/^[ ]{0,3}\S/m.test(F.selection)){F.selection=F.selection.replace(/^/gm," ")}else{F.selection=F.selection.replace(/^[ ]{4}/gm,"")}}}else{F.trimWhitespace();F.findTags(/`/,/`/);if(!F.startTag&&!F.endTag){F.startTag=F.endTag="`";if(!F.selection){F.selection="enter code here"}}else{if(F.endTag&&!F.startTag){F.before+=F.endTag;F.endTag=""}else{F.startTag=F.endTag=""}}}};h.doList=function(Q,J,I){var S=/(\n|^)(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*$/;var R=/^\n*(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*/;var F="-";var N=1;var L=function(){var T;if(I){T=" "+N+". ";N++}else{T=" "+F+" "}return T};var M=function(T){if(I===undefined){I=/^\s*\d/.test(T)}T=T.replace(/^[ ]{0,3}([*+-]|\d+[.])\s/gm,function(U){return L()});return T};Q.findTags(/(\n|^)*[ ]{0,3}([*+-]|\d+[.])\s+/,null);if(Q.before&&!/\n$/.test(Q.before)&&!/^\n/.test(Q.startTag)){Q.before+=Q.startTag;Q.startTag=""}if(Q.startTag){var H=/\d+[.]/.test(Q.startTag);Q.startTag="";Q.selection=Q.selection.replace(/\n[ ]{4}/g,"\n");h.unwrap(Q);Q.skipLines();if(H){Q.after=Q.after.replace(R,M)}if(I==H){return}}var K=1;Q.before=Q.before.replace(S,function(T){if(/^\s*([*+-])/.test(T)){F=s.$1}K=/[^\n]\n\n[^\n]/.test(T)?1:0;return M(T)});if(!Q.selection){Q.selection="List item"}var O=L();var G=1;Q.after=Q.after.replace(R,function(T){G=/[^\n]\n\n[^\n]/.test(T)?1:0;return M(T)});Q.trimWhitespace(true);Q.skipLines(K,G,true);Q.startTag=O;var P=O.replace(/./g," ");h.wrap(Q,y.wmd_env.lineLength-P.length);Q.selection=Q.selection.replace(/\n/g,"\n"+P)};h.doHeading=function(H,I){H.selection=H.selection.replace(/\s+/g," ");H.selection=H.selection.replace(/(^\s+|\s+$)/g,"");if(!H.selection){H.startTag="## ";H.selection="Heading";H.endTag=" ##";return}var J=0;H.findTags(/#+[ ]*/,/[ ]*#+/);if(/#+/.test(H.startTag)){J=s.lastMatch.length}H.startTag=H.endTag="";H.findTags(null,/\s?(-+|=+)/);if(/=+/.test(H.endTag)){J=1}if(/-+/.test(H.endTag)){J=2}H.startTag=H.endTag="";H.skipLines(1,1);var K=J==0?2:J-1;if(K>0){var G=K>=2?"-":"=";var F=H.selection.length;if(F>y.wmd_env.lineLength){F=y.wmd_env.lineLength}H.endTag="\n";while(F--){H.endTag+=G}}};h.doHorizontalRule=function(F,G){F.startTag="----------\n";F.selection="";F.skipLines(2,1,true)}};Attacklab.wmd_env={};Attacklab.account_options={};Attacklab.wmd_defaults={version:1,output:"Markdown",lineLength:40,delayLoad:false};if(!Attacklab.wmd){Attacklab.wmd=function(){Attacklab.loadEnv=function(){var b=function(d){if(!d){return}for(var c in d){Attacklab.wmd_env[c]=d[c]}};b(Attacklab.wmd_defaults);b(Attacklab.account_options);b(top.wmd_options);Attacklab.full=true;var a="bold italic link blockquote code image ol ul heading hr";Attacklab.wmd_env.buttons=Attacklab.wmd_env.buttons||a};Attacklab.loadEnv()};Attacklab.wmd();Attacklab.wmdBase();Attacklab.Util.startEditor()}; \ No newline at end of file
diff --git a/forum/templates/footer.html b/forum/templates/footer.html
index 239ac9e1..89d4801f 100644
--- a/forum/templates/footer.html
+++ b/forum/templates/footer.html
@@ -28,7 +28,7 @@
</div>
<div id="licenseLogo">
<a href="http://creativecommons.org/licenses/by/3.0/">
- <img src="{% media "/content/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
+ <img src="{% media "/media/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
</a>
</div>
</div>
diff --git a/forum/templates/header.html b/forum/templates/header.html
index 4869fb3a..3afc46c5 100644
--- a/forum/templates/header.html
+++ b/forum/templates/header.html
@@ -18,7 +18,7 @@
<td width="23%">
<div id="logo">
<a href="{% url index %}">
- <img src="{% media "/content/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
+ <img src="{% media "/media/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
</a>
</div>
</td>
diff --git a/forum/templates/index.html b/forum/templates/index.html
index 3011dc58..df2814d6 100644
--- a/forum/templates/index.html
+++ b/forum/templates/index.html
@@ -17,8 +17,8 @@
$("#nav_questions").attr('className',"on");
});
</script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.tag_selector.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.tag_selector.js" %}'></script>
{% endblock %}
{% block content %}
<div class="tabBar">
diff --git a/forum/templates/question.html b/forum/templates/question.html
index 15df0fc8..048c2d64 100644
--- a/forum/templates/question.html
+++ b/forum/templates/question.html
@@ -11,13 +11,13 @@
<meta name="keywords" content="{{question.tagname_meta_generator}}" />
<link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
{% if not question.closed %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/showdown.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/wmd.js" %}'></script>
- <link rel="stylesheet" type="text/css" href="{% media "/content/js/wmd/wmd.css" %}" />
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/showdown.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/wmd.js" %}'></script>
+ <link rel="stylesheet" type="text/css" href="{% media "/media/js/wmd/wmd.css" %}" />
{% endif %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
<script type="text/javascript">
// define reputation needs for comments
@@ -70,9 +70,9 @@
{% if question_vote %}
<img id="question-img-upvote-{{ question.id }}" class="question-img-upvote"
{% if question_vote.is_upvote %}
- src="{% media "/content/images/vote-arrow-up-on.png" %}"
+ src="{% media "/media/images/vote-arrow-up-on.png" %}"
{% else %}
- src="{% media "/content/images/vote-arrow-up.png" %}"
+ src="{% media "/media/images/vote-arrow-up.png" %}"
{% endif %}
alt="{% trans "i like this post (click again to cancel)" %}"
title="{% trans "i like this post (click again to cancel)" %}" />
@@ -82,9 +82,9 @@
</div>
<img id="question-img-downvote-{{ question.id }}" class="question-img-downvote"
{% if question_vote.is_downvote %}
- src="{% media "/content/images/vote-arrow-down-on.png" %}"
+ src="{% media "/media/images/vote-arrow-down-on.png" %}"
{% else %}
- src="{% media "/content/images/vote-arrow-down.png" %}"
+ src="{% media "/media/images/vote-arrow-down.png" %}"
{% endif %}
alt="{% trans "i dont like this post (click again to cancel)" %}"
title="{% trans "i dont like this post (click again to cancel)" %}" />
@@ -92,27 +92,27 @@
{% else %}
<img id="question-img-upvote-{{ question.id }}" class="question-img-upvote"
alt="{% trans "i like this post (click again to cancel)" %}"
- src="{% media "/content/images/vote-arrow-up.png" %}"
+ src="{% media "/media/images/vote-arrow-up.png" %}"
title="{% trans "i like this post (click again to cancel)" %}" />
<div id="question-vote-number-{{ question.id }}" class="vote-number"
title="{% trans "current number of votes" %}">
{{ question.score }}
</div>
<img id="question-img-downvote-{{ question.id }}" class="question-img-downvote"
- src="{% media "/content/images/vote-arrow-down.png" %}"
+ src="{% media "/media/images/vote-arrow-down.png" %}"
alt="{% trans "i dont like this post (click again to cancel)" %}"
title="{% trans "i dont like this post (click again to cancel)" %}" />
{% endif %}
{% if favorited %}
- <img class="question-img-favorite" src="{% media "/content/images/vote-favorite-on.png" %}"
+ <img class="question-img-favorite" src="{% media "/media/images/vote-favorite-on.png" %}"
alt="{% trans "mark this question as favorite (click again to cancel)" %}"
title="{% trans "mark this question as favorite (click again to cancel)" %}" />
<div id="favorite-number" class="favorite-number my-favorite-number">
{{ question.favourite_count }}
</div>
{% else %}
- <img class="question-img-favorite" src="{% media "/content/images/vote-favorite-off.png" %}"
+ <img class="question-img-favorite" src="{% media "/media/images/vote-favorite-off.png" %}"
alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"
title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />
<div id="favorite-number" class="favorite-number">
@@ -178,7 +178,7 @@
<span class="comment-age">({% diff_date comment.added_at %})</span>
{% if request.user|can_delete_comment:comment %}
<img class="delete-icon"
- src="{% media "/content/images/close-small.png" %}"
+ src="{% media "/media/images/close-small.png" %}"
title="{% trans "delete this comment" %}"/>
{% endif %}
{% endspaceless %}
@@ -251,26 +251,26 @@
<td style="width:30px;vertical-align:top">
<div class="vote-buttons">
<img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote"
- src="{% blockmedia %}/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockmedia %}"
+ src="{% blockmedia %}/media/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockmedia %}"
alt="{% trans "i like this answer (click again to cancel)" %}"
title="{% trans "i like this answer (click again to cancel)" %}"/>
<div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">
{{ answer.score }}
</div>
<img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote"
- src="{% blockmedia %}/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockmedia %}"
+ src="{% blockmedia %}/media/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockmedia %}"
alt="{% trans "i dont like this answer (click again to cancel)" %}"
title="{% trans "i dont like this answer (click again to cancel)" %}" />
{% ifequal request.user question.author %}
<img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept"
- src="{% blockmedia %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}"
+ src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}"
alt="{% trans "mark this answer as favorite (click again to undo)" %}"
title="{% trans "mark this answer as favorite (click again to undo)" %}" />
{% else %}
{% if answer.accepted %}
<img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept"
- src="{% blockmedia %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}"
+ src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}"
alt="{% trans "the author of the question has selected this answer as correct" %}"
title="{% trans "the author of the question has selected this answer as correct" %}" />
{% endif %}
@@ -327,7 +327,7 @@
<span class="comment-age">({% diff_date comment.added_at %})</span>
{% if request.user|can_delete_comment:comment %}
<img class="delete-icon"
- src="{% media "/content/images/close-small.png" %}"
+ src="{% media "/media/images/close-small.png" %}"
title="{% trans "delete this comment" %}"/>
{% endif %}
{% endspaceless %}
diff --git a/forum/templates/question_edit.html b/forum/templates/question_edit.html
index 59b70477..fe711849 100644
--- a/forum/templates/question_edit.html
+++ b/forum/templates/question_edit.html
@@ -4,12 +4,12 @@
{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "Edit question" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/showdown.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/wmd/wmd.js" %}'></script>
- <link rel="stylesheet" type="text/css" href="{% media "/content/js/wmd/wmd.css" %}" />
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/showdown.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/wmd/wmd.js" %}'></script>
+ <link rel="stylesheet" type="text/css" href="{% media "/media/js/wmd/wmd.css" %}" />
<script type="text/javascript">
//todo move javascript out
$().ready(function(){
diff --git a/forum/templates/question_retag.html b/forum/templates/question_retag.html
index 6a240dbc..03f3da04 100644
--- a/forum/templates/question_retag.html
+++ b/forum/templates/question_retag.html
@@ -3,9 +3,9 @@
{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "Change tags" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.validate.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.validate.pack.js" %}'></script>
<script type="text/javascript">
$().ready(function(){
diff --git a/forum/templates/questions.html b/forum/templates/questions.html
index e849e09d..77802efc 100644
--- a/forum/templates/questions.html
+++ b/forum/templates/questions.html
@@ -19,8 +19,8 @@
Hilite.debug_referrer = location.href;
});
</script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.tag_selector.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.tag_selector.js" %}'></script>
{% endblock %}
{% block content %}
<div class="tabBar">
diff --git a/forum/templates/revisions_answer.html b/forum/templates/revisions_answer.html
index 1c2e9c2f..b2e33dfe 100644
--- a/forum/templates/revisions_answer.html
+++ b/forum/templates/revisions_answer.html
@@ -6,8 +6,8 @@
{% load humanize %}
{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
<script type="text/javascript">
//todo - take this out into .js file
$().ready(function(){
@@ -24,7 +24,7 @@
var arrow = $("#rev-arrow-" + id);
var visible = arrow.attr("src").indexOf("hide") > -1;
- var path = $.i18n._('/') + "content/images/expander-arrow-" +
+ var path = $.i18n._('/') + "media/images/expander-arrow-" +
(visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
arrow.attr("src", path);
$("#rev-body-" + id).slideToggle("fast");
@@ -46,7 +46,7 @@
<table width="100%">
<tr>
<td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}"
- src="{% media "/content/images/expander-arrow-show.gif" %}"
+ src="{% media "/media/images/expander-arrow-show.gif" %}"
alt="{% trans "click to hide/show revision" %}"/>
</td>
<td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
diff --git a/forum/templates/revisions_question.html b/forum/templates/revisions_question.html
index e945c6d6..86d52a36 100644
--- a/forum/templates/revisions_question.html
+++ b/forum/templates/revisions_question.html
@@ -7,8 +7,8 @@
{% load humanize %}
{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.editor.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.post.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.editor.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.post.js" %}'></script>
<script type="text/javascript">
//todo - take this out into .js file
$().ready(function(){
@@ -25,7 +25,7 @@
var arrow = $("#rev-arrow-" + id);
var visible = arrow.attr("src").indexOf("hide") > -1;
- var path = $.i18n._('/') + "content/images/expander-arrow-" +
+ var path = $.i18n._('/') + "media/images/expander-arrow-" +
(visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
arrow.attr("src", path);
$("#rev-body-" + id).slideToggle("fast");
@@ -46,7 +46,7 @@
<table width="100%">
<tr>
<td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}"
- src="{% media "/content/images/expander-arrow-show.gif" %}"
+ src="{% media "/media/images/expander-arrow-show.gif" %}"
alt="{% trans "click to hide/show revision" %}"/>
</td>
<td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
diff --git a/forum/templates/tag_selector.html b/forum/templates/tag_selector.html
index 07ffb135..7686d717 100644
--- a/forum/templates/tag_selector.html
+++ b/forum/templates/tag_selector.html
@@ -10,7 +10,7 @@
title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
<img class="delete-icon"
- src="{% media "/content/images/close-small-dark.png" %}"
+ src="{% media "/media/images/close-small-dark.png" %}"
title="{% blocktrans %}remove '{{tag_name}}' from the list of interesting tags{% endblocktrans %}"/>
</span>
{% endspaceless %}
@@ -27,7 +27,7 @@
title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
<img class="delete-icon"
- src="{% media "/content/images/close-small-dark.png" %}"
+ src="{% media "/media/images/close-small-dark.png" %}"
title="{% blocktrans %}remove '{{tag_name}}' from the list of ignored tags{% endblocktrans %}"/>
</span>
{% endspaceless %}
diff --git a/forum/templates/user.html b/forum/templates/user.html
index 9f3e8370..5931f31c 100644
--- a/forum/templates/user.html
+++ b/forum/templates/user.html
@@ -12,8 +12,8 @@
{% endblock %}
{% block forejs %}
{% if request.user|can_moderate_users %}
- <script type='text/javascript' src='{% media "/content/js/com.cnprog.admin.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.form.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/com.cnprog.admin.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.form.js" %}'></script>
{% endif %}
<script type="text/javascript">
var viewUserID = {{view_user.id}};
diff --git a/forum/templates/user_edit.html b/forum/templates/user_edit.html
index cc144e24..040ebff4 100644
--- a/forum/templates/user_edit.html
+++ b/forum/templates/user_edit.html
@@ -24,7 +24,7 @@
{% if request.user.email %}
{% gravatar request.user 128 %}
{% else %}
- <img src="{% media "/content/images/nophoto.png" %}">
+ <img src="{% media "/media/images/nophoto.png" %}">
{% endif %}
<div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
<a href="http://www.gravatar.com/" target="_blank"
diff --git a/forum/templates/user_reputation.html b/forum/templates/user_reputation.html
index 2f959c27..776935ae 100644
--- a/forum/templates/user_reputation.html
+++ b/forum/templates/user_reputation.html
@@ -4,8 +4,8 @@
{% load extra_filters %}
{% load humanize %}
{% block userjs %}
- <script type='text/javascript' src='{% media "/content/js/excanvas.pack.js" %}'></script>
- <script type='text/javascript' src='{% media "/content/js/jquery.flot.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/excanvas.pack.js" %}'></script>
+ <script type='text/javascript' src='{% media "/media/js/jquery.flot.pack.js" %}'></script>
<script type="text/javascript">
$().ready(function(){
diff --git a/forum/templates/user_stats.html b/forum/templates/user_stats.html
index 8fc16447..933764d9 100644
--- a/forum/templates/user_stats.html
+++ b/forum/templates/user_stats.html
@@ -69,12 +69,12 @@
<table>
<tr>
<td width="60">
- <img style="cursor: default;" src="{% media "/content/images/vote-arrow-up-on.png" %}" alt="{% trans "thumb up" %}" />
+ <img style="cursor: default;" src="{% media "/media/images/vote-arrow-up-on.png" %}" alt="{% trans "thumb up" %}" />
<span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
</td>
<td width="60">
- <img style="cursor: default;" src="{% media "/content/images/vote-arrow-down-on.png" %}" alt="{% trans "thumb down" %}" />
+ <img style="cursor: default;" src="{% media "/media/images/vote-arrow-down-on.png" %}" alt="{% trans "thumb down" %}" />
<span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
</td>
diff --git a/forum/templates/user_votes.html b/forum/templates/user_votes.html
index f29e3394..b56aab01 100644
--- a/forum/templates/user_votes.html
+++ b/forum/templates/user_votes.html
@@ -12,9 +12,9 @@
<div style="width:150px;float:left">{% diff_date vote.voted_at 3 %}</div>
<div style="width:30px;float:left">
{% ifequal vote.vote 1 %}
- <img src="{% media "/content/images/vote-arrow-up-on.png" %}" title="{% trans "upvote" %}">
+ <img src="{% media "/media/images/vote-arrow-up-on.png" %}" title="{% trans "upvote" %}">
{% else %}
- <img src="{% media "/content/images/vote-arrow-down-on.png" %}" title="{% trans "downvote" %}">
+ <img src="{% media "/media/images/vote-arrow-down-on.png" %}" title="{% trans "downvote" %}">
{% endifequal %}
</div>
<div style="float:left;overflow:hidden;width:750px">
diff --git a/forum/templates/users_questions.html b/forum/templates/users_questions.html
index 5c7fb551..eb1be4ee 100644
--- a/forum/templates/users_questions.html
+++ b/forum/templates/users_questions.html
@@ -10,14 +10,14 @@
<div class="favorites-count">
<img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}"
alt="{% trans "thumb-up on" %}"
- src="{% media "/content/images/vote-favorite-on.png" %}"/>
+ src="{% media "/media/images/vote-favorite-on.png" %}"/>
<div><b>{{question.favourite_count|intcomma}}</b></div>
</div>
{% else %}
<div class="favorites-count-off">
<img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}"
alt="{% trans "thumb-up off" %}"
- src="{% media "/content/images/vote-favorite-off.png" %}"/>
+ src="{% media "/media/images/vote-favorite-off.png" %}"/>
<div><b>{{question.favourite_count|intcomma}}</b></div>
</div>
{% endif %}
diff --git a/forum/upfiles/README b/forum/upfiles/README
new file mode 100644
index 00000000..17bf8ecb
--- /dev/null
+++ b/forum/upfiles/README
@@ -0,0 +1,2 @@
+This directory is to contain uploaded images and other files
+must be writable by the webserver
diff --git a/forum/urls.py b/forum/urls.py
index 42746d44..19d97d00 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -18,13 +18,13 @@ APP_PATH = os.path.dirname(os.path.dirname(__file__))
urlpatterns = patterns('',
url(r'^$', app.index, name='index'),
url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
- (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
- (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
- (r'^content/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
+ (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.ico'}),
+ (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.gif'}),
+ (r'^media/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': os.path.join(APP_PATH, 'media').replace('\\','/')}
),
(r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
- {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
+ {'document_root': os.path.join(APP_PATH, '/upfiles').replace('\\','/')}
),
(r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
url(r'^%s$' % _('about/'), app.about, name='about'),