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

#54 add custom paper-list

Browse Source
This commit is contained in:
Nightblade73 2019-03-11 11:36:00 +04:00
parent d332282e03
commit f90d92b19d
3 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/resources/public/css/conference.css
View File

@ -1,6 +1,13 @@
.form-group textarea{
min-height: 206px;
max-height: 463px;
}
.deadline-list{ .deadline-list{
height: 200px; height: 200px;
padding: 0px; padding: 0px;
overflow-y: scroll;
} }
.deadline{ .deadline{
@ -14,12 +21,32 @@
.member-list{ .member-list{
height: 200px; height: 200px;
padding: 0px; padding: 0px;
overflow-y: scroll;
} }
.member{ .member{
margin: 0; 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{ .icon{
width: 38px; width: 38px;
height: 38px; height: 38px;
@ -27,9 +54,21 @@
cursor: pointer; cursor: pointer;
} }
.icon-delete{
background: #ff4444;
}
.icon-paper{
height: 26px;
width: 26px;
float: right;
margin: 5px;
}
.icon-edit-input-text{ .icon-edit-input-text{
width: 27px; width: 27px;
height: 27px; height: 27px;
float: right;
} }
.grey-border{ .grey-border{

BIN
src/main/resources/public/img/conference/paper.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 597 B

42
src/main/resources/templates/conferences/conference.html
View File

@ -19,8 +19,10 @@
<div class="col-lg-12"> <div class="col-lg-12">
<form id="paper-form" method="post"> <form id="paper-form" method="post">
<div class="row"> <div class="row">
<div class="col-md-7 col-sm-12"> <div class="col-md-7 col-sm-12">
<input type="hidden" name="id"/> <input type="hidden" name="id"/>
<div class="form-group"> <div class="form-group">
<label for="title">Название:</label> <label for="title">Название:</label>
<img class="icon grey-border float-right icon-edit-input-text" <img class="icon grey-border float-right icon-edit-input-text"
@ -54,18 +56,19 @@
<input type="date"/> <input type="date"/>
<img class="icon grey-border" src="/img/conference/edit.png" <img class="icon grey-border" src="/img/conference/edit.png"
alt="Редактировать"/> alt="Редактировать"/>
<img class="icon grey-border" src="/img/conference/delete.png" <img class="icon grey-border icon-delete" src="/img/conference/delete.png"
alt="Удалить"/> alt="Удалить"/>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group float-right"> <div class="form-group float-right">
<input type="submit" id="addDeadline" name="addDeadline" <input type="submit" id="add-deadline" name="add-deadline"
class="btn btn-primary float-right" class="btn btn-primary"
value="Добавить дедлайн"/> value="Добавить дедлайн"/>
</div> </div>
</div> </div>
<div class="col-md-5 col-sm-12 offset-sm-0"> <div class="col-md-5 col-sm-12 offset-sm-0">
<div class="form-group"> <div class="form-group">
<label for="dates">Дата проведения:</label> <label for="dates">Дата проведения:</label>
@ -106,13 +109,40 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<button id="pingButton" class="btn btn-primary float-right" <button id="take-part" class="btn btn-primary"
type="button"> type="button">
Принять участие Принять участие
</button> </button>
</div> </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>
<div class="clearfix"></div> <div class="clearfix"></div>