Revert "PINES Workaround for Broken Splash Page Search Box"

This reverts commit 66d956722eb287ee8e07ba01d561622e6f188b12.

diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 69e9277..bd57834 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -3,7 +3,7 @@
     <div class="navbar-nav">
       <div class="nav-item">
         <a i18n class="nav-link with-material-icon" 
-          href="/eg2/en-US/staff/splash"
+          href="/eg/staff/"
           egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
           keySpec="alt+h" keyDesc="Navigate Home">
           <span class="material-icons">home</span>

diff --git a/Open-ILS/src/eg2/src/app/staff/splash.component.html b/Open-ILS/src/eg2/src/app/staff/splash.component.html
index a793bf2..cf46f42 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/splash.component.html
@@ -33,7 +33,7 @@
     <div class="col-lg-4">
       <div class="card">
         <div class="card-header">
-          <h2 class="panel-title text-center" i18n style="text-decoration:none;">Circulation and Patrons</h2>
+          <h2 class="panel-title text-center" i18n>Circulation and Patrons</h2>
         </div>
         <div class="card-body">
           <div class="list-group">
@@ -75,7 +75,7 @@
     <div class="col-lg-4">
       <div class="card">
         <div class="card-header">
-          <h2 class="panel-title text-center" i18n style="text-decoration:none;">Item Search and Cataloging</h2>
+          <h2 class="panel-title text-center" i18n>Item Search and Cataloging</h2>
         </div>
         <div class="card-body">
           <div class="list-group">
@@ -148,7 +148,7 @@
     <div class="col-lg-4">
       <div class="card">
         <div class="card-header">
-          <h2 class="panel-title text-center" i18n style="text-decoration:none;">Administration</h2>
+          <h2 class="panel-title text-center" i18n>Administration</h2>
         </div>
         <div class="card-body">
           <div class="list-group">

diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 59d052c..a00cf50 100644 (file)
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -25,7 +25,7 @@
 
   <div class="navbar-collapse collapse" ng-class="!navCollapsed && 'in'">
     <ul class="nav navbar-nav">
-      <li><a href='/eg2/en-US/staff/splash' title="[% l('Home') %]" target="_self"
+      <li><a href='./' title="[% l('Home') %]" target="_self"
         class="glyphicon glyphicon-home"></a><li>
 
       <!-- search -->

diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index ea33f94..5bd0436 100644 (file)
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -1,9 +1,3 @@
-<!-- Redirect to EG2 Splash Page -->
-        <script type="text/javascript">
-            window.location.href = "/eg2/en-US/staff/splash"
-        </script>
-
-
 <div class="container">
   <div class="row">
     <div class="col-md-12 text-center">
@@ -11,6 +5,131 @@
     </div>
   </div>
   <br/>
+  <div class="row" id="splash-nav">
 
