Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Commit

Permalink
removed all thought of the sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
@timlevett
timlevett authored and Jared Hanstra committed Dec 21, 2015
1 parent b220a1e commit c461389
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 53 deletions.
5 changes: 0 additions & 5 deletions uw-frame-components/js/frame-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ define(['angular'], function(angular) {
"title" : "Beta Settings",
"description" : "Shows/Hides the Beta Settings"
},
{
"id" : "useGravatar",
"title" : "Use Gravatar to get profile image",
"description" : "Show Gravatar in header"
},
]);

return config;
Expand Down
10 changes: 5 additions & 5 deletions uw-frame-components/portal/main/partials/body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<div class="container-fluid" id="body-background">
<portal-header></portal-header>

<!-- Body -->
<div class="row page-content">
<div role="main" id="region-main" class="col-xs-12 no-padding">
<div ng-class="routeClass" ng-view role="application" aria-labelledby="app-title"></div>

<!-- Body -->
<div class="row page-content">
<div role="main" id="region-main" class="col-xs-12">
<div ng-class="routeClass" ng-view role="application" aria-labelledby="app-title"></div>
</div>
</div>
</div>
</div>
Expand Down
15 changes: 0 additions & 15 deletions uw-frame-components/portal/main/partials/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,6 @@
<div class="nav navbar-nav hidden-sm hidden-md hidden-lg bucky-nav">
<bucky-announcement mode='BUCKY_MOBILE' header-ctrl='headerCtrl'></bucky-announcement>
<notification-bell mode='mobile-menu' header-ctrl='headerCtrl'></notification-bell>
<ul class="list-group sidebar-list">
<li class="list-group-item" ng-click="headerCtrl.navbarCollapsed = true;">
<a ng-if='APP_FLAGS.isWeb' href="/web" ng-click="pushGAEvent('Sidebar', 'Click Link', 'Home');">
<span class="fa fa-home fa-fw"></span> Home
</a>
<a ng-if='!APP_FLAGS.isWeb' href="/" target="_self" ng-click="pushGAEvent('Sidebar', 'Click Link', 'Home');">
<span class="fa fa-home fa-fw"></span> Home
</a>
</li>
<li class="list-group-item" ng-click="headerCtrl.navbarCollapsed = true;">
<a href="{{MISC_URLS.logoutURL}}" target="_self" ng-click="pushGAEvent('Sidebar', 'Click Link', 'Log out');">
<span class="fa fa-sign-out fa-fw"></span> Log out
</a>
</li>
</ul>
</div>
<ul class="nav navbar-nav hidden-xs bucky-nav-large">
<li>
Expand Down
73 changes: 45 additions & 28 deletions uw-frame-components/portal/settings/partials/settings.html
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,45 @@
<frame-page app-title='Beta Settings'
app-icon='fa-gears'>
<ul class='row' style='margin : 10px; padding : 0;'>
<li class='col-sm-5 col-sm-offset-1 portlet-container-home beta-card-style' ng-repeat='option in options'>
<setting-option></setting-option>
</li>
</ul>
<ul class="row" style='margin : 10px; padding : 0;'>
<li class="col-sm-5 col-sm-offset-1 no-padding portlet-container-home beta-card-style" style='text-align : center;'>
<h4>Theme Selector</h4>
<small>Pick which place you call home</small>
<select class="form-control" ng-options="item as item.name for item in THEMES track by item.name" ng-model="portal.theme">
</select>
</li>
<li class="col-sm-5 col-sm-offset-1 portlet-container-home beta-card-style center">
<h4>Danger Zone</h4>
<h4>
<span class="btn-group">
<label class="btn btn-default" ng-click="resetLocal()">Reset Local Storage</label>
</span>
<span class="btn-group">
<label class="btn btn-default" ng-click="clearSession()">Clear Session Storage</label>
</span>
</h4>
<small>Reset to default and clearing the session storage can be nice to clean the slate.</small>
</li>
</ul>
</frame-page>
<div class="portlet-frame container-fluid" ng-controller="SettingsController">
<div role="banner" class="portlet-header">
<img src="img/stand-back.jpg" alt="Science" height="180px" style="left: 30%; width: inherit;">
<h1>Beta Settings</h1>
<p>Opting in/out of experimental features, no warranty included</p>
</div>
<div role="main" class="portlet-body">
<ul class='row' style='margin : 10px; padding : 0;'>
<li class='col-sm-6 portlet-container-home beta-card-style' ng-repeat='option in options'>
<setting-option></setting-option>
</li>
</ul>
<ul class="row" style='margin : 10px; padding : 0;'>
<li class="col-sm-6 no-padding portlet-container-home beta-card-style" style='text-align : center;'>
<h4>Theme Selector</h4>
<small>Pick which place you call home</small>
<select class="form-control" ng-options="item as item.name for item in THEMES track by item.name" ng-model="portal.theme">
</select>
</li>
<li class="col-sm-6 no-padding portlet-container-home beta-card-style" style='text-align : center;'>
<h4>Home Background Image &nbsp;</h4>
<small>Pick a different background image for MyUW Home</small>
<div style='text-align: center;'>
<div style='padding: 1em;'>
<img ng-src="{{$storage.homeImg}}" height='100px'>
</div>
<label class="btn btn-primary" ng-model="$storage.homeImg" btn-radio="'img/terrace.jpg'">Chairs at the Union Terrace</label>
<label class="btn btn-primary" ng-model="$storage.homeImg" btn-radio="'img/square.jpg'">333 East Campus</label>
</div>
</li>
<li class="col-sm-6 portlet-container-home beta-card-style center">
<h4>Danger Zone</h4>
<h4>
<span class="btn-group">
<label class="btn btn-default" ng-click="resetLocal()">Reset Local Storage</label>
</span>
<span class="btn-group">
<label class="btn btn-default" ng-click="clearSession()">Clear Session Storage</label>
</span>
</h4>
<small>Reset to default and clearing the session storage can be nice to clean the slate.</small>
</li>
</ul>
</div>
</div>

0 comments on commit c461389

Please sign in to comment.