Changeset 17713
- Timestamp:
- 09/26/08 11:20:08 (2 months ago)
- Files:
-
- branches/MidCOM_2_8/fi.hut.loginbroker/callbacks/prototypes.php (modified) (1 diff)
- branches/MidCOM_2_8/fi.hut.loginbroker/handler/index.php (modified) (1 diff)
- branches/MidCOM_2_8/net.nemein.feedcollector/style/manage-topic-item.php (modified) (1 diff)
- branches/MidCOM_2_8/net.nemein.feedcollector/viewer.php (modified) (1 diff)
- branches/MidCOM_2_8/net.nemein.personnel/admin.php (modified) (4 diffs)
- branches/MidCOM_2_8/net.nemein.personnel/handler/account.php (modified) (1 diff)
- branches/MidCOM_2_8/net.nemein.personnel/handler/admin.php (modified) (7 diffs)
- branches/MidCOM_2_8/net.nemein.personnel/handler/view.php (modified) (6 diffs)
- branches/MidCOM_2_8/net.nemein.personnel/midcom/interfaces.php (modified) (1 diff)
- branches/MidCOM_2_8/net.nemein.personnel/style/index-alpha-bar.php (modified) (2 diffs)
- branches/MidCOM_2_8/net.nemein.personnel/viewer.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/MidCOM_2_8/fi.hut.loginbroker/callbacks/prototypes.php
r15082 r17713 11 11 * 12 12 * The midcom_baseclasses_components_purecode class defines a bunch of helper vars 13 * See: http://www.midgard-project.org/api-docs/midcom/dev/midcom.baseclasses/midcom_baseclasses_components_purecode .html13 * See: http://www.midgard-project.org/api-docs/midcom/dev/midcom.baseclasses/midcom_baseclasses_components_purecode/ 14 14 * 15 15 * @package fi.hut.loginbroker branches/MidCOM_2_8/fi.hut.loginbroker/handler/index.php
r16489 r17713 11 11 * 12 12 * The midcom_baseclasses_components_handler class defines a bunch of helper vars 13 * See: http://www.midgard-project.org/api-docs/midcom/dev/midcom.baseclasses/midcom_baseclasses_components_handler .html13 * See: http://www.midgard-project.org/api-docs/midcom/dev/midcom.baseclasses/midcom_baseclasses_components_handler/ 14 14 * 15 15 * @package fi.hut.loginbroker branches/MidCOM_2_8/net.nemein.feedcollector/style/manage-topic-item.php
r13950 r17713 37 37 <div class="net_nemein_feedcollector_management_topic"> 38 38 <div class="net_nemein_feedcollector_management_topic_buttons" style="float:right;"> 39 <a href="&(prefix);__ais/folder/metadata/&(feedtopic_guid); .html" title="<? echo $data['l10n']->get('edit metadata'); ?>" alt="<? echo $data['l10n']->get('edit metadata'); ?>"><img src="&(static_url);/stock-icons/16x16/metadata.png" alt="<? echo $data['l10n']->get('edit metadata'); ?>" border="0"></a>39 <a href="&(prefix);__ais/folder/metadata/&(feedtopic_guid);/" title="<? echo $data['l10n']->get('edit metadata'); ?>" alt="<? echo $data['l10n']->get('edit metadata'); ?>"><img src="&(static_url);/stock-icons/16x16/metadata.png" alt="<? echo $data['l10n']->get('edit metadata'); ?>" border="0"></a> 40 40 <a href="&(prefix);manage/edit/&(feedtopic_guid);" title="<? echo $data['l10n']->get('edit'); ?>" alt="<? echo $data['l10n']->get('edit'); ?>"><img src="&(static_url);/stock-icons/16x16/edit.png" alt="<? echo $data['l10n']->get('edit'); ?>" border="0"></a> 41 41 <a href="&(prefix);manage/delete/&(feedtopic_guid);" title="<? echo $data['l10n']->get('remove'); ?>" alt="<? echo $data['l10n']->get('remove'); ?>"><img src="&(static_url);/stock-icons/16x16/cancel.png" alt="<? echo $data['l10n']->get('remove'); ?>" border="0"></a> branches/MidCOM_2_8/net.nemein.feedcollector/viewer.php
r14972 r17713 208 208 array 209 209 ( 210 MIDCOM_TOOLBAR_URL => 'config .html',210 MIDCOM_TOOLBAR_URL => 'config/', 211 211 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'), 212 212 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'), branches/MidCOM_2_8/net.nemein.personnel/admin.php
r16543 r17713 183 183 // Add the toolbar items 184 184 $this->_local_toolbar->add_item(Array( 185 MIDCOM_TOOLBAR_URL => "edit/{$id} .html",185 MIDCOM_TOOLBAR_URL => "edit/{$id}/", 186 186 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 187 187 MIDCOM_TOOLBAR_HELPTEXT => null, … … 213 213 { 214 214 $this->_owner = true; 215 $this->_local_toolbar->enable_item("edit/{$id} .html");215 $this->_local_toolbar->enable_item("edit/{$id}/"); 216 216 } 217 217 … … 229 229 230 230 $this->_topic_toolbar->disable_item(''); 231 $this->_local_toolbar->disable_item("edit/{$id} .html");231 $this->_local_toolbar->disable_item("edit/{$id}/"); 232 232 $this->_local_toolbar->disable_view_page(); 233 233 … … 247 247 case MIDCOM_DATAMGR_CANCELLED: 248 248 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) 249 . "view/{$id} .html");249 . "view/{$id}/"); 250 250 // This will exit() 251 251 branches/MidCOM_2_8/net.nemein.personnel/handler/account.php
r16543 r17713 199 199 $tmp[] = array 200 200 ( 201 MIDCOM_NAV_URL => "{$this->_person->guid} .html",201 MIDCOM_NAV_URL => "{$this->_person->guid}/", 202 202 MIDCOM_NAV_NAME => $this->_person->name, 203 203 ); branches/MidCOM_2_8/net.nemein.personnel/handler/admin.php
r17532 r17713 56 56 { 57 57 $this->_view_toolbar->add_item(Array( 58 MIDCOM_TOOLBAR_URL => "admin/edit/{$this->_person->guid} .html",58 MIDCOM_TOOLBAR_URL => "admin/edit/{$this->_person->guid}/", 59 59 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 60 60 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 64 64 { 65 65 $this->_view_toolbar->add_item(Array( 66 MIDCOM_TOOLBAR_URL => "admin/delete/{$this->_person->guid} .html",66 MIDCOM_TOOLBAR_URL => "admin/delete/{$this->_person->guid}/", 67 67 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 68 68 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 222 222 $tmp[] = Array 223 223 ( 224 MIDCOM_NAV_URL => "alpha/{$alpha_filter} .html",224 MIDCOM_NAV_URL => "alpha/{$alpha_filter}/", 225 225 MIDCOM_NAV_NAME => $alpha_filter, 226 226 ); … … 233 233 $tmp[] = Array 234 234 ( 235 MIDCOM_NAV_URL => "admin/edit/{$this->_person->guid} .html",235 MIDCOM_NAV_URL => "admin/edit/{$this->_person->guid}/", 236 236 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'), 237 237 ); … … 319 319 $tmp[] = Array 320 320 ( 321 MIDCOM_NAV_URL => "alpha/{$alpha_filter} .html",321 MIDCOM_NAV_URL => "alpha/{$alpha_filter}/", 322 322 MIDCOM_NAV_NAME => $alpha_filter, 323 323 ); … … 330 330 $tmp[] = Array 331 331 ( 332 MIDCOM_NAV_URL => "admin/delete/{$this->_person->guid} .html",332 MIDCOM_NAV_URL => "admin/delete/{$this->_person->guid}/", 333 333 MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'), 334 334 ); … … 455 455 $tmp[] = Array 456 456 ( 457 MIDCOM_NAV_URL => 'admin/create .html',457 MIDCOM_NAV_URL => 'admin/create/', 458 458 MIDCOM_NAV_NAME => $this->_l10n->get('create person'), 459 459 ); branches/MidCOM_2_8/net.nemein.personnel/handler/view.php
r17540 r17713 260 260 array 261 261 ( 262 MIDCOM_TOOLBAR_URL => "admin/edit/{$this->_person->guid} .html",262 MIDCOM_TOOLBAR_URL => "admin/edit/{$this->_person->guid}/", 263 263 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'), 264 264 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 273 273 array 274 274 ( 275 MIDCOM_TOOLBAR_URL => "admin/delete/{$this->_person->guid} .html",275 MIDCOM_TOOLBAR_URL => "admin/delete/{$this->_person->guid}/", 276 276 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'), 277 277 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png', … … 285 285 array 286 286 ( 287 MIDCOM_TOOLBAR_URL => "account/{$this->_person->guid} .html",287 MIDCOM_TOOLBAR_URL => "account/{$this->_person->guid}/", 288 288 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('user account'), 289 289 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png', … … 307 307 $tmp[] = array 308 308 ( 309 MIDCOM_NAV_URL => "alpha/{$this->_alpha_filter} .html",309 MIDCOM_NAV_URL => "alpha/{$this->_alpha_filter}/", 310 310 MIDCOM_NAV_NAME => $this->_alpha_filter, 311 311 ); … … 443 443 if (!$this->_config->get('group')) 444 444 { 445 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "config .html");445 $_MIDCOM->relocate($_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "config/"); 446 446 } 447 447 … … 477 477 $tmp[] = array 478 478 ( 479 MIDCOM_NAV_URL => "alpha/{$this->_alpha_filter} .html",479 MIDCOM_NAV_URL => "alpha/{$this->_alpha_filter}/", 480 480 MIDCOM_NAV_NAME => $this->_alpha_filter, 481 481 ); branches/MidCOM_2_8/net.nemein.personnel/midcom/interfaces.php
r16543 r17713 103 103 if ($person->username) 104 104 { 105 return "{$person->username} .html";105 return "{$person->username}/"; 106 106 } 107 return "{$person->guid} .html";107 return "{$person->guid}/"; 108 108 } 109 109 } branches/MidCOM_2_8/net.nemein.personnel/style/index-alpha-bar.php
r14775 r17713 10 10 <p> 11 11 <?php 12 //FIXME: Should probably handle scandinavian characters too ? 12 13 for ($char = 'A', $i = 0; $i < 26; $i++, $char++) 13 14 { … … 17 18 &(char); 18 19 <?php } else { ?> 19 <a href="&(prefix);&(char); .html">&(char);</a>20 <a href="&(prefix);&(char);/">&(char);</a> 20 21 <?php } } ?> 21 22 </p> branches/MidCOM_2_8/net.nemein.personnel/viewer.php
r17541 r17713 270 270 array 271 271 ( 272 MIDCOM_TOOLBAR_URL => "admin/create .html",272 MIDCOM_TOOLBAR_URL => "admin/create/", 273 273 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'), 274 274 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person.png', … … 281 281 { 282 282 $this->_node_toolbar->add_item(array( 283 MIDCOM_TOOLBAR_URL => 'config .html',283 MIDCOM_TOOLBAR_URL => 'config/', 284 284 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'), 285 285 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'), … … 290 290 291 291 /** 292 * Simple helper, gives the base URL for a person (either username .htmlor293 * guid .html, depending on the username).292 * Simple helper, gives the base URL for a person (either username/ or 293 * guid/, depending on the username). 294 294 * 295 295 * All 1 argument handlers are filtered here. … … 310 310 && $person->username != 'foaf.rdf') 311 311 { 312 return "{$prefix}{$person->username} .html";312 return "{$prefix}{$person->username}/"; 313 313 } 314 314 else 315 315 { 316 return "{$prefix}{$person->guid} .html";316 return "{$prefix}{$person->guid}/"; 317 317 } 318 318 }
