110swag / flashy-frontend

Download as
Browse Code ยป

Commit b20385f0c6caf373a35262c5684a24184e188159

Authored by Melody
1 parent adafd6d972
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Collapsible classes and sidebar but layout messed up

Showing 2 changed files with 32 additions and 19 deletions Side-by-side Diff

home.html View file @ b20385f
... ... @@ -10,22 +10,36 @@
10 10 <link href='https://fonts.googleapis.com/css?family=Changa+One:400,400italic|Titillium+Web:200,200italic,300,600,400,900,700,400italic,700italic,300italic,600italic' rel='stylesheet' type='text/css'>
11 11 </head>
12 12 <header>
13   - <!--<a href="#" data-activates="sidebar" class="button-collapse"><i class="medium mdi-navigation-menu"></i></a>-->
14   - <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed">
15   - <li class="logo"><a href="//flashy.cards/" id="logo-container">
  13 + <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed">
  14 + <li class="logo"><a href="//flashy.cards/" id="logo-container">
16 15  
17   - <h1>Flashy</h1>
18   - </a></li>
19   - <li class="bold">
20   - <a>Classes:</a></li>
21   - <div ng-repeat="section in sections">
22   - <li class="bold class" ui-sref-active="active"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  16 + <h1>Flashy</h1>
  17 + </a></li>
  18 + <li class="no-padding">
  19 + <ul class="collapsible" data-collapsible="accordion">
  20 + <li class="bold">
  21 + <a class="collapsible-header black-text">Classes</a>
  22 + </li>
  23 + <div class="collapsible-body" style="display: block">
  24 + <ul>
  25 + <li ng-repeat="section in sections">
  26 + <a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  27 + </li>
  28 + </ul>
  29 + </div>
  30 + </ul>
23 31 </li>
24   - </div>
25   - <li class="bold"><a ui-sref="addclass">Add Class</a></li>
26   - <li class="bold"><a ui-sref="study">Study</a></li>
27   - <li class="bold"><a ui-sref="logout">Logout</a></li>
28   - </ul>
  32 + <!--<li class="bold">
  33 + <a>Classes:</a></li>
  34 + <div ng-repeat="section in sections">
  35 + <li class="bold class" ui-sref-active="active"><a ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
  36 + </li>
  37 + </div>-->
  38 + <li class="bold"><a ui-sref="addclass">Add Class</a></li>
  39 + <li class="bold"><a ui-sref="study">Study</a></li>
  40 + <li class="bold"><a ui-sref="logout">Logout</a></li>
  41 + </ul>
  42 + <a href="#" data-activates="sidebar" class="button-collapse"><i class="medium mdi-navigation-menu"></i></a>
29 43 </header>
30 44 <body ng-controller="RootController">
31 45  
scripts/RootController.js View file @ b20385f
... ... @@ -3,7 +3,7 @@
3 3 controller('RootController', ['$rootScope', '$scope', '$state', 'UserService', function($rootScope, $scope, $state, UserService) {
4 4 //UserService.getUserData();
5 5 //$('#top').collapsible('accordion');
6   - $('.button-collapse').sideNav();
  6 + //$('.button-collapse').sideNav();
7 7 if (UserService.isLoggedIn()) $state.go('login');
8 8 else $state.go('addclass');
9 9 $rootScope.isLoggedIn = false;
10 10  
... ... @@ -14,11 +14,10 @@
14 14 });
15 15  
16 16 $('.button-collapse').sideNav({
17   - menuWidth: 300, // Default is 240
18   - edge: 'right', // Choose the horizontal origin
19   - closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
  17 + menuWidth: 240, // Default is 240
  18 + edge: 'left', // Choose the horizontal origin
  19 + //closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
20 20 }
21 21 );
22   -
23 22 }]);