Bugzilla – Attachment 137416 Details for
Bug 30952
New design for staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30952: update aside menu
Bug-30952-update-aside-menu.patch (text/plain), 16.26 KB, created by
Solene D
on 2022-07-08 13:34:47 UTC
(
hide
)
Description:
Bug 30952: update aside menu
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-08 13:34:47 UTC
Size:
16.26 KB
patch
obsolete
>From 18e5b6f3451447384d609291958c91a37f129548 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Fri, 8 Jul 2022 13:48:34 +0200 >Subject: [PATCH] Bug 30952: update aside menu > >--- > .../prog/en/includes/acquisitions-menu.inc | 7 +++--- > .../prog/en/includes/admin-menu.inc | 24 +++++++++---------- > .../prog/en/includes/circ-menu.inc | 2 +- > .../prog/en/includes/circ-nav.inc | 11 +++------ > .../prog/en/includes/pos-menu.inc | 4 ++-- > .../prog/en/includes/reports-menu.inc | 12 +++++----- > .../prog/en/includes/serials-menu.inc | 4 ++-- > .../prog/en/includes/tools-menu.inc | 12 +++++----- > 8 files changed, 35 insertions(+), 41 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >index f806915d0f..51d77de107 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -2,8 +2,8 @@ > <div id="navmenu"> > <div id="navmenulist"> > >+ <h4>Acquisitions</h4> > <ul> >- <h5>Acquisitions</h5> > <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li> > [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %] > [% IF ( suggestion && CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %] >@@ -14,9 +14,8 @@ > </ul> > > [% IF ( CAN_user_reports || CAN_user_circulate_circulate_remaining_permissions ) %] >- >+ <h4>Reports</h4> > <ul> >- <h5>Reports</h5> > [% IF ( CAN_user_reports ) %] > <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics wizard</a></li> > <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> >@@ -27,7 +26,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %] >- <h5>Administration</h5> >+ <h4>Administration</h4> > <ul> > [% IF ( CAN_user_acquisition_period_manage ) %] > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >index 7394a418a2..74efd42cbc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >@@ -4,15 +4,15 @@ > <div id="navmenulist"> > > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >+ <h4>System preferences</h4> > <ul> >- <h5>System preferences</h5> > <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] >+ <h4>Basic parameters</h4> > <ul> >- <h5>Basic parameters</h5> > [% IF ( CAN_user_parameters_manage_libraries ) %] > <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li> > <li><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></li> >@@ -27,8 +27,8 @@ > [% END %] > > [% IF ( CAN_user_parameters_manage_patron_categories || CAN_user_parameters_manage_circ_rules || CAN_user_parameters_manage_patron_attributes || CAN_user_parameters_manage_transfers || CAN_user_parameters_manage_item_circ_alerts || CAN_user_parameters_manage_cities ) %] >- <ul> >- <h5>Patrons and circulation</h5> >+ <h4>Patrons and circulation</h4> >+ <ul> > [% IF ( CAN_user_parameters_manage_patron_categories ) %] > <li><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></li> > [% END %] >@@ -55,8 +55,8 @@ > [% END %] > > [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] >+ <h4>Accounting</h4> > <ul> >- <h5>Accounting</h5> > [% IF ( CAN_user_parameters_manage_accounts ) %] > <li><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></li> > <li><a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a></li> >@@ -68,15 +68,15 @@ > [% END %] > > [% IF CAN_user_parameters_manage_background_jobs %] >+ <h4>Background jobs</h4> > <ul> >- <h5>Background jobs</h5> > <li><a href="/cgi-bin/koha/admin/background_jobs.pl">Background jobs</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules ) %] >- <ul> >- <h5>Catalog</h5> >+ <h4>Catalog</h4> >+ <ul> > [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] > <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li> > <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li> >@@ -107,7 +107,7 @@ > [% END %] > > [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %] >- <h5>Acquisition parameters</h5> >+ <h4>Acquisition parameters</h4> > > <ul> > [% IF ( CAN_user_acquisition_currencies_manage ) %] >@@ -127,15 +127,15 @@ > [% END %] > > [% IF CAN_user_plugins && plugins_enabled %] >+ <h4>Plugins</h4> > <ul> >- <h5>Plugins</h5> > <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %] >- <ul> >- <h5>Additional parameters</h5> >+ <h4>Additional parameters</h4> >+ <ul> > [% IF ( CAN_user_parameters_manage_search_targets ) %] > <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index 989dd1860b..8006f372c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -228,7 +228,7 @@ > <input type="hidden" id="image" name="filetype" value="image" /> > <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" /> > <input type="hidden" id="borrowernumber" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload photo</button> >+ <button type="submit" class="btn btn-default principal btn-xs"><i class="fa fa-upload"></i> Upload photo</button> > <input name="op" type="hidden" value="Upload" /> > [% IF ( patron.image ) %] > <a id="delpicture" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >index acd7e6a597..cc027ef386 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -3,14 +3,10 @@ > <div id="navmenu"> > <div id="navmenulist"> > >- <ul> >- <li> >- <a class="titre" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a> >- </li> >- </ul> >+ <h2><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></h2> > >+ <h4>Circulation</h4> > <ul> >- <h5>Circulation</h5> > <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li> > <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li> > <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li> >@@ -34,9 +30,8 @@ > [% END %] > </ul> > >+ <h4>Circulation reports</h4> > <ul> >- <h5>Circulation reports</h5> >- > <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li> > <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li> > <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >index 5a2a1f3885..55d4249a0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -3,8 +3,8 @@ > <div id="navmenu"> > <div id="navmenulist"> > [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %] >+ <h4>Cash management</h4> > <ul> >- <h5>Cash management</h5> > <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li> > [% IF !(Registers.session_register_name == '') %] > <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li> >@@ -13,8 +13,8 @@ > </ul> > [% END %] > [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %] >+ <h4>Administration</h4> > <ul> >- <h5>Administration</h5> > [% IF ( CAN_user_parameters_manage_cash_registers ) %] > <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >index 2826540104..6ae990f257 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >@@ -2,8 +2,8 @@ > > <div id="navmenu"> > <div id="navmenulist"> >+ <h4>Guided reports</h4> > <ul> >- <h5>Guided reports</h5> > <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li> > [% IF ( CAN_user_reports_create_reports ) %] > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li> >@@ -16,8 +16,8 @@ > [% END %] > </ul> > >+ <h4>Statistics wizards</h4> > <ul> >- <h5>Statistics wizards</h5> > <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li> > <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li> > <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li> >@@ -28,26 +28,26 @@ > </ul> > > [% IF Koha.ArePluginsEnabled() %] >+ <h4>Report plugins</h4> > <ul> >- <h5>Report plugins</h5> > <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li> > </ul> > [% END %] > >+ <h4>Top lists</h4> > <ul> >- <h5>Top lists</h5> > <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li> > <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li> > </ul> > >+ <h4>Inactive</h4> > <ul> >- <h5>Inactive</h5> > <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li> > <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li> > </ul> > >+ <h4>Other</h4> > <ul> >- <h5>Other</h5> > <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li> > <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> > <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by item type</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >index 1a9a25f7eb..699c3975c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >@@ -1,7 +1,7 @@ > <div id="navmenu"> > <div id="navmenulist"> >+ <h4>Serials</h4> > <ul> >- <h5>Serials</h5> > [% IF ( subscriptionid ) %] > <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li> > [% UNLESS closed %] >@@ -42,8 +42,8 @@ > </ul> > > [% IF ( CAN_user_reports ) %] >+ <h4>Reports</h4> > <ul> >- <h5>Reports</h5> > <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials statistics wizard</a></li> > </ul> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >index a1681dcd08..7d793adc37 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -2,11 +2,11 @@ > > <div id="navmenu"> > <div id="navmenulist"> >-<ul> >- <li><a class="titre" href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li> >-</ul> >+ >+ <h2><a class="titre" href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></h2> >+ > [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] >-<h5>Patrons and circulation</h5> >+<h4>Patrons and circulation</h4> > <ul> > [% IF ( CAN_user_tools_manage_patron_lists ) %] > <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li> >@@ -47,7 +47,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] >-<h5>Catalog</h5> >+<h4>Catalog</h4> > <ul> > [% IF ( CAN_user_tools_items_batchdel ) %] > <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li> >@@ -96,7 +96,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] >-<h5>Additional tools</h5> >+<h4>Additional tools</h4> > <ul> > [% IF ( CAN_user_tools_edit_calendar ) %] > <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li> >-- >2.17.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30952
:
136810
|
136812
|
136813
|
136815
|
136816
|
136818
|
136819
|
136820
|
136822
|
136823
|
136825
|
136827
|
136828
|
136830
|
136831
|
136833
|
136834
|
136836
|
136837
|
136839
|
136840
|
136842
|
136844
|
136845
|
136847
|
136848
|
136878
|
136879
|
136880
|
136881
|
136882
|
136883
|
136884
|
136885
|
136886
|
136887
|
136888
|
136889
|
136890
|
136891
|
136892
|
136893
|
136894
|
136895
|
136896
|
136897
|
136898
|
136899
|
136900
|
136901
|
136902
|
136950
|
136951
|
136952
|
136953
|
136954
|
136955
|
136956
|
136957
|
136958
|
136959
|
136960
|
136961
|
136962
|
136963
|
136964
|
136965
|
136966
|
136967
|
136968
|
136969
|
136970
|
136971
|
136972
|
136973
|
136974
|
137408
|
137409
|
137410
|
137411
|
137414
|
137415
|
137416
|
137417
|
137418
|
137419
|
137420
|
137744
|
137767
|
137768
|
137775
|
137776
|
137994
|
138091
|
138092
|
138093
|
138094
|
138095
|
138096
|
138097
|
138098
|
138099
|
138100
|
138101
|
138102
|
138103
|
138245
|
138246
|
138247
|
138293
|
138299
|
138300
|
138302
|
140117
|
140118
|
140119
|
140120
|
140121
|
140122
|
140123
|
140124
|
140125
|
140126
|
140127
|
140128
|
140129
|
140130
|
140131
|
140132
|
140133
|
140134
|
140135
|
140136
|
140137
|
140138
|
140139
|
140140
|
140141
|
140142
|
140143
|
140371
|
140372
|
140373
|
140374
|
140433
|
140435
|
140459
|
140460
|
140512
|
140513
|
140514
|
140515
|
140516
|
140517
|
140519
|
140520
|
140521
|
140522
|
140523
|
140524
|
140525
|
140526
|
140527
|
140528
|
140529
|
140530
|
140531
|
140532
|
140533
|
140534
|
140535
|
140536
|
140537
|
140538
|
140539
|
140540
|
140541
|
140542
|
140543
|
140544
|
140545
|
140546
|
140547
|
140548
|
140549
|
140550
|
140551
|
140552
|
140553
|
140554
|
140555
|
140556
|
140557
|
140558
|
140559
|
140560
|
140566
|
140567
|
140570
|
140571
|
140575
|
140576
|
140577
|
140588
|
140613
|
140617
|
140618
|
140619
|
140620
|
140628
|
140629
|
140635
|
140649
|
140650
|
140651
|
140652
|
140653
|
140654
|
140658
|
140687
|
140976
|
140977
|
141020
|
141024
|
141026
|
141027
|
141041
|
141043
|
141044
|
141047
|
141052
|
141053
|
141054
|
141055
|
141056
|
141057
|
141064
|
141074
|
141075
|
141631
|
141632
|
141633
|
141634
|
141635
|
141636
|
141637
|
141638
|
141639
|
141640
|
141641
|
141642
|
141643
|
141644
|
141645
|
141646
|
141647
|
141648
|
141649
|
141650
|
141651
|
141652
|
141653
|
141654
|
141655
|
141656
|
141657
|
141658
|
141659
|
141660
|
141661
|
141662
|
141663
|
141664
|
141665
|
141666
|
141667
|
141668
|
141669
|
141670
|
141671
|
141672
|
141673
|
141674
|
141675
|
141676
|
141677
|
141678
|
141679
|
141680
|
141681
|
141682
|
141683
|
141684
|
141685
|
141686
|
141687
|
141688
|
141689
|
141690
|
141691
|
141692
|
141693
|
141694
|
141695
|
141696
|
141697
|
141698
|
141699
|
141700
|
141701
|
141702
|
141703
|
141704
|
141705
|
141706
|
141707
|
141708
|
141709
|
141710
|
141711
|
141712
|
141713
|
142604
|
142605