Merge branch 'release-1.10.4'

baton/static/baton/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

baton/static/baton/app/src/index.js

@@ -78,8 +78,12 @@ window.Baton = {
       return 'change_form'
     } else if (document.getElementById('changelist')) {
       return 'changelist'
+    } else if (document.getElementById('change-history')) {
+      return 'changehistory'
     } else if (/\/filer\//.test(location.pathname)) {
       return 'filer'
+    } else {
+      return 'default'
     }
   },
   Analytics: Analytics,

baton/static/baton/app/src/styles/_changehistory.scss

@@ -1,5 +1,5 @@
 // scss-lint:disable IdSelector PlaceholderInExtend NestingDepth QualifyingElement SelectorDepth ImportantRule
-body[class=" baton-ready"] #content-main > .module {
+body.page-changehistory #content-main > .module {
   @extend .p-3;
   @extend .table-responsive;
   background: $changehistory-bg;

baton/static/baton/app/src/styles/_login.scss

@@ -1,13 +1,21 @@
 // scss-lint:disable ImportantRule IdSelector SelectorDepth NestingDepth PlaceholderInExtend
 body.login {
   padding-top: 1px;
+
+  #header #branding {
+    margin: auto !important;
+  }
 }
 
 .login {
   #content {
     padding-top: 1px !important;
   }
 
+  #content-main + br.clear {
+    display: none;
+  }
+
   #container {
     @extend .p-3;
     max-width: 100%;

baton/static/baton/app/src/styles/_placeholders.scss

@@ -39,6 +39,12 @@
       }
     }
 
+    .newline {
+      display: block;
+      height: .5rem;
+      width: 100%;
+    }
+
     > div {
       align-items: flex-start;
       display: flex;
@@ -348,6 +354,7 @@
   }
 
   input[type=text],
+  input[type=url],
   input[type=number],
   input[type=email],
   input[type=date],
@@ -359,6 +366,10 @@
     }
   }
 
+  input[type=url] {
+    display: inline-block !important;
+  }
+
   input[type=text][size] {
     width: auto !important;
   }

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.10.3'
+version = u'1.10.4'
 # The full version, including alpha/beta/rc tags.
-release = u'1.10.3'
+release = u'1.10.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.10.3',
+    version='1.10.4',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',

testapp/app/app/tests/test_e2e_tabs.py

@@ -88,9 +88,9 @@ def test_tabs(self):
         attachments_rows = inlines.find_elements_by_css_selector('.dynamic-attachments')
         self.assertEqual(inline_title.is_displayed(), True)
         self.assertEqual(inline_title.get_attribute('innerText'), 'Attachments')
-        self.assertEqual(len(attachments_rows), 1)
+        self.assertEqual(len(attachments_rows), 2)
         add_button = inlines.find_element_by_css_selector('.add-row a')
         self.assertEqual(add_button.is_displayed(), True)
         add_button.click()
         attachments_rows = inlines.find_elements_by_css_selector('.dynamic-attachments')
-        self.assertEqual(len(attachments_rows), 2)
+        self.assertEqual(len(attachments_rows), 3)

testapp/app/news/admin.py

@@ -46,7 +46,7 @@ class NewsAdmin(admin.ModelAdmin):
 
         }),
         ('Main', {
-            'fields': ('category', 'title', 'image', 'content', ),
+            'fields': ('category', 'title', 'link', 'image', 'content', ),
             'classes': ('tab-fs-main', ),
             'description': 'This is a description text'
 

testapp/app/news/migrations/0005_news_link.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.9 on 2020-08-05 10:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0004_video_author_email'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='news',
+            name='link',
+            field=models.URLField(blank=True, null=True, verbose_name='link'),
+        ),
+    ]

testapp/app/news/models.py

@@ -23,6 +23,7 @@ class News(models.Model):
     date = models.DateField('date')
     datetime = models.DateTimeField('datetime', blank=True, null=True, help_text='insert date')
     title = models.CharField('title', max_length=50, help_text='please insert a cool title')
+    link = models.URLField('link', blank=True, null=True)
     image = FilerImageField(null=True, blank=True, on_delete=models.SET_NULL, related_name="news_image")
     content = models.TextField('content', help_text='html is supported')
     share = models.BooleanField(default=False)