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

Merge branch '7-dates-Matveeva' into 'master'

Browse Source 
Resolve "Отображать даты создания и изменения статей"

Closes #7

See merge request romanov73/ng-tracker!10
This commit is contained in:
Anton Romanov 2018-10-18 07:25:58 +00:00
commit 5c0de4bcf4
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/resources/templates/papers/paper.html
View File

@ -55,12 +55,23 @@
</div>
</div>
<p><a href="#myModal1" class="btn btn-primary" data-toggle="modal">Редактировать авторов статьи</a></p>
<div class="form-group">
<label>Дата публикации:</label>
<input type="date" class="form-control" name="date-publish"/>
</div>
<div class="form-group">
<label>Последнее изменение:</label>
<input type="date" class="form-control" name="date-update"/>
</div>
<p><a href="#myModal1" class="btn btn-primary" data-toggle="modal">Редактировать авторов
статьи</a></p>
<div id="myModal1" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×
</button>
<h4 class="modal-title">Авторы статьи</h4>
</div>
<div class="modal-body">
@ -78,7 +89,8 @@
<td>Иван</td>
<td>Иванович</td>
<td>
<span class="table-remove"><button type="button" class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
<span class="table-remove"><button type="button"
class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
</td>
</tr>
<tr>
@ -86,14 +98,17 @@
<td>text</td>
<td>text</td>
<td>
<span class="table-remove"><button type="button" class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
<span class="table-remove"><button type="button"
class="btn btn-danger btn-rounded btn-sm my-0">Remove</button></span>
</td>
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Выберите автора
<button class="btn btn-primary dropdown-toggle"
type="button" data-toggle="dropdown">Выберите автора
<span class="caret"></span></button>
<ul class="dropdown-menu">
<input class="form-control" id="myInput" type="text" placeholder="Search.."/>
<input class="form-control" id="myInput" type="text"
placeholder="Search.."/>
<li><a href="#">Иванов</a></li>
<li><a href="#">Смирнов</a></li>
<li><a href="#">Кузнецов</a></li>
@ -105,14 +120,16 @@
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary">Сохранить изменения</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
<button type="button" class="btn btn-primary">Сохранить изменения
</button>
<button type="button" class="btn btn-default" data-dismiss="modal">
Отмена
</button>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3 offset-md-3 col-sm-12 offset-sm-0">
<div class="form-group">
<button id="pingButton" class="btn btn-primary text-uppercase" type="button">