From 440def2b71c4155c6a62e947f44f208702325b23 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 17 Feb 2020 12:56:19 +0400
Subject: [PATCH] fix layout

---
 .../META-INF/resources/basicTemplate.xhtml    |  4 +-
 .../resources/META-INF/resources/login.xhtml  |  4 +-
 .../META-INF/resources/paper/papers.xhtml     | 96 ++++++++++---------
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/src/main/resources/META-INF/resources/basicTemplate.xhtml b/src/main/resources/META-INF/resources/basicTemplate.xhtml
index 3bc3a23..7bcfa8b 100644
--- a/src/main/resources/META-INF/resources/basicTemplate.xhtml
+++ b/src/main/resources/META-INF/resources/basicTemplate.xhtml
@@ -20,8 +20,8 @@
     </style>
     <h:form id="mainForm">
         <div class="ui-g">
-            <div class="ui-g-2"></div>
-            <div class="ui-g-8">
+            <div class="ui-g-12 ui-md-2"></div>
+            <div class="ui-g-12 ui-md-8">
                 <p:menubar>
                     <p:menuitem>
                         <h:link outcome="#{page.INDEX}">
diff --git a/src/main/resources/META-INF/resources/login.xhtml b/src/main/resources/META-INF/resources/login.xhtml
index d0f1026..88f00f6 100644
--- a/src/main/resources/META-INF/resources/login.xhtml
+++ b/src/main/resources/META-INF/resources/login.xhtml
@@ -11,8 +11,8 @@
 </h:head>
 <h:body class="black">
     <div class="ui-g">
-        <div class="ui-g-5"></div>
-        <div class="ui-g-2">
+        <div class="ui-md-5 ui-g-12"></div>
+        <div class="ui-md-2  ui-g-12">
             <form method="post" action="/login.xhtml">
                 <p:panel header="Вход в систему" style="margin-bottom:20px">
                     <table cellpadding="10" style="width: 100%">
diff --git a/src/main/resources/META-INF/resources/paper/papers.xhtml b/src/main/resources/META-INF/resources/paper/papers.xhtml
index 845eabd..08aa636 100644
--- a/src/main/resources/META-INF/resources/paper/papers.xhtml
+++ b/src/main/resources/META-INF/resources/paper/papers.xhtml
@@ -10,51 +10,61 @@
                 text-align: right !important;
             }
         </style>
-        <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" rows="10" id="papersTable"
-                     widgetVar="papersTable" emptyMessage="Не найдено подходящих статей"
-                     selection="#{papersView.selectedPapers}" rowKey="#{paper.id}">
-            <f:facet name="header">
-                <p:outputPanel>
-                    <h:outputText value="Поиск:"/>
-                    <p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px"
-                                 placeholder="Строка поиска..."/>
-                </p:outputPanel>
-            </f:facet>
-            <p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="@form"/>
-            <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
-            <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
-            <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="@form"/>
-            <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>
+        <div class="ui-fluid">
+            <div class="ui-g">
+                <div class="ui-md-3 ui-g-12">
+                    <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
+                                     disabled="#{papersView.selectedPapers.isEmpty()}"
+                                     action="#{papersView.deleteSelected}" ajax="true" process="@form"
+                                     update="messages @form"/>
+                </div>
+
+                <div class="ui-md-5 ui-g-12">
+                    <p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
+                </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>
+
+            <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" rows="10" id="papersTable"
+                         widgetVar="papersTable" emptyMessage="Не найдено подходящих статей"
+                         selection="#{papersView.selectedPapers}" rowKey="#{paper.id}">
+                <f:facet name="header">
+                    <p:outputPanel>
+                        <h:outputText value="Поиск:"/>
+                        <p:inputText id="globalFilter" onkeyup="PF('papersTable').filter()" style="width:150px"
+                                     placeholder="Строка поиска..."/>
+                    </p:outputPanel>
                 </f:facet>
-                <ui:include src="paperStatusFragment.xhtml">
-                    <ui:param name="paper" value="#{paper}"/>
-                </ui:include>
-            </p:column>
-        </p:dataTable>
-        <div class="ui-g-3">
-            <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
-                             disabled="#{papersView.selectedPapers.isEmpty()}"
-                             action="#{papersView.deleteSelected}" ajax="true" process="@form"
-                             update="messages @form"/>
+                <p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="@form"/>
+                <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
+                <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
+                <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="@form"/>
+                <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: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:composition>
 </html>