Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

So many changes.

  • Loading branch information...
commit 2d8cde90d5b54969337504badfcf978f0244f952 1 parent c2eb878
Eric Florenzano authored
View
24 media/css/screen.css
@@ -88,16 +88,14 @@ ul.messages li a.clear_button {
color: white;
}
-/* Event */
-div.event_container { margin-bottom: 5px; }
-div.event { height: 60px; }
-div.event img { margin: 1px 10px 0px 0px; float: left; }
-div.event .username {
- float: left;
- position: relative;
- display: block;
- right: 68px;
- top: 48px;
+/* Person */
+div.person { margin: 1px 20px 10px 0px; float: left; }
+div.person a { text-decoration: none; }
+div.person .username {
+ float: left;
+ position: absolute;
+ margin-top: 47px;
+ z-index: 1;
width: 58px;
font-weight: bolder;
font-size: 11px;
@@ -110,6 +108,10 @@ div.event .username {
-webkit-opacity: 0.7;
-moz-opacity: 0.7;
}
+
+/* Event */
+div.event_container { margin-bottom: 5px; }
+div.event { height: 60px; }
div.event span.description_small {
display: block;
padding: 20px 10px 0px 0px;
@@ -333,4 +335,4 @@ body { height: 100%; }
.container_12 { position: relative; min-height: 100%; }
* html .container_12 { height: 100%; }
#content { padding-bottom: 7em; }
-#footer { position: relative; margin-top: -3.5em; }
+#footer { position: relative; margin-top: -3.5em; }
View
20 media/js/global.js
@@ -52,13 +52,21 @@ $(function() {
return false;
});
});
- $('div.event .username').livequery(function() {
+ $('div.person').livequery(function() {
$(this).mouseover(function() {
- $(this).animate({'fontSize': '12px'}, "fast");
- $(this).fadeTo('fast', 1.0);
+ $(this).animate({'marginRight': '16px', 'marginBottom': '0px'}, "fast")
+ .find('img')
+ .animate({'width': '65px', 'height': '65px', 'marginTop': '-3px', 'marginLeft': '-3px'}, "fast")
+ .parent().find('.username')
+ .animate({'fontSize': '12px', 'width': '65px', 'marginTop': '51px', 'marginLeft': '-3px'}, "fast")
+ .fadeTo('fast', 1.0);
}).mouseout(function() {
- $(this).animate({'fontSize': '11px'}, "fast");
- $(this).fadeTo('fast', 0.7);
+ $(this).animate({'marginRight': '20px', 'marginBottom': '10px'}, "fast")
+ .find('img')
+ .animate({'width': '58px', 'height': '58px', 'marginTop': '0px', 'marginLeft': '0px'}, "fast")
+ .parent().find('.username')
+ .animate({'fontSize': '11px', 'width': '58px', 'marginTop': '47px', 'marginLeft': '0px'}, "fast")
+ .fadeTo('fast', 0.7);
});
});
$('#event_form').ajaxForm({
@@ -103,4 +111,4 @@ $(function() {
$('.unattend').val('').livequery(function() {
$(this).val('');
});
-});
+});
View
2  profile/__init__.py
@@ -0,0 +1,2 @@
+
+
View
1  profile/models.py
@@ -0,0 +1 @@
+# Nothing to see here.
View
2  profile/templatetags/__init__.py
@@ -0,0 +1,2 @@
+
+
View
7 profile/templatetags/profile_tags.py
@@ -0,0 +1,7 @@
+from django import template
+
+def person(user):
+ return {'user': user}
+
+register = template.Library()
+register.inclusion_tag('profile/person.html')(person)
View
3  settings.py
@@ -99,9 +99,10 @@
'startthedark.socialgraph',
'pagination',
'gravatar',
+ 'profile',
)
try:
from local_settings import *
except ImportError:
- pass
+ pass
View
10 templates/events/event.html
@@ -1,9 +1,9 @@
{% load gravatar %}
{% load events_tags %}
+{% load profile_tags %}
<div class="event_container{% if event_num %} event_num_{{ event_num }}{% endif %}">
<div class="grid_10 alpha event">
- {% gravatar event.creator 58 %}
- <a class="username" href="">{{ event.creator.username|truncate:"12" }}</a>
+ {% person event.creator %}
<span class="description_{{ event.description_size }}">{{ event.description }}</span>
</div>
<div class="grid_1 person_count">
@@ -20,9 +20,9 @@
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}{{ request.path }}{% endif %}" />
<input type="hidden" name="event_id" value="{{ event.id }}" />
{% if attending %}
- <input class="attendance unattend" type="submit" value="No Longer Attending" />
+ <input class="attendance unattend" type="submit" value="&#10003;" />
{% else %}
- <input class="attendance attend" type="submit" value="I Will Attend" />
+ <input class="attendance attend" type="submit" value="+" />
{% endif %}
</form>
{% else %}
@@ -31,4 +31,4 @@
</div>
{% endif %}
<div class="clear"></div>
-</div>
+</div>
View
5 templates/events/event_details.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load events_tags %}
+{% load profile_tags %}
{% block main_content %}
<h2 id="event_title">Event</h2>
@@ -8,6 +9,6 @@ <h2 id="event_title">Event</h2>
{% event event 1 %}
<h2 id="attendees_title">Attendees</h2>
{% for person in event.attendees.all %}
- {{ person }}
+ {% person person %}
{% endfor %}
-{% endblock %}
+{% endblock %}
View
8 templates/profile/person.html
@@ -0,0 +1,8 @@
+{% load gravatar %}
+{% load events_tags %}
+<div class="person">
+ <a href="">
+ <span class="username">{{ user.username|truncate:"12" }}</span>
+ {% gravatar user 58 %}
+ </a>
+</div>
Please sign in to comment.
Something went wrong with that request. Please try again.