Changeset 17927

Show
Ignore:
Timestamp:
10/05/08 14:02:40 (2 months ago)
Author:
flack
Message:

remove more .html suffixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/midcom/org.openpsa.contacts/handler/person.php

    r17644 r17927  
    349349                $this->_toolbars->bottom->add_item( 
    350350                    Array( 
    351                         MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}.html", 
     351                        MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}/", 
    352352                        MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('remove buddy'), 
    353353                        MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    362362                $this->_toolbars->bottom->add_item( 
    363363                    Array( 
    364                         MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}.html", 
     364                        MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}/", 
    365365                        MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('add buddy'), 
    366366                        MIDCOM_TOOLBAR_HELPTEXT => null, 
  • trunk/midcom/org.openpsa.contacts/handler/person/admin.php

    r17644 r17927  
    7979            array 
    8080            ( 
    81                 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}.html", 
     81                MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}/", 
    8282                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8383                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    9292            array 
    9393            ( 
    94                 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}.html", 
     94                MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}/", 
    9595                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9696                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103        { 
    104104            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}/"); 
    106106                break; 
    107107            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}/"); 
    109109                break; 
    110110        } 
     
    206206                $tmp[] = Array 
    207207                ( 
    208                     MIDCOM_NAV_URL => "person/edit/{$this->_contact->guid}.html", 
     208                    MIDCOM_NAV_URL => "person/edit/{$this->_contact->guid}/", 
    209209                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    210210                ); 
     
    213213                $tmp[] = Array 
    214214                ( 
    215                     MIDCOM_NAV_URL => "person/delete/{$this->_contact->guid}.html", 
     215                    MIDCOM_NAV_URL => "person/delete/{$this->_contact->guid}/", 
    216216                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    217217                ); 
  • trunk/midcom/org.openpsa.contacts/handler/person/view.php

    r17350 r17927  
    5151            array 
    5252            ( 
    53                 MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}.html", 
     53                MIDCOM_TOOLBAR_URL => "person/edit/{$this->_contact->guid}/", 
    5454                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    5555                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    6464            array 
    6565            ( 
    66                 MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}.html", 
     66                MIDCOM_TOOLBAR_URL => "person/delete/{$this->_contact->guid}/", 
    6767                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    6868                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    8585                array 
    8686                ( 
    87                     MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}.html", 
     87                    MIDCOM_TOOLBAR_URL => "buddylist/remove/{$this->_request_data['person']->guid}/", 
    8888                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('remove buddy'), 
    8989                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    100100                array 
    101101                ( 
    102                     MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}.html", 
     102                    MIDCOM_TOOLBAR_URL => "buddylist/add/{$this->_request_data['person']->guid}/", 
    103103                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('add buddy'), 
    104104                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    197197        $tmp[] = array 
    198198        ( 
    199             MIDCOM_NAV_URL => "person/{$this->_contact->guid}.html", 
     199            MIDCOM_NAV_URL => "person/{$this->_contact->guid}/", 
    200200            MIDCOM_NAV_NAME => $this->_contact->name, 
    201201        ); 
  • trunk/midcom/org.openpsa.directmarketing/campaign_member.php

    r17802 r17927  
    116116        $content = str_replace('<UNSUBSCRIBE_URL>', $this->get_unsubscribe_url($node, $person), $content); 
    117117        // 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); 
    119119        // General membership GUID 
    120120        $content = str_replace('<MEMBER_GUID>', $this->guid, $content); 
     
    175175            $person = new org_openpsa_contacts_person($this->person); 
    176176        } 
    177         return "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe/{$this->guid}.html"; 
     177        return "{$node[MIDCOM_NAV_FULLURL]}campaign/unsubscribe/{$this->guid}/"; 
    178178    } 
    179179 
  • trunk/midcom/org.openpsa.directmarketing/handler/campaign/admin.php

    r17802 r17927  
    7979            array 
    8080            ( 
    81                 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}.html", 
     81                MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}/", 
    8282                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8383                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    9292            array 
    9393            ( 
    94                 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}.html", 
     94                MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}/", 
    9595                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9696                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103        { 
    104104            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}/"); 
    106106                break; 
    107107            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}/"); 
    109109                break; 
    110110        } 
     
    178178                $tmp[] = array 
    179179                ( 
    180                     MIDCOM_NAV_URL => "campaign/edit/{$this->_campaign->guid}.html", 
     180                    MIDCOM_NAV_URL => "campaign/edit/{$this->_campaign->guid}/", 
    181181                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    182182                ); 
     
    185185                $tmp[] = array 
    186186                ( 
    187                     MIDCOM_NAV_URL => "campaign/delete/{$this->_campaign->guid}.html", 
     187                    MIDCOM_NAV_URL => "campaign/delete/{$this->_campaign->guid}/", 
    188188                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    189189                ); 
     
    192192                $tmp[] = array 
    193193                ( 
    194                     MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}.html", 
     194                    MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}/", 
    195195                    MIDCOM_NAV_NAME => $this->_l10n->get('edit rules'), 
    196196                ); 
     
    199199                $tmp[] = array 
    200200                ( 
    201                     MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}.html", 
     201                    MIDCOM_NAV_URL => "campaign/edit_query/{$this->_campaign->guid}/", 
    202202                    MIDCOM_NAV_NAME => $this->_l10n->get('edit rules'), 
    203203                ); 
    204204                $tmp[] = array 
    205205                ( 
    206                     MIDCOM_NAV_URL => "campaign/edit_query_advanced/{$this->_campaign->guid}.html", 
     206                    MIDCOM_NAV_URL => "campaign/edit_query_advanced/{$this->_campaign->guid}/", 
    207207                    MIDCOM_NAV_NAME => $this->_l10n->get('advanced rule editor'), 
    208208                ); 
  • trunk/midcom/org.openpsa.directmarketing/handler/campaign/campaign.php

    r17802 r17927  
    9292                array 
    9393                ( 
    94                     MIDCOM_TOOLBAR_URL => "campaign/import/{$this->_campaign->guid}.html", 
     94                    MIDCOM_TOOLBAR_URL => "campaign/import/{$this->_campaign->guid}/", 
    9595                    MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('import subscribers'), 
    9696                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    116116            array 
    117117            ( 
    118                 MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}.html", 
     118                MIDCOM_TOOLBAR_URL => "campaign/edit/{$this->_campaign->guid}/", 
    119119                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    120120                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', 
     
    127127            array 
    128128            ( 
    129                 MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}.html", 
     129                MIDCOM_TOOLBAR_URL => "campaign/delete/{$this->_campaign->guid}/", 
    130130                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    131131                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
  • trunk/midcom/org.openpsa.directmarketing/handler/message/admin.php

    r17802 r17927  
    7979            array 
    8080            ( 
    81                 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}.html", 
     81                MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}/", 
    8282                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8383                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    9292            array 
    9393            ( 
    94                 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}.html", 
     94                MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}/", 
    9595                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9696                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103        { 
    104104            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}/"); 
    106106                break; 
    107107            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}/"); 
    109109                break; 
    110110        } 
     
    184184                $tmp[] = array 
    185185                ( 
    186                     MIDCOM_NAV_URL => "message/edit/{$this->_message->guid}.html", 
     186                    MIDCOM_NAV_URL => "message/edit/{$this->_message->guid}/", 
    187187                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    188188                ); 
     
    191191                $tmp[] = array 
    192192                ( 
    193                     MIDCOM_NAV_URL => "message/delete/{$this->_message->guid}.html", 
     193                    MIDCOM_NAV_URL => "message/delete/{$this->_message->guid}/", 
    194194                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    195195                ); 
  • trunk/midcom/org.openpsa.directmarketing/handler/message/message.php

    r17802 r17927  
    8282            array 
    8383            ( 
    84                 MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}.html", 
     84                MIDCOM_TOOLBAR_URL => "message/edit/{$this->_message->guid}/", 
    8585                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8686                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', 
     
    9393            array 
    9494            ( 
    95                 MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}.html", 
     95                MIDCOM_TOOLBAR_URL => "message/delete/{$this->_message->guid}/", 
    9696                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9797                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103            && !empty($_MIDCOM->auth->user->guid)) 
    104104        { 
    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}/"; 
    106106        } 
    107107        else 
    108108        { 
    109             $preview_url = "message/compose/{$this->_message->guid}.html"; 
     109            $preview_url = "message/compose/{$this->_message->guid}/"; 
    110110        } 
    111111        $this->_view_toolbar->add_item 
     
    125125            array 
    126126            ( 
    127                 MIDCOM_TOOLBAR_URL => "message/report/{$this->_request_data['message']->guid}.html", 
     127                MIDCOM_TOOLBAR_URL => "message/report/{$this->_request_data['message']->guid}/", 
    128128                MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("message report"), 
    129129                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    137137            array 
    138138            ( 
    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}/", 
    140140                MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("send message to testers"), 
    141141                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    148148            array 
    149149            ( 
    150                 MIDCOM_TOOLBAR_URL => "message/send/{$this->_request_data['message']->guid}.html", 
     150                MIDCOM_TOOLBAR_URL => "message/send/{$this->_request_data['message']->guid}/", 
    151151                MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get("send message to whole campaign"), 
    152152                MIDCOM_TOOLBAR_HELPTEXT => null, 
  • trunk/midcom/org.openpsa.directmarketing/handler/message/report.php

    r17802 r17927  
    397397        $campaign->schedule_update_smart_campaign_members(); 
    398398        $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) 
    399             . "campaign/edit/{$campaign->guid}.html"); 
     399            . "campaign/edit/{$campaign->guid}/"); 
    400400        // This will exit() 
    401401    } 
     
    448448        $tmp[] = array 
    449449        ( 
    450             MIDCOM_NAV_URL => "message/report/{$this->_message->guid}.html", 
     450            MIDCOM_NAV_URL => "message/report/{$this->_message->guid}/", 
    451451            MIDCOM_NAV_NAME => $this->_l10n->get('message report'), 
    452452        ); 
     
    468468            && !empty($_MIDCOM->auth->user->guid)) 
    469469        { 
    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}/"; 
    471471        } 
    472472        else 
    473473        { 
    474             $preview_url = "message/compose/{$this->_message->guid}.html"; 
     474            $preview_url = "message/compose/{$this->_message->guid}/"; 
    475475        } 
    476476        $this->_view_toolbar->add_item 
  • trunk/midcom/org.openpsa.interviews/handler/campaign.php

    r17555 r17927  
    148148            } 
    149149 
    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}/"); 
    151151            // This will exit. 
    152152        } 
  • trunk/midcom/org.openpsa.invoices/handler/edit.php

    r17901 r17927  
    234234        { 
    235235            $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}/"); 
    237237            // This will exit 
    238238        } 
     
    277277        { 
    278278            $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}/"); 
    280280            // This will exit 
    281281        } 
     
    314314            $this->_view_toolbar->add_item( 
    315315                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}/", 
    317317                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('mark sent'), 
    318318                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    327327            $this->_view_toolbar->add_item( 
    328328                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}/", 
    330330                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('mark paid'), 
    331331                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    568568                // Relocate to main view 
    569569                $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}/"); 
    571571                break; 
    572572 
  • trunk/midcom/org.openpsa.invoices/handler/list.php

    r17926 r17927  
    215215        $this->_node_toolbar->add_item( 
    216216            Array( 
    217                 MIDCOM_TOOLBAR_URL => "invoice/new/{$this->_request_data['customer']->guid}.html", 
     217                MIDCOM_TOOLBAR_URL => "invoice/new/{$this->_request_data['customer']->guid}/", 
    218218                MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('create invoice'), 
    219219                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    234234            $this->_view_toolbar->add_item( 
    235235                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}/", 
    237237                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('all invoices'), 
    238238                    MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    250250            $this->_view_toolbar->add_item( 
    251251                Array( 
    252                     MIDCOM_TOOLBAR_URL => "list/customer/{$this->_request_data['customer']->guid}.html", 
     252                    MIDCOM_TOOLBAR_URL => "list/customer/{$this->_request_data['customer']->guid}/", 
    253253                    MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('open invoices'), 
    254254                    MIDCOM_TOOLBAR_HELPTEXT => null, 
  • trunk/midcom/org.openpsa.invoices/handler/projects.php

    r17350 r17927  
    8080 
    8181            $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}/"); 
    8383            // This will exit 
    8484        } 
  • trunk/midcom/org.openpsa.projects/handler/project/admin.php

    r17904 r17927  
    153153                $tmp[] = Array 
    154154                ( 
    155                     MIDCOM_NAV_URL => "project/edit/{$this->_project->guid}.html", 
     155                    MIDCOM_NAV_URL => "project/edit/{$this->_project->guid}/", 
    156156                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    157157                ); 
     
    160160                $tmp[] = Array 
    161161                ( 
    162                     MIDCOM_NAV_URL => "project/delete/{$this->_project->guid}.html", 
     162                    MIDCOM_NAV_URL => "project/delete/{$this->_project->guid}/", 
    163163                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    164164                ); 
  • trunk/midcom/org.openpsa.projects/handler/task/admin.php

    r17904 r17927  
    7979            array 
    8080            ( 
    81                 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}.html", 
     81                MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}/", 
    8282                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8383                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    9292            array 
    9393            ( 
    94                 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}.html", 
     94                MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}/", 
    9595                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9696                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103        { 
    104104            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}/"); 
    106106                break; 
    107107            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}/"); 
    109109                break; 
    110110        } 
     
    188188                $tmp[] = Array 
    189189                ( 
    190                     MIDCOM_NAV_URL => "task/edit/{$this->_task->guid}.html", 
     190                    MIDCOM_NAV_URL => "task/edit/{$this->_task->guid}/", 
    191191                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    192192                ); 
     
    195195                $tmp[] = Array 
    196196                ( 
    197                     MIDCOM_NAV_URL => "task/delete/{$this->_task->guid}.html", 
     197                    MIDCOM_NAV_URL => "task/delete/{$this->_task->guid}/", 
    198198                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    199199                ); 
  • trunk/midcom/org.openpsa.projects/handler/task/resourcing.php

    r17904 r17927  
    6969            array 
    7070            ( 
    71                 MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}.html", 
     71                MIDCOM_TOOLBAR_URL => "task/edit/{$this->_task->guid}/", 
    7272                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    7373                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    8282            array 
    8383            ( 
    84                 MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}.html", 
     84                MIDCOM_TOOLBAR_URL => "task/delete/{$this->_task->guid}/", 
    8585                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    8686                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    153153                $tmp[] = Array 
    154154                ( 
    155                     MIDCOM_NAV_URL => "task/resourcing/{$this->_task->guid}.html", 
     155                    MIDCOM_NAV_URL => "task/resourcing/{$this->_task->guid}/", 
    156156                    MIDCOM_NAV_NAME => $this->_l10n->get('resourcing'), 
    157157                ); 
  • trunk/midcom/org.openpsa.reports/handler/sales/report.php

    r17901 r17927  
    142142        $tmp[] = Array 
    143143        ( 
    144             MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}.html", 
     144            MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 
    145145            MIDCOM_NAV_NAME => $this->_salesproject->title, 
    146146        ); 
  • trunk/midcom/org.openpsa.sales/handler/deliverable/add.php

    r17350 r17927  
    194194        $tmp[] = Array 
    195195        ( 
    196             MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}.html", 
     196            MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 
    197197            MIDCOM_NAV_NAME => $this->_salesproject->title, 
    198198        ); 
    199199        $tmp[] = Array 
    200200        ( 
    201             MIDCOM_NAV_URL => "deliverable/add/{$this->_salesproject->guid}.html", 
     201            MIDCOM_NAV_URL => "deliverable/add/{$this->_salesproject->guid}/", 
    202202            MIDCOM_NAV_NAME => sprintf($this->_l10n->get('add products to %s'), $this->_salesproject->title), 
    203203        ); 
  • trunk/midcom/org.openpsa.sales/handler/deliverable/admin.php

    r17350 r17927  
    7979            array 
    8080            ( 
    81                 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}.html", 
     81                MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}/", 
    8282                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    8383                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    9292            array 
    9393            ( 
    94                 MIDCOM_TOOLBAR_URL => "deliverable/delete/{$this->_deliverable->guid}.html", 
     94                MIDCOM_TOOLBAR_URL => "deliverable/delete/{$this->_deliverable->guid}/", 
    9595                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    9696                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    103103        { 
    104104            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}/"); 
    106106                break; 
    107107            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}/"); 
    109109                break; 
    110110        } 
     
    188188                $tmp[] = Array 
    189189                ( 
    190                     MIDCOM_NAV_URL => "deliverable/edit/{$this->_deliverable->guid}.html", 
     190                    MIDCOM_NAV_URL => "deliverable/edit/{$this->_deliverable->guid}/", 
    191191                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 
    192192                ); 
     
    195195                $tmp[] = Array 
    196196                ( 
    197                     MIDCOM_NAV_URL => "deliverable/delete/{$this->_deliverable->guid}.html", 
     197                    MIDCOM_NAV_URL => "deliverable/delete/{$this->_deliverable->guid}/", 
    198198                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 
    199199                ); 
  • trunk/midcom/org.openpsa.sales/handler/deliverable/report.php

    r17901 r17927  
    105105        $tmp[] = Array 
    106106        ( 
    107             MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}.html", 
     107            MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 
    108108            MIDCOM_NAV_NAME => $this->_salesproject->title, 
    109109        ); 
  • trunk/midcom/org.openpsa.sales/handler/deliverable/view.php

    r17350 r17927  
    5353            array 
    5454            ( 
    55                 MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}.html", 
     55                MIDCOM_TOOLBAR_URL => "deliverable/edit/{$this->_deliverable->guid}/", 
    5656                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    5757                MIDCOM_TOOLBAR_HELPTEXT => null, 
     
    6666        { 
    6767            $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}/", 
    6969                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    7070                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
  • trunk/midcom/org.openpsa.sales/handler/edit.php

    r17350 r17927  
    131131        $this->_view_toolbar->add_item( 
    132132            Array( 
    133                 MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_request_data['salesproject']->guid}.html", 
     133                MIDCOM_TOOLBAR_URL => "salesproject/edit/{$this->_request_data['salesproject']->guid}/", 
    134134                MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n_midcom']->get("edit"), 
    135135                MIDCOM_TOOLBAR_HELPTEXT => null, 
  • trunk/midcom/org.openpsa.sales/handler/view.php

    r17350 r17927  
    4343        { 
    4444            $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}/", 
    4646                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 
    4747                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', 
     
    5252        { 
    5353            $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}/", 
    5555                MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 
    5656                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', 
     
    102102        $tmp[] = Array 
    103103        ( 
    104             MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}.html", 
     104            MIDCOM_NAV_URL => "salesproject/{$this->_salesproject->guid}/", 
    105105            MIDCOM_NAV_NAME => $this->_salesproject->title, 
    106106        );