Skip to content

Commit 16a5d52

Browse files
author
Simon Sendler
committed
fix: fix display of action box in my tasks
1 parent c23698b commit 16a5d52

1 file changed

Lines changed: 54 additions & 56 deletions

File tree

‎src/main/webapp/uii/task_all.xhtml‎

Lines changed: 54 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
1111
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
1212
xmlns:jsf="http://xmlns.jcp.org/jsf"
13-
xmlns:util="http://goobi.io/util">
13+
xmlns:util="http://goobi.io/util"
14+
xmlns:section="http://goobi.io/section">
1415

1516
<ui:param name="myPageTitle" value="#{msgs.aktuelleSchritte}" />
1617

@@ -27,7 +28,7 @@
2728
<ui:define name="content">
2829

2930

30-
<main role="main" id="tasksAll">
31+
<main role="main" id="tasksAll" class="flow">
3132
<c:if test="#{LoginForm.hasRole('Task_List')}">
3233

3334
<div class="row">
@@ -181,7 +182,7 @@
181182
name="sorthelper_last_close_date"
182183
sortField="prioritaet desc, sorthelper_last_close_date"
183184
form="#{AktuelleSchritteForm}"
184-
ajaxRender="processAllBox:myform" />
185+
ajaxRender="processAllBox:myform" />
185186

186187
<!-- Priority -->
187188
<intranda:columnheader id="sortStepPriority" name="priority"
@@ -425,7 +426,7 @@
425426
</td>
426427
<!-- // NUMBER OF IMAGES -->
427428
<td
428-
429+
429430
data-label="#{msgs.lastStatusUpdate}"
430431
jsf:rendered="#{AktuelleSchritteForm.anzeigeAnpassen['lastStatusUpdate']}">
431432
<h:outputText value="#{item.prozess.displayLastStepCloseDate}" />
@@ -689,63 +690,60 @@
689690
</div>
690691

691692
<!-- ACTION BOX -->
692-
<div class="row mt-4" jsf:rendered="#{LoginForm.myBenutzer.mitMassendownload and AktuelleSchritteForm.paginator.totalResults > 0 }">
693+
<div class="row" jsf:rendered="#{LoginForm.myBenutzer.mitMassendownload and AktuelleSchritteForm.paginator.totalResults > 0 }">
693694
<div class="col-12">
694-
<intranda:box id="boxTaskAllActions" boxType="action"
695-
icon="tool" title="#{msgs.moeglicheAktionen}">
695+
<section:section
696+
type="action">
697+
<section:header
698+
icon="tool"
699+
title="#{msgs.moeglicheAktionen}" />
696700
<h:form id="actionForm2" prependId="false">
697701

