Merge pull request #364 from UW-Madison-DoIT/utilize-new-app-header-c…

…ontroller

MUMUP-2164 : Utilize new app header add to home

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",

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>
@@ -15,7 +12,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}}">

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>
@@ -15,7 +12,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>

build.sh

@@ -3,34 +3,30 @@
 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
 
 
 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
-