Merge pull request #51 from SemmLille/dev

1.3

Author: Ptitloup

pod_project/core/admin.py

@@ -26,7 +26,7 @@
 from ckeditor.widgets import CKEditorWidget
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
-from core.models import UserProfile, PagesMenuBas, EncodingType
+from core.models import UserProfile, PagesMenuBas, EncodingType, ContactUs
 
 
 class PageForm(FlatpageForm):
@@ -77,3 +77,7 @@ class EncodingTypeAdmin(admin.ModelAdmin):
     list_display = (
         'name', 'bitrate_audio', 'bitrate_video', 'output_height', 'mediatype')
 admin.site.register(EncodingType, EncodingTypeAdmin)
+
+class ContactUsAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'email', 'subject', 'message')
+admin.site.register(ContactUs, ContactUsAdmin)

pod_project/core/forms.py

@@ -20,15 +20,20 @@
 voir http://www.gnu.org/licenses/
 """
 
-from django.forms import ModelForm
-from core.models import FileBrowse, UserProfile
+from django.forms import ModelForm, URLField
+from core.models import FileBrowse, UserProfile, ContactUs
+from captcha.fields import CaptchaField
+from django.utils.safestring import mark_safe
+from django.forms.widgets import HiddenInput
+from django.utils.translation import ugettext_lazy as _
 
 class FileBrowseForm(ModelForm):
     class Meta:
         model = FileBrowse
         fields = '__all__'
 
 class ProfileForm(ModelForm):
+
   def __init__(self, *args, **kwargs):
     super(ProfileForm, self).__init__(*args, **kwargs)
     try :
@@ -45,4 +50,27 @@ def __init__(self, *args, **kwargs):
 
   class Meta:
     model = UserProfile
-    exclude = ('user','auth_type', 'commentaire', 'affiliation' )
+    exclude = ('user','auth_type', 'commentaire', 'affiliation' )
+
+class ContactUsModelForm(ModelForm):
+    captcha = CaptchaField(label=_(u'Please indicate the result of the following operation hereunder '))
+    url_referrer = URLField(required=False, widget=HiddenInput())
+    def __init__(self, request, *args, **kwargs):
+        super(ContactUsModelForm, self).__init__(*args, **kwargs)
+
+        if request.user and request.user.is_authenticated():
+            self.fields['name'].widget = HiddenInput()
+            self.fields['email'].widget = HiddenInput()
+            del self.fields['captcha']
+
+        for myField in self.fields:
+            if self.fields[myField].label != None: 
+                self.fields[myField].widget.attrs['placeholder'] = self.fields[myField].label
+                if self.fields[myField].required:
+                    self.fields[myField].widget.attrs['class'] = 'required'
+                    label_unicode = u'%s' %self.fields[myField].label
+                    self.fields[myField].label = mark_safe("%s <span class=\"special_class\">*</span> : " %label_unicode)
+
+    class Meta:
+        model = ContactUs
+        fields = '__all__'

pod_project/core/migrations/0002_ContactUs.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import filer.fields.image
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContactUs',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=250, verbose_name='Name')),
+                ('email', models.EmailField(max_length=250, verbose_name='Email')),
+                ('subject', models.CharField(max_length=250, verbose_name='Subject')),
+                ('message', models.TextField(verbose_name='Message')),
+            ],
+            options={
+                'verbose_name': 'Contact',
+                'verbose_name_plural': 'Contacts',
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterModelOptions(
+            name='encodingtype',
+            options={'verbose_name': 'encoding type', 'verbose_name_plural': 'encoding types'},
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='description',
+            field=models.TextField(help_text='This field allows you to write a few words about yourself. The text will be displayed with your videos.', max_length=100, verbose_name='Description', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='image',
+            field=filer.fields.image.FilerImageField(blank=True, to='filer.Image', help_text='This field allows you to add a photo ID. The picture will be displayed with your videos.', null=True, verbose_name='Avatar'),
+            preserve_default=True,
+        ),
+    ]

pod_project/core/models.py

@@ -6,7 +6,7 @@
 de la licence GNU Public Licence telle que publiée
 par la Free Software Foundation, soit dans la
 version 3 de la licence, ou (selon votre choix)
-toute version ultérieure. 
+toute version ultérieure.
 Ce programme est distribué avec l'espoir
 qu'il sera utile, mais SANS AUCUNE
 GARANTIE : sans même les garanties
@@ -84,9 +84,9 @@ def __str__(self):
 class UserProfile(models.Model):
     user = models.OneToOneField(User)
     image = FilerImageField(null=True, blank=True, verbose_name=_('Avatar'),
-                            help_text=_('This field allows you to add a photo ID. The picture will be displayed with yours videos.'))
+                            help_text=_('This field allows you to add a photo ID. The picture will be displayed with your videos.'))
     description = models.TextField(_('Description'), max_length=100, blank=True,
-                                   help_text=_('This field allows you to write a few words about yourself. The text will be displayed with yours videos.'))
+                                   help_text=_('This field allows you to write a few words about yourself. The text will be displayed with your videos.'))
     url = models.URLField(_('Web link'), blank=True,
                           help_text=_('This field allows you to add an url.'))
 
@@ -114,8 +114,8 @@ def create_user_profile(sender, instance, created, **kwargs):
         # creation du profil
         try:
             UserProfile.objects.create(user=instance)
-        except  Exception as e:
-            msg = u'\n Create user profile ***** Unexpected error :%r' % e
+        except Exception as e:
+            msg = u'\n Create user profile ***** Error:%r' % e
             msg += '\n%s' % traceback.format_exc()
             logger.error(msg)
             print msg
@@ -125,8 +125,8 @@ def create_user_profile(sender, instance, created, **kwargs):
             if not instance.groups.filter(name='can delete file').exists():
                 g = Group.objects.get(name='can delete file')
                 g.user_set.add(instance)
-        except  Exception as e:
-            msg = u'\n Create folder and add group to user ***** Unexpected error :%r' % e
+        except Exception as e:
+            msg = u'\n Create folder and add group to user ***** Error:%r' % e
             msg += '\n%s' % traceback.format_exc()
             logger.error(msg)
             print msg
@@ -162,9 +162,11 @@ class Video(models.Model):
     description = RichTextField(
         _('Description'), config_name='complete', blank=True)
 
-    view_count = models.PositiveIntegerField(default=0, editable=False)
+    view_count = models.PositiveIntegerField(
+        _('View count'), default=0, editable=False)
 
-    encoding_in_progress = models.BooleanField(default=False, editable=False)
+    encoding_in_progress = models.BooleanField(
+        _('Encoding in progress'), default=False, editable=False)
     encoding_status = models.CharField(
         _('Encoding status'), max_length=250, editable=False, blank=True, null=True)
 
@@ -242,8 +244,29 @@ class EncodingType(models.Model):
     mediatype = models.CharField(
         _('mediatype'), max_length=5, choices=TYPE_CHOICES, default="video")
 
+    class Meta:
+        verbose_name = _("encoding type")
+        verbose_name_plural = _("encoding types")
+
     def __str__(self):
         return "%s %s %s" % (self.mediatype, self.name, self.output_height)
 
     def __unicode__(self):
         return "%s %s %s" % (self.mediatype, self.name, self.output_height)
+
+@python_2_unicode_compatible
+class ContactUs(models.Model):
+    name = models.CharField(_('Name'), max_length=250)
+    email = models.EmailField(_('Email'), max_length=250)
+    subject = models.CharField(_('Subject'), max_length=250)
+    message = models.TextField(_('Message'))
+
+    class Meta:
+        verbose_name = _("Contact")
+        verbose_name_plural = _("Contacts")
+
+    def __str__(self):
+        return "%s %s %s" % (self.name, self.email, self.subject)
+
+    def __unicode__(self):
+        return "%s %s %s" % (self.name, self.email, self.subject)

pod_project/core/static/JS/navigation.js

@@ -158,6 +158,22 @@ $(document).ready(function() {
 
 });
 
+/*** DON'T TOUCH THIS ****/
+function csrfSafeMethod(method) {
+    // These HTTP methods do not require CSRF protection
+    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+}
+
+$.ajaxSetup({
+    crossDomain: false, // Obviates need for sameOrigin test
+    beforeSend: function(xhr, settings) {
+        if (!csrfSafeMethod(settings.type)) {
+            xhr.setRequestHeader('X-CSRFToken', csrftoken);
+        }
+    }
+});
+var csrftoken = getCookie('csrftoken');
+
 /** EVTS PERMANENT **/
 /** video list **/
 $(document).on('click', "#pagination .paginator a", function () {

pod_project/core/static/JS/player.js

@@ -379,21 +379,6 @@ function changeDisplay(disp, duration) {
     }
 }
 
-function csrfSafeMethod(method) {
-    // These HTTP methods do not require CSRF protection
-    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-}
-
-$.ajaxSetup({
-    crossDomain: false, // Obviates need for sameOrigin test
-    beforeSend: function(xhr, settings) {
-        if (!csrfSafeMethod(settings.type)) {
-            xhr.setRequestHeader('X-CSRFToken', csrftoken);
-        }
-    }
-});
-var csrftoken = getCookie('csrftoken');
-
 $(document).on(
     'click',
     'button#button_video_note',

pod_project/core/templates/404.html

@@ -6,7 +6,7 @@
 de la licence GNU Public Licence telle que publiée
 par la Free Software Foundation, soit dans la
 version 3 de la licence, ou (selon votre choix)
-toute version ultérieure. 
+toute version ultérieure.
 Ce programme est distribué avec l'espoir
 qu'il sera utile, mais SANS AUCUNE
 GARANTIE : sans même les garanties
@@ -21,7 +21,7 @@
 {%endcomment%}
 {% load i18n %}
 
-{% block bootstrap3_title %}{{ block.super }}{% trans "Page not found" %}{% endblock %}
+{% block bootstrap3_title %}{{ block.super }}{% trans "Page not found." %}{% endblock %}
 
 {% block bootstrap3_extra_head %}
 <style>
@@ -31,7 +31,7 @@
 
 
 {% block breadcrumbs %}
-    {{ block.super }} <li class="active">{% trans "Page not found" %}</li>
+    {{ block.super }} <li class="active">{% trans "Page not found." %}</li>
 {%endblock%}
 
 {% block mainToolbar %}
@@ -41,13 +41,13 @@
 {% endblock stats %}
 
 {% block article_title %}
-    {% trans "Page not found" %}&nbsp;&nbsp;<span frown>:(</span>
+    {% trans "Page not found." %}&nbsp;&nbsp;<span frown>:(</span>
 {% endblock %}
 
 {% block article %}
     {% block article_content %}
     <div>
-       <p>{% trans "The requested address was not found on this server" %}</p>
+       <p>{% trans "The requested address was not found on this server." %}</p>
        <p><a href="/" id="home">[ {% trans "Home" %} ]</a></p>
     </div>
     {% endblock article_content %}
@@ -60,7 +60,7 @@
     <aside class="col-sm-3">
     {% block box_info %}
     {% endblock box_info %}
-    
+
     {% block box_discipline %}{{ block.super }}{% endblock box_discipline %}
     {% block box_tags %}{{ block.super }}{% endblock box_tags %}
     {% block box_note %} {% endblock box_note %}