Merge pull request #414 from UW-Madison-DoIT/guest-mode-home-page

MUMUP-2423 : GuestMode the home page
uPortal-Attic · Feb 25, 2016 · ea36651 · ea36651
2 parents e1d6246 + e25c877
commit ea36651
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/list/partials/home-list-view.html b/angularjs-portal-home/src/main/webapp/my-app/layout/list/partials/home-list-view.html
@@ -11,7 +11,7 @@
          <default-card></default-card>
        </li>
     </ul>
-    <ul class="tile-list">
+    <ul class="tile-list" ng-hide='GuestMode'>
        <li class="col-xs-6 col-sm-3 col-md-3 col-lg-2 no-padding list-container">
          <marketplace-light></marketplace-light>
        </li>

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/partials/default-card.html b/angularjs-portal-home/src/main/webapp/my-app/layout/partials/default-card.html
@@ -6,7 +6,7 @@
     tooltip-placement="top"
     tooltip-popup-delay="200"></i>
   </div>
-  <div class='widget-remove'>
+  <div class='widget-remove' ng-hide='GuestMode'>
     <i title="Remove" class="fa fa-times portlet-options" ng-click="layoutCtrl.removePortlet(portlet.nodeId, portlet.title)"><a aria-label="Remove this app symbol" href="#"></a></i>
   </div>
   <a aria-labelledby="appTitle_portlet.title-{{::portlet.nodeId}}" tabindex="0" ng-if="'EXCLUSIVE' === layoutCtrl.portletType(portlet)" href="exclusive/{{::portlet.fname}}" target="{{::portlet.target}}">

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
@@ -8,10 +8,10 @@
     </div>
   </div>
 </script>
-<app-header app-title="Home" 
-            app-icon="fa-home"
-            app-action-link-url='apps'
-            app-action-link-icon='fa-plus-square'
-            app-action-link-text='Add more to home'
-            app-option-template='toggle-modes.html'>
-</app-header>
+<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 MyUW' : 'Add more to home'"
+            app-option-template="'toggle-modes.html'">
+</app-header-two-way-bind>
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-card.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-card.html
@@ -3,13 +3,13 @@
   <div class="portlet-title">
       <portlet-icon></portlet-icon><h1>{{ ::portlet.title }}</h1>
   </div>
-  
-  <div class='widget-remove'>
+
+  <div class='widget-remove' ng-hide='GuestMode'>
      <i title="Remove" class="fa fa-times portlet-options" ng-click="layoutCtrl.removePortlet(portlet.nodeId, portlet.title)"></i>
   </div>
   <div class="portlet-content">
     {{:: portlet.description | truncate:160}}
   </div>
   <div ng-bind-html="portlet.staticContent" class="hidden up-portlet-content-wrapper" id="content-{{::portlet.nodeId}}">
   </div>
-</div>
+</div>
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/widget/partials/home-widget-view.html b/angularjs-portal-home/src/main/webapp/my-app/layout/widget/partials/home-widget-view.html
@@ -12,7 +12,7 @@
         <widget-card></widget-card>
       </li>
     </ul>
-    <ul class="tile-list">
+    <ul class="tile-list" ng-hide='GuestMode'>
        <li class="col-xs-12 col-sm-6 col-md-4 col-lg-3 no-padding list-container">
          <div class="widget-frame add-favorites">
            <a href='apps'>

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/widget/partials/widget-card.html b/angularjs-portal-home/src/main/webapp/my-app/layout/widget/partials/widget-card.html
@@ -8,7 +8,7 @@
       tooltip-placement="top"
       tooltip-popup-delay="200"></i>
     </div>
-    <div class='widget-remove'>
+    <div class='widget-remove' ng-hide='GuestMode'>
       <i title="Remove" class="fa fa-times portlet-options" ng-click="widgetCtrl.removePortlet(portlet.nodeId, portlet.title)"><a aria-label="Remove this app" href="#"></a></i>
     </div>