Skip to content

Commit

Permalink
Merge pull request #299 from laf/issue-laf-43
Browse files Browse the repository at this point in the history
Added a new library to support on screen notification messages
  • Loading branch information
paulgear committed Oct 7, 2014
2 parents d665a10 + 8851fe4 commit 3d0c11b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Expand Up @@ -5,4 +5,4 @@ imports:

# please keep the excluded paths list sorted
filter:
excluded_paths: [ html/includes/geshi/*, html/includes/jpgraph/*, html/js/bootstrap*, html/js/jqplot/*, html/js/jquery.cycle*, html/js/jquery-ui-timepicker-addon.js, html/js/sorttable.js, html/js/tw-sack.js, includes/phpmailer/*, html/css/bootstrap*, html/includes/Slim/* ]
excluded_paths: [ html/includes/geshi/*, html/includes/jpgraph/*, html/js/bootstrap*, html/js/jqplot/*, html/js/jquery.cycle*, html/js/jquery-ui-timepicker-addon.js, html/js/sorttable.js, html/js/tw-sack.js, includes/phpmailer/*, html/css/bootstrap*, html/includes/Slim/*, html/css/toastr*, html/js/toastr* ]
1 change: 1 addition & 0 deletions html/css/toastr.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions html/index.php
Expand Up @@ -130,6 +130,7 @@
<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="css/typeahead.js-bootstrap.css" rel="stylesheet" type="text/css" />
<link href="css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
<link href="css/toastr.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo($config['stylesheet']); ?>" rel="stylesheet" type="text/css" />
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
Expand All @@ -153,6 +154,7 @@ function popUp(URL)
// End -->
</script>
<script type="text/javascript" src="js/overlib_mini.js"></script>
<script type="text/javascript" src="js/toastr.min.js"></script>
</head>
<body>

Expand Down Expand Up @@ -297,5 +299,19 @@ function popUp(URL)
</div>
</div>
</footer>
<?php

if(is_array($msg_box)) {
echo("<script>
toastr.options.timeout = 10;
toastr.options.extendedTimeOut = 20;
");
foreach ($msg_box as $message) {
echo "toastr.".$message['type']."('".$message['message']."','".$message['title']."');\n";
}
echo("</script>");
}

?>
</body>
</html>
1 change: 1 addition & 0 deletions html/js/toastr.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3d0c11b

Please sign in to comment.