website-update-newhomepage

Author: mawy7

app/models.py

@@ -13,7 +13,7 @@ class Album(models.Model):
     flickr_url = models.URLField(default='', help_text='Link to Flick Photo Ablum', blank=True,)
     album_link = models.URLField(help_text='Link to Photo Ablum', blank=False,)
     googlephotos_url = models.URLField(default='', help_text='Link to Google Photo Ablum', blank=True,)
-    thumb = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(300)], format='JPEG', options={'quality': 90})
+    thumb = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(300)], format='jpg', options={'quality': 90})
     tags = models.CharField(max_length=250)
     is_visible = models.BooleanField(default=True)
     created = models.DateTimeField(auto_now_add=True)
@@ -27,8 +27,8 @@ def __unicode__(self):
         return self.title
 
 class AlbumImage(models.Model):
-    image = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(1280)], format='JPEG', options={'quality': 70})
-    thumb = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(300)], format='JPEG', options={'quality': 80})
+    image = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(1280)], format='jpg', options={'quality': 70})
+    thumb = ProcessedImageField(upload_to='albums', processors=[ResizeToFit(300)], format='jpg', options={'quality': 80})
     album = models.ForeignKey('album')
     alt = models.CharField(max_length=255, default=uuid.uuid4)
     created = models.DateTimeField(auto_now_add=True)

gallery/.coveragerc

@@ -0,0 +1,4 @@
+[run]
+omit =
+    */tests/*
+    */runtests.py

gallery/.travis.yml

@@ -0,0 +1,12 @@
+dist: xenial
+language: python
+python:
+  - "3.6"
+install:
+  - ./build.sh
+  - pip install --find-links ./django-starcross-gallery/dist django-starcross-gallery
+  - pip install coveralls
+script:
+  - coverage run --source=gallery runtests.py
+after_success:
+  - coveralls

gallery/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

gallery/MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE
+include README.rst
+recursive-include gallery/static *
+recursive-include gallery/templates *

gallery/README.rst

