From e48bb249e845f4e692c8aa977dbf0c3c3325bdb9 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 4 Mar 2014 15:50:03 +0100 Subject: [PATCH] [UPDATE] hide lastlogin message without site reload --- public/include/pages/about/chat.inc.php | 0 public/include/pages/about/donors.inc.php | 0 public/include/pages/about/pool.inc.php | 0 public/include/pages/account/confirm.inc.php | 0 public/include/pages/account/edit.inc.php | 0 public/index.php | 4 +- .../site_assets/bootstrap/js/jquery.cookie.js | 163 ++++++++++-------- public/site_assets/bootstrap/js/mpos.js | 18 +- public/templates/bootstrap/master.tpl | 7 +- 9 files changed, 116 insertions(+), 76 deletions(-) mode change 100644 => 100755 public/include/pages/about/chat.inc.php mode change 100644 => 100755 public/include/pages/about/donors.inc.php mode change 100644 => 100755 public/include/pages/about/pool.inc.php mode change 100644 => 100755 public/include/pages/account/confirm.inc.php mode change 100644 => 100755 public/include/pages/account/edit.inc.php mode change 100644 => 100755 public/index.php mode change 100644 => 100755 public/site_assets/bootstrap/js/jquery.cookie.js mode change 100644 => 100755 public/site_assets/bootstrap/js/mpos.js mode change 100644 => 100755 public/templates/bootstrap/master.tpl diff --git a/public/include/pages/about/chat.inc.php b/public/include/pages/about/chat.inc.php old mode 100644 new mode 100755 diff --git a/public/include/pages/about/donors.inc.php b/public/include/pages/about/donors.inc.php old mode 100644 new mode 100755 diff --git a/public/include/pages/about/pool.inc.php b/public/include/pages/about/pool.inc.php old mode 100644 new mode 100755 diff --git a/public/include/pages/account/confirm.inc.php b/public/include/pages/account/confirm.inc.php old mode 100644 new mode 100755 diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php old mode 100644 new mode 100755 diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 index 7a04599d..1ec49fff --- a/public/index.php +++ b/public/index.php @@ -99,9 +99,9 @@ if (count(@$_SESSION['last_ip_pop']) == 2) { $ip = filter_var($data[0], FILTER_VALIDATE_IP); $time = date("l, F jS \a\\t g:i a", $data[1]); if (@$_SESSION['AUTHENTICATED'] && $_SESSION['last_ip_pop'][0] !== $user->getCurrentIP()) { - $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from $ip on $time", 'TYPE' => 'alert alert-warning alert-dismissable'); + $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from $ip on $time", 'DISMISS' => 'yes', 'ID' => 'lastlogin', 'TYPE' => 'alert alert-warning'); } else { - $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from $ip on $time", 'TYPE' => 'alert alert-info alert-dismissable'); + $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from $ip on $time", 'DISMISS' => 'yes', 'ID' => 'lastlogin', 'TYPE' => 'alert alert-info'); } } diff --git a/public/site_assets/bootstrap/js/jquery.cookie.js b/public/site_assets/bootstrap/js/jquery.cookie.js old mode 100644 new mode 100755 index a03edb8c..92719000 --- a/public/site_assets/bootstrap/js/jquery.cookie.js +++ b/public/site_assets/bootstrap/js/jquery.cookie.js @@ -1,94 +1,117 @@ /*! - * jQuery Cookie Plugin v1.3.1 + * jQuery Cookie Plugin v1.4.0 * https://github.com/carhartl/jquery-cookie * * Copyright 2013 Klaus Hartl * Released under the MIT license */ (function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as anonymous module. - define(['jquery'], factory); - } else { - // Browser globals. - factory(jQuery); - } + if (typeof define === 'function' && define.amd) { + // AMD. Register as anonymous module. + define(['jquery'], factory); + } else { + // Browser globals. + factory(jQuery); + } }(function ($) { - var pluses = /\+/g; + var pluses = /\+/g; - function raw(s) { - return s; - } + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } - function decoded(s) { - return decodeURIComponent(s.replace(pluses, ' ')); - } + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } - function converted(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - try { - return config.json ? JSON.parse(s) : s; - } catch(er) {} - } + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } - var config = $.cookie = function (key, value, options) { + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } - // write - if (value !== undefined) { - options = $.extend({}, config.defaults, options); + 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; + } - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } + try { + // If we can't parse the cookie, ignore it, it's unusable. + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } - value = config.json ? JSON.stringify(value) : String(value); + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } - return (document.cookie = [ - config.raw ? key : encodeURIComponent(key), - '=', - config.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } + var config = $.cookie = function (key, value, options) { - // read - var decode = config.raw ? raw : decoded; - var cookies = document.cookie.split('; '); - var result = key ? undefined : {}; - for (var i = 0, l = cookies.length; i < l; i++) { - var parts = cookies[i].split('='); - var name = decode(parts.shift()); - var cookie = decode(parts.join('=')); + // Write + if (value !== undefined && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); - if (key && key === name) { - result = converted(cookie); - break; - } + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } - if (!key) { - result[name] = converted(cookie); - } - } + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } - return result; - }; + // Read - config.defaults = {}; + var result = key ? undefined : {}; - $.removeCookie = function (key, options) { - if ($.cookie(key) !== undefined) { - $.cookie(key, '', $.extend(options, { expires: -1 })); - return true; - } - return false; - }; + // 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('; ') : []; -})); \ No newline at end of file + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) !== undefined) { + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return true; + } + return false; + }; + +})); diff --git a/public/site_assets/bootstrap/js/mpos.js b/public/site_assets/bootstrap/js/mpos.js old mode 100644 new mode 100755 index 3943e033..1232ec13 --- a/public/site_assets/bootstrap/js/mpos.js +++ b/public/site_assets/bootstrap/js/mpos.js @@ -1,7 +1,5 @@ $(function() { - $('#side-menu').metisMenu(); - }); //Loads the correct sidebar on window load, @@ -24,5 +22,21 @@ $(document).ready(function() { // Bootstrap iOS style switches for checkboxes with switch class $('.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: '/' }); + }); + +}); \ No newline at end of file diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl old mode 100644 new mode 100755 index 6ba43f84..0f663317 --- a/public/templates/bootstrap/master.tpl +++ b/public/templates/bootstrap/master.tpl @@ -24,6 +24,7 @@ + @@ -43,8 +44,10 @@ {nocache} {if is_array($smarty.session.POPUP|default)} {section popup $smarty.session.POPUP} -
- +
+ {if $smarty.session.POPUP[popup].DISMISS|default:"no" == "yes"} + + {/if} {$smarty.session.POPUP[popup].CONTENT nofilter}
{/section}