Merge pull request #374 from divio/bugfix/tabular-inline

Fixed string representation in the tabular inline

Author: vxsx

CHANGELOG.rst

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.2.5 (unreleased)
+------------------
+
+* Fixed string representation in the tabular inline
+
+
 1.2.4 (2016-09-15)
 ------------------
 

djangocms_admin_style/sass/components/_content.scss

@@ -158,6 +158,7 @@ ul.messagelist + #content {
         border-radius: 0;
         background: none !important;
         box-shadow: none;
+        overflow: auto;
         h2 {
             font-size: $font-size-large !important;
             margin-bottom: 10px;
@@ -185,10 +186,6 @@ ul.messagelist + #content {
             border-bottom: none !important;
         }
     }
-    .module {
-        overflow: auto;
-        width: 80%;
-    }
     .add-row {
         border-bottom: 0 !important;
         &,

djangocms_admin_style/sass/components/_tables.scss

@@ -29,7 +29,7 @@
             border-right: 0 !important;
         }
         p,
-        a {
+        a:not(.cke_button) {
             font-size: $font-size-normal !important;
             line-height: $font-size-normal;
             font-weight: normal;
@@ -324,24 +324,27 @@
         }
     }
     tbody td {
+        padding-top: 46px !important;
         input[type="checkbox"] {
             line-height: 36px;
             height: 36px;
         }
+        > p {
+            line-height: 36px;
+        }
         a:not(.related-widget-wrapper-link):not(.add-another):before {
             vertical-align: middle;
             line-height: 36px;
         }
     }
     td.original {
-        // make sure that there is no padding if there is no content #252
-        padding: 0 !important;
+        padding-left: 0 !important;
+        padding-right: 0 !important;
         p {
-            position: static !important;
             line-height: 36px  !important;
             height: 36px  !important;
             font-weight: normal !important;
-            padding: 0 !important;
+            padding: 0 13px !important;
         }
         .vForeignKeyRawIdAdminField {
             width: auto;

djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css

@@ -211,6 +211,61 @@ casper.test.begin('Creation of a new job opening', function (test) {
         });
 });
 
+casper.test.begin('Submission of a job opening', function (test) {
+    casper.start()
+        .then(cms.addPage({ title: 'Home' }))
+        .then(cms.addPage({ title: 'Jobs' }))
+        .then(cms.addApphookToPage({
+            page: 'Jobs',
+            apphook: 'JobsApp'
+        }))
+        .then(cms.publishPage({
+            page: 'Jobs'
+        }))
+        .thenOpen(globals.baseUrl + 'jobs/')
+        .waitForSelector('article', function () {
+            this.clickLabel('Test job');
+        })
+        .waitForSelector('form', function () {
+            this.fill('form', {
+                salutation: 'male',
+                first_name: 'Vadim',
+                last_name: 'Sikora',
+                email: '[email protected]',
+                cover_letter: 'Oh boy, I am amazing!'
+            }, true);
+        })
+        .waitForSelector('.cms-messages-inner', function () {
+            test.assertSelectorHasText('.cms-messages-inner', 'You have successfully applied for');
+        })
+        .thenOpen(globals.adminUrl)
+        .waitUntilVisible('#content', function () {
+            this.click(
+                xPath(cms.getXPathForAdminSection({
+                    section: 'Aldryn Jobs',
+                    row: 'Job openings',
+                    link: 'Change'
+                }))
+            );
+        })
+        .waitForUrl(/jobopening/)
+        .waitForSelector('#changelist-form', function () {
+            this.clickLabel('Test job');
+        })
+        .waitUntilVisible('#jobopening_form')
+        .wait(2000, function () {
+            phantomcss.screenshot('html', 'Job opening with submissions');
+        })
+        .then(function () {
+            phantomcss.compareSession();
+        })
+        .then(cms.removePage())
+        .then(cms.removePage())
+        .run(function () {
+            test.done();
+        });
+});
+
 casper.test.begin('Deletion of a job opening', function (test) {
     casper
         .start(globals.adminUrl)