Merge lp:~mhall119/summit/meeting-search into lp:summit

[Michael Hall]

Adds meeting search functionality

Adds meeting search functionality, search box in subnav, and adjustments to make it look alright in mobile view.

[Chris Johnston (cjohnston)]

Seems as thought the search image is missing.

review: Needs Fixing

[Chris Johnston (cjohnston)]

The search page template is broken in some way. The area between the footer and the main content is wrong.

review: Needs Fixing

[Chris Johnston (cjohnston)]

LGTM

review: Approve

[Tarmac WebDev (tarmac-webdev)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html	2012-05-03 01:57:41 +0000
+++ summit/common/templates/base.html	2012-10-10 18:35:23 +0000
@@ -47,12 +47,27 @@
     </ul>
 {% endblock %}
 
-{% block search %}{% endblock %}
+{% block sub_nav %}
+<div id="sub-nav-container" >
+    <nav role="navigation" class="nav-secondary">
+        <ul class="clearfix">
+            {% block sub_nav_links %}
+            {% endblock %}
+        </ul>
+    </nav>
+    {% if summit %}
+    <section id="searchbox-container">
+                        
+        <form id="site_search_form" action="{% url summit.schedule.views.search summit.name %}" method="get">
+                <input id="id_q" type="text" name="q" maxlength="100" value="{{ query }}" />
+                <input id="id_button" type="image" src="/media/img/search.png" title="Search" alt="Search"  />
+        </form>
 
-{% block sub_nav_links %}
+    </section>
+    {% endif %}
+</div>
 {% endblock %}
 
-
 {% block messages %}
     {% if messages %}
       {% for message in messages %}

=== modified file 'summit/media/css/site.css'
--- summit/media/css/site.css	2012-10-09 21:00:53 +0000
+++ summit/media/css/site.css	2012-10-10 18:35:23 +0000
@@ -176,3 +176,31 @@
     display: inline-block;
     margin-right: 2px;
 }
+
+/* Subnav search form */
+#sub-nav-container {
+    height: 40px;
+    display: block;
+    margin-bottom: 20px;
+}
+
+#searchbox-container {
+    position: absolute;
+    top: 10px;
+    right: 30px;
+}
+#site_search_form {
+    display: inline;
+}
+
+#site_search_form #id_q {
+    width: 200px;
+    padding: 0px;
+    margin: 0px;
+    display: inline;
+}
+
+#site_search_form #id_button {
+    width: 16px;
+    display: inline;
+}

=== added file 'summit/media/img/search.png'
Binary files summit/media/img/search.png	1970-01-01 00:00:00 +0000 and summit/media/img/search.png	2012-10-10 18:35:23 +0000 differ
=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-10-09 21:00:53 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-10-10 18:35:23 +0000
@@ -157,7 +157,7 @@
     }
     div.schedule-head .schedule-date {
         font-weight: normal;
-        font-size: 36px;
+        font-size: 24px;
         margin: 0;
         display: block;
         text-align: center;
@@ -169,6 +169,15 @@
         width: 25%;
         text-align: center;
     }
+    
+    div.schedule-head .qrcode {
+        display: none;
+    }
+    
+    #sub-nav-container {
+        margin-bottom: 0px;
+    }
+
 }
 </style>
 

