Bugzilla – Attachment 141889 Details for
Bug 31162
Add a clear cataloguing module home page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31162: (follow-up) Restore toolbar
Bug-31162-follow-up-Restore-toolbar.patch (text/plain), 10.85 KB, created by
Martin Renvoize (ashimema)
on 2022-10-14 14:13:24 UTC
(
hide
)
Description:
Bug 31162: (follow-up) Restore toolbar
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-10-14 14:13:24 UTC
Size:
10.85 KB
patch
obsolete
>From 2cc0c300a47a075c0e0607f56d52e7b139634e34 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 14 Oct 2022 14:22:02 +0100 >Subject: [PATCH] Bug 31162: (follow-up) Restore toolbar > >This patch reverts to having the 'New' options in the top toolbar as >feedback suggested. >--- > .../prog/css/src/staff-global.scss | 36 ----- > .../en/modules/cataloguing/cataloging-home.tt | 133 ++++++++++-------- > 2 files changed, 78 insertions(+), 91 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index c82e2af6bc..82baa544f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -2743,42 +2743,6 @@ td.bundle { > } > } > } >- >- button { >- &.circ-button { >- // Class used for each module link >- background-color: #F4F8F9; >- background-position: 5px 3px; >- background-repeat: no-repeat; >- border: 2px solid #B9D8D9; >- border-radius: 6px; >- box-sizing: content-box; >- color: #000000; >- display: block; >- font-size: 110%; >- font-weight: bold; >- margin: .5em 0; >- max-width: 260px; >- padding: 8px; >- text-decoration: none; >- >- &:hover { >- // Class used for each module link hover state >- border-color: #538200; >- color: #538200; >- } >- } >- } >- >- div { >- &.btn-group { >- button { >- &.btn:first-child { >- width: 238px; >- } >- } >- } >- } > } > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >index 80938efde4..0115278325 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >@@ -25,49 +25,41 @@ > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >+ <div id="toolbar" class="btn-toolbar"> >+ [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >+ <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default"><i class="fa fa-pencil"></i> Advanced editor</a> >+ [% END %] >+ <div class="btn-group"> >+ <button class="btn btn-default" id="newRecord"><i class="fa fa-plus"></i> New record</button> >+ <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> >+ [% FOREACH framework IN frameworks %] >+ <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% IF servers.count > 0 %] >+ <div class="btn-group"> >+ <button class="btn btn-default" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >+ <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ <li id="Default" class="z3950searchFw"><a href="#">Default framework</a></li> >+ [% FOREACH framework IN frameworks %] >+ <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a href="#">[% framework.frameworktext | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% END # /IF servers.count %] >+ </div> <!-- /#toolbar --> >+ [% END # /IF CAN_user_editcatalogue_edit_catalogue %] >+ > <h1>Cataloging</h1> > > <div class="row"> > > <div class="col-sm-4 col-md-4"> >- >- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- <h3>New</h3> >- <ul class="buttons-list"> >- [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default"><i class="fa fa-pencil"></i> Advanced editor</a> >- </li> >- [% END %] >- <li> >- <div class="btn-group"> >- <button class="btn circ-button" id="newRecord"><i class="fa fa-plus"></i> New record</button> >- <button class="btn circ-button dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >- <ul class="dropdown-menu"> >- <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> >- [% FOREACH framework IN frameworks %] >- <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li> >- [% END %] >- </ul> >- </div> >- <li> >- [% IF servers.count > 0 %] >- <li> >- <div class="btn-group"> >- <button class="btn circ-button" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >- <button class="btn circ-button dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >- <ul class="dropdown-menu"> >- <li id="Default" class="z3950searchFw"><a href="#">Default framework</a></li> >- [% FOREACH framework IN frameworks %] >- <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a href="#">[% framework.frameworktext | html %]</a></li> >- [% END %] >- </ul> >- </div> >- </li> >- [% END # /IF servers.count %] >- </ul> >- [% END # /IF CAN_user_editcatalogue_edit_catalogue %] >- > [% IF ( CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc ) %] > <h3>Import</h3> > <ul class="buttons-list"> >@@ -96,6 +88,17 @@ > </ul> > [% END %] > >+ [% IF ( CAN_user_tools_inventory ) %] >+ <h3>Reports</h3> >+ <ul class="buttons-list"> >+ [% IF ( CAN_user_tools_inventory ) %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/tools/inventory.pl"><i class="fa fa-line-chart"></i> Inventory</a> >+ </li> >+ [% END %] >+ </ul> >+ [% END %] >+ > </div> > > <div class="col-sm-4 col-md-4"> >@@ -136,17 +139,6 @@ > > <div class="col-sm-4 col-md-4"> > >- [% IF ( CAN_user_tools_inventory ) %] >- <h3>Reports</h3> >- <ul class="buttons-list"> >- [% IF ( CAN_user_tools_inventory ) %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/tools/inventory.pl"><i class="fa fa-line-chart"></i> Inventory</a> >- </li> >- [% END %] >- </ul> >- [% END %] >- > [% IF ( CAN_user_tools_label_creator || CAN_user_tools_upload_local_cover_images ) %] > <h3>Tools</h3> > <ul class="buttons-list"> >@@ -196,12 +188,43 @@ > > [% MACRO jsinclude BLOCK %] > <script> >- $(document).ready(function() { >- $("#z3950search").click(function(){ >- window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?frameworkcode=Default","z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes'); >- return false; >- }); >- }); >+ $(document).ready(function() { >+ >+ $("#newRecord").click(function(){ >+ var url = $("a#newRecordDefault").prop("href"); >+ window.location.href = url; >+ return false; >+ }); >+ >+ $("#z3950search").click(function(){ >+ PopupZ3950("Default"); >+ return false; >+ }); >+ >+ $(".z3950searchFw").click(function(){ >+ PopupZ3950($(this).prop('id')); >+ return false; >+ }); >+ >+ $("#useadvanced").click(function(){ >+ Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "advanced", { expires: 365, path: '/', sameSite: 'Lax' } ); >+ return true; >+ }); >+ }); >+ >+ /* this function open a popup to search on z3950 server. */ >+ function PopupZ3950(fw) { >+ var strQuery = GetZ3950Terms(fw); >+ if(strQuery){ >+ window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber | html %]"+strQuery,"z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes'); >+ } >+ } >+ >+ /* provide Z3950 search points */ >+ function GetZ3950Terms(fw){ >+ var strQuery="&frameworkcode=" + fw; >+ return strQuery; >+ } > </script> > > [% END %] >-- >2.20.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 31162
:
137747
|
137754
|
137758
|
138141
|
138167
|
138687
|
138694
|
138797
|
138798
|
138799
|
139593
|
139594
|
139595
|
139596
|
139597
|
139598
|
139650
|
139651
|
139652
|
139654
|
139900
|
139901
|
139902
|
139903
|
139904
|
139905
|
139906
|
139907
|
140578
|
140579
|
140580
|
140581
|
140582
|
140583
|
140584
|
140585
|
140586
|
141246
|
141247
|
141248
|
141249
|
141250
|
141251
|
141252
|
141253
|
141254
|
141880
|
141881
|
141882
|
141883
|
141884
|
141885
|
141886
|
141887
|
141888
|
141889
|
141890
|
141891
|
141975
|
141976
|
141977
|
142028
|
142029
|
142663
|
142664