[open-ils-commits] [GIT] Evergreen ILS branch master updated. b203881fb849e930b47f9f0f05dee0e4ae79e6dd

Evergreen Git git at git.evergreen-ils.org
Wed Sep 27 12:16:42 EDT 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  b203881fb849e930b47f9f0f05dee0e4ae79e6dd (commit)
       via  af284fcc7c545c5076d02a32f9aab9479f17b3ed (commit)
      from  c965386c9f9b31f31809872320ebece595bbab9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b203881fb849e930b47f9f0f05dee0e4ae79e6dd
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Sep 27 11:22:13 2017 -0400

    LP#1718036: Adding more information to About page
    
    Adding a small description of Evergreen along with links to the web site,
    documentation and license on the About page.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    
    + Minor formatting repairs to remove an extraneous '"', give the "What
    Is..." section its own column, and avoid wide lines.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/staff/t_about.tt2 b/Open-ILS/src/templates/staff/t_about.tt2
index 8fe52a5..7aa2ea5 100644
--- a/Open-ILS/src/templates/staff/t_about.tt2
+++ b/Open-ILS/src/templates/staff/t_about.tt2
@@ -19,8 +19,32 @@
         </div>
       </div>
     </div><!--panel-->
+   </div>
+</div>
+<div class="row">
+  <div class="col-md-8">
+     <h2>What is Evergreen?</h2>
+     <p>Evergreen is library automation software that assists libraries
+        in day-to-day operations such as checking out materials, keeping
+        track of users, sharing resources among a group of libraries,
+        acquiring materials, and providing a web-based library catalog for
+        the public.</p>
+     <p>The open-source community developing and supporting Evergreen is
+        marked by a high degree of participation from developers and from
+        the librarians who use the software.</p>
+     <p>More information can be found at <a
+        href="https://evergreen-ils.org"> https://evergreen-ils.org</a>.
+        For help in using Evergreen, see our documentation
+        at <a href="http://docs.evergreen-ils.org">
+        http://docs.evergreen-ils.org.</a></p>
+     <p>Evergreen is Copyright © Georgia Public Library
+        Service - A Unit of the University System of Georgia, and
+        others. The Evergreen software is distributed under the <a
+        href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">
+        GNU General Public License, Version 2.</a></p>
   </div>
 </div>
 
 
 
+

commit af284fcc7c545c5076d02a32f9aab9479f17b3ed
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Sep 19 16:20:05 2017 -0400

    LP#1718036 Webstaff about page
    
    Adds a simple About page showing the EG server version number, accessed
    from the "hamburger" (log out) menu.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 0482d99..a6a65ad 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -557,6 +557,12 @@
               [% l('Log Out') %]
             </a>
           </li>
+          <li>
+            <a href="./about" target="_self">
+              <span class="glyphicon glyphicon-question-sign"></span>
+              [% l('About') %]
+            </a>
+          </li>
           <li class="divider"></li>
           <li class="disabled">
             <a href disabled="disabled">
diff --git a/Open-ILS/src/templates/staff/t_about.tt2 b/Open-ILS/src/templates/staff/t_about.tt2
new file mode 100644
index 0000000..8fe52a5
--- /dev/null
+++ b/Open-ILS/src/templates/staff/t_about.tt2
@@ -0,0 +1,26 @@
+<div class="container-fluid text-center">
+  <div class="alert alert-info alert-less-pad strong-text-2">
+    <span>[% l('About Evergreen') %]</span>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-4">
+    <div class="panel panel-default">
+      <div class="panel-heading">[% l('Server Details') %]</div>
+      <div class="panel-body">
+        <div class="row pad-vert nav-pills-like-tabs">
+          <div class="col-md-6">[% l('Evergreen Version') %]</div>
+          <div class="col-md-6">{{context.version}}</div>
+        </div>
+        <div class="row pad-vert">
+          <div class="col-md-6">[% l('Hostname') %]</div>
+          <div class="col-md-6">{{context.server}}</div>
+        </div>
+      </div>
+    </div><!--panel-->
+  </div>
+</div>
+
+
+
diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js
index f76c278..167e238 100644
--- a/Open-ILS/web/js/ui/default/staff/app.js
+++ b/Open-ILS/web/js/ui/default/staff/app.js
@@ -24,6 +24,12 @@ function($routeProvider , $locationProvider) {
         resolve : resolver
     });
 
+    $routeProvider.when('/about', {
+        templateUrl: './t_about',
+        controller: 'AboutCtrl',
+        resolve : resolver
+    });
+
     // default page 
     $routeProvider.otherwise({
         templateUrl : './t_splash',
@@ -155,5 +161,22 @@ function($routeProvider , $locationProvider) {
             '/eg/staff/cat/catalog/results?query=' + 
             encodeURIComponent($scope.cat_query);
     }
-}]);
+}])
+
+.controller('AboutCtrl', [
+            '$scope','$location','egCore', 
+    function($scope , $location , egCore) {
+
+    $scope.context = {
+        server : $location.host()
+    }; 
+
+    egCore.net.request(
+        'open-ils.actor','opensrf.open-ils.system.ils_version')
+        .then(function(version) {
+            $scope.context.version = version;
+        }
+    );
+
+}])
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/navbar.tt2  |    6 +++
 Open-ILS/src/templates/staff/t_about.tt2 |   50 ++++++++++++++++++++++++++++++
 Open-ILS/web/js/ui/default/staff/app.js  |   25 ++++++++++++++-
 3 files changed, 80 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/t_about.tt2


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list