summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-11 20:30:19 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-11 20:30:19 -0500
commitae6761ca8aeaa5e4d5467781fc17063afcc9b7b6 (patch)
treee7d65382f5b32b2ca6a64493a055c47b92e49485
parent6eb767adc62f1013f0e03537947563695669c50f (diff)
downloadaskbot-ae6761ca8aeaa5e4d5467781fc17063afcc9b7b6.tar.gz
askbot-ae6761ca8aeaa5e4d5467781fc17063afcc9b7b6.tar.bz2
askbot-ae6761ca8aeaa5e4d5467781fc17063afcc9b7b6.zip
removed com.cnprog and org.askbot from file names
-rw-r--r--askbot/__init__.py2
-rw-r--r--askbot/skins/default/media/js/admin.js (renamed from askbot/skins/default/media/js/com.cnprog.admin.js)0
-rwxr-xr-xaskbot/skins/default/media/js/compress.bat2
-rw-r--r--askbot/skins/default/media/js/editor.js (renamed from askbot/skins/default/media/js/com.cnprog.editor.js)0
-rw-r--r--askbot/skins/default/media/js/i18n.js (renamed from askbot/skins/default/media/js/com.cnprog.i18n.js)0
-rw-r--r--askbot/skins/default/media/js/output-words.html (renamed from askbot/skins/default/media/js/org.askbot.output-words.html)6
-rw-r--r--askbot/skins/default/media/js/output-words.js (renamed from askbot/skins/default/media/js/org.askbot.output-words.js)2
-rw-r--r--askbot/skins/default/media/js/post.js (renamed from askbot/skins/default/media/js/com.cnprog.post.js)0
-rw-r--r--askbot/skins/default/media/js/tag_selector.js (renamed from askbot/skins/default/media/js/com.cnprog.tag_selector.js)0
-rw-r--r--askbot/skins/default/media/js/utils.js (renamed from askbot/skins/default/media/js/com.cnprog.utils.js)0
-rw-r--r--askbot/skins/default/templates/answer_edit.html4
-rw-r--r--askbot/skins/default/templates/ask.html4
-rw-r--r--askbot/skins/default/templates/base.html4
-rw-r--r--askbot/skins/default/templates/question.html4
-rw-r--r--askbot/skins/default/templates/question_edit.html4
-rw-r--r--askbot/skins/default/templates/question_retag.html4
-rw-r--r--askbot/skins/default/templates/questions.html4
-rw-r--r--askbot/skins/default/templates/revisions.html6
-rw-r--r--askbot/skins/default/templates/user.html2
19 files changed, 24 insertions, 24 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py
index 87e9e2e5..7b1e48fe 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -22,7 +22,7 @@ def get_version():
"""returns version of the askbot app
this version is meaningful for pypi only
"""
- return '0.6.26'
+ return '0.6.27'
#todo: maybe send_mail functions belong to models
#or the future API
diff --git a/askbot/skins/default/media/js/com.cnprog.admin.js b/askbot/skins/default/media/js/admin.js
index 39dff48c..39dff48c 100644
--- a/askbot/skins/default/media/js/com.cnprog.admin.js
+++ b/askbot/skins/default/media/js/admin.js
diff --git a/askbot/skins/default/media/js/compress.bat b/askbot/skins/default/media/js/compress.bat
index 5b2673cf..53d72588 100755
--- a/askbot/skins/default/media/js/compress.bat
+++ b/askbot/skins/default/media/js/compress.bat
@@ -1,5 +1,5 @@
#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js
#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js
-#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js
+#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 post.js -o post.pack.js
java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 se_hilite_src.js -o se_hilite.js
pause
diff --git a/askbot/skins/default/media/js/com.cnprog.editor.js b/askbot/skins/default/media/js/editor.js
index 18cc5166..18cc5166 100644
--- a/askbot/skins/default/media/js/com.cnprog.editor.js
+++ b/askbot/skins/default/media/js/editor.js
diff --git a/askbot/skins/default/media/js/com.cnprog.i18n.js b/askbot/skins/default/media/js/i18n.js
index 6f5616b1..6f5616b1 100644
--- a/askbot/skins/default/media/js/com.cnprog.i18n.js
+++ b/askbot/skins/default/media/js/i18n.js
diff --git a/askbot/skins/default/media/js/org.askbot.output-words.html b/askbot/skins/default/media/js/output-words.html
index 6fc359e0..8ea5f314 100644
--- a/askbot/skins/default/media/js/org.askbot.output-words.html
+++ b/askbot/skins/default/media/js/output-words.html
@@ -5,7 +5,7 @@
and generates an empty template containing all the keys
for new translations.
- Needs org.askbot.output-words.js and other JavaScript files shipped with Askbot.
+ Needs output-words.js and other JavaScript files shipped with Askbot.
@author Pekka Gaiser <post@pekkagaiser.com>
@package Part of the ASKBOT project <www.askbot.org>
@@ -33,8 +33,8 @@
<script type="text/javascript">i18nLang = "De";</script>
<script type="text/javascript" src="jquery-1.2.6.js"></script>
-<script type="text/javascript" src="com.cnprog.i18n.js"></script>
-<script type="text/javascript" src="org.askbot.output-words.js"></script>
+<script type="text/javascript" src="i18n.js"></script>
+<script type="text/javascript" src="output-words.js"></script>
</head>
diff --git a/askbot/skins/default/media/js/org.askbot.output-words.js b/askbot/skins/default/media/js/output-words.js
index a9ad6981..41e25651 100644
--- a/askbot/skins/default/media/js/org.askbot.output-words.js
+++ b/askbot/skins/default/media/js/output-words.js
@@ -5,7 +5,7 @@
and generates an empty template containing all the keys
for new translations.
- Is included by org.askbot.output-words.html.
+ Is included by output-words.html.
@author Pekka Gaiser <post@pekkagaiser.com>
@package Part of the ASKBOT project <www.askbot.org>
diff --git a/askbot/skins/default/media/js/com.cnprog.post.js b/askbot/skins/default/media/js/post.js
index d21cc7cd..d21cc7cd 100644
--- a/askbot/skins/default/media/js/com.cnprog.post.js
+++ b/askbot/skins/default/media/js/post.js
diff --git a/askbot/skins/default/media/js/com.cnprog.tag_selector.js b/askbot/skins/default/media/js/tag_selector.js
index 6b33852e..6b33852e 100644
--- a/askbot/skins/default/media/js/com.cnprog.tag_selector.js
+++ b/askbot/skins/default/media/js/tag_selector.js
diff --git a/askbot/skins/default/media/js/com.cnprog.utils.js b/askbot/skins/default/media/js/utils.js
index aec04ffd..aec04ffd 100644
--- a/askbot/skins/default/media/js/com.cnprog.utils.js
+++ b/askbot/skins/default/media/js/utils.js
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index 79bc8b4d..b263c03f 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -33,9 +33,9 @@
{% block endjs %}
{% include "editor_data.html" %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type='text/javascript'>
{% if settings.ENABLE_MATHJAX or settings.MARKUP_CODE_FRIENDLY %}
var codeFriendlyMarkdown = true;
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 1ab19bce..52d130e5 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -9,9 +9,9 @@
{% include "question_edit_tips.html" %}
{% endblock %}
{% block endjs %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/jquery.validate.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
{% include "editor_data.html" %}
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 1d69f406..d9ca2dea 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -51,9 +51,9 @@
src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"
{% endif %}
></script>
- <script type='text/javascript' src="{{"/js/com.cnprog.i18n.js"|media }}"></script>
+ <script type='text/javascript' src="{{"/js/i18n.js"|media }}"></script>
<script type='text/javascript' src="{{"/js/jquery.i18n.js"|media }}"></script>
- <script type='text/javascript' src="{{"/js/com.cnprog.utils.js"|media }}"></script>
+ <script type='text/javascript' src="{{"/js/utils.js"|media }}"></script>
{% if settings.ENABLE_MATHJAX %}
<script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js">
MathJax.Hub.Config({
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 8ef973f0..d5b188ed 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -405,7 +405,7 @@
{% endblock %}
{% block endjs %}
{% if not question.closed %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
<script type='text/javascript'>
{% if settings.ENABLE_MATHJAX or settings.MARKUP_CODE_FRIENDLY %}
var codeFriendlyMarkdown = true;
@@ -418,7 +418,7 @@
<script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
{% endif %}
<script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type="text/javascript">
{% if request.user.is_authenticated() %}
var tags_autocomplete = {{tags_autocomplete|safe}};
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index 9b341a81..5729dc02 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -38,9 +38,9 @@
{% block endjs %}
{% include "editor_data.html" %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media }}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media }}'></script>
<script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
<script type="text/javascript">
diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html
index f4e52514..49b68745 100644
--- a/askbot/skins/default/templates/question_retag.html
+++ b/askbot/skins/default/templates/question_retag.html
@@ -44,8 +44,8 @@
</div>
{% endblock %}
{% block endjs %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
<script type="text/javascript">
$().ready(function(){
diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html
index 7bd838c0..13f3fbe2 100644
--- a/askbot/skins/default/templates/questions.html
+++ b/askbot/skins/default/templates/questions.html
@@ -245,9 +245,9 @@
Hilite.debug_referrer = location.href;
});
</script>
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
{% if request.user.is_authenticated() %}
- <script type='text/javascript' src='{{"/js/com.cnprog.tag_selector.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/tag_selector.js"|media}}'></script>
{% endif %}
<script type="text/javascript" src="{{"/js/live_search.js"|media}}"></script>
{% endblock %}
diff --git a/askbot/skins/default/templates/revisions.html b/askbot/skins/default/templates/revisions.html
index 02de2871..cb1af2f0 100644
--- a/askbot/skins/default/templates/revisions.html
+++ b/askbot/skins/default/templates/revisions.html
@@ -66,11 +66,11 @@
{% endblock %}
{% block endjs %}
- <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
- <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/post.js"|media}}'></script>
<script type="text/javascript">
//todo - take this out into .js file
- $().ready(function(){
+ $(document).ready(function(){
$("#nav_questions").attr('className',"on");
$('div.revision div[id^=rev-header-]').bind('click', function(){
var revId = this.id.substr(11);
diff --git a/askbot/skins/default/templates/user.html b/askbot/skins/default/templates/user.html
index 59de49b5..4a42d23d 100644
--- a/askbot/skins/default/templates/user.html
+++ b/askbot/skins/default/templates/user.html
@@ -23,7 +23,7 @@
{% block endjs %}
{% if request.user|can_moderate_user(view_user) %}
<!-- todo: add condition that scripts are loaded for admins only -->
- <script type='text/javascript' src='{{"/js/com.cnprog.admin.js"|media}}'></script>
+ <script type='text/javascript' src='{{"/js/admin.js"|media}}'></script>
<script type='text/javascript' src='{{"/js/jquery.form.js"|media}}'></script>
{% endif %}
<script type="text/javascript">