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

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

Merged
romanov73 merged 57 commits from 4-show-time-line into master 2018-10-30 23:32:01 +04:00
Conversation 18 Commits 57 Files Changed 121 +50 -6
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89f4b04a3f - Show all commits

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

@ -19,9 +19,7 @@
<div class="col-lg-10 text-center">
</div>
<div class="col-lg-2 text-center">
<button id="sendAlert" class="btn btn-primary btn-xl text-uppercase" type="submit">
Ping авторам
</button>
</div>
</div>
<div class="row">
@ -30,10 +28,35 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="name">Название:</label>
<input class="form-control" id="name" type="text" placeholder="Название статьи"
required="" data-validation-required-message="Ввеите название статьи"/>
required="" data-validation-required-message="Введите название статьи"/>
<p class="help-block text-danger"></p>
</div>
<div class="form-group">
<label for="status">Статус:</label>
<select class="form-control" id="status">
<option value="COMPLETED">Завершена</option>
<option value="DRAFT">Черновик</option>
<option value="ATTENTION">Внимание</option>
</select>
</div>
<div class="form-group">
<label for="comment">Комментарий:</label>
<textarea class="form-control" rows="5" id="comment"></textarea>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" id="locked"/>
<label class="form-check-label" for="locked">Заблокирована</label>
</div>
<div class="form-group">
<label for="loader">Загрузить статью:</label>
<div id="loader">
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="col-lg-12 text-center">
@ -42,6 +65,9 @@
type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-primary btn-xl text-uppercase" type="submit">
Отмена
</button>
</div>
</div>
</form>
@ -49,7 +75,25 @@
</div>
</div>
</section>
<script type="text/javascript" src="/js/file-loader.js"></script>
<script>
/*<![CDATA[*/
$(document).ready(function () {
new FileLoader({
div: "loader",
url: urlFileUpload,
maxSize: 1.5,
extensions: ["xls", "jpg", "pdf", "txt", "png"],
callback: function (response) {
showFeedbackMessage("Файл успешно загружен");
console.debug(response);
}
});
});
/*]]>*/
</script>
</div>
</body>
</html>
</html>

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

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