698-
<!-- NUMBER OF IMAGES -->
699-
<h:panelGroup styleClass="pull-right">
700-
<h:outputText value="#{msgs.anzahlDerImagesAllerTreffer}:" />
701-
<h:outputText id="calcNumber"
702-
styleClass="mx-3"
703-
value="#{AktuelleSchritteForm.allImages}" />
704-
<button jsf:id="calc"
705-
jsf:action="#{AktuelleSchritteForm.calcHomeImages}"
706-
class="btn btn-blank btn-icon">
707-
<util:icon icon="refresh" />
702+
<section:body padding="true">
703+
<!-- NUMBER OF IMAGES -->
704+
<h:panelGroup styleClass="pull-right">
705+
<h:outputText value="#{msgs.anzahlDerImagesAllerTreffer}:" />
706+
<h:outputText id="calcNumber"
707+
styleClass="mx-3"
708+
value="#{AktuelleSchritteForm.allImages}" />
709+
<button jsf:id="calc"
710+
jsf:action="#{AktuelleSchritteForm.calcHomeImages}"
711+
class="btn btn-blank btn-icon">
712+
<util:icon icon="refresh" />
713+
</button>
714+
</h:panelGroup>
715+
</section:body>
716+
<section:footer>
717+
<!-- UPLOAD FROM DONE FOLDER -->
718+
<button jsf:id="uploadAll"
719+
jsf:action="#{AktuelleSchritteForm.uploadFromHomeAlle}"
720+
class="btn btn-neutral-600 me-auto"
721+
title="#{msgs.verzeichnisFertigHochladen}"
722+
onclick="if (!confirm('#{msgs.upload}')) return false">
723+
<util:icon-text icon="cloud-upload" iconClass="me-1" text="#{msgs.verzeichnisFertigHochladen}" />
708724
</button>
709-
</h:panelGroup>
710-
711-
<!-- UPLOAD FROM DONE FOLDER -->
712-
<button jsf:id="uploadAll"
713-
jsf:action="#{AktuelleSchritteForm.uploadFromHomeAlle}"
714-
class="btn btn-hot d-block"
715-
title="#{msgs.verzeichnisFertigHochladen}"
716-
onclick="if (!confirm('#{msgs.upload}')) return false">
717-
<util:icon icon="cloud-upload" styleClass="me-1" />
718-
<span>
719-
<h:outputText value="#{msgs.verzeichnisFertigHochladen}" />
720-
</span>
721-
</button>
722-
723-
<!-- DOWNLOAD PAGE HITS INTO USERS HOME -->
724-
<button jsf:id="downloadPage"
725-
jsf:action="#{AktuelleSchritteForm.downloadToHomePage}"
726-
class="btn btn-success d-block"
727-
title="#{msgs.alleTrefferDieserSeiteInMeinHomeverzeichnis}"
728-
onclick="if (!confirm('#{msgs.upload}')) return false">
729-
<util:icon icon="cloud-download" styleClass="me-1" />
730-
<span>
731-
<h:outputText value="#{msgs.alleTrefferDieserSeiteInMeinHomeverzeichnis}" />
732-
</span>
733-
</button>
734-
735-
<!-- DOWNLOAD ALL HITS INTO USERS HOME -->
736-
<button jsf:id="downloadAll"
737-
jsf:action="#{AktuelleSchritteForm.downloadToHomeHits}"
738-
class="btn btn-success d-block"
739-
title="#{msgs.gesamtesTreffersetInMeinHomeverzeichnis}"
740-
onclick="if (!confirm('#{msgs.upload}')) return false">
741-
<util:icon icon="cloud-download" styleClass="me-1" />
742-
<span>
743-
<h:outputText value="#{msgs.gesamtesTreffersetInMeinHomeverzeichnis}" />
744-
</span>
745-
</button>
746-
</h:form>
747725

748-
</intranda:box>
726+
<!-- DOWNLOAD PAGE HITS INTO USERS HOME -->
727+
<button jsf:id="downloadPage"
728+
jsf:action="#{AktuelleSchritteForm.downloadToHomePage}"
729+
class="btn btn-action"
730+
title="#{msgs.alleTrefferDieserSeiteInMeinHomeverzeichnis}"
731+
onclick="if (!confirm('#{msgs.upload}')) return false">
732+
<util:icon-text icon="cloud-download" iconClass="me-1" text="#{msgs.alleTrefferDieserSeiteInMeinHomeverzeichnis}" />
733+
</button>
734+
735+
<!-- DOWNLOAD ALL HITS INTO USERS HOME -->
736+
<button jsf:id="downloadAll"
737+
jsf:action="#{AktuelleSchritteForm.downloadToHomeHits}"
738+
class="btn btn-action"
739+
title="#{msgs.gesamtesTreffersetInMeinHomeverzeichnis}"
740+
onclick="if (!confirm('#{msgs.upload}')) return false">
741+
<util:icon-text icon="cloud-download" iconClass="me-1" text="#{msgs.gesamtesTreffersetInMeinHomeverzeichnis}" />
742+
</button>
743+
744+
</section:footer>
745+
</h:form>
746+
</section:section>
749747

750748
</div>
751749
</div>

0 commit comments

Comments
 (0)