=== added file 'summit/schedule/templates/schedule/search.html'
--- summit/schedule/templates/schedule/search.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/search.html	2012-10-10 18:35:23 +0000
@@ -0,0 +1,143 @@
+{% extends "base.html" %}
+{% load datetime %}
+
+{% block page_name %}
+Meeting Search - {{ summit.title }}
+{% endblock %}
+
+{% block sub_nav_links %}
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/" title="Summit">Back to Summit</a></li>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+<article class="span-8">
+{% if meetings %}
+<h2>Results for: {{query}}</h2>
+{% else %}
+<h3>No Meetings found matching query</h3>
+{% endif %}
+
+<ul>
+{% for meeting in meetings %}
+    <li><a href="{{meeting.get_meeting_page_url}}">{{meeting.title}}</a>{% if meeting.agenda_set.count %} - 
+    {% for agenda in meeting.agenda_set.all %}{{agenda.slot}}{% endfor %}
+    {% endif %}</li>
+{% endfor %}
+</ul>
+</article>
+</div>
+{% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary, .schedule-qrcode { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column td ul {
+        width: 100%;
+        margin: 0;
+        padding: 0;
+    }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+        .schedule-head > a { display: none; } /* qr code */
+    div.schedule-head .schedule-date a:nth-child(1) {
+        float: left;
+    }
+    div.schedule-head .schedule-date {
+        font-weight: normal;
+        font-size: 24px;
+        margin: 0;
+        display: block;
+        text-align: center;
+    }
+    div.schedule-head .schedule-date a {
+        display: block;
+        float: right;
+        background: #eee;
+        width: 25%;
+        text-align: center;
+    }
+
+    #sub-nav-container {
+        margin-bottom: 0px;
+    }
+}
+</style>
+
+<script language="JavaScript">
+
+function show_agenda_details(agenda_id, index_id) {
+    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='block';
+}
+
+function hide_agenda_details(agenda_id, index_id) {
+    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='none';
+}
+
+</script>
+<script>
+/* Mobile handler for clicking a link */
+/* put at the bottom of the page so that the relevant elements exist */
+document.querySelector("article.main-content").addEventListener("click", function(e) {
+    /* Only handle clicking on the main links in the table */
+    if (e.target.nodeName.toLowerCase() == "a" && e.target.className == "main-agenda-item-name") {
+        /* only override links if we're in mobile mode */
+        if (document.documentElement.clientWidth > 481) return;
+        e.stopPropagation();
+        e.preventDefault();
+        /* toggle display of the details div */
+        var details_div = e.target.parentNode.getElementsByTagName("div")[0];
+        details_div.style.display = details_div.style.display == "block" ? "none" : "block";
+        /* and add a link to the specific page to the top of the details div, if
+           we haven't already */
+        var links = details_div.getElementsByClassName("real-link");
+        if (links.length == 0) {
+            var a = document.createElement("a");
+            a.href = e.target.href;
+            a.appendChild(document.createTextNode("View details of this session"));
+            a.className = "real-link";
+            details_div.insertBefore(a, details_div.firstChild);
+        }
+    }
+});
+
+/* override the mouseover/mouseout functions in mobile mode */
+var old_show_agenda_details = show_agenda_details;
+var old_hide_agenda_details = hide_agenda_details;
+show_agenda_details = function(agenda_id, slot_id) {
+    if (document.documentElement.clientWidth > 481) {
+        return old_show_agenda_details(agenda_id, slot_id);
+    }
+};
+hide_agenda_details = function(agenda_id, slot_id) {
+    if (document.documentElement.clientWidth > 481) {
+        return old_hide_agenda_details(agenda_id, slot_id);
+    }
+};
+
+</script>
+{% endblock %}
+
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-05-17 12:56:36 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-10-10 18:35:23 +0000
@@ -120,6 +120,10 @@
         margin: 0;
     }
     #fb-root * { width: auto; }
+
+    #sub-nav-container {
+        margin-bottom: 0px;
+    }
 }
 </style>
 {% endblock %}

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-10-09 18:55:55 +0000
+++ summit/schedule/tests.py	2012-10-10 18:35:23 +0000
@@ -1967,3 +1967,86 @@
         self.login()
         response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
         self.assertRedirects(response, reverse('summit.schedule.views.delete_confirmed', args=(self.summit.name,)), status_code=302, target_status_code=200)
