You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/06/24 19:36:53 UTC
[airavata-django-portal] branch develop updated (7e330f7 -> 9d1858b)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 7e330f7 Merge branch 'AIRAVATA-3340' into develop
add 0804f48 Fix linting errors
add 72fb150 Merge branch 'AIRAVATA-3306-wagtail-allow-specifying-a-container-for-page-row'
new 27b2667 AIRAVATA-3347 Add `interval` to BootstrapCarousel block
new 9d1858b Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/apps/auth/backends.py | 2 +-
django_airavata/static/common/js/cms.js | 4 ----
.../templates/blocks/bootstrap/carousel.html | 2 +-
django_airavata/wagtailapps/base/blocks.py | 4 ++++
...20191106_1542.py => 0024_auto_20200624_1925.py} | 24 ++++++++--------------
5 files changed, 14 insertions(+), 22 deletions(-)
copy django_airavata/wagtailapps/base/migrations/{0022_auto_20191106_1542.py => 0024_auto_20200624_1925.py} (55%)
[airavata-django-portal] 01/02: AIRAVATA-3347 Add `interval` to
BootstrapCarousel block
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 27b2667ca0f104256a4808c830b6e98beeaf47bd
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 24 15:36:08 2020 -0400
AIRAVATA-3347 Add `interval` to BootstrapCarousel block
---
django_airavata/static/common/js/cms.js | 4 --
.../templates/blocks/bootstrap/carousel.html | 2 +-
django_airavata/wagtailapps/base/blocks.py | 4 ++
.../base/migrations/0024_auto_20200624_1925.py | 50 ++++++++++++++++++++++
4 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/django_airavata/static/common/js/cms.js b/django_airavata/static/common/js/cms.js
index 45583b2..7e6153e 100644
--- a/django_airavata/static/common/js/cms.js
+++ b/django_airavata/static/common/js/cms.js
@@ -7,7 +7,3 @@ import "@fortawesome/fontawesome-free/css/all.css";
$(function() {
$('[data-toggle="tooltip"]').tooltip();
});
-
-$('.carousel').carousel({
- interval: 2000
-})
diff --git a/django_airavata/templates/blocks/bootstrap/carousel.html b/django_airavata/templates/blocks/bootstrap/carousel.html
index ef76efe..284973d 100755
--- a/django_airavata/templates/blocks/bootstrap/carousel.html
+++ b/django_airavata/templates/blocks/bootstrap/carousel.html
@@ -1,7 +1,7 @@
{% load wagtailimages_tags %}
-<div id="carouselExampleIndicators" class="carousel slide {%if self.custom_class %}{{self.custom_class}}{% endif %}" data-ride="carousel">
+<div id="carouselExampleIndicators" class="carousel slide {%if self.custom_class %}{{self.custom_class}}{% endif %}" data-ride="carousel" data-interval="{{self.interval}}">
<ol class="carousel-indicators">
<li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
{% if self.c_image2 %}<li data-target="#carouselExampleIndicators" data-slide-to="1"></li>{% endif %}
diff --git a/django_airavata/wagtailapps/base/blocks.py b/django_airavata/wagtailapps/base/blocks.py
index bbb8a6d..729d7e2 100644
--- a/django_airavata/wagtailapps/base/blocks.py
+++ b/django_airavata/wagtailapps/base/blocks.py
@@ -338,6 +338,10 @@ class BootstrapCarousel(StructBlock):
"""
Custom 'StructBlock' that allows the user to make a bootstrap carousel
"""
+ interval = IntegerBlock(default=2000, help_text="""
+ The amount of time to delay between automatically cycling an item. If
+ false, carousel will not automatically cycle.
+ """)
c_image1 = ImageChooserBlock(required=True)
c_image1_title = TextBlock(
required=False, blank=True, help_text="Give a title for image 1")
diff --git a/django_airavata/wagtailapps/base/migrations/0024_auto_20200624_1925.py b/django_airavata/wagtailapps/base/migrations/0024_auto_20200624_1925.py
new file mode 100644
index 0000000..bc4064b
--- /dev/null
+++ b/django_airavata/wagtailapps/base/migrations/0024_auto_20200624_1925.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2020-06-24 19:25
+from __future__ import unicode_literals
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.documents.blocks
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('django_airavata_wagtail_base', '0023_rowblankpagerelation_container'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='cybergatewayhomepage',
+ name='contact',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ migrations.AlterField(
+ model_name='cybergatewayhomepage',
+ name='footer',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ migrations.AlterField(
+ model_name='footertext',
+ name='footer',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ migrations.AlterField(
+ model_name='homepage',
+ name='body',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ migrations.AlterField(
+ model_name='rowblankpagerelation',
+ name='body',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ migrations.AlterField(
+ model_name='rowcybergatewayhomepagerelation',
+ name='body',
+ field=wagtail.core.fields.StreamField((('paragraph_block', wagtail.core.blocks.StructBlock((('custom_class', wagtail.core.blocks.TextBlock(blank=True, help_text='control this element by giving unique class names separated by space and styling the class in css', required=False)), ('body', wagtail.core.blocks.RichTextBlock())))), ('image_block', wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.Ch [...]
+ ),
+ ]
[airavata-django-portal] 02/02: Merge branch
'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous' into
develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 9d1858b34873ddcc4bc56688a323f59c0f51b657
Merge: 7e330f7 27b2667
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 24 15:36:22 2020 -0400
Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous' into develop
django_airavata/apps/auth/backends.py | 2 +-
django_airavata/static/common/js/cms.js | 4 --
.../templates/blocks/bootstrap/carousel.html | 2 +-
django_airavata/wagtailapps/base/blocks.py | 4 ++
.../base/migrations/0024_auto_20200624_1925.py | 50 ++++++++++++++++++++++
5 files changed, 56 insertions(+), 6 deletions(-)