Commit 15b58ef63d5867cc3eba4e56b7c2cdfe7b2908cd

Authored by Andrew Buss
1 parent 7cf67e5616

just use two icons rather than a dropdown

Showing 1 changed file with 8 additions and 6 deletions Inline Diff

<!DOCTYPE html> 1 1 <!DOCTYPE html>
<html ng-app="flashy"> 2 2 <html ng-app="flashy">
<base href="/app/"> 3 3 <base href="/app/">
<head> 4 4 <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> 5 5 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<link rel="stylesheet" 6 6 <link rel="stylesheet"
href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css"> 7 7 href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
8 8
<link rel="stylesheet" href="styles/flashier.css"/> 9 9 <link rel="stylesheet" href="styles/flashier.css"/>
<link rel="stylesheet" href="styles/flashy.css"/> 10 10 <link rel="stylesheet" href="styles/flashy.css"/>
<link href='https://fonts.googleapis.com/css?family=Titillium+Web:200,200italic,300,600,400,900,700,400italic,700italic,300italic,600italic' 11 11 <link href='https://fonts.googleapis.com/css?family=Titillium+Web:200,200italic,300,600,400,900,700,400italic,700italic,300italic,600italic'
rel='stylesheet' type='text/css'> 12 12 rel='stylesheet' type='text/css'>
<title>Flashy</title> 13 13 <title>Flashy</title>
</head> 14 14 </head>
<body ng-controller="RootController"> 15 15 <body ng-controller="RootController">
<header> 16 16 <header>
<nav> 17 17 <nav>
<div class="nav-wrapper"> 18 18 <div class="nav-wrapper">
<a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo" 19 19 <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo"
class="left button-collapse hide-on-med-and-up"><i 20 20 class="left button-collapse hide-on-med-and-up"><i
class="mdi-navigation-menu"></i></a> 21 21 class="mdi-navigation-menu"></i></a>
<!-- User's classes dropdown --> 22 22 <!-- User's classes dropdown -->
<ul id="classDropdown" class="dropdown-content"> 23 23 <ul id="classDropdown" class="dropdown-content">
<li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections"> 24 24 <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
<a ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a> 25 25 <a ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
</li> 26 26 </li>
<li class="divider"></li> 27 27 <li class="divider"></li>
<li><a ui-sref="addclass">Add Class</a></li> 28 28 <li><a ui-sref="addclass">Add Class</a></li>
</ul> 29 29 </ul>
<ul> 30 30 <ul>
<li><a style="font-size:20px; font-weight:700" class="dropdown-button ng-cloak hide-on-small-and-down" 31 31 <li><a style="font-size:20px; font-weight:700" class="dropdown-button ng-cloak hide-on-small-and-down"
href="#!" 32 32 href="#!"
data-activates="classDropdown">{{currentSection.id?currentSection.short_name:"Classes"}}<i 33 33 data-activates="classDropdown">{{currentSection.id?currentSection.short_name:"Classes"}}<i
class="mdi-navigation-arrow-drop-down right"></i></a></li> 34 34 class="mdi-navigation-arrow-drop-down right"></i></a></li>
</ul> 35 35 </ul>
<ul ng-show="currentSection.id && UserService.isLoggedIn()" class="left hide-on-small-and-down"> 36 36 <ul ng-show="currentSection.id && UserService.isLoggedIn()" class="left hide-on-small-and-down">
<li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped" 37 37 <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
data-position="bottom" 38 38 data-position="bottom"
data-delay="50" data-tooltip="Feed"><i 39 39 data-delay="50" data-tooltip="Feed"><i
class="mdi-action-view-module"></i></a></li> 40 40 class="mdi-action-view-module"></i></a></li>
<li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped" 41 41 <li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped"
data-position="bottom" 42 42 data-position="bottom"
data-delay="50" data-tooltip="Deck"><i 43 43 data-delay="50" data-tooltip="Deck"><i
class="mdi-action-view-carousel"></i></a></li> 44 44 class="mdi-action-view-carousel"></i></a></li>
<li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped" 45 45 <li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped"
data-position="bottom" 46 46 data-position="bottom"
data-delay="50" data-tooltip="Card List"><i 47 47 data-delay="50" data-tooltip="Card List"><i
class="mdi-action-view-list"></i></a></li> 48 48 class="mdi-action-view-list"></i></a></li>
</ul> 49 49 </ul>
<a href="#" class="brand-logo center">Flashy</a> 50 50 <a href="#" class="brand-logo center">Flashy</a>
51 51
<ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down"> 52 52 <ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down">
53 53
<li ui-sref-active="active"><a ui-sref="study" class="tooltipped" data-position="bottom" data-delay="50" 54 54 <li ui-sref-active="active"><a ui-sref="study" class="tooltipped" data-position="bottom" data-delay="50"
data-tooltip="Study"> 55 55 data-tooltip="Study">
<i class="tiny mdi-action-pageview"></i></a></li> 56 56 <i class="tiny mdi-action-pageview"></i></a></li>
57 57
<!-- Settings Dropdown --> 58 58 <!-- Settings Dropdown -->
<ul id="settingsDropdown" class="dropdown-content"> 59 59 <ul id="settingsDropdown" class="dropdown-content">
<li><a ui-sref="settings">Settings</a></li> 60 60
<li><a ui-sref="logout">Logout</a></li> 61 61
</ul> 62 62 </ul>
63
<li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped" 63 64 <li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped"
data-position="bottom" 64 65 data-position="bottom"
data-delay="50" data-tooltip="Help"></i></a></li> 65 66 data-delay="50" data-tooltip="Help"></i></a></li>
66 67 <li ui-sref-active="active"><a ui-sref="settings"><i data-position="bottom" data-delay="50"
<li><a class="dropdown-button ng-cloak" href="#!" data-activates="settingsDropdown"><i 67 68 data-tooltip="Settings"
class="tiny mdi-action-settings"><i 68 69 class="mdi-action-settings tooltipped"></i></a></li>
class="mdi-navigation-arrow-drop-down right"></i></i></a></li> 69 70 <li><a ui-sref="logout"><i data-position="bottom" data-delay="50" data-tooltip="Logout"
71 class="mdi-content-forward tooltipped"></i></a></li>
70 72
71 73
</ul> 72 74 </ul>
73 75
<!-- Slide-in side-nav for small screens --> 74 76 <!-- Slide-in side-nav for small screens -->
<ul ng-show="UserService.isLoggedIn()" class="side-nav" id="mobile-demo"> 75 77 <ul ng-show="UserService.isLoggedIn()" class="side-nav" id="mobile-demo">
<span ng-show="currentSection.id"> 76 78 <span ng-show="currentSection.id">
<li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"> 77 79 <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-module left"></i> 78 80 <i class="mdi-action-view-module left"></i>
Feed</a> 79 81 Feed</a>
</li> 80 82 </li>
<li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped"> 81 83 <li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-carousel left"> </i> 82 84 <i class="mdi-action-view-carousel left"> </i>
Deck 83 85 Deck
</a> 84 86 </a>
</li> 85 87 </li>
<li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped"> 86 88 <li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-list left"></i> 87 89 <i class="mdi-action-view-list left"></i>
Card List 88 90 Card List
</a> 89 91 </a>
</li> 90 92 </li>
<hr> 91 93 <hr>
</span> 92 94 </span>
<!-- Collapsible menu for all the User's classes --> 93 95 <!-- Collapsible menu for all the User's classes -->
<ul class="collapsible" data-collapsible="accordion"> 94 96 <ul class="collapsible" data-collapsible="accordion">
<li class="bold"> 95 97 <li class="bold">
<a class="collapsible-header black-text"> 96 98 <a class="collapsible-header black-text">
Classes 97 99 Classes
<i class="mdi-navigation-arrow-drop-down right"></i> 98 100 <i class="mdi-navigation-arrow-drop-down right"></i>
</a> 99 101 </a>
</li> 100 102 </li>
<div class="collapsible-body" style="display: block"> 101 103 <div class="collapsible-body" style="display: block">
<ul> 102 104 <ul>
<li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections"> 103 105 <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
<a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a> 104 106 <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
</li> 105 107 </li>
<hr> 106 108 <hr>
<li><a ui-sref="addclass"><i class="tiny mdi-content-add">Add Class</i></a></li> 107 109 <li><a ui-sref="addclass"><i class="tiny mdi-content-add">Add Class</i></a></li>
</ul> 108 110 </ul>
</div> 109 111 </div>
</ul> 110 112 </ul>
<li><a ui-sref="study">Study</a></li> 111 113 <li><a ui-sref="study">Study</a></li>
<li><a ui-sref="settings">Settings</a></li> 112 114 <li><a ui-sref="settings">Settings</a></li>
<li><a ui-sref="logout">Logout</a></li> 113 115 <li><a ui-sref="logout">Logout</a></li>
</ul> 114 116 </ul>
</div> 115 117 </div>
</nav> 116 118 </nav>
117 119
</header> 118 120 </header>
119 121
120 122
<!-- Menu Bar --> 121 123 <!-- Menu Bar -->
122 124
<div class="wrapper"> 123 125 <div class="wrapper">
124 126
<main ui-view></main> 125 127 <main ui-view></main>
126 128
<div class="push"></div> 127 129 <div class="push"></div>
</div> 128 130 </div>
129 131
130 132
<footer class="page-footer"> 131 133 <footer class="page-footer">
<div class="footer-copyright"> 132 134 <div class="footer-copyright">
<div class="container"> 133 135 <div class="container">
&copy; 2015 Team Swag 134 136 &copy; 2015 Team Swag
<a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by 135 137 <a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by
email!</a> 136 138 email!</a>
</div> 137 139 </div>
138 140
</div> 139 141 </div>
</footer> 140 142 </footer>
141 143
</body> 142 144 </body>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> 143 145 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> 144 146 <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script> 145 147 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script> 146 148 <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="scripts/materialize.js"></script> 147 149 <script type="text/javascript" src="scripts/materialize.js"></script>
<script type="text/javascript" src="scripts/jquery.collapsible.js"></script> 148 150 <script type="text/javascript" src="scripts/jquery.collapsible.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script> 149 151 <script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script> 150 152 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script> 151 153 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-resource.min.js"></script> 152 154 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-resource.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.4/angular-filter.js"></script> 153 155 <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.4/angular-filter.js"></script>
154 156
155 157
<script src="config.js"></script> 156 158 <script src="config.js"></script>
157 159
<!-- Controllers --> 158 160 <!-- Controllers -->
<script src="scripts/FeedController.js"></script> 159 161 <script src="scripts/FeedController.js"></script>
<script src="scripts/RootController.js"></script> 160 162 <script src="scripts/RootController.js"></script>
<script src="scripts/SettingsController.js"></script> 161 163 <script src="scripts/SettingsController.js"></script>
<script src="scripts/LoginController.js"></script> 162 164 <script src="scripts/LoginController.js"></script>
<script src="scripts/LogoutController.js"></script> 163 165 <script src="scripts/LogoutController.js"></script>
<script src="scripts/DeckController.js"></script> 164 166 <script src="scripts/DeckController.js"></script>