From 3dbcdc8bca09df73af202e37ccf3ca531017f088 Mon Sep 17 00:00:00 2001 From: pavel Date: Wed, 17 Dec 2014 14:51:42 +0000 Subject: [PATCH] expo-13 - ready --- .../client/includes/exposition/exposition_list.html | 3 ++- templates/client/static_client/css/main.css | 10 +++++++--- .../static_client/js/_modules/block.exposition.list.js | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index c6f3dc91..5ed3d042 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -69,7 +69,7 @@ {% include 'client/includes/exposition/services.html' with obj=obj %} {% include 'client/includes/calendar_button.html' with event=obj user=user %} -
+
{% with note=obj|note_by_user:request.user %} {% trans 'заметка' %}
@@ -118,6 +118,7 @@ EXPO.exposition.list.init({ note:{ wrapClass:'note-wrap', + wrapDisabledClass:'note-wrap-disabled', buttonClass:'note-button', inputClass:'note-text' } diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css index 1e11b2ee..a837f9b2 100644 --- a/templates/client/static_client/css/main.css +++ b/templates/client/static_client/css/main.css @@ -1463,10 +1463,11 @@ aside nav + hr { color: #87c525; } -.button.green:hover{ +.button.green:hover, .button.green.active{ border-color: #87c525; background: #87c525; color: #fff; + text-shadow: none; } .button.red { @@ -1615,7 +1616,7 @@ aside nav + hr { height: 14px; background-position: -74px 0; } -.button.icon-note:hover:before { +.button.icon-note:hover:before, .button.icon-note.active:before { background-position: -74px -16px; } @@ -12314,11 +12315,14 @@ hr + .rq-note { # edit note overlay on /expo/ page \******************************/ - .note-wrap{ + .note-wrap, .note-wrap-disabled{ display: inline-block; vertical-align: top; position: relative; } + .note-wrap-disabled .note-overlay{ + display: none; + } .note-wrap .note-overlay{ margin-top: 5px; padding: 10px 14px; diff --git a/templates/client/static_client/js/_modules/block.exposition.list.js b/templates/client/static_client/js/_modules/block.exposition.list.js index afc3bbf5..962a46bc 100644 --- a/templates/client/static_client/js/_modules/block.exposition.list.js +++ b/templates/client/static_client/js/_modules/block.exposition.list.js @@ -35,9 +35,11 @@ if (EXPO.exposition.list){ send: function () { var data = {}, response, + self = this, handler = function (data) { if (data.success){ console.log('ok'); + $(self.DOMbutton).addClass('active'); }else{ console.log('data not send'); } @@ -64,6 +66,10 @@ if (EXPO.exposition.list){ var note = new Note(this,self.opt.note); self.notes.push(note); }); + $('.'+this.opt.note.wrapDisabledClass).on('click', function () { + $.fancybox.open('#pw-login'); + return false; + }); }; return that;