Skip to content

Commit 9ac48b5

Browse files
committed
Refactor mass import page to use base list view instead of base edit view
1 parent 570c4e0 commit 9ac48b5

6 files changed

Lines changed: 238 additions & 227 deletions

File tree

Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,7 @@ body .content-header > .ui-panel-content {
788788

789789
.content-header .ui-panel-content > form,
790790
.content-header .ui-panel-content > button,
791+
#massImportButtonForm > button,
791792
.ui-menubutton,
792793
.ui-selectbooleanbutton {
793794
white-space: nowrap;
@@ -1931,124 +1932,124 @@ body .functional-metadata-wrapper .help-button .ui-button-text {
19311932
Mass import
19321933
----------------------------------------------------------------------*/
19331934

1934-
#editForm\:fileUploadButtonWrapper {
1935+
#fileUploadForm\:fileUploadButtonWrapper {
19351936
padding: 0;
19361937
}
19371938

1938-
#editForm\:recordsTable th span.metadata-record-id::after,
1939-
#editForm\:recordsTable th span.metadata-doctype::after {
1939+
#recordsForm\:recordsTable th span.metadata-record-id::after,
1940+
#recordsForm\:recordsTable th span.metadata-doctype::after {
19401941
color: var(--medium-gray);
19411942
font-family: FontAwesome;
19421943
margin-left: var(--default-half-size);
19431944
}
19441945

1945-
#editForm\:recordsTable th span.metadata-record-id::after {
1946+
#recordsForm\:recordsTable th span.metadata-record-id::after {
19461947
content: "\f2c2";
19471948
}
19481949

1949-
#editForm\:recordsTable th span.metadata-doctype::after {
1950+
#recordsForm\:recordsTable th span.metadata-doctype::after {
19501951
content: "\f02d";
19511952
}
19521953

1953-
#editForm\:recordsTable .ui-datatable-scrollable-theadclone {
1954+
#recordsForm\:recordsTable .ui-datatable-scrollable-theadclone {
19541955
display: none;
19551956
}
19561957

1957-
#editForm\:recordsTable_scrollableThead > tr > th:last-child span {
1958+
#recordsForm\:recordsTable_scrollableThead > tr > th:last-child span {
19581959
float: right;
19591960
}
19601961

1961-
#editForm\:recordsTable th.ui-state-default,
1962-
#editForm\:recordsTable td.ui-editable-column,
1963-
#editForm\:recordsTable td.remove-column,
1964-
#editForm\:recordsTable tr.ui-datatable-empty-message {
1962+
#recordsForm\:recordsTable th.ui-state-default,
1963+
#recordsForm\:recordsTable td.ui-editable-column,
1964+
#recordsForm\:recordsTable td.remove-column,
1965+
#recordsForm\:recordsTable tr.ui-datatable-empty-message {
19651966
border: 1px solid var(--carbon-blue);
19661967
}
19671968

1968-
#editForm\:addCsvRecord,
1969-
#editForm\:catalogSelectionWrapper {
1969+
#recordsForm\:addCsvRecord,
1970+
#fileUploadForm\:catalogSelectionWrapper {
19701971
margin-top: var(--default-half-size);
19711972
}
19721973

1973-
#editForm\:recordsTable th:has(> span.ui-column-title > span.invalid-configuration) {
1974+
#recordsForm\:recordsTable th:has(> span.ui-column-title > span.invalid-configuration) {
19741975
background-color: var(--orange);
19751976
}
19761977

1977-
#editForm\:recordsTable th:has(> span.ui-column-title > span.unknown-metadata) {
1978+
#recordsForm\:recordsTable th:has(> span.ui-column-title > span.unknown-metadata) {
19781979
background-color: var(--light-orange);
19791980
}
19801981

1981-
#editForm\:recordsTable td.ui-editable-column {
1982+
#recordsForm\:recordsTable td.ui-editable-column {
19821983
overflow-x: hidden;
19831984
text-overflow: ellipsis;
19841985
white-space: nowrap;
19851986
}
19861987

1987-
#editForm .ui-panelgrid-cell {
1988+
#fileUploadForm .ui-panelgrid-cell {
19881989
padding-left: var(--default-full-size);
19891990
}
19901991

1991-
#editForm .ui-fileupload-buttonbar {
1992+
#fileUploadForm .ui-fileupload-buttonbar {
19921993
padding: 0;
19931994
}
19941995

1995-
#editForm .ui-fileupload-buttonbar .ui-button {
1996+
#fileUploadForm .ui-fileupload-buttonbar .ui-button {
19961997
margin-right: var(--default-full-size);
19971998
}
19981999

