nas commited on 2010-12-04 03:13:58
Showing 9 changed files, with 33 additions and 19 deletions.
... | ... |
@@ -99,7 +99,7 @@ $txt['shd_credits_projectsupport_desc'] = 'Those managing and supporting the pro |
99 | 99 |
$txt['shd_credits_marketing'] = 'Marketing'; |
100 | 100 |
$txt['shd_credits_marketing_desc'] = 'Those spreading the word of SimpleDesk.'; |
101 | 101 |
$txt['shd_credits_globalizer'] = 'Globalization'; |
102 |
-$txt['shd_credits_globalizer_desc'] = 'The people who makes SimpleDesk spread across the world.'; |
|
102 |
+$txt['shd_credits_globalizer_desc'] = 'The people who make SimpleDesk spread across the world.'; |
|
103 | 103 |
$txt['shd_credits_support'] = 'Support'; |
104 | 104 |
$txt['shd_credits_support_desc'] = 'The people providing all the helpless souls with the support they require.'; |
105 | 105 |
$txt['shd_credits_qualityassurance'] = 'Quality Assurance'; |
... | ... |
@@ -517,7 +517,7 @@ function shd_credits() |
517 | 517 |
'members' => array( |
518 | 518 |
'Peter "Arantor" Spicer', |
519 | 519 |
'Jason "JBlaze" Clemons', |
520 |
- 'Marcus "Nas" Forsberg', |
|
520 |
+ 'Marcus "cσσкιє мσηѕтєя" Forsberg', |
|
521 | 521 |
), |
522 | 522 |
), |
523 | 523 |
array( |
... | ... |
@@ -548,6 +548,7 @@ function shd_credits() |
548 | 548 |
'members' => array( |
549 | 549 |
'Tyrsson', |
550 | 550 |
'Ha2', |
551 |
+ 'Aldo "hadesflames" Barreras', |
|
551 | 552 |
), |
552 | 553 |
), |
553 | 554 |
array( |
... | ... |
@@ -556,6 +557,8 @@ function shd_credits() |
556 | 557 |
'members' => array( |
557 | 558 |
'Sinan "[SiNaN]" Çevik', |
558 | 559 |
'Alex "Cleo" Tokar', |
560 |
+ 'Paul "tfs" Laufer', |
|
561 |
+ 'Shomari "spoogs" Scott', |
|
559 | 562 |
), |
560 | 563 |
), |
561 | 564 |
array( |
... | ... |
@@ -563,15 +566,19 @@ function shd_credits() |
563 | 566 |
'desc' => $txt['shd_credits_beta_desc'], |
564 | 567 |
'members' => array( |
565 | 568 |
'Chris "ccbtimewiz" Batista', |
566 |
- 'Wade "Acans" Poulsen', |
|
567 |
- 'Aldo "hadesflames" Barreras', |
|
568 |
- 'tfs', |
|
569 |
+ 'Wade "ѕησω" Poulsen', |
|
569 | 570 |
'Edwin "Dismal Shadow" Mendez', |
570 | 571 |
'Treznax', |
571 | 572 |
'Mark "KiLLuMiNaTi−7−" Longworth', |
572 | 573 |
'NIBOGO', |
573 | 574 |
'Robert "Robbo" Clancy', |
574 | 575 |
'Yağizcan Arslan', |
576 |
+ 'MultiformeIngegno', |
|
577 |
+ 'flapjack', |
|
578 |
+ 'feline', |
|
579 |
+ 'Sordell Media', |
|
580 |
+ '[FailSafe]', |
|
581 |
+ 'chilly', |
|
575 | 582 |
), |
576 | 583 |
), |
577 | 584 |
array( |
... | ... |
@@ -256,7 +256,7 @@ function shd_view_ticket() |
256 | 256 |
|
257 | 257 |
$posters = array_unique($posters); |
258 | 258 |
|
259 |
- $context['is_team'] = array(); |
|
259 |
+ $context['shd_is_staff'] = array(); |
|
260 | 260 |
// Get the poster data |
261 | 261 |
if (!empty($posters)) |
262 | 262 |
{ |
... | ... |
@@ -266,7 +266,7 @@ function shd_view_ticket() |
266 | 266 |
$team = array_intersect($posters, shd_members_allowed_to('shd_staff')); |
267 | 267 |
|
268 | 268 |
foreach ($team as $member) |
269 |
- $context['is_team'][$member] = true; |
|
269 |
+ $context['shd_is_staff'][$member] = true; |
|
270 | 270 |
} |
271 | 271 |
|
272 | 272 |
if (!empty($context['ticket_messages'])) |
... | ... |
@@ -557,7 +557,7 @@ function shd_view_ticket() |
557 | 557 |
* <li>body: censored, parsed for smileys and bbcode (in {@link shd_format_text()})</li> |
558 | 558 |
* <li>time: string of the time the reply was posted</li> |
559 | 559 |
* <li>timestamp: internal stored timestamp attached to the reply</li> |
560 |
- * <li>is_team: boolean value of whether the posting member is currently helpdesk staff</li> |
|
560 |
+ * <li>is_staff: boolean value of whether the posting member is currently helpdesk staff</li> |
|
561 | 561 |
* <li>can_edit: boolean value reflecting if this reply can be edited</li> |
562 | 562 |
* <li>can_delete: boolean value reflecting if this reply can be deleted</li> |
563 | 563 |
* <li>can_restore: boolean value reflecting if this reply can be restored</li> |
... | ... |
@@ -614,7 +614,7 @@ function shd_prepare_ticket_context() |
614 | 614 |
'time' => timeformat($message['poster_time']), |
615 | 615 |
'timestamp' => forum_time(true, $message['poster_time']), |
616 | 616 |
'body' => $message['body'], |
617 |
- 'is_team' => !empty($context['is_team'][$message['id_member']]), |
|
617 |
+ 'is_staff' => !empty($context['shd_is_staff'][$message['id_member']]), |
|
618 | 618 |
'can_edit' => $message['message_status'] != MSG_STATUS_DELETED && !$context['ticket']['closed'] && !$context['ticket']['deleted'] && (shd_allowed_to('shd_edit_reply_any') || ($message['id_member'] == $user_info['id'] && shd_allowed_to('shd_edit_reply_own'))), |
619 | 619 |
'can_delete' => $message['message_status'] != MSG_STATUS_DELETED && !$context['ticket']['closed'] && !$context['ticket']['deleted'] && (shd_allowed_to('shd_delete_reply_any') || ($message['id_member'] == $user_info['id'] && shd_allowed_to('shd_delete_reply_own'))), |
620 | 620 |
'can_restore' => $message['message_status'] == MSG_STATUS_DELETED && !$context['ticket']['closed'] && !$context['ticket']['deleted'] && (shd_allowed_to('shd_restore_reply_any') || ($message['id_member'] == $user_info['id'] && shd_allowed_to('shd_restore_reply_own'))), |
... | ... |
@@ -1076,7 +1076,7 @@ function shd_setup_replies($first_msg) |
1076 | 1076 |
|
1077 | 1077 |
$posters = array_unique($posters); |
1078 | 1078 |
|
1079 |
- $context['is_team'] = array(); |
|
1079 |
+ $context['shd_is_staff'] = array(); |
|
1080 | 1080 |
|
1081 | 1081 |
if (!empty($messages)) |
1082 | 1082 |
{ |
... | ... |
@@ -1091,7 +1091,7 @@ function shd_setup_replies($first_msg) |
1091 | 1091 |
$team = array_intersect($posters, shd_members_allowed_to('shd_staff')); |
1092 | 1092 |
|
1093 | 1093 |
foreach ($team as $member) |
1094 |
- $context['is_team'][$member] = true; |
|
1094 |
+ $context['shd_is_staff'][$member] = true; |
|
1095 | 1095 |
} |
1096 | 1096 |
|
1097 | 1097 |
$reply_request = shd_db_query('', ' |
... | ... |
@@ -1226,7 +1226,7 @@ function shd_prepare_reply_context() |
1226 | 1226 |
'time' => timeformat($message['poster_time']), |
1227 | 1227 |
'timestamp' => forum_time(true, $message['poster_time']), |
1228 | 1228 |
'body' => $message['body'], |
1229 |
- 'is_team' => !empty($context['is_team'][$message['id_member']]), |
|
1229 |
+ 'is_staff' => !empty($context['shd_is_staff'][$message['id_member']]), |
|
1230 | 1230 |
'can_edit' => shd_allowed_to('shd_edit_reply_any') || ($message['id_member'] == $user_info['id'] && shd_allowed_to('shd_edit_reply_own')), |
1231 | 1231 |
); |
1232 | 1232 |
|
... | ... |
@@ -689,7 +689,7 @@ function shd_no_expand_pageindex($base_url, &$start, $max_value, $num_per_page, |
689 | 689 |
*/ |
690 | 690 |
function shd_load_language($langfile) |
691 | 691 |
{ |
692 |
- global $modSettings, $user_info; |
|
692 |
+ global $modSettings, $user_info, $language; |
|
693 | 693 |
if (empty($modSettings['disable_language_fallback'])) |
694 | 694 |
{ |
695 | 695 |
$cur_language = isset($user_info['language']) ? $user_info['language'] : $language; |
... | ... |
@@ -289,10 +289,10 @@ function template_viewreplies() |
289 | 289 |
echo ' |
290 | 290 |
', $reply['member']['avatar']['image']; |
291 | 291 |
|
292 |
- if ($modSettings['shd_staff_badge'] == (!empty($reply['is_team']) ? 'staffbadge' : 'userbadge') || $modSettings['shd_staff_badge'] == 'bothbadge') |
|
292 |
+ if ($modSettings['shd_staff_badge'] == (!empty($reply['is_staff']) ? 'staffbadge' : 'userbadge') || $modSettings['shd_staff_badge'] == 'bothbadge') |
|
293 | 293 |
echo '<br /> |
294 | 294 |
', $reply['member']['group_stars']; |
295 |
- elseif (!empty($reply['is_team']) && $modSettings['shd_staff_badge'] == 'nobadge') |
|
295 |
+ elseif (!empty($reply['is_staff']) && $modSettings['shd_staff_badge'] == 'nobadge') |
|
296 | 296 |
echo '<br /> |
297 | 297 |
<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />'; |
298 | 298 |
|
... | ... |
@@ -501,7 +501,7 @@ function template_ticket_do_replies() |
501 | 501 |
echo ' |
502 | 502 |
<div>', $reply['member']['avatar']['image'], '</div>'; |
503 | 503 |
|
504 |
- if (!empty($reply['is_team'])) |
|
504 |
+ if (!empty($reply['is_staff'])) |
|
505 | 505 |
if (empty($modSettings['shd_use_staff_badge'])) |
506 | 506 |
echo '<br /> |
507 | 507 |
<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />'; |
... | ... |
@@ -475,4 +475,12 @@ function template_shd_menu_header($header, $string) |
475 | 475 |
|
476 | 476 |
return $html; |
477 | 477 |
} |
478 |
+ |
|
479 |
+// Provide a placeholder in the event template_button_strip isn't defined (like in the mobile templates) |
|
480 |
+if (!function_exists('template_button_strip')) |
|
481 |
+{ |
|
482 |
+ function template_button_strip($navigation, $direction) |
|
483 |
+ { |
|
484 |
+ } |
|
485 |
+} |
|
478 | 486 |
?> |
479 | 487 |
\ No newline at end of file |
480 | 488 |