Changeset 17927
- Timestamp:
- 10/05/08 14:02:40 (2 months ago)
- Files:
-
- trunk/midcom/org.openpsa.contacts/handler/person.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.contacts/handler/person/admin.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.contacts/handler/person/view.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.directmarketing/campaign_member.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.directmarketing/handler/campaign/admin.php (modified) (7 diffs)
- trunk/midcom/org.openpsa.directmarketing/handler/campaign/campaign.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.directmarketing/handler/message/admin.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.directmarketing/handler/message/message.php (modified) (6 diffs)
- trunk/midcom/org.openpsa.directmarketing/handler/message/report.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.interviews/handler/campaign.php (modified) (1 diff)
- trunk/midcom/org.openpsa.invoices/handler/edit.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.invoices/handler/list.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.invoices/handler/projects.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/handler/project/admin.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.projects/handler/task/admin.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.projects/handler/task/resourcing.php (modified) (3 diffs)
- trunk/midcom/org.openpsa.reports/handler/sales/report.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/deliverable/add.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/deliverable/admin.php (modified) (5 diffs)
- trunk/midcom/org.openpsa.sales/handler/deliverable/report.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/deliverable/view.php (modified) (2 diffs)
- trunk/midcom/org.openpsa.sales/handler/edit.php (modified) (1 diff)
- trunk/midcom/org.openpsa.sales/handler/view.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/org.openpsa.contacts/handler/person.php
r17644 r17927 349 349 $this->_toolbars->bottom->add_item( 350 350 Array( 351 MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid} .html",351 MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}/", 352 352 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('remove buddy'), 353 353 MIDCOM_TOOLBAR_HELPTEXT => null, … … 362 362 $this->_toolbars->bottom->add_item( 363 363 Array( 364 MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid} .html",364 MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}/", 365 365 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('add buddy'), 366 366 MIDCOM_TOOLBAR_HELPTEXT => null, trunk/midcom/org.openpsa.contacts/handler/person/admin.php
r17644 r17927 79 79 array 80 80 ( 81 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid} .html",81 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}/", 82 82 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 83 83 MIDCOM_TOOLBAR_HELPTEXT => null, … … 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid} .html",94 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 96 96 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 { 104 104 case 'person_edit': 105 $this->_view_toolbar->disable_item("person/edit/{$this->_contact->guid} .html");105 $this->_view_toolbar->disable_item("person/edit/{$this->_contact->guid}/"); 106 106 break; 107 107 case 'person_delete': 108 $this->_view_toolbar->disable_item("person/delete/{$this->_contact->guid} .html");108 $this->_view_toolbar->disable_item("person/delete/{$this->_contact->guid}/"); 109 109 break; 110 110 } … … 206 206 $tmp[] = Array 207 207 ( 208 MIDCOM_NAV_URL => "person/edit/{$this->_contact->guid} .html",208 MIDCOM_NAV_URL => "person/edit/{$this->_contact->guid}/", 209 209 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 210 210 ); … … 213 213 $tmp[] = Array 214 214 ( 215 MIDCOM_NAV_URL => "person/delete/{$this->_contact->guid} .html",215 MIDCOM_NAV_URL => "person/delete/{$this->_contact->guid}/", 216 216 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 217 217 ); trunk/midcom/org.openpsa.contacts/handler/person/view.php
r17350 r17927 51 51 array 52 52 ( 53 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid} .html",53 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}/", 54 54 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 55 55 MIDCOM_TOOLBAR_HELPTEXT => null, … … 64 64 array 65 65 ( 66 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid} .html",66 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}/", 67 67 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 68 68 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 85 85 array 86 86 ( 87 MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid} .html",87 MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}/", 88 88 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('remove buddy'), 89 89 MIDCOM_TOOLBAR_HELPTEXT => null, … … 100 100 array 101 101 ( 102 MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid} .html",102 MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}/", 103 103 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('add buddy'), 104 104 MIDCOM_TOOLBAR_HELPTEXT => null, … … 197 197 $tmp[] = array 198 198 ( 199 MIDCOM_NAV_URL => "person/{$this->_contact->guid} .html",199 MIDCOM_NAV_URL => "person/{$this->_contact->guid}/", 200 200 MIDCOM_NAV_NAME => $this->_contact->name, 201 201 ); trunk/midcom/org.openpsa.directmarketing/campaign_member.php
r17802 r17927 116 116 $content = str_replace('<UNSUBSCRIBE_URL>', $this->get_unsubscribe_url($node, $person), $content); 117 117 // Unsubscribe from all URL 118 $content = str_replace('<UNSUBSCRIBE_ALL_URL>', "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe_all/{$person->guid} .html", $content);118 $content = str_replace('<UNSUBSCRIBE_ALL_URL>', "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe_all/{$person->guid}/", $content); 119 119 // General membership GUID 120 120 $content = str_replace('<MEMBER_GUID>', $this->guid, $content); … … 175 175 $person = new org_openpsa_contacts_person($this->person); 176 176 } 177 return "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe/{$this->guid} .html";177 return "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe/{$this->guid}/"; 178 178 } 179 179 trunk/midcom/org.openpsa.directmarketing/handler/campaign/admin.php
r17802 r17927 79 79 array 80 80 ( 81 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid} .html",81 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}/", 82 82 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 83 83 MIDCOM_TOOLBAR_HELPTEXT => null, … … 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid} .html",94 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 96 96 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 { 104 104 case 'edit_campaign': 105 $this->_view_toolbar->disable_item("campaign/edit/{$this->_campaign->guid} .html");105 $this->_view_toolbar->disable_item("campaign/edit/{$this->_campaign->guid}/"); 106 106 break; 107 107 case 'delete_campaign': 108 $this->_view_toolbar->disable_item("campaign/delete/{$this->_campaign->guid} .html");108 $this->_view_toolbar->disable_item("campaign/delete/{$this->_campaign->guid}/"); 109 109 break; 110 110 } … … 178 178 $tmp[] = array 179 179 ( 180 MIDCOM_NAV_URL => "campaign/edit/{$this->_campaign->guid} .html",180 MIDCOM_NAV_URL => "campaign/edit/{$this->_campaign->guid}/", 181 181 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 182 182 ); … … 185 185 $tmp[] = array 186 186 ( 187 MIDCOM_NAV_URL => "campaign/delete/{$this->_campaign->guid} .html",187 MIDCOM_NAV_URL => "campaign/delete/{$this->_campaign->guid}/", 188 188 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 189 189 ); … … 192 192 $tmp[] = array 193 193 ( 194 MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid} .html",194 MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}/", 195 195 MIDCOM_NAV_NAME => $this->_l10n->get('edit rules'), 196 196 ); … … 199 199 $tmp[] = array 200 200 ( 201 MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid} .html",201 MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}/", 202 202 MIDCOM_NAV_NAME => $this->_l10n->get('edit rules'), 203 203 ); 204 204 $tmp[] = array 205 205 ( 206 MIDCOM_NAV_URL => "campaign/edit_query_advanced/{$this->_campaign->guid} .html",206 MIDCOM_NAV_URL => "campaign/edit_query_advanced/{$this->_campaign->guid}/", 207 207 MIDCOM_NAV_NAME => $this->_l10n->get('advanced rule editor'), 208 208 ); trunk/midcom/org.openpsa.directmarketing/handler/campaign/campaign.php
r17802 r17927 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "campaign/import/{$this->_campaign->guid} .html",94 MIDCOM_TOOLBAR_URL => "campaign/import/{$this->_campaign->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('import subscribers'), 96 96 MIDCOM_TOOLBAR_HELPTEXT => null, … … 116 116 array 117 117 ( 118 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid} .html",118 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}/", 119 119 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 120 120 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 127 127 array 128 128 ( 129 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid} .html",129 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}/", 130 130 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 131 131 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', trunk/midcom/org.openpsa.directmarketing/handler/message/admin.php
r17802 r17927 79 79 array 80 80 ( 81 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid} .html",81 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}/", 82 82 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 83 83 MIDCOM_TOOLBAR_HELPTEXT => null, … … 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid} .html",94 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 96 96 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 { 104 104 case 'edit_message': 105 $this->_view_toolbar->disable_item("message/edit/{$this->_message->guid} .html");105 $this->_view_toolbar->disable_item("message/edit/{$this->_message->guid}/"); 106 106 break; 107 107 case 'delete_message': 108 $this->_view_toolbar->disable_item("message/delete/{$this->_message->guid} .html");108 $this->_view_toolbar->disable_item("message/delete/{$this->_message->guid}/"); 109 109 break; 110 110 } … … 184 184 $tmp[] = array 185 185 ( 186 MIDCOM_NAV_URL => "message/edit/{$this->_message->guid} .html",186 MIDCOM_NAV_URL => "message/edit/{$this->_message->guid}/", 187 187 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 188 188 ); … … 191 191 $tmp[] = array 192 192 ( 193 MIDCOM_NAV_URL => "message/delete/{$this->_message->guid} .html",193 MIDCOM_NAV_URL => "message/delete/{$this->_message->guid}/", 194 194 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 195 195 ); trunk/midcom/org.openpsa.directmarketing/handler/message/message.php
r17802 r17927 82 82 array 83 83 ( 84 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid} .html",84 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}/", 85 85 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 86 86 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 93 93 array 94 94 ( 95 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid} .html",95 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}/", 96 96 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 97 97 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 && !empty($_MIDCOM->auth->user->guid)) 104 104 { 105 $preview_url = "message/compose/{$this->_message->guid}/{$_MIDCOM->auth->user->guid} .html";105 $preview_url = "message/compose/{$this->_message->guid}/{$_MIDCOM->auth->user->guid}/"; 106 106 } 107 107 else 108 108 { 109 $preview_url = "message/compose/{$this->_message->guid} .html";109 $preview_url = "message/compose/{$this->_message->guid}/"; 110 110 } 111 111 $this->_view_toolbar->add_item … … 125 125 array 126 126 ( 127 MIDCOM_TOOLBAR_URL => "message/report/{$this->_request_data['message']->guid} .html",127 MIDCOM_TOOLBAR_URL => "message/report/{$this->_request_data['message']->guid}/", 128 128 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("message report"), 129 129 MIDCOM_TOOLBAR_HELPTEXT => null, … … 137 137 array 138 138 ( 139 MIDCOM_TOOLBAR_URL => "message/send_test/{$this->_request_data['message']->guid} .html",139 MIDCOM_TOOLBAR_URL => "message/send_test/{$this->_request_data['message']->guid}/", 140 140 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("send message to testers"), 141 141 MIDCOM_TOOLBAR_HELPTEXT => null, … … 148 148 array 149 149 ( 150 MIDCOM_TOOLBAR_URL => "message/send/{$this->_request_data['message']->guid} .html",150 MIDCOM_TOOLBAR_URL => "message/send/{$this->_request_data['message']->guid}/", 151 151 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("send message to whole campaign"), 152 152 MIDCOM_TOOLBAR_HELPTEXT => null, trunk/midcom/org.openpsa.directmarketing/handler/message/report.php
r17802 r17927 397 397 $campaign->schedule_update_smart_campaign_members(); 398 398 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) 399 . "campaign/edit/{$campaign->guid} .html");399 . "campaign/edit/{$campaign->guid}/"); 400 400 // This will exit() 401 401 } … … 448 448 $tmp[] = array 449 449 ( 450 MIDCOM_NAV_URL => "message/report/{$this->_message->guid} .html",450 MIDCOM_NAV_URL => "message/report/{$this->_message->guid}/", 451 451 MIDCOM_NAV_NAME => $this->_l10n->get('message report'), 452 452 ); … … 468 468 && !empty($_MIDCOM->auth->user->guid)) 469 469 { 470 $preview_url = "message/compose/{$this->_message->guid}/{$_MIDCOM->auth->user->guid} .html";470 $preview_url = "message/compose/{$this->_message->guid}/{$_MIDCOM->auth->user->guid}/"; 471 471 } 472 472 else 473 473 { 474 $preview_url = "message/compose/{$this->_message->guid} .html";474 $preview_url = "message/compose/{$this->_message->guid}/"; 475 475 } 476 476 $this->_view_toolbar->add_item trunk/midcom/org.openpsa.interviews/handler/campaign.php
r17555 r17927 148 148 } 149 149 150 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "interview/{$member->guid} .html");150 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "interview/{$member->guid}/"); 151 151 // This will exit. 152 152 } trunk/midcom/org.openpsa.invoices/handler/edit.php
r17901 r17927 234 234 { 235 235 $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 236 $_MIDCOM->relocate("{$prefix}invoice/{$this->_request_data['invoice']->guid} .html");236 $_MIDCOM->relocate("{$prefix}invoice/{$this->_request_data['invoice']->guid}/"); 237 237 // This will exit 238 238 } … … 277 277 { 278 278 $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 279 $_MIDCOM->relocate("{$prefix}invoice/{$this->_request_data['invoice']->guid} .html");279 $_MIDCOM->relocate("{$prefix}invoice/{$this->_request_data['invoice']->guid}/"); 280 280 // This will exit 281 281 } … … 314 314 $this->_view_toolbar->add_item( 315 315 Array( 316 MIDCOM_TOOLBAR_URL => "invoice/mark_sent/{$this->_request_data['invoice']->guid} .html",316 MIDCOM_TOOLBAR_URL => "invoice/mark_sent/{$this->_request_data['invoice']->guid}/", 317 317 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('mark sent'), 318 318 MIDCOM_TOOLBAR_HELPTEXT => null, … … 327 327 $this->_view_toolbar->add_item( 328 328 Array( 329 MIDCOM_TOOLBAR_URL => "invoice/mark_paid/{$this->_request_data['invoice']->guid} .html",329 MIDCOM_TOOLBAR_URL => "invoice/mark_paid/{$this->_request_data['invoice']->guid}/", 330 330 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('mark paid'), 331 331 MIDCOM_TOOLBAR_HELPTEXT => null, … … 568 568 // Relocate to main view 569 569 $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 570 $_MIDCOM->relocate("{$prefix}invoice/edit/{$this->_request_data['invoice']->guid} .html");570 $_MIDCOM->relocate("{$prefix}invoice/edit/{$this->_request_data['invoice']->guid}/"); 571 571 break; 572 572 trunk/midcom/org.openpsa.invoices/handler/list.php
r17926 r17927 215 215 $this->_node_toolbar->add_item( 216 216 Array( 217 MIDCOM_TOOLBAR_URL => "invoice/new/{$this->_request_data['customer']->guid} .html",217 MIDCOM_TOOLBAR_URL => "invoice/new/{$this->_request_data['customer']->guid}/", 218 218 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('create invoice'), 219 219 MIDCOM_TOOLBAR_HELPTEXT => null, … … 234 234 $this->_view_toolbar->add_item( 235 235 Array( 236 MIDCOM_TOOLBAR_URL => "list/customer/all/{$this->_request_data['customer']->guid} .html",236 MIDCOM_TOOLBAR_URL => "list/customer/all/{$this->_request_data['customer']->guid}/", 237 237 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('all invoices'), 238 238 MIDCOM_TOOLBAR_HELPTEXT => null, … … 250 250 $this->_view_toolbar->add_item( 251 251 Array( 252 MIDCOM_TOOLBAR_URL => "list/customer/{$this->_request_data['customer']->guid} .html",252 MIDCOM_TOOLBAR_URL => "list/customer/{$this->_request_data['customer']->guid}/", 253 253 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('open invoices'), 254 254 MIDCOM_TOOLBAR_HELPTEXT => null, trunk/midcom/org.openpsa.invoices/handler/projects.php
r17350 r17927 80 80 81 81 $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 82 $_MIDCOM->relocate("{$prefix}invoice/edit/{$invoice->guid} .html");82 $_MIDCOM->relocate("{$prefix}invoice/edit/{$invoice->guid}/"); 83 83 // This will exit 84 84 } trunk/midcom/org.openpsa.projects/handler/project/admin.php
r17904 r17927 153 153 $tmp[] = Array 154 154 ( 155 MIDCOM_NAV_URL => "project/edit/{$this->_project->guid} .html",155 MIDCOM_NAV_URL => "project/edit/{$this->_project->guid}/", 156 156 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 157 157 ); … … 160 160 $tmp[] = Array 161 161 ( 162 MIDCOM_NAV_URL => "project/delete/{$this->_project->guid} .html",162 MIDCOM_NAV_URL => "project/delete/{$this->_project->guid}/", 163 163 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 164 164 ); trunk/midcom/org.openpsa.projects/handler/task/admin.php
r17904 r17927 79 79 array 80 80 ( 81 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid} .html",81 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}/", 82 82 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 83 83 MIDCOM_TOOLBAR_HELPTEXT => null, … … 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid} .html",94 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 96 96 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 { 104 104 case 'task_edit': 105 $this->_view_toolbar->disable_item("task/edit/{$this->_task->guid} .html");105 $this->_view_toolbar->disable_item("task/edit/{$this->_task->guid}/"); 106 106 break; 107 107 case 'task_delete': 108 $this->_view_toolbar->disable_item("task/delete/{$this->_task->guid} .html");108 $this->_view_toolbar->disable_item("task/delete/{$this->_task->guid}/"); 109 109 break; 110 110 } … … 188 188 $tmp[] = Array 189 189 ( 190 MIDCOM_NAV_URL => "task/edit/{$this->_task->guid} .html",190 MIDCOM_NAV_URL => "task/edit/{$this->_task->guid}/", 191 191 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 192 192 ); … … 195 195 $tmp[] = Array 196 196 ( 197 MIDCOM_NAV_URL => "task/delete/{$this->_task->guid} .html",197 MIDCOM_NAV_URL => "task/delete/{$this->_task->guid}/", 198 198 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 199 199 ); trunk/midcom/org.openpsa.projects/handler/task/resourcing.php
r17904 r17927 69 69 array 70 70 ( 71 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid} .html",71 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}/", 72 72 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 73 73 MIDCOM_TOOLBAR_HELPTEXT => null, … … 82 82 array 83 83 ( 84 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid} .html",84 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}/", 85 85 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 86 86 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 153 153 $tmp[] = Array 154 154 ( 155 MIDCOM_NAV_URL => "task/resourcing/{$this->_task->guid} .html",155 MIDCOM_NAV_URL => "task/resourcing/{$this->_task->guid}/", 156 156 MIDCOM_NAV_NAME => $this->_l10n->get('resourcing'), 157 157 ); trunk/midcom/org.openpsa.reports/handler/sales/report.php
r17901 r17927 142 142 $tmp[] = Array 143 143 ( 144 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid} .html",144 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 145 145 MIDCOM_NAV_NAME => $this->_salesproject->title, 146 146 ); trunk/midcom/org.openpsa.sales/handler/deliverable/add.php
r17350 r17927 194 194 $tmp[] = Array 195 195 ( 196 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid} .html",196 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 197 197 MIDCOM_NAV_NAME => $this->_salesproject->title, 198 198 ); 199 199 $tmp[] = Array 200 200 ( 201 MIDCOM_NAV_URL => "deliverable/add/{$this->_salesproject->guid} .html",201 MIDCOM_NAV_URL => "deliverable/add/{$this->_salesproject->guid}/", 202 202 MIDCOM_NAV_NAME => sprintf($this->_l10n->get('add products to %s'), $this->_salesproject->title), 203 203 ); trunk/midcom/org.openpsa.sales/handler/deliverable/admin.php
r17350 r17927 79 79 array 80 80 ( 81 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid} .html",81 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}/", 82 82 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 83 83 MIDCOM_TOOLBAR_HELPTEXT => null, … … 92 92 array 93 93 ( 94 MIDCOM_TOOLBAR_URL => "deliverable/delete/{$this->_deliverable->guid} .html",94 MIDCOM_TOOLBAR_URL => "deliverable/delete/{$this->_deliverable->guid}/", 95 95 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 96 96 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 103 103 { 104 104 case 'deliverable_edit': 105 $this->_view_toolbar->disable_item("deliverable/edit/{$this->_deliverable->guid} .html");105 $this->_view_toolbar->disable_item("deliverable/edit/{$this->_deliverable->guid}/"); 106 106 break; 107 107 case 'deliverable_delete': 108 $this->_view_toolbar->disable_item("deliverable/delete/{$this->_deliverable->guid} .html");108 $this->_view_toolbar->disable_item("deliverable/delete/{$this->_deliverable->guid}/"); 109 109 break; 110 110 } … … 188 188 $tmp[] = Array 189 189 ( 190 MIDCOM_NAV_URL => "deliverable/edit/{$this->_deliverable->guid} .html",190 MIDCOM_NAV_URL => "deliverable/edit/{$this->_deliverable->guid}/", 191 191 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 192 192 ); … … 195 195 $tmp[] = Array 196 196 ( 197 MIDCOM_NAV_URL => "deliverable/delete/{$this->_deliverable->guid} .html",197 MIDCOM_NAV_URL => "deliverable/delete/{$this->_deliverable->guid}/", 198 198 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 199 199 ); trunk/midcom/org.openpsa.sales/handler/deliverable/report.php
r17901 r17927 105 105 $tmp[] = Array 106 106 ( 107 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid} .html",107 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 108 108 MIDCOM_NAV_NAME => $this->_salesproject->title, 109 109 ); trunk/midcom/org.openpsa.sales/handler/deliverable/view.php
r17350 r17927 53 53 array 54 54 ( 55 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid} .html",55 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}/", 56 56 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 57 57 MIDCOM_TOOLBAR_HELPTEXT => null, … … 66 66 { 67 67 $this->_view_toolbar->add_item(Array( 68 MIDCOM_TOOLBAR_URL => "salesproject/delete/{$this->_salesproject->guid} .html",68 MIDCOM_TOOLBAR_URL => "salesproject/delete/{$this->_salesproject->guid}/", 69 69 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 70 70 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', trunk/midcom/org.openpsa.sales/handler/edit.php
r17350 r17927 131 131 $this->_view_toolbar->add_item( 132 132 Array( 133 MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_request_data['salesproject']->guid} .html",133 MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_request_data['salesproject']->guid}/", 134 134 MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n_midcom']->get("edit"), 135 135 MIDCOM_TOOLBAR_HELPTEXT => null, trunk/midcom/org.openpsa.sales/handler/view.php
r17350 r17927 43 43 { 44 44 $this->_view_toolbar->add_item(Array( 45 MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_salesproject->guid} .html",45 MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_salesproject->guid}/", 46 46 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 47 47 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 52 52 { 53 53 $this->_view_toolbar->add_item(Array( 54 MIDCOM_TOOLBAR_URL => "salesproject/delete/{$this->_salesproject->guid} .html",54 MIDCOM_TOOLBAR_URL => "salesproject/delete/{$this->_salesproject->guid}/", 55 55 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 56 56 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 102 102 $tmp[] = Array 103 103 ( 104 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid} .html",104 MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 105 105 MIDCOM_NAV_NAME => $this->_salesproject->title, 106 106 );
