Fix OSQA 100, show revision number in the powered bi osqa link, in title attribute.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@241 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/context.py b/forum/context.py
index f7139ac404769e056e8bba04b539439d3d2fb075..1059332c28b0b0a866f52f8f66c549215225f333 100644 (file)
--- a/forum/context.py
+++ b/forum/context.py
@@ -1,5 +1,6 @@
 from forum import settings
 from django.conf import settings as djsettings
+
 def application_settings(context):
     my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
@@ -18,6 +19,9 @@ def application_settings(context):
         'WIKI_ON':settings.WIKI_ON,
         'OSQA_SKIN':djsettings.OSQA_DEFAULT_SKIN,
         'APP_FAVICON':settings.APP_FAVICON,
+        'OSQA_VERSION': settings.OSQA_VERSION,
+        'ADMIN_MEDIA_PREFIX': djsettings.ADMIN_MEDIA_PREFIX,
+        'SVN_REVISION': settings.SVN_REVISION,
         }
     return {'settings':my_settings}
 

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 6351ecee015369767addc448b9b669f1b223801a..5306aa7868f363a24531331bb5a6601a67310f70 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -5,8 +5,10 @@ from forms import ImageFormWidget
 from django.forms.widgets import Textarea
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings as djsettings
+from django.utils.version import get_svn_revision
 
-OSQA_VERSION = Setting('OSQA_VERSION', "Development Version")
+OSQA_VERSION = "Development Build"
+SVN_REVISION = get_svn_revision(djsettings.SITE_SRC_ROOT) 
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 APP_URL = djsettings.APP_URL
 FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS

diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 518318db77b1d3e073c4c033ba05b31602e3461b..907669af2ace14078ecda574903c4daf46bd7ba8 100644 (file)
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -20,7 +20,7 @@
                 {% endspaceless %}
                        </div>
                  <p>
-                        <a href="http://osqa.net" target="_blank">
+                        <a href="http://osqa.net" target="_blank" title="OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})">
                                powered by OSQA
                         </a>
                  </p>

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index ef20ad5c546cace9b44d554a6d45d6a9715656bb..38cab07e64404f9b21c5bd7cbe0df52f26581bef 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,6 +4,7 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
+{% load markup %}
 {% load user_tags %}
 <div id="subheader" class="headUser">
     {{view_user.username}}
@@ -104,7 +105,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|safe}}
+                {{view_user.about|markdown}}
             {% endif %}
             </div>
         </td>