Skip to content

Commit

Permalink
Crypsisb3 fix message title on top
Browse files Browse the repository at this point in the history
  • Loading branch information
@810
810 committed May 14, 2018
1 parent d955195 commit 5bdc263
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 41 deletions.
76 changes: 59 additions & 17 deletions src/components/com_kunena/template/crypsisb3/assets/less/general.less
View file
Expand Up @@ -291,14 +291,8 @@ a:focus,
border-radius: 4px;
}

.horizontal-message-top .kmsg {
padding-top: 40px;
min-height: 140px;
padding-left: 10px;
}

.horizontal-message .kmessage {
padding: 10px;
padding: 5px 10px 0;
}

[class*="horizontal-message-top"] {
Expand All @@ -310,27 +304,42 @@ a:focus,
position: absolute;
top: 0;
font-weight: bold;
padding: 8px 12px;
margin-top: -10px;
padding: 8px 12px !important;
margin-top: -10px !important;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
border-top: 0 !important;
border-left: 0 !important;
}

[class*="horizontal-message-bottom"] {
position: relative;
}

.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"] {
.horizontal-message [class*="badger-left"] {
position: relative;
margin: -8px 0 0 0;
padding: 0 9px 0 3px !important;
border-radius: 4px;
border: 0;
box-shadow: none;
}

.message-bottom [class*="badger-left"]{
margin: 0;
}

[class*="badger-left"] {
position: relative;
margin: 15px 0;
padding: 39px 19px 0 14px;
Expand Down Expand Up @@ -359,6 +368,11 @@ a:focus,
background: rgba(229, 229, 229, 0.4);
}

.badger-solved {
border: 1px solid #5cb85c;
background-color: honeydew;
}

legend {
color: inherit;
}
Expand All @@ -380,6 +394,34 @@ div.kmsgtext-confidential {
font-style: italic;
}

/* styling for message header */
.mykmsg-header {
margin-top: 0;
background: rgba(229,229,229,0.4);
padding: 10px 19px 12px 14px !important;
margin-left: -15px;
margin-right:-20px;
font-weight: bold;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}

/* make .badger-left::after invisible */
.badger-left::after {
border-radius: 0 !important;
height: 0 !important;
}

[class*="badger"]::after {
padding: 0;
border-right: none !important;
border-bottom: none !important;
}

[class*="badger-left"] {
padding: 0 19px 0 14px !important;
}

#kwho > div > p,
#kstats > div > p {
margin: 0;
Expand Down
15 changes: 9 additions & 6 deletions src/components/com_kunena/template/crypsisb3/layouts/message/item/bottom/default.php
View file
Expand Up @@ -13,6 +13,8 @@
// @var KunenaForumMessage $message

$message = $this->message;
$topic = $message->getTopic();
$category = $message->getCategory();
$isReply = $this->message->id != $this->topic->first_post_id;
$signature = $this->profile->getSignature();
$attachments = $message->getAttachments();
Expand Down Expand Up @@ -52,13 +54,14 @@
</small>
<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; ?>"
data-badger="<?php
$subject = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$msg = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($msg, $avatarname, $subject);
?>">
<div class="badger-left badger-info <?php if ($message->getAuthor()->isModerator()) : ?> badger-moderator <?php endif; ?> message-<?php echo $this->message->getState(); ?>">
<div class="kmessage">
<div class="mykmsg-header">
<?php
$title = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$langstr = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($langstr, $message->getAuthor()->getLink(), $this->getTopicLink($topic, 'first', null, null, KunenaTemplate::getInstance()->tooltips() . ' topictitle', $category, true, false));?>
</div>
<div class="horizontal-message-text">
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
Expand Down
15 changes: 9 additions & 6 deletions src/components/com_kunena/template/crypsisb3/layouts/message/item/default.php
View file
Expand Up @@ -13,6 +13,8 @@
// @var KunenaForumMessage $message

$message = $this->message;
$topic = $message->getTopic();
$category = $message->getCategory();
$isReply = $this->message->id != $this->topic->first_post_id;
$signature = $this->profile->getSignature();
$attachments = $message->getAttachments();
Expand Down Expand Up @@ -47,13 +49,14 @@
<span class="visible-xs"><?php echo JText::_('COM_KUNENA_BY') . ' ' . $message->getAuthor()->getLink(); ?></span>
</small>

