Multiple fixes for hnofficehours

.gitignore

@@ -2,3 +2,4 @@ settings_local.py
 *.sqlite3
 pip-log.txt
 *.pyc
+*~

apps/profiles/models.py

@@ -4,6 +4,7 @@
 from tagging.fields import TagField
 from tagging.models import Tag
 from tagging_autocomplete.models import TagAutocompleteField
+from timezones.zones import PRETTY_TIMEZONE_CHOICES
 from timezones.fields import TimeZoneField
 
 class Profile(models.Model):
@@ -13,8 +14,8 @@ class Profile(models.Model):
     gchat = models.CharField("Google Chat", max_length=20, null=True, blank=True)
     phone = models.CharField("Phone number", max_length=20, null=True, blank=True)
     is_available = models.BooleanField("Available now")
-    timezone = TimeZoneField()
-
+    timezone = TimeZoneField(choices=sorted(PRETTY_TIMEZONE_CHOICES,
+                                        key=lambda x: (int(x[1][4:9]), x[1])))
     skills = models.ManyToManyField('Skill', blank=True)
     def __unicode__(self):
         return unicode(self.user)

apps/profiles/urls.py

@@ -7,8 +7,8 @@
         name='ajax_toggle_availability'),
     url(r'^set_availability/(?P<set_status>\d)/$', 'set_availability',
         name='set_availability'),
-    url(r'^skills/(?P<skill>\w+)/$', 'list_profiles_by_skill',
+    url(r'^skills/(?P<skill>[-.\w]+)/$', 'list_profiles_by_skill',
        name='list_profiles_by_skill'),
-    url(r'^(?P<username>\w+)/$', 'view_profile', name='view_profile'),
+    url(r'^(?P<username>[-.\w]+)/$', 'view_profile', name='view_profile'),
     url(r'^(?P<profile_id>\d+)/skill/(?P<skill_id>\d+)/(?P<verb>\w+)/$', 'ajax_view', name='ajax-view'),
 )

apps/search/views.py

@@ -14,12 +14,12 @@ def search(request):
                 try:
                     qs = [list(chain(*[skill.profile_set.all() for skill in Skill.objects.filter(name__contains=tag_clean(qry))])) for qry in query_list]
                     results = list(set(qs[0]).intersection(*qs))
-                except Exception as e:
+                except Exception, e:
                     results = None
             else:
                 try:
                     results = list(chain(Skill.objects.get(name__contains=query_list[0]).profile_set.all()))
-                except Exception as e:
+                except Exception, e:
                     if e.__class__ == Skill.MultipleObjectsReturned:
                         results = list(chain(*[skill.profile_set.all() for skill in Skill.objects.filter(name__contains=query_list[0])]))
                     else:

media/schedule/css/jquery.tooltip.css

@@ -0,0 +1,9 @@
+#tooltip {
+	position: absolute;
+	z-index: 3000;
+	border: 1px solid #111;
+	background-color: #eee;
+	padding: 5px;
+	opacity: 0.85;
+}
+#tooltip h3, #tooltip div { margin: 0; }

settings.py

@@ -106,7 +106,7 @@
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
 
-    # third-party apps:
+    # third-party apps: (see deploy/requirements.txt)
     'ajax_select',
     'django_extensions',
     'schedule',

settings_local.copy

@@ -40,7 +40,7 @@ INSTALLED_APPS = (
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
 
-    # third-party apps:
+    # third-party apps: (see deploy/requirements.txt)
     'ajax_select',
     'django_extensions',
     'schedule',

templates/profiles/view_profile.html

@@ -21,6 +21,8 @@ <h1>
   </h1>
   {% if display_full_profile %}
     {% with user.get_profile as profile %}
+      <p><label>hn profile:</label> <a
+      href="http://news.ycombinator.com/user?id={{ user.username }}">{{ user.username }}</a></p>
       <p><label>skype:</label> {{ profile.skype }}
       {% if profile.skype %}
 <a class="skype" href="skype:{{ profile.skype }}?call"><img src="http://mystatus.skype.com/bigclassic/{{ profile.skype }}" style="border: none;" width="182" height="44" alt="My status" /></a>
@@ -40,7 +42,7 @@ <h2>Holds office hours for:</h2>
     {% for skill in user.get_profile.skills.all %}
       <li>{{ skill }}</li>
     {% empty %}
-      <li>{{ user.username }} has not listed his skills</li>
+      <li>{{ user.username }} has not listed any skills</li>
     {% endfor %}
     </ul>
   <br />

templates/schedule/event_form_base.html

@@ -7,12 +7,20 @@
     $(function() {
         $("#id_start_0").datepicker({
           dateFormat: $.datepicker.ATOM,
+	  changeMonth: true,
+	  changeYear: true,
+	  minDate: new Date(),
           onSelect: function(dateText,inst){ $("#id_end_0").val(dateText); }  // automagically set end to the same date
         });
-        $("#id_end_0").datepicker({dateFormat: $.datepicker.ATOM});
+        $("#id_end_0").css({visibility: "hidden"});
         $("#id_start_1").timePicker();
         $("#id_end_1").timePicker();
-        $("#id_end_recurring_period").datepicker({dateFormat: $.datepicker.ATOM});
+        $("#id_end_recurring_period").datepicker({
+	  dateFormat: $.datepicker.ATOM,
+	  changeMonth: true,
+	  changeYear: true,
+	  minDate: new Date()
+	});
         var oldTime = $.timePicker("#id_start_1").getTime();
         $("#id_start_1").change(function() {
           if ($("#id_end_1").val()) { // Only update when second input has a value.

templates/upcoming_office_hour.html

@@ -2,7 +2,13 @@
   <div>
   {% with office_hour.event.creator as user %}
     <h3><a href="{% url view_profile user.username %}"><em>{{ user.username }}</em></a></h3>
-    <p>From {{ office_hour.event.start }} to {{ office_hour.event.end }}</p>
+    {% if office_hour.start.date == office_hour.end.date %}
+        <p>{{ office_hour.start.date }}
+             from {{ office_hour.start.time }}
+	       to {{ office_hour.end.time }}</p>
+    {% else %}
+        <p>From {{ office_hour.start }} to {{ office_hour.end }}</p>
+    {% endif %}
     <ul class="skill"><li>{{ user.get_profile.skills.all|join:"</li><li>" }}</li></ul>
   {% endwith %}
   </div>

views.py

@@ -23,7 +23,15 @@ def site_index(request, template_name='index.html'):
     users = set(list(users_available_now) + users_holding_office_hours_now)
     future = Period(events=events, start=datetime.now(),
                     end=datetime.now() + timedelta(days=MAX_FUTURE_DAYS))
-    upcoming_office_hours = future.get_occurrences()
+    upcoming_office_hours = []
+    already_saw = {}
+    for i in future.get_occurrences():
+        if len(upcoming_office_hours) >= MAX_FUTURE_OFFICE_HOURS:
+            break
+        if already_saw.get(i.event.creator):
+            continue
+        upcoming_office_hours.append(i)
+        already_saw[i.event.creator] = 1
     upcoming_office_hours = upcoming_office_hours[:MAX_FUTURE_OFFICE_HOURS]
     return direct_to_template(request, template_name, locals())