diff --git a/catalog/templates/discover.html b/catalog/templates/discover.html
index 144df49f..1468e3f2 100644
--- a/catalog/templates/discover.html
+++ b/catalog/templates/discover.html
@@ -116,7 +116,7 @@
{% include "partial/_footer.html" %}
- {% if unread_announcements %}
+ {% if request.user.unread_announcements %}
{% include "partial/_announcement.html" %}
{% endif %}
diff --git a/catalog/views.py b/catalog/views.py
index ba3edc5b..cec71849 100644
--- a/catalog/views.py
+++ b/catalog/views.py
@@ -306,19 +306,9 @@ def discover(request):
if user.is_authenticated:
layout = user.get_preference().discover_layout
top_tags = user.tag_manager.all_tags[:10]
- unread_announcements = Announcement.objects.filter(
- pk__gt=request.user.read_announcement_index
- ).order_by("-pk")
- try:
- user.read_announcement_index = Announcement.objects.latest("pk").pk
- user.save(update_fields=["read_announcement_index"])
- except ObjectDoesNotExist:
- # when there is no annoucenment
- pass
else:
layout = []
top_tags = []
- unread_announcements = []
cache_key = "public_gallery_list"
gallery_list = cache.get(cache_key, [])
@@ -374,6 +364,5 @@ def discover(request):
"top_tags": top_tags,
"gallery_list": gallery_list,
"layout": layout,
- "unread_announcements": unread_announcements,
},
)
diff --git a/common/static/lib/css/calendar_yearview_blocks.css b/common/static/lib/css/calendar_yearview_blocks.css
new file mode 100644
index 00000000..d5785d0e
--- /dev/null
+++ b/common/static/lib/css/calendar_yearview_blocks.css
@@ -0,0 +1,31 @@
+.svg-tip {
+ padding: 10px;
+ background: #191919;
+ opacity: 0.8;
+ color: #eee;
+ font-size: 12px;
+ position: absolute;
+ z-index: 99999;
+ text-align: center;
+ border-radius: 3px;
+}
+
+.svg-tip:after {
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ position: absolute;
+ left: 50%;
+ height: 5px;
+ width: 5px;
+ bottom: -10px;
+ margin: 0 0 0 -5px;
+ content: " ";
+ border: 5px solid transparent;
+ border-top-color: rgba(0,0,0,0.8);
+}
+
+.wday, .month {
+ font-variant: small-caps;
+ color: #222222;
+ font-size: 12px;
+}
diff --git a/common/static/lib/js/calendar_yearview_blocks.js b/common/static/lib/js/calendar_yearview_blocks.js
new file mode 100644
index 00000000..7c9934ec
--- /dev/null
+++ b/common/static/lib/js/calendar_yearview_blocks.js
@@ -0,0 +1,246 @@
+(function ($) {
+
+ $.fn.calendar_yearview_blocks = function (options) {
+
+ // Format string
+ if (!String.prototype.formatString) {
+ String.prototype.formatString = function () {
+ var args = arguments;
+ return this.replace(/{(\d+)}/g, function (match, number) {
+ return typeof args[number] !== 'undefined'
+ ? args[number]
+ : match
+ ;
+ });
+ };
+ }
+
+ // If the number less than 10, add a zero before it
+ var prettyNumber = function (number) {
+ return number < 10 ? '0' + number.toString() : number = number.toString();
+ };
+
+ var getDisplayDate = function (date_obj) {
+ var pretty_month = prettyNumber(date_obj.getMonth() + 1);
+ var pretty_date = prettyNumber(date_obj.getDate());
+ return "{0}-{1}-{2}".formatString(date_obj.getFullYear(), pretty_month, pretty_date);
+ };
+
+ var start = function () {
+ obj_timestamp = JSON.parse(settings.data);
+
+ var wrap_chart = _this;
+
+ var end_date = new Date(settings.final_date);
+ end_date.setDate(end_date.getDate()+1);
+ var current_date = new Date();
+ var start_date = new Date();
+ start_date.setMonth(end_date.getMonth() - 12);
+
+ var start_weekday = settings.start_monday === true?1:0;
+ for (var i = 0; i < 7; i++) {
+ var day = start_date.getDay();
+ if (day === start_weekday) {
+ break;
+ }
+ else {
+ // Loop until start_weekday
+ start_date.setDate(start_date.getDate() + 1);
+ }
+ }
+ var loop_html = "";
+
+ // One year has 52 weeks
+ var step = 13; // Amount of pixels to move
+
+ var month_position = [];
+ month_position.push({month_index: start_date.getMonth(), x: 0});
+ var using_month = start_date.getMonth();
+ for (var i = 0; i <= 52; i++) { // For each week, generate a column
+ var g_x = i * step;
+ var item_html = '