Merge branch 'fix_stack' into 'master'

Fix stack

Closes #104 and #108

See merge request federez/re2o!140

preferences/forms.py

@@ -27,9 +27,16 @@ from __future__ import unicode_literals
 
 from django.forms import ModelForm, Form
 from django import forms
-from .models import OptionalUser, OptionalMachine, OptionalTopologie
-from .models import GeneralOption, AssoOption, MailMessageOption, Service
-
+from .models import (
+    OptionalUser,
+    OptionalMachine,
+    OptionalTopologie,
+    GeneralOption,
+    AssoOption,
+    MailMessageOption,
+    AccueilOption,
+    Service
+)
 
 class EditOptionalUserForm(ModelForm):
     """Formulaire d'édition des options de l'user. (solde, telephone..)"""
@@ -185,6 +192,21 @@ class EditMailMessageOptionForm(ModelForm):
         mail de bienvenue en anglais'
 
 
+class EditAccueilOptionForm(ModelForm):
+    """Formulaire d'édition des options de la page d'accueil"""
+    class Meta:
+        model = AccueilOption
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        prefix = kwargs.pop('prefix', self.Meta.model.__name__)
+        super(EditAccueilOptionForm, self).__init__(
+            *args,
+            prefix=prefix,
+            **kwargs
+        )
+
+
 class ServiceForm(ModelForm):
     """Edition, ajout de services sur la page d'accueil"""
     class Meta:

preferences/migrations/0033_accueiloption.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-04-16 02:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import re2o.mixins
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0032_optionaluser_shell_default'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AccueilOption',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('facebook_url', models.URLField(blank=True, help_text='Url du compte facebook', null=True)),
+                ('twitter_url', models.URLField(blank=True, help_text='Url du compte twitter', null=True)),
+                ('twitter_account_name', models.CharField(blank=True, help_text='Nom du compte à afficher', max_length=32, null=True)),
+            ],
+            options={
+                'permissions': (('view_accueiloption', "Peut voir les options de l'accueil"),),
+            },
+            bases=(re2o.mixins.AclMixin, models.Model),
+        ),
+    ]

preferences/models.py

@@ -331,6 +331,40 @@ def assooption_post_save(**kwargs):
     asso_pref.set_in_cache()
 
 
+class AccueilOption(AclMixin, PreferencesModel):
+    """Reglages de la page d'accueil"""
+    PRETTY_NAME = "Options de la page d'accueil"
+
+    facebook_url = models.URLField(
+        null=True,
+        blank=True,
+        help_text="Url du compte facebook"
+    )
+    twitter_url = models.URLField(
+        null=True,
+        blank=True,
+        help_text="Url du compte twitter"
+    )
+    twitter_account_name = models.CharField(
+        max_length=32,
+        null=True,
+        blank=True,
+        help_text="Nom du compte à afficher"
+    )
+
+    class Meta:
+        permissions = (
+            ("view_accueiloption", "Peut voir les options de l'accueil"),
+        )
+
+
+@receiver(post_save, sender=AccueilOption)
+def accueiloption_post_save(**kwargs):
+    """Ecriture dans le cache"""
+    accueil_pref = kwargs['instance']
+    accueil_pref.set_in_cache()
+
+
 class MailMessageOption(AclMixin, models.Model):
     """Reglages, mail de bienvenue et autre"""
     PRETTY_NAME = "Options de corps de mail"

preferences/templates/preferences/display_preferences.html

@@ -211,12 +211,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ mailmessageoptions.welcome_mail_en | safe }}</td>
         </tr>
     </table>
-  <h2>Liste des services page d'accueil</h2>
+  <h2>Liste des services et préférences page d'accueil</h2>
   {% can_create preferences.Service%}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service'  %}"><i class="fa fa-plus"></i> Ajouter un service</a>
   {% acl_end %}
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-services'  %}"><i class="fa fa-trash"></i> Supprimer un ou plusieurs service</a>
   {%  include "preferences/aff_service.html" with  service_list=service_list %}
