From 1b63f8b414402963c5d3ac275548629e42baf9bb Mon Sep 17 00:00:00 2001
From: zeke-witter <david.witter@wisc.edu>
Date: Mon, 14 Aug 2017 13:23:08 -0500
Subject: [PATCH 1/4] Use new app options model

---
 .../src/main/webapp/js/override.js              |  3 +++
 .../layout/partials/app-header-options.html     | 15 +++++++++++++++
 .../my-app/layout/partials/home-header.html     | 17 ++---------------
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html

diff --git a/angularjs-portal-home/src/main/webapp/js/override.js b/angularjs-portal-home/src/main/webapp/js/override.js
index 8a6be5e9e..ec3ab2f2a 100644
--- a/angularjs-portal-home/src/main/webapp/js/override.js
+++ b/angularjs-portal-home/src/main/webapp/js/override.js
@@ -11,6 +11,9 @@ define(['angular'], function(angular) {
             'debug': true,
             'showUserSettingsPage': true,
           },
+          'APP_OPTIONS': {
+            'optionsTemplateURL': 'my-app/layout/partials/app-header-options.html',
+          },
           'FEATURES': {
             enabled: true,
           },
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
new file mode 100644
index 000000000..e9aff2661
--- /dev/null
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
@@ -0,0 +1,15 @@
+<md-button ng-href="apps" class="md-primary">
+  <span ng-if="GuestMode">
+    <md-icon>explore</md-icon> Browse {{ portal.theme.title }}
+  </span>
+  <span ng-if="!GuestMode">
+    <md-icon>add</md-icon> Add more to home
+  </span>
+</md-button>
+<div ng-controller="ToggleController">
+  <md-switch class="md-accent app-header-toggle" ng-model="expandedMode"
+             aria-label="Toggle expanded widget layout" ng-change="toggleMode(expandedMode)"
+             style="margin-top:0;margin-bottom:0;">
+    <span>Expand widgets</span>
+  </md-switch>
+</div>
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/home-header.html b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/home-header.html
index b79c1fea5..091b50bc9 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/home-header.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/home-header.html
@@ -1,17 +1,4 @@
-<script type="text/ng-template" id="toggle-modes.html">
-  <div ng-controller="ToggleController">
-    <md-switch class="md-accent app-header-toggle" ng-model="expandedMode"
-               aria-label="Toggle expanded widget layout" ng-change="toggleMode(expandedMode)"
-               style="margin-top:0;margin-bottom:0;">
-      <span>Expand widgets</span>
-    </md-switch>
-  </div>
-</script>
 <app-header-two-way-bind app-title="'Home'"
-                         app-icon="'fa-home'"
-                         app-action-link-url="'apps'"
-                         app-action-link-icon="GuestMode ? 'fa-globe' : 'fa-plus-square'"
-                         app-action-link-text="GuestMode ? 'Browse {{portal.theme.title}}' : 'Add more to home'"
-                         app-single-option="true"
-                         app-option-template="'toggle-modes.html'">
+                         app-icon="'home'"
+                         app-show-add-to-home="false">
 </app-header-two-way-bind>

From 492c20e469ca7ada3773a3367194d19b5c7f17bf Mon Sep 17 00:00:00 2001
From: zeke-witter <david.witter@wisc.edu>
Date: Mon, 14 Aug 2017 13:40:05 -0500
Subject: [PATCH 2/4] Add app header options

---
 .../my-app/layout/partials/app-header-options.html   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
index e9aff2661..4b4611de2 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
@@ -1,15 +1,15 @@
-<md-button ng-href="apps" class="md-primary">
+<div layout="row" layout-align="end center">
+  <md-button ng-href="apps" class="md-primary">
   <span ng-if="GuestMode">
     <md-icon>explore</md-icon> Browse {{ portal.theme.title }}
   </span>
-  <span ng-if="!GuestMode">
+    <span ng-if="!GuestMode">
     <md-icon>add</md-icon> Add more to home
   </span>
-</md-button>
-<div ng-controller="ToggleController">
-  <md-switch class="md-accent app-header-toggle" ng-model="expandedMode"
+  </md-button>
+  <md-switch class="md-accent app-header-toggle" ng-model="expandedMode" ng-controller="ToggleController"
              aria-label="Toggle expanded widget layout" ng-change="toggleMode(expandedMode)"
-             style="margin-top:0;margin-bottom:0;">
+             style="margin-top:0;margin-bottom:0;color:#fff;">
     <span>Expand widgets</span>
   </md-switch>
 </div>

From 8a7ea50bcd77cda71525670e4f9399fd824b0c13 Mon Sep 17 00:00:00 2001
From: zeke-witter <david.witter@wisc.edu>
Date: Tue, 15 Aug 2017 13:00:40 -0500
Subject: [PATCH 3/4] Add small screens menu

---
 .../layout/partials/app-header-options.html   | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
index 4b4611de2..f7292723d 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/app-header-options.html
@@ -1,11 +1,12 @@
-<div layout="row" layout-align="end center">
+<!-- MEDIUM AND LARGE SCREENS -->
+<div layout="row" layout-align="end center" hide-xs>
   <md-button ng-href="apps" class="md-primary">
-  <span ng-if="GuestMode">
-    <md-icon>explore</md-icon> Browse {{ portal.theme.title }}
-  </span>
+    <span ng-if="GuestMode">
+      <md-icon>explore</md-icon> Browse {{ portal.theme.title }}
+    </span>
     <span ng-if="!GuestMode">
-    <md-icon>add</md-icon> Add more to home
-  </span>
+      <md-icon>add</md-icon> Add more to home
+    </span>
   </md-button>
   <md-switch class="md-accent app-header-toggle" ng-model="expandedMode" ng-controller="ToggleController"
              aria-label="Toggle expanded widget layout" ng-change="toggleMode(expandedMode)"
@@ -13,3 +14,30 @@
     <span>Expand widgets</span>
   </md-switch>
 </div>
+
+<!-- SMALL SCREENS -->
+<md-menu md-position-mode="target-right bottom" hide-gt-xs>
+  <md-button aria-label="Open options menu" class="md-primary link-div" ng-click="$mdOpenMenu($event)">
+    <span layout="row" layout-align="center center"><md-icon>settings</md-icon></span>
+    <md-tooltip class="top-bar-tooltip" md-direction="bottom" md-delay="500">Options</md-tooltip>
+  </md-button>
+  <md-menu-content width="5">
+    <md-menu-item>
+      <md-button ng-href="apps" class="md-primary">
+        <span ng-if="GuestMode">
+          <md-icon>explore</md-icon> Browse {{ portal.theme.title }}
+        </span>
+        <span ng-if="!GuestMode">
+          <md-icon>add</md-icon> Add more to home
+        </span>
+      </md-button>
+    </md-menu-item>
+    <md-menu-item>
+      <md-switch class="md-accent app-header-toggle" ng-model="expandedMode" ng-controller="ToggleController"
+                 aria-label="Toggle expanded widget layout" ng-change="toggleMode(expandedMode)"
+                 style="margin-top:0;margin-bottom:0;color:#fff;">
+        <span>Expand widgets</span>
+      </md-switch>
+    </md-menu-item>
+  </md-menu-content>
+</md-menu>

From c0f84b396fbd663512c32fd5bea1f20165256273 Mon Sep 17 00:00:00 2001
From: zeke-witter <david.witter@wisc.edu>
Date: Tue, 15 Aug 2017 14:39:34 -0500
Subject: [PATCH 4/4] Fix linting error

---
 angularjs-portal-home/src/main/webapp/js/override.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/angularjs-portal-home/src/main/webapp/js/override.js b/angularjs-portal-home/src/main/webapp/js/override.js
index ee9625d88..0be50d16e 100644
--- a/angularjs-portal-home/src/main/webapp/js/override.js
+++ b/angularjs-portal-home/src/main/webapp/js/override.js
@@ -12,7 +12,8 @@ define(['angular'], function(angular) {
             'showUserSettingsPage': true,
           },
           'APP_OPTIONS': {
-            'optionsTemplateURL': 'my-app/layout/partials/app-header-options.html',
+            'optionsTemplateURL':
+              'my-app/layout/partials/app-header-options.html',
           },
           'SERVICE_LOC': {
             'aboutURL': '/portal/api/session.json',