@@ -, +, @@ - Add a toolbar with an "Upload" button so that it can be accessed from the upload results or search results views - On views other than the "main" view, add search forms to the sidebar - The search form markup has been modified somewhat in order to make it work well in both the sidebar and the main body of the page. - Show the upload category description instead of the code - Link the upload category in search results to a search for that category - Go to Tools -> Upload. - Upload a file, adding a category as you do so. - On the upload results page, test that the "Upload file" button returns you to the main upload page. - On the upload results or search results view, confirm that the "Search uploads by category" and "Search uploads by name" forms work correctly. - When viewing upload or search results, confirm that the category discription is shown instead of the code. Confirm that the category is a link to a search for other files in that category. --- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 36 ++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE Koha %] [% USE TablesSettings %] +[% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% IF plugin %] @@ -111,11 +112,11 @@ [% BLOCK form_browse %] [% IF uploadcategories %] -
+ [% PROCESS plugin_pars %] -
- Search uploads by category +
+

Search uploads by category

  1. @@ -135,11 +136,11 @@ [% END %] [% BLOCK form_search %] - + [% PROCESS plugin_pars %] -
    - Search uploads by name or hashvalue +
    +

    Search uploads by name or hashvalue

    1. @@ -208,7 +209,9 @@ [% record.filename | html %] [% record.filesize | html %] [% record.hashvalue | html %] - [% record.uploadcategorycode | html %] + + [% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %] + [% IF !plugin %] [% IF record.public %]Yes[% ELSE %]No[% END %] [% IF record.permanent %]No[% ELSE %]Yes[% END %] @@ -261,10 +264,19 @@ [% PROCESS submitter %] [% IF mode == 'new' || mode == 'deleted' %] [% PROCESS form_new %] - [% PROCESS form_browse %] - [% PROCESS form_search %] +
      +
      + [% PROCESS form_browse %] +
      +
      + [% PROCESS form_search %] +
      +
      [% PROCESS closer %] [% ELSIF mode == 'report' %] + [% IF uploads %]

      Your request gave the following results:

      [% PROCESS table_results %] @@ -282,6 +294,12 @@
      --