From f90d92b19d47743c011fc105cb46d4baf019d62b Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Mon, 11 Mar 2019 11:36:00 +0400
Subject: [PATCH] #54 add custom paper-list

---
 src/main/resources/public/css/conference.css  |  39 ++++++++++++++++
 .../resources/public/img/conference/paper.png | Bin 0 -> 597 bytes
 .../templates/conferences/conference.html     |  42 +++++++++++++++---
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/public/img/conference/paper.png

diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index 3b867c6..e29ef9a 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -1,6 +1,13 @@
+.form-group textarea{
+    min-height: 206px;
+    max-height: 463px;
+}
+
+
 .deadline-list{
     height: 200px;
     padding: 0px;
+    overflow-y: scroll;
 }
 
 .deadline{
@@ -14,12 +21,32 @@
 .member-list{
     height: 200px;
     padding: 0px;
+    overflow-y: scroll;
 }
 
 .member{
     margin: 0;
 }
 
+.paper-list{
+    height: 200px;
+    padding: 0px;
+    overflow-y: scroll;
+}
+
+.paper{
+    margin: 0;
+}
+
+.paper-name{
+    flex: 1;
+}
+
+.paper-name span{
+    margin: 6px 15px;
+    display: inline-block;
+}
+
 .icon{
     width: 38px;
     height: 38px;
@@ -27,9 +54,21 @@
     cursor: pointer;
 }
 
+.icon-delete{
+    background: #ff4444;
+}
+
+.icon-paper{
+     height: 26px;
+     width: 26px;
+     float: right;
+     margin: 5px;
+}
+
 .icon-edit-input-text{
     width: 27px;
     height: 27px;
+    float: right;
 }
 
 .grey-border{
diff --git a/src/main/resources/public/img/conference/paper.png b/src/main/resources/public/img/conference/paper.png
new file mode 100644
index 0000000000000000000000000000000000000000..78a0dfc525d61f0611eeb7c768c248cf1bb15158
GIT binary patch
literal 597
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*&j1=vkPm?-EeRN0|TS7r;B5V$MK_6_hvCUin#f^
zOcTv%X^HqPG3lC?ht=*0YOYez8-p(8eqvFK^+-$<4Ps%+bdpmDo#z<x=OAmi;N(N8
zLg~jO-3{w5-`QFHyx{$D18#2Cn&@jSN>Z{M4d+eOzH(@OR9Ze+sq01ZHC5hom2rM*
z5%KG%R7_znWXurEW8gg`x<Fx)m*Xt1I2r$)sv_~PTnfLqP7c0z$7+Y*@rQH$xmH_o
ztjuJ*x-@pfPWDMx_=M(g@Td6xOvq!F5t3j?FUe^ztDG*l?OOtSgU-cM=80!E#;mKl
z@W^9wY{sz@d=9#|R<iG^{*bVPUA!c>f$=-rfdlsr_AIxpp77|D!6DgX=>y8?3>9Su
zCVbjowW0pNdUiX>_Tqo@&7~rqf7e_8BlaKTBesIR7AqcL#4xCqxJHzuB$lLFB^RXv
zDF!10LrYx)V_ieT5CbzSLrW_Y18oCCD+7c7OwFKJL1@U$PsvQH#I2z(-ns#(K@wy`
saDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uvp00i_>zopr04dzcJpcdz

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 599c745..e8b8935 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -19,8 +19,10 @@
                 <div class="col-lg-12">
                     <form id="paper-form" method="post">
                         <div class="row">
+
                             <div class="col-md-7 col-sm-12">
                                 <input type="hidden" name="id"/>
+
                                 <div class="form-group">
                                     <label for="title">Название:</label>
                                     <img class="icon grey-border float-right icon-edit-input-text"
@@ -54,18 +56,19 @@
                                             <input type="date"/>
                                             <img class="icon grey-border" src="/img/conference/edit.png"
                                                  alt="Редактировать"/>
-                                            <img class="icon grey-border" src="/img/conference/delete.png"
+                                            <img class="icon grey-border icon-delete" src="/img/conference/delete.png"
                                                  alt="Удалить"/>
                                         </div>
-
                                     </div>
                                 </div>
+
                                 <div class="form-group float-right">
-                                    <input type="submit" id="addDeadline" name="addDeadline"
-                                           class="btn btn-primary float-right"
+                                    <input type="submit" id="add-deadline" name="add-deadline"
+                                           class="btn btn-primary"
                                            value="Добавить дедлайн"/>
                                 </div>
                             </div>
+
                             <div class="col-md-5 col-sm-12 offset-sm-0">
                                 <div class="form-group">
                                     <label for="dates">Дата проведения:</label>
@@ -106,13 +109,40 @@
                                     </div>
                                 </div>
 
-
                                 <div class="form-group">
-                                    <button id="pingButton" class="btn btn-primary float-right"
+                                    <button id="take-part" class="btn btn-primary"
                                             type="button">
                                         Принять участие
                                     </button>
                                 </div>
+
+                                <div class="form-group">
+                                    <label for="papers">Статьи:</label>
+                                    <div class="paper-list form-control" id="papers">
+                                        <div class="row paper grey-border">
+                                            <div class="paper-name grey-border">
+                                                <span>
+                                                    Имя статьи
+                                                </span>
+                                                <img class="icon-paper" src="/img/conference/paper.png"/>
+                                            </div>
+                                            <img class="icon grey-border icon-delete" src="/img/conference/delete.png"
+                                                 alt="Удалить"/>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <button id="attach-paper" class="btn btn-primary"
+                                            type="button">
+                                        Прикрепить статью
+                                    </button>
+                                    <button id="add-paper" class="btn btn-primary"
+                                            type="button">
+                                        Добавить статью
+                                    </button>
+                                </div>
+
+
                             </div>
 
                             <div class="clearfix"></div>