110swag / flashy-frontend

Download as
Browse Code ยป

Commit 8ee3ec903bcfa156dfeb571e3e2dad015c45f272

Authored by Rohan Rangray
2 parents 70278fc157 47cf6bed83
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Merge branch 'master' of git.ucsd.edu:110swag/flashy-frontend 

mergin

Showing 2 changed files Side-by-side Diff

home.html View file @ 8ee3ec9
... ... @@ -22,6 +22,7 @@
22 22 <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo"
23 23 class="left button-collapse hide-on-med-and-up"><i
24 24 class="mdi-navigation-menu"></i></a>
  25 +
25 26 <!-- User's classes dropdown -->
26 27 <ul id="classDropdown" class="dropdown-content">
27 28 <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
28 29  
... ... @@ -31,16 +32,16 @@
31 32 <li><a ui-sref="addclass">Add Class</a></li>
32 33 </ul>
33 34 <ul ng-show="UserService.isLoggedIn()" class="left hide-on-small-and-down">
34   - <li><a style="font-size:20px; font-weight:700" class="dropdown-button ng-cloak hide-on-small-and-down"
35   - href="#!"
36   - data-activates="classDropdown">{{currentSection.id?currentSection.short_name:"Classes"}}<i
  35 + <li><a style="font-size:20px; font-weight:700;" class="dropdown-button ng-cloak hide-on-small-and-down"
  36 + href="#!" id="class-list"
  37 + data-activates="classDropdown" data-beloworigin="true">{{currentSection.id?currentSection.short_name:"Classes"}}<i
37 38 class="mdi-navigation-arrow-drop-down right"></i></a></li>
38 39 <li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})"
39 40 class="tooltipped"
40 41 data-position="bottom"
41 42 data-delay="50" data-tooltip="Feed"><i
42 43 class="mdi-action-view-module"></i></a></li>
43   - <li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})"
  44 + <li ng-show="currentSection.id" ui-sref-active="active" id="class-list"><a ui-sref="deck({sectionId:currentSection.id})"
44 45 class="tooltipped"
45 46 data-position="bottom"
46 47 data-delay="50" data-tooltip="Deck"><i
... ... @@ -97,7 +98,7 @@
97 98 <hr>
98 99 </span>
99 100 <!-- Collapsible menu for all the User's classes -->
100   - <ul class="collapsible" data-collapsible="accordion">
  101 + <ul class="collapsible" data-collapsible="accordion" >
101 102 <li class="bold">
102 103 <a class="collapsible-header black-text">
103 104 Classes
scripts/RootController.js View file @ 8ee3ec9
... ... @@ -10,17 +10,31 @@
10 10 // console.log(data);
11 11 // $rootScope.user = data;
12 12 //});
13   - $('.button-collapse').sideNav({
  13 + /* $('.button-collapse').sideNav({
14 14 menuWidth: 240, // Default is 240
15 15 edge: 'left', // Choose the horizontal origin
16 16 closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
17 17 }
18   - );
  18 + ); */
19 19  
  20 + /*
20 21 $('.collapsible').collapsible({
21 22 accordion: false // A setting that changes the collapsible behavior to expandable instead of the default accordion style
22 23 });
  24 + */
23 25  
  26 + /*
  27 + $('#dropdown-button').dropdown({
  28 + closeOnClick: true;
  29 + });
  30 + */
  31 +
  32 + /*
  33 + $('#class-list').on('click',function(){
  34 + $('#classDropdown').toggle();
  35 + })
  36 + */
  37 +
24 38 var postlogin = function(data) {
25 39 $scope.user = data;
26 40 //UserService.redirectToDefaultState($state);