1999-
#editForm\:fileUploadButtonWrapper .ui-fileupload-files:not(:has(div.ui-fileupload-row)) {
2000+
#fileUploadForm\:fileUploadButtonWrapper .ui-fileupload-files:not(:has(div.ui-fileupload-row)) {
20002001
border: none;
20012002
}
20022003

2003-
#editForm\:recordsTableWrapper {
2004+
#recordsForm\:recordsTableWrapper {
20042005
padding: 0 var(--default-full-size);
20052006
}
20062007

2007-
#editForm\:recordsTable tr {
2008+
#recordsForm\:recordsTable tr {
20082009
height: var(--input-height);
20092010
overflow-y: hidden;
20102011
}
20112012

2012-
#editForm\:recordsTable .remove-column {
2013+
#recordsForm\:recordsTable .remove-column {
20132014
width: 50px;
20142015
}
20152016

2016-
#editForm\:recordsTable .remove-column button.secondary,
2017-
#editForm\:recordsTable .remove-metadata-column {
2017+
#recordsForm\:recordsTable .remove-column button.secondary,
2018+
#recordsForm\:recordsTable .remove-metadata-column {
20182019
border: none;
20192020
}
20202021

2021-
#editForm\:addCsvRecord,
2022-
#editForm\:recordsTable .remove-column button.secondary {
2022+
#recordsForm\:addCsvRecord,
2023+
#recordsForm\:recordsTable .remove-column button.secondary {
20232024
float: right;
20242025
}
20252026

2026-
#editForm\:recordsTable input.ui-inputtext {
2027+
#recordsForm\:recordsTable input.ui-inputtext {
20272028
width: 100%;
20282029
}
20292030

2030-
#editForm\:csvSeparator {
2031+
#fileUploadForm\:csvSeparator {
20312032
display: block;
20322033
width: 60px;
20332034
}
20342035

2035-
#editForm\:separatorCharacterWrapper .separator-selection {
2036+
#fileUploadForm\:separatorCharacterWrapper .separator-selection {
20362037
display: inline-block;
20372038
margin-right: var(--default-double-size);
20382039
width: 45%;
20392040
}
20402041

2041-
#editForm\:skipEmptyColumnsWrapper {
2042+
#fileUploadForm\:skipEmptyColumnsWrapper {
20422043
display: inline-block;
20432044
vertical-align: top;
20442045
}
20452046

2046-
#editForm\:csvFileUpload {
2047+
#fileUploadForm\:csvFileUpload {
20472048
overflow-x: hidden;
20482049
white-space: nowrap;
20492050
}
20502051

2051-
#editForm\:csvFileUpload .ui-fileupload-buttonbar {
2052+
#fileUploadForm\:csvFileUpload .ui-fileupload-buttonbar {
20522053
background: transparent;
20532054
border: none;
20542055
}
@@ -2062,26 +2063,26 @@ Mass import
20622063
padding: 0;
20632064
}
20642065

2065-
#editForm\:recordsTable\:addMetadataColumn,
2066-
#editForm\:recordsTable button.remove-metadata-column {
2066+
#recordsForm\:recordsTable\:addMetadataColumn,
2067+
#recordsForm\:recordsTable button.remove-metadata-column {
20672068
background: transparent;
20682069
overflow: hidden;
20692070
height: inherit;
20702071
}
20712072

2072-
#editForm\:recordsTable span.ui-column-title {
2073+
#recordsForm\:recordsTable span.ui-column-title {
20732074
white-space: nowrap;
20742075
}
20752076

2076-
#editForm\:recordsTable span.ui-column-title span {
2077+
#recordsForm\:recordsTable span.ui-column-title span {
20772078
display: inline-block;
20782079
overflow: hidden;
20792080
text-overflow: ellipsis;
20802081
vertical-align: middle;
20812082
width: calc(100% - 20px);
20822083
}
20832084

2084-
#editForm\:recordsTable_data tr td {
2085+
#recordsForm\:recordsTable_data tr td {
20852086
box-sizing: content-box;
20862087
}
20872088

Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/dialogs/addMetadata.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
styleClass="dialogButtonWrapper">
125125
<p:commandButton id="apply"
126126
action="#{MassImportForm.addMetadataDialog.addMetadata()}"
127-
update="editForm:recordsTableWrapper"
127+
update="recordsForm:recordsTableWrapper"
128128
oncomplete="PF('addMetadataDialog').hide();"
129129
value="#{msgs.apply}"
130130
styleClass="primary right"/>

0 commit comments

Comments
 (0)