+
+
+class MeetingSearchTestCase(djangotest.TestCase):
+    """
+    This will test different options for deleting a meeting from
+    the front end UI.
+    """
+ 
+    form_html = '<form id="site_search_form"'
+    
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        self.summit = factory.make_one(Summit, name='uds-test', date_start=now, date_end=now+one_hour)
+        self.slot = factory.make_one(
+            Slot,
+            summit=self.summit,
+            start_utc=now,
+            end_utc=now+one_hour)
+        self.room = factory.make_one(Room)
+  
+    def test_searchform_exists_on_summit_view(self):
+        ''' Search form should appear on the summit view page '''
+        response = self.client.get(reverse('summit.schedule.views.summit', args=[self.summit.name]))
+        self.assertContains(response, self.form_html, 1)
+    
+    def test_searchform_exists_on_daily_view(self):
+        ''' Search form should appear on the list view page '''
+        response = self.client.get(reverse('summit.schedule.views.daily_schedule', args=[self.summit.name, '2012-10-10']))
+        self.assertContains(response, self.form_html, 1)
+    
+    def test_searchform_exists_on_today_view(self):
+        ''' Search form should appear on the today view page '''
+        response = self.client.get(reverse('summit.schedule.views.today_view', args=[self.summit.name]))
+        self.assertContains(response, self.form_html, 1)
+    
+    def test_searchform_exists_on_meeting_view(self):
+        ''' Search form should appear on the meeting view page '''
+        meeting = factory.make_one(Meeting, summit=self.summit, requires_dial_in=False, private=False)
+ 
+        response = self.client.get(reverse('summit.schedule.views.meeting', args=[self.summit.name, meeting.id, meeting.name]))
+        self.assertContains(response, self.form_html, 1)
+    
+    def test_searchform_not_exists_on_index(self):
+        ''' Search form should NOT appear on the index page because there isn't a summit selected  '''
+        response = self.client.get(reverse('summit.common.views.index'))
+        self.assertContains(response, self.form_html, 0)
+    
+    def test_meeting_in_search_results(self):
+        ''' Meeting should appear in search results page if the query matches the name or title '''
+        meeting = factory.make_one(Meeting, summit=self.summit, name='test-name', title='Test Title', requires_dial_in=False, private=False)
+
+        # Attempt to match 'name' against 'test-name' in Meeting.name
+        response = self.client.get(reverse('summit.schedule.views.search', args=[self.summit.name]), {'q': 'name'})
+        self.assertContains(response, self.form_html, 1)
+        self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 1)
+    
+        # Attempt to match 'title' against 'Test Title' in Meeting.title
+        response = self.client.get(reverse('summit.schedule.views.search', args=[self.summit.name]), {'q': 'title'})
+        self.assertContains(response, self.form_html, 1)
+        self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 1)
+    
+    def test_meeting_not_in_search_results(self):
+        ''' Meetings for one summit should NOT appear when searching a different summit '''
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        
+        # Create a second summit
+        other_summit = factory.make_one(Summit, name='uds-other', date_start=now, date_end=now+one_hour)
+
+        meeting = factory.make_one(Meeting, summit=other_summit, name='test-name', title='Test Title', requires_dial_in=False, private=False)
+
+        # Attempt to match 'test' against 'test-name' or 'Test Title', should return 0 results
+        # because the the meeting is in other_summit, not self.summit
+        response = self.client.get(reverse('summit.schedule.views.search', args=[self.summit.name]), {'q': 'test'})
+        self.assertContains(response, self.form_html, 1)
+        self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 0)
+        
+        # Same test, but searching the correct other_summit should return 1 result
+        response = self.client.get(reverse('summit.schedule.views.search', args=[other_summit.name]), {'q': 'test'})
+        self.assertContains(response, self.form_html, 1)
+        self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 1)
+        

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-10-09 18:56:16 +0000
+++ summit/schedule/views.py	2012-10-10 18:35:23 +0000
@@ -59,7 +59,7 @@
     'csv',
     'today_view',
 )
-        
+
 @summit_required
 def summit(request, summit, attendee):
     edit = False
@@ -81,6 +81,21 @@
     return render_to_response("schedule/summit.html", context,
                               context_instance=RequestContext(request))
 
+@summit_only_required
+def search(request, summit):
+    query = request.GET.get('q', None)
+    if query:
+        meetings = summit.meeting_set.filter(Q(name__icontains=query) | Q(title__icontains=query))
+    else:
+        meetings = []
+    
+    context = {
+        'summit': summit,
+        'query': query,
+        'meetings': meetings,
+    }
+    return render_to_response("schedule/search.html", context,
+                              context_instance=RequestContext(request))
 @summit_required
 def daily_schedule(request, summit, attendee, date):
     viewdate = summit.as_localtime(datetime.datetime.strptime(date, "%Y-%m-%d"))

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-10-06 16:02:36 +0000
+++ summit/urls.py	2012-10-10 18:35:23 +0000
@@ -67,6 +67,7 @@
     url(r'^logout$', 'logout_view', name='logout'),
     (r'^(?P<summit_name>[\w-]+)/$', 'summit'),
     (r'^(?P<summit_name>[\w-]+)/mobile/$', 'mobile'),
+    (r'^(?P<summit_name>[\w-]+)/search/$', 'search'),
     (r'^(?P<summit_name>[\w-]+)/propose_meeting/$', 'propose_meeting'),
     (r'^(?P<summit_name>[\w-]+)/edit_meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'edit_meeting'),
     (r'^(?P<summit_name>[\w-]+)/review/$', 'review_pending'),