Commit 83b0fbebca0f897968301bee94822d0d362cd11f

Authored by Melody

Might be an issue with long cards

Showing 2 changed files Side-by-side Diff

scripts/CardListController.js View file @ 83b0fbe
... ... @@ -40,7 +40,7 @@
40 40 console.log(card.text + ' hidden');
41 41  
42 42 // locally change hidden
43   - card.is_hidden=true;
  43 + card.is_hidden = true;
44 44 }).
45 45 error(function(err) {
46 46 console.log('no hide for you');
... ... @@ -54,7 +54,7 @@
54 54 console.log(card.text + ' pulled');
55 55  
56 56 // locally change boolean for display purposes
57   - card.is_in_deck=true;
  57 + card.is_in_deck = true;
58 58 }).
59 59 error(function(err) {
60 60 console.log('no hide for you');
... ... @@ -68,7 +68,7 @@
68 68 console.log(card.text + ' unpulled');
69 69  
70 70 // local change for display purposes
71   - card.is_in_deck=false;
  71 + card.is_in_deck = false;
72 72 }).
73 73 error(function(err) {
74 74 console.log('no hide for you');
templates/cardlist.html View file @ 83b0fbe
... ... @@ -63,12 +63,14 @@
63 63 <li class="collection-header"><h3>Week {{weeknum}}</h3></li>
64 64 <li class="collection-item" ng-repeat="card in week_cards" ng-show="show || !card.is_hidden">
65 65 <div>{{card.text}}
66   - <a href="" ng-click="expand = !expand" class="secondary-content" ng-show="!card.is_hidden"><i class="small mdi-action-info-outline"></i></a>
67   - <p class="right-align" ng-show="expand">
68   - <a href="" ng-click="hide(card)" class="waves-effect waves-light btn" ng-show="!card.is_hidden">Hide</a>
69   - <a href="" ng-click="unhide(card)" class="waves-effect waves-light btn" ng-show="card.is_hidden">Unhide</a>
70   - <a href="" ng-click="pull(card)" class="waves-effect waves-light btn" ng-show="!card.is_in_deck">Add to Deck</a>
71   - <a href="" ng-click="unpull(card)" class="waves-effect waves-light btn" ng-show="card.is_in_deck">Remove from Deck</a>
  66 + <a href="" ng-click="hide(card)" class="secondary-content" ng-show="!card.is_hidden"><i
  67 + class="mdi-action-delete small"></i></a>
  68 + <a href="" ng-click="unhide(card)" class="secondary-content" ng-show="card.is_hidden"><i
  69 + class="mdi-image-remove-red-eye small"></i></a>
  70 + <a href="" ng-click="pull(card)" class="secondary-content" ng-show="!card.is_in_deck"><i
  71 + class="mdi-content-add-circle small"></i></a>
  72 + <a href="" ng-click="unpull(card)" class="secondary-content" ng-show="card.is_in_deck"><i
  73 + class="mdi-content-remove-circle small"></i></a>
72 74 </p>
73 75 </div>
74 76 </li>