Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Crypsisb3 report modal #5645

Merged
merged 1 commit into from Nov 24, 2017
Merged

Fix Crypsisb3 report modal #5645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php
View file
Open in desktop
Expand Up @@ -75,10 +75,14 @@
'type' => 'user', 'id' => 'btn_report', 'normal' => '', 'icon' => KunenaIcons::reportname(),
'modal' => 'modal', 'pullright' => 'pullright'));
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 id="report<?php echo $this->message->id; ?>" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-dialog" role="document">
<div class="modal-content">
<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>
</div>
</div>
<?php endif; ?>
Expand Down
1 change: 0 additions & 1 deletion src/components/com_kunena/template/crypsisb3/layouts/message/item/actions/default.php
View file
Open in desktop
Expand Up @@ -110,7 +110,6 @@

<?php echo $this->messageButtons->get('thankyou'); ?>
<?php echo $this->messageButtons->get('unthankyou'); ?>
<div class="pull-right"><?php echo $this->messageButtons->get('report'); ?></div>
</div>

<?php else : ?>
Expand Down
8 changes: 6 additions & 2 deletions src/components/com_kunena/template/crypsisb3/layouts/message/item/default.php
View file
Open in desktop
Expand Up @@ -65,9 +65,13 @@
<?php endif ?>
</div>
<?php if ($this->config->reportmsg && $this->me->exists()) :
echo KunenaLayout::factory('Widget/Button')
->setProperties(array('url' => '#report'. $message->id .'', 'name' => 'report', 'scope' => 'message',
'type' => 'user', 'id' => 'btn_report', 'normal' => '', 'icon' => KunenaIcons::reportname(),
'modal' => 'modal', 'pullright' => 'pullright'));
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 fade" tabindex="-1" role="dialog" data-backdrop="false">
<div class="modal-dialog">
<div id="report<?php echo $this->message->id; ?>" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
Expand Down
8 changes: 6 additions & 2 deletions src/components/com_kunena/template/crypsisb3/layouts/message/item/top/default.php
View file
Open in desktop
Expand Up @@ -64,9 +64,13 @@
</div>
</div>
<?php if ($this->config->reportmsg && $this->me->exists()) :
echo KunenaLayout::factory('Widget/Button')
->setProperties(array('url' => '#report'. $message->id .'', 'name' => 'report', 'scope' => 'message',
'type' => 'user', 'id' => 'btn_report', 'normal' => '', 'icon' => KunenaIcons::reportname(),
'modal' => 'modal', 'pullright' => 'pullright'));
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 fade" tabindex="-1" role="dialog" data-backdrop="false">
<div class="modal-dialog">
<div id="report<?php echo $this->message->id; ?>" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
Expand Down