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 +24 -16
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76666912d7 - Show all commits

5
src/main/resources/public/css/agency.css
View File

@ -76,6 +76,11 @@ section h3.section-subheading {
padding: 20px 40px;
}
.btn-success {
background-color: #28a745;
border-color: #28a745;
}
.btn-primary {
background-color: #fed136;
border-color: #fed136;

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

@ -26,7 +26,7 @@
<div class="col-lg-12">
<form id="contactForm" name="sentMessage" novalidate="">
<div class="row">
<div class="col-md-6">
<div class="col-md-6 col-sm-12">
<div class="form-group">
<label for="name">Название:</label>
<input class="form-control" id="name" type="text" placeholder="Название статьи"
@ -57,22 +57,25 @@
</div>
</div>
<div class="col-md-3 offset-md-3">
<button id="pingButton" class="btn btn-primary btn-xl text-uppercase" type="button">
Ping авторам
</button>
<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">
Ping авторам
</button>
</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-default btn-xl text-uppercase" type="button">
Отмена
</button>
<div class="col-lg-12">
<div class="form-group">
<button id="sendMessageButton" class="btn btn-success text-uppercase"
type="submit">
Сохранить
</button>
<button id="cancelButton" class="btn btn-default text-uppercase" type="button">
Отмена
</button>
</div>
</div>
</div>
</form>
@ -89,14 +92,14 @@
div: "loader",
url: urlFileUpload,
maxSize: 1.5,
extensions: ["doc", "docx","xls", "jpg", "pdf", "txt", "png"],
extensions: ["doc", "docx", "xls", "jpg", "pdf", "txt", "png"],
callback: function (response) {
showFeedbackMessage("Файл успешно загружен");
console.debug(response);
}
});
getFromRest(urlPaperStatuses, function(response) {
getFromRest(urlPaperStatuses, function (response) {
fillSelect($("#status"), response);
});
});