From a64e121db7575ecfcdd9ef51eecc62dc1848456e Mon Sep 17 00:00:00 2001
From: Tim Levett <levett@wisc.edu>
Date: Mon, 28 Dec 2015 14:28:09 -0600
Subject: [PATCH 1/2] configure max & exclusive modes to use new add to home

---
 .../src/main/webapp/js/app-config.js               |  6 +++++-
 .../static/partials/static-content-exclusive.html  |  5 ++++-
 .../layout/static/partials/static-content-max.html |  5 ++++-
 build.sh                                           | 14 +++++---------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/angularjs-portal-home/src/main/webapp/js/app-config.js b/angularjs-portal-home/src/main/webapp/js/app-config.js
index 5e534d78f..9f770e549 100644
--- a/angularjs-portal-home/src/main/webapp/js/app-config.js
+++ b/angularjs-portal-home/src/main/webapp/js/app-config.js
@@ -58,7 +58,11 @@ define(['angular'], function(angular) {
             'eventsSearchURL' : 'https://today.wisc.edu/events/search?term=',
             'loginURL' : '/portal/Login?profile=bucky',
             'logoutURL' : '/portal/Logout',
-            'rootURL' : '/web'
+            'rootURL' : '/web',
+            'addToHomeURLS' : {
+              'layoutURL' : '/portal/web/layoutDoc?tab=UW Bucky Home',
+              'addToHomeActionURL' : '/portal/web/layout?tabName=UW Bucky Home&action=addPortlet&fname='
+            }
         })
         .constant('FOOTER_URLS', [
           { "url" : "static/myuw-help",
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
index 18a774225..6b1dcf1ec 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
@@ -15,7 +15,10 @@
   <app-header-two-way-bind
   app-title="portlet.title"
   app-icon="portlet.faIcon"
-  app-option-template="'static-content-options.html'"></app-header-two-way-bind>
+  app-option-template="'static-content-options.html'"
+  app-fname='portlet.fname'
+  app-action-link-text="'Add to home'"
+  app-add-to-home='true'></app-header-two-way-bind>
   <div role="main" class="col-xs-12 no-padding portlet-body">
     <div data-loading class='loading-gif abs-bottom-right'><img src="img/ajax-loader.gif" alt="Loading content, please wait"></div>
 	  <div ng-bind-html="portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{::portlet.nodeId}}">
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
index 8b7d09276..2a0cef4f3 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
@@ -15,7 +15,10 @@
   <app-header-two-way-bind
   app-title="portlet.title"
   app-icon="portlet.faIcon"
-  app-option-template="'static-content-options.html'"></app-header-two-way-bind>
+  app-option-template="'static-content-options.html'"
+  app-fname='portlet.fname'
+  app-action-link-text="'Add to home'"
+  app-add-to-home='true'></app-header-two-way-bind>
 
   <div role="main" class="col-xs-12 no-padding portlet-body">
     <loading-gif data-object='loading'></loading-gif>
diff --git a/build.sh b/build.sh
index 397c856da..f6a62988a 100755
--- a/build.sh
+++ b/build.sh
@@ -3,25 +3,22 @@
 if [ "$1" = "master" ]; then
   cp angularjs-portal-home/src/main/webapp/js/app-config.js angularjs-portal-home/src/main/webapp/js/app-config.js.bak
   cp angularjs-portal-home/src/main/webapp/js/master-app-config.js angularjs-portal-home/src/main/webapp/js/app-config.js
-  
+
   mvn -Djava.awt.headless=true clean install
 else
 
   if [ "$#" = "0" ]; then
    mvn -Djava.awt.headless=true clean install
-  else 
+  else
    mvn -Djava.awt.headless=true $@
   fi
 
 fi
-  
-  pushd angularjs-portal-frame
-  mvn -Djava.awt.headless=true tomcat7:redeploy
-  popd
+
   pushd angularjs-portal-home
   mvn -Djava.awt.headless=true tomcat7:redeploy
   popd
-  
+
 if [ "$1" = "master" ]; then
   mv angularjs-portal-home/src/main/webapp/js/app-config.js.bak angularjs-portal-home/src/main/webapp/js/app-config.js
 fi
@@ -29,8 +26,7 @@ fi
 
 unamestr=`uname`
 if [[ "$unamestr" == 'Linux' ]]; then
- notify-send "build complete for angular" 
+ notify-send "build complete for angular"
 elif [[ "$unamestr" == 'Darwin' ]]; then
  osascript -e 'display notification "angularJSportal build.sh finished" with title "Angular portal deployed" sound name "Hero"'
 fi
-

From 832822ae5b4fa5ecde7d9ef1d5d111a46a7e66d7 Mon Sep 17 00:00:00 2001
From: Tim Levett <levett@wisc.edu>
Date: Mon, 28 Dec 2015 14:38:53 -0600
Subject: [PATCH 2/2] removed unneeded option about adding to home

---
 .../layout/static/partials/static-content-exclusive.html       | 3 ---
 .../my-app/layout/static/partials/static-content-max.html      | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
index 6b1dcf1ec..8e6edc20c 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
@@ -2,9 +2,6 @@
   <script type="text/ng-template" id="static-content-options.html">
     <div ng-controller="StaticContentController as staticContentCtrl">
       <ul>
-        <li role="presentation" class="fname-{{::portlet.fname}}" ng-hide='inFavorites'>
-            <a ng-click="staticContentCtrl.addToHome(portlet)" href='javascript:;'><span>Add to home</span></a>
-        </li>
         <li role="presentation">
             <a ng-click="openRating('sm',portlet.fname, portlet.title)" href='javascript:;'><span>Rate this App</span></a>
         </li>
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
index 2a0cef4f3..d2fd79b8b 100644
--- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
+++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
@@ -2,9 +2,6 @@
   <script type="text/ng-template" id="static-content-options.html">
     <div ng-controller="StaticContentController as staticContentCtrl">
       <ul>
-        <li role="presentation" class="fname-{{::portlet.fname}}"  ng-hide='inFavorites'>
-            <a ng-click="staticContentCtrl.addToHome(portlet)" href='javascript:;'><span>Add to home</span></a>
-        </li>
         <li role="presentation">
             <a ng-click="openRating('sm',portlet.fname, portlet.title)" href='javascript:;'><span>Rate this App</span></a>
         </li>