Merge pull request #658 from rapidpro/fix-stories-homepage

Fix homepage stories
rapidpro · Dec 1, 2020 · 9f56142 · 9f56142
2 parents bb9cb8f + 8b9a55f
commit 9f56142
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         pg-version: ['9.6', '10', '11']
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v1

diff --git a/templates/public/index.haml b/templates/public/index.haml
@@ -115,7 +115,7 @@
 
                   %a.twitter-timeline(href='https://twitter.com/{{ org|config:"twitter_handle" }}' width="400px" height="500px" data-chrome="noheader nofooter" data-link-color="#4aaad4" target="_blank")
 
-  - if stories
+  - if main_stories
     // featured-story-full
     .max-w-page.mx-auto.hidden.bg-squares(class="md:block")
       .flex
@@ -130,7 +130,7 @@
             &nbsp;
 
       %div
-        - for story in stories|slice:"1"
+        - for story in main_stories|slice:"1"
           .border-solid.border-dark1(class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %}")
             .border-solid.border-light1.flex(class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %}")
               .pl-10.flex.flex-col.justify-center(class="w-1/3 rtl:pr-10 ltr:pl-10")
@@ -168,7 +168,7 @@
 
     // featured-story-mobile
     %div(class="md:hidden")
-      - for story in stories|slice:"1"
+      - for story in main_stories|slice:"1"
         - if story.get_image
           {% thumbnail story.get_image "800x500" crop="top" as im %}
           %img(width="100%" src="{{im.url}}")

diff --git a/ureport/settings.py.prod b/ureport/settings.py.prod
@@ -28,12 +28,12 @@ CSRF_COOKIE_AGE = 10800
 SECURE_HSTS_INCLUDE_SUBDOMAINS = True
 SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_BROWSER_XSS_FILTER = True
-SECURE_HSTS_PRELOAD: False
-SECURE_HSTS_SECONDS: 86400
-SECURE_PROXY_SSL_HEADER: ('HTTP_X_FORWARDED_PROTO', 'HTTPS')
-SECURE_REDIRECT_EXEMPT: []
-SECURE_SSL_HOST: None
-SECURE_SSL_REDIRECT: False
+SECURE_HSTS_PRELOAD = False
+SECURE_HSTS_SECONDS = 86400
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'HTTPS')
+SECURE_REDIRECT_EXEMPT =  []
+SECURE_SSL_HOST = None
+SECURE_SSL_REDIRECT = False
 
 # these guys will get email from sentry
 ADMINS = (

diff --git a/ureport/settings.py.staging b/ureport/settings.py.staging
@@ -26,12 +26,12 @@ CSRF_COOKIE_AGE = 10800
 SECURE_HSTS_INCLUDE_SUBDOMAINS = True
 SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_BROWSER_XSS_FILTER = True
-SECURE_HSTS_PRELOAD: False
-SECURE_HSTS_SECONDS: 86400
-SECURE_PROXY_SSL_HEADER: ('HTTP_X_FORWARDED_PROTO', 'HTTPS')
-SECURE_REDIRECT_EXEMPT: []
-SECURE_SSL_HOST: None
-SECURE_SSL_REDIRECT: False
+SECURE_HSTS_PRELOAD =  False
+SECURE_HSTS_SECONDS = 86400
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'HTTPS')
+SECURE_REDIRECT_EXEMPT = []
+SECURE_SSL_HOST = None
+SECURE_SSL_REDIRECT = False
 
 # these guys will get email from sentry
 ADMINS = (