[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. b8b8a730955f4765dab757dec2faeb5edadaf005
Evergreen Git
git at git.evergreen-ils.org
Fri Oct 4 10:17:10 EDT 2019
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, rel_3_4 has been updated
via b8b8a730955f4765dab757dec2faeb5edadaf005 (commit)
via 7d71e8f88896216770427c9e2d62d3ad9147d35f (commit)
from 372965906c0a7000c4646c678467d2e1dfceb56b (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 b8b8a730955f4765dab757dec2faeb5edadaf005
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Fri Oct 4 10:12:49 2019 -0400
LP#1803790: apply alphabetization fix to Angular admin splash pages
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
index 02565dfafa..e051d37c42 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
@@ -23,18 +23,6 @@
url="/eg/staff/admin/local/config/circ_matrix_matchpoint"></eg-link-table-link>
<eg-link-table-link i18n-label label="Closed Dates Editor"
url="/eg/staff/admin/local/actor/closed_dates"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Item Alert Types"
- url="/eg/staff/admin/local/config/copy_alert_types"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Item Alert Suppression"
- routerLink="/staff/admin/local/actor/copy_alert_suppress"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Shelving Location Groups"
- url="/eg/staff/admin/local/asset/copy_location_group"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Shelving Location Order"
- url="/eg/staff/admin/local/asset/copy_location_order"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Shelving Locations Editor"
- routerLink="/staff/admin/local/asset/copy_location"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Item Tags"
- routerLink="/staff/admin/local/asset/copy_tag"></eg-link-table-link>
<!-- do-able with a list of IDL classes to add to the edit dialog -->
<eg-link-table-link i18n-label label="Field Documentation"
url="/eg/staff/admin/local/config/idl_field_doc"></eg-link-table-link>
@@ -42,6 +30,14 @@
routerLink="/staff/admin/local/permission/grp_penalty_threshold"></eg-link-table-link>
<eg-link-table-link i18n-label label="Hold Policies"
routerLink="/staff/admin/local/config/hold_matrix_matchpoint"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Holdings Template Editor"
+ url="/eg/staff/cat/volcopy/edit_templates"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Alert Suppression"
+ routerLink="/staff/admin/local/actor/copy_alert_suppress"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Alert Types"
+ url="/eg/staff/admin/local/config/copy_alert_types"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Tags"
+ routerLink="/staff/admin/local/asset/copy_tag"></eg-link-table-link>
<eg-link-table-link i18n-label label="Library Settings Editor"
url="/eg/staff/admin/local/asset/org_unit_settings"></eg-link-table-link>
<eg-link-table-link i18n-label label="Non-Cataloged Types Editor"
@@ -54,6 +50,12 @@
url="/eg/staff/admin/local/permission/grp_tree_display_entry"></eg-link-table-link>
<eg-link-table-link i18n-label label="Search Filter Groups"
url="/eg/staff/admin/local/actor/search_filter_group"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Location Groups"
+ url="/eg/staff/admin/local/asset/copy_location_group"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Location Order"
+ url="/eg/staff/admin/local/asset/copy_location_order"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Locations Editor"
+ routerLink="/staff/admin/local/asset/copy_location"></eg-link-table-link>
<eg-link-table-link i18n-label label="Standing Penalties"
routerLink="/staff/admin/local/config/standing_penalty"></eg-link-table-link>
<eg-link-table-link i18n-label label="Statistical Categories Editor"
@@ -64,8 +66,6 @@
url="/eg/staff/admin/local/action/survey"></eg-link-table-link>
<eg-link-table-link i18n-label label="Transit List"
url="/eg/staff/circ/transits/list"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Holdings Template Editor"
- url="/eg/staff/cat/volcopy/edit_templates"></eg-link-table-link>
<eg-link-table-link i18n-label label="Work Log"
url="/eg/staff/admin/workstation/log"></eg-link-table-link>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
index a1b6db1c44..b9737ed00a 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
@@ -39,10 +39,6 @@
routerLink="/staff/admin/server/config/circ_modifier"></eg-link-table-link>
<eg-link-table-link i18n-label label="Circulation Recurring Fine Rules"
routerLink="/staff/admin/server/config/rule_recurring_fine"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Item Statuses"
- routerLink="/staff/admin/server/config/copy_status"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Item Tag Types"
- routerLink="/staff/admin/server/config/copy_tag_type"></eg-link-table-link>
<eg-link-table-link i18n-label label="Custom Org Unit Trees"
url="/eg/staff/admin/server/actor/org_unit_custom_tree"></eg-link-table-link>
<eg-link-table-link i18n-label label="Floating Groups"
@@ -55,6 +51,10 @@
routerLink="/staff/admin/server/config/hold_matrix_weights"></eg-link-table-link>
<eg-link-table-link i18n-label label="Import Match Sets"
routerLink="/staff/admin/server/vandelay/match_set"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Statuses"
+ routerLink="/staff/admin/server/config/copy_status"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Tag Types"
+ routerLink="/staff/admin/server/config/copy_tag_type"></eg-link-table-link>
<eg-link-table-link i18n-label label="MARC Coded Value Maps"
routerLink="/staff/admin/server/config/coded_value_map"></eg-link-table-link>
<eg-link-table-link i18n-label label="MARC Import Remove Fields"
@@ -73,10 +73,10 @@
routerLink="/staff/admin/server/config/marc_field"></eg-link-table-link>
<eg-link-table-link i18n-label label="Org Unit Proximity Adjustments"
routerLink="/staff/admin/server/actor/org_unit_proximity_adjustment"></eg-link-table-link>
- <eg-link-table-link i18n-label label="Organization Types"
- routerLink="/staff/admin/server/actor/org_unit_type"></eg-link-table-link>
<eg-link-table-link i18n-label label="Org Unit Setting Types"
routerLink="/staff/admin/server/config/org_unit_setting_type"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Organization Types"
+ routerLink="/staff/admin/server/actor/org_unit_type"></eg-link-table-link>
<eg-link-table-link i18n-label label="Organizational Units"
routerLink="/staff/admin/server/actor/org_unit"></eg-link-table-link>
<eg-link-table-link i18n-label label="Permission Groups"
commit 7d71e8f88896216770427c9e2d62d3ad9147d35f
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date: Wed Mar 6 16:40:53 2019 -0500
LP#1803790 Re-alphabetize Local & Server Administration Links
Small fix that re-orders the links that were out of order due
to link name changes.
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
index 2043230809..ab18436f90 100644
--- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
@@ -17,27 +17,27 @@
,[ l('Circulation Limit Sets'), "./admin/local/config/circ_limit_set" ]
,[ l('Circulation Policies'), "./admin/local/config/circ_matrix_matchpoint" ]
,[ l('Closed Dates Editor'), "./admin/local/actor/closed_dates" ]
- ,[ l('Item Alert Types'), "./admin/local/config/copy_alert_types" ]
- ,[ l('Item Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ]
- ,[ l('Shelving Location Groups'), "./admin/local/asset/copy_location_group" ]
- ,[ l('Shelving Location Order'), "./admin/local/asset/copy_location_order" ]
- ,[ l('Shelving Locations Editor'), "./admin/local/asset/copy_locations" ]
- ,[ l('Item Tags'), "./admin/local/asset/copy_tag" ]
,[ l('Field Documentation'), "./admin/local/config/idl_field_doc" ]
,[ l('Group Penalty Thresholds'), "./admin/local/permission/grp_penalty_threshold" ]
,[ l('Hold Policies'), "./admin/local/config/hold_matrix_matchpoint" ]
+ ,[ l('Holdings Template Editor'), "./cat/volcopy/edit_templates" ]
+ ,[ l('Item Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ]
+ ,[ l('Item Alert Types'), "./admin/local/config/copy_alert_types" ]
+ ,[ l('Item Tags'), "./admin/local/asset/copy_tag" ]
,[ l('Library Settings Editor'), "./admin/local/asset/org_unit_settings" ]
,[ l('Non-Cataloged Types Editor'), "./admin/local/config/non_cat_types" ]
,[ l('Notifications / Action Triggers'), "./admin/local/action_trigger/event_definition" ]
,[ l('Patrons with Negative Balances'), "./admin/local/circ/neg_balance_users" ]
,[ l('Permission Tree Display Entries'), "./admin/local/permission/grp_tree_display_entry" ]
,[ l('Search Filter Groups'), "./admin/local/actor/search_filter_group" ]
+ ,[ l('Shelving Location Groups'), "./admin/local/asset/copy_location_group" ]
+ ,[ l('Shelving Location Order'), "./admin/local/asset/copy_location_order" ]
+ ,[ l('Shelving Locations Editor'), "./admin/local/asset/copy_locations" ]
,[ l('Standing Penalties'), "./admin/local/config/standing_penalty" ]
,[ l('Statistical Categories Editor'), "./admin/local/asset/stat_cat_editor" ]
,[ l('Statistical Popularity Badges'), "./admin/local/rating/badge" ]
,[ l('Surveys'), "./admin/local/action/survey" ]
,[ l('Transit List'), "./circ/transits/list" ]
- ,[ l('Holdings Template Editor'), "./cat/volcopy/edit_templates" ]
,[ l('Work Log'), "./admin/workstation/log" ]
];
diff --git a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
index c03666f6b5..1377308693 100644
--- a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
@@ -26,14 +26,14 @@
,[ l('Circulation Max Fine Rules'), "./admin/server/config/rule_max_fine" ]
,[ l('Circulation Modifiers'), "./admin/server/config/circ_modifier" ]
,[ l('Circulation Recurring Fine Rules'), "./admin/server/config/rule_recurring_fine" ]
- ,[ l('Item Statuses'), "./admin/server/legacy/config/copy_status" ]
- ,[ l('Item Tag Types'), "./admin/server/config/copy_tag_type" ]
,[ l('Custom Org Unit Trees'), "./admin/server/actor/org_unit_custom_tree" ]
,[ l('Floating Groups'), "./admin/server/config/floating_groups" ]
,[ l('Global Flags'), "./admin/server/config/global_flag" ]
,[ l('Hard Due Date Changes'), "./admin/server/config/hard_due_date" ]
,[ l('Hold Matchpoint Weights'), "./admin/server/config/hold_matrix_weights" ]
,[ l('Import Match Sets'), "./admin/server/vandelay/match_set" ]
+ ,[ l('Item Statuses'), "./admin/server/legacy/config/copy_status" ]
+ ,[ l('Item Tag Types'), "./admin/server/config/copy_tag_type" ]
,[ l('MARC Coded Value Maps'), "./admin/server/config/coded_value_map" ]
,[ l('MARC Import Remove Fields'), "./admin/server/vandelay/import_bib_trash_group" ]
,[ l('MARC Record Attributes'), "./admin/server/config/record_attr_definition" ]
@@ -43,8 +43,8 @@
,[ l('MARC Search/Facet Fields'), "./admin/server/config/metabib_field" ]
,[ l('MARC Tag Tables'), "./admin/server/config/marc_field" ]
,[ l('Org Unit Proximity Adjustments'), "./admin/server/config/org_unit_proximity_adjustment" ]
- ,[ l('Organization Types'), "./admin/server/legacy/actor/org_unit_type" ]
,[ l('Org Unit Setting Types'), "./admin/server/config/org_unit_setting_type" ]
+ ,[ l('Organization Types'), "./admin/server/legacy/actor/org_unit_type" ]
,[ l('Organizational Units'), "./admin/server/legacy/actor/org_unit" ]
,[ l('Permission Groups'), "./admin/server/legacy/permission/grp_tree" ]
,[ l('Permissions'), "./admin/server/legacy/permission/perm_list" ]
-----------------------------------------------------------------------
Summary of changes:
.../admin/local/admin-local-splash.component.html | 28 +++++++++++-----------
.../server/admin-server-splash.component.html | 12 +++++-----
.../src/templates/staff/admin/local/t_splash.tt2 | 14 +++++------
.../src/templates/staff/admin/server/t_splash.tt2 | 6 ++---
4 files changed, 30 insertions(+), 30 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list