Merge lp:~cjohnston/summit/track-display-name into lp:summit

[Chris Johnston]

Adds lpc_settings.py
Creates settings.TRACK_DISPLAY_NAME andd settings.TRACK_DISPLAY_NAME_PLURAL
Creates a track_display_name template context processor
Switches the name "Track" in the templates to use the new TRACK_DISPLAY_NAME or TRACK_DISPLAY_NAME_PLURAL template context processor

LPC uses the term "Microconf" instead of "Track." This creates a need to us to be able to support different naming conventions without creating a delta between the summit installs.

Also commits an lpc_settings.py

[Adnane Belmadiaf (daker)]

+1 from me

review: Approve

[lp:~cjohnston/summit/track-display-name]

503. By Chris Johnston on 2013-03-06

Adds TRACK_DISPLAY_NAME_PLURAL

[Adnane Belmadiaf (daker)]

+1

review: Approve

[Michael Hall (mhall119)]

Use just one context processor for both, and provide fallback values in case it's not in settings.py:

def track_display_name(request):
    """
    Adds the track display name from settings
    """
    display = getattr(settings, 'TRACK_DISPLAY_NAME', 'Track')
    display_plural = getattr(settings, 'TRACK_DISPLAY_NAME_PLURAL', display+'s')
    return {
        'TRACK_DISPLAY_NAME': display,
        'TRACK_DISPLAY_NAME_PLURAL': display_plural.
    }

[lp:~cjohnston/summit/track-display-name]

504. By Chris Johnston on 2013-03-07

Makes changes per mhall119s suggestion

[Michael Hall (mhall119)]

Not just removed the variable from settings.py, since it'll default to those values anyway, and all will be good

[lp:~cjohnston/summit/track-display-name]

505. By Chris Johnston on 2013-03-07

More fixes per mhall119

[Michael Hall (mhall119)]

Line 156 of the diff:

verbose_name=settings.TRACK_DISPLAY_NAME,

Needs to be:

verbose_name=getattr(settings, 'TRACK_DISPLAY_NAME', 'Track')

review: Needs Fixing

[lp:~cjohnston/summit/track-display-name]

506. By Chris Johnston on 2013-03-09

Final fix

[Michael Hall (mhall119)]

Looks good now

review: Approve

=== modified file 'summit/common/context_processors.py'
--- summit/common/context_processors.py	2013-02-26 19:31:21 +0000
+++ summit/common/context_processors.py	2013-03-09 04:44:20 +0000
@@ -27,7 +27,7 @@
 
 def url_base(request):
     url = request.get_full_path().split('/')
-    return {'url_base':url[1]}
+    return {'url_base': url[1]}
 
 
 def next_summit(request):
@@ -53,3 +53,19 @@
         return {'main_menu': Menu.on_site.all()[0].slug}
     except IndexError:
         return {}
+
+
+def track_display_name(request):
+    """
+    Adds the track display name from settings
+    """
+    display = getattr(settings, 'TRACK_DISPLAY_NAME', 'Track')
+    display_plural = getattr(
+        settings,
+        'TRACK_DISPLAY_NAME_PLURAL',
+        display+'s'
+    )
+    return {
+        'TRACK_DISPLAY_NAME': display,
+        'TRACK_DISPLAY_NAME_PLURAL': display_plural
+    }

=== added file 'summit/lpc_settings.py'
--- summit/lpc_settings.py	1970-01-01 00:00:00 +0000
+++ summit/lpc_settings.py	2013-03-09 04:44:20 +0000
@@ -0,0 +1,33 @@
+import os
+import sys
+
+from settings import *
+
+SITE_ID = 1
+
+try:
+    import ubuntu_website
+
+    INSTALLED_APPS.append('ubuntu_website')
+
+    TEMPLATE_CONTEXT_PROCESSORS += (
+        "ubuntu_website.media_processor",
+        "ubuntu_website.popup_check",
+    )
+    TEMPLATE_DIRS += (
+        ubuntu_website.TEMPLATE_DIR,
+    )
+
+    THEME_MEDIA = ubuntu_website.MEDIA_ROOT
+except ImportError:
+    if not 'init-summit' in sys.argv:
+        print "You will need to run ./manage.py init-summit"
+        "to make The Summit Scheduler fully work."
+    else:
+        pass
+
+# Days before the start of the summit when we stop allowing
+# track leads to edit the schedule
+TRACK_LEAD_SCHEDULE_BLACKOUT = 0
+TRACK_DISPLAY_NAME = 'Microconf'
+TRACK_DISPLAY_NAME_PLURAL = 'Microconfs'

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2013-03-04 21:48:31 +0000
+++ summit/schedule/forms.py	2013-03-09 04:44:20 +0000
@@ -26,7 +26,10 @@
 class MultipleAttendeeField(forms.ModelMultipleChoiceField):
     def label_from_instance(self, obj):
         return u"%s %s (%s)" % (
-            obj.user.first_name, obj.user.last_name, obj.user.username)
+            obj.user.first_name,
+            obj.user.last_name,
+            obj.user.username
+        )
 
 
 class MeetingFormBase(forms.ModelForm):
