Skip to content

Commit c8493d4

Browse files
dejandedejande
committed
In log details view I added the print log button. By clicking on it new window opens and in it there are all log's details including attachments
1 parent c687a00 commit c8493d4

File tree

13 files changed

+614
-468
lines changed

13 files changed

+614
-468
lines changed

‎Olog/public_html/index.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
<li class="divider-vertical"></li>
3333
</ul>
3434

35-
<div class="btn-group">
36-
<button id="new_log" class="btn btn-primary">New Log Entry</button>
35+
<div id="add_btn_group" style="z-index: -1;" class="btn-group">
36+
<button id="new_log" class="btn btn-primary"><i class="icon-plus icon-white"></i> Log Entry</button>
3737
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
3838
<span class="caret"></span>
3939
</button>
4040
<ul class="dropdown-menu">
41-
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
42-
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
41+
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
42+
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
4343
</ul>
4444
</div>
4545

@@ -118,7 +118,7 @@ <h5>Filter Log Entries</h5>
118118
<div id="load_log" class="well container-scroll-last-one">
119119

120120
<div class="log_title">
121-
<h5><span id="log_owner"></span>, <span id="log_date"></span><a class="log_show_details" href="#view"><i class="icon-info-sign"></i> <span id="show_details">Show details</span></a><a id="modify_log_link" href="modify_log.html"><i title="Modify Log Entry" class="icon-pencil float_right float_right_padding"></i></a></h5>
121+
<h5><span id="log_owner"></span>, <span id="log_date"></span><a class="log_show_details" href="#view"><i class="icon-info-sign"></i> <span id="show_details">Show details</span></a><a id="modify_log_link" href="modify_log.html"><i title="Modify Log Entry" class="icon-pencil float_right float_right_padding"></i></a><a id="print_log_link" target="_blank" href="print_log.html"><i title="Print Log Entry" class="icon-print float_right float_right_padding"></i></a></h5>
122122
</div>
123123

124124
<div class="log_details display_none">
@@ -227,6 +227,7 @@ <h5><span id="log_owner"></span>, <span id="log_date"></span><a class="log_show_
227227
<script src="static/js/moment.min.js"></script>
228228
<script src="static/js/mustache.js"></script>
229229
<script src="static/js/configuration.js"></script>
230+
<script src="static/js/helper.js"></script>
230231
<script src="static/js/multilist.js"></script>
231232
<script src="static/js/common.js"></script>
232233
<script src="static/js/rest.js"></script>

‎Olog/public_html/modify_log.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</ul>
4040

4141
<div class="btn-group">
42-
<button id="new_log" class="btn btn-primary active">New Log Entry</button>
42+
<button id="new_log" class="btn btn-primary active"><i class="icon-plus icon-white"></i> Log Entry</button>
4343
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
4444
<span class="caret"></span>
4545
</button>
4646
<ul class="dropdown-menu">
47-
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
48-
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
47+
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
48+
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
4949
</ul>
5050
</div>
5151

@@ -170,6 +170,7 @@ <h5>Quickly add or remove <a id="tooltip" href="#" data-toggle="tooltip" title="
170170
<script src="static/js/mustache.js"></script>
171171
<script src="static/js/bootstrap-tagmanager.js"></script>
172172
<script src="static/js/configuration.js"></script>
173+
<script src="static/js/helper.js"></script>
173174
<script src="static/js/multilist.js"></script>
174175
<script src="static/js/common.js"></script>
175176
<script src="static/js/rest.js"></script>

‎Olog/public_html/new_log.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</ul>
4040

4141
<div class="btn-group">
42-
<button id="new_log" class="btn btn-primary active">New Log Entry</button>
42+
<button id="new_log" class="btn btn-primary active"><i class="icon-plus icon-white"></i> Log Entry</button>
4343
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
4444
<span class="caret"></span>
4545
</button>
4646
<ul class="dropdown-menu">
47-
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
48-
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
47+
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
48+
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
4949
</ul>
5050
</div>
5151

