Merge branch 'main' into pr-8923-b

dspace/config/dspace.cfg

@@ -1460,23 +1460,15 @@ log.report.dir = ${dspace.dir}/log
 # fields at least the date and title fields as specified by the
 # webui.browse.index.* configuration options below.
 #
-# If you have enabled thumbnails (webui.browse.thumbnail.show), you must also
-# include a 'thumbnail' entry in your columns - this is where the thumbnail will be displayed
-#
 # If you want to mark each item include a 'mark_[value]' (without the brackets - replace the word 'value' with anything that
 # has a meaning for your mark) entry in your columns - this is where the icon will be displayed.
 # Do not forget to add a Spring bean with id = "org.dspace.app.itemmarking.ItemMarkingExtractor.[value]"
 # in file 'config/spring/api/item-marking.xml'. This bean is responsible for drawing the appropriate mark for each item.
 # You can add more than one 'mark_[value]' options (with different value) in case you need to mark items more than one time for
 # different purposes. Remember to add the respective beans in file 'config/spring/api/item-marking.xml'.
 #
-# webui.itemlist.columns = thumbnail, dc.date.issued(date), dc.title, dc.contributor.*
+# webui.itemlist.columns = dc.date.issued(date), dc.title, dc.contributor.*
 #
-# You can customise the width of each column with the following line - you can have numbers (pixels)
-# or percentages. For the 'thumbnail' column, a setting of '*' will use the max width specified
-# for browse thumbnails (webui.browse.thumbnail.maxwidth, thumbnail.maxwidth)
-# webui.itemlist.widths = *, 130, 60%, 40%
-
 # Additionally, you can override the DC fields used on the listing page for
 # a given browse index and/or sort option. As a sort option or index may be defined
 # on a field that isn't normally included in the list, this allows you to display
@@ -1486,30 +1478,8 @@ log.report.dir = ${dspace.dir}/log
 # they are listed below is the priority in which they will be used (so a combination
 # of an index name and sort name will take precedence over just the browse name).
 #
-# webui.itemlist.browse.<index name>.sort.<sort name>.columns
 # webui.itemlist.sort.<sort name>.columns
-# webui.itemlist.browse.<browse name>.columns
 # webui.itemlist.<sort or index name>.columns
-#
-# In the last case, a sort option name will always take precedence over a browse
-# index name. Note also, that for any additional columns you list, you will need to
-# ensure there is an itemlist.<field name> entry in the messages file.
-#
-# The following example would display the date of accession in place of the issue date
-# whenever the dateaccessioned browse index or sort option is selected.
-#
-# Just like webui.itemlist.columns, you will need to include a 'thumbnail' entry to display
-# and thumbnails in the item list
-#
-# webui.itemlist.dateaccessioned.columns = thumbnail, dc.date.accessioned(date), dc.title, dc.contributor.*
-#
-# As above, you can customise the width of the columns for each configured column list, substituting '.widths' for
-# '.columns' in the property name. See the setting for webui.itemlist.widths for more details
-# webui.itemlist.dateaccessioned.widths = *, 130, 60%, 40%
-
-# You can also set the overall size of the item list table with the following setting. It can lead to faster
-# table rendering when used with the column widths above, but not generally recommended.
-# webui.itemlist.tablewidth = 100%
 
 ##### SFX Server (OpenURL) #####
 

dspace/config/item-submission.xml

@@ -55,18 +55,14 @@
  - - - - - -
  PLEASE NOTICE THAT YOU WILL HAVE TO RESTART DSPACE
  - - - - - -
- Uncomment if you intend to use them
- --> 
- <!-- 
+ -->
  <name-map collection-entity-type="Publication" submission-name="Publication"/>
  <name-map collection-entity-type="Person" submission-name="Person"/>
  <name-map collection-entity-type="Project" submission-name="Project"/>
  <name-map collection-entity-type="OrgUnit" submission-name="OrgUnit"/>
  <name-map collection-entity-type="Journal" submission-name="Journal"/>
  <name-map collection-entity-type="JournalVolume" submission-name="JournalVolume"/>
  <name-map collection-entity-type="JournalIssue" submission-name="JournalIssue"/>
- -->
-
  </submission-map>