Fix #2219: Overlapping summary mail content

Fix Wall entry layout link/text overflow
humhub · Apr 4, 2017 · 44e5ac1 · 44e5ac1
1 parent c5039b8
commit 44e5ac1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
@@ -8,6 +8,8 @@ HumHub Change Log
 - Fix: Mentioning notificaiton in user not working
 - Fix: Catch yii\db\Expression error for updated_at in wallentry
 - Enh: Added 'client.back' js action
+- Fix #2219: Overlapping summary mail content
+- Fix Wall entry layout link/text overflow
 
 1.2.0-beta.4 (March 28, 2017)
 --------------------------------

diff --git a/protected/humhub/modules/activity/views/layouts/mail.php b/protected/humhub/modules/activity/views/layouts/mail.php
@@ -65,30 +65,29 @@
 
                                                             <tr>
                                                                 <td style="font-size: 13px; line-height: 22px; font-family:Open Sans,Arial,Tahoma, Helvetica, sans-serif; color:#555555; font-weight:300; text-align:left; ">
-
-                                                                    <!-- content output-->
-                                                                    <?= $content; ?>
-
-                                                                    <!-- check if activity object has a space -->
-                                                                    <?php if ($record->content->space !== null): ?>
-                                                                        (<?= Yii::t('ActivityModule.views_activityLayoutMail', 'via'); ?>
-                                                                        <a href="<?= $record->content->space->createUrl('/space/space', [], true); ?>"
-                                                                           style="text-decoration: none; color: #555555;">
-                                                                               <?= Html::encode($record->content->space->name); ?></a>)
-                                                                    <?php endif; ?>
-
-                                                                    <?php if ($url != "") : ?>
-                                                                        <!-- START: CONTENT LINK -->
-                                                                        <span
-                                                                            style="text-decoration: none; color: #7191a8;"> - <a
-                                                                                href="<?= $url; ?>"
-                                                                                style="text-decoration: none; color: #7191a8; "><?= Yii::t('ActivityModule.views_activityLayoutMail', 'see online'); ?></a></span>
-                                                                        <!-- END: CONTENT LINK -->
-                                                                    <?php endif; ?>
-
-
-
-
+                                                                    <!-- prevent content overflow -->
+                                                                    <div style="width:480px;overflow:hidden;text-overflow:ellipsis;font-size: 13px; line-height: 22px; font-family:Open Sans,Arial,Tahoma, Helvetica, sans-serif; color:#555555; font-weight:300; text-align:left;">
+                                                                        <!-- content output-->
+                                                                        <?= $content; ?>
+
+                                                                        <!-- check if activity object has a space -->
+                                                                        <?php if ($record->content->space !== null): ?>
+                                                                            (<?= Yii::t('ActivityModule.views_activityLayoutMail', 'via'); ?>
+                                                                            <a href="<?= $record->content->space->createUrl('/space/space', [], true); ?>"
+                                                                               style="text-decoration: none; color: #555555;">
+                                                                                   <?= Html::encode($record->content->space->name); ?></a>)
+                                                                        <?php endif; ?>
+
+                                                                        <?php if ($url != "") : ?>
+                                                                            <!-- START: CONTENT LINK -->
+                                                                            <span
+                                                                                style="text-decoration: none; color: #7191a8;"> - <a
+                                                                                    href="<?= $url; ?>"
+                                                                                    style="text-decoration: none; color: #7191a8; "><?= Yii::t('ActivityModule.views_activityLayoutMail', 'see online'); ?></a></span>
+                                                                            <!-- END: CONTENT LINK -->
+                                                                        <?php endif; ?>
+                                                                    </div>
+
                                                                 </td>
                                                             </tr>
 

diff --git a/static/less/stream.less b/static/less/stream.less
@@ -30,7 +30,13 @@
 // Wall-Entries
 .wall-entry {
     position: relative;
-
+
+    .content {
+        p, a {
+            overflow:hidden;
+            text-overflow:ellipsis;
+        }
+    }
     .media {
         overflow: visible;
     }

diff --git a/themes/HumHub/css/theme.css b/themes/HumHub/css/theme.css