[UPDATE] hide lastlogin message without site reload

This commit is contained in:
iAmShorty 2014-03-04 15:50:03 +01:00
parent 35bef0f00a
commit e48bb249e8
9 changed files with 116 additions and 76 deletions

0
public/include/pages/about/chat.inc.php Normal file → Executable file
View File

0
public/include/pages/about/donors.inc.php Normal file → Executable file
View File

0
public/include/pages/about/pool.inc.php Normal file → Executable file
View File

0
public/include/pages/account/confirm.inc.php Normal file → Executable file
View File

0
public/include/pages/account/edit.inc.php Normal file → Executable file
View File

4
public/index.php Normal file → Executable file
View File

@ -99,9 +99,9 @@ if (count(@$_SESSION['last_ip_pop']) == 2) {
$ip = filter_var($data[0], FILTER_VALIDATE_IP); $ip = filter_var($data[0], FILTER_VALIDATE_IP);
$time = date("l, F jS \a\\t g:i a", $data[1]); $time = date("l, F jS \a\\t g:i a", $data[1]);
if (@$_SESSION['AUTHENTICATED'] && $_SESSION['last_ip_pop'][0] !== $user->getCurrentIP()) { if (@$_SESSION['AUTHENTICATED'] && $_SESSION['last_ip_pop'][0] !== $user->getCurrentIP()) {
$_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'TYPE' => 'alert alert-warning alert-dismissable'); $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'DISMISS' => 'yes', 'ID' => 'lastlogin', 'TYPE' => 'alert alert-warning');
} else { } else {
$_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'TYPE' => 'alert alert-info alert-dismissable'); $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'DISMISS' => 'yes', 'ID' => 'lastlogin', 'TYPE' => 'alert alert-info');
} }
} }

69
public/site_assets/bootstrap/js/jquery.cookie.js Normal file → Executable file
View File

