Adapted models and templates to support Uploadcare

Zowie · Jul 13, 2017 · 7c57311 · 7c57311
1 parent 1403edf
commit 7c57311
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,12 @@
+.idea
 *.log
 *.pot
 *.pyc
 .project
 .pydevproject
 .settings
 .*
-djangocms_slideshow.egg-info
-djangocms_slider_easy.egg-info
+djangocms_slider_easy_uploadcare.egg-info
 dist
 build
 env*

diff --git a/djangocms_slider/migrations/__init__.py → __init__.py b/djangocms_slider/migrations/__init__.py → __init__.py
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/djangocms_slider/__init__.py b/djangocms_slider/__init__.py
diff --git a/djangocms_slider/migrations/0001_initial.py b/djangocms_slider/migrations/0001_initial.py
diff --git a/djangocms_slider/migrations/0002_auto_20160728_1656.py b/djangocms_slider/migrations/0002_auto_20160728_1656.py
diff --git a/djangocms_slider/migrations/0003_auto_20160728_1705.py b/djangocms_slider/migrations/0003_auto_20160728_1705.py
diff --git a/djangocms_slider/migrations/0004_auto_20161108_2219.py b/djangocms_slider/migrations/0004_auto_20161108_2219.py
diff --git a/djangocms_slider_uploadcare/__init__.py b/djangocms_slider_uploadcare/__init__.py
@@ -0,0 +1 @@
+__version__ = '0.3.0'
diff --git a/djangocms_slider/cms_plugins.py → djangocms_slider_uploadcare/cms_plugins.py b/djangocms_slider/cms_plugins.py → djangocms_slider_uploadcare/cms_plugins.py
@@ -3,25 +3,25 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from django.utils.translation import ugettext_lazy as _
-from .models import Slider, Slide
+from .models import UploadcareSlide, UploadcareSlider
 
 
-class SlidePlugin(CMSPluginBase):
-    model = Slide
+class UploadcareSlidePlugin(CMSPluginBase):
+    model = UploadcareSlide
     module = _("Slider")
     name = _("Slide")
     render_template = 'djangocms_slider/slide.html'
 
-plugin_pool.register_plugin(SlidePlugin)
+plugin_pool.register_plugin(UploadcareSlidePlugin)
 
 
-class SliderPlugin(CMSPluginBase):
-    model = Slider
+class UploadcareSliderPlugin(CMSPluginBase):
+    model = UploadcareSlider
     name = _('Slider')
     module = _("Slideshow")
     render_template = 'djangocms_slider/slider.html'
     allow_children = True
-    child_classes = ["SlidePlugin"]
+    child_classes = ["UploadcareSlidePlugin"]
 
     def render(self, context, instance, placeholder):
         context.update({
@@ -31,4 +31,4 @@ def render(self, context, instance, placeholder):
         return context
 
 
-plugin_pool.register_plugin(SliderPlugin)
+plugin_pool.register_plugin(UploadcareSliderPlugin)
diff --git a/...ms_slider/locale/en/LC_MESSAGES/django.mo → ...ploadcare/locale/en/LC_MESSAGES/django.mo b/...ms_slider/locale/en/LC_MESSAGES/django.mo → ...ploadcare/locale/en/LC_MESSAGES/django.mo
diff --git a/...ms_slider/locale/en/LC_MESSAGES/django.po → ...ploadcare/locale/en/LC_MESSAGES/django.po b/...ms_slider/locale/en/LC_MESSAGES/django.po → ...ploadcare/locale/en/LC_MESSAGES/django.po
diff --git a/...ms_slider/locale/nl/LC_MESSAGES/django.mo → ...ploadcare/locale/nl/LC_MESSAGES/django.mo b/...ms_slider/locale/nl/LC_MESSAGES/django.mo → ...ploadcare/locale/nl/LC_MESSAGES/django.mo
diff --git a/...ms_slider/locale/nl/LC_MESSAGES/django.po → ...ploadcare/locale/nl/LC_MESSAGES/django.po b/...ms_slider/locale/nl/LC_MESSAGES/django.po → ...ploadcare/locale/nl/LC_MESSAGES/django.po
diff --git a/djangocms_slider_uploadcare/migrations/0001_initial.py b/djangocms_slider_uploadcare/migrations/0001_initial.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import pyuploadcare.dj.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0016_auto_20160608_1535'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UploadcareSlide',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(primary_key=True, serialize=False, auto_created=True, related_name='djangocms_slider_uploadcare_uploadcareslide', parent_link=True, to='cms.CMSPlugin')),
+                ('image', pyuploadcare.dj.models.ImageField()),
+                ('url', models.CharField(verbose_name='link', max_length=255, blank=True, null=True, help_text='If present, clicking on image will take user to link.')),
+                ('caption', models.TextField(verbose_name='caption', max_length=255, blank=True, null=True, help_text='Specifies text that occurs on the slide.')),
+                ('page_link', models.ForeignKey(verbose_name='page', blank=True, null=True, help_text='If present, clicking on image will take user to specified page.', to='cms.Page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='UploadcareSlider',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(primary_key=True, serialize=False, auto_created=True, related_name='djangocms_slider_uploadcare_uploadcareslider', parent_link=True, to='cms.CMSPlugin')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+    ]
diff --git a/djangocms_slider_uploadcare/migrations/__init__.py b/djangocms_slider_uploadcare/migrations/__init__.py
diff --git a/djangocms_slider/models.py → djangocms_slider_uploadcare/models.py b/djangocms_slider/models.py → djangocms_slider_uploadcare/models.py
@@ -18,7 +18,7 @@ def get_plugin_media_path(instance, filename):
 
 
 @python_2_unicode_compatible
-class Slide(CMSPlugin):
+class UploadcareSlide(CMSPlugin):
     """
     A Slide plugin that contains an image and some text.
     """
@@ -57,7 +57,7 @@ def clean(self):
 
 
 @python_2_unicode_compatible
-class Slider(CMSPlugin):
+class UploadcareSlider(CMSPlugin):
     """
     Plugin that can contain Slides.
     """

diff --git a/...der/templates/djangocms_slider/slide.html → ...are/templates/djangocms_slider/slide.html b/...der/templates/djangocms_slider/slide.html → ...are/templates/djangocms_slider/slide.html
diff --git a/...er/templates/djangocms_slider/slider.html → ...re/templates/djangocms_slider/slider.html b/...er/templates/djangocms_slider/slider.html → ...re/templates/djangocms_slider/slider.html
diff --git a/setup.py b/setup.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 import os
 
-import djangocms_slider
+import djangocms_slider_uploadcare
 
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-version = djangocms_slider.__version__
+version = djangocms_slider_uploadcare.__version__
 
 
 def read(fname):
@@ -39,15 +39,15 @@ def read(fname):
 ]
 
 setup(
-    name="djangocms-slider-easy",
+    name="djangocms-slider-easy-uploadcare",
     version=version,
     author="Luminum Solutions",
-    author_email="info@akoten.com",
+    author_email="zowie@akoten.com",
     description="A slider plugin for djangocms that lets you arrange slides like any other djangocms plugin. Fork of urga/djangocms-slider, but using uploadcare.",
     license="BSD",
     keywords=["slideshow", "django", "cms", "plugin"],
     url="https://github.com/Akoten/djangocms-slider-easy-uploadcare",
-    packages=['djangocms_slider', 'djangocms_slider.migrations'],
+    packages=['djangocms_slider_uploadcare', 'djangocms_slider_uploadcare.migrations'],
     install_requires=INSTALL_REQUIRES,
     classifiers=CLASSIFIERS,
     long_description=read('README.md'),