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

Commit

Permalink
cleanup merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
timlevett committed Dec 21, 2015
1 parent d24e5bd commit a860a16
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 53 deletions.
8 changes: 4 additions & 4 deletions uw-frame-components/portal/main/partials/example-page.html
Expand Up @@ -29,26 +29,26 @@
</a>
</li>
<li class='col-sm-2 col-sm-offset-1 portlet-container-home beta-card-style center'>
<a href='settings'>Notifications
<a href='notifications'>Notifications
<br><br>
<i class='fa fa-bell fa-3x'></i>
</a>
</li>
<li class='col-sm-2 col-sm-offset-1 portlet-container-home beta-card-style center'>
<a href='settings'>Server error
<a href='server-error'>Server error
<br><br>
<i class='fa fa-exclamation-triangle fa-3x'></i>
</a>
</li>
<li class='col-sm-2 col-sm-offset-1 portlet-container-home beta-card-style center'>
<a href='settings'>Access denied
<a href='access-denied'>Access denied
<br><br>
<i class='fa fa-exclamation-triangle fa-3x'></i>
</a>
</li>

<li class='col-sm-2 portlet-container-home beta-card-style center'>
<a href='settings'>Features
<a href='features'>Features
<br><br>
<i class='fa fa-newspaper-o fa-3x'></i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion uw-frame-components/portal/main/partials/server-error.html
@@ -1,4 +1,4 @@
<frame-page app-title='{{NAMES.title}} - Service Temporarily Unavailable'>
<frame-page app-title='{{NAMES.title}} - Service Unavailable'>
<h2 class='center'>We're sorry, but there was a problem with your request.</h2>
<p class='center'>
<i class='fa fa-exclamation-triangle fa-3x warning-color'></i>
Expand Down
4 changes: 2 additions & 2 deletions uw-frame-components/portal/misc/partials/app-header.html
Expand Up @@ -6,10 +6,10 @@
</script>

<div role="heading" class="app-header">
<div class="col-sm-6 col-xs-9">
<div class="col-sm-7 col-xs-9">
<h3 id="app-title" class='title'><i class="fa {{::icon}}"></i> {{::title}}</h3>
</div>
<div class="col-sm-6 col-xs-3 header-links">
<div class="col-sm-5 col-xs-3 header-links">
<div ng-if='optionTemplate' class="link-div" popover-template="'AppHeaderOptions.html'" popover-placement="bottom" popover-trigger="click">
<span class='visible-xs'><i class='fa fa-gear fa-fw'></i></span><span class='hidden-xs'>Options <i class="fa fa-angle-down"></i></span>
</div>
Expand Down
@@ -1,5 +1,5 @@
<div class="portlet-frame" ng-controller="PortalNotificationController as notificationCtrl">
<app-header app-title="Notifications"></app-header>
<app-header app-title="Notifications" app-icon='fa-bell'></app-header>

<div class="portlet-body notifications">
<div class="inner-nav-container">
Expand Down
73 changes: 28 additions & 45 deletions uw-frame-components/portal/settings/partials/settings.html
@@ -1,45 +1,28 @@
<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>
<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>

0 comments on commit a860a16

Please sign in to comment.