Skip to content
Browse files

git-svn-id: https://svn.uswaretech.com/forumproject@160 ad127118-9ec2…

…-4c8a-8d99-4e47e8ea721e
  • Loading branch information...
1 parent 88e8216 commit 8e8fcf93e69c3e71b3fa1d5338f4fff3102e8b31 shabda committed Oct 4, 2009
Showing with 21 additions and 8 deletions.
  1. +3 −1 dinette/models.py
  2. +18 −6 dinette/templates/dinette/base.html
  3. +0 −1 dinette/urls.py
View
4 dinette/models.py
@@ -222,9 +222,11 @@ def classname(self):
class DinetteUserProfile(models.Model):
user = models.ForeignKey(User)
last_activity = models.DateTimeField(auto_now_add=True)
- userrank = models.CharField(max_length=30,default="Junior Memeber")
+ userrank = models.CharField(max_length=30,default="Junior Member")
last_posttime = models.DateTimeField(auto_now_add=True)
photo = models.ImageField(upload_to='dinette/files',null=True,blank=True)
+ signature = models.CharField(max_length = 1000, null = True, blank = True)
+
def get_total_posts(self):
return self.user.ftopics_set.count() + self.user.reply_set.count()
View
24 dinette/templates/dinette/base.html
@@ -1,12 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+{% load compress %}
+
+{% block html_declare %}
<html>
+{% endblock %}
+
<head>
+ {% compress css %}
<link rel="stylesheet" type="text/css" media="screen" href="{{ MEDIA_URL }}dinette/css/oxygen.css" />
- <link rel="stylesheet" type="text/css" media="screen" href="{{ MEDIA_URL }}dinette/css/oxygen_cs.css" />
-<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}dinette/css/Oxygen_ie6.css" /><![endif]-->
-<!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}dinette/css/Oxygen_ie7.css" /><![endif]-->
- <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}dinette/css/djorumstyle.css">
+ <link rel="stylesheet" type="text/css" media="screen" href="{{ MEDIA_URL }}dinette/css/oxygen_cs.css" />
+ <!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}dinette/css/Oxygen_ie6.css" /><![endif]-->
+ <!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}dinette/css/Oxygen_ie7.css" /><![endif]-->
+ <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}dinette/css/djorumstyle.css">
+ {% endcompress %}
<title>
{% block title %} {{ config.name }} - {{ config.tag_line }} {% endblock %}
@@ -15,12 +23,16 @@
</head>
<body>
-
-{% block content%} {% endblock %}
+{% block main_content %} {% endblock %}
+{% block content %} {% endblock %}
+
+
+{% compress js %}
<script type="text/javascript" src="{{ MEDIA_URL }}dinette/scripts/jquery13.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}dinette/scripts/jqueryform.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}dinette/scripts/djorumajax.js"></script>
+{% endcompress %}
View
1 dinette/urls.py
@@ -16,7 +16,6 @@
url(r'^(?P<categoryslug>[\w-]+)/page(?P<pageno>\d+)/$','category_details', name='dinette_index2'),
url(r'^post/topic/$','postTopic', name='dinette_posttopic'),
url(r'^post/reply/$','postReply', name='dinette_postreply'),
- #url(r'^topics/list/$','topic_list', name='dinette_topic_list'),
url(r'^(?P<categoryslug>[\w-]+)/(?P<topic_slug>[\w-]+)/$','topic_detail', name='dinette_topic_detail'),
url(r'^(?P<categoryslug>[\w-]+)/(?P<topic_slug>[\w-]+)/page(?P<pageno>\d+)/$','topic_detail', name='dinette_reply_detail_paged'),
#moderation views - Hence dont bother with SEF urls

0 comments on commit 8e8fcf9

Please sign in to comment.
Something went wrong with that request. Please try again.