Skip to content

Commit

Permalink
In log details view I added the print log button. By clicking on it n…
Browse files Browse the repository at this point in the history 
…ew window opens and in it there are all log's details including attachments
  • Loading branch information
@dejande
dejande committed Nov 21, 2014
1 parent c687a00 commit c8493d4
Show file tree
Hide file tree
Showing 13 changed files with 614 additions and 468 deletions.
11 changes: 6 additions & 5 deletions Olog/public_html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
<li class="divider-vertical"></li>
</ul>

<div class="btn-group">
<button id="new_log" class="btn btn-primary">New Log Entry</button>
<div id="add_btn_group" style="z-index: -1;" class="btn-group">
<button id="new_log" class="btn btn-primary"><i class="icon-plus icon-white"></i> Log Entry</button>
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
</ul>
</div>

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

<div class="log_title">
<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>
<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>
</div>

<div class="log_details display_none">
Expand Down Expand Up @@ -227,6 +227,7 @@ <h5><span id="log_owner"></span>, <span id="log_date"></span><a class="log_show_
<script src="static/js/moment.min.js"></script>
<script src="static/js/mustache.js"></script>
<script src="static/js/configuration.js"></script>
<script src="static/js/helper.js"></script>
<script src="static/js/multilist.js"></script>
<script src="static/js/common.js"></script>
<script src="static/js/rest.js"></script>
Expand Down
7 changes: 4 additions & 3 deletions Olog/public_html/modify_log.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
</ul>

<div class="btn-group">
<button id="new_log" class="btn btn-primary active">New Log Entry</button>
<button id="new_log" class="btn btn-primary active"><i class="icon-plus icon-white"></i> Log Entry</button>
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
</ul>
</div>

Expand Down Expand Up @@ -170,6 +170,7 @@ <h5>Quickly add or remove <a id="tooltip" href="#" data-toggle="tooltip" title="
<script src="static/js/mustache.js"></script>
<script src="static/js/bootstrap-tagmanager.js"></script>
<script src="static/js/configuration.js"></script>
<script src="static/js/helper.js"></script>
<script src="static/js/multilist.js"></script>
<script src="static/js/common.js"></script>
<script src="static/js/rest.js"></script>
Expand Down
7 changes: 4 additions & 3 deletions Olog/public_html/new_log.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
</ul>

<div class="btn-group">
<button id="new_log" class="btn btn-primary active">New Log Entry</button>
<button id="new_log" class="btn btn-primary active"><i class="icon-plus icon-white"></i> Log Entry</button>
<button id="new_logbook_and_tag" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a onclick="showAddModal('myModal');">New Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');">New Tag</a></li>
<li><a onclick="showAddModal('myModal');"><i class="icon-plus"></i> Logbook</a></li>
<li><a onclick="showAddModal('myTagModal');"><i class="icon-plus"></i> Tag</a></li>
</ul>
</div>

Expand Down Expand Up @@ -175,6 +175,7 @@ <h5>Quickly add <a id="tooltip" href="#" data-toggle="tooltip" title="You can se
<script src="static/js/mustache.js"></script>
<script src="static/js/bootstrap-tagmanager.js"></script>
<script src="static/js/configuration.js"></script>
<script src="static/js/helper.js"></script>
<script src="static/js/multilist.js"></script>
<script src="static/js/common.js"></script>
<script src="static/js/rest.js"></script>
Expand Down
81 changes: 81 additions & 0 deletions Olog/public_html/print_log.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<!DOCTYPE html>
<html>
<head>
<title>Olog</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="static/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="static/css/bootstrap-responsive.css">
<link rel="stylesheet" type="text/css" href="static/css/print_style.css">
<link rel="stylesheet" type="text/css" href="static/css/bootstrap-tagmanager.css">
<link rel="stylesheet" type="text/css" href="static/css/jquery-ui-1.10.3.custom.min.css">

<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="../assets/js/html5shiv.js"></script>
<![endif]-->

<link rel="shortcut icon" href="static/img/favicon.png">
</head>
<body>

<div class="container">
<div>
<h4>Log id: <span id="log_id"></span>, Log version: <span id="log_version"></span></h4>
</div>
<div>
<p><span class="bold">Owner:</span> <span id="log_owner"></span></p>
</div>
<div>
<p><span class="bold">Log created:</span> <span id="log_date"></span></p>
</div>
<div>
<p><span class="bold">Level:</span> <span id="log_level"></span></p>
</div>
<div>
<p><span class="bold">Logbooks:</span> <span id="load_log_logbooks"></span></p>
</div>
<div>
<p><span class="bold">Tags:</span> <span id="load_log_tags"></span></p>
</div>
<div>
<p>
<span class="bold">Description:</span>
<br/>
<span id="log_description"></span>
</p>
</div>
<div>
<span class="bold">Attachments:</span>
<br/>
<span id="load_log_attachments"></span>
</div>
<div>
<br/>
<p><span class="bold">Date printed:</span> <span id="date_printed"></span></p>
</div>
</div>

<!-- Templates
==================================================== -->
<div id="template_container"></div>

<!-- Import javascript files
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="static/js/jquery-2.0.2.js"></script>
<script src="static/js/jquery-ui-1.10.3.custom.min.js"></script>
<script src="static/js/jquery-ui-timepicker-addon.js"></script>
<script src="static/js/jquery.cookie.js"></script>
<script src="static/js/purl.js"></script>
<script src="static/js/bootstrap.js"></script>
<script src="static/js/moment.min.js"></script>
<script src="static/js/mustache.js"></script>
<script src="static/js/configuration.js"></script>
<script src="static/js/helper.js"></script>
<script src="static/js/multilist.js"></script>
<script src="static/js/rest.js"></script>
<script src="static/js/print_log.js"></script>

</body>
</html>
22 changes: 22 additions & 0 deletions Olog/public_html/static/css/print_style.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Common styles used in all files
*
* @author: Dejan Dežman <[email protected]>
* @created: 2014-11-21
*/

html, body {
margin: 0;
padding: 0;
height: 100%;
width: 100%;
}

.container {
margin-top: 20px;
margin-bottom: 20px;
}

.bold {
font-weight: bold;
}
2 changes: 1 addition & 1 deletion Olog/public_html/static/css/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Common styles used in all files
*
* @author: Dejan Dežman <[email protected]>
* @author: Dejan Dežman <[email protected]>
*/

html, body {
Expand Down
Loading

0 comments on commit c8493d4

Please sign in to comment.