@@ -34,7 +37,8 @@
         queryset=Attendee.objects.all,
         widget=forms.CheckboxSelectMultiple,
         label='Participants',
-        required=False)
+        required=False
+    )
 
     class Media:
         css = {'all': ('/media/css/colortip-1.0-jquery.css',)}
@@ -57,9 +61,12 @@
 
         summit = self.instance.summit
         self.fields['participants'].queryset = Attendee.objects.filter(
-            summit=summit).order_by('user__first_name',
-                                    'user__last_name',
-                                    'user__username')
+            summit=summit
+        ).order_by(
+            'user__first_name',
+            'user__last_name',
+            'user__username'
+        )
 
     def save(self, commit=True):
         instance = super(MeetingFormBase, self).save(commit)
@@ -76,8 +83,11 @@
             # This is where we actually link the pizza with toppings
             instance.participants.clear()
             for participant in self.cleaned_data['participants']:
-                record = Participant(meeting=instance, attendee=participant,
-                                     participation='INTERESTED')
+                record = Participant(
+                    meeting=instance,
+                    attendee=participant,
+                    participation='INTERESTED'
+                )
                 record.save()
         self.save_m2m = save_m2m
 
@@ -193,7 +203,7 @@
 YOUTUBE_SHORT_URL = re.compile(r'https?:\/\/youtu.be\/(?P<youtube_id>[^\?]*).*')
 
 class YouTubeEmbedURL(forms.URLField):
-    
+
     def clean(self, value):
         match_html = YOUTUBE_EMBED_HTML.match(value)
         match_page = YOUTUBE_PAGE_URL.match(value)

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-03-04 19:23:37 +0000
+++ summit/schedule/models/meetingmodel.py	2013-03-09 04:44:20 +0000
@@ -19,6 +19,7 @@
 from urlparse import urlparse
 from datetime import datetime
 
+from django.conf import settings
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
@@ -129,7 +130,11 @@
     )
     # FIXME tracks must be for the same summit
     # (will require js magic in admin to refresh the boxes)
