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

Merge branch '54-view-conference' into 'dev'

Browse Source 
Resolve "Вёрстка страницы просмотра информации о конференции"

Closes #54

See merge request romanov73/ng-tracker!26
This commit is contained in:
Anton Romanov 2019-03-11 10:49:07 +00:00
commit 3169551968
9 changed files with 280 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/ru/ulstu/configuration/MvcConfiguration.java
View File

@ -13,6 +13,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
//registry.addViewController("/admin/{articlename:\\w+}"); //registry.addViewController("/admin/{articlename:\\w+}");
registry.addViewController("/papers/{articlename:\\w+}"); registry.addViewController("/papers/{articlename:\\w+}");
registry.addViewController("/grants/{articlename:\\w+}"); registry.addViewController("/grants/{articlename:\\w+}");
registry.addViewController("/conferences/{articlename:\\w+}");
registry.addRedirectViewController("/", "/index"); registry.addRedirectViewController("/", "/index");
registry.addRedirectViewController("/default", "/index"); registry.addRedirectViewController("/default", "/index");
} }

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

@ -0,0 +1,94 @@
.col-lg-12 a{
position: absolute;
font-size: smaller;
}
.col-lg-12 a img{
width: 36px;
height: 33px;
}
.form-group textarea{
min-height: 206px;
max-height: 463px;
}
.deadline-list{
height: 200px;
padding: 0px;
overflow-y: scroll;
}
.deadline{
margin: 0;
}
.deadline-text{
flex: 1;
}
.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;
padding: 2px;
cursor: pointer;
}
.icon-delete{
background-color: #f44;
}
.icon-paper{
height: 26px;
width: 26px;
float: right;
margin: 5px;
}
.grey-border{
color: #495057;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
}
#add-paper{
margin-left: 10px;
}
#cancel-button{
position: relative;
font-size: 1rem;
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

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

164
src/main/resources/templates/conferences/conference.html Normal file
View File

@ -0,0 +1,164 @@
<!DOCTYPE html>
<html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default">
<head>
<link rel="stylesheet" type="text/css" href="../css/conference.css"/>
</head>
<body>
<div layout:fragment="content">
<section id="conference">
<div class="container">
<div class="row">
<div class="col-lg-12">
<a class="d-flex align-items-center" href="/conferences/conferences">
<img class="icon" src="/img/conference/back.png"/>
Назад к списку конференций
</a>
<h3 class="section-heading text-uppercase text-center">Редактирование конференции</h3>
</div>
</div>
<hr/>
<div class="row">
<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>
<input class="form-control" id="title" type="text"
placeholder="Название конференции"/>
</div>
<div class="form-group">
<label for="url">URL:</label>
<input class="form-control" id="url" type="text"
placeholder="URL адрес"/>
</div>
<div class="form-group">
<label for="description">Описание:</label>
<textarea class="form-control" rows="8" id="description">
</textarea>
</div>
<div class="form-group">
<label for="deadlines">Дедлайны:</label>
<div class="deadline-list form-control" id="deadlines">
<div class="row deadline grey-border">
<input class="form-control deadline-text" type="text"
placeholder="Текст дедлайна"/>
<input type="date"/>
<img class="icon grey-border icon-delete" src="/img/conference/delete.png"
alt="Удалить"/>
</div>
</div>
</div>
<div class="form-group d-flex justify-content-end">
<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>
<div class="row" id="dates">
<div class="col">
<input type="date" id="date-begin"/>
-
<input type="date" id="date-end"/>
</div>
</div>
</div>
<div class="form-group">
<label for="members">Участники:</label>
<div class="member-list form-control" id="members">
<div class="row member grey-border">
<div class="col-5 member-name">
Пользователь 1
</div>
<div class="col-3 member-participation">
очная
</div>
<div class="col member-deposit">
статья
</div>
</div>
<div class="row member grey-border">
<div class="col-5 member-name">
Пользователь 2
</div>
<div class="col-3 member-participation">
заочная
</div>
<div class="col member-deposit">
доклад
</div>
</div>
</div>
</div>
<div class="form-group d-flex justify-content-end">
<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 d-flex justify-content-end">
<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>
<div class="col-lg-12">
<div class="form-group d-flex justify-content-between">
<button id="send-message-button" name="save"
class="btn btn-success text-uppercase"
type="submit">
Сохранить
</button>
<a id="cancel-button" class="btn btn-default text-uppercase"
href="/conferences/conferences">
Отмена
</a>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</body>
</html>

20
src/main/resources/templates/conferences/conferences.html Normal file
View File

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default">
<head>
</head>
<body>
<div layout:fragment="content">
<a href="./conference" style="
top: 100px;
position: absolute;
width: 100px;
height: 50px;
">нажать</a>
</div>
</body>
</html>

2
src/main/resources/templates/index.html
View File

@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-6 portfolio-item"> <div class="col-md-4 col-sm-6 portfolio-item">
<a class="portfolio-link" data-toggle="modal" href="./conferences.html"> <a class="portfolio-link" href="./conferences/conferences">
<div class="portfolio-hover"> <div class="portfolio-hover">
<div class="portfolio-hover-content"> <div class="portfolio-hover-content">
<i class="fa fa-arrow-right fa-3x"></i> <i class="fa fa-arrow-right fa-3x"></i>