diff --git a/core/models.py b/core/models.py index 8a12de89..9023b702 100755 --- a/core/models.py +++ b/core/models.py @@ -48,8 +48,8 @@ class CeleryTask(models.Model): class Claim(models.Model): STATUSES = (( - u'active', u'Claim has been registered and approved.'), - (u'pending', u'Claim is pending approval.'), + u'active', u'Claim has been accepted.'), + (u'pending', u'Claim is pending acceptance.'), (u'release', u'Claim has not been accepted.'), ) created = models.DateTimeField(auto_now_add=True) diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 9522a78a..90246817 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -132,7 +132,7 @@ {% else %}{% ifequal status "INITIALIZED" %} Status: Coming soon! {% else %} - Status:  + Status: {{ status }} {% endifequal %}{% endifequal %}
diff --git a/frontend/templates/campaign_detail.html b/frontend/templates/campaign_detail.html index 7ec71583..64f14501 100644 --- a/frontend/templates/campaign_detail.html +++ b/frontend/templates/campaign_detail.html @@ -36,7 +36,7 @@
{% csrf_token %} {{form.as_p}} - +
diff --git a/frontend/templates/goodreads_display.html b/frontend/templates/goodreads_display.html index 2af19aee..2216b9fb 100644 --- a/frontend/templates/goodreads_display.html +++ b/frontend/templates/goodreads_display.html @@ -101,7 +101,7 @@

Here are some of your books that you've put on your Goodreads shelves:

{% endif %} diff --git a/frontend/templates/librarything.html b/frontend/templates/librarything.html index b4c77602..5e9cbdab 100644 --- a/frontend/templates/librarything.html +++ b/frontend/templates/librarything.html @@ -13,7 +13,7 @@ {% if books %} {% endif %} diff --git a/frontend/templates/notification/active_campaign/notice.html b/frontend/templates/notification/active_campaign/notice.html index 93aece3e..87f2962b 100644 --- a/frontend/templates/notification/active_campaign/notice.html +++ b/frontend/templates/notification/active_campaign/notice.html @@ -1,7 +1,7 @@ {% with campaign.work.id as id %}
- cover image for {{ campaign.work.title }} + cover image for {{ campaign.work.title }}
diff --git a/frontend/templates/notification/coment_on_commented/notice.html b/frontend/templates/notification/coment_on_commented/notice.html index 8a0c71bd..aa167eb0 100644 --- a/frontend/templates/notification/coment_on_commented/notice.html +++ b/frontend/templates/notification/coment_on_commented/notice.html @@ -3,7 +3,7 @@
- cover image for {{ comment.content_object.title }} + cover image for {{ comment.content_object.title }}
diff --git a/frontend/templates/notification/wishlist_comment/notice.html b/frontend/templates/notification/wishlist_comment/notice.html index 8a0c71bd..aa167eb0 100644 --- a/frontend/templates/notification/wishlist_comment/notice.html +++ b/frontend/templates/notification/wishlist_comment/notice.html @@ -3,7 +3,7 @@
- cover image for {{ comment.content_object.title }} + cover image for {{ comment.content_object.title }}
diff --git a/frontend/templates/pledge.html b/frontend/templates/pledge.html index a883b480..eaaacbe0 100644 --- a/frontend/templates/pledge.html +++ b/frontend/templates/pledge.html @@ -73,7 +73,7 @@ {% endfor %} - +
diff --git a/frontend/templates/pledge_modify.html b/frontend/templates/pledge_modify.html index 9729fef2..dca76ce3 100644 --- a/frontend/templates/pledge_modify.html +++ b/frontend/templates/pledge_modify.html @@ -90,7 +90,7 @@ {% endfor %} - +
diff --git a/frontend/templates/registration/password_reset_form.html b/frontend/templates/registration/password_reset_form.html index 4677cfa0..68fc4199 100644 --- a/frontend/templates/registration/password_reset_form.html +++ b/frontend/templates/registration/password_reset_form.html @@ -8,7 +8,7 @@ instructions for creating your new password.

{% csrf_token %}

- +

