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

#54 add member list

Browse Source
This commit is contained in:
Nightblade73 2019-03-07 22:50:37 +04:00
parent 76ec5add30
commit 7fff337c3a
2 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/public/css/conference.css Normal file
View File

@ -0,0 +1,14 @@
.member-list{
height: 200px;
padding: 0px;
}
.member{
margin: 0;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
}

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

@ -3,7 +3,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default"> layout:decorator="default">
<head> <head>
<link rel="stylesheet" type="text/css" href="../css/conference.css"/>
</head> </head>
<body> <body>
<div layout:fragment="content"> <div layout:fragment="content">
@ -28,14 +28,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="title">URL:</label> <label for="url">URL:</label>
<input class="form-control" id="url" type="text" <input class="form-control" id="url" type="text"
placeholder="URL адрес:"/> placeholder="URL адрес:"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="comment">Описание:</label> <label for="description">Описание:</label>
<textarea class="form-control" rows="8" id="comment"> <textarea class="form-control" rows="8" id="description">
</textarea> </textarea>
</div> </div>
@ -47,33 +47,51 @@
value="Добавить дедлайн"/> value="Добавить дедлайн"/>
</div> </div>
</div> </div>
<div class="col-md-4 offset-md-1 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">
<div class="row"> <label for="dates">Дата проведения:</label>
<h6 class="my-0">Дата проведения:</h6> <div class="row" id="dates">
</div>
<div class="row">
<div class="col"> <div class="col">
<input type="date" id="date-begin" name="date"/> <input type="date" id="date-begin" name="date"/>
</div> -
<div class="col">
<input type="date" id="date-end" name="date"/> <input type="date" id="date-end" name="date"/>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="row"> <label for="members">Участники:</label>
<div class="col"> <div class="member-list form-control" id="members">
<h6 class="my-0">Дата изменения:</h6> <div class="row member">
<div class="col member-name">
Пользователь 1
</div>
<div class="col member-participation">
очная
</div>
<div class="col member-deposit">
статья
</div>
</div> </div>
<div class="col"> <div class="row member">
<div class="col member-name">
Пользователь 2
</div>
<div class="col member-participation">
заочная
</div>
<div class="col member-deposit">
доклад
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<button id="pingButton" class="btn btn-primary text-uppercase" <button id="pingButton" class="btn btn-primary text-uppercase"
type="button"> type="button">
Ping авторам Принять участие
</button> </button>
</div> </div>
</div> </div>