<div class="badger-left badger-info message-<?php echo $this->message->getState(); ?>"
data-badger="<?php
$subject = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$msg = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($msg, $avatarname, $subject);
?>">
<div class="badger-left badger-info <?php if ($message->getAuthor()->isModerator()) : ?> badger-moderator <?php endif; ?> message-<?php echo $this->message->getState(); ?>">
<div class="kmessage">
<div class="mykmsg-header">
<?php
$title = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$langstr = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($langstr, $message->getAuthor()->getLink(), $this->getTopicLink($topic, 'first', null, null, KunenaTemplate::getInstance()->tooltips() . ' topictitle', $category, true, false));?>
</div>
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
echo $message->displayField('message');
Expand Down
18 changes: 9 additions & 9 deletions src/components/com_kunena/template/crypsisb3/layouts/message/item/top/default.php
View file
Expand Up @@ -13,6 +13,8 @@
// @var KunenaForumMessage $message

$message = $this->message;
$topic = $message->getTopic();
$category = $message->getCategory();
$isReply = $this->message->id != $this->topic->first_post_id;
$signature = $this->profile->getSignature();
$attachments = $message->getAttachments();
Expand Down Expand Up @@ -55,16 +57,14 @@
<div class="profile-horizontal-top">
<?php echo $this->subLayout('User/Profile')->set('user', $this->profile)->setLayout('horizontal')->set('topic_starter', $topicStarter)->set('category_id', $this->category->id); ?>
</div>
<div class="horizontal-message-top badger-info <?php if ($message->getAuthor()->isModerator())
:
?> badger-moderator <?php
endif; ?>"
data-badger="<?php
$subject = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$msg = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($msg, $avatarname, $subject);
?>">
<div class="badger-left badger-info <?php if ($message->getAuthor()->isModerator()) : ?> badger-moderator <?php endif; ?> message-<?php echo $this->message->getState(); ?>">
<div class="kmessage">
<div class="mykmsg-header">
<?php
$title = KunenaForumMessage::getInstance()->getsubstr($this->escape($message->subject), 0, $subjectlengthmessage);
$langstr = $isReply ? 'COM_KUNENA_MESSAGE_REPLIED_NEW' : 'COM_KUNENA_MESSAGE_CREATED_NEW';
echo JText::sprintf($langstr, $message->getAuthor()->getLink(), $this->getTopicLink($topic, 'first', null, null, KunenaTemplate::getInstance()->tooltips() . ' topictitle', $category, true, false));?>
</div>
<div class="horizontal-message-text">
<div class="kmsg">
<?php if (!$this->me->userid && !$isReply) :
Expand Down
2 changes: 1 addition & 1 deletion src/components/com_kunena/template/crypsisb3/layouts/user/attachments/default.php
View file
Expand Up @@ -143,7 +143,7 @@
<h4 class="modal-title" id="myModalLabel"><?php echo JText::_('COM_KUNENA_FILES_CONFIRMATION_DELETE_MODAL_LABEL ') ?></h4>
</div>
<div class="modal-body">
<p><?php echo JText::sprintf('COM_KUNENA_FILES_DELETE_MODAL_DESCRIPTION', $attachment->getFilename(), number_format(intval($attachment->size) / 1024, 0, '', ',') . ' ' . JText::_('COM_KUNENA_USER_ATTACHMENT_FILE_WEIGHT')); ?></p>
<p><?php echo JText::sprintf('COM_KUNENA_FILES_DELETE_MODAL_DESCRIPTION', $attachments->getFilename(), number_format(intval($attachmenst->size) / 1024, 0, '', ',') . ' ' . JText::_('COM_KUNENA_USER_ATTACHMENT_FILE_WEIGHT')); ?></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo JText::_('COM_KUNENA_FILES_CONFIRM_DELETE_MODAL_BUTTON') ?></button>
Expand Down
7 changes: 5 additions & 2 deletions src/components/com_kunena/template/crypsisb3/layouts/user/item/default.php
View file
Expand Up @@ -24,7 +24,7 @@
?>
<?php echo $this->profile->getLink(
KunenaIcons::edit() . ' ' . JText::_('COM_KUNENA_EDIT'),
JText::_('COM_KUNENA_EDIT'), 'nofollow', 'edit', 'btn btn-default'
JText::_('COM_KUNENA_EDIT'), 'nofollow', 'edit', 'btn'
); ?>
<?php endif; ?>
</h2>
Expand All @@ -35,6 +35,8 @@
->set('config', $this->config);
?>

<?php echo $this->subLayout('Widget/Module')->set('position', 'kunena_summary'); ?>

<div class="tabs">
<br/>
<br/>
Expand All @@ -45,7 +47,7 @@
:
?>
<li<?php echo $tab->active ? ' class="active"' : ''; ?>>
<a href="#<?php echo $name; ?>" data-toggle="tab"><?php echo $tab->title; ?></a>
<a href="#<?php echo $name; ?>" data-toggle="tab" rel="nofollow"><?php echo $tab->title; ?></a>
</li>
<?php endforeach; ?>

Expand All @@ -66,3 +68,4 @@
</div>

<div class="clearfix"></div>

0 comments on commit 5bdc263

Please sign in to comment.