diff --git a/frontend/templates/work.html b/frontend/templates/work.html index ed515978..aa09c064 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -101,9 +101,9 @@ $j(document).ready(function(){
{% if status == 'ACTIVE' %} {% if pledged %} -
+
{% else %} -
+
{% endif %} {% endif %}
@@ -246,13 +246,13 @@ $j(document).ready(function(){

Rights Information

{% if claimstatus == 'one_active' %} -

This work has been claimed by {{ rights_holder_name }}. The claim has been registered and approved by Unglue.It staff.

+

This work has been claimed by {{ rights_holder_name }}.

{% else %} {% if claimstatus == 'disputed' %}

Rights claims are pending.

{% else %} {% if claimstatus == 'one_pending' %} -

This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.

+

A claim for this work by {{ rights_holder_name }} is pending.

{% else %} {% if request.user.rights_holder.all.count %} Is this work yours? Claim it:

diff --git a/static/js/slides.min.jquery.js b/static/js/slides.min.jquery.js index 7c0a768b..cf6111d9 100755 --- a/static/js/slides.min.jquery.js +++ b/static/js/slides.min.jquery.js @@ -17,4 +17,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -(function($){$.fn.slides=function(g){g=$.extend({},$.fn.slides.option,g);return this.each(function(){$('.'+g.container,$(this)).children().wrapAll('
');var d=$(this),control=$('.slides_control',d),total=control.children().size(),width=control.children().outerWidth(),height=control.children().outerHeight(),start=g.start-1,effect=g.effect.indexOf(',')<0?g.effect:g.effect.replace(' ','').split(',')[0],paginationEffect=g.effect.indexOf(',')<0?effect:g.effect.replace(' ','').split(',')[1],next=0,prev=0,number=0,current=0,loaded,active,clicked,position,direction,imageParent,pauseTimeout,playInterval;function animate(a,b,c){if(!active&&loaded){active=true;g.animationStart(current+1);switch(a){case'next':prev=current;next=current+1;next=total===next?0:next;position=width*2;a=-width*2;current=next;break;case'prev':prev=current;next=current-1;next=next===-1?total-1:next;position=0;a=0;current=next;break;case'pagination':next=parseInt(c,10);prev=$('.'+g.paginationClass+' li.'+g.currentClass+' a',d).attr('href').match('[^#/]+$');if(next>prev){position=width*2;a=-width*2}else{position=0;a=0}current=next;break}if(b==='fade'){if(g.crossfade){control.children(':eq('+next+')',d).css({zIndex:10}).fadeIn(g.fadeSpeed,g.fadeEasing,function(){if(g.autoHeight){control.animate({height:control.children(':eq('+next+')',d).outerHeight()},g.autoHeightSpeed,function(){control.children(':eq('+prev+')',d).css({display:'none',zIndex:0});control.children(':eq('+next+')',d).css({zIndex:0});g.animationComplete(next+1);active=false})}else{control.children(':eq('+prev+')',d).css({display:'none',zIndex:0});control.children(':eq('+next+')',d).css({zIndex:0});g.animationComplete(next+1);active=false}})}else{control.children(':eq('+prev+')',d).fadeOut(g.fadeSpeed,g.fadeEasing,function(){if(g.autoHeight){control.animate({height:control.children(':eq('+next+')',d).outerHeight()},g.autoHeightSpeed,function(){control.children(':eq('+next+')',d).fadeIn(g.fadeSpeed,g.fadeEasing)})}else{control.children(':eq('+next+')',d).fadeIn(g.fadeSpeed,g.fadeEasing,function(){if($.browser.msie){$(this).get(0).style.removeAttribute('filter')}})}g.animationComplete(next+1);active=false})}}else{control.children(':eq('+next+')').css({left:position,display:'block'});if(g.autoHeight){control.animate({left:a,height:control.children(':eq('+next+')').outerHeight()},g.slideSpeed,g.slideEasing,function(){control.css({left:-width});control.children(':eq('+next+')').css({left:width,zIndex:5});control.children(':eq('+prev+')').css({left:width,display:'none',zIndex:0});g.animationComplete(next+1);active=false})}else{control.animate({left:a},g.slideSpeed,g.slideEasing,function(){control.css({left:-width});control.children(':eq('+next+')').css({left:width,zIndex:5});control.children(':eq('+prev+')').css({left:width,display:'none',zIndex:0});g.animationComplete(next+1);active=false})}}if(g.pagination){$('.'+g.paginationClass+' li.'+g.currentClass,d).removeClass(g.currentClass);$('.'+g.paginationClass+' li:eq('+next+')',d).addClass(g.currentClass)}}}function stop(){clearInterval(d.data('interval'))}function pause(){if(g.pause){clearTimeout(d.data('pause'));clearInterval(d.data('interval'));pauseTimeout=setTimeout(function(){clearTimeout(d.data('pause'));playInterval=setInterval(function(){animate("next",effect)},g.play);d.data('interval',playInterval)},g.pause);d.data('pause',pauseTimeout)}else{stop()}}if(total<2){return}if(start<0){start=0}if(start>total){start=total-1}if(g.start){current=start}if(g.randomize){control.randomize()}$('.'+g.container,d).css({overflow:'hidden',position:'relative'});control.children().css({position:'absolute',top:0,left:control.children().outerWidth(),zIndex:0,display:'none'});control.css({position:'relative',width:(width*3),height:height,left:-width});$('.'+g.container,d).css({display:'block'});if(g.autoHeight){control.children().css({height:'auto'});control.animate({height:control.children(':eq('+start+')').outerHeight()},g.autoHeightSpeed)}if(g.preload&&control.find('img').length){$('.'+g.container,d).css({background:'url('+g.preloadImage+') no-repeat 50% 50%'});var f=control.find('img:eq('+start+')').attr('src')+'?'+(new Date()).getTime();if($('img',d).parent().attr('class')!='slides_control'){imageParent=control.children(':eq(0)')[0].tagName.toLowerCase()}else{imageParent=control.find('img:eq('+start+')')}control.find('img:eq('+start+')').attr('src',f).load(function(){control.find(imageParent+':eq('+start+')').fadeIn(g.fadeSpeed,g.fadeEasing,function(){$(this).css({zIndex:5});$('.'+g.container,d).css({background:''});loaded=true;g.slidesLoaded()})})}else{control.children(':eq('+start+')').fadeIn(g.fadeSpeed,g.fadeEasing,function(){loaded=true;g.slidesLoaded()})}if(g.bigTarget){control.children().css({cursor:'pointer'});control.children().click(function(){animate('next',effect);return false})}if(g.hoverPause&&g.play){control.bind('mouseover',function(){stop()});control.bind('mouseleave',function(){pause()})}if(g.generateNextPrev){$('.'+g.container,d).after('Prev');$('.'+g.prev,d).after('Next')}$('.'+g.next,d).click(function(e){e.preventDefault();if(g.play){pause()}animate('next',effect)});$('.'+g.prev,d).click(function(e){e.preventDefault();if(g.play){pause()}animate('prev',effect)});if(g.generatePagination){if(g.prependPagination){d.prepend('
    ')}else{d.append('
      ')}control.children().each(function(){$('.'+g.paginationClass,d).append('
    • '+(number+1)+'
      • ');number++})}else{$('.'+g.paginationClass+' li a',d).each(function(){$(this).attr('href','#'+number);number++})}$('.'+g.paginationClass+' li:eq('+start+')',d).addClass(g.currentClass);$('.'+g.paginationClass+' li a',d).click(function(){if(g.play){pause()}clicked=$(this).attr('href').match('[^#/]+$');if(current!=clicked){animate('pagination',paginationEffect,clicked)}return false});$('a.link',d).click(function(){if(g.play){pause()}clicked=$(this).attr('href').match('[^#/]+$')-1;if(current!=clicked){animate('pagination',paginationEffect,clicked)}return false});if(g.play){playInterval=setInterval(function(){animate('next',effect)},g.play);d.data('interval',playInterval)}})};$.fn.slides.option={preload:false,preloadImage:'/img/loading.gif',container:'slides_container',generateNextPrev:false,next:'next',prev:'prev',pagination:true,generatePagination:true,prependPagination:false,paginationClass:'pagination',currentClass:'current',fadeSpeed:350,fadeEasing:'',slideSpeed:350,slideEasing:'',start:1,effect:'slide',crossfade:false,randomize:false,play:0,pause:0,hoverPause:false,autoHeight:false,autoHeightSpeed:350,bigTarget:false,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}};$.fn.randomize=function(c){function randomizeOrder(){return(Math.round(Math.random())-0.5)}return($(this).each(function(){var $this=$(this);var $children=$this.children();var a=$children.length;if(a>1){$children.hide();var b=[];for(i=0;i');var d=$(this),control=$('.slides_control',d),total=control.children().size(),width=control.children().outerWidth(),height=control.children().outerHeight(),start=g.start-1,effect=g.effect.indexOf(',')<0?g.effect:g.effect.replace(' ','').split(',')[0],paginationEffect=g.effect.indexOf(',')<0?effect:g.effect.replace(' ','').split(',')[1],next=0,prev=0,number=0,current=0,loaded,active,clicked,position,direction,imageParent,pauseTimeout,playInterval;function animate(a,b,c){if(!active&&loaded){active=true;g.animationStart(current+1);switch(a){case'next':prev=current;next=current+1;next=total===next?0:next;position=width*2;a=-width*2;current=next;break;case'prev':prev=current;next=current-1;next=next===-1?total-1:next;position=0;a=0;current=next;break;case'pagination':next=parseInt(c,10);prev=$('.'+g.paginationClass+' li.'+g.currentClass+' a',d).attr('href').match('[^#/]+$');if(next>prev){position=width*2;a=-width*2}else{position=0;a=0}current=next;break}if(b==='fade'){if(g.crossfade){control.children(':eq('+next+')',d).css({zIndex:10}).fadeIn(g.fadeSpeed,g.fadeEasing,function(){if(g.autoHeight){control.animate({height:control.children(':eq('+next+')',d).outerHeight()},g.autoHeightSpeed,function(){control.children(':eq('+prev+')',d).css({display:'none',zIndex:0});control.children(':eq('+next+')',d).css({zIndex:0});g.animationComplete(next+1);active=false})}else{control.children(':eq('+prev+')',d).css({display:'none',zIndex:0});control.children(':eq('+next+')',d).css({zIndex:0});g.animationComplete(next+1);active=false}})}else{control.children(':eq('+prev+')',d).fadeOut(g.fadeSpeed,g.fadeEasing,function(){if(g.autoHeight){control.animate({height:control.children(':eq('+next+')',d).outerHeight()},g.autoHeightSpeed,function(){control.children(':eq('+next+')',d).fadeIn(g.fadeSpeed,g.fadeEasing)})}else{control.children(':eq('+next+')',d).fadeIn(g.fadeSpeed,g.fadeEasing,function(){if($.browser.msie){$(this).get(0).style.removeAttribute('filter')}})}g.animationComplete(next+1);active=false})}}else{control.children(':eq('+next+')').css({left:position,display:'block'});if(g.autoHeight){control.animate({left:a,height:control.children(':eq('+next+')').outerHeight()},g.slideSpeed,g.slideEasing,function(){control.css({left:-width});control.children(':eq('+next+')').css({left:width,zIndex:5});control.children(':eq('+prev+')').css({left:width,display:'none',zIndex:0});g.animationComplete(next+1);active=false})}else{control.animate({left:a},g.slideSpeed,g.slideEasing,function(){control.css({left:-width});control.children(':eq('+next+')').css({left:width,zIndex:5});control.children(':eq('+prev+')').css({left:width,display:'none',zIndex:0});g.animationComplete(next+1);active=false})}}if(g.pagination){$('.'+g.paginationClass+' li.'+g.currentClass,d).removeClass(g.currentClass);$('.'+g.paginationClass+' li:eq('+next+')',d).addClass(g.currentClass)}}}function stop(){clearInterval(d.data('interval'))}function pause(){if(g.pause){clearTimeout(d.data('pause'));clearInterval(d.data('interval'));pauseTimeout=setTimeout(function(){clearTimeout(d.data('pause'));playInterval=setInterval(function(){animate("next",effect)},g.play);d.data('interval',playInterval)},g.pause);d.data('pause',pauseTimeout)}else{stop()}}if(total<2){return}if(start<0){start=0}if(start>total){start=total-1}if(g.start){current=start}if(g.randomize){control.randomize()}$('.'+g.container,d).css({overflow:'hidden',position:'relative'});control.children().css({position:'absolute',top:0,left:control.children().outerWidth(),zIndex:0,display:'none'});control.css({position:'relative',width:(width*3),height:height,left:-width});$('.'+g.container,d).css({display:'block'});if(g.autoHeight){control.children().css({height:'auto'});control.animate({height:control.children(':eq('+start+')').outerHeight()},g.autoHeightSpeed)}if(g.preload&&control.find('img').length){$('.'+g.container,d).css({background:'url('+g.preloadImage+') no-repeat 50% 50%'});var f=control.find('img:eq('+start+')').attr('src')+'?'+(new Date()).getTime();if($('img',d).parent().attr('class')!='slides_control'){imageParent=control.children(':eq(0)')[0].tagName.toLowerCase()}else{imageParent=control.find('img:eq('+start+')')}control.find('img:eq('+start+')').attr('src',f).load(function(){control.find(imageParent+':eq('+start+')').fadeIn(g.fadeSpeed,g.fadeEasing,function(){$(this).css({zIndex:5});$('.'+g.container,d).css({background:''});loaded=true;g.slidesLoaded()})})}else{control.children(':eq('+start+')').fadeIn(g.fadeSpeed,g.fadeEasing,function(){loaded=true;g.slidesLoaded()})}if(g.bigTarget){control.children().css({cursor:'pointer'});control.children().click(function(){animate('next',effect);return false})}if(g.hoverPause&&g.play){control.bind('mouseover',function(){stop()});control.bind('mouseleave',function(){pause()})}if(g.generateNextPrev){$('.'+g.container,d).after('Prev');$('.'+g.prev,d).after('Next')}$('.'+g.next,d).click(function(e){e.preventDefault();if(g.play){pause()}animate('next',effect)});$('.'+g.prev,d).click(function(e){e.preventDefault();if(g.play){pause()}animate('prev',effect)});if(g.generatePagination){if(g.prependPagination){d.prepend('
        ')}else{d.append('
          ')}control.children().each(function(){$('.'+g.paginationClass,d).append('
        • '+(number+1)+'
          • ');number++})}else{$('.'+g.paginationClass+' li a',d).each(function(){$(this).attr('href','#'+number);number++})}$('.'+g.paginationClass+' li:eq('+start+')',d).addClass(g.currentClass);$('.'+g.paginationClass+' li a',d).click(function(){if(g.play){pause()}clicked=$(this).attr('href').match('[^#/]+$');if(current!=clicked){animate('pagination',paginationEffect,clicked)}return false});$('a.link',d).click(function(){if(g.play){pause()}clicked=$(this).attr('href').match('[^#/]+$')-1;if(current!=clicked){animate('pagination',paginationEffect,clicked)}return false});if(g.play){playInterval=setInterval(function(){animate('next',effect)},g.play);d.data('interval',playInterval)}})};$.fn.slides.option={preload:false,preloadImage:'/img/loading.gif',container:'slides_container',generateNextPrev:false,next:'next',prev:'prev',pagination:true,generatePagination:true,prependPagination:false,paginationClass:'pagination',currentClass:'current',fadeSpeed:350,fadeEasing:'',slideSpeed:350,slideEasing:'',start:1,effect:'slide',crossfade:false,randomize:false,play:0,pause:0,hoverPause:false,autoHeight:false,autoHeightSpeed:350,bigTarget:false,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}};$.fn.randomize=function(c){function randomizeOrder(){return(Math.round(Math.random())-0.5)}return($(this).each(function(){var $this=$(this);var $children=$this.children();var a=$children.length;if(a>1){$children.hide();var b=[];for(i=0;i