DigitalCampus#300: Implementing ajax pagination...

chaotic-kingdoms · Apr 22, 2016 · bfe3abf · bfe3abf
1 parent ace76ed
commit bfe3abf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/oppia/profile/views.py b/oppia/profile/views.py
@@ -566,7 +566,7 @@ def list_users(request):
                               {
                                   'page': users,
                                   'page_ordering':ordering,
-                                  'users_list_template':'export',
+                                  'users_list_template':'select',
                                   'ajax_url':request.path
                               },
                               context_instance=RequestContext(request),)
diff --git a/oppia/static/oppia/style.css b/oppia/static/oppia/style.css
@@ -242,7 +242,9 @@ div.date-picker-row-fluid .controls{ width: 100%;}
   float: left;
   border-bottom-width: 0;
 }
-
+.table-fixed tr {
+    clear:left;
+}
 .hidden-fields{ display:none; }
 
 }

diff --git a/oppia/templates/oppia/profile/list/header-user-select.html b/oppia/templates/oppia/profile/list/header-user-select.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% load sort_link %}
+
+<th class="col-xs-2 col-sm-1"></th>
+<th class="col-xs-7 col-sm-7">{% sort_link 'first_name' 'User' %}</th>
+<th class="col-xs-3 col-sm-4">{% sort_link 'date_joined' 'Registration date' %}</th>
diff --git a/oppia/templates/oppia/profile/list/row-user-select.html b/oppia/templates/oppia/profile/list/row-user-select.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+{% load display_functions %}
+
+<tr id="{{ user.username }}">
+    <td class="col-xs-2 col-sm-1">
+        <button class="btn btn-sm btn-primary btn-add"><i class="glyphicon glyphicon-plus"></i> <i class="glyphicon glyphicon-ok hidden"></i> </button>
+        <button class="btn btn-sm btn-primary btn-remove removing" style="display: none;"><i class="glyphicon glyphicon-remove"></i> </button>
+    </td>
+    <td class="col-xs-7 col-sm-7 ">{% if OPPIA_SHOW_GRAVATARS %} {{ user|gravatar:24 }} {% endif %}
+        {{ user.first_name }} {{ user.last_name }}
+    </td>
+    <td class="col-xs-3 col-sm-4 ">{{ user.date_joined|date:"d/m/Y" }}</td>
+</tr>
diff --git a/oppia/views.py b/oppia/views.py
@@ -634,7 +634,7 @@ def cohort_add(request):
                                 'form': form,
                                 'page': users,
                                 'page_ordering':ordering,
-                                'users_list_template':'default'
+                                'users_list_template':'select'
                              },context_instance=RequestContext(request))
 
 def cohort_view(request,cohort_id):