Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add license and author fields to exercise images

Roland Geiderf5575acb3504
diff --git a/wger/config/management/commands/extract-categories-i18n.py b/wger/config/management/commands/extract-categories-i18n.py
index 2109bd601..785449793 100644
--- a/wger/config/management/commands/extract-categories-i18n.py
+++ b/wger/config/management/commands/extract-categories-i18n.py
@@ -18,6 +18,7 @@ from django.core.management.base import BaseCommand
from wger.exercises.models import ExerciseCategory
from wger.exercises.models import Equipment
+from wger.exercises.models import ExerciseImage
class Command(BaseCommand):
@@ -29,10 +30,17 @@ class Command(BaseCommand):
def handle(self, *args, **options):
+ # Exercise categories
for category in ExerciseCategory.objects.all():
self.stdout.write('msgid "{0}"\n'
'msgstr ""\n\n'.format(category))
+ # Equipment names
for equipment in Equipment.objects.all():
self.stdout.write('msgid "{0}"\n'
'msgstr ""\n\n'.format(equipment))
+
+ # Image licenses
+ for license in ExerciseImage.IMAGE_LICENSE:
+ self.stdout.write('msgid "{0}"\n'
+ 'msgstr ""\n\n'.format(unicode(license[1])))
diff --git a/wger/exercises/fixtures/test-exercise-images.json b/wger/exercises/fixtures/test-exercise-images.json
index 98079800d..8a33826e9 100644
--- a/wger/exercises/fixtures/test-exercise-images.json
+++ b/wger/exercises/fixtures/test-exercise-images.json
@@ -5,7 +5,8 @@
"fields": {
"image": "exercise-images/1/protestschwein.jpg",
"exercise": 1,
- "is_main": true
+ "is_main": true,
+ "license": "1"
}
},
{
@@ -14,7 +15,8 @@
"fields": {
"image": "exercise-images/1/wildschwein.jpg",
"exercise": 1,
- "is_main": false
+ "is_main": false,
+ "license": "2"
}
}
]
diff --git a/wger/exercises/migrations/0010_auto__add_field_exerciseimage_image_license__add_field_exerciseimage_l.py b/wger/exercises/migrations/0010_auto__add_field_exerciseimage_image_license__add_field_exerciseimage_l.py
new file mode 100644
index 000000000..38369854e
--- /dev/null
+++ b/wger/exercises/migrations/0010_auto__add_field_exerciseimage_image_license__add_field_exerciseimage_l.py
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'ExerciseImage.license'
+ db.add_column(u'exercises_exerciseimage', 'license',
+ self.gf('django.db.models.fields.CharField')(default='1', max_length=2),
+ keep_default=False)
+
+ # Adding field 'ExerciseImage.license_author'
+ db.add_column(u'exercises_exerciseimage', 'license_author',
+ self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'ExerciseImage.license'
+ db.delete_column(u'exercises_exerciseimage', 'license')
+
+ # Deleting field 'ExerciseImage.license_author'
+ db.delete_column(u'exercises_exerciseimage', 'license_author')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'exercises.equipment': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'exercises.exercise': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),
+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Language']"}),
+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Muscle']", 'symmetrical': 'False'}),
+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.exercisecategory': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'exercises.exercisecomment': {
+ 'Meta': {'object_name': 'ExerciseComment'},
+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'exercises.exerciseimage': {
+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},
+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'license': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),
+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+ },
+ u'exercises.language': {
+ 'Meta': {'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'exercises.muscle': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ }
+ }
+
+ complete_apps = ['exercises']
\ No newline at end of file
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 390104842..ded1b806e 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -337,6 +337,15 @@ class ExerciseImage(models.Model):
'''
Model for an exercise image
'''
+
+ IMAGE_LICENSE_CC_BY_SA_3 = '1'
+ IMAGE_LICENSE_PUBLIC_DOMAIN = '2'
+
+ IMAGE_LICENSE = (
+ (IMAGE_LICENSE_CC_BY_SA_3, 'CC-BY-SA 3.0'),
+ (IMAGE_LICENSE_PUBLIC_DOMAIN, _('Public domain')),
+ )
+
exercise = models.ForeignKey(Exercise,
verbose_name=_('Exercise'),
editable=False)
@@ -347,11 +356,27 @@ class ExerciseImage(models.Model):
upload_to=exercise_image_upload_dir)
'''Uploaded image'''
+ license = models.CharField(verbose_name=_('License'),
+ max_length=2,
+ choices=IMAGE_LICENSE,
+ default=IMAGE_LICENSE_CC_BY_SA_3)
+ '''The license the image is released under'''
+
+ license_author = models.CharField(verbose_name=_('Author'),
+ max_length=50,
+ blank=True,
+ null=True,
+ help_text=_('If you are not the author of the image, enter '
+ 'the name here. This is needed for some licenses '
+ 'e.g. the CC-BY-SA.'))
+ '''The author of the image if it is not the uploader'''
+
is_main = models.BooleanField(verbose_name=_('Is main picture'),
default=False,
help_text=_("Tick the box if you want set this image as the main "
"one for the exercise (will be shown e.g. in the "
- "search)"))
+ "search). The first image is automatically marked "
+ "by the system."))
'''A flag indicating whether the image is the exercise's main image'''
class Meta:
@@ -360,12 +385,6 @@ class ExerciseImage(models.Model):
'''
ordering = ['-is_main', 'id']
- def get_owner_object(self):
- '''
- Image has no owner information
- '''
- return False
-
def save(self, *args, **kwargs):
'''
Only one image can be marked as main picture at a time
@@ -410,6 +429,12 @@ class ExerciseImage(models.Model):
image.is_main = True
image.save()
+ def get_owner_object(self):
+ '''
+ Image has no owner information
+ '''
+ return False
+
def delete_exercise_image_on_delete(sender, instance, **kwargs):
'''
diff --git a/wger/exercises/templates/mobile/view.html b/wger/exercises/templates/mobile/view.html
index 49c85af5f..a4a801509 100644
--- a/wger/exercises/templates/mobile/view.html
+++ b/wger/exercises/templates/mobile/view.html
@@ -146,6 +146,14 @@ included in the database.{% endblocktrans %}
data-role="button">
{% trans "Reduced size" %}</a>
+ <h3>{% trans "License" %}</h3>
+ <p>
+ {{image.get_license_display}}
+ {% if image.license_author %}
+ – {{image.license_author}}
+ {% endif %}
+ </p>
+
{% if perms.exercises.change_exerciseimage %}
<h3>{% trans "Options" %}</h3>
<a href="{% url 'exerciseimage-delete' exercise.pk image.pk %}"
diff --git a/wger/exercises/templates/view.html b/wger/exercises/templates/view.html
index 9be235737..70ce5b9ec 100644
--- a/wger/exercises/templates/view.html
+++ b/wger/exercises/templates/view.html
@@ -160,9 +160,8 @@ included in the database.{% endblocktrans %}
target="_blank"
class=" no-hover">
{% trans "Download" %}</a>
-
{% if perms.exercises.change_exerciseimage %}
- <br>
+ |
<a href="{% url 'exerciseimage-delete' exercise.pk main_image.pk %}"
class="modal-dialog no-hover">
{% trans 'Delete' %}</a> |
@@ -170,6 +169,13 @@ included in the database.{% endblocktrans %}
class="no-hover">
{% trans 'Edit' %}</a>
{% endif %}
+
+ <br>
+ {{main_image.get_license_display}}
+ {% if main_image.license_author %}
+ – {{main_image.license_author}}
+ {% endif %}
+
</div>
</div>
</div>
@@ -192,9 +198,8 @@ included in the database.{% endblocktrans %}
target="_blank"
class=" no-hover">
{% trans "Download" %}</a>
-
{% if perms.exercises.change_exerciseimage %}
- <br>
+ |
<a href="{% url 'exerciseimage-delete' exercise.pk image.pk %}"
class="modal-dialog no-hover">
{% trans 'Delete' %}</a> |
@@ -202,6 +207,13 @@ included in the database.{% endblocktrans %}
class="no-hover">
{% trans 'Edit' %}</a>
{% endif %}
+
+ <br>
+ {{image.get_license_display}}
+ {% if image.license_author %}
+ – {{image.license_author}}
+ {% endif %}
+
</div>
</div>
</div>
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 08abd8f84..b8d724826 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -35,7 +35,8 @@ class AddExerciseImageTestCase(WorkoutManagerAddTestCase):
pk = 3
user_fail = False
data = {'is_main': True,
- 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb')}
+ 'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
+ 'license': '1'}
class EditExerciseImageTestCase(WorkoutManagerEditTestCase):
@@ -46,7 +47,8 @@ class EditExerciseImageTestCase(WorkoutManagerEditTestCase):
object_class = ExerciseImage
url = 'exerciseimage-edit'
pk = 2
- data = {'is_main': True}
+ data = {'is_main': True,
+ 'license': '1'}
class DeleteExerciseImageTestCase(WorkoutManagerDeleteTestCase):
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index d2289eb2c..8e9cc0057 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -16,7 +16,6 @@
import logging
from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy
from django.utils.translation import ugettext as _
@@ -56,6 +55,7 @@ class ExerciseImageEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
def get_context_data(self, **kwargs):
context = super(ExerciseImageEditView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
+ context['select_lists'] = ('license', )
context['form_action'] = reverse('exerciseimage-edit',
kwargs={'pk': self.object.id})
@@ -85,6 +85,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
context = super(ExerciseImageAddView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
+ context['select_lists'] = ('license', )
context['form_action'] = reverse('exerciseimage-add',
kwargs={'exercise_pk': self.kwargs['exercise_pk']})
diff --git a/wger/manager/static/css/workout-manager-common.css b/wger/manager/static/css/workout-manager-common.css
index f4253cedc..8a8f1f4dc 100644
--- a/wger/manager/static/css/workout-manager-common.css
+++ b/wger/manager/static/css/workout-manager-common.css
@@ -259,9 +259,13 @@ body .boxInner:hover .titleBox, body.touch .boxInner.touchFocus .titleBox {
margin-bottom: 0;
}
+.titleBox{
+ font-size: 80%;
+}
+
.titleBox a, .titleBox .ui-link {
color: white;
- font-size: 80%;
+
text-shadow: none;
}
@media only screen and (max-width : 480px) {