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 2018/10/31 19:12:49 UTC
[airavata-django-portal] branch master updated (9b0b28e -> 6b1dad0)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 9b0b28e AIRAVATA-2888 Fix To for admin emails
new 0e7737b AIRAVATA-2888 Default Create Account nav link block
new 6b1dad0 AIRAVATA-2888 Fixing formatting
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/wagtailapps/base/blocks.py | 73 ++++++++++++++++++++++--------
1 file changed, 53 insertions(+), 20 deletions(-)
[airavata-django-portal] 01/02: AIRAVATA-2888 Default Create
Account nav link block
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 0e7737bc158d375b410f3a65ee69376f456d5081
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 31 13:56:53 2018 -0400
AIRAVATA-2888 Default Create Account nav link block
---
django_airavata/wagtailapps/base/blocks.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/django_airavata/wagtailapps/base/blocks.py b/django_airavata/wagtailapps/base/blocks.py
index f4c4544..e2542fe 100644
--- a/django_airavata/wagtailapps/base/blocks.py
+++ b/django_airavata/wagtailapps/base/blocks.py
@@ -492,6 +492,18 @@ class LogoutNavItem(NavItem):
}
+class CreateAccountNavItem(NavItem):
+
+ class Meta:
+ default = {
+ 'link': '/auth/create-account',
+ 'link_text': 'Create Account',
+ 'icon_class': 'fas fa-user',
+ 'show': 'not-logged-in',
+ 'horizontal_alignment': 'push-right',
+ }
+
+
class Nav(StructBlock):
custom_class = CharBlock(required=False)
nav_items = StreamBlock([
@@ -499,6 +511,7 @@ class Nav(StructBlock):
('login_link', LoginNavItem()),
('dashboard_link', DashboardLinkNavItem()),
('logout_link', LogoutNavItem()),
+ ('create_account_link', CreateAccountNavItem()),
])
class Meta:
[airavata-django-portal] 02/02: AIRAVATA-2888 Fixing formatting
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 6b1dad0bd6f6df762bd97d9988c733715b04a1fd
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 31 14:01:10 2018 -0400
AIRAVATA-2888 Fixing formatting
---
django_airavata/wagtailapps/base/blocks.py | 60 ++++++++++++++++++++----------
1 file changed, 40 insertions(+), 20 deletions(-)
diff --git a/django_airavata/wagtailapps/base/blocks.py b/django_airavata/wagtailapps/base/blocks.py
index e2542fe..bdd31fa 100644
--- a/django_airavata/wagtailapps/base/blocks.py
+++ b/django_airavata/wagtailapps/base/blocks.py
@@ -31,7 +31,8 @@ class ImageBlock(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = 'image'
@@ -40,7 +41,8 @@ class ImageBlock(StructBlock):
class FontAwesomeIcon(StructBlock):
"""
- Custom 'StructBlock' for utilizing images with associated caption and attribution django_airavata
+ Custom 'StructBlock' for utilizing images with associated caption and
+ attribution django_airavata
"""
icon_tag = TextBlock(required=True, blank=False,
help_text="Provide a font awesome icon class text")
@@ -53,7 +55,8 @@ class FontAwesomeIcon(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = 'fa-flag'
@@ -67,7 +70,8 @@ class ParagraphBlock(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
body = RichTextBlock()
class Meta:
@@ -83,7 +87,8 @@ class IuFooter(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
footer_links = RichTextBlock()
class Meta:
@@ -94,7 +99,8 @@ class IuFooter(StructBlock):
class HeadingBlock(StructBlock):
"""
- Custom `StructBlock` that allows the user to select h1 - h4 sizes for headers
+ Custom `StructBlock` that allows the user to select h1 - h4 sizes for
+ headers
"""
heading_text = CharBlock(classname="title", required=True)
size = ChoiceBlock(choices=[
@@ -107,7 +113,8 @@ class HeadingBlock(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "title"
@@ -121,7 +128,8 @@ class PlaceholderBlock(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-map-marker"
@@ -136,12 +144,14 @@ class CustomEmbedBlock(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-link"
template = "blocks/embed_block.html"
- help_text = "Insert an embed URL e.g https://www.youtube.com/embed/SGJFWirQ3ks"
+ help_text = ("Insert an embed URL e.g "
+ "https://www.youtube.com/embed/SGJFWirQ3ks")
class CssCommentBlock(StructBlock):
@@ -171,7 +181,8 @@ class HorizontalRule(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-long-arrow-right"
@@ -204,7 +215,8 @@ class BootstrapJumbotron(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-indent"
@@ -233,7 +245,8 @@ class BootstrapButton(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-bold"
@@ -260,7 +273,8 @@ class BootstrapAlert(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-bell"
@@ -305,7 +319,8 @@ class BootstrapCard(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-id-card"
@@ -345,17 +360,20 @@ class BootstrapCarousel(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-film"
template = "blocks/bootstrap/carousel.html"
- help_text = "Create a bootstrap carousel. Fill the images in order to get optimized display."
+ help_text = ("Create a bootstrap carousel. Fill the images in order "
+ "to get optimized display.")
class BootstrapWell(StructBlock):
"""
- Custom 'StructBlock' that allows user to make a bootstrap well. (optimized for bootstrap 4 using card)
+ Custom 'StructBlock' that allows user to make a bootstrap well.
+ (optimized for bootstrap 4 using card)
"""
message = RichTextBlock(help_text="Enter some message inside well")
well_bg_color = ChoiceBlock(choices=[
@@ -370,7 +388,8 @@ class BootstrapWell(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-window-minimize"
@@ -400,7 +419,8 @@ class BootstrapMediaObject(StructBlock):
custom_class = TextBlock(
required=False,
blank=True,
- help_text="control this element by giving unique class names separated by space and styling the class in css")
+ help_text="control this element by giving unique class names "
+ "separated by space and styling the class in css")
class Meta:
icon = "fa-align-right"