Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

created a filter for the users table and an empty ember view to manag…

…e it
  • Loading branch information...
commit c4b785c23c580e0f9b2c6f2ea28a17e6a1bb89b5 1 parent 9ff9dbb
@jgnewman jgnewman authored
View
1  priv/www/css/styles.css
@@ -1140,6 +1140,7 @@ input[type=checkbox] {
}
input[type=text] {
+ font-family: 'titillium', helvetica, serif;
border: 0;
background: #eaeaea;
padding: 5px 10px;
View
6 priv/www/js/templates/users.hbs
@@ -8,7 +8,11 @@
<div class="white-slab">
<div class="tab-container right">
- <a {{action "viewUsers" this href=true}} class="active-tab">All</a>
+ <!-- <a {{action "viewUsers" this href=true}} class="active-tab">All</a> -->

Can we nuke the commented code?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ <a class="active-tab">
+ Filter by
+ {{view RiakCsControl.UserFilterView placeholder="All Users..."}}
+ </a>
<div class="hide-shadow clear"></div>
</div>
<div class="user-list-table">
View
38 priv/www/js/templates/users.hbs.orig
@@ -1,38 +0,0 @@
-<section class="constrained info">
-
- {{#if view.isLoading}}
- {{view RiakCsControl.LoadingView id="loading"}}
- {{else}}
- <div class="block-container white">
- <h2 class="title">User List</h2>
-
-<<<<<<< HEAD
- <div class="white-slab">
- <div class="tab-container right">
- <!-- <a {{action "viewUsers" this href=true}} class="active-tab">All</a> -->
- <a class="active-tab">
- Filter by
- <input id="user-filter" type="text" placeholder="All Users..."/>
- </a>
- <div class="hide-shadow clear"></div>
- </div>
- <div class="user-list-table">
- <table class="info-table">
- {{collection RiakCsControl.UsersCollectionView contentBinding="controller" itemClass="standard-row"}}
- </table>
-=======
- <div class="white-slab">
- <div class="tab-container right">
- <a {{action "viewUsers" this href=true}} class="active-tab">All</a>
- <div class="hide-shadow clear"></div>
- </div>
- <div class="user-list-table">
- <table class="info-table">
- {{collection RiakCsControl.UsersCollectionView contentBinding="controller" itemClass="standard-row"}}
- </table>
- </div>
->>>>>>> jgn-admin-styling
- </div>
- </div>
- {{/if}}
-</section>
View
4 priv/www/js/views.js
@@ -88,4 +88,8 @@ minispade.register('views', function() {
}
});
+ RiakCsControl.UserFilterView = Ember.TextField.extend({

I think this could just be RiakCsControl.UserFilterView = Ember.TextField.extend()

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+
+ });
+
});
Please sign in to comment.
Something went wrong with that request. Please try again.