@ -1,5 +1,5 @@
/*! /*!
* jQuery Cookie Plugin v1.3.1 * jQuery Cookie Plugin v1.4.0
* https://github.com/carhartl/jquery-cookie * https://github.com/carhartl/jquery-cookie
* *
* Copyright 2013 Klaus Hartl * Copyright 2013 Klaus Hartl
@ -17,28 +17,47 @@
var pluses = /\+/g; var pluses = /\+/g;
function raw(s) { function encode(s) {
return s; return config.raw ? s : encodeURIComponent(s);
} }
function decoded(s) { function decode(s) {
return decodeURIComponent(s.replace(pluses, ' ')); return config.raw ? s : decodeURIComponent(s);
} }
function converted(s) { function stringifyCookieValue(value) {
return encode(config.json ? JSON.stringify(value) : String(value));
}
function parseCookieValue(s) {
if (s.indexOf('"') === 0) { if (s.indexOf('"') === 0) {
// This is a quoted cookie as according to RFC2068, unescape // This is a quoted cookie as according to RFC2068, unescape...
s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
} }
try { try {
// Replace server-side written pluses with spaces.
// If we can't decode the cookie, ignore it, it's unusable.
s = decodeURIComponent(s.replace(pluses, ' '));
} catch(e) {
return;
}
try {
// If we can't parse the cookie, ignore it, it's unusable.
return config.json ? JSON.parse(s) : s; return config.json ? JSON.parse(s) : s;
} catch(er) {} } catch(e) {}
}
function read(s, converter) {
var value = config.raw ? s : parseCookieValue(s);
return $.isFunction(converter) ? converter(value) : value;
} }
var config = $.cookie = function (key, value, options) { var config = $.cookie = function (key, value, options) {
// write // Write
if (value !== undefined) { if (value !== undefined && !$.isFunction(value)) {
options = $.extend({}, config.defaults, options); options = $.extend({}, config.defaults, options);
if (typeof options.expires === 'number') { if (typeof options.expires === 'number') {
@ -46,12 +65,8 @@
t.setDate(t.getDate() + days); t.setDate(t.getDate() + days);
} }
value = config.json ? JSON.stringify(value) : String(value);
return (document.cookie = [ return (document.cookie = [
config.raw ? key : encodeURIComponent(key), encode(key), '=', stringifyCookieValue(value),
'=',
config.raw ? value : encodeURIComponent(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '', options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '', options.domain ? '; domain=' + options.domain : '',
@ -59,22 +74,29 @@
].join('')); ].join(''));
} }
// read // Read
var decode = config.raw ? raw : decoded;
var cookies = document.cookie.split('; ');
var result = key ? undefined : {}; var result = key ? undefined : {};
// To prevent the for loop in the first place assign an empty array
// in case there are no cookies at all. Also prevents odd result when
// calling $.cookie().
var cookies = document.cookie ? document.cookie.split('; ') : [];
for (var i = 0, l = cookies.length; i < l; i++) { for (var i = 0, l = cookies.length; i < l; i++) {
var parts = cookies[i].split('='); var parts = cookies[i].split('=');
var name = decode(parts.shift()); var name = decode(parts.shift());
var cookie = decode(parts.join('=')); var cookie = parts.join('=');
if (key && key === name) { if (key && key === name) {
result = converted(cookie); // If second argument (value) is a function it's a converter...
result = read(cookie, value);
break; break;
} }
if (!key) { // Prevent storing a cookie that we couldn't decode.
result[name] = converted(cookie); if (!key && (cookie = read(cookie)) !== undefined) {
result[name] = cookie;
} }
} }
@ -85,7 +107,8 @@
$.removeCookie = function (key, options) { $.removeCookie = function (key, options) {
if ($.cookie(key) !== undefined) { if ($.cookie(key) !== undefined) {
$.cookie(key, '', $.extend(options, { expires: -1 })); // Must not alter options, thus extending a fresh object...
$.cookie(key, '', $.extend({}, options, { expires: -1 }));
return true; return true;
} }
return false; return false;

18
public/site_assets/bootstrap/js/mpos.js Normal file → Executable file
View File

@ -1,7 +1,5 @@
$(function() { $(function() {
$('#side-menu').metisMenu(); $('#side-menu').metisMenu();
}); });
//Loads the correct sidebar on window load, //Loads the correct sidebar on window load,
@ -24,5 +22,21 @@ $(document).ready(function() {
// Bootstrap iOS style switches for checkboxes with switch class // Bootstrap iOS style switches for checkboxes with switch class
$('.switch').bootstrapSwitch(); $('.switch').bootstrapSwitch();
}); });
$(function() {
// Check if lastlogin alert has been closed
if( $.cookie('lastlogin-box') === 'closed' ){
$('#lastlogin').hide();
}
// Grab your button (based on your posted html)
$('.close').click(function( e ){
e.preventDefault();
//alert($(this).attr("id"));
$.cookie('lastlogin-box', 'closed', { path: '/' });
});
});

7
public/templates/bootstrap/master.tpl Normal file → Executable file
View File

@ -24,6 +24,7 @@
<link href="{$PATH}/css/sparklines.css" rel="stylesheet"> <link href="{$PATH}/css/sparklines.css" rel="stylesheet">
<script src="{$PATH}/js/jquery-2.0.3.min.js"></script> <script src="{$PATH}/js/jquery-2.0.3.min.js"></script>
<script src="{$PATH}/js/jquery.cookie.js"></script>
<script src="{$PATH}/js/bootstrap.min.js"></script> <script src="{$PATH}/js/bootstrap.min.js"></script>
<script src="{$PATH}/js/bootstrap-switch.min.js"></script> <script src="{$PATH}/js/bootstrap-switch.min.js"></script>
<script src="{$PATH}/js/plugins/dataTables/jquery.dataTables.js"></script> <script src="{$PATH}/js/plugins/dataTables/jquery.dataTables.js"></script>
@ -43,8 +44,10 @@
{nocache} {nocache}
{if is_array($smarty.session.POPUP|default)} {if is_array($smarty.session.POPUP|default)}
{section popup $smarty.session.POPUP} {section popup $smarty.session.POPUP}
<div class="{$smarty.session.POPUP[popup].TYPE|default:"alert alert-info alert-dismissable"}"> <div class="{if $smarty.session.POPUP[popup].DISMISS|default:"" == "yes"}alert-dismissable{/if} {$smarty.session.POPUP[popup].TYPE|default:"alert alert-info"}" id="{$smarty.session.POPUP[popup].ID|default:"static"}">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button> {if $smarty.session.POPUP[popup].DISMISS|default:"no" == "yes"}
<button id="{$smarty.session.POPUP[popup].ID|default:"static"}" type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{/if}
{$smarty.session.POPUP[popup].CONTENT nofilter} {$smarty.session.POPUP[popup].CONTENT nofilter}
</div> </div>
{/section} {/section}