[open-ils-commits] [GIT] Evergreen ILS branch master updated. de82391aa8379f95352a4e6f565f85bd1463a63b
Evergreen Git
git at git.evergreen-ils.org
Sun Aug 6 20:01:06 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 de82391aa8379f95352a4e6f565f85bd1463a63b (commit)
from aa139defa54c613444af14bc083b45803abbba2a (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 de82391aa8379f95352a4e6f565f85bd1463a63b
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Jul 24 12:17:51 2017 -0400
LP#1684126: copy images used by staff portal outside of /xul/
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 at equinoxinitiative.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
index ec1b8a9..3c7929e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
@@ -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}}') %]
diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index 2f2eb5d..c096f10 100644
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -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/>
@@ -14,15 +14,15 @@
</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>
@@ -49,11 +49,11 @@
</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>
@@ -67,19 +67,19 @@
</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
index 0000000..7d6786b
--- /dev/null
+++ b/Open-ILS/web/images/portal/LICENSE
@@ -0,0 +1,70 @@
+Oxygen Icons 4.3.1 (KDE) (oxygen)
+link: http://www.oxygen-icons.org/
+license: Dual: CC-BY-SA 3.0 or LGPL
+formats: svg, png
+subdirectory: open_icon_library-devel/icons/oxygen
+
+Icons Used:
+address-book-new-3.svg
+contact-new-3.svg
+edit-find-user.svg
+help-contextual-2.svg
+office-chart-pie.svg
+zoom-original-4.svg
+preferences-desktop-accessibility-5.svg
+
+
+Intrigue Icon Set 0.6.2 [Green] (intrigue)
+link: http://simpleinnovation.net/index.php?page=22&source=2&id=2
+license: GPLv2
+formats: png
+subdirectory: open_icon_library-devel/icons/intrigue
+
+
+Icons Used:
+go-next.png
+go-previous.png
+
+
+GNOME Icon Theme 2.26.0 (gnome)
+link: http://art.gnome.org/
+license: GPLv2
+formats: svg, png
+subdirectories: open_icon_library-devel/icons/gnome
+open_icon_library-devel/icons_by_subject/gnome
+
+Icons Used:
+system-help-2.svg
+
+app-install-data (app-install)
+link: http://packages.debian.org/lenny/app-install-data
+licenses: Various, see docs/AUTHORS_app-install
+format: xpm, svg, png
+subdirectory: open_icon_library-devel/icons/app-install
+
+Icons Used:
+epiphany-bookmarks.svg
+
+Wikimedia Commons
+link: http://commons.wikimedia.org/wiki/Main_Page
+license: CC, GPL, PD, MIT, BSD (in seperate directories)
+format: svg, png
+subdirectory: open-icon-library-devel/icons/wiki_commons_bsd
+subdirectory: open-icon-library-devel/icons/wiki_commons_mit
+subdirectory: open-icon-library-devel/icons/wiki_commons_cc
+subdirectory: open-icon-library-devel/icons/wiki_commons_gpl
+subdirectory: open-icon-library-devel/icons/wiki_commons_pd
+
+Icons Used:
+gnome-dictionary.svg
+
+Crystal Clear (crystal_clear)
+link: http://commons.wikimedia.org/wiki/Crystal_Clear
+license: LGPL-2.1
+formats: png
+subdirectories: open_icon_library-devel/icons/crystal_clear
+open_icon_library-devel/icons_by_subject/crystal_clear
+
+
+Icons Used:
+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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
index 0000000..f7379b3
Binary files /dev/null and b/Open-ILS/web/images/stop_sign.png differ
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/circ/patron/t_alerts.tt2 | 3 +--
Open-ILS/src/templates/staff/t_splash.tt2 | 18 +++++++++---------
.../skin/media => web}/images/portal/LICENSE | 0
.../skin/media => web}/images/portal/back.png | Bin 6731 -> 6731 bytes
.../media => web}/images/portal/background.png | Bin 2640 -> 2640 bytes
.../media => web}/images/portal/batchimport.png | Bin 5517 -> 5517 bytes
.../skin/media => web}/images/portal/book.png | Bin 6296 -> 6296 bytes
.../skin/media => web}/images/portal/bucket.png | Bin 4179 -> 4179 bytes
Open-ILS/web/images/{ => portal}/eg_tiny_logo.jpg | Bin 1722 -> 1722 bytes
.../skin/media => web}/images/portal/forward.png | Bin 6814 -> 6814 bytes
.../skin/media => web}/images/portal/helpdesk.png | Bin 8801 -> 8801 bytes
.../skin/media => web}/images/portal/holds.png | Bin 5281 -> 5281 bytes
.../skin/media => web}/images/portal/logo.png | Bin 24396 -> 24396 bytes
.../skin/media => web}/images/portal/map.PNG | Bin 3371 -> 3371 bytes
.../skin/media => web}/images/portal/newtab2.PNG | Bin 2997 -> 2997 bytes
.../media => web}/images/portal/receipt_editor.png | Bin 2463 -> 2463 bytes
.../media => web}/images/portal/registerpatron.png | Bin 6485 -> 6485 bytes
.../skin/media => web}/images/portal/reports.png | Bin 5920 -> 5920 bytes
.../media => web}/images/portal/retreivepatron.png | Bin 7188 -> 7188 bytes
.../skin/media => web}/images/portal/z3950.png | Bin 5050 -> 5050 bytes
.../server/skin/media => web}/images/stop_sign.png | Bin 1729 -> 1729 bytes
21 files changed, 10 insertions(+), 11 deletions(-)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/LICENSE (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/back.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/background.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/batchimport.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/book.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/bucket.png (100%)
copy Open-ILS/web/images/{ => portal}/eg_tiny_logo.jpg (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/forward.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/helpdesk.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/holds.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/logo.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/map.PNG (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/newtab2.PNG (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/receipt_editor.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/registerpatron.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/reports.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/retreivepatron.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/portal/z3950.png (100%)
copy Open-ILS/{xul/staff_client/server/skin/media => web}/images/stop_sign.png (100%)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list