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

#53 added supporting bootstrap style

Browse Source
This commit is contained in:
Nightblade73 2019-03-18 18:41:59 +04:00
parent 6296b661a9
commit fd22aecd22
3 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/resources/public/css/conference.css
View File

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

8
src/main/resources/public/js/conference.js
View File

@ -1,3 +1,9 @@
$(document).ready(function () {
$('#table_id').dataTable();
$('#table_id').dataTable({
"pageLength": 10,
select: {
style: 'multi'
},
"lengthChange": false
});
});

28
src/main/resources/templates/conferences/conferences.html
View File

@ -3,8 +3,8 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default">
<head>
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.css"/>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.18/datatables.min.css"/>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.18/datatables.min.js"></script>
</head>
<body>
@ -25,24 +25,30 @@
<hr/>
<div class="row">
<div class="col-lg-12">
<form id="paper-form" method="post">
<table id="table_id" class="display">
<form id="conferences-form" method="post">
<table id="table_id" class="table table-bordered table-hover dataTable">
<thead>
<tr>
<th>Column 1</th>
<th>Column 2</th>
<th>Название:</th>
<th>Описание:</th>
<th>Начало:</th>
<th>Конец:</th>
</tr>
</thead>
<tbody>
<tr>
<td>Row 1 Data 1</td>
<td>Row 1 Data 2</td>
<td>Конференция 1</td>
<td>Описание 1</td>
<td>01.01.2000</td>
<td>02.01.2000</td>
</tr>
<tr>
<td>Row 2 Data 1</td>
<td>Row 2 Data 2</td>
<td>Конференция 2</td>
<td>Описание 2</td>
<td>01.02.2001</td>
<td>02.02.2001</td>
</tr>
</tbody>
</table>
</form>