From 107ddb90acbb165687feb7091d799f6e2746aacb Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sun, 24 Nov 2019 23:22:05 +0400
Subject: [PATCH] add side commands

---
 .../META-INF/resources/paper/paper.xhtml      | 81 ++++++++++---------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/META-INF/resources/paper/paper.xhtml b/src/main/resources/META-INF/resources/paper/paper.xhtml
index a8bcf4b..a1ee9d2 100644
--- a/src/main/resources/META-INF/resources/paper/paper.xhtml
+++ b/src/main/resources/META-INF/resources/paper/paper.xhtml
@@ -20,48 +20,53 @@
         </style>
         <p:panel id="panel" header="Статья" style="margin-bottom:10px;">
             <h:panelGrid columns="2" cellpadding="5">
-                <h:outputLabel for="name" value="Название:"/>
-                <p:inputText id="name" required="true" value="#{paperView.paper.title}"/>
+                <h:panelGrid columns="2" cellpadding="5">
+                    <h:outputLabel for="name" value="Название:"/>
+                    <p:inputText id="name" required="true" value="#{paperView.paper.title}"/>
 
-                <p:outputLabel for="@next" value="Статус:"/>
-                <p:panelGrid columns="2" id="paperStatus">
-                    <p:selectOneMenu id="status" required="true" value="#{paperView.paper.status}"
-                                     converter="paperStatusConverter">
-                        <p:ajax update="mainForm:paperStatus" process="@this"/>
-                        <f:selectItems value="#{paperView.paperStatuses}"
-                                       var="status"
-                                       itemLabel="#{status.statusName}"
-                                       itemValue="#{status}"/>
+                    <p:outputLabel for="@next" value="Статус:"/>
+                    <p:panelGrid columns="2" id="paperStatus">
+                        <p:selectOneMenu id="status" required="true" value="#{paperView.paper.status}"
+                                         converter="paperStatusConverter">
+                            <p:ajax update="mainForm:paperStatus" process="@this"/>
+                            <f:selectItems value="#{paperView.paperStatuses}"
+                                           var="status"
+                                           itemLabel="#{status.statusName}"
+                                           itemValue="#{status}"/>
+                        </p:selectOneMenu>
+                        <ui:include src="paperStatusFragment.xhtml">
+                            <ui:param name="paper" value="#{paperView.paper}"/>
+                            <ui:param name="shortMode" value="true"/>
+                        </ui:include>
+                    </p:panelGrid>
+
+                    <p:outputLabel for="@next" value="Тип:"/>
+                    <p:selectOneMenu id="type" value="#{paperView.paper.type}"
+                                     converter="paperTypeConverter">
+                        <f:selectItems value="#{paperView.paperTypes}"
+                                       var="type"
+                                       itemLabel="#{type.typeName}"
+                                       itemValue="#{type}"/>
                     </p:selectOneMenu>
-                    <ui:include src="paperStatusFragment.xhtml">
-                        <ui:param name="paper" value="#{paperView.paper}"/>
-                        <ui:param name="shortMode" value="true"/>
-                    </ui:include>
+                    <p:outputLabel for="@next" value="Комментарий:"/>
+                    <p:textEditor widgetVar="editor2" value="#{paperView.paper.comment}" height="300"
+                                  style="margin-bottom:10px" placeholder="Комментарий"/>
+
+                    <p:outputLabel for="@next" value="Авторы:"/>
+                    <p:selectCheckboxMenu id="authors" value="#{paperView.paper.authors}" multiple="true"
+                                          converter="#{userConverter}">
+                        <f:attribute name="collectionType" value="java.util.HashSet"/>
+                        <f:selectItems value="#{paperView.authors}"
+                                       var="author"
+                                       itemLabel="#{author.userAbbreviate}"
+                                       itemValue="#{author}"/>
+                    </p:selectCheckboxMenu>
+                    <p:commandButton action="#{paperView.save}" value="Сохранить" ajax="true" process="@form"/>
+                </h:panelGrid>
+                <p:panelGrid columns="1">
+                    <p:link href="/conference/conferenceList.xhtml" value="Статья участвует в конференции"/>
                 </p:panelGrid>
-
-                <p:outputLabel for="@next" value="Тип:"/>
-                <p:selectOneMenu id="type" value="#{paperView.paper.type}"
-                                 converter="paperTypeConverter">
-                    <f:selectItems value="#{paperView.paperTypes}"
-                                   var="type"
-                                   itemLabel="#{type.typeName}"
-                                   itemValue="#{type}"/>
-                </p:selectOneMenu>
-                <p:outputLabel for="@next" value="Комментарий:"/>
-                <p:textEditor widgetVar="editor2" value="#{paperView.paper.comment}" height="300"
-                              style="margin-bottom:10px" placeholder="Комментарий"/>
-
-                <p:outputLabel for="@next" value="Авторы:"/>
-                <p:selectCheckboxMenu id="authors" value="#{paperView.paper.authors}" multiple="true"
-                                      converter="#{userConverter}">
-                    <f:attribute name="collectionType" value="java.util.HashSet"/>
-                    <f:selectItems value="#{paperView.authors}"
-                                   var="author"
-                                   itemLabel="#{author.userAbbreviate}"
-                                   itemValue="#{author}"/>
-                </p:selectCheckboxMenu>
             </h:panelGrid>
-            <p:commandButton action="#{paperView.save}" value="Сохранить" ajax="true" process="@form"/>
         </p:panel>
     </ui:define>
 </ui:composition>