@@ -0,0 +1,136 @@
+.. image:: https://img.shields.io/pypi/v/django-starcross-gallery.svg
+    :target: https://pypi.python.org/pypi/django-starcross-gallery/
+    :alt: PyPI version
+
+.. image:: https://travis-ci.org/Starcross/django-starcross-gallery.svg?branch=master
+    :target: https://travis-ci.org/Starcross/django-starcross-gallery
+    :alt: Build Status
+
+.. image:: https://coveralls.io/repos/github/Starcross/django-starcross-gallery/badge.svg?branch=master
+    :target: https://coveralls.io/github/Starcross/django-starcross-gallery?branch=master
+    :alt: Code coverage
+
+=================
+Starcross Gallery
+=================
+
+Starcross Gallery is a streamlined photo gallery Django app. Key features are:
+
+* Justified image grid display, as used on sites like Flickr
+* Infinite scroll
+* Easy drag and drop upload
+* Straightforward object model - All metadata is pulled from the file including title and exif data
+
+Demo at https://starcross.dev/gallery
+
+Quick start
+-----------
+
+1. Install Starcross gallery using pip::
+
+    pip install django-starcross-gallery
+
+2. Add "gallery" to your INSTALLED_APPS setting like this::
+
+    INSTALLED_APPS = [
+        ...
+        'gallery',
+    ]
+
+3. Include the gallery URLconf in your project urls.py like this with your preferred location e.g. "gallery/"::
+
+    path('gallery/', include('gallery.urls')),
+
+4. Ensure a `MEDIA directory <https://docs.djangoproject.com/en/2.1/topics/files/>`_ is set up
+
+5. Run ``python manage.py makemigrations gallery``, then ``python manage.py migrate gallery`` to create the models.
+
+6. Start the development server and create any albums you required in http://127.0.0.1:8000/admin/. It's not necessary to create albums if you prefer just a single image feed
+
+7. Visit http://127.0.0.1:8000/gallery/ to access the gallery. Albums can be added through the django admin interface (/admin)
+
+
+Instructions
+------------
+
+Starcross gallery groups Images into Albums, which enables your to organise your presentation. Add albums via the django admin interface, and drag multiple images into your empty albums in the album page itself. It's also possible to use the gallery as a flat image feed only, which is a view published at <gallery base>/images. All images will be displayed here in descending date order. You can add images here directly as well, but they will not be added to an album.
+
+The gallery was designed with simplicity of Image management in mind, so titles are derived from the file name. You only need to add albums and then drag your collection into place. The idea is to avoid the need to manage your collection both on the website and on your disk. If you wish to reorganise, you can delete and easily re-upload
+
+Images in albums are ordered by the date the photo was taken if available in the exif data, or failing that the modification date
+
+Album order can be specified in the Django admin interface. Support for `django-admin-sortable2 <https://github.com/jrief/django-admin-sortable2>`_ is provided, if you want drag and drop ordering in the admin interface. Just installing the module is all that's required. If you have already added albums you will need to use the `reorder <https://django-admin-sortable2.readthedocs.io/en/latest/usage.html#initial-data>`_ command.
+
+Settings
+--------
+
+Override these default settings by adding to your settings.py
+
+
+**GALLERY_LOGO_PATH** -- Default: "gallery/images/starcross.png"
+
+Path to the header logo within the static directory. If you do not wish to use a logo, override with a blank string
+
+**GALLERY_TITLE** -- Default: "Gallery"
+
+The title of the Gallery shown in the header on the main page and image feed
+
+**GALLERY_FOOTER_INFO** -- Default: "Starcross Gallery"
+
+Information text in the footer
+
+**GALLERY_FOOTER_EMAIL** -- Default: "[email protected]"
+
+Contact email address in the footer. Override with a blank string to hide
+
+**GALLERY_THEME_COLOR** -- Default "black"
+
+Use a predefined theme color scheme. Options are black, white, or grey
+
+**GALLERY_THUMBNAIL_SIZE** -- Default: 200
+
+The target thumbnail height in px. This will vary slightly in rendering due to the justified layout
+
+**GALLERY_PREVIEW_SIZE** -- Default: 1000
+
+The preview size in px - width or height, whichever is largest. The rendered image size will depend on the size of the browser window, so this should be set high enough to not cause a deterioration in quality
+
+**GALLERY_RESIZE_QUALITY** -- Default: 80
+
+JPEG quality (0-100) of the preview and thumbnail images
+
+**GALLERY_HDPI_FACTOR** -- Default: 2
+
+The actual preview and thumbnail sizes are multiplied by this number, but rendered according to the quoted value. This enables high dpi displays, such as many mobile devices to show more detail and take advantage of their extra resolution. Some go up to 4x now, so recommended values are 1-4
+
+**GALLERY_IMAGE_MARGIN** -- Default: 6
+
+Margin between thumbnails in px. Some may prefer a less condensed look, so increase this value if your template requires it
+
+
+Troubleshooting
+---------------
+
+**Broken image links after upload**
+
+Check your MEDIA settings. If the media location on disk is changed, you will need to copy the files in the CACHE directory to the new location, or delete and re-upload the broken images
+
+**Errors during upload**
+
+Your server may have a limit on maximum request size (e.g. client_max_body_size for nginx). This needs to be larger than the combined total of all the images your are uploading at once. Also the timeout may need to be extended as preview and thumbnail caches are generated at the time of upload
+
+**Delay when dragging images into upload box**
+
+If you are using Firefox on Linux, there can be a delay before the upload box flashes to acknowledge the pending files, proportional to the number of files. You can use another browser such as Chrome if this is inconvenient.
+
+Credits
+-------
+
+Starcross Gallery is by Alex Luton <[email protected]>, published under GNU LGPLv3
+
+
+Album icon by Google licensed CC BY 3.0
+
+Focal Length icon by Ilaria Bernareggi from the Noun Project
+
+Other image data icons made by Freepik www.flaticon.com licensed by CC 3.0 BY

gallery/__init__.py

@@ -0,0 +1,2 @@
+
+default_app_config = 'gallery.apps.GalleryConfig'

gallery/admin.py

@@ -0,0 +1,34 @@
+from gallery.models import Image, Album
+from django.contrib import admin
+from imagekit.admin import AdminThumbnail
+# Support adminsortable2 optionally
+import importlib
+if importlib.util.find_spec('adminsortable2', 'admin'):
+    from adminsortable2.admin import SortableAdminMixin
+else:
+    # Mock up class for mixin
+    class SortableAdminMixin:
+        mock = True
+
+
+class ImageAdmin(admin.ModelAdmin):
+    admin_thumbnail = AdminThumbnail(image_field='data_thumbnail', template='gallery/admin/thumbnail.html')
+    list_display = ('title', 'admin_thumbnail', 'date_taken', 'date_uploaded')
+    list_filter = ('image_albums',)
+    list_per_page = 25
+    readonly_fields = ('admin_thumbnail',)
+
+
+class AlbumAdmin(SortableAdminMixin, admin.ModelAdmin):
+    list_display = ('order', 'title')
+    list_display_links = ('title',)
+    if hasattr(SortableAdminMixin, 'mock'):
+        list_editable = ('order',)
+        list_display = ('title', 'order')
+    filter_horizontal = ('images',)
+    raw_id_fields = ('highlight',)
+
+
+admin.site.register(Image, ImageAdmin)
+admin.site.register(Album, AlbumAdmin)
+

gallery/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+class GalleryConfig(AppConfig):
+    name = 'gallery'
+    verbose_name = 'Starcross Gallery'
+
+    def ready(self):
+        import gallery.signals