Skip to content

Commit

Permalink
Unnecessary blank space in message #5487 (#5488)
Browse files Browse the repository at this point in the history
  • Loading branch information
@810
810 committed Jul 26, 2017
1 parent d398e79 commit 2eef278
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 61 deletions.
21 changes: 13 additions & 8 deletions src/components/com_kunena/template/crypsis/assets/less/general.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,13 @@ a:focus,
}

.horizontal-message-bottom:after {
content: attr(data-badger);
position: absolute;
top: 0;
font-weight: bold;
padding: 8px 12px;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
content : attr(data-badger);
position : absolute;
top : 0;
font-weight : bold;
padding : 8px 12px !important;
border-right : 1px solid #ddd;
border-bottom : 1px solid #ddd;
}

[class*="badger-left"] {
Expand Down Expand Up @@ -546,6 +546,11 @@ table .well {
min-height: 110px;
}

.profile-horizontal-top .topic-starter,
.profile-horizontal-bottom .topic-starter {
border: none;
}

.table .pagination {
max-height: 25px;
}
Expand Down Expand Up @@ -1140,7 +1145,7 @@ div.krating > label:active {
}

[class*="badger"]::after {
padding: 0 !important;
padding: 0;
border-right: none !important;
border-bottom: none !important;
}
Expand Down
57 changes: 28 additions & 29 deletions src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,40 +51,39 @@
<div class="clear-fix"></div>
<div class="horizontal-message">
<div class="horizontal-message-bottom badger-info <?php if ($message->getAuthor()->isModerator()) : ?> badger-moderator <?php endif;?> message-<?php echo $this->message->getState(); ?>"
data-badger="<?php echo (!$isReply) ? $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_CREATED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage) : $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_REPLIED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage); ?>">
<div class="kmessage">
<div class="kmessage">
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
echo $message->displayField('message');
else:
echo (!$this->me->userid && $this->config->teaser) ? JText::_('COM_KUNENA_TEASER_TEXT') : $this->message->displayField('message');
endif;?>
</div>
data-badger="<?php echo (!$isReply) ? $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_CREATED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage) : $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_REPLIED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage); ?>">
<div class="kmessage">
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
echo $message->displayField('message');
else:
echo (!$this->me->userid && $this->config->teaser) ? JText::_('COM_KUNENA_TEASER_TEXT') : $this->message->displayField('message');
endif;?>
</div>
</div>

<?php if ($signature) : ?>
<div class="ksig">
<hr>
<span class="ksignature"><?php echo $signature; ?></span>
</div>
<?php endif; ?>
<?php if ($this->config->reportmsg && $this->me->exists()) :
if ($this->me->isModerator($this->topic->getCategory()) || $this->config->user_report || !$this->config->user_report && $this->me->userid != $this->message->userid) : ?>
<div id="report<?php echo $this->message->id; ?>" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<?php echo $this->subRequest('Topic/Report')->set('id', $this->topic->id); ?>
</div>
<?php if ($signature) : ?>
<div class="ksig">
<hr>
<span class="ksignature"><?php echo $signature; ?></span>
</div>
<?php endif ?>

<?php if ($this->config->reportmsg && $this->me->exists()) :
if ($this->me->isModerator($this->topic->getCategory()) || $this->config->user_report || !$this->config->user_report && $this->me->userid != $this->message->userid) : ?>
<div id="report<?php echo $this->message->id; ?>" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<?php echo $this->subRequest('Topic/Report')->set('id', $this->topic->id); ?>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
</div>
<div class="profile-horizontal-bottom">
<?php echo $this->subLayout('User/Profile')->set('user', $this->profile)->setLayout('horizontal')->set('topic_starter', $topicStarter)->set('category_id', $this->category->id); ?>
</div>
<?php endif; ?>
</div>
<div class="profile-horizontal-bottom">
<?php echo $this->subLayout('User/Profile')->set('user', $this->profile)->setLayout('horizontal')->set('topic_starter', $topicStarter)->set('category_id', $this->category->id); ?>
</div>
</div>

<?php if (!empty($attachments)) : ?>
<div class="kattach">
Expand Down
48 changes: 24 additions & 24 deletions src/components/com_kunena/template/crypsis/layouts/message/item/top/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,34 +56,34 @@
<div class="horizontal-message-top badger-info <?php if ($message->getAuthor()->isModerator()) : ?> badger-moderator <?php endif;?> message-<?php echo $this->message->getState(); ?>"
data-badger="<?php echo (!$isReply) ? $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_CREATED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage) : $avatarname . ' ' . JText::_('COM_KUNENA_MESSAGE_REPLIED') . ' ' . KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage); ?>">
<div class="kmessage">
<div class="kmessage">
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
echo $message->displayField('message');
else:
echo (!$this->me->userid && $this->config->teaser) ? JText::_('COM_KUNENA_TEASER_TEXT') : $this->message->displayField('message');
endif;?>
</div>
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
echo $message->displayField('message');
else:
echo (!$this->me->userid && $this->config->teaser) ? JText::_('COM_KUNENA_TEASER_TEXT') : $this->message->displayField('message');
endif;?>
</div>
<?php if ($signature) : ?>
<div class="ksig">
<hr>
<span class="ksignature"><?php echo $signature; ?></span>
</div>
<?php endif; ?>
<?php if ($this->config->reportmsg && $this->me->exists()) :
if ($this->me->isModerator($this->topic->getCategory()) || $this->config->user_report || !$this->config->user_report && $this->me->userid != $this->message->userid) : ?>
<div id="report<?php echo $this->message->id; ?>" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<?php echo $this->subRequest('Topic/Report')->set('id', $this->topic->id); ?>
</div>
</div>

<?php if ($signature) : ?>
<div class="ksig">
<hr>
<span class="ksignature"><?php echo $signature; ?></span>
</div>
<?php endif ?>

<?php if ($this->config->reportmsg && $this->me->exists()) :
if ($this->me->isModerator($this->topic->getCategory()) || $this->config->user_report || !$this->config->user_report && $this->me->userid != $this->message->userid) : ?>
<div id="report<?php echo $this->message->id; ?>" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<?php echo $this->subRequest('Topic/Report')->set('id', $this->topic->id); ?>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
</div>
</div>
<?php if (!empty($attachments)) : ?>
<div class="kattach">
<h5> <?php echo JText::_('COM_KUNENA_ATTACHMENTS'); ?> </h5>
Expand Down

0 comments on commit 2eef278

Please sign in to comment.