close message

project/customer/context_processors.py

@@ -6,20 +6,23 @@ from .models import License
 
 def license_check_soon_ends(request):
     try:
-        now = datetime.today()
-        license_15days = cache.get('license_15_%s' % (request.user.username,), None)
-        if license_15days is None:
-            licenses_ends = License.objects.filter(company=request.user.profile, date_to__lte=now + timedelta(15), status__in=[-1, 1, 2], deleted=False)
-            next_licenses = License.objects.filter(company=request.user.profile, status=1, deleted=False)
-            if licenses_ends and not next_licenses:
-                days_to_end = licenses_ends[0].date_to
-                cache.set('license_15_%s' % (request.user.username,), days_to_end, 3600)
-                license_15days = days_to_end
-            else:
-                license_15days = ''
+        license_cookie = request.COOKIES.get('close_message_license')
+        if not license_cookie:
+            now = datetime.today()
+            license_15days = cache.get('license_15_%s' % (request.user.username,), None)
+            if license_15days is None:
+                licenses_ends = License.objects.filter(company=request.user.profile, date_to__lte=now + timedelta(15), status__in=[-1, 1, 2], deleted=False)
+                next_licenses = License.objects.filter(company=request.user.profile, status=1, deleted=False)
+                if licenses_ends and not next_licenses:
+                    days_to_end = licenses_ends[0].date_to
+                    cache.set('license_15_%s' % (request.user.username,), days_to_end, 3600)
+                    license_15days = days_to_end
+                else:
+                    license_15days = ''
 
-        return {
-                'license_15days': license_15days
-        }
+            return {
+                    'license_15days': license_15days
+            }
+        return { }
     except:
         return { }

project/myauth/views.py

@@ -248,4 +248,6 @@ def logout(request):
     except:
         pass
     django_logout(request)
-    return redirect('/')
+    response = redirect('/')
+    response.delete_cookie('close_message_license')
+    return response

project/static/css/style.css

@@ -224,3 +224,4 @@ tr.doc-row:hover {cursor:pointer;}
 #clients tr:nth-child(odd) {background: #f5f5f5;}
 
 #req-avail-form {display:none;} 
+.close-message {display:inline-block;float:right;}

project/static/js/commons.js

@@ -1,5 +1,11 @@
 $(document).ready(function() {
     $('.has-datepicker').datepicker({dateFormat: 'dd.mm.yy'});
+    $('.close-message').click(function(e){ 
+        e.preventDefault();
+        $(this).closest('li').hide();
+        var close_action = $(this).data('close');
+        $.cookie(close_action, true, {path: '/'});
+    });
 
     $('.captcha_refresh').click(function(e) {
         e.preventDefault();

project/static/js/lib/jquery.cookie.js

@@ -0,0 +1,117 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2006, 2014 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		// CommonJS
+		factory(require('jquery'));
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
+
+	var pluses = /\+/g;
+
+	function encode(s) {
+		return config.raw ? s : encodeURIComponent(s);
+	}
+
+	function decode(s) {
+		return config.raw ? s : decodeURIComponent(s);
+	}
+
+	function stringifyCookieValue(value) {
+		return encode(config.json ? JSON.stringify(value) : String(value));
+	}
+
+	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, '\\');
+		}
+
+		try {
+			// Replace server-side written pluses with spaces.
+			// If we can't decode the cookie, ignore it, it's unusable.
+			// If we can't parse the cookie, ignore it, it's unusable.
+			s = decodeURIComponent(s.replace(pluses, ' '));
+			return config.json ? JSON.parse(s) : s;
+		} 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) {
+
+		// Write
+
+		if (arguments.length > 1 && !$.isFunction(value)) {
+			options = $.extend({}, config.defaults, options);
+
+			if (typeof options.expires === 'number') {
+				var days = options.expires, t = options.expires = new Date();
+				t.setTime(+t + days * 864e+5);
+			}
+
+			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(''));
+		}
+
+		// Read
+
+		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++) {
+			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) {
+			return false;
+		}
+
+		// Must not alter options, thus extending a fresh object...
+		$.cookie(key, '', $.extend({}, options, { expires: -1 }));
+		return !$.cookie(key);
+	};
+
+}));

project/templates/base.html

@@ -16,10 +16,10 @@
     <div id="content" class="clear">
         <ul class="messagelist">
             {% for message in messages %}
-                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}<a href='#' class='close-message'>Закрыть</a></li>
             {% endfor %}
             {% if license_15days %}
-                <li class="error">{{ license_15days }} заканчивается срок действия лицензии.</li>
+                <li class="error">{{ license_15days }} заканчивается срок действия лицензии.<a href='#' class='close-message' data-close='close_message_license'>Закрыть</a></li>
             {% endif %}
         </ul>
     </div>
@@ -81,6 +81,7 @@
     <script src="{{ STATIC_URL }}js/lib/jquery.formset.js"></script>
     <script src="{{ STATIC_URL }}js/lib/jquery.blockUI.js"></script>
     <script src="{{ STATIC_URL }}js/lib/entertotab.js"></script>
+    <script src="{{ STATIC_URL }}js/lib/jquery.cookie.js"></script>
 
     <script src="{{ STATIC_URL }}js/csrf.js"></script>