Merge branch 'reorder-filter-dates'

# Conflicts: # talks/templates/events/browse.html
ox-it · May 6, 2016 · 076db49 · 076db49
2 parents dc81c39 + 1eba64a
commit 076db49
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/talks/core/utils.py b/talks/core/utils.py
@@ -24,7 +24,7 @@ def parse_date(date_param):
             from_date = datetime.strptime(date_param, "%d/%m/%y")
         except Exception as e:
             try:
-                from_date = datetime.strptime(date_param, "%d/%m/%y")
+                from_date = datetime.strptime(date_param, "%d/%m/%Y")
             except Exception as e:
                 try:
                     from_date = datetime.strptime(date_param, "%Y-%m-%d")
@@ -91,4 +91,4 @@ def iso8601_duration(value):
     # remove trailing zeros
     seconds = seconds.rstrip('0')
     time += '{}S'.format(seconds)
-    return u'P' + date + time
+    return u'P' + date + time
diff --git a/talks/events/views.py b/talks/events/views.py
@@ -60,7 +60,7 @@ def browse_events(request):
     modified_request_parameters['subdepartments'] = "false"
     if (len(request.GET) == 0) or (len(request.GET) == 1) and request.GET.get('limit_to_collections'):
         today = date.today()
-        modified_request_parameters['start_date'] = today.strftime("%Y-%m-%d")
+        modified_request_parameters['start_date'] = today.strftime("%d/%m/%Y")
         modified_request_parameters['include_subdepartments'] = True
         modified_request_parameters['subdepartments'] = 'true'
     elif request.GET.get('include_subdepartments'):

diff --git a/talks/templates/base.html b/talks/templates/base.html
@@ -106,6 +106,7 @@
                             <ul class="dropdown-menu">
                                 <li {% if '/user/lists' in request.path  %} class="active" {% endif %}><a href="{{ manage_lists }}"><span class="glyphicon glyphicon-list-alt"></span> Manage Collections</a></li>
                                 <li {% if '/user/mytalks' in request.path  %} class="active" {% endif %}><a href="{% url 'my-talks' %}"><span class="glyphicon glyphicon-list-alt"></span> My Talks</a></li>
+                                <li><a href="http://talksox.readthedocs.io/en/latest/user/talk-editors/sign-up.html" target="blank"><span class="glyphicon glyphicon-list-alt"></span> Become an Editor</a></li>
                                 <li><a href="{% url 'logout' %}">Logout</a></li>
                             </ul>
                         </li>

diff --git a/talks/templates/events/browse.html b/talks/templates/events/browse.html
@@ -90,7 +90,7 @@ <h3 class="hidden-xs">Filters</h3>
                         });
 
                         $('.js-datetimepicker').datetimepicker({
-                          format : 'YYYY-MM-DD',
+              format : 'DD/MM/YYYY',
                           allowInputToggle : true
                         }).each(function(i,v){
                           $(v).data("DateTimePicker").ignoreReadonly(true);  
@@ -99,7 +99,7 @@ <h3 class="hidden-xs">Filters</h3>
                         $('#start_date').on('dp.change', function(e){
                           $('#to').data('DateTimePicker').minDate(e.date);
                         });
-                        
+
                       });
                     </script>