Resolve "Список периодических событий" #129

Merged
romanov73 merged 57 commits from 4-show-time-line into master 2018-10-30 23:32:01 +04:00
4 changed files with 150 additions and 192 deletions
Showing only changes of commit 31c7c8571e - Show all commits

View File

@ -1,146 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<meta name="description" content=""/>
<meta name="author" content=""/>
<title>NG-Tacker</title>
<!-- Bootstrap core CSS -->
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
<!-- Custom fonts for this template -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link href="vendor/google/montserrat.css" rel="stylesheet" type="text/css"/>
<link href='vendor/google/kaushan.css' rel='stylesheet' type='text/css'/>
<link href='vendor/google/droid.css' rel='stylesheet' type='text/css'/>
<link href='vendor/google/roboto.css' rel='stylesheet' type='text/css'/>
<!-- Custom styles for this template -->
<link href="css/agency.css" rel="stylesheet"/>
</head>
<body id="page-top">
<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark fixed-top navbar-shrink" id="mainNav">
<div class="container">
<a class="navbar-brand js-scroll-trigger" href="#page-top">NG-Tracker</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fa fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="#landing">НИО-17</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="http://is.ulstu.ru">Сайт кафедры</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="https://kias.rfbr.ru/">КИАС РФФИ</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#logout">Выход</a>
</li>
</ul>
</div>
</div>
</nav>
<section id="paper">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Редактирование статьи</h2>
</div>
</div>
<div class="row">
<div class="col-lg-10 text-center">
</div>
<div class="col-lg-2 text-center">
</div>
</div>
<div class="row">
<div class="col-lg-12">
<form id="contactForm" name="sentMessage" novalidate="">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<input class="form-control" id="name" type="text" placeholder="Название статьи" required="" data-validation-required-message="Введите название статьи"/>
<p class="help-block text-danger"></p>
</div>
<div class="dropdown open">
<div class="form-group">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Статус
</button>
</div>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#">Завершена</a>
<a class="dropdown-item" href="#">Черновик</a>
<a class="dropdown-item" href="#">Внимание</a>
</div>
<div class="form-group">
<label for="comment">Comment:</label>
<textarea class="form-control" rows="5" id="comment"></textarea>
</div>
<div class="form-group">
<div class="checkbox">
<label><input type="checkbox" value=""/>Заблокировать</label>
</div>
</div>
<div class="form-group">
<label for="myFile2">Загрузить статью:</label>
<input type="file" class="form-control-file" id="myFile2"/>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="col-lg-12 text-center">
<div id="success"></div>
<button id="sendMessageButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
Отмена
</button>
<button id="sendAlert" class="btn btn-primary btn-xl text-uppercase" type="submit">
Ping авторам
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Plugin JavaScript -->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Contact form JavaScript -->
<script src="js/jqBootstrapValidation.js"></script>
<script src="js/contact_me.js"></script>
<!-- Custom scripts for this template -->
<script src="js/agency.js"></script>
</body>
</html>

View File

@ -1,44 +0,0 @@
<!DOCTYPE html>
<html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default">
<head>
</head>
<body>
<div class="container" layout:fragment="content">
<section id="papers">
<div class="container">
<div class="row" id="paper-list">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Статьи</h2>
<a href = "./paper"><h4>Добавить статью</h4></a>
</div>
</div>
</div>
</section>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Plugin JavaScript -->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Contact form JavaScript -->
<script src="js/jqBootstrapValidation.js"></script>
<script src="js/contact_me.js"></script>
<!-- Custom scripts for this template -->
<script src="js/agency.js"></script>
<script src="js/core.js"></script>
<script src="js/papers.js"></script>
<script>
showPapers($("#paper-list"));
// only for demo
//addPaper("название", "DRAFT", "comment", false);
</script>
</div>
</body>
</html>

View File

@ -1,3 +1,4 @@
<!--
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
@ -53,3 +54,150 @@
</body> </body>
</html> </html>
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<meta name="description" content=""/>
<meta name="author" content=""/>
<title>NG-Tacker</title>
<!-- Bootstrap core CSS -->
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
<!-- Custom fonts for this template -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link href="vendor/google/montserrat.css" rel="stylesheet" type="text/css"/>
<link href='vendor/google/kaushan.css' rel='stylesheet' type='text/css'/>
<link href='vendor/google/droid.css' rel='stylesheet' type='text/css'/>
<link href='vendor/google/roboto.css' rel='stylesheet' type='text/css'/>
<!-- Custom styles for this template -->
<link href="css/agency.css" rel="stylesheet"/>
</head>
<body id="page-top">
<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark fixed-top navbar-shrink" id="mainNav">
<div class="container">
<a class="navbar-brand js-scroll-trigger" href="#page-top">NG-Tracker</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fa fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="#landing">НИО-17</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="http://is.ulstu.ru">Сайт кафедры</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" target="_blank" href="https://kias.rfbr.ru/">КИАС РФФИ</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#logout">Выход</a>
</li>
</ul>
</div>
</div>
</nav>
<section id="paper">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Редактирование статьи</h2>
</div>
</div>
<div class="row">
<div class="col-lg-10 text-center">
</div>
<div class="col-lg-2 text-center">
</div>
</div>
<div class="row">
<div class="col-lg-12">
<form id="contactForm" name="sentMessage" novalidate="">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<input class="form-control" id="name" type="text" placeholder="Название статьи" required="" data-validation-required-message="Введите название статьи"/>
<p class="help-block text-danger"></p>
</div>
<div class="dropdown open">
<div class="form-group">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Статус
</button>
</div>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#">Завершена</a>
<a class="dropdown-item" href="#">Черновик</a>
<a class="dropdown-item" href="#">Внимание</a>
</div>
<div class="form-group">
<label for="comment">Comment:</label>
<textarea class="form-control" rows="5" id="comment"></textarea>
</div>
<div class="form-group">
<div class="checkbox">
<label><input type="checkbox" value=""/>Заблокировать</label>
</div>
</div>
<div class="form-group">
<label for="myFile2">Загрузить статью:</label>
<input type="file" class="form-control-file" id="myFile2"/>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="col-lg-12 text-center">
<div id="success"></div>
<button id="sendMessageButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
Отмена
</button>
<button id="sendAlert" class="btn btn-primary btn-xl text-uppercase" type="submit">
Ping авторам
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Plugin JavaScript -->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Contact form JavaScript -->
<script src="js/jqBootstrapValidation.js"></script>
<script src="js/contact_me.js"></script>
<!-- Custom scripts for this template -->
<script src="js/agency.js"></script>
</body>
</html>

View File

@ -13,7 +13,7 @@
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Статьи</h2> <h2 class="section-heading text-uppercase">Статьи</h2>
<a href="./dashboard"><h5>Перейти на тестовую страницу Алёны</h5></a> <a href="./dashboard"><h5>Перейти на тестовую страницу Алёны</h5></a>
<a href="./myPaper"><h4>Ссылка на пустую страницу</h4></a> <a href = "./paper"><h4>Добавить статью</h4></a>
</div> </div>
</div> </div>
</div> </div>