Skip to content

Commit

Permalink
Merge pull request #6 from michaeldale/master
Browse files Browse the repository at this point in the history 
Updates from Michael Dale
  • Loading branch information
@FrankGiesecke
FrankGiesecke authored Oct 30, 2017
2 parents d334f4a + 4291dae commit 34f2c6e
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 75 deletions.
31 changes: 19 additions & 12 deletions install/includes/html-footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@

<div id="footer">
<div id="footer-design">
<div id="copyright">Copyright &copy; Dalegroup Pty Ltd <?php echo date('Y'); ?></div>
<div id="version">MrP</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<div class="clearfix"></div>
<div class="modal fade" id="custom_modal_anchor" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>

</div><!--/.container-->

<footer>
<p class="text-muted">
<small>
Copyright <span class="glyphicon glyphicon-copyright-mark"></span> <a href="http://www.dalegroup.net/">Dalegroup Pty Ltd</a> <?php echo date('Y'); ?>
</small>
</p>
</footer>

<script type="text/javascript">
$('.dropdown-toggle').dropdown();
</script>

</body>
</html>
111 changes: 70 additions & 41 deletions install/includes/html-header.php
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,70 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Dalegroup MrP</title>
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="../user/themes/standard/css/ie.css" media="screen" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="../user/themes/standard/css/reset.css" />
<link type="text/css" media="screen" href="../user/themes/standard/css/default.css" rel="stylesheet" />
<link type="text/css" media="screen" href="../user/themes/standard/css/suckerfish.css" rel="stylesheet" />
<script type="text/javascript" src="../system/libraries/js/jquery.js"></script>
</head>
<body>
<div class="left-border">
<div class="right-border">
<div class="page-wrapper">
<div id="header">
<div id="header-design">
<div id="logo-image">
<h1>Dalegroup Pty Ltd</h1>
</div>
<!--<div id="header-right">
<p id="welcome-text">Welcome Text</p>
<a href="" class="button logout">Logout Text</a>
<div class="clear"></div>
</div>-->
<div class="clear"></div>
</div>
</div>
<div id="menu">
<ul id="nav">
<li class="first_item"><a href="index.php"><span>Home</span></a></li>
</ul>
<div class="clear"></div>
</div>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Dalegroup MrP</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<!-- Core theme -->
<link href="../user/themes/bootstrap3/core6/css/bootstrap.css" rel="stylesheet">
<link href="../user/themes/bootstrap3/code6/css/responsive-tables.css" rel="stylesheet">
<link href="../user/themes/bootstrap3/code6/css/font-awesome.min.css" rel="stylesheet">
<link href="../user/themes/bootstrap3/core6/stylesheets/theme.css" rel="stylesheet">
<link href="../user/themes/bootstrap3/core6/stylesheets/theme-custom.css" rel="stylesheet">
<script type="text/javascript" src="../system/libraries/js/jquery.js"></script>
<script src="../user/themes/bootstrap3/core6/js/autocollapse.js" rel="stylesheet"></script>
<script type="text/javascript" src="../user/themes/bootstrap3/core6/js/masonry.js"></script>
<script type="text/javascript" src="../user/themes/bootstrap3/core6/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../system/libraries/js/respond.min.js"></script>
<link rel="stylesheet" href="../system/libraries/select2/select2.css" />
<script type="text/javascript" src="../system/libraries/select2/select2.min.js"></script>
<script type="text/javascript">
$(document).ready(function () {
//Custom Selectmenu
$('select').select2({ width: 'resolve' });
//tooltip
$(".glyphicon-question-sign").tooltip({html: true});
//popover
$('.popover-item').popover().click(function(e){e.preventDefault();});
});
</script>
</head>
<body>
<nav id="autocollapse" class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar-header">
<a class="navbar-brand" href="index.php">MrP</a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="index.php"><span class="glyphicon glyphicon-home"></span> Home</a></li>
</ul>
</div><!--/.nav-collapse -->
</nav>
<div class="container">
15 changes: 13 additions & 2 deletions system/classes/upgrade.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

