Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '531-attachment-preview-link' into '3-1-0'

Browse Source 
Replace modal with lightbox for viewing images

See merge request !59
This commit is contained in:
Mike Koch 2017-05-06 20:28:43 +00:00
commit ca681cdb5b
7 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/jquery.fancybox.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
css/mods-for-hesk-new.css
View File

@ -121,7 +121,7 @@
vertical-align: middle; vertical-align: middle;
} }
.attachment-table > tbody > tr > td > span > img { .attachment-table > tbody > tr > td > a > img {
max-height: 80px; max-height: 80px;
max-width: 80px; max-width: 80px;
cursor: pointer; cursor: pointer;

2
css/mods-for-hesk.css
View File

@ -35,7 +35,7 @@ button.dropdown-submit {
vertical-align: middle; vertical-align: middle;
} }
.attachment-table > tbody > tr > td > span > img { .attachment-table > tbody > tr > td > a > img {
max-height: 80px; max-height: 80px;
max-width: 80px; max-width: 80px;
cursor: pointer; cursor: pointer;

2
inc/header.inc.php
View File

@ -89,6 +89,7 @@ if (is_dir(HESK_PATH . 'install')) {
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
<?php if (defined('USE_JQUERY_2')): ?> <?php if (defined('USE_JQUERY_2')): ?>
<script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<?php else: ?> <?php else: ?>
@ -111,6 +112,7 @@ if (is_dir(HESK_PATH . 'install')) {
<script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<style> <style>
.navbar-default { .navbar-default {
background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>; background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;

2
inc/headerAdmin.inc.php
View File

@ -64,6 +64,7 @@ $modsForHesk_settings = mfh_getSettings();
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
<?php if (defined('USE_JQUERY_2')): ?> <?php if (defined('USE_JQUERY_2')): ?>
<script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<?php else: ?> <?php else: ?>
@ -88,6 +89,7 @@ $modsForHesk_settings = mfh_getSettings();
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script> <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
<?php <?php
if (defined('EXTRA_JS')) { if (defined('EXTRA_JS')) {
echo EXTRA_JS; echo EXTRA_JS;

34
inc/view_attachment_functions.inc.php
View File

@ -15,6 +15,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
/* List attachments */ /* List attachments */
$att = explode(',', substr($attachments, 0, -1)); $att = explode(',', substr($attachments, 0, -1));
$uniq_identifier = null;
echo '<div class="table-responsive">'; echo '<div class="table-responsive">';
echo '<table class="table table-striped attachment-table">'; echo '<table class="table table-striped attachment-table">';
echo '<thead> echo '<thead>
@ -29,8 +30,12 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
</thead>'; </thead>';
echo '<tbody>'; echo '<tbody>';
foreach ($att as $myatt) { foreach ($att as $myatt) {
list($att_id, $att_name) = explode('#', $myatt); list($att_id, $att_name) = explode('#', $myatt);
if ($uniq_identifier === null) {
$uniq_identifier = $att_id;
}
$fileparts = pathinfo($att_name); $fileparts = pathinfo($att_name);
$fontAwesomeIcon = mfh_getFontAwesomeIconForFileExtension($fileparts['extension']); $fontAwesomeIcon = mfh_getFontAwesomeIconForFileExtension($fileparts['extension']);
echo ' echo '
@ -44,30 +49,9 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
if ($path == '') { if ($path == '') {
echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>'; echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
} else { } else {
echo '<span data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '"> echo '<a href="' . $path . '" data-fancybox="' . htmlspecialchars($uniq_identifier) . '">
<img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="modal" data-target="#modal-attachment-' . $att_id . '"> <img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '">
</span>'; </a>';
$download_path = '';
if ($is_staff) {
$download_path = '../';
}
echo '<div class="modal fade" id="modal-attachment-' . $att_id . '" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">' . $att_name . '</h4>
</div>
<div class="modal-body">
<img class="img-responsive" src="' . $path . '" alt="' . $hesklang['image'] . '">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">' . $hesklang['close_modal'] . '</button>
<a href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . $email . '" class="btn btn-success">' . $hesklang['dnl'] . '</a>
</div>
</div>
</div>
</div>';
} }
} else { } else {
//-- Display the FontAwesome icon in the panel's body //-- Display the FontAwesome icon in the panel's body

12
js/jquery.fancybox.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long