@@ -175,6 +175,7 @@ <h5>Quickly add <a id="tooltip" href="#" data-toggle="tooltip" title="You can se
175175
<script src="static/js/mustache.js"></script>
176176
<script src="static/js/bootstrap-tagmanager.js"></script>
177177
<script src="static/js/configuration.js"></script>
178+
<script src="static/js/helper.js"></script>
178179
<script src="static/js/multilist.js"></script>
179180
<script src="static/js/common.js"></script>
180181
<script src="static/js/rest.js"></script>

‎Olog/public_html/print_log.html‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Olog</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<link rel="stylesheet" type="text/css" href="static/css/bootstrap.css">
8+
<link rel="stylesheet" type="text/css" href="static/css/bootstrap-responsive.css">
9+
<link rel="stylesheet" type="text/css" href="static/css/print_style.css">
10+
<link rel="stylesheet" type="text/css" href="static/css/bootstrap-tagmanager.css">
11+
<link rel="stylesheet" type="text/css" href="static/css/jquery-ui-1.10.3.custom.min.css">
12+
13+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
14+
<!--[if lt IE 9]>
15+
<script src="../assets/js/html5shiv.js"></script>
16+
<![endif]-->
17+
18+
<link rel="shortcut icon" href="static/img/favicon.png">
19+
</head>
20+
<body>
21+
22+
<div class="container">
23+
<div>
24+
<h4>Log id: <span id="log_id"></span>, Log version: <span id="log_version"></span></h4>
25+
</div>
26+
<div>
27+
<p><span class="bold">Owner:</span> <span id="log_owner"></span></p>
28+
</div>
29+
<div>
30+
<p><span class="bold">Log created:</span> <span id="log_date"></span></p>
31+
</div>
32+
<div>
33+
<p><span class="bold">Level:</span> <span id="log_level"></span></p>
34+
</div>
35+
<div>
36+
<p><span class="bold">Logbooks:</span> <span id="load_log_logbooks"></span></p>
37+
</div>
38+
<div>
39+
<p><span class="bold">Tags:</span> <span id="load_log_tags"></span></p>
40+
</div>
41+
<div>
42+
<p>
43+
<span class="bold">Description:</span>
44+
<br/>
45+
<span id="log_description"></span>
46+
</p>
47+
</div>
48+
<div>
49+
<span class="bold">Attachments:</span>
50+
<br/>
51+
<span id="load_log_attachments"></span>
52+
</div>
53+
<div>
54+
<br/>
55+
<p><span class="bold">Date printed:</span> <span id="date_printed"></span></p>
56+
</div>
57+
</div>
58+
59+
<!-- Templates
60+
==================================================== -->
61+
<div id="template_container"></div>
62+
63+
<!-- Import javascript files
64+
================================================== -->
65+
<!-- Placed at the end of the document so the pages load faster -->
66+
<script src="static/js/jquery-2.0.2.js"></script>
67+
<script src="static/js/jquery-ui-1.10.3.custom.min.js"></script>
68+
<script src="static/js/jquery-ui-timepicker-addon.js"></script>
69+
<script src="static/js/jquery.cookie.js"></script>
70+
<script src="static/js/purl.js"></script>
71+
<script src="static/js/bootstrap.js"></script>
72+
<script src="static/js/moment.min.js"></script>
73+
<script src="static/js/mustache.js"></script>
74+
<script src="static/js/configuration.js"></script>
75+
<script src="static/js/helper.js"></script>
76+
<script src="static/js/multilist.js"></script>
77+
<script src="static/js/rest.js"></script>
78+
<script src="static/js/print_log.js"></script>
79+
80+
</body>
81+
</html>

‎Olog/public_html/static/css/print_style.css‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Common styles used in all files
3+
*
4+
* @author: Dejan Dežman <dejan.dezman@cosylab.com>
5+
* @created: 2014-11-21
6+
*/
7+
8+
html, body {
9+
margin: 0;
10+
padding: 0;
11+
height: 100%;
12+
width: 100%;
13+
}
14+
15+
.container {
16+
margin-top: 20px;
17+
margin-bottom: 20px;
18+
}
19+
20+
.bold {
21+
font-weight: bold;
22+
}

‎Olog/public_html/static/css/style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Common styles used in all files
33
*
4-
* @author: Dejan Dežman <dejan.dezman@cosylab.com>
4+
* @author: Dejan Dežman <dejan.dezman@cosylab.com>
55
*/
66

77
html, body {

0 commit comments

Comments
 (0)