Added middleware that presents exceptions from AJAX requests as plain text. Added highlighting of selected timeframe and proper pagination for all subtables in the frontend, as well as rudimentary server-side ordering for daemons.

Author: maxbogue

middleware.py

@@ -1,8 +1,19 @@
-
+import traceback
+from django.http import HttpResponseServerError
+from django.template.loader import render_to_string
 from django.shortcuts import render_to_response
 
 class StaffOnlyMiddleware(object):
     def process_request(self, request):
         if not request.path.startswith('/admin'):
             if not request.user.is_staff:
                 return render_to_response('404.html')
+
+class ErrorHandlingMiddleware(object):
+    def process_exception(self, request, exception):
+        if request.is_ajax():
+            return HttpResponseServerError(traceback.format_exc(),
+                content_type='text/plain')
+        # else:
+        #     return HttpResponseServerError(render_to_string('500.html',
+        #         dict(message=traceback.format_exc())))

norc_utils/web.py

@@ -16,7 +16,7 @@ def default(self, obj):
 
 def paginate(request, data_set):
     try:
-        per_page = int(request.GET.get('per_page', 20))
+        per_page = int(request.GET.get('per_page', 15))
     except ValueError:
         per_page = 15
     paginator = Paginator(data_set, per_page)
@@ -28,9 +28,11 @@ def paginate(request, data_set):
         page_num = 1
     page = paginator.page(page_num)
     page_data = {
-        'next': page.next_page_number() if page.has_next() else 0,
-        'prev': page.previous_page_number() if page.has_previous() else 0,
+        'nextPage': page.next_page_number() if page.has_next() else 0,
+        'prevPage': page.previous_page_number() if page.has_previous() else 0,
         'start': page.start_index(),
         'end': page.end_index(),
+        'current': page_num,
+        'total': paginator.num_pages,
     }
     return page, page_data

static/css/norc_display.css renamed to static/css/status.css

@@ -23,7 +23,7 @@ table {
 }
 table.L1 {
     font-family:"Trebuchet MS", "Futura", "Courier New";
-    font-size:11px;
+/*    font-size:11px;*/
 }
 
 tr {
@@ -32,7 +32,7 @@ tr {
 }
 td {
     margin:0px;
-    padding:0px 4px;
+    padding:2px;
 }
 .inserted td {
     padding:0px;
@@ -48,6 +48,15 @@ table.L1 tr.hover {
     background-color:#EEFEEE;
 }
 
+table.L1 ul.pagination {
+    background-color:#92E6E7;
+}
+table.L1 ul.pagination li.clickable {
+    background-color:#66A9BD;
+}
+table.L1 ul.pagination li.clickable:hover {
+    background-color:#76B9CD;
+}
 table.L1 tr.expanded {
     background-color:#9FE8F3;
 }
@@ -64,6 +73,15 @@ table.L2 tr.hover {
     background-color:#EBFFFF;
 }
 
+table.L2 ul.pagination {
+    background-color:#FFCF57;
+}
+table.L2 ul.pagination li.clickable {
+    background-color:#86652C;
+}
+table.L2 ul.pagination li.clickable:hover {
+    background-color:#9C8038;
+}
 table.L2 tr.expanded {
     background-color:#FFDF57;
 }
@@ -80,17 +98,59 @@ table.L3 tr.hover {
     background-color:#FFFADD;
 }
 
-.hover {
-    cursor:pointer;
+
+ul.pagination {
+    background-color:#B8DBB9;
+    display:block;
+    list-style:none;
+    margin:0px;
+    padding:1px;
+    text-align:center;
+}
+ul.pagination li {
+    cursor:default;
+    display:inline;
+    margin:0px 20px;
+    padding:1px 20px;
 }
-span.clickable {
-    color:#888;
-    text-decoration:underline;
+ul.pagination li.clickable {
+    background-color:#658869;
+    color:#FFFFFF;
     cursor:pointer;
 }
-.paging {
+ul.pagination li.clickable:hover {
+    background-color:#7D9E80;
+}
+
+/* Timeframe stuff. */
+ul.timeframe {
+    background-color:#B8DBB9;
+    cursor:default;
+    display:inline-block;
+    margin:0px;
+    padding:0px;
     text-align:center;
 }
+ul.timeframe li {
+    display:inline-block;
+    margin:0px;
+    padding:2px 5px;
+    width:25px;
+}
+ul.timeframe li.clickable {
+    cursor:pointer;
+}
+ul.timeframe li.clickable:hover {
+    background-color:#7D9E80;
+    color:#FFFFFF;
+}
+ul.timeframe li.selected {
+    background-color:#658869;
+    color:#FFFFFF;
+}
+.hover {
+    cursor:pointer;
+}
 .status_good {
     background-color:#CF6;
 }