harmonization with master for merge

core/models.py

@@ -110,7 +110,7 @@ class Claim(models.Model):
     rights_holder =  models.ForeignKey("RightsHolder", related_name="claim", null=False )    
     work =  models.ForeignKey("Work", related_name="claim", null=False )    
     user =  models.ForeignKey(User, related_name="claim", null=False ) 
-    status = models.CharField(max_length=7, choices= STATUSES, default='pending')
+    status = models.CharField(max_length=7, choices=STATUSES, default='pending')
     
     @property
     def can_open_new(self):
@@ -176,16 +176,7 @@ class CampaignAction(models.Model):
     campaign = models.ForeignKey("Campaign", related_name="actions", null=False)
 
 class CCLicense():
-    CCCHOICES = ( 
-            ('CC BY-NC-ND','CC BY-NC-ND'), 
-            ('CC BY-ND','CC BY-ND'), 
-            ('CC BY','CC BY'), 
-            ('CC BY-NC','CC BY-NC'),
-            ( 'CC BY-NC-SA','CC BY-NC-SA'),
-            ( 'CC BY-SA','CC BY-SA'),
-            ( 'CC0','CC0'),
-        )
-    CHOICES = CCCHOICES+(('PD-US', 'Public Domain, US'),)
+    CHOICES = settings.CHOICES
     
     @staticmethod
     def url(license):
@@ -242,7 +233,7 @@ class Offer(models.Model):
 
 (REWARDS, BUY2UNGLUE) = (1, 2)
 class Campaign(models.Model):
-    LICENSE_CHOICES = CCLicense.CCCHOICES
+    LICENSE_CHOICES = settings.CCCHOICES
     created = models.DateTimeField(auto_now_add=True)
     name = models.CharField(max_length=500, null=True, blank=False)
     description = RichTextField(null=True, blank=False)
@@ -1090,7 +1081,8 @@ class EbookFile(models.Model):
     
     
 class Ebook(models.Model):
-    RIGHTS_CHOICES = CCLicense.CHOICES
+    FORMAT_CHOICES = settings.FORMATS
+    RIGHTS_CHOICES = settings.CCCHOICES
     url = models.URLField(max_length=1024)
     created = models.DateTimeField(auto_now_add=True)
     format = models.CharField(max_length=25, choices = FORMAT_CHOICES)
@@ -1206,6 +1198,15 @@ pledger2.instance=None
 ANONYMOUS_AVATAR = '/static/images/header/avatar.png'
 (NO_AVATAR, GRAVATAR, TWITTER, FACEBOOK) = (0, 1, 2, 3)
 
+class Libpref(models.Model):
+    user = models.OneToOneField(User, related_name='libpref')
+    marc_link_target = models.CharField(
+        max_length=6,
+        default = 'UNGLUE', 
+        choices = settings.MARC_CHOICES,
+        verbose_name="MARC record link targets"
+    )
+
 
 class UserProfile(models.Model):
     created = models.DateTimeField(auto_now_add=True)
@@ -1225,11 +1226,9 @@ class UserProfile(models.Model):
     goodreads_auth_secret = models.TextField(null=True, blank=True)
     goodreads_user_link = models.CharField(max_length=200, null=True, blank=True)  
     
-    
     avatar_source = models.PositiveSmallIntegerField(null = True, default = GRAVATAR,
             choices=((NO_AVATAR,'No Avatar, Please'),(GRAVATAR,'Gravatar'),(TWITTER,'Twitter'),(FACEBOOK,'Facebook')))
     
-
     def __unicode__(self):
         return self.user.username
 

frontend/forms.py

@@ -53,8 +53,8 @@ from regluit.utils.localdatetime import now
 logger = logging.getLogger(__name__)
 
 class EditionForm(forms.ModelForm):
-    add_author = forms.CharField(max_length=500,  required=False)
-    add_subject = forms.CharField(max_length=200,  required=False)
+    add_author = forms.CharField(max_length=500, required=False)
+    add_subject = forms.CharField(max_length=200, required=False)
     publisher_name = AutoCompleteSelectField(
             PublisherNameLookup,
             label='Publisher Name',

settings/common.py

@@ -27,7 +27,7 @@ MEDIA_ROOT = ''
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = '/media/'
 
 CKEDITOR_UPLOAD_PATH = ''
 CKEDITOR_RESTRICT_BY_USER = True
@@ -341,6 +341,55 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 AWS_ACCESS_KEY_ID = ''
 AWS_SECRET_ACCESS_KEY = ''
 AWS_STORAGE_BUCKET_NAME = ''
+AWS_QUERYSTRING_AUTH = False
 
 MAILCHIMP_API_KEY = '5f8e846a2bbc847807ed89086de4b4bf-us2'
 MAILCHIMP_NEWS_ID = u'c5cce92fe1'
+
+# let's be DRY with these parameters
+# CCHOICES, CCGRANTS, and FORMATS are all used in places that expect tuples
+# CONTENT_TYPES will be easiest to manipulate in ungluify_record as a dict
+CCCHOICES = ( 
+    ('CC BY','Creative Commons Attribution 3.0 Unported (CC BY 3.0)'), 
+    ('CC BY-SA','Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)'),
+    ('CC BY-NC','Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)'),
+    ('CC BY-NC-SA','Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)'),
+    ('CC BY-NC-ND','Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-NC-ND 3.0)'), 
+    ('CC BY-ND','Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)'), 
+    ('CC0','No Rights Reserved (CC0)'),
+)
+CHOICES = CCCHOICES + (('PD-US', 'Public Domain, US'),)
+
+CCGRANTS = (
+    ('CC BY', 'http://creativecommons.org/licenses/by/3.0/'),
+    ('CC BY-SA', 'http://creativecommons.org/licenses/by-sa/3.0/'),
+    ('CC BY-NC', 'http://creativecommons.org/licenses/by-nc/3.0/'),
+    ('CC BY-NC-SA', 'http://creativecommons.org/licenses/by-nc-sa/3.0/'),
+    ('CC BY-NC-ND', 'http://creativecommons.org/licenses/by-nc-nd/3.0/'),
+    ('CC BY-ND', 'http://creativecommons.org/licenses/by-nd/3.0/'),        
+    ('CC0', 'http://creativecommons.org/about/cc0'),
+)
+GRANTS = CCGRANTS + (('PD-US', ''),)
+
+
+FORMATS = (
+    ('pdf','PDF'),
+    ('epub','EPUB'),
+    ('html','HTML'),
+    ('text','TEXT'),
+    ('mobi','MOBI'),
+)
+CONTENT_TYPES = {
+    'pdf': 'application/pdf',
+    'epub': 'application/epub+zip',
+    'html': 'text/html',
+    'text': 'text/plain',
+    'mobi': 'application/x-mobipocket-ebook'
+}
+
+# if you add more of these, make sure core/ungluify_record.py can deal
+MARC_CHOICES = (
+    ('DIRECT', 'Raw link'),
+    ('UNGLUE', 'Unglue.it link'),
+)
+