class upgrade {

private $db_version = '27';
private $program_version = '4.0';
private $db_version = '28';
private $program_version = '4.1';

function __construct() {

Expand Down Expand Up @@ -852,6 +852,17 @@ private function dbdv_27() {
$config->set('database_version', 27);
}

private function dbdv_28() {
global $db;

$config = &singleton::get(__NAMESPACE__ . '\config');
$tables = &singleton::get(__NAMESPACE__ . '\tables');
$error = &singleton::get(__NAMESPACE__ . '\error');

$config->set('program_version', '4.1');
$config->set('database_version', 28);
}

}

?>
25 changes: 19 additions & 6 deletions system/js/password.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
$(document).ready(function () {

$(".show_password_history").click(function () {
$(".show_password_history").click(function (e) {
e.preventDefault();

var password_id = $(this).attr("id");
var password_exploded = password_id.split('-');
password_id = password_exploded[1];
Expand All @@ -20,7 +22,9 @@ $(document).ready(function () {

});

$(".show_password").click(function () {
$(".show_password").click(function (e) {
e.preventDefault();

var password_id = $(this).attr("id");
var password_exploded = password_id.split('-');
password_id = password_exploded[1];
Expand All @@ -40,7 +44,9 @@ $(document).ready(function () {

});

$(".show_share_password").click(function () {
$(".show_share_password").click(function (e) {
e.preventDefault();

var password_id = $(this).attr("id");
var password_exploded = password_id.split('-');
password_id = password_exploded[1];
Expand All @@ -60,7 +66,9 @@ $(document).ready(function () {

});

$(".show_global_password").click(function () {
$(".show_global_password").click(function (e) {
e.preventDefault();

var password_id = $(this).attr("id");
var password_exploded = password_id.split('-');
password_id = password_exploded[1];
Expand All @@ -84,6 +92,7 @@ $(document).ready(function () {
var box = $("<div>");

var input = $("<input>");
//input.addClass("form-control");
input.val(value);
input.appendTo(box);
input.prop("readonly", true);
Expand All @@ -93,7 +102,9 @@ $(document).ready(function () {
copy.addClass("copy_value");
copy.attr("alt", "Copy value");
copy.data("value", value);
copy.html("copy");
copy.html('<span class="glyphicon glyphicon-copy"></span>');

box.append("&nbsp;");
copy.appendTo(box);

return box;
Expand Down Expand Up @@ -186,6 +197,8 @@ $(document).ready(function () {
});

$('body').on('click', '.copy_value', function(e) {
e.preventDefault();

var temp = $("<input>");
$("body").append(temp);
temp.val($(this).prev("input").val());
Expand All @@ -212,7 +225,7 @@ $(document).ready(function () {
temp.remove();
});

$(".content-as-copy-box").each(function (e) {
$(".content-as-copy-box").each(function () {
$(this).replaceWith(generateCopyBox($(this).text()));
});

Expand Down
14 changes: 1 addition & 13 deletions user/themes/bootstrap3/core6/stylesheets/theme-custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,16 +431,4 @@ body {
border-bottom: none;
background-color: #85d0e7 !important; }
.navbar-collapse .navbar-nav.navbar-right {
padding-right: 0; } }

a.copy_value {
display: inline-block;
width: 16px;
height: 16px;
background-image: url("../../images/icons/clipboard.png");
margin-left: 5px;

text-indent: 100%;
white-space: nowrap;
overflow: hidden;
}
padding-right: 0; } }
8 changes: 7 additions & 1 deletion user/themes/bootstrap3/pages/passwords/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,13 @@
<td class="centre"><a href="<?php echo $config->get('address'); ?>/passwords/view/<?php echo (int) $password['id']; ?>/"><?php echo safe_output($password['name']); ?></a></td>
<td class="centre"><?php echo safe_output($password['category_name']); ?></td>
<td class="centre"><span class="content-as-copy-box"><?php echo safe_output($password['username']); ?></span></td>
<td class="centre" name="password<?php echo (int) $password['id']; ?>"><?php if ($show_all) { ?><span class="content-as-copy-box"><?php echo safe_output($encryption->decrypt($password['password'])); ?></span><?php } else { ?><a href="#password<?php echo (int) $password['id']; ?>" class="show_password" id="id-<?php echo (int) $password['id']; ?>"><?php echo $language->get('Show'); ?></a><?php } ?></td>
<td class="centre" name="password<?php echo (int) $password['id']; ?>">
<?php if ($show_all) { ?>
<span class="content-as-copy-box"><?php echo safe_output($encryption->decrypt($password['password'])); ?></span>
<?php } else { ?>
<a href="#password<?php echo (int) $password['id']; ?>" class="show_password" id="id-<?php echo (int) $password['id']; ?>"><?php echo $language->get('Show'); ?></a>
<?php } ?>
</td>
</tr>
<?php $i++; } ?>
</table>
Expand Down

0 comments on commit 34f2c6e

Please sign in to comment.