Changeset 2582
- Timestamp:
- 02/07/10 08:47:38 (2 years ago)
- Location:
- branches/smarty/gui
- Files:
-
- 2 added
- 5 edited
-
include/SmartyPlugins/modifier.nl2br.php (added)
-
include/class.smartyTemplate.php (modified) (1 diff)
-
reseller/ticket_create.php (modified) (3 diffs)
-
reseller/ticket_view.php (modified) (9 diffs)
-
themes/smarty_test/reseller/main.tpl (modified) (1 diff)
-
themes/smarty_test/reseller/ticket_create.tpl (modified) (1 diff)
-
themes/smarty_test/reseller/ticket_view.tpl (added)
Legend:
- Unmodified
- Added
- Removed
-
branches/smarty/gui/include/class.smartyTemplate.php
r2575 r2582 86 86 public function prnt() 87 87 { 88 $this->assign('date_format', Config::get('DATE_FORMAT')); 88 89 $this->assign('content_template', $this->_content_template); 89 90 $this->display('main.tpl'); -
branches/smarty/gui/reseller/ticket_create.php
r2575 r2582 121 121 gen_logged_from($tpl); 122 122 123 $userdata = array( 124 /* Smarty integration... not needed... 125 'OPT_URGENCY_1'=>'', 'OPT_URGENCY_2'=>'', 'OPT_URGENCY_3'=>'', 'OPT_URGENCY_4'=>'' 126 */ 127 ); 123 $userdata = array(); 128 124 if (isset($_POST['urgency'])) { 129 125 $userdata['URGENCY'] = intval($_POST['urgency']); … … 131 127 $userdata['URGENCY'] = 2; 132 128 } 133 /* Smarty integration... not needed...134 135 switch ($userdata['URGENCY']) {136 case 1:137 $userdata['OPT_URGENCY_1'] = ' selected="selected"';138 break;139 case 3:140 $userdata['OPT_URGENCY_3'] = ' selected="selected"';141 break;142 case 4:143 $userdata['OPT_URGENCY_4'] = ' selected="selected"';144 break;145 default:146 $userdata['OPT_URGENCY_2'] = ' selected="selected"';147 break;148 }149 */150 129 151 130 // New by Smarty integration: 152 $userdata['urgency_options'] = array( 153 1 => tr('Low'), 154 2 => tr('Medium'), 155 3 => tr('High'), 156 4 => tr('Very high') 157 ); 131 $urgencies = array(); 132 for ($i = 1; $i < 5; $i++) { 133 $urgencies[$i] = get_ticket_urgency($i); 134 } 135 $userdata['urgencies'] = $urgencies; 158 136 159 137 // HTML escaping is done by Smarty … … 164 142 $tpl->assign( 165 143 array( 166 'TR_NEW_TICKET' => tr('New ticket'), 167 /* Smarty integration... not needed here 168 'TR_LOW' => tr('Low'), 169 'TR_MEDIUM' => tr('Medium'), 170 'TR_HIGH' => tr('High'), 171 'TR_VERI_HIGH' => tr('Very high'), 172 */ 144 'TR_SUBTITLE' => tr('New ticket'), 173 145 'TR_URGENCY' => tr('Priority'), 174 146 'TR_EMAIL' => tr('Email'), -
branches/smarty/gui/reseller/ticket_view.php
r2527 r2582 48 48 } 49 49 50 $tpl = new pTemplate(); 51 $tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/ticket_view.tpl'); 52 $tpl->define_dynamic('page_message', 'page'); 53 $tpl->define_dynamic('logged_from', 'page'); 54 $tpl->define_dynamic('tickets_list', 'page'); 55 $tpl->define_dynamic('tickets_item', 'tickets_list'); 50 $tpl = new smartyTemplate('reseller'); 51 $tpl->setTemplate('ticket_view.tpl'); 56 52 57 53 // page functions. 58 54 59 function gen_tickets_list(&$tpl, &$sql, &$ticket_id, &$screenwidth) { 55 function get_tickets_list(&$tpl, &$sql, &$ticket_id, &$screenwidth) { 56 $tickets_list = array(); 57 60 58 $user_id = $_SESSION['user_id']; 61 59 $query = " … … 79 77 80 78 if ($rs->RecordCount() == 0) { 81 $tpl->assign('TICKETS_LIST', '');82 83 79 set_page_message(tr('Ticket not found!')); 84 80 } else { 81 $data = $rs->FetchRow(); 82 85 83 $ticket_urgency = $rs->fields['ticket_urgency']; 86 84 $ticket_status = $rs->fields['ticket_status']; 87 85 88 86 if ($ticket_status == 0) { 89 $ tr_action= tr("Open ticket");90 $ action= "open";87 $data['tr_action'] = tr("Open ticket"); 88 $data['action'] = "open"; 91 89 } else { 92 $ tr_action= tr("Close ticket");93 $ action= "close";90 $data['tr_action'] = tr("Close ticket"); 91 $data['action'] = "close"; 94 92 } 95 93 96 get_ticket_from($tpl, $sql, $ticket_id); 97 $date_formt = Config::get('DATE_FORMAT'); 98 $ticket_content = wordwrap($rs->fields['ticket_message'], round(($screenwidth-200) / 7), "\n"); 99 100 $tpl->assign( 101 array( 102 'TR_ACTION' => $tr_action, 103 'ACTION' => $action, 104 'URGENCY' => get_ticket_urgency($ticket_urgency), 105 'URGENCY_ID' => $ticket_urgency, 106 'DATE' => date($date_formt, $rs->fields['ticket_date']), 107 'SUBJECT' => htmlspecialchars($rs->fields['ticket_subject']), 108 'TICKET_CONTENT' => nl2br(htmlspecialchars($ticket_content)), 109 'ID' => $rs->fields['ticket_id'] 110 ) 111 ); 112 113 $tpl->parse('TICKETS_ITEM', '.tickets_item'); 114 get_tickets_replys($tpl, $sql, $ticket_id, $screenwidth); 115 } 94 $data['from'] = get_ticket_from($tpl, $sql, $ticket_id); 95 $data['ticket_message'] = wordwrap($data['ticket_message'], round(($screenwidth-200) / 7), "\n"); 96 $data['ticket_items'] = get_tickets_replys($tpl, $sql, $ticket_id, $screenwidth); 97 $data['urgency'] = get_ticket_urgency($data['ticket_urgency']); 98 99 $tickets_list[] = $data; 100 } 101 102 return $tickets_list; 116 103 } 117 104 118 105 function get_tickets_replys(&$tpl, &$sql, &$ticket_id, &$screenwidth) { 106 $result = array(); 107 119 108 $query = " 120 109 SELECT … … 136 125 137 126 if ($rs->RecordCount() == 0) { 138 return; 139 } 140 141 while (!$rs->EOF) { 142 $ticket_id = $rs->fields['ticket_id']; 143 $ticket_date = $rs->fields['ticket_date']; 144 $ticket_message = $rs->fields['ticket_message']; 145 146 $date_formt = Config::get('DATE_FORMAT'); 147 $ticket_content = wordwrap($ticket_message, round(($screenwidth-200) / 7), "\n"); 148 149 $tpl->assign( 150 array( 151 'DATE' => date($date_formt, $ticket_date), 152 'TICKET_CONTENT' => nl2br(htmlspecialchars($ticket_content)) 153 ) 154 ); 155 get_ticket_from($tpl, $sql, $ticket_id); 156 $tpl->parse('TICKETS_ITEM', '.tickets_item'); 127 $data = $rs->FetchRow(); 128 129 $data['ticket_message'] = wordwrap($data['ticket_message'], round(($screenwidth-200) / 7), "\n"); 130 $data['from'] = get_ticket_from($tpl, $sql, $ticket_id); 131 132 $result[] = $data; 133 157 134 $rs->MoveNext(); 158 135 } 136 137 return $result; 159 138 } 160 139 … … 174 153 $rs = exec_query($sql, $query, array($ticket_id)); 175 154 $ticket_from = $rs->fields['ticket_from']; 176 $ticket_to = $rs->fields['ticket_to'];177 $ticket_status = $rs->fields['ticket_status'];178 $ticket_reply = clean_html($rs->fields['ticket_reply']);179 155 180 156 $query = " … … 196 172 $from_last_name = $rs->fields['lname']; 197 173 198 $from _name = $from_first_name . " " . $from_last_name . " (" . $from_user_name . ")";199 200 $tpl->assign(201 array('FROM' => $from_name)174 $from = array( 175 'first_name' => $from_first_name, 176 'last_name' => $from_last_name, 177 'user_name' => $from_user_name 202 178 ); 179 180 return $from; 203 181 } 204 182 … … 443 421 send_user_message($sql, $_SESSION['user_id'], $reseller_id, $_GET['ticket_id'], $screenwidth); 444 422 445 gen_tickets_list($tpl, $sql, $_GET['ticket_id'], $screenwidth);423 $tpl->assign('tickets_list', get_tickets_list($tpl, $sql, $_GET['ticket_id'], $screenwidth)); 446 424 } else { 447 425 set_page_message(tr('Ticket not found!')); … … 457 435 gen_logged_from($tpl); 458 436 437 $urgencies = array(); 438 for ($i = 1; $i < 5; $i++) { 439 $urgencies[$i] = get_ticket_urgency($i); 440 } 441 459 442 $tpl->assign( 460 array('TR_VIEW_SUPPORT_TICKET' => tr('View support ticket'), 443 array( 444 'TR_SUBTITLE' => tr('View support ticket'), 461 445 'TR_TICKET_URGENCY' => tr('Priority'), 462 446 'TR_TICKET_SUBJECT' => tr('Subject'), … … 468 452 'TR_OPEN_TICKETS' => tr('Open tickets'), 469 453 'TR_CLOSED_TICKETS' => tr('Closed tickets'), 454 'urgencies' => $urgencies, 470 455 ) 471 456 ); … … 473 458 gen_page_message($tpl); 474 459 475 $tpl->parse('PAGE', 'page');476 460 $tpl->prnt(); 477 461 -
branches/smarty/gui/themes/smarty_test/reseller/main.tpl
r2575 r2582 26 26 <td style="width: 195px; vertical-align: top;">{$MENU}</td> 27 27 <td colspan="2" style="vertical-align: top;"> 28 <table style="width: 100%; padding:0;margin:0;" cellspacing="0"> 29 <tr style="height:95px;"> 30 <td style="padding-left:30px; width: 100%; background-image: url({$THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{$MAIN_MENU}</td> 31 <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{$THEME_COLOR_PATH}/images/top/middle_right.jpg" width="73" height="95" border="0" alt="" /></td> 32 </tr> 33 <tr> 34 <td colspan="3"><table width="100%" border="0" cellspacing="0" cellpadding="0"> 35 <tr> 36 <td align="left"><table width="100%" cellpadding="5" cellspacing="5"> 37 <tr> 38 <td width="25"><img src="{$THEME_COLOR_PATH}/images/content/table_icon_support.png" width="25" height="25" alt="" /></td> 39 <td colspan="2" class="title">{$TR_SUBTITLE}</td> 40 </tr> 41 </table></td> 42 <td width="27" align="right"> </td> 43 </tr> 44 <tr> 45 <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 46 <tr> 47 <td width="40"> </td> 48 <td valign="top"><form name="question_frm" method="post" action="ticket_create.php"> 49 <table width="100%" cellspacing="5"> 50 {if $MESSAGE != ''} 51 <tr> 52 <td colspan="2" class="title"><span class="message">{$MESSAGE}</span></td> 53 </tr> 54 {/if} 28 55 29 56 <!-- for debugging: {$content_template} --> 30 57 {include file=$content_template} 31 58 32 </td> 59 <!-- end of content --> 60 </form></td> 61 </tr> 62 </table></td> 63 <td> </td> 64 </tr> 65 <tr> 66 <td> </td> 67 <td> </td> 68 </tr> 69 </table></td> 70 </tr> 71 </table></td> 33 72 </tr> 34 73 </table> -
branches/smarty/gui/themes/smarty_test/reseller/ticket_create.tpl
r2575 r2582 1 <table style="width: 100%; padding:0;margin:0;" cellspacing="0"> 2 <tr style="height:95px;"> 3 <td style="padding-left:30px; width: 100%; background-image: url({$THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{$MAIN_MENU}</td> 4 <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{$THEME_COLOR_PATH}/images/top/middle_right.jpg" width="73" height="95" border="0" alt="" /></td> 5 </tr> 6 <tr> 7 <td colspan="3"><table width="100%" border="0" cellspacing="0" cellpadding="0"> 8 <tr> 9 <td align="left"><table width="100%" cellpadding="5" cellspacing="5"> 10 <tr> 11 <td width="25"><img src="{$THEME_COLOR_PATH}/images/content/table_icon_support.png" width="25" height="25" alt="" /></td> 12 <td colspan="2" class="title">{$TR_NEW_TICKET}</td> 13 </tr> 14 </table></td> 15 <td width="27" align="right"> </td> 16 </tr> 17 <tr> 18 <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 19 <tr> 20 <td width="40"> </td> 21 <td valign="top"><form name="question_frm" method="post" action="ticket_create.php"> 22 <table width="100%" cellspacing="5"> 23 {if $MESSAGE != ''} 24 <tr> 25 <td colspan="2" class="title"><span class="message">{$MESSAGE|escape}</span></td> 26 </tr> 27 {/if} 28 <tr> 29 <td class="content2" style="width:200px;">{$TR_URGENCY}</td> 30 <td class="content">{control_input_select name=urgency options=$urgency_options value=$OPT_URGENCY} 31 </td> 32 </tr> 33 <tr> 34 <td class="content2" style="width:200px;">{$TR_SUBJECT}</td> 35 <td class="content">{control_input_text name=subj style="width:80%" value=$SUBJECT} 36 </td> 37 </tr> 38 <tr> 39 <td class="content2" style="width:200px;vertical-align:top;">{$TR_YOUR_MESSAGE}</td> 40 <td class="content"><textarea name="user_message" style="width:80%" class="textinput2" cols="80" rows="12">{$USER_MESSAGE}</textarea> 41 </td> 42 </tr> 43 <tr> 44 <td colspan="2"><input name="Submit" type="submit" class="button" value="{$TR_SEND_MESSAGE}" /> 45 <input name="uaction" type="hidden" value="send_msg" /></td> 46 </tr> 47 </table> 48 <!-- end of content --> 49 </form></td> 50 </tr> 51 </table></td> 52 <td> </td> 53 </tr> 54 <tr> 55 <td> </td> 56 <td> </td> 57 </tr> 58 </table></td> 59 </tr> 60 </table> 1 <tr> 2 <td class="content2" style="width:200px;">{$TR_URGENCY}</td> 3 <td class="content">{control_input_select name=urgency options=$urgencies value=$OPT_URGENCY} 4 </td> 5 </tr> 6 <tr> 7 <td class="content2" style="width:200px;">{$TR_SUBJECT}</td> 8 <td class="content">{control_input_text name=subj style="width:80%" value=$SUBJECT} 9 </td> 10 </tr> 11 <tr> 12 <td class="content2" style="width:200px;vertical-align:top;">{$TR_YOUR_MESSAGE}</td> 13 <td class="content"><textarea name="user_message" style="width:80%" class="textinput2" cols="80" rows="12">{$USER_MESSAGE}</textarea> 14 </td> 15 </tr> 16 <tr> 17 <td colspan="2"><input name="Submit" type="submit" class="button" value="{$TR_SEND_MESSAGE}" /> 18 <input name="uaction" type="hidden" value="send_msg" /></td> 19 </tr> 20 </table>
Note: See TracChangeset
for help on using the changeset viewer.
