Fix up some recent SMF changes
jdarwood007 commited on 2018-07-17 17:06:15
Showing 8 changed files, with 50 additions and 54 deletions.
Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>
- css/helpdesk.css f604bb4..e4c944b
- css/helpdesk_icons.css e80d366..f09d98c
- sd_source/SimpleDesk-AjaxHandler.php be835f0..1b9f483
- sd_template/SimpleDesk-AdminPermissions.template.php d922c84..77293ff
- sd_template/SimpleDesk-Display.template.php c8aab60..76bb9c4
- sd_template/SimpleDesk-Post.template.php fd2c02b..acb4258
- sd_template/SimpleDesk-Profile.template.php b0c72b2..3ceb51f
- sd_template/SimpleDesk.template.php 49871c1..b284c89
| ... | ... |
@@ -3,8 +3,8 @@ |
| 3 | 3 |
***********************************/ |
| 4 | 4 |
/* SimpleDesk icons */ |
| 5 | 5 |
.shd_smallicon {
|
| 6 |
- width: 13px; |
|
| 7 |
- height: 13px; |
|
| 6 |
+ width: 16px; |
|
| 7 |
+ height: 20px; |
|
| 8 | 8 |
margin-right: 4px; |
| 9 | 9 |
} |
| 10 | 10 |
.shd_icon_minihead {
|
| ... | ... |
@@ -334,9 +334,7 @@ form#postmodify .shd_ticket_roundframe {
|
| 334 | 334 |
* Attachment stuff * |
| 335 | 335 |
***********************************/ |
| 336 | 336 |
.shd_reply_attachments {
|
| 337 |
- width: 66%; |
|
| 338 | 337 |
margin-bottom: 0; |
| 339 |
- float: left; |
|
| 340 | 338 |
margin-top: 5px; |
| 341 | 339 |
} |
| 342 | 340 |
.shd_reply_attachments ul, .shd_reply_attachments li {
|
| ... | ... |
@@ -378,6 +376,10 @@ form#postmodify .shd_ticket_roundframe {
|
| 378 | 376 |
margin-right: auto; |
| 379 | 377 |
} |
| 380 | 378 |
|
| 379 |
+#shd_notifications_div {
|
|
| 380 |
+ margin-top: 1em; |
|
| 381 |
+} |
|
| 382 |
+ |
|
| 381 | 383 |
/********************************** |
| 382 | 384 |
* Posting and editing tickets/replies * |
| 383 | 385 |
***********************************/ |
| ... | ... |
@@ -400,8 +402,6 @@ form#postmodify .shd_ticket_roundframe {
|
| 400 | 402 |
margin: 0.75em 0 0.5em 0; |
| 401 | 403 |
} |
| 402 | 404 |
#canned_replies {
|
| 403 |
- float: left; |
|
| 404 |
- width: 66%; |
|
| 405 | 405 |
margin-top: 1em; |
| 406 | 406 |
} |
| 407 | 407 |
|
| ... | ... |
@@ -1,140 +1,140 @@ |
| 1 | 1 |
/* The icons. */ |
| 2 |
-.large_admin_menu_icon.shd_cannedreplies {
|
|
| 2 |
+.large_admin_menu_icon.shd_cannedreplies::before {
|
|
| 3 | 3 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 4 | 4 |
background-position: -9px -9px; |
| 5 | 5 |
} |
| 6 | 6 |
|
| 7 |
-.large_admin_menu_icon.shd_custom_fields {
|
|
| 7 |
+.large_admin_menu_icon.shd_custom_fields::before {
|
|
| 8 | 8 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 9 | 9 |
background-position: -59px -10px; |
| 10 | 10 |
} |
| 11 | 11 |
|
| 12 |
-.large_admin_menu_icon.shd_departments {
|
|
| 12 |
+.large_admin_menu_icon.shd_departments::before {
|
|
| 13 | 13 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 14 | 14 |
background-position: -109px -9px; |
| 15 | 15 |
} |
| 16 | 16 |
|
| 17 |
-.large_admin_menu_icon.shd_log {
|
|
| 17 |
+.large_admin_menu_icon.shd_log::before {
|
|
| 18 | 18 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 19 | 19 |
background-position: -161px -10px; |
| 20 | 20 |
} |
| 21 | 21 |
|
| 22 |
-.large_admin_menu_icon.shd_mail {
|
|
| 22 |
+.large_admin_menu_icon.shd_mail::before {
|
|
| 23 | 23 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 24 | 24 |
background-position: -9px -60px; |
| 25 | 25 |
} |
| 26 | 26 |
|
| 27 |
-.large_admin_menu_icon.shd_maintenance {
|
|
| 27 |
+.large_admin_menu_icon.shd_maintenance::before {
|
|
| 28 | 28 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 29 | 29 |
background-position: -61px -61px; |
| 30 | 30 |
} |
| 31 | 31 |
|
| 32 |
-.large_admin_menu_icon.shd_options {
|
|
| 32 |
+.large_admin_menu_icon.shd_options::before {
|
|
| 33 | 33 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 34 | 34 |
background-position: -110px -58px; |
| 35 | 35 |
} |
| 36 | 36 |
|
| 37 |
-.large_admin_menu_icon.shd_permissions {
|
|
| 37 |
+.large_admin_menu_icon.shd_permissions::before {
|
|
| 38 | 38 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 39 | 39 |
background-position: -161px -59px; |
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 |
-.large_admin_menu_icon.shd_plugins {
|
|
| 42 |
+.large_admin_menu_icon.shd_plugins::before {
|
|
| 43 | 43 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 44 | 44 |
background-position: -9px -106px; |
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 |
-.large_admin_menu_icon.shd_simpledesk {
|
|
| 47 |
+.large_admin_menu_icon.shd_simpledesk::before {
|
|
| 48 | 48 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 49 | 49 |
background-position: -56px -106px; |
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 |
-.large_admin_menu_icon.shd_support {
|
|
| 52 |
+.large_admin_menu_icon.shd_support::before {
|
|
| 53 | 53 |
background: url(../images/simpledesk/icons/shd_admin_icons.png) no-repeat; |
| 54 | 54 |
background-position: -110px -110px; |
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 |
-.generic_icons.shd_cannedreplies {
|
|
| 57 |
+.generic_icons.shd_cannedreplies::before {
|
|
| 58 | 58 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 59 | 59 |
background-position: -18px -22px; |
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 |
-.generic_icons.shd_custom_fields {
|
|
| 62 |
+.generic_icons.shd_custom_fields::before {
|
|
| 63 | 63 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 64 | 64 |
background-position: -71px -22px; |
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 |
-.generic_icons.shd_departments {
|
|
| 67 |
+.generic_icons.shd_departments::before {
|
|
| 68 | 68 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 69 | 69 |
background-position: -124px -22px; |
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 |
-.generic_icons.shd_log {
|
|
| 72 |
+.generic_icons.shd_log::before {
|
|
| 73 | 73 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 74 | 74 |
background-position: -167px -22px; |
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 |
-.generic_icons.shd_mail {
|
|
| 77 |
+.generic_icons.shd_mail::before {
|
|
| 78 | 78 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 79 | 79 |
background-position: -18px -64px; |
| 80 | 80 |
} |
| 81 | 81 |
|
| 82 |
-.generic_icons.shd_maintenance {
|
|
| 82 |
+.generic_icons.shd_maintenance::before {
|
|
| 83 | 83 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 84 | 84 |
background-position: -66px -64px; |
| 85 | 85 |
} |
| 86 | 86 |
|
| 87 |
-.generic_icons.shd_options {
|
|
| 87 |
+.generic_icons.shd_options::before {
|
|
| 88 | 88 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 89 | 89 |
background-position: -118px -64px; |
| 90 | 90 |
} |
| 91 | 91 |
|
| 92 |
-.generic_icons.shd_permissions {
|
|
| 92 |
+.generic_icons.shd_permissions::before {
|
|
| 93 | 93 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 94 | 94 |
background-position: -166px -65px; |
| 95 | 95 |
} |
| 96 | 96 |
|
| 97 |
-.generic_icons.shd_plugins {
|
|
| 97 |
+.generic_icons.shd_plugins::before {
|
|
| 98 | 98 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 99 | 99 |
background-position: -16px -116px; |
| 100 | 100 |
} |
| 101 | 101 |
|
| 102 |
-.generic_icons.shd_simpledesk, .generic_icons.helpdesk {
|
|
| 102 |
+.generic_icons.shd_simpledesk::before, .generic_icons.helpdesk::before {
|
|
| 103 | 103 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 104 | 104 |
background-position: -65px -116px; |
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 |
-.generic_icons.shd_support {
|
|
| 107 |
+.generic_icons.shd_support::before {
|
|
| 108 | 108 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 109 | 109 |
background-position: -119px -116px; |
| 110 | 110 |
} |
| 111 | 111 |
|
| 112 |
-.generic_icons.profile {
|
|
| 112 |
+.generic_icons.profile::before {
|
|
| 113 | 113 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 114 | 114 |
background-position: -167px -117px; |
| 115 | 115 |
} |
| 116 | 116 |
|
| 117 |
-.generic_icons.hd_profile {
|
|
| 117 |
+.generic_icons.hd_profile::before {
|
|
| 118 | 118 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 119 | 119 |
background-position: -167px -117px; |
| 120 | 120 |
} |
| 121 | 121 |
|
| 122 |
-.generic_icons.hd_prefs {
|
|
| 122 |
+.generic_icons.hd_prefs::before {
|
|
| 123 | 123 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 124 | 124 |
background-position: -218px -25px; |
| 125 | 125 |
} |
| 126 | 126 |
|
| 127 |
-.generic_icons.hd_showtickets {
|
|
| 127 |
+.generic_icons.hd_showtickets::before {
|
|
| 128 | 128 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 129 | 129 |
background-position: -217px -68px; |
| 130 | 130 |
} |
| 131 | 131 |
|
| 132 |
-.generic_icons.hd_permissions {
|
|
| 132 |
+.generic_icons.hd_permissions::before {
|
|
| 133 | 133 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 134 | 134 |
background-position: -218px -117px; |
| 135 | 135 |
} |
| 136 | 136 |
|
| 137 |
-.generic_icons.hd_actionlog {
|
|
| 137 |
+.generic_icons.hd_actionlog::before {
|
|
| 138 | 138 |
background: url(../images/simpledesk/icons/shd_generic_icons.png) no-repeat; |
| 139 | 139 |
background-position: -267px -25px; |
| 140 | 140 |
} |
| 141 | 141 |
\ No newline at end of file |
| ... | ... |
@@ -835,7 +835,7 @@ function shd_ajax_notify() |
| 835 | 835 |
echo '<div class="shd_ajaxnotify"><input type="checkbox" name="notify[', $id, ']" value="', $id, '"', in_array($id, $selected) ? ' checked="checked"' : '', ' > ', $member, '</div>'; |
| 836 | 836 |
} |
| 837 | 837 |
|
| 838 |
- echo ']', ']></notify>'; |
|
| 838 |
+ echo '<br class="clear">]', ']></notify>'; |
|
| 839 | 839 |
|
| 840 | 840 |
$content = ob_get_clean(); |
| 841 | 841 |
return $context['ajax_raw'] = cleanXml($content); |
| ... | ... |
@@ -311,7 +311,8 @@ function template_shd_edit_role() |
| 311 | 311 |
<dt><strong>', $txt['shd_role_name'], ':</strong></dt> |
| 312 | 312 |
<dd><input type="text" name="rolename" id="rolename" value="', $role['name'], '" size="30"></dd> |
| 313 | 313 |
</dl> |
| 314 |
- </div>'; |
|
| 314 |
+ </div> |
|
| 315 |
+ <br class="clear">'; |
|
| 315 | 316 |
|
| 316 | 317 |
// Get ready to display the actual permissions |
| 317 | 318 |
$permission_set = array(); |
| ... | ... |
@@ -465,6 +466,7 @@ function template_shd_edit_role() |
| 465 | 466 |
|
| 466 | 467 |
echo ' |
| 467 | 468 |
</table> |
| 469 |
+ <br class="clear"> |
|
| 468 | 470 |
<div class="floatleft" style="width: 100%;"> |
| 469 | 471 |
<div class="cat_bar"> |
| 470 | 472 |
<h3 class="catbg"> |
| ... | ... |
@@ -403,7 +403,7 @@ function template_viewticketattach() |
| 403 | 403 |
<img src="', $settings['default_images_url'], '/simpledesk/attachments.png" alt="">', $txt['shd_ticket_attachments'], ' (', count($context['ticket_attach']['ticket']), ')
|
| 404 | 404 |
</h3> |
| 405 | 405 |
</div> |
| 406 |
- <div class="windowbg2"> |
|
| 406 |
+ <div class="windowbg"> |
|
| 407 | 407 |
<div class="shd_attachmentbox">'; |
| 408 | 408 |
|
| 409 | 409 |
foreach ($context['ticket_attach']['ticket'] as $attachment) |
| ... | ... |
@@ -1011,7 +1011,7 @@ function template_ticketactionlog() |
| 1011 | 1011 |
|
| 1012 | 1012 |
if (empty($context['ticket_log'])) |
| 1013 | 1013 |
echo ' |
| 1014 |
- <tr class="windowbg2"> |
|
| 1014 |
+ <tr class="windowbg"> |
|
| 1015 | 1015 |
<td colspan="3" class="shd_noticket">', $txt['shd_ticket_log_none'], '</td> |
| 1016 | 1016 |
</tr>'; |
| 1017 | 1017 |
else |
| ... | ... |
@@ -530,7 +530,7 @@ function template_ticket_postbox() |
| 530 | 530 |
template_ticket_cannedreplies(); |
| 531 | 531 |
|
| 532 | 532 |
echo ' |
| 533 |
- <br> |
|
| 533 |
+ <br class="clear"> |
|
| 534 | 534 |
<span class="smalltext"><br>', $context['browser']['is_firefox'] ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '</span><br> |
| 535 | 535 |
<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['post'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button"> |
| 536 | 536 |
<input class="button" type="submit" name="preview" value="', $txt['preview'], '" accesskey="p" tabindex="', $context['tabindex']++, '">'; |
| ... | ... |
@@ -639,17 +639,12 @@ function template_ticket_additional_options() |
| 639 | 639 |
echo ' |
| 640 | 640 |
</ul>'; |
| 641 | 641 |
|
| 642 |
- if (empty($context['current_attachments']) && empty($context['ticket_form']['do_attach'])) |
|
| 643 |
- {
|
|
| 644 |
- echo ' |
|
| 645 |
- </div>'; |
|
| 646 |
- } |
|
| 647 |
- else |
|
| 648 |
- {
|
|
| 649 | 642 |
// Attachments handling.. |
| 650 | 643 |
template_show_attachments(); |
| 651 | 644 |
template_add_attachments(); |
| 652 |
- } |
|
| 645 |
+ |
|
| 646 |
+ echo ' |
|
| 647 |
+ </div>'; |
|
| 653 | 648 |
|
| 654 | 649 |
template_singleton_email(); |
| 655 | 650 |
} |
| ... | ... |
@@ -796,6 +791,7 @@ function template_singleton_email() |
| 796 | 791 |
<input type="hidden" name="list" value="', $context['notification_ping_list'], '">'; |
| 797 | 792 |
|
| 798 | 793 |
echo ' |
| 794 |
+ <br class="clear"> |
|
| 799 | 795 |
</div> |
| 800 | 796 |
<script type="text/javascript"><!-- // --><![CDATA[ |
| 801 | 797 |
document.getElementById("shd_notifications_div").style.display = "";
|
| ... | ... |
@@ -362,8 +362,7 @@ function template_shd_profile_show_tickets() |
| 362 | 362 |
$item_link = '"<a href="' . $scripturl . '?action=helpdesk;sa=ticket;ticket=' . $item['ticket'] . '.' . ($item['is_ticket'] ? '0' : ($item['start'] . '#msg' . $item['msg'])) . '">' . $item['subject'] . '</a>"'; |
| 363 | 363 |
|
| 364 | 364 |
echo ' |
| 365 |
- <div class="topic"> |
|
| 366 |
- <div class="', $item['alternate'] == 0 ? 'windowbg2' : 'windowbg', ' core_posts"> |
|
| 365 |
+ <div class="windowbg core_posts"> |
|
| 367 | 366 |
<div class="content"> |
| 368 | 367 |
<div class="counter">', $item['counter'], '</div> |
| 369 | 368 |
<div class="topic_details"> |
| ... | ... |
@@ -378,7 +377,6 @@ function template_shd_profile_show_tickets() |
| 378 | 377 |
</div> |
| 379 | 378 |
</div> |
| 380 | 379 |
<br> |
| 381 |
- </div> |
|
| 382 | 380 |
</div>'; |
| 383 | 381 |
} |
| 384 | 382 |
|
| ... | ... |
@@ -426,7 +424,7 @@ function template_shd_profile_show_notify_override() |
| 426 | 424 |
if (empty($context['tickets'])) |
| 427 | 425 |
{
|
| 428 | 426 |
echo ' |
| 429 |
- <tr class="windowbg2"> |
|
| 427 |
+ <tr class="windowbg"> |
|
| 430 | 428 |
<td colspan="7">', $txt['shd_error_no_tickets'], '</td> |
| 431 | 429 |
</tr>'; |
| 432 | 430 |
} |
| ... | ... |
@@ -696,7 +694,7 @@ function template_shd_profile_actionlog() |
| 696 | 694 |
|
| 697 | 695 |
if (empty($context['action_log'])) |
| 698 | 696 |
echo ' |
| 699 |
- <tr class="windowbg2"> |
|
| 697 |
+ <tr class="windowbg"> |
|
| 700 | 698 |
<td colspan="2" class="shd_noticket">', $txt['shd_profile_log_none'], '</td> |
| 701 | 699 |
</tr>'; |
| 702 | 700 |
else |
| ... | ... |
@@ -413,11 +413,11 @@ function template_ticket_block() |
| 413 | 413 |
$unread_image = $ticket['is_unread'] ? 'unread.png' : 'read.png'; |
| 414 | 414 |
$unread_txt = $ticket['is_unread'] ? $txt['shd_ticket_new'] : $txt['shd_ticket_notnew']; |
| 415 | 415 |
echo ' |
| 416 |
- <td width="1%"> |
|
| 416 |
+ <td width="3%"> |
|
| 417 | 417 |
<img src="', $settings['default_images_url'], '/simpledesk/', $unread_image, '" alt="', $unread_txt, '" title="', $unread_txt, '"> |
| 418 | 418 |
<img src="', $settings['default_images_url'], '/simpledesk/', $private_image, '" alt="', $private_txt, '" title="', $private_txt, '"> |
| 419 | 419 |
</td> |
| 420 |
- <td width="4%" class="smalltext">', $ticket['display_id'], '</td>'; |
|
| 420 |
+ <td class="smalltext">', $ticket['display_id'], '</td>'; |
|
| 421 | 421 |
break; |
| 422 | 422 |
case 'ticket_name': |
| 423 | 423 |
echo ' |
| 424 | 424 |