LP#1684126: copy images used by staff portal outside of /xul/
authorGalen Charlton <gmc@equinoxinitiative.org>
Mon, 24 Jul 2017 16:17:51 +0000 (12:17 -0400)
committerBen Shum <ben@evergreener.net>
Mon, 7 Aug 2017 00:00:40 +0000 (20:00 -0400)
This patch ensures that various images used by the web
staff client will remain available whenever the last bits
of the XUL client are removed.

To test:

[1] Apply patch
[2] Verify that all of the images on the web staff client's
    splash page are displayed.
[3] Retrieve a patron that has an alertable condition (e.g.,
    the patron record is expired. Verify that the stop sign
    image is displayed.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Ben Shum <ben@evergreener.net>
21 files changed:
Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
Open-ILS/src/templates/staff/t_splash.tt2
Open-ILS/web/images/portal/LICENSE [new file with mode: 0644]
Open-ILS/web/images/portal/back.png [new file with mode: 0644]
Open-ILS/web/images/portal/background.png [new file with mode: 0644]
Open-ILS/web/images/portal/batchimport.png [new file with mode: 0644]
Open-ILS/web/images/portal/book.png [new file with mode: 0644]
Open-ILS/web/images/portal/bucket.png [new file with mode: 0644]
Open-ILS/web/images/portal/eg_tiny_logo.jpg [new file with mode: 0644]
Open-ILS/web/images/portal/forward.png [new file with mode: 0644]
Open-ILS/web/images/portal/helpdesk.png [new file with mode: 0644]
Open-ILS/web/images/portal/holds.png [new file with mode: 0644]
Open-ILS/web/images/portal/logo.png [new file with mode: 0644]
Open-ILS/web/images/portal/map.PNG [new file with mode: 0644]
Open-ILS/web/images/portal/newtab2.PNG [new file with mode: 0644]
Open-ILS/web/images/portal/receipt_editor.png [new file with mode: 0644]
Open-ILS/web/images/portal/registerpatron.png [new file with mode: 0644]
Open-ILS/web/images/portal/reports.png [new file with mode: 0644]
Open-ILS/web/images/portal/retreivepatron.png [new file with mode: 0644]
Open-ILS/web/images/portal/z3950.png [new file with mode: 0644]
Open-ILS/web/images/stop_sign.png [new file with mode: 0644]

index ec1b8a9..3c7929e 100644 (file)
@@ -1,7 +1,6 @@
 <div>
 
-  <!-- FIXME: move image file -->
-  <img src='/xul/server/skin/media/images/stop_sign.png'>
+  <img src='[% ctx.media_prefix %]/images/stop_sign.png'>
 
   <div class="alert alert-info" ng-if="patron_stats().holds.ready > 0">
     [% l('Holds available: [_1]', '{{patron_stats().holds.ready}}') %]
index 2f2eb5d..c096f10 100644 (file)
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12 text-center">
-      <img src="/xul/server/skin/media/images/portal/logo.png"/>
+      <img src="[% ctx.media_prefix %]/images/portal/logo.png"/>
     </div>
   </div>
   <br/>
         </div>
         <div class="panel-body">
           <div>
-            <img src="/xul/server/skin/media/images/portal/forward.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/forward.png"/>
             <a target="_self" href="./circ/patron/bcsearch">[% l('Check Out Items') %]</a>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/back.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/back.png"/>
             <a target="_self" href="./circ/checkin/index">[% l('Check In Items') %]</a>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/retreivepatron.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/retreivepatron.png"/>
             <a target="_self" href="./circ/patron/search">[% l('Search For Patron By Name') %]</a>
           </div>
         </div>
             </div>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/bucket.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/bucket.png"/>
             <a target="_self" href="./cat/bucket/record/">[% l('Record Buckets') %]</a>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/bucket.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/bucket.png"/>
             <a target="_self" href="./cat/bucket/copy/">[% l('Copy Buckets') %]</a>
           </div>
         </div>
         </div>
         <div class="panel-body">
           <div>
-            <img src="/xul/server/skin/media/images/portal/helpdesk.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png"/>
             <a target="_top" href="http://docs.evergreen-ils.org/">
               [% l('Evergreen Documentation') %]
             </a>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/helpdesk.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png"/>
             <a target="_top" href="./admin/workstation/index">
               [% l('Workstation Administration') %]
             </a>
           </div>
           <div>
-            <img src="/xul/server/skin/media/images/portal/reports.png"/>
+            <img src="[% ctx.media_prefix %]/images/portal/reports.png"/>
             <a target="_top" href="./reporter/legacy/main">
               [% l('Reports') %]
             </a>
diff --git a/Open-ILS/web/images/portal/LICENSE b/Open-ILS/web/images/portal/LICENSE
new file mode 100644 (file)
index 0000000..7d6786b
--- /dev/null
@@ -0,0 +1,70 @@
+Oxygen Icons 4.3.1 (KDE) (oxygen)\r
+link: http://www.oxygen-icons.org/\r
+license: Dual: CC-BY-SA 3.0 or LGPL\r
+formats: svg, png\r
+subdirectory: open_icon_library-devel/icons/oxygen\r
+\r
+Icons Used:\r
+address-book-new-3.svg\r
+contact-new-3.svg\r
+edit-find-user.svg\r
+help-contextual-2.svg\r
+office-chart-pie.svg\r
+zoom-original-4.svg\r
+preferences-desktop-accessibility-5.svg\r
+\r
+\r
+Intrigue Icon Set 0.6.2 [Green] (intrigue)\r
+link: http://simpleinnovation.net/index.php?page=22&source=2&id=2\r
+license: GPLv2\r
+formats: png\r
+subdirectory: open_icon_library-devel/icons/intrigue\r
+\r
+\r
+Icons Used:\r
+go-next.png\r
+go-previous.png\r
+\r
+\r
+GNOME Icon Theme 2.26.0 (gnome)\r
+link: http://art.gnome.org/\r
+license: GPLv2\r
+formats: svg, png\r
+subdirectories: open_icon_library-devel/icons/gnome\r
+open_icon_library-devel/icons_by_subject/gnome\r
+\r
+Icons Used:\r
+system-help-2.svg\r
+\r
+app-install-data (app-install)\r
+link: http://packages.debian.org/lenny/app-install-data\r
+licenses: Various, see docs/AUTHORS_app-install\r
+format: xpm, svg, png\r
+subdirectory: open_icon_library-devel/icons/app-install\r
+\r
+Icons Used:\r
+epiphany-bookmarks.svg\r
+\r
+Wikimedia Commons\r
+link: http://commons.wikimedia.org/wiki/Main_Page\r
+license: CC, GPL, PD, MIT, BSD (in seperate directories)\r
+format: svg, png\r
+subdirectory: open-icon-library-devel/icons/wiki_commons_bsd\r
+subdirectory: open-icon-library-devel/icons/wiki_commons_mit\r
+subdirectory: open-icon-library-devel/icons/wiki_commons_cc\r
+subdirectory: open-icon-library-devel/icons/wiki_commons_gpl\r
+subdirectory: open-icon-library-devel/icons/wiki_commons_pd\r
+\r
+Icons Used:\r
+gnome-dictionary.svg\r
+\r
+Crystal Clear (crystal_clear)\r
+link: http://commons.wikimedia.org/wiki/Crystal_Clear\r
+license: LGPL-2.1\r
+formats: png\r
+subdirectories: open_icon_library-devel/icons/crystal_clear\r
+open_icon_library-devel/icons_by_subject/crystal_clear\r
+\r
+\r
+Icons Used:\r
+db_update.png
\ No newline at end of file
diff --git a/Open-ILS/web/images/portal/back.png b/Open-ILS/web/images/portal/back.png
new file mode 100644 (file)
index 0000000..8adfb99
Binary files /dev/null and b/Open-ILS/web/images/portal/back.png differ
diff --git a/Open-ILS/web/images/portal/background.png b/Open-ILS/web/images/portal/background.png
new file mode 100644 (file)
index 0000000..3b88d08
Binary files /dev/null and b/Open-ILS/web/images/portal/background.png differ
diff --git a/Open-ILS/web/images/portal/batchimport.png b/Open-ILS/web/images/portal/batchimport.png
new file mode 100644 (file)
index 0000000..3f2fb39
Binary files /dev/null and b/Open-ILS/web/images/portal/batchimport.png differ
diff --git a/Open-ILS/web/images/portal/book.png b/Open-ILS/web/images/portal/book.png
new file mode 100644 (file)
index 0000000..ab6c422
Binary files /dev/null and b/Open-ILS/web/images/portal/book.png differ
diff --git a/Open-ILS/web/images/portal/bucket.png b/Open-ILS/web/images/portal/bucket.png
new file mode 100644 (file)
index 0000000..b794c13
Binary files /dev/null and b/Open-ILS/web/images/portal/bucket.png differ
diff --git a/Open-ILS/web/images/portal/eg_tiny_logo.jpg b/Open-ILS/web/images/portal/eg_tiny_logo.jpg
new file mode 100644 (file)
index 0000000..a570a37
Binary files /dev/null and b/Open-ILS/web/images/portal/eg_tiny_logo.jpg differ
diff --git a/Open-ILS/web/images/portal/forward.png b/Open-ILS/web/images/portal/forward.png
new file mode 100644 (file)
index 0000000..ea6e87a
Binary files /dev/null and b/Open-ILS/web/images/portal/forward.png differ
diff --git a/Open-ILS/web/images/portal/helpdesk.png b/Open-ILS/web/images/portal/helpdesk.png
new file mode 100644 (file)
index 0000000..cf95cfb
Binary files /dev/null and b/Open-ILS/web/images/portal/helpdesk.png differ
diff --git a/Open-ILS/web/images/portal/holds.png b/Open-ILS/web/images/portal/holds.png
new file mode 100644 (file)
index 0000000..2f2d4c7
Binary files /dev/null and b/Open-ILS/web/images/portal/holds.png differ
diff --git a/Open-ILS/web/images/portal/logo.png b/Open-ILS/web/images/portal/logo.png
new file mode 100644 (file)
index 0000000..1526f16
Binary files /dev/null and b/Open-ILS/web/images/portal/logo.png differ
diff --git a/Open-ILS/web/images/portal/map.PNG b/Open-ILS/web/images/portal/map.PNG
new file mode 100644 (file)
index 0000000..8dca3d0
Binary files /dev/null and b/Open-ILS/web/images/portal/map.PNG differ
diff --git a/Open-ILS/web/images/portal/newtab2.PNG b/Open-ILS/web/images/portal/newtab2.PNG
new file mode 100644 (file)
index 0000000..de5d805
Binary files /dev/null and b/Open-ILS/web/images/portal/newtab2.PNG differ
diff --git a/Open-ILS/web/images/portal/receipt_editor.png b/Open-ILS/web/images/portal/receipt_editor.png
new file mode 100644 (file)
index 0000000..daab752
Binary files /dev/null and b/Open-ILS/web/images/portal/receipt_editor.png differ
diff --git a/Open-ILS/web/images/portal/registerpatron.png b/Open-ILS/web/images/portal/registerpatron.png
new file mode 100644 (file)
index 0000000..eab5cda
Binary files /dev/null and b/Open-ILS/web/images/portal/registerpatron.png differ
diff --git a/Open-ILS/web/images/portal/reports.png b/Open-ILS/web/images/portal/reports.png
new file mode 100644 (file)
index 0000000..5a673ab
Binary files /dev/null and b/Open-ILS/web/images/portal/reports.png differ
diff --git a/Open-ILS/web/images/portal/retreivepatron.png b/Open-ILS/web/images/portal/retreivepatron.png
new file mode 100644 (file)
index 0000000..986e080
Binary files /dev/null and b/Open-ILS/web/images/portal/retreivepatron.png differ
diff --git a/Open-ILS/web/images/portal/z3950.png b/Open-ILS/web/images/portal/z3950.png
new file mode 100644 (file)
index 0000000..d773382
Binary files /dev/null and b/Open-ILS/web/images/portal/z3950.png differ
diff --git a/Open-ILS/web/images/stop_sign.png b/Open-ILS/web/images/stop_sign.png
new file mode 100644 (file)
index 0000000..f7379b3
Binary files /dev/null and b/Open-ILS/web/images/stop_sign.png differ