expo-13 - ready

remotes/origin/1203
pavel 11 years ago
parent fb7159362f
commit 3dbcdc8bca
  1. 3
      templates/client/includes/exposition/exposition_list.html
  2. 10
      templates/client/static_client/css/main.css
  3. 6
      templates/client/static_client/js/_modules/block.exposition.list.js

@ -69,7 +69,7 @@
{% include 'client/includes/exposition/services.html' with obj=obj %} {% include 'client/includes/exposition/services.html' with obj=obj %}
{% include 'client/includes/calendar_button.html' with event=obj user=user %} {% include 'client/includes/calendar_button.html' with event=obj user=user %}
<div class="note-wrap"> <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
{% with note=obj|note_by_user:request.user %} {% with note=obj|note_by_user:request.user %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a> <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay"> <div class="note-overlay">
@ -118,6 +118,7 @@
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ note:{
wrapClass:'note-wrap', wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button', buttonClass:'note-button',
inputClass:'note-text' inputClass:'note-text'
} }

@ -1463,10 +1463,11 @@ aside nav + hr {
color: #87c525; color: #87c525;
} }
.button.green:hover{ .button.green:hover, .button.green.active{
border-color: #87c525; border-color: #87c525;
background: #87c525; background: #87c525;
color: #fff; color: #fff;
text-shadow: none;
} }
.button.red { .button.red {
@ -1615,7 +1616,7 @@ aside nav + hr {
height: 14px; height: 14px;
background-position: -74px 0; background-position: -74px 0;
} }
.button.icon-note:hover:before { .button.icon-note:hover:before, .button.icon-note.active:before {
background-position: -74px -16px; background-position: -74px -16px;
} }
@ -12314,11 +12315,14 @@ hr + .rq-note {
# edit note overlay on /expo/ page # edit note overlay on /expo/ page
\******************************/ \******************************/
.note-wrap{ .note-wrap, .note-wrap-disabled{
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
position: relative; position: relative;
} }
.note-wrap-disabled .note-overlay{
display: none;
}
.note-wrap .note-overlay{ .note-wrap .note-overlay{
margin-top: 5px; margin-top: 5px;
padding: 10px 14px; padding: 10px 14px;

@ -35,9 +35,11 @@ if (EXPO.exposition.list){
send: function () { send: function () {
var data = {}, var data = {},
response, response,
self = this,
handler = function (data) { handler = function (data) {
if (data.success){ if (data.success){
console.log('ok'); console.log('ok');
$(self.DOMbutton).addClass('active');
}else{ }else{
console.log('data not send'); console.log('data not send');
} }
@ -64,6 +66,10 @@ if (EXPO.exposition.list){
var note = new Note(this,self.opt.note); var note = new Note(this,self.opt.note);
self.notes.push(note); self.notes.push(note);
}); });
$('.'+this.opt.note.wrapDisabledClass).on('click', function () {
$.fancybox.open('#pw-login');
return false;
});
}; };
return that; return that;

Loading…
Cancel
Save