Merge pull request ietf-tools#109 from ietf-tools/deploy/preview

Deploy/preview -> Main
larseggert · Aug 2, 2021 · d374a73 · d374a73
2 parents 0148fea + a2797ca
commit d374a73
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/ietf/events/migrations/0003_auto_20210704_2343.py b/ietf/events/migrations/0003_auto_20210704_2343.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.19 on 2021-07-04 23:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0002_auto_20210325_0442'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventpage',
+            name='introduction',
+            field=models.CharField(help_text='The introduction for the event page. Limited to 511 characters.', max_length=511),
+        ),
+    ]
diff --git a/ietf/events/models.py b/ietf/events/models.py
@@ -110,7 +110,7 @@ class EventPage(Page, PromoteMixin):
         help_text="The end date of the event."
     )
     introduction = models.CharField(
-        max_length=200,
+        max_length=511,
         help_text="The introduction for the event page. "
         "Limited to 511 characters."
     )

diff --git a/ietf/settings/base.py b/ietf/settings/base.py
@@ -151,6 +151,9 @@
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 MEDIA_URL = "/media/"
 
+# File upload permissions
+# https://docs.djangoproject.com/en/3.2/ref/settings/#file-upload-permissions
+FILE_UPLOAD_PERMISSIONS = 0o664
 
 # Django compressor settings
 # http://django-compressor.readthedocs.org/en/latest/settings/

diff --git a/ietf/templates/404.html b/ietf/templates/404.html
@@ -22,11 +22,11 @@
 
 
                 <div class="u-max-text-width">
-                    <h1>HTTP Status Code:<br />
-                        <a href="https://datatracker.ietf.org/doc/rfc7231/?include_text=1">404 Page Not Found</a>
-                    </h1>
+                    <h1>HTTP Status Code: 404 Page Not Found</h1>
+
+                    <p>Did you know that the IETF is where the <a href="https://www.ietf.org/rfc/rfc7231.txt">404 error code</a> is defined?</p>
 
-                    <p>There was no Web page at the <a href="https://www.ietf.org/rfc/rfc1738.txt">URL</a> provided. Please use the standard site navigation above or the search bar below to find what you’re looking for.</p>
+                    <p>There was no Web page at the URL provided. Please use the standard site navigation above or the search bar below to find what you’re looking for.</p>
                 </div>
 
                 <div class="row mb-4 mt-4">