-<p>If you are not redirected automatically, follow the <a  href='/eg2/en-US/staff/splash'>link to the main page</a>.</p>
+    <div class="col-md-4">
+      <div class="panel panel-success">
+        <div class="panel-heading">
+          <h2 class="panel-title text-center">[% l('Circulation and Patrons') %]</h2>
+        </div>
+        <div class="panel-body">
+          <div>
+            <a target="_self" href="./circ/patron/bcsearch">
+              <img src="[% ctx.media_prefix %]/images/portal/forward.png" alt="" role="presentation"/>
+              [% l('Check Out Items') %]
+            </a>
+          </div>
+          <div>
+            <a target="_self" href="./circ/checkin/index">
+              <img src="[% ctx.media_prefix %]/images/portal/back.png" alt="" role="presentation"/>
+              [% l('Check In Items') %]
+            </a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/registerpatron.png" alt="" role="presentation"/>
+            <a target="_self" href="./circ/patron/register">[% l('Register New Patron') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/retreivepatron.png" alt="" role="presentation"/>
+            <a target="_self" href="./circ/patron/search">[% l('Search For Patron By Name') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/holds.png" alt="" role="presentation"/>
+            <a target="_self" href="./circ/holds/pull">[% l('Pull List for Hold Requests') %]</a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-4">
+      <div class="panel panel-success">
+        <div class="panel-heading">
+          <h2 class="panel-title text-center">[% l('Item Search and Cataloging') %]</h2>
+        </div>
+        <div class="panel-body">
+          <div>
+            <div class="input-group">
+                <input focus-me="focus_search" 
+                    aria-label="[% l('Search for...') %]"
+                    class="form-control" ng-model="cat_query" type="text" 
+                    ng-keypress="catalog_search($event)"
+                    placeholder="[% l('Search for...') %]"/>
+                <span class="input-group-btn">
+                    <button class='btn btn-default' ng-click="catalog_search()">
+                        [% l('Search Catalog') %]
+                    </button>
+                </span>
+            </div>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/book.png" alt="" role="presentation"/>
+            <a target="_self" href="/eg2/staff/catalog/search">[% l('Advanced Search') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/book.png" alt="" role="presentation"/>
+            <a target="_self" href="./cat/item/search">[% l('Item Status / Display') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/batchimport.png" alt="" role="presentation"/>
+            <a target="_self" href="/eg2/staff/cat/vandelay/import">[% l('MARC Batch Import / Export') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/z3950.png" alt="" role="presentation"/>
+            <a target="_self" href="./cat/z3950/index">[% l('z39.50 Import') %]</a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/bucket.png" alt="" role="presentation"/>
+            <a target="_self" href="./cat/bucket/record/">[% l('Record Buckets') %]</a>
+          </div>
+          <div>
+            <a target="_self" href="./cat/bucket/copy/">
+              <img src="[% ctx.media_prefix %]/images/portal/bucket.png" alt="" role="presentation"/>
+              [% l('Item Buckets') %]
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-4">
+      <div class="panel panel-success">
+        <div class="panel-heading">
+          <div class="panel-title text-center">[% l('Administration and Documentation') %]</div>
+        </div>
+        <div class="panel-body">
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png" alt="" role="presentation"/>
+            <a target="_new" href="https://help.georgialibraries.org">
+              [% l('GPLS Help Desk') %]
+            </a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png" alt="" role="presentation"/>
+            <a target="_new" href="https://pines.georgialibraries.org/documentation/">
+              [% l('PINES Documentation') %]
+            </a>
+          </div>
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/reports.png" alt="" role="presentation"/>
+            <a target="_top" href="./reporter/legacy/main">
+              [% l('Reports') %]
+            </a>
+          </div>          
+          <div>
+            <img src="[% ctx.media_prefix %]/images/portal/reports.png"/>
+            <a target="_new" href="/report-creator/">
+              [% l('PINES Quick Reports') %]
+            </a>
+          </div>
+          <div>
+            <a target="_top" href="./admin/workstation/index">
+              <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png" alt="" role="presentation"/>
+              [% l('Workstation Administration') %]
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
 </div>

diff --git a/Open-ILS/web/staff/index.html b/Open-ILS/web/staff/index.html
index 28f53ff..278cdfe 100644 (file)
--- a/Open-ILS/web/staff/index.html
+++ b/Open-ILS/web/staff/index.html
@@ -2,13 +2,13 @@
 <html lang="en-US">
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="refresh" content="1;url=/eg2/en-US/staff/splash">
+        <meta http-equiv="refresh" content="1;url=/eg/staff">
         <script type="text/javascript">
-            window.location.href = "/eg2/en-US/staff/splash"
+            window.location.href = "/eg/staff"
         </script>
         <title>Staff</title>
     </head>
     <body>
-        <p>If you are not redirected automatically, follow the <a  href='/eg2/en-US/staff/splash'>link to the main page</a>.</p>
+        <p>If you are not redirected automatically, follow the <a  href='/eg/staff'>link to the main page</a>.</p>
     </body>
 </html>
\ No newline at end of file