summaryrefslogtreecommitdiffstats
path: root/forum
diff options
context:
space:
mode:
Diffstat (limited to 'forum')
-rwxr-xr-xforum/authentication/forms.py2
-rw-r--r--forum/context.py2
-rwxr-xr-xforum/skins/__init__.py12
-rwxr-xr-xforum/skins/default/media/js/com.cnprog.utils.js4
-rwxr-xr-xforum/skins/default/templates/base.html2
-rwxr-xr-xforum/skins/default/templates/base_content.html2
-rwxr-xr-xforum/skins/default/templates/footer.html4
-rwxr-xr-xforum/urls.py4
-rwxr-xr-xforum/views/commands.py2
-rwxr-xr-xforum/views/meta.py2
10 files changed, 18 insertions, 18 deletions
diff --git a/forum/authentication/forms.py b/forum/authentication/forms.py
index 7fa06b01..24e76c08 100755
--- a/forum/authentication/forms.py
+++ b/forum/authentication/forms.py
@@ -39,7 +39,7 @@ class TemporaryLoginRequestForm(forms.Form):
class SimpleEmailSubscribeForm(forms.Form):
SIMPLE_SUBSCRIBE_CHOICES = (
('y',_('okay, let\'s try!')),
- ('n',_('no OSQA community email please, thanks'))
+ ('n',_('no community email please, thanks'))
)
subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
error_messages={'required':_('please choose one of the options above')},
diff --git a/forum/context.py b/forum/context.py
index 905d24dd..d8f1d838 100644
--- a/forum/context.py
+++ b/forum/context.py
@@ -15,7 +15,7 @@ def application_settings(context):
'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
'WIKI_ON':settings.WIKI_ON,
'RESOURCE_REVISION':settings.RESOURCE_REVISION,
- 'OSQA_SKIN':settings.OSQA_DEFAULT_SKIN,
+ 'ASKBOT_SKIN':settings.ASKBOT_DEFAULT_SKIN,
}
return {'settings':my_settings}
diff --git a/forum/skins/__init__.py b/forum/skins/__init__.py
index be6bd4f3..10b6a340 100755
--- a/forum/skins/__init__.py
+++ b/forum/skins/__init__.py
@@ -5,9 +5,9 @@ from django.http import HttpResponse
import os.path
import logging
-#module for skinning osqa
+#module for skinning askbot
#at this point skin can be changed only in settings file
-#via OSQA_DEFAULT_SKIN variable
+#via ASKBOT_DEFAULT_SKIN variable
#note - Django template loaders use method django.utils._os.safe_join
#to work on unicode file paths
@@ -15,7 +15,7 @@ import logging
def load_template_source(name, dirs=None):
try:
- tname = os.path.join(settings.OSQA_DEFAULT_SKIN,'templates',name)
+ tname = os.path.join(settings.ASKBOT_DEFAULT_SKIN,'templates',name)
return filesystem.load_template_source(tname,dirs)
except:
tname = os.path.join('default','templates',name)
@@ -26,7 +26,7 @@ def find_media_source(url):
"""returns url prefixed with the skin name
of the first skin that contains the file
directories are searched in this order:
- settings.OSQA_DEFAULT_SKIN, then 'default', then 'commmon'
+ settings.ASKBOT_DEFAULT_SKIN, then 'default', then 'commmon'
if file is not found - returns None
and logs an error message
"""
@@ -37,9 +37,9 @@ def find_media_source(url):
f = os.path.isfile
skins = n(j(d(d(__file__)),'skins'))
try:
- media = os.path.join(skins, settings.OSQA_DEFAULT_SKIN, url)
+ media = os.path.join(skins, settings.ASKBOT_DEFAULT_SKIN, url)
assert(f(media))
- use_skin = settings.OSQA_DEFAULT_SKIN
+ use_skin = settings.ASKBOT_DEFAULT_SKIN
except:
try:
media = j(skins, 'default', url)
diff --git a/forum/skins/default/media/js/com.cnprog.utils.js b/forum/skins/default/media/js/com.cnprog.utils.js
index 3f7720c1..3b816ed7 100755
--- a/forum/skins/default/media/js/com.cnprog.utils.js
+++ b/forum/skins/default/media/js/com.cnprog.utils.js
@@ -1,6 +1,6 @@
-//var $, scriptUrl, osqaSkin
+//var $, scriptUrl, askbotSkin
var mediaUrl = function(resource){
- return scriptUrl + 'm/' + osqaSkin + '/' + resource;
+ return scriptUrl + 'm/' + askbotSkin + '/' + resource;
};
var showMessage = function(object, msg) {
diff --git a/forum/skins/default/templates/base.html b/forum/skins/default/templates/base.html
index cd7aba23..6a06e7cd 100755
--- a/forum/skins/default/templates/base.html
+++ b/forum/skins/default/templates/base.html
@@ -21,7 +21,7 @@
/* <![CDATA[ */
var i18nLang = '{{settings.LANGUAGE_CODE}}';
var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
- var osqaSkin = '{{settings.OSQA_SKIN}}';
+ var askbotSkin = '{{settings.ASKBOT_SKIN}}';
/* ]] */
</script>
<script type='text/javascript' src='{% media "/media/js/com.cnprog.i18n.js" %}'></script>
diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index d1cf673b..c98e1f67 100755
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -19,7 +19,7 @@
<script type="text/javascript">
var i18nLang = '{{ settings.LANGUAGE_CODE }}';
var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
- var osqaSkin = '{{settings.OSQA_SKIN}}';
+ var askbotSkin = '{{settings.ASKBOT_SKIN}}';
</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>
diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 66ea2bc5..cb46c2cc 100755
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -21,8 +21,8 @@
{% endspaceless %}
</div>
<p>
- <a href="http://osqa.net" target="_blank">
- powered by OSQA
+ <a href="http://askbot.net" target="_blank">
+ powered by ASKBOT
</a>
</p>
</div>
diff --git a/forum/urls.py b/forum/urls.py
index 3e99af41..a76906cb 100755
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -23,7 +23,7 @@ urlpatterns = patterns('',
#(r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.gif'}),
url(r'^m/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': os.path.join(APP_PATH,'skins').replace('\\','/')},
- name='osqa_media',
+ name='askbot_media',
),
url(r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
{'document_root': os.path.join(APP_PATH,'upfiles').replace('\\','/')},
@@ -81,7 +81,7 @@ urlpatterns = patterns('',
url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.meta.badge, name='badge'),
url(r'^%s%s$' % (_('messages/'), _('markread/')),app.commands.read_message, name='read_message'),
# (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
- url(r'^%s(.*)' % _('nimda/'), admin.site.root, name='osqa_admin'),
+ url(r'^%s(.*)' % _('nimda/'), admin.site.root, name='askbot_admin'),
url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feeds'),
url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
url(r'^%s$' % _('search/'), app.readers.search, name='search'),
diff --git a/forum/views/commands.py b/forum/views/commands.py
index ca6569e2..b312242d 100755
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -317,7 +317,7 @@ def reopen(request, id):#re-open question
'question' : question,
}, context_instance=RequestContext(request))
-#osqa-user communication system
+#askbot-user communication system
def read_message(request):#marks message a read
if request.method == "POST":
if request.POST['formdata'] == 'required':
diff --git a/forum/views/meta.py b/forum/views/meta.py
index 6417e8f5..40f3d394 100755
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -51,7 +51,7 @@ def logout(request):#refactor/change behavior?
#I guess rationale was to tell the user that s/he may be still logged in
#through their external login sytem and we'd want to remind them about it
#however it might be a little annoying
-#why not just show a message: you are logged out of osqa, but
+#why not just show a message: you are logged out of askbot, but
#if you really want to log out -> go to your openid provider
return render_to_response('logout.html', {
'next' : get_next_url(request),
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 00:08:39 +0000