+
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'AccueilOption' %}">
+            <i class="fa fa-edit"></i>
+            Editer
+        </a>
+    <p>
+
+    <table class="table table-striped">
+        <tr>
+            <th>Url du compte twitter</th>
+            <td>{{ accueiloptions.twitter_url }}</td>
+            <th>Nom utilisé pour afficher le compte</th>
+            <td>{{ accueiloptions.twitter_account_name }}</td>
+        </tr>
+        <tr>
+            <th>Url du compte facebook</th>
+            <td>{{ accueiloptions.facebook_url }}</td>
+        </tr>
+    </table>
   <br />
   <br />
   <br />

preferences/urls.py

@@ -57,6 +57,11 @@ urlpatterns = [
         views.edit_options,
         name='edit-options'
         ),
+    url(
+        r'^edit_options/(?P<section>AccueilOption)$',
+        views.edit_options,
+        name='edit-options'
+        ),
     url(
         r'^edit_options/(?P<section>MailMessageOption)$',
         views.edit_options,

preferences/views.py

@@ -43,8 +43,16 @@ from re2o.views import form
 from re2o.acl import can_create, can_edit, can_delete_set, can_view_all
 
 from .forms import ServiceForm, DelServiceForm
-from .models import Service, OptionalUser, OptionalMachine, AssoOption
-from .models import MailMessageOption, GeneralOption, OptionalTopologie
+from .models import (
+    Service,
+    OptionalUser,
+    OptionalMachine,
+    AssoOption,
+    MailMessageOption,
+    GeneralOption,
+    OptionalTopologie,
+    AccueilOption
+)
 from . import models
 from . import forms
 
@@ -56,6 +64,7 @@ from . import forms
 @can_view_all(GeneralOption)
 @can_view_all(AssoOption)
 @can_view_all(MailMessageOption)
+@can_view_all(AccueilOption)
 def display_options(request):
     """Vue pour affichage des options (en vrac) classé selon les models
     correspondants dans un tableau"""
@@ -64,6 +73,7 @@ def display_options(request):
     topologieoptions, _created = OptionalTopologie.objects.get_or_create()
     generaloptions, _created = GeneralOption.objects.get_or_create()
     assooptions, _created = AssoOption.objects.get_or_create()
+    accueiloptions, _created = AccueilOption.objects.get_or_create()
     mailmessageoptions, _created = MailMessageOption.objects.get_or_create()
     service_list = Service.objects.all()
     return form({
@@ -72,6 +82,7 @@ def display_options(request):
         'topologieoptions': topologieoptions,
         'generaloptions': generaloptions,
         'assooptions': assooptions,
+        'accueiloptions': accueiloptions,
         'mailmessageoptions': mailmessageoptions,
         'service_list': service_list
         }, 'preferences/display_preferences.html', request)

re2o/templates/re2o/sidebar.html

@@ -25,4 +25,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 {% block sidebar %}
+
+{% if facebook_url %}
+<div class="fb-page" data-href="{{ facebook_url }}" data-tabs="timeline" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="false"><blockquote cite="{{ facebook_url }}" class="fb-xfbml-parse-ignore"><a href="{{ facebook_url }}">{{ asso_name }}</a></blockquote></div>
+
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = 'https://connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v2.12';
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<hr>
+
+{% endif %}
+
+{% if twitter_url %}
+<a class="twitter-timeline" data-lang="fr" data-height="500" href="{{ twitter_url }}?ref_src=twsrc%5Etfw">Tweets de @{{ twitter_account_name }}</a>
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+
+<a href="{{ twitter_url }}?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-show-count="false"> Suivre @{{ twitter_account_name }}</a>
+<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+{% endif %}
+
 {% endblock %}
+

re2o/views.py

@@ -41,7 +41,12 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.cache import cache_page
 
 import preferences
-from preferences.models import Service, GeneralOption, AssoOption
+from preferences.models import (
+    Service,
+    GeneralOption,
+    AssoOption,
+    AccueilOption
+)
 import users
 import cotisations
 import topologie
@@ -63,7 +68,17 @@ def index(request):
     services = [[], [], []]
     for indice, serv in enumerate(Service.objects.all()):
         services[indice % 3].append(serv)
-    return form({'services_urls': services}, 're2o/index.html', request)
+    twitter_url = AccueilOption.get_cached_value('twitter_url')
+    facebook_url = AccueilOption.get_cached_value('facebook_url')
+    twitter_account_name = AccueilOption.get_cached_value('twitter_account_name')
+    asso_name = AssoOption.get_cached_value('pseudo')
+    return form({
+         'services_urls': services,
+         'twitter_url': twitter_url,
+         'twitter_account_name' : twitter_account_name,
+         'facebook_url': facebook_url,
+         'asso_name': asso_name
+         }, 're2o/index.html', request)
 
 
 #: Binding the corresponding char sequence of history url to re2o models.

static/js/jquery.ez-plus.js

+/* jshint -W071, -W074 */
+/* global jQuery:false */
+
+/* Disabled options are:
+ * W071: This function has too many statements
+ * W074: This function's cyclomatic complexity is too high
+ */
+
+/*
+ *	jQuery ezPlus 1.1.11
+ *	Demo's and documentation:
+ *	http://igorlino.github.io/elevatezoom-plus/
+ *
+ *	licensed under MIT license.
+ *	http://en.wikipedia.org/wiki/MIT_License
+ *
+ */
+
+if (typeof Object.create !== 'function') {
+    Object.create = function (obj) {
+        function F() {
+        }
+
+        F.prototype = obj;
+        return new F();
+    };
+}
+
+(function ($, window, document, undefined) {
+    var EZP = {
+        init: function (options, elem) {
+            var self = this;
+            var $galleries;
+
+            self.elem = elem;
+            self.$elem = $(elem);
+
+            self.options = $.extend({}, $.fn.ezPlus.options, self.responsiveConfig(options || {}));
+
+            self.imageSrc = self.$elem.data(self.options.attrImageZoomSrc) ? self.$elem.data(self.options.attrImageZoomSrc) : self.$elem.attr('src');
+
+            if (!self.options.enabled) {
+                return;
+            }
+
+            //TINT OVERRIDE SETTINGS
+            if (self.options.tint) {
+                self.options.lensColour = 'none'; //colour of the lens background
+                self.options.lensOpacity = '1'; //opacity of the lens
+            }
+            //INNER OVERRIDE SETTINGS
+            if (self.options.zoomType === 'inner') {
+                self.options.showLens = false;
+            }
+
+            //UUID WHEN MISSING IDENTIFIER
+            if (self.options.zoomId === -1) {
+                self.options.zoomId = generateUUID();
+            }
+
+            //Remove alt on hover
+
+            self.$elem.parent().removeAttr('title').removeAttr('alt');
+
+            self.zoomImage = self.imageSrc;
+
+            self.refresh(1);
+
+            //Create the image swap from the gallery
+            $galleries = $(self.options.gallery ? ('#' + self.options.gallery) : self.options.gallerySelector);
+            $galleries.on('click.zoom', self.options.galleryItem, function (e) {
+
+                //Set a class on the currently active gallery image
+                if (self.options.galleryActiveClass) {
+                    $(self.options.galleryItem, $galleries).removeClass(self.options.galleryActiveClass);
+                    $(this).addClass(self.options.galleryActiveClass);
+                }
+                //stop any link on the a tag from working
+                if (this.tagName === 'A') {
+                    e.preventDefault();
+                }
+
+                //call the swap image function
+                if ($(this).data(self.options.attrImageZoomSrc)) {
+                    self.zoomImagePre = $(this).data(self.options.attrImageZoomSrc);
+                }
+                else {
+                    self.zoomImagePre = $(this).data('image');
+                }
+                self.swaptheimage($(this).data('image'), self.zoomImagePre);
+                if (this.tagName === 'A') {
+                    return false;
+                }
+            });
+
+            function generateUUID() {
+                var d = new Date().getTime();
+                var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = (d + Math.random() * 16) % 16 | 0;
+                    d = Math.floor(d / 16);
+                    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+                });
+                return uuid;
+            }
+        },
+        refresh: function (length) {
+            var self = this;
+
+            setTimeout(function () {
+                self.fetch(self.imageSrc, self.$elem, self.options.minZoomLevel);
+
+            }, length || self.options.refresh);
+        },
+        fetch: function (imgsrc, element, minZoom) {
+            //get the image
+            var self = this;
+            var newImg = new Image();
+            newImg.onload = function () {
+                //set the large image dimensions - used to calculte ratio's
+                if (newImg.width / element.width() <= minZoom) {
+                    self.largeWidth = element.width() * minZoom;
+                } else {
+                    self.largeWidth = newImg.width;
+                }
+                if (newImg.height / element.height() <= minZoom) {
+                    self.largeHeight = element.height() * minZoom;
+                } else {
+                    self.largeHeight = newImg.height;
+                }
+                //once image is loaded start the calls
+                self.startZoom();
+                self.currentImage = self.imageSrc;
+                //let caller know image has been loaded
+                self.options.onZoomedImageLoaded(self.$elem);
+            };
+            self.setImageSource(newImg, imgsrc); // this must be done AFTER setting onload
+
+            return;
+        },
+        setImageSource: function (image, src) {
+            //sets an image's source.
+            image.src = src;
+        },
+        startZoom: function () {
+            var self = this;
+            //get dimensions of the non zoomed image
+            self.nzWidth = self.$elem.width();
+            self.nzHeight = self.$elem.height();
+
+            //activated elements
+            self.isWindowActive = false;
+            self.isLensActive = false;
+            self.isTintActive = false;
+            self.overWindow = false;
+
+            //CrossFade Wrapper
+            if (self.options.imageCrossfade) {
+                self.zoomWrap = self.$elem.wrap('<div style="height:' + self.nzHeight + 'px;width:' + self.nzWidth + 'px;" class="zoomWrapper" />');
+                self.$elem.css('position', 'absolute');
+            }
+
+            self.zoomLock = 1;
+            self.scrollingLock = false;
+            self.changeBgSize = false;
+            self.currentZoomLevel = self.options.zoomLevel;
+
+            //get offset of the non zoomed image
+            self.nzOffset = self.$elem.offset();
+            //calculate the width ratio of the large/small image
+            self.widthRatio = (self.largeWidth / self.currentZoomLevel) / self.nzWidth;
+            self.heightRatio = (self.largeHeight / self.currentZoomLevel) / self.nzHeight;
+
+            function getWindowZoomStyle() {
+                return 'overflow: hidden;' +
+                    'background-position: 0px 0px;text-align:center;' +
+                    'background-color: ' + String(self.options.zoomWindowBgColour) + ';' +
+                    'width: ' + String(self.options.zoomWindowWidth) + 'px;' +
+                    'height: ' + String(self.options.zoomWindowHeight) + 'px;' +
+                    'float: left;' +
+                    'background-size: ' + self.largeWidth / self.currentZoomLevel + 'px ' + self.largeHeight / self.currentZoomLevel + 'px;' +
+                    'display: none;z-index:100;' +
+                    'border: ' + String(self.options.borderSize) + 'px solid ' + self.options.borderColour + ';' +
+                    'background-repeat: no-repeat;' +
+                    'position: absolute;';
+            }
+
+            //if window zoom
+            if (self.options.zoomType === 'window') {
+                self.zoomWindowStyle = getWindowZoomStyle();
+            }
+
+            function getInnerZoomStyle() {
+                //has a border been put on the image? Lets cater for this
+                var borderWidth = self.$elem.css('border-left-width');
+
+                return 'overflow: hidden;' +
+                    'margin-left: ' + String(borderWidth) + ';' +
+                    'margin-top: ' + String(borderWidth) + ';' +
+                    'background-position: 0px 0px;' +
+                    'width: ' + String(self.nzWidth) + 'px;' +
+                    'height: ' + String(self.nzHeight) + 'px;' +
+                    'float: left;' +
+                    'display: none;' +
+                    'cursor:' + (self.options.cursor) + ';' +
+                    'border: ' + String(self.options.borderSize) + 'px solid ' + self.options.borderColour + ';' +
+                    'background-repeat: no-repeat;' +
+                    'position: absolute;';
+            }
+
+            //if inner  zoom
+            if (self.options.zoomType === 'inner') {
+                self.zoomWindowStyle = getInnerZoomStyle();
+            }
+
+            function getWindowLensStyle() {
+                // adjust images less than the window height
+
+                if (self.nzHeight < self.options.zoomWindowHeight / self.heightRatio) {
+                    self.lensHeight = self.nzHeight;
+                }
+                else {
+                    self.lensHeight = String(self.options.zoomWindowHeight / self.heightRatio);
+                }
+                if (self.largeWidth < self.options.zoomWindowWidth) {
+                    self.lensWidth = self.nzWidth;
+                }
+                else {
+                    self.lensWidth = String(self.options.zoomWindowWidth / self.widthRatio);
+                }
+
+                return 'background-position: 0px 0px;width: ' + String((self.options.zoomWindowWidth) / self.widthRatio) + 'px;' +
+                    'height: ' + String((self.options.zoomWindowHeight) / self.heightRatio) +
+                    'px;float: right;display: none;' +
+                    'overflow: hidden;' +
+                    'z-index: 999;' +
+                    'opacity:' + (self.options.lensOpacity) + ';filter: alpha(opacity = ' + (self.options.lensOpacity * 100) + '); zoom:1;' +
+                    'width:' + self.lensWidth + 'px;' +
+                    'height:' + self.lensHeight + 'px;' +
+                    'background-color:' + (self.options.lensColour) + ';' +
+                    'cursor:' + (self.options.cursor) + ';' +
+                    'border: ' + (self.options.lensBorderSize) + 'px' +
+                    ' solid ' + (self.options.lensBorderColour) + ';background-repeat: no-repeat;position: absolute;';
+            }
+
+            //lens style for window zoom
+            if (self.options.zoomType === 'window') {
+                self.lensStyle = getWindowLensStyle();
+            }
+
+            //tint style
+            self.tintStyle = 'display: block;' +
+                'position: absolute;' +
+                'background-color: ' + self.options.tintColour + ';' +
+                'filter:alpha(opacity=0);' +
+                'opacity: 0;' +
+                'width: ' + self.nzWidth + 'px;' +
+                'height: ' + self.nzHeight + 'px;';
+
+            //lens style for lens zoom with optional round for modern browsers
+            self.lensRound = '';
+
+            if (self.options.zoomType === 'lens') {
+                self.lensStyle = 'background-position: 0px 0px;' +
+                    'float: left;display: none;' +
+                    'border: ' + String(self.options.borderSize) + 'px solid ' + self.options.borderColour + ';' +
+                    'width:' + String(self.options.lensSize) + 'px;' +
+                    'height:' + String(self.options.lensSize) + 'px;' +
+                    'background-repeat: no-repeat;position: absolute;';
+            }
+
+            //does not round in all browsers
+            if (self.options.lensShape === 'round') {
+                self.lensRound = 'border-top-left-radius: ' + String(self.options.lensSize / 2 + self.options.borderSize) + 'px;' +
+                    'border-top-right-radius: ' + String(self.options.lensSize / 2 + self.options.borderSize) + 'px;' +
+                    'border-bottom-left-radius: ' + String(self.options.lensSize / 2 + self.options.borderSize) + 'px;' +
+                    'border-bottom-right-radius: ' + String(self.options.lensSize / 2 + self.options.borderSize) + 'px;';
+            }
+
+            //create the div's                                                + ""
+            //self.zoomContainer = $('<div/>').addClass('zoomContainer').css({"position":"relative", "height":self.nzHeight, "width":self.nzWidth});
+
+            self.zoomContainer =
+                $('<div class="zoomContainer" ' +
+                    'uuid="' + self.options.zoomId + '"' +
+                    'style="' +
+                    'position:absolute;' +
+                    'left:' + self.nzOffset.left + 'px;' +
+                    'top:' + self.nzOffset.top + 'px;' +
+                    'height:' + self.nzHeight + 'px;' + '' +
+                    'width:' + self.nzWidth + 'px;' +
+                    'z-index:' + self.options.zIndex + '"></div>');
+            if (self.$elem.attr('id')) {
+                self.zoomContainer.attr('id', self.$elem.attr('id') + '-zoomContainer');
+            }
+            $(self.options.zoomContainerAppendTo).append(self.zoomContainer);
+
+            //this will add overflow hidden and contrain the lens on lens mode
+            if (self.options.containLensZoom && self.options.zoomType === 'lens') {
+                self.zoomContainer.css('overflow', 'hidden');
+            }
+            if (self.options.zoomType !== 'inner') {
+                self.zoomLens = $('<div class="zoomLens" style="' + self.lensStyle + self.lensRound + '">&nbsp;</div>')
+                    .appendTo(self.zoomContainer)
+                    .click(function () {
+                        self.$elem.trigger('click');
+                    });
+
+                if (self.options.tint) {
+                    self.tintContainer = $('<div/>').addClass('tintContainer');
+                    self.zoomTint = $('<div class="zoomTint" style="' + self.tintStyle + '"></div>');
+
+                    self.zoomLens.wrap(self.tintContainer);
+
+                    self.zoomTintcss = self.zoomLens.after(self.zoomTint);
+
+                    //if tint enabled - set an image to show over the tint
+
+                    self.zoomTintImage = $('<img style="' +
+                        'position: absolute; left: 0px; top: 0px; max-width: none; ' +
+                        'width: ' + self.nzWidth + 'px; ' +
+                        'height: ' + self.nzHeight + 'px;" ' +
+                        'src="' + self.imageSrc + '">')
+                        .appendTo(self.zoomLens)
+                        .click(function () {
+
+                            self.$elem.trigger('click');
+                        });
+                }
+            }
+
+            var targetZoomContainer = isNaN(self.options.zoomWindowPosition) ? 'body' : self.zoomContainer;
+            //create zoom window
+            self.zoomWindow = $('<div style="z-index:999;' +
+                'left:' + (self.windowOffsetLeft) + 'px;' +
+                'top:' + (self.windowOffsetTop) + 'px;' + self.zoomWindowStyle + '" class="zoomWindow">&nbsp;</div>')
+                .appendTo(targetZoomContainer).click(function () {
+                    self.$elem.trigger('click');
+                });
+            self.zoomWindowContainer = $('<div/>').addClass('zoomWindowContainer').css('width', self.options.zoomWindowWidth);
+            self.zoomWindow.wrap(self.zoomWindowContainer);
+
+            //  self.captionStyle = "text-align: left;background-color: black;'+
+            // 'color: white;font-weight: bold;padding: 10px;font-family: sans-serif;font-size: 11px";
+            // self.zoomCaption = $('<div class="ezplus-caption" '+
+            // 'style="'+self.captionStyle+'display: block; width: 280px;">INSERT ALT TAG</div>').appendTo(self.zoomWindow.parent());
+
+            if (self.options.zoomType === 'lens') {
+                self.zoomLens.css('background-image', 'url("' + self.imageSrc + '")');
+            }
+            if (self.options.zoomType === 'window') {
+                self.zoomWindow.css('background-image', 'url("' + self.imageSrc +