Merge pull request #3 from queryselector/master

Fixes + Icons
This commit is contained in:
Amos Blanton 2012-12-20 07:27:03 -08:00
commit 72630c23e6
37 changed files with 84 additions and 89 deletions

View file

@ -74,4 +74,14 @@ $(document).ready(function() {
//log("unbind onbeforeunload");
window.onbeforeunload = null;
});
!function () {
var submitted = false;
$('#post').submit(function (e) {
if (submitted) {
e.preventDefault();
}
submitted = true;
});
}();
});

View file

@ -104,7 +104,7 @@ LABEL.conl {
/* 5.2 Set up page numbering and posts links */
DIV.linkst .conl, DIV.linksb .conl, DIV.postlinksb .conl {WIDTH:18em}
DIV.linkst .conl, DIV.linksb .conl, DIV.postlinksb .conl { float:right; width: auto }
DIV.linkst .conr, DIV.linksb .conr, DIV.postlinksb .conr {WIDTH:16em}
@ -112,7 +112,7 @@ FORM DIV.linksb .conr {WIDTH: 32em}
/* 5.3 Keep breadcrumbs from shifting to the right when wrapping */
.linkst UL, linksb UL, .postlinksb UL {MARGIN-LEFT: 18em}
/*.linkst UL, linksb UL, .postlinksb UL {MARGIN-LEFT: 18em}*/
/* 5.4 Settings for Profile and Admin interface.*/

View file

@ -131,21 +131,35 @@ without interferring with IE's rather nice default */
.inew = new posts, .iredirect = redirect forums, .iclosed = closed topics and
.isticky = sticky topics. The default is "icon". By default only .inew is different.*/
DIV.forum_icon {background:url(../img/active_forum.gif)}
DIV.icon {background:url(../img/inactive_topic.gif)}
DIV.inew {background:url(../img/active_topic.gif)}
DIV.sticky {background:url(../img/sticky_topic.gif)}
DIV.closed {background:url(../img/closed_topic.gif)}
TR.inew DIV.icon {background:url(../img/active_topic.gif)}
TR.isticky DIV.inew {background:url(../img/active_topic.gif)}
TR.iclosed DIV.icon {background:url(../img/closed.png)}
DIV.iredirect {background:url(../img/link.png)}
.closed {
background-image: url(../img/icon/closed.png);
}
.inew {
background-image: url(../img/icon/new.png);
}
.sticky {
background-image: url(../img/icon/sticky.png);
}
.sticky.closed {
background-image: url(../img/icon/sticky-closed.png);
}
.closed-topic a {
color: #aaa;
}
div.inew, div.sticky, div.closed {
margin-top: .7em !important;
}
/****************************************************************/
/* 6. EXTRAS */
/****************************************************************/
/* #brdmenu {BACKGROUND: url(../img/fon111.gif); border-top: 1px solid #46586a;border-bottom: 1px solid #46586a; BACKGROUND-COLOR: #46586a;} */
/* header logo */
.posteditmessage {
color: #aaa;
}
.djangobb H1 span
{
/* color: #3A3B3C; */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 619 B

View file

@ -20,7 +20,7 @@
{% for post in posts %}
<div id="p{{ post.id }}" class="blockpost roweven firstpost">
<a name="post-{{ post.id }}"></a>
<h2><span><span class="conr">#{{ forloop.counter }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{% forum_time post.created %}</a></span></h2>
<h2><span><span class="conr">#{{ forloop.counter }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{{ post.created|forum_time }}</a></span></h2>
<div class="box">
<div class="inbox box-content">
<div class="postleft">
@ -34,7 +34,7 @@
<div class="postmsg">
{{ post.body_html|safe }}
{% if post.updated %}
<p class="postedit"><em>{% trans "Edited" %} {{ post.user.username }} ({% forum_time post.updated %})</em></p>
<p class="postedit"><em>{% trans "Edited" %} {{ post.user.username }} ({{ post.updated|forum_time }})</em></p>
{% endif %}
</div>
{% if not forloop.first %}
@ -50,7 +50,7 @@
<div class="postlinksb">
<div class="inbox">
<div class="pagelink conl">{% paginate %}</div>
<p class="conr"><input type="submit" value="{% trans "Delete" %}" class="small grey button" /></p>
<p class="conr"><button type="submit" class="grey button"><span>{% trans "Delete" %}</span></button></p>
<div class="clearer"></div>
</div>
</div>

View file

@ -32,7 +32,7 @@
</fieldset>
</div>
<p><input type="submit" value="{% trans "Save" %}" class="small grey button" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
<p><button type="submit" class="grey button"><span>{% trans "Save" %}</span></button> <a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
</form>
</div>
</div>

View file

@ -42,8 +42,8 @@
<div class="nosize"><!-- --></div>
</div>
<div {% if topic.sticky %}class="sticky"{% else %}{% if topic.closed %}class="closed"{% else %}{% if topic|has_unreads:user %}class="inew"{% else %}class="forumicon"{% endif %}{% endif %}{% endif %}><div class="nosize"><!-- --></div></div>
<div class="tclcon">
<div {% if topic.sticky %}class="sticky{% if topic.closed %} closed{% endif %}"{% else %}{% if topic.closed %}class="closed"{% else %}{% if topic|has_unreads:user %}class="inew"{% else %}class="forumicon"{% endif %}{% endif %}{% endif %}><div class="nosize"><!-- --></div></div>
<div class="tclcon{% if topic.closed %} closed-topic{% endif %}">
{% if topic.sticky %}
{% trans "Sticky:" %}
{% endif %}
@ -55,7 +55,7 @@
</td>
<td class="tc2">{{ topic.reply_count }}</td>
<td class="tc3">{{ topic.views }}</td>
<td class="tcr"><a href="{{ topic.last_post.get_absolute_url }}">{% forum_time topic.updated %}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
<td class="tcr"><a href="{{ topic.last_post.get_absolute_url }}">{{ topic.updated|forum_time }}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
</tr>
{% endfor %}
{% else %}

View file

@ -34,7 +34,7 @@
<td class="tcr">
{% if forum.updated %}
{% if forum.last_post.topic %}
<a href="{{ forum.last_post.get_absolute_url }}">{% forum_time forum.last_post.created %}</a>
<a href="{{ forum.last_post.get_absolute_url }}">{{ forum.last_post.created|forum_time }}</a>
<span class="byuser">{% trans "by" %} {{ forum.last_post.user.username }}</span>
{% endif %}
{% endif %}

View file

@ -21,7 +21,7 @@
<li id="navadmin" class="admin-only"><a href="{% url admin:index %}">{% trans "Administration" %}</a></li>
{% endif %}
{% if user.is_authenticated %}
<li id="navprofile"><a href="{% url djangobb:forum_profile request.user %}personality/">{% trans "Settings" %}</a></li>
<li id="navprofile"><a href="{% url djangobb:forum_profile_personality request.user %}">{% trans "Settings" %}</a></li>
{% comment %}
<li id="navprofile"><a href="{% url djangobb:forum_profile request.user %}">{% trans "Profile" %}</a></li>
{% endcomment %}
@ -36,7 +36,7 @@
<ul class="conl">
{% if user.is_authenticated %}
<li>{% trans "Logged in as" %} <strong>{{ user.username }}</strong></li>
<li>{% trans "Last visit:" %} {% forum_time user.last_login %}</li>
<li>{% trans "Last visit:" %} {{ user.last_login|forum_time }}</li>
{% if forum_settings.PM_SUPPORT and messages_inbox_count > 0 %}
<ul><li class="pmlink"><strong><a href="{% url messages_inbox %}">{% trans "There are new messages" %} ({{ messages_inbox_count }})</a></strong></li></ul>
{% endif %}

View file

@ -53,7 +53,7 @@
</fieldset>
</div>
{% endif %}
<p><input type="submit" class="small grey button" name="{{ form.FORM_NAME }}" value="{% trans "Submit" %}" /><a href="{{ back_url|default_if_none:"javascript:history.go(-1)" }}">{% trans "Go back" %}</a></p>
<p><button type="submit" class="grey button" name="{{ form.FORM_NAME }}"><span>{% trans "Submit" %}</span></button> <a href="{{ back_url|default_if_none:"javascript:history.go(-1)" }}">{% trans "Go back" %}</a></p>
</form>
</div>
</div>

View file

@ -2,7 +2,7 @@
{% load i18n %}
<div class="blockpost searchposts roweven">
<h2>{% link post.topic.forum %}&nbsp;&raquo;&nbsp;{% link post.topic %}&nbsp;&raquo;&nbsp;<a href="{{ post.get_absolute_url }}">{% forum_time post.created %}</a></h2>
<h2>{% link post.topic.forum %}&nbsp;&raquo;&nbsp;{% link post.topic %}&nbsp;&raquo;&nbsp;<a href="{{ post.get_absolute_url }}">{{ post.created|forum_time }}</a></h2>
<div class="box">
<div class="inbox">
@ -22,4 +22,4 @@
<div class="clearer"></div>
</div>
</div>
</div>
</div>

View file

@ -86,7 +86,7 @@
<dl id="onlinelist" class= "clearb">
<dt><strong>{% trans "Online:" %} </strong></dt>
{% for online in users_online %}
<dd>{{ online|profile_link }}</dd>
<dd>{{ online|profile_link }}{% if not forloop.last %},{% endif %}</dd>
{% endfor %}
</dl>
{% endif %}

View file

@ -19,7 +19,7 @@
<div class='postwrapper'>
<div class='posttopbar'>
<div class='postname'>{{ post.user.username }}</div>
<div class='postdate'>{% forum_time post.created %}</div>
<div class='postdate'>{{ post.created|forum_time }}</div>
</div>
<div class='postcontent'>
{{ post.body_html|safe }}

View file

@ -47,7 +47,7 @@
</td>
<td class="tc2">{{ topic.reply_count }}</td>
<td class="tc3">{{ topic.views }}</td>
<td class="tcr"><a href="{{ topic.get_absolute_url }}">{% forum_time topic.updated %}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
<td class="tcr"><a href="{{ topic.get_absolute_url }}">{{ topic.updated|forum_time }}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
<td class="tcmod"><input type="checkbox" name="topic_id" value="{{ topic.id }}" /></td>
</tr>
{% endfor %}

View file

@ -20,7 +20,7 @@
{% for post in posts %}
<div id="p{{ post.id }}" class="blockpost roweven firstpost">
<a name="post-{{ post.id }}"></a>
<h2><span><span class="conr">#{{ forloop.counter }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{% forum_time post.created %}</a></span></h2>
<h2><span><span class="conr">#{{ forloop.counter }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{{ post.created|forum_time }}</a></span></h2>
<div class="box">
<div class="inbox box-content">
<div class="postleft">
@ -34,7 +34,7 @@
<div class="postmsg">
{{ post.body_html|safe }}
{% if post.updated %}
<p class="postedit"><em>{% trans "Edited" %} {{ post.user.username }} ({% forum_time post.updated %})</em></p>
<p class="postedit"><em>{% trans "Edited" %} {{ post.user.username }} ({{ post.updated|forum_time }})</em></p>
{% endif %}
</div>
<p class="multidelete"><label><strong>{% trans "Select" %}</strong>&nbsp;&nbsp;<input type="checkbox" name="post" value="{{ post.id }}" /></label></p>
@ -62,7 +62,7 @@
</div>
</fieldset>
</div>
<p><input type="submit" value="{% trans "Move" %}" class="small grey button" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
<p><button type="submit" class="grey button"><span>{% trans "Move" %}</span></button> <a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
<div class="clearer"></div>
</div>
</div>

View file

@ -31,7 +31,7 @@
</div>
</fieldset>
</div>
<p><input type="submit" value="{% trans "Move" %}" class="small grey button" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
<p><button type="submit" class="grey button"><span>{% trans "Move" %}</span></button> <a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
</form>
</div>
</div>

View file

@ -12,6 +12,15 @@ body {
font: 11px/1.4 Verdana, Arial, Helvetica, sans-serif;
margin: 6px;
}
a {
color: #1AA0D8;
text-decoration: none;
text-shadow: none;
}
a:hover, a:active {
color: #1AA0D8;
text-decoration: underline;
}
</style>
</head>
<body class="djangobb">

View file

@ -3,9 +3,11 @@
{% load i18n %}
{% block content %}
<div id="profile" class="block2col">
{% if forum_settings.DISPLAY_PROFILE_MENU_OPTIONS %}
<div id="profile" class="block2col">
{% include 'djangobb_forum/profile/profile_menu.html' %}
{% else }
<div id="profile">
{% endif %}
<div class="blockform">
<h2><span>{{ profile.username }} - {% trans "Personality" %}</span></h2>
@ -50,7 +52,7 @@
</div>
</fieldset>
</div>
<p><input name="update" value="{% trans "Submit" %}" type="submit">{% trans "When you update your profile, you will be redirected back to this page." %}</p>
<p><button name="update" class="grey button" type="submit"><span>{% trans "Submit" %}</span></button> {% trans "When you update your profile, you will be redirected back to this page." %}</p>
</form>
</div>
</div>

View file

@ -19,7 +19,7 @@
</div>
</fieldset>
</div>
<p><input type="submit" name="submit" value="{% trans "Submit" %}" accesskey="s" /><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
<p><button type="submit" class="grey button" name="submit" accesskey="s"><span>{% trans "Submit" %}</span></button><a href="javascript:history.go(-1)">{% trans "Go back" %}</a></p>
</form>
</div>
</div>

View file

@ -27,7 +27,7 @@
<br><br>
Posted By:<a href="{% url profile_detail report.post.user.username %}"> {{ report.post.user }} </a>
</td><td>
<input type="submit" name="zap_id[{{ report.id }}]" value=" Zap ">
<button type="submit" class="grey button" name="zap_id[{{ report.id }}]"><span>Zap</span></button>
</td></tr>
{% endfor %}
</table>
@ -59,7 +59,7 @@ Posted By:<a href="{% url profile_detail report.post.user.username %}"> {{ repor
<br><br>
Posted By:<a href="{% url profile_detail report.post.user.username %}"> {{ report.post.user }} </a>
</td><td>
<input type="submit" name="zap_id[{{ report.id }}]" value=" Unzap ">
<button type="submit" class="grey button" name="zap_id[{{ report.id }}]"><span>Unzap</span></button>
<br>
Zapped By: {{ report.zapped_by }}
</td></tr>

View file

@ -42,7 +42,7 @@
<img src="{{ STATIC_URL }}djangobb_forum/img/reputation/warn_minus.gif" alt="+" border="0">
{% endif %}
</td>
<td>{% forum_time reputation.time %}</td>
<td>{{ reputation.time|forum_time }}</td>
{% if request.user.is_superuser %}
<td style="text-align: center;"><input type="checkbox" name="reputation_id" value="{{ reputation.id }}"></td>
{% endif %}

View file

@ -67,7 +67,7 @@
</div>
</fieldset>
</div>
<p><input type="submit" value="{% trans "Submit" %}" accesskey="s" /></p>
<p><button type="submit" class="grey button" accesskey="s"><span>{% trans "Submit" %}</span></button></p>
</form>
</div>
</div>

View file

@ -48,7 +48,7 @@
</td>
<td class="tc2">{% link topic.forum %}</td>
<td class="tc3">{{ topic.reply_count }}</td>
<td class="tcr"><a href="{{ topic.get_absolute_url }}">{% forum_time topic.updated %}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
<td class="tcr"><a href="{{ topic.get_absolute_url }}">{{ topic.updated|forum_time }}</a> <span class="byuser">{% trans "by" %} {{ topic.last_post.user.username }}</span></td>
</tr>
{% empty %}
<tr>

View file

@ -55,7 +55,7 @@
<a name="post-{{ post.id }}"></a>
<div class="box">
<h2><span><span class="conr">#{{ forloop.counter|add:first_post_number }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{% forum_time post.created %}</a></span></h2>
<h2><span><span class="conr">#{{ forloop.counter|add:first_post_number }}&nbsp;</span><a href="{{ post.get_absolute_url }}">{{ post.created|forum_time }}</a></span></h2>
<div class="inbox box-content">
<div class="postleft">
<dl>
@ -133,7 +133,7 @@
{% endif %}
{% endif %}
{% if post.updated %}
<p class="postedit"><em>{% trans "Edited" %} {{ post.updated_by.username }} ({% forum_time post.updated %})</em></p>
<p class="postedit"><em>{% trans "Edited" %} {{ post.updated_by.username }} ({{ post.updated|forum_time }})</em></p>
{% endif %}
{% with post.attachments.all as attachments %}
{% if attachments %}

View file

@ -27,7 +27,7 @@
<p class="clearb">{% trans "Enter a username to search for. The username field can be left blank. Sort users by name, date registered or number of posts and in ascending/descending order." %}</p>
</div>
</fieldset>
<input type="submit" value="{% trans "Search" %}" />
<button type="submit" class="grey button"><span>{% trans "Search" %}</span></button>
</div>
</form>
</div>

View file

@ -7,6 +7,7 @@ from django.core.cache import cache
from django.utils.safestring import mark_safe
from django.utils.encoding import smart_unicode
from django.db import settings
from django.utils.text import capfirst
from django.utils.html import escape
from django.utils.hashcompat import md5_constructor
from django.contrib.humanize.templatetags.humanize import naturalday
@ -29,25 +30,9 @@ def profile_link(user):
return mark_safe(data)
@register.tag
def forum_time(parser, token):
try:
tag, time = token.split_contents()
except ValueError:
raise template.TemplateSyntaxError('forum_time requires single argument')
else:
return ForumTimeNode(time)
class ForumTimeNode(template.Node):
def __init__(self, time):
self.time = template.Variable(time)
def render(self, context):
time = self.time.resolve(context)
formated_time = u'%s %s' % (naturalday(time), time.strftime('%H:%M:%S'))
formated_time = mark_safe(formated_time)
return formated_time
@register.filter
def forum_time(time):
return u'%s %s' % (capfirst(naturalday(time)), time.strftime('%H:%M:%S'))
# TODO: this old code requires refactoring

View file

@ -18,36 +18,11 @@ urlpatterns = patterns('',
url('^search/$', forum_views.search, name='search'),
url('^misc/$', forum_views.misc, name='misc'),
# User
url('^user/(?P<username>.*)/upload_avatar/$', forum_views.upload_avatar, {
'form_class': UploadAvatarForm,
'template': 'djangobb_forum/upload_avatar.html'
}, name='forum_profile_upload_avatar'),
url('^user/(?P<username>.*)/privacy/$', forum_views.user, {
'section': 'privacy',
'form_class': PrivacyProfileForm,
'template': 'djangobb_forum/profile/profile_privacy.html'
}, name='forum_profile_privacy'),
url('^user/(?P<username>.*)/display/$', forum_views.user, {
'section': 'display',
'form_class': DisplayProfileForm,
'template': 'djangobb_forum/profile/profile_display.html'
}, name='forum_profile_display'),
url('^user/(?P<username>.*)/personality/$', forum_views.user, {
url('^user/(?P<username>.*)/settings/$', forum_views.user, {
'section': 'personality',
'form_class': PersonalityProfileForm,
'template': 'djangobb_forum/profile/profile_personality.html'
}, name='forum_profile_personality'),
url('^user/(?P<username>.*)/messaging/$', forum_views.user, {
'section': 'messaging',
'form_class': MessagingProfileForm,
'template': 'djangobb_forum/profile/profile_messaging.html'
}, name='forum_profile_messaging'),
url('^user/(?P<username>.*)/personal/$', forum_views.user, {
'section': 'personal',
'form_class': PersonalProfileForm,
'template': 'djangobb_forum/profile/profile_personal.html'
}, name='forum_profile_personal'),
url('^user/(?P<username>.*)/essentials/$', forum_views.user, name='forum_profile_essentials'),
url('^user/(?P<username>.*)/$', forum_views.user, name='forum_profile'),
url('^users/$', forum_views.users, name='forum_users'),

View file

@ -21,7 +21,7 @@ from haystack.query import SearchQuerySet, SQ
from djangobb_forum import settings as forum_settings
from djangobb_forum.forms import AddPostForm, EditPostForm, UserSearchForm, \
PostSearchForm, ReputationForm, MailToForm, EssentialsProfileForm, \
PostSearchForm, ReputationForm, MailToForm, PersonalityProfileForm, \
VotePollForm, ReportForm, VotePollForm, PollForm
from djangobb_forum.models import Category, Forum, Topic, Post, Reputation, \
Report, Attachment, PostTracking
@ -562,7 +562,7 @@ def upload_avatar(request, username, template=None, form_class=None):
@transaction.commit_on_success
def user(request, username, section='essentials', action=None, template='djangobb_forum/profile/profile_essentials.html', form_class=EssentialsProfileForm):
def user(request, username, section='personality', action=None, template='djangobb_forum/profile/profile_personality.html', form_class=PersonalityProfileForm):
user = get_object_or_404(User, username=username)
if request.user.is_authenticated():
# looking at your own, you see the options that you can change