romanov73
/
ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

fix layout

Browse Source
merge-requests/119/head
Anton Romanov 4 years ago
parent 1460e26127
commit 440def2b71
3 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File

4
src/main/resources/META-INF/resources/basicTemplate.xhtml
Unescape Escape View File

@ -20,8 +20,8 @@
</style> </style>
<h:form id="mainForm"> <h:form id="mainForm">
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-2"></div> <div class="ui-g-12 ui-md-2"></div>
<div class="ui-g-8"> <div class="ui-g-12 ui-md-8">
<p:menubar> <p:menubar>
<p:menuitem> <p:menuitem>
<h:link outcome="#{page.INDEX}"> <h:link outcome="#{page.INDEX}">

4
src/main/resources/META-INF/resources/login.xhtml
Unescape Escape View File

@ -11,8 +11,8 @@
</h:head> </h:head>
<h:body class="black"> <h:body class="black">
<div class="ui-g"> <div class="ui-g">
<div class="ui-g-5"></div> <div class="ui-md-5 ui-g-12"></div>
<div class="ui-g-2"> <div class="ui-md-2 ui-g-12">
<form method="post" action="/login.xhtml"> <form method="post" action="/login.xhtml">
<p:panel header="Вход в систему" style="margin-bottom:20px"> <p:panel header="Вход в систему" style="margin-bottom:20px">
<table cellpadding="10" style="width: 100%"> <table cellpadding="10" style="width: 100%">

96
src/main/resources/META-INF/resources/paper/papers.xhtml
Unescape Escape View File

@ -10,51 +10,61 @@
text-align: right !important; text-align: right !important;
} }
</style> </style>
<p:dataTable value="#{papersView.papers}" var="paper" paginator="true" rows="10" id="papersTable" <div class="ui-fluid">
widgetVar="papersTable" emptyMessage="Не найдено подходящих статей" <div class="ui-g">
selection="#{papersView.selectedPapers}" rowKey="#{paper.id}"> <div class="ui-md-3 ui-g-12">
<f:facet name="header"> <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
<p:outputPanel> disabled="#{papersView.selectedPapers.isEmpty()}"
<h:outputText value="Поиск:"/> action="#{papersView.deleteSelected}" ajax="true" process="@form"
<p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px" update="messages @form"/>
placeholder="Строка поиска..."/> </div>
</p:outputPanel>
</f:facet> <div class="ui-md-5 ui-g-12">
<p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="@form"/> <p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
<p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="@form"/> </div>
<p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" process="@form"/> <div class="ui-md-2 ui-g-12">
<p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="@form"/> <p:commandButton action="#{papersView.create}" value="Создать" ajax="true" process="@form"
<p:column selectionMode="multiple" style="width:16px;text-align:center"/> update="messages @form mainForm:papersTable"/>
<p:column headerText="Название" filterBy="#{paper.title}" filterMatchMode="contains"> </div>
<h:outputLink value="/paper/paper.xhtml"> </div>
#{paper.title}
<f:param name="id" value="#{paper.id}"/> <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" rows="10" id="papersTable"
</h:outputLink> widgetVar="papersTable" emptyMessage="Не найдено подходящих статей"
</p:column> selection="#{papersView.selectedPapers}" rowKey="#{paper.id}">
<p:column headerText="Статус" filterBy="#{paper.status} #{paper.status.statusName}" <f:facet name="header">
filterMatchMode="contains"> <p:outputPanel>
<f:facet name="filter"> <h:outputText value="Поиск:"/>
<p:selectOneMenu onchange="PF('papersTable').filter()" styleClass="custom-filter" <p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px"
converter="paperStatusConverter"> placeholder="Строка поиска..."/>
<f:selectItem itemLabel="Статус" itemValue="#{null}" noSelectionOption="true"/> </p:outputPanel>
<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="@form"/>
<ui:param name="paper" value="#{paper}"/> <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
</ui:include> <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
</p:column> <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="@form"/>
</p:dataTable> <p:column selectionMode="multiple" style="width:16px;text-align:center"/>
<div class="ui-g-3"> <p:column headerText="Название" filterBy="#{paper.title}" filterMatchMode="contains">
<p:commandButton value="Удалить выделенные" id="papersRemoveButton" <h:outputLink value="/paper/paper.xhtml">
disabled="#{papersView.selectedPapers.isEmpty()}" #{paper.title}
action="#{papersView.deleteSelected}" ajax="true" process="@form" <f:param name="id" value="#{paper.id}"/>
update="messages @form"/> </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> </div>
<p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
<p:commandButton action="#{papersView.create}" value="Сохранить" ajax="true" process="@form"
update="messages @form mainForm:papersTable" style="visibility: hidden"/>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</html> </html>

Write Preview
Loading…
Cancel
Save