summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrcerqueira <hrcerqueira@gmail.com>2010-03-04 11:32:37 +0000
committerhrcerqueira <hrcerqueira@gmail.com>2010-03-04 11:32:37 +0000
commitc05e229c817647799a991028bee6cb727301b0a6 (patch)
tree160f3b9026be92460fd79ab5999e50cd73febd6c
parent90140cbc1e1e5ce4c79cf872b6cef754b342f0bf (diff)
downloadaskbot-c05e229c817647799a991028bee6cb727301b0a6.tar.gz
askbot-c05e229c817647799a991028bee6cb727301b0a6.tar.bz2
askbot-c05e229c817647799a991028bee6cb727301b0a6.zip
fixed rss feed and a couple more bugs in templates
-rwxr-xr-x.idea/workspace.xml185
-rwxr-xr-xforum/models/__init__.py2
-rwxr-xr-xforum/models/repute.py13
-rwxr-xr-xforum/skins/default/templates/index.html2
-rwxr-xr-xforum/skins/default/templates/user_stats.html2
-rwxr-xr-xforum/skins/default/templates/user_tabs.html14
-rwxr-xr-xforum/urls.py4
-rw-r--r--settings.py2
8 files changed, 138 insertions, 86 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 81da1ab9..44b0b2f7 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -58,7 +58,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/templates/revisions_answer.html" afterPath="$PROJECT_DIR$/forum/skins/default/templates/revisions_answer.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/vote-arrow-up-on.png" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/vote-arrow-up-on.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/openid/openid.gif" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/openid/openid.gif" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/INSTALL" afterPath="$PROJECT_DIR$/INSTALL" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum_modules/localauth/authentication.py" afterPath="$PROJECT_DIR$/forum_modules/localauth/authentication.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/__init__.py" afterPath="$PROJECT_DIR$/forum/skins/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/vote-arrow-up.png" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/vote-arrow-up.png" />
@@ -97,8 +96,8 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/middleware/__init__.py" afterPath="$PROJECT_DIR$/forum/middleware/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/openid/yahoo.gif" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/openid/yahoo.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/utils/forms.py" afterPath="$PROJECT_DIR$/forum/utils/forms.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/answer.py" afterPath="$PROJECT_DIR$/forum/models/answer.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/management/commands/sample_command.py" afterPath="$PROJECT_DIR$/forum/management/commands/sample_command.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/answer.py" afterPath="$PROJECT_DIR$/forum/models/answer.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/middleware/anon_user.py" afterPath="$PROJECT_DIR$/forum/middleware/anon_user.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/style/openid.css" afterPath="$PROJECT_DIR$/forum/skins/default/media/style/openid.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/logo.png" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/logo.png" />
@@ -143,8 +142,8 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/jquery-openid/images/google.gif" afterPath="$PROJECT_DIR$/forum/skins/default/media/jquery-openid/images/google.gif" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/authentication/__init__.py" afterPath="$PROJECT_DIR$/forum/authentication/__init__.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/base.py" afterPath="$PROJECT_DIR$/forum/models/base.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum_modules/oauthauth/lib/__init__.py" afterPath="$PROJECT_DIR$/forum_modules/oauthauth/lib/__init__.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/base.py" afterPath="$PROJECT_DIR$/forum/models/base.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/templatetags/extra_tags.py" afterPath="$PROJECT_DIR$/forum/templatetags/extra_tags.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum_modules/openidauth/models.py" afterPath="$PROJECT_DIR$/forum_modules/openidauth/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/style/style.css" afterPath="$PROJECT_DIR$/forum/skins/default/media/style/style.css" />
@@ -159,8 +158,8 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/templates/base.html" afterPath="$PROJECT_DIR$/forum/skins/default/templates/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/templates/question_edit_tips.html" afterPath="$PROJECT_DIR$/forum/skins/default/templates/question_edit_tips.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/const.py" afterPath="$PROJECT_DIR$/forum/const.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/question.py" afterPath="$PROJECT_DIR$/forum/models/question.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cron/once_award_badges_virtualenv" afterPath="$PROJECT_DIR$/cron/once_award_badges_virtualenv" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/question.py" afterPath="$PROJECT_DIR$/forum/models/question.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/logo1.png" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/logo1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/jquery-openid/images/livejournal-1.png" afterPath="$PROJECT_DIR$/forum/skins/default/media/jquery-openid/images/livejournal-1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/js/jquery-1.2.6.min.js" afterPath="$PROJECT_DIR$/forum/skins/default/media/js/jquery-1.2.6.min.js" />
@@ -224,6 +223,7 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/openid/blogger.ico" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/openid/blogger.ico" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum_modules/sphinxfulltext/handlers.py" afterPath="$PROJECT_DIR$/forum_modules/sphinxfulltext/handlers.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/sql_scripts/update_2010_01_23.sql" afterPath="$PROJECT_DIR$/sql_scripts/update_2010_01_23.sql" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/settings.py" afterPath="$PROJECT_DIR$/forum/settings.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/models/meta.py" afterPath="$PROJECT_DIR$/forum/models/meta.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/templates/authopenid/signin.html" afterPath="$PROJECT_DIR$/forum/skins/default/templates/authopenid/signin.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/forum/skins/default/media/images/openid/google.gif" afterPath="$PROJECT_DIR$/forum/skins/default/media/images/openid/google.gif" />
@@ -376,55 +376,46 @@
<component name="FileColors" enabled="true" enabledForTabs="true" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="settings.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/settings.py">
+ <file leaf-file-name="repute.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/forum/models/repute.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="1" selection-start="2690" selection-end="2690" vertical-scroll-proportion="0.0">
+ <state line="97" column="16" selection-start="3777" selection-end="3777" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/forum/urls.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="78" column="35" selection-start="4847" selection-end="4847" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="header.html" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/header.html">
+ <file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="29" selection-start="207" selection-end="283" vertical-scroll-proportion="-4.9583335">
+ <state line="113" column="38" selection-start="4999" selection-end="4999" vertical-scroll-proportion="0.5612903">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="users.html" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/users.html">
+ <file leaf-file-name="style.css" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/media/style/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="94" selection-start="2171" selection-end="2171" vertical-scroll-proportion="-14.875">
+ <state line="1013" column="1" selection-start="17211" selection-end="17218" vertical-scroll-proportion="-21.36">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="questions.html" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/questions.html">
+ <file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/forum/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="16" selection-start="4128" selection-end="4128" vertical-scroll-proportion="0.8308458">
+ <state line="109" column="77" selection-start="7604" selection-end="7625" vertical-scroll-proportion="-17.2">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/index.html">
+ <file leaf-file-name="feed.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/forum/feed.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="8" selection-start="1653" selection-end="3273" vertical-scroll-proportion="-0.7083333">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -433,25 +424,25 @@
<file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/forum/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="88" selection-start="4150" selection-end="4150" vertical-scroll-proportion="-15.24">
+ <state line="95" column="61" selection-start="4124" selection-end="4124" vertical-scroll-proportion="-20.68">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="settings_local.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/settings_local.py">
+ <file leaf-file-name="base.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/forum/models/base.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="32" selection-start="747" selection-end="747" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="settings_local.py.dist" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/settings_local.py.dist">
+ <file leaf-file-name="settings.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="26" column="5" selection-start="985" selection-end="985" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -460,7 +451,7 @@
<file leaf-file-name="settings.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/forum/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="59" selection-start="122" selection-end="122" vertical-scroll-proportion="0.0">
+ <state line="38" column="49" selection-start="1218" selection-end="1233" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -476,22 +467,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/forum/skins/default/templates/base_content.html" />
- <option value="$PROJECT_DIR$/forum/skins/default/templates/base.html" />
- <option value="$PROJECT_DIR$/forum/skins/default/templates/auth/signin.html" />
<option value="$PROJECT_DIR$/forum/views/auth.py" />
<option value="$PROJECT_DIR$/forum_modules/localauth/views.py" />
<option value="$PROJECT_DIR$/forum/templatetags/extra_tags.py" />
<option value="$PROJECT_DIR$/forum/settings_builder.py" />
<option value="$PROJECT_DIR$/INSTALL" />
<option value="$PROJECT_DIR$/forum/settings.py" />
- <option value="$PROJECT_DIR$/settings.py" />
<option value="$PROJECT_DIR$/forum/skins/default/templates/header.html" />
- <option value="$PROJECT_DIR$/forum/models/__init__.py" />
- <option value="$PROJECT_DIR$/forum/skins/default/templates/index.html" />
- <option value="$PROJECT_DIR$/forum/urls.py" />
<option value="$PROJECT_DIR$/forum/skins/default/templates/users.html" />
<option value="$PROJECT_DIR$/forum/skins/default/templates/questions.html" />
+ <option value="$PROJECT_DIR$/forum/skins/default/templates/user_stats.html" />
+ <option value="$PROJECT_DIR$/forum/skins/default/templates/user_tabs.html" />
+ <option value="$PROJECT_DIR$/settings.py" />
+ <option value="$PROJECT_DIR$/forum/models/repute.py" />
+ <option value="$PROJECT_DIR$/forum/urls.py" />
+ <option value="$PROJECT_DIR$/forum/models/__init__.py" />
+ <option value="$PROJECT_DIR$/forum/skins/default/templates/index.html" />
</list>
</option>
</component>
@@ -578,6 +569,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osqa" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osqa" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="forum" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="skins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -603,8 +612,34 @@
<option name="myItemId" value="default" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osqa" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="templates" />
+ <option name="myItemId" value="osqa" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="forum" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="skins" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="default" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="media" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="style" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -629,6 +664,10 @@
<option name="myItemId" value="default" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="media" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -956,114 +995,114 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/osqa-requirements.txt">
+ <entry file="file://$PROJECT_DIR$/forum/views/writers.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/osqa.wsgi.dist">
+ <entry file="file://$PROJECT_DIR$/forum/views/commands.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="36" selection-start="102" selection-end="138" vertical-scroll-proportion="0.0">
+ <state line="65" column="38" selection-start="2466" selection-end="2468" vertical-scroll-proportion="-3.96">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/modules.py">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/about.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.056384742">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/settings_local.py.dist">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/header.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="20" column="87" selection-start="912" selection-end="912" vertical-scroll-proportion="-7.7916665">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/settings_local.py">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/user.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="32" selection-start="747" selection-end="747" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/user_stats.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="111" column="113" selection-start="5031" selection-end="5031" vertical-scroll-proportion="-4.0416665">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/INSTALL">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/user_tabs.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="24" selection-start="905" selection-end="905" vertical-scroll-proportion="0.81832296">
+ <state line="27" column="76" selection-start="2050" selection-end="2050" vertical-scroll-proportion="-19.125">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/forum/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="59" selection-start="122" selection-end="122" vertical-scroll-proportion="0.0">
+ <state line="38" column="49" selection-start="1218" selection-end="1233" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="1" selection-start="2690" selection-end="2690" vertical-scroll-proportion="0.0">
+ <state line="26" column="5" selection-start="985" selection-end="985" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/models/__init__.py">
+ <entry file="file://$PROJECT_DIR$/forum/models/base.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="88" selection-start="4150" selection-end="4150" vertical-scroll-proportion="-15.24">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/question.html">
+ <entry file="file://$PROJECT_DIR$/forum/models/repute.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.16915423">
+ <state line="97" column="16" selection-start="3777" selection-end="3777" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/header.html">
+ <entry file="file://$PROJECT_DIR$/forum/feed.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="29" selection-start="207" selection-end="283" vertical-scroll-proportion="-4.9583335">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/urls.py">
+ <entry file="file://$PROJECT_DIR$/forum/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="35" selection-start="4847" selection-end="4847" vertical-scroll-proportion="0.0">
+ <state line="95" column="61" selection-start="4124" selection-end="4124" vertical-scroll-proportion="-20.68">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/users.html">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/media/style/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="94" selection-start="2171" selection-end="2171" vertical-scroll-proportion="-14.875">
+ <state line="1013" column="1" selection-start="17211" selection-end="17218" vertical-scroll-proportion="-21.36">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/index.html">
+ <entry file="file://$PROJECT_DIR$/forum/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="8" selection-start="1653" selection-end="3273" vertical-scroll-proportion="-0.7083333">
+ <state line="109" column="77" selection-start="7604" selection-end="7625" vertical-scroll-proportion="-17.2">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/questions.html">
+ <entry file="file://$PROJECT_DIR$/forum/skins/default/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="16" selection-start="4128" selection-end="4128" vertical-scroll-proportion="0.8308458">
+ <state line="113" column="38" selection-start="4999" selection-end="4999" vertical-scroll-proportion="0.5612903">
<folding />
</state>
</provider>
diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index 4e29c215..3998021b 100755
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -93,7 +93,7 @@ def delete_messages(self):
def get_profile_url(self):
"""Returns the URL for this User's profile."""
- return reverse('user_prof', kwargs={'id': self.id, 'slug': slugify(self.username)})
+ return "/users/%d/%s" % (self.id, slugify(self.username))
def get_profile_link(self):
profile_link = u'<a href="%s">%s</a>' % (self.get_profile_url(),self.username)
diff --git a/forum/models/repute.py b/forum/models/repute.py
index f0ee27ed..533f1323 100755
--- a/forum/models/repute.py
+++ b/forum/models/repute.py
@@ -85,9 +85,18 @@ class ReputeManager(models.Manager):
today = datetime.date.today()
sums = self.filter(models.Q(reputation_type=1) | models.Q(reputation_type=-8),
user=user, reputed_at__range=(today, today + datetime.timedelta(1))). \
- agregate(models.Sum('positive'), models.Sum('negative'))
+ aggregate(models.Sum('positive'), models.Sum('negative'))
- return sums['positive__sum'] + sums['negative__sum']
+ positive = sums['positive__sum']
+ negative = sums['negative__sum']
+
+ if positive is None:
+ positive = 0
+
+ if negative is None:
+ negative = 0
+
+ return positive + negative
else:
return 0
diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index 191387ef..42fa175d 100755
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -111,7 +111,7 @@
</div>
{% endif %}
<div id="feeds">
-<a href="{% media "/feeds/rss" %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
+<a href="{% url latest_questions_feed %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
</div>
{% endblock %}
{% block tail %}
diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html
index a3f88131..5ad1d71b 100755
--- a/forum/skins/default/templates/user_stats.html
+++ b/forum/skins/default/templates/user_stats.html
@@ -124,7 +124,7 @@
<tr>
<td width="180" style="line-height:35px">
{% for award in awards %}
- <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#x2715; {{ award.count|intcomma }}</span><br/>
+ <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ award.count|intcomma }}</span><br/>
{% if forloop.counter|divisibleby:"6" %}
</td>
<td width="180" style="line-height:35px">
diff --git a/forum/skins/default/templates/user_tabs.html b/forum/skins/default/templates/user_tabs.html
index 908e8430..136a1eaa 100755
--- a/forum/skins/default/templates/user_tabs.html
+++ b/forum/skins/default/templates/user_tabs.html
@@ -4,28 +4,28 @@
<div class="tabBar">
<div class="tabsA">
<a id="stats" {% ifequal tab_name "stats" %}class="on"{% endifequal %}
- title="{% trans "User profile" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
+ title="{% trans "User profile" %}" href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}/?sort=stats">{% trans "overview" %}</a>
<a id="recent" {% ifequal tab_name "recent" %}class="on"{% endifequal %}
- title="{% trans "recent activity" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
+ title="{% trans "recent activity" %}" href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=recent">{% trans "recent activity" %}</a>
{% if request.user|is_user_self:view_user %}
<a id="responses" {% ifequal tab_name "responses" %}class="on"{% endifequal %}
title="{% trans "comments and answers to others questions" %}"
- href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
+ href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=responses">{% trans "responses" %}</a>
{% endif %}
<a id="reputation" {% ifequal tab_name "reputation" %}class="on"{% endifequal %}
title="{% trans "graph of user reputation" %}"
- href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
+ href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=reputation">{% trans "reputation history" %}</a>
{% if request.user|can_view_user_votes:view_user %}
<a id="votes" {% ifequal tab_name "votes" %}class="on"{% endifequal %}
- title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
+ title="{% trans "user vote record" %}" href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=votes">{% trans "casted votes" %}</a>
{% endif %}
<a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %}
title="{% trans "questions that user selected as his/her favorite" %}"
- href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
+ href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=favorites">{% trans "favorites" %}</a>
{% if request.user|can_view_user_preferences:view_user %}
<a id="email_subscriptions" {% ifequal tab_name "email_subscriptions" %}class="on"{% endifequal %}
title="{% trans "email subscription settings" %}"
- href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=email_subscriptions">{% trans "email subscriptions" %}</a>
+ href="/users/{{ view_user.id }}/{{ view_user.username|slugify }}?sort=email_subscriptions">{% trans "email subscriptions" %}</a>
{% endif %}
</div>
</div>
diff --git a/forum/urls.py b/forum/urls.py
index 671b3da8..3e99af41 100755
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -105,7 +105,9 @@ urlpatterns = patterns('',
#url(r'^%s%s%s$' % (_('accounts/'), _('password/'), _('confirm/')), app.user.confirmchangepw, name='user_confirmchangepw'),
#url(r'^%s$' % _('account/'), app.users.account_settings, name='user_account_settings'),
- #url(r'^%s$' % _('delete/'), app.users.delete, name='user_delete'),
+ #url(r'^%s$' % _('delete/'), app.users.delete, name='user_delete'),
+
+ url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"),
)
from forum.modules import get_modules_script
diff --git a/settings.py b/settings.py
index f4a1f171..f9357877 100644
--- a/settings.py
+++ b/settings.py
@@ -30,6 +30,7 @@ MIDDLEWARE_CLASSES = [
'forum.middleware.cancel.CancelActionMiddleware',
#'recaptcha_django.middleware.ReCaptchaMiddleware',
'django.middleware.transaction.TransactionMiddleware',
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
]
TEMPLATE_CONTEXT_PROCESSORS = (
@@ -67,6 +68,7 @@ INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.humanize',
'django.contrib.sitemaps',
+ 'debug_toolbar',
'forum',
]