some layout fixes

This commit is contained in:
Anton Romanov 2020-04-25 00:48:21 +04:00
parent 6adb3fec71
commit 751195bf96
2 changed files with 71 additions and 70 deletions

View File

@ -31,11 +31,7 @@
background: white !important; background: white !important;
} }
</style> </style>
<p:panel id="panel" header="Статья" style="margin-bottom:10px;"> <p:panel id="panel" header="Редактирование статьи: #{paperView.paper.title}" style="margin-bottom:10px;">
<p:panelGrid cellpadding="5" id="paperPanel">
</p:panelGrid>
<div class="ui-fluid"> <div class="ui-fluid">
<div class="ui-g"> <div class="ui-g">
<div class="ui-md-3 ui-g-12"> <div class="ui-md-3 ui-g-12">

View File

@ -10,74 +10,79 @@
text-align: right !important; text-align: right !important;
} }
</style> </style>
<div class="ui-fluid"> <p:panel id="panel" header="Все статьи" style="margin-bottom:10px;">
<div class="ui-g">
<div class="ui-md-5 ui-g-12">
<p:inputText placeholder="Создать новую статью" id="newPaperName"
value="#{papersView.newPaperTitle}" required="true"
requiredMessage="Введите название новой статьи"/>
<p:message for="newPaperName"/>
</div>
<div class="ui-md-2 ui-g-12">
<p:commandButton action="#{papersView.create}" value="Создать" ajax="true" process="@form"
update="messages @form mainForm:papersTable"/>
</div> <div class="ui-fluid">
<div class="ui-md-3 ui-g-12"> <div class="ui-g">
<p:commandButton value="Удалить выделенные" id="papersRemoveButton" <div class="ui-md-5 ui-g-12">
disabled="#{papersView.selectedPapers.isEmpty()}" <p:inputText placeholder="Создать новую статью" id="newPaperName"
action="#{papersView.deleteSelected}" ajax="true" value="#{papersView.newPaperTitle}" required="true"
process="mainForm:papersRemoveButton" requiredMessage="Введите название новой статьи"/>
update="messages mainForm:papersTable"> <p:message for="newPaperName"/>
<p:confirm header="Подтверждение" message="Удалить выделенные статьи?" </div>
icon="pi pi-exclamation-triangle"/> <div class="ui-md-2 ui-g-12">
</p:commandButton> <p:commandButton action="#{papersView.create}" value="Создать" ajax="true" process="@form"
</div> update="messages @form mainForm:papersTable"/>
<p:confirmDialog global="true" showEffect="fade" hideEffect="fade">
<p:commandButton value="Да" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check"/>
<p:commandButton value="Нет" type="button" styleClass="ui-confirmdialog-no" icon="pi pi-times"/>
</p:confirmDialog>
</div>
<p:dataTable value="#{papersView.papers}" var="paper" paginator="true" paginatorPosition="bottom" </div>
rows="10" id="papersTable" <div class="ui-md-3 ui-g-12">
widgetVar="papersTable" emptyMessage="Не найдено подходящих статей" <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
selection="#{papersView.selectedPapers}" rowKey="#{paper.id}"> disabled="#{papersView.selectedPapers.isEmpty()}"
<f:facet name="header"> action="#{papersView.deleteSelected}" ajax="true"
<p:outputPanel> process="mainForm:papersRemoveButton"
<h:outputText value="Поиск:"/> update="messages mainForm:papersTable">
<p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px" <p:confirm header="Подтверждение" message="Удалить выделенные статьи?"
placeholder="Строка поиска..."/> icon="pi pi-exclamation-triangle"/>
</p:outputPanel> </p:commandButton>
</f:facet> </div>
<p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/> <p:confirmDialog global="true" showEffect="fade" hideEffect="fade">
<p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/> <p:commandButton value="Да" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check"/>
<p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" <p:commandButton value="Нет" type="button" styleClass="ui-confirmdialog-no" icon="pi pi-times"/>
process="mainForm:papersTable"/> </p:confirmDialog>
<p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/> </div>
<p:column selectionMode="multiple" style="width:16px;text-align:center"/>
<p:column headerText="Название" filterBy="#{paper.title}" filterMatchMode="contains"> <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" paginatorPosition="bottom"
<h:outputLink value="/paper/paper.xhtml"> rows="10" id="papersTable"
#{paper.title} widgetVar="papersTable" emptyMessage="Не найдено подходящих статей"
<f:param name="id" value="#{paper.id}"/> selection="#{papersView.selectedPapers}" rowKey="#{paper.id}">
</h:outputLink> <f:facet name="header">
</p:column> <p:outputPanel>
<p:column headerText="Статус" filterBy="#{paper.status} #{paper.status.statusName}" <h:outputText value="Поиск:"/>
filterMatchMode="contains"> <p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px"
<f:facet name="filter"> placeholder="Строка поиска..."/>
<p:selectOneMenu onchange="PF('papersTable').filter()" styleClass="custom-filter" </p:outputPanel>
converter="paperStatusConverter">
<f:selectItem itemLabel="Статус" itemValue="#{null}" noSelectionOption="true"/>
<f:selectItems value="#{papersView.paperStatuses}" var="status" itemLabel="#{status.statusName}"
itemValue="#{status}"/>
</p:selectOneMenu>
</f:facet> </f:facet>
<ui:include src="paperStatusFragment.xhtml"> <p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/>
<ui:param name="paper" value="#{paper}"/> <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton"
</ui:include> process="mainForm:papersTable"/>
</p:column> <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton"
</p:dataTable> process="mainForm:papersTable"/>
</div> <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/>
<p:column selectionMode="multiple" style="width:16px;text-align:center"/>
<p:column headerText="Название" filterBy="#{paper.title}" filterMatchMode="contains">
<h:outputLink value="/paper/paper.xhtml">
#{paper.title}
<f:param name="id" value="#{paper.id}"/>
</h:outputLink>
</p:column>
<p:column headerText="Статус" filterBy="#{paper.status} #{paper.status.statusName}"
filterMatchMode="contains">
<f:facet name="filter">
<p:selectOneMenu onchange="PF('papersTable').filter()" styleClass="custom-filter"
converter="paperStatusConverter">
<f:selectItem itemLabel="Статус" itemValue="#{null}" noSelectionOption="true"/>
<f:selectItems value="#{papersView.paperStatuses}" var="status"
itemLabel="#{status.statusName}"
itemValue="#{status}"/>
</p:selectOneMenu>
</f:facet>
<ui:include src="paperStatusFragment.xhtml">
<ui:param name="paper" value="#{paper}"/>
</ui:include>
</p:column>
</p:dataTable>
</div>
</p:panel>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</html> </html>