-    tracks = models.ManyToManyField(Track, blank=True)
+    tracks = models.ManyToManyField(
+        Track,
+        verbose_name=getattr(settings, 'TRACK_DISPLAY_NAME', 'Track'),
+        blank=True
+    )
     spec_url = models.URLField(
         blank=True,
         verbose_name="Spec URL"
@@ -656,7 +661,7 @@
 
         return missing
 
-    def try_schedule(self, with_interested = False):
+    def try_schedule(self, with_interested=False):
         """Try to schedule this meeting in a suitable room."""
         if self.private:
             print "Not scheduling private meeting: %s" % self
@@ -676,7 +681,7 @@
         if not self.try_schedule_into(rooms):
             print "Gave up scheduling %s" % self
 
-    def try_schedule_into(self, rooms, with_interested = False):
+    def try_schedule_into(self, rooms, with_interested=False):
         """Try to schedule this meeting in one of the given rooms."""
         today = datetime.now()
         for room in rooms:

=== modified file 'summit/schedule/templates/schedule/by_participant.html'
--- summit/schedule/templates/schedule/by_participant.html	2013-01-10 21:37:16 +0000
+++ summit/schedule/templates/schedule/by_participant.html	2013-03-09 04:44:20 +0000
@@ -56,7 +56,7 @@
     {% endfor %}</div>
     {% endif %}
     {% if agenda.meeting.tracks.count > 0 %}
-    <br /><b>Tracks:</b>
+    <br /><b>{{ TRACK_DISPLAY_NAME_PLURAL }}:</b>
     <ul>{% for track in agenda.meeting.tracks.all %}
         <li style="color: #{{track.color}};">{{ track.title }}</li>
     {% endfor %}</ul>

=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html	2013-03-04 18:40:11 +0000
+++ summit/schedule/templates/schedule/by_room.html	2013-03-09 04:44:20 +0000
@@ -62,7 +62,7 @@
     {% endfor %}</div>
     {% endif %}
     {% if agenda.meeting.tracks.count > 0 %}
-    <br /><b>Tracks:</b>
+    <br /><b>{{ TRACK_DISPLAY_NAME_PLURAL }}:</b>
     <ul>{% for track in agenda.meeting.tracks.all %}
         <li style="color: #{{track.color}};">{{ track.title }}</li>
     {% endfor %}</ul>

=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html	2013-03-04 18:40:11 +0000
+++ summit/schedule/templates/schedule/by_track.html	2013-03-09 04:44:20 +0000
@@ -57,7 +57,7 @@
     {% endfor %}</div>
     {% endif %}
     {% if agenda.meeting.tracks.count > 0 %}
-    <br /><b>Tracks:</b>
+    <br /><b>{{ TRACK_DISPLAY_NAME_PLURAL }}:</b>
     <ul>{% for track in agenda.meeting.tracks.all %}
         <li style="color: #{{track.color}};">{{ track.title }}</li>
     {% endfor %}</ul>

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2013-03-04 18:40:11 +0000
+++ summit/schedule/templates/schedule/daily.html	2013-03-09 04:44:20 +0000
@@ -84,7 +84,7 @@
     {% endfor %}</div>
     {% endif %}
     {% if agenda.meeting.tracks.count > 0 %}
-    <br /><b>Tracks:</b>
+    <br /><b>{{ TRACK_DISPLAY_NAME_PLURAL }}:</b>
     <ul>{% for track in agenda.meeting.tracks.all %}
         <li style="color: #{{track.color}};">{{ track.title }}</li>
     {% endfor %}</ul>

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2012-04-12 13:43:12 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2013-03-09 04:44:20 +0000
@@ -15,7 +15,7 @@
 </li>
 <li>
 <div id="column-schedule-inner">
-By track:
+    By {{ TRACK_DISPLAY_NAME }}:
 <ul>
   {% for track in tracks %}
     <li><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></li>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-10-10 16:02:28 +0000
+++ summit/schedule/templates/schedule/summit.html	2013-03-09 04:44:20 +0000
@@ -18,7 +18,7 @@
     <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />{% endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a></li>
+<li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="{{ TRACK_DISPLAY_NAME_PLURAL }}">{{ TRACK_DISPLAY_NAME_PLURAL }}</a></li>
     <li><a class="sub-nav-item" href="/{{ summit.name }}.ical">All sessions (iCal)</a></li>
     <li><a class="sub-nav-item" href="{% url summit.schedule.views.past %}">Past summits</a></li>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/tracks.html'
--- summit/schedule/templates/schedule/tracks.html	2012-04-18 21:51:05 +0000
+++ summit/schedule/templates/schedule/tracks.html	2013-03-09 04:44:20 +0000
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {% load  markup %}
-{% block page_name %}{{ summit.title }} Tracks{%endblock %}
+{% block page_name %}{{ summit.title }} {{ TRACK_DISPLAY_NAME_PLURAL }}{%endblock %}
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
     <div class="row">
         <div class="span-12">
-            <h1>{{ summit.title }} Tracks</h1>
+            <h1>{{ summit.title }} {{ TRACK_DISPLAY_NAME_PLURAL }}</h1>
         </div>
     </div>
 

=== modified file 'summit/settings.py'
--- summit/settings.py	2013-03-08 22:04:36 +0000
+++ summit/settings.py	2013-03-09 04:44:20 +0000
@@ -101,6 +101,7 @@
     "common.context_processors.url_base",
     "common.context_processors.summit_version",
     "common.context_processors.site_menu",
+    "common.context_processors.track_display_name",
 )
 
 MIDDLEWARE_CLASSES = (