Added UI for filtering columns

SpiderOak · Jun 20, 2015 · 8d7d967 · 8d7d967
1 parent 7f94ac5
commit 8d7d967
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,9 @@ django/apps/blue_management/blue_mgnt/fonts*
 django/apps/blue_management/blue_mgnt/fonts/*
 django/omva/settings.py
 *.pyc
+
+#Added by benny
+bin/bin
+django/apps/blue_management/blue_mgnt/static/fonts/*
+upgrade/resources/*
+
diff --git a/django/apps/blue_management/blue_mgnt/static/css/console-min.css b/django/apps/blue_management/blue_mgnt/static/css/console-min.css
diff --git a/django/apps/blue_management/blue_mgnt/static/less/style.less b/django/apps/blue_management/blue_mgnt/static/less/style.less
@@ -367,19 +367,30 @@ h1.page-header {
                 margin: 10px auto;
                 text-align: left;
             }
+            a.button {
+                padding: 3px 18px;
+            }
             button {
-                float: right;
-                margin: -30px 50px 0 0;
+                float: none;
+                margin: 20px 50px 0 0;
             }
             ul {
                 list-style-type: none;
                 columns: 3;
                 -webkit-columns: 3;
                 -moz-columns: 3;
             }
-            span.text {
+            label {
                 font-size: 12px;
                 vertical-align: middle;
+                &[for=id_columns_0]{
+                    display: none;
+                }
+            }
+            .options-filter-apply {
+                display: block;
+                width: 100%;
+                text-align: center;
             }
         }
     }

diff --git a/django/apps/blue_management/blue_mgnt/templates/base.html b/django/apps/blue_management/blue_mgnt/templates/base.html
@@ -11,7 +11,7 @@
 	{% block base_styles %}
 	{% endblock base_styles %}
 
-    {% with dev=True %}
+    {% with dev=False %}
     {% block styles %}
     <link rel="stylesheet" href="/static/blue_mgnt/css/ss-standard.css" />
 

diff --git a/django/apps/blue_management/blue_mgnt/templates/users.html b/django/apps/blue_management/blue_mgnt/templates/users.html
@@ -14,22 +14,11 @@ <h1 class="page-header">
             <div class="filter-menu modal-content" data-visibility="false">
                 <form action="{% url 'blue_mgnt:users' %}" method="GET">
                     {{ column_form }}
+                    <div class="options-filter-apply">
+                        <a href="{% url 'blue_mgnt:users' %}" class="button thin button-muted">Reset</a>
+                        <button class="button thin button-primary-basic">Apply</button>
+                    </div>
                 </form>
-                {% comment %}
-                <form action="{% url 'blue_mgnt:users' %}" method="GET">
-                    <ul>
-                        {% for item in all_user_columns %}
-                        <li>
-                        <input type="checkbox" value="{{ item.name }}"{% for match in user_coulmns %}
-                            {% if match.name == item.name %} checked="checked"{% endif %}
-                            {% endfor %}>
-                            <span class="text">{{ item.header }}</span>
-                        </li>
-                        {% endfor %}
-                    </ul>
-                    <button class="button thin button-primary-basic">Apply</button>
-                </form>
-                {% endcomment %}
             </div>
         </div>
         <div id="option-add-user" class="inline-standard">

diff --git a/django/apps/blue_management/blue_mgnt/views/users.py b/django/apps/blue_management/blue_mgnt/views/users.py
@@ -346,7 +346,9 @@ def users(request, api, account_info, config, username, saved=False):
         default_columns = 'name,email,group_id,bytes_stored'
     else:
         default_columns = 'username,name,email,group_id,bytes_stored'
-    column_arg = request.GET.get('columns', default_columns)
+    column_arg = request.GET.getlist('columns', default_columns)
+    if type(column_arg) is list:
+        column_arg = ','.join(map(str, column_arg))
     columns = [x.strip() for x in column_arg.split(',')]
     user_columns, error = get_user_columns(columns)
     for column in user_columns:
@@ -397,11 +399,11 @@ def users(request, api, account_info, config, username, saved=False):
     ))
 
     class UserColumnsForm(forms.Form):
-        checkfield = forms.MultipleChoiceField(required=False,
+        columns = forms.MultipleChoiceField(required=False,
                 choices=[(item.name, item.header) for item in USER_COLUMNS],
                 widget=forms.CheckboxSelectMultiple)
 
-    column_form = UserColumnsForm()
+    column_form = UserColumnsForm(initial={'columns': columns})
 
     if request.method == 'POST':
         if request.POST.get('form', '') == 'csv':
@@ -446,7 +448,7 @@ class UserColumnsForm(forms.Form):
         user_rows=user_rows,
         pagination=pagination,
         all_user_columns=all_user_columns,
-        coulmn_form=column_form,
+        column_form=column_form,
     ),
     RequestContext(request))