Navigation

← Previous Changeset
Next Changeset →

Changeset 17736

Timestamp:

09/26/08 15:37:01 (2 months ago)

Author:

bergie

Message:

Remove .html suffixes, refs #47

Files:

trunk/midcom/midcom.admin.help/style/midcom_admin_help_component.php (modified) (1 diff)
trunk/midcom/midcom.admin.settings/editor.php (modified) (2 diffs)
trunk/midcom/midcom.admin.styleeditor/admin.php (modified) (7 diffs)
trunk/midcom/midcom.helper.replicator/manager.php (modified) (2 diffs)
trunk/midcom/midcom.helper.search/style/opensearch_description.php (modified) (1 diff)
trunk/midcom/midgard.admin.acl/acl_editor.php (modified) (2 diffs)
trunk/midcom/midgard.admin.asgard/handler/object/rcs.php (modified) (5 diffs)
trunk/midcom/midgard.admin.asgard/plugin.php (modified) (2 diffs)
trunk/midcom/net.nemein.registrations/event.php (modified) (2 diffs)
trunk/midcom/net.nemein.registrations/handler/compose.php (modified) (1 diff)
trunk/midcom/net.nemein.registrations/handler/event.php (modified) (13 diffs)
trunk/midcom/net.nemein.registrations/handler/events.php (modified) (4 diffs)
trunk/midcom/net.nemein.registrations/handler/register.php (modified) (4 diffs)
trunk/midcom/net.nemein.registrations/handler/registration.php (modified) (11 diffs)
trunk/midcom/net.nemein.registrations/handler/welcome.php (modified) (4 diffs)
trunk/midcom/net.nemein.registrations/navigation.php (modified) (1 diff)
trunk/midcom/net.nemein.reservations/handler/admin.php (modified) (5 diffs)
trunk/midcom/net.nemein.reservations/handler/create.php (modified) (1 diff)
trunk/midcom/net.nemein.reservations/handler/reservation/admin.php (modified) (5 diffs)
trunk/midcom/net.nemein.reservations/handler/reservation/list.php (modified) (4 diffs)
trunk/midcom/net.nemein.reservations/handler/reservation/repeat.php (modified) (4 diffs)
trunk/midcom/net.nemein.reservations/handler/reservation/view.php (modified) (3 diffs)
trunk/midcom/net.nemein.reservations/handler/resource.php (modified) (2 diffs)
trunk/midcom/net.nemein.reservations/style/view-datereservations-item.php (modified) (1 diff)
trunk/midcom/net.nemein.reservations/viewer.php (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/midcom/midcom.admin.help/style/midcom_admin_help_component.php

r17201	r17736
11	11	$uri_string = basename($file_info['path']);
12	12	$uri_parts = explode('.', $uri_string);
13		$uri = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "__ais/help/{$uri_parts[0]}~~.html~~";
	13	$uri = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX) . "__ais/help/{$uri_parts[0]}/";
14	14	echo "<li><a href=\"{$uri}\">{$file_info['subject']}</a></li>\n";
15	15	}

trunk/midcom/midcom.admin.settings/editor.php

r17556	r17736
240	240	}
241	241
242		$_MIDCOM->relocate('__mfa/asgard_midcom.admin.settings/'.$host->guid.'~~.html~~');
	242	$_MIDCOM->relocate('__mfa/asgard_midcom.admin.settings/'.$host->guid.'/');
243	243
244	244	case 'cancel':
245		$_MIDCOM->relocate('__mfa/asgard_midcom.admin.settings/'.$host->guid.'~~.html~~');
	245	$_MIDCOM->relocate('__mfa/asgard_midcom.admin.settings/'.$host->guid.'/');
246	246	// This will exit.
247	247	}
…	…
373	373	if ($host->can_do("midgard::update"))
374	374	{
375		echo " <li class=\"status\"><a href=\"{$prefix}__mfa/asgard_midcom.admin.settings/{$host->guid}~~.html~~\">{$host->name}{$host->prefix}/</a></li>";
	375	echo " <li class=\"status\"><a href=\"{$prefix}__mfa/asgard_midcom.admin.settings/{$host->guid}/\">{$host->name}{$host->prefix}/</a></li>";
376	376	}
377	377	}

trunk/midcom/midcom.admin.styleeditor/admin.php

r17359	r17736
82	82	$toolbar = &midcom_helper_toolbars::get_instance();
83	83	$toolbar->top->add_item(Array(
84		MIDCOM_TOOLBAR_URL => 'config~~.html~~',
	84	MIDCOM_TOOLBAR_URL => 'config/',
85	85	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
86	86	MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
…	…
100	100	Array
101	101	(
102		MIDCOM_TOOLBAR_URL => "create/{$name}~~.html~~",
	102	MIDCOM_TOOLBAR_URL => "create/{$name}/",
103	103	MIDCOM_TOOLBAR_LABEL => $text,
104	104	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
191	191	{
192	192	$toolbar->add_item(Array(
193		MIDCOM_TOOLBAR_URL => "{$prefix}/unapprove~~.html~~",
	193	MIDCOM_TOOLBAR_URL => "{$prefix}/unapprove/",
194	194	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('unapprove'),
195	195	MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('approved'),
…	…
201	201	{
202	202	$toolbar->add_item(Array(
203		MIDCOM_TOOLBAR_URL => "{$prefix}/approve~~.html~~",
	203	MIDCOM_TOOLBAR_URL => "{$prefix}/approve/",
204	204	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('approve'),
205	205	MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('unapproved'),
…	…
212	212	{
213	213	$toolbar->add_item(Array(
214		MIDCOM_TOOLBAR_URL => "{$prefix}/unhide~~.html~~",
	214	MIDCOM_TOOLBAR_URL => "{$prefix}/unhide/",
215	215	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('unhide'),
216	216	MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('hidden'),
…	…
222	222	{
223	223	$toolbar->add_item(Array(
224		MIDCOM_TOOLBAR_URL => "{$prefix}/hide~~.html~~",
	224	MIDCOM_TOOLBAR_URL => "{$prefix}/hide/",
225	225	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('hide'),
226	226	MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('not hidden'),
…	…
231	231
232	232	$toolbar->add_item(Array(
233		MIDCOM_TOOLBAR_URL => "{$prefix}/edit~~.html~~",
	233	MIDCOM_TOOLBAR_URL => "{$prefix}/edit/",
234	234	MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('edit metadata'),
235	235	MIDCOM_TOOLBAR_HELPTEXT => null,

trunk/midcom/midcom.helper.replicator/manager.php

r17556	r17736
133	133	array
134	134	(
135		MIDCOM_TOOLBAR_URL => "{$prefix}{$name}~~.html~~",
	135	MIDCOM_TOOLBAR_URL => "{$prefix}{$name}/",
136	136	MIDCOM_TOOLBAR_LABEL => sprintf
137	137	(
…	…
166	166	$tmp[] = Array
167	167	(
168		MIDCOM_NAV_URL => "__mfa/asgard_midcom.helper.replicator/create/{$this->_schema}~~.html~~",
	168	MIDCOM_NAV_URL => "__mfa/asgard_midcom.helper.replicator/create/{$this->_schema}/",
169	169	MIDCOM_NAV_NAME => $this->_request_data['view_title'],
170	170	);

trunk/midcom/midcom.helper.search/style/opensearch_description.php

r14251	r17736
9	9	<InputEncoding>UTF-8</InputEncoding>
10	10	<Image height="16" width="16" type="image/x-icon"><?php echo MIDCOM_STATIC_URL . '/midcom.helper.search/search.ico'; ?></Image>
11		<Url type="text/html" method="get" template="&(prefix);result~~.html~~?query={searchTerms}"/>
	11	<Url type="text/html" method="get" template="&(prefix);result/?query={searchTerms}"/>
12	12	</OpenSearchDescription>

trunk/midcom/midgard.admin.acl/acl_editor.php

r17556	r17736
360	360	$tmp[] = Array
361	361	(
362		MIDCOM_NAV_URL => "__ais/acl/edit/{$this->_object->guid}~~.html~~",
	362	MIDCOM_NAV_URL => "__ais/acl/edit/{$this->_object->guid}/",
363	363	MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('topic privileges', 'midgard.admin.acl'),
364	364	);
365		$this->_node_toolbar->hide_item("__ais/acl/edit/{$this->_object->guid}~~.html~~");
	365	$this->_node_toolbar->hide_item("__ais/acl/edit/{$this->_object->guid}/");
366	366	}
367	367	else
…	…
374	374	$tmp[] = Array
375	375	(
376		MIDCOM_NAV_URL => "__ais/acl/edit/{$this->_object->guid}~~.html~~",
	376	MIDCOM_NAV_URL => "__ais/acl/edit/{$this->_object->guid}/",
377	377	MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('privileges', 'midgard.admin.acl'),
378	378	);
379		$this->_view_toolbar->hide_item("__ais/acl/edit/{$this->_object->guid}~~.html~~");
	379	$this->_view_toolbar->hide_item("__ais/acl/edit/{$this->_object->guid}/");
380	380	}
381	381	$_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);

trunk/midcom/midgard.admin.asgard/handler/object/rcs.php

r17555	r17736
442	442	array
443	443	(
444		MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/diff/{$this->_guid}/{$first}/{$second}~~.html~~",
	444	MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/diff/{$this->_guid}/{$first}/{$second}/",
445	445	MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_get('view %s differences with previous (%s)'), $second, $first),
446	446	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
454	454	array
455	455	(
456		MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/preview/{$this->_guid}/{$revision}~~.html~~",
	456	MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/preview/{$this->_guid}/{$revision}/",
457	457	MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_get('view this revision (%s)'), $revision),
458	458	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
468	468	array
469	469	(
470		MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/restore/{$this->_guid}/{$revision}~~.html~~",
	470	MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/restore/{$this->_guid}/{$revision}/",
471	471	MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_get('restore this revision (%s)'), $revision),
472	472	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
479	479	array
480	480	(
481		MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/diff/{$this->_guid}/{$revision}/{$after}~~.html~~",
	481	MIDCOM_TOOLBAR_URL => "__mfa/asgard/object/rcs/diff/{$this->_guid}/{$revision}/{$after}/",
482	482	MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_get('view %s differences with next (%s)'), $revision, $after),
483	483	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
702	702	$this->_request_data['preview'] = $this->_backend->get_revision($revision);
703	703
704		$this->_view_toolbar->hide_item("__mfa/asgard/object/rcs/preview/{$this->_guid}/{$revision}~~.html~~");
	704	$this->_view_toolbar->hide_item("__mfa/asgard/object/rcs/preview/{$this->_guid}/{$revision}/");
705	705
706	706	$this->_request_data['view_title'] = sprintf($this->_l10n->get('viewing version %s of %s'), $revision, $this->_resolve_object_title());

trunk/midcom/midgard.admin.asgard/plugin.php

r17574	r17736
683	683	{
684	684	$toolbar->add_item(Array(
685		MIDCOM_TOOLBAR_URL => "__ais/folder/unapprove~~.html~~",
	685	MIDCOM_TOOLBAR_URL => "__ais/folder/unapprove/",
686	686	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('unapprove', 'midcom'),
687	687	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('approved', 'midcom'),
…	…
700	700	{
701	701	$toolbar->add_item(Array(
702		MIDCOM_TOOLBAR_URL => "__ais/folder/approve~~.html~~",
	702	MIDCOM_TOOLBAR_URL => "__ais/folder/approve/",
703	703	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('approve', 'midcom'),
704	704	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('unapproved', 'midcom'),

trunk/midcom/net.nemein.registrations/event.php

r17003	r17736
493	493	{
494	494	$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
495		return "{$prefix}register/{$this->guid}~~.html~~";
	495	return "{$prefix}register/{$this->guid}/";
496	496	}
497	497	if (! $this->_content_topic->can_do('midgard:create'))
…	…
503	503	{
504	504	$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
505		return "{$prefix}register/{$this->guid}~~.html~~";
	505	return "{$prefix}register/{$this->guid}/";
506	506	}
507	507	else

trunk/midcom/net.nemein.registrations/handler/compose.php

r17555	r17736
78	78	$tmp[] = Array
79	79	(
80		MIDCOM_NAV_URL => "event/view/{$this->_event->guid}~~.html~~",
	80	MIDCOM_NAV_URL => "event/view/{$this->_event->guid}/",
81	81	MIDCOM_NAV_NAME => $this->_event->title,
82	82	);
83	83	$tmp[] = Array
84	84	(
85		MIDCOM_NAV_URL => "registration/view/{$this->_registration->guid}~~.html~~",
	85	MIDCOM_NAV_URL => "registration/view/{$this->_registration->guid}/",
86	86	MIDCOM_NAV_NAME => sprintf($this->_l10n->get('registration for %s'), $this->_event->title),
87	87	);

trunk/midcom/net.nemein.registrations/handler/event.php

r17555	r17736
69	69	$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
70	70
71		$this->_request_data['view_url'] = "{$prefix}event/view/{$this->_event->guid}~~.html~~";
	71	$this->_request_data['view_url'] = "{$prefix}event/view/{$this->_event->guid}/";
72	72
73	73	if ($this->_event->can_do('net.nemein.registrations:manage'))
74	74	{
75		$this->_request_data['list_registrations_url'] = "{$prefix}event/list_registrations/{$this->_event->guid}~~.html~~";
	75	$this->_request_data['list_registrations_url'] = "{$prefix}event/list_registrations/{$this->_event->guid}/";
76	76	$this->_request_data['export_csv_url'] = "{$prefix}event/export/csv/{$this->_event->guid}/" . midcom_generate_urlname_from_string($this->_event->title) . date('_Y-m-d') . '.csv';
77	77	$this->_request_data['admin_register_url'] = "{$prefix}admin/register/{$this->_event->guid}/";
…	…
86	86	if ($this->_event->can_do('midgard:update'))
87	87	{
88		$this->_request_data['edit_url'] = "{$prefix}event/edit/{$this->_event->guid}~~.html~~";
	88	$this->_request_data['edit_url'] = "{$prefix}event/edit/{$this->_event->guid}/";
89	89	if ($this->_event->is_open())
90	90	{
91		$this->_request_data['close_url'] = "{$prefix}event/close/{$this->_event->guid}~~.html~~";
	91	$this->_request_data['close_url'] = "{$prefix}event/close/{$this->_event->guid}/";
92	92	$this->_request_data['open_url'] = null;
93	93	}
94	94	else
95	95	{
96		$this->_request_data['open_url'] = "{$prefix}event/open/{$this->_event->guid}~~.html~~";
	96	$this->_request_data['open_url'] = "{$prefix}event/open/{$this->_event->guid}/";
97	97	$this->_request_data['close_url'] = null;
98	98	}
…	…
107	107	if ($this->_event->can_do('midgard:delete'))
108	108	{
109		$this->_request_data['delete_url'] = "{$prefix}event/delete/{$this->_event->guid}~~.html~~";
	109	$this->_request_data['delete_url'] = "{$prefix}event/delete/{$this->_event->guid}/";
110	110	}
111	111	else
…	…
120	120	{
121	121	$registration = $this->_event->get_registration();
122		$this->_request_data['registration_url'] = "{$prefix}registration/view/{$registration->guid}~~.html~~";
	122	$this->_request_data['registration_url'] = "{$prefix}registration/view/{$registration->guid}/";
123	123	}
124	124	else
…	…
233	233	$tmp[] = Array
234	234	(
235		MIDCOM_NAV_URL => "event/view/{$this->_event->guid}~~.html~~",
	235	MIDCOM_NAV_URL => "event/view/{$this->_event->guid}/",
236	236	MIDCOM_NAV_NAME => $this->_event->title,
237	237	);
…	…
242	242	$tmp[] = Array
243	243	(
244		MIDCOM_NAV_URL => "event/edit/{$this->_event->guid}~~.html~~",
	244	MIDCOM_NAV_URL => "event/edit/{$this->_event->guid}/",
245	245	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'),
246	246	);
…	…
250	250	$tmp[] = Array
251	251	(
252		MIDCOM_NAV_URL => "event/delete/{$this->_event->guid}~~.html~~",
	252	MIDCOM_NAV_URL => "event/delete/{$this->_event->guid}/",
253	253	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'),
254	254	);
…	…
258	258	$tmp[] = Array
259	259	(
260		MIDCOM_NAV_URL => "event/list_registrations/{$this->_event->guid}~~.html~~",
	260	MIDCOM_NAV_URL => "event/list_registrations/{$this->_event->guid}/",
261	261	MIDCOM_NAV_NAME => $this->_l10n->get('registrations'),
262	262	);
…	…
325	325	case 'cancel':
326	326	// If we have a save or cancel event, we relocate back to the view.
327		$_MIDCOM->relocate("event/view/{$this->_event->guid}~~.html~~");
	327	$_MIDCOM->relocate("event/view/{$this->_event->guid}/");
328	328	// This will exit.
329	329	}
…	…
440	440	$data['registration'] =& $data['registrations'][$id];
441	441	$data['registrar'] = $data['registration']->get_registrar();
442		$data['registration_url'] = "{$prefix}registration/view/{$data['registration']->guid}~~.html~~";
	442	$data['registration_url'] = "{$prefix}registration/view/{$data['registration']->guid}/";
443	443	$data['approved'] = $data['registration']->is_approved();
444	444	midcom_show_style('event-list-registrations-item');
…	…
489	489	{
490	490	// Delete cancelled, relocating to view.
491		$_MIDCOM->relocate("event/view/{$this->_event->guid}~~.html~~");
	491	$_MIDCOM->relocate("event/view/{$this->_event->guid}/");
492	492	// This will exit.
493	493	}
…	…
533	533	}
534	534
535		$_MIDCOM->relocate("event/view/{$this->_event->guid}~~.html~~");
	535	$_MIDCOM->relocate("event/view/{$this->_event->guid}/");
536	536	}
537	537
…	…
557	557	}
558	558
559		$_MIDCOM->relocate("event/view/{$this->_event->guid}~~.html~~");
	559	$_MIDCOM->relocate("event/view/{$this->_event->guid}/");
560	560	}
561	561

trunk/midcom/net.nemein.registrations/handler/events.php

r17555	r17736
97	97	$tmp[] = Array
98	98	(
99		MIDCOM_NAV_URL => "events/create~~.html~~",
	99	MIDCOM_NAV_URL => "events/create/",
100	100	MIDCOM_NAV_NAME => $this->_l10n->get('create an event'),
101	101	);
…	…
104	104	$tmp[] = Array
105	105	(
106		MIDCOM_NAV_URL => "events/list_all~~.html~~",
	106	MIDCOM_NAV_URL => "events/list_all/",
107	107	MIDCOM_NAV_NAME => $this->_l10n->get('list all events'),
108	108	);
…	…
153	153	{
154	154	$data['event'] =& $this->_events[$id];
155		$data['view_url'] = "{$prefix}event/view/{$data['event']->guid}~~.html~~";
	155	$data['view_url'] = "{$prefix}event/view/{$data['event']->guid}/";
156	156	midcom_show_style('events-list_all-item');
157	157	}
…	…
213	213	net_nemein_registrations_event::index($this->_controller->datamanager, $indexer, $this->_topic);
214	214
215		$_MIDCOM->relocate("event/view/{$this->_event->guid}~~.html~~");
	215	$_MIDCOM->relocate("event/view/{$this->_event->guid}/");
216	216	// This will exit.
217	217	}

trunk/midcom/net.nemein.registrations/handler/register.php

r17555	r17736
156	156	// In case we are already registered, we relocate to the view registration page.
157	157	$registration = $this->_event->get_registration();
158		$_MIDCOM->relocate("registration/view/{$registration->guid}~~.html~~");
	158	$_MIDCOM->relocate("registration/view/{$registration->guid}/");
159	159	// This will exit.
160	160	}
…	…
320	320	debug_pop();
321	321	// TODO: redirect elsewhere in admin mode ?
322		$_MIDCOM->relocate('register/success~~.html~~');
	322	$_MIDCOM->relocate('register/success/');
323	323	}
324	324	// First, update/create the person
…	…
361	361	// This will exit()
362	362	}
363		$_MIDCOM->relocate('register/success~~.html~~');
	363	$_MIDCOM->relocate('register/success/');
364	364	// This will exit()
365	365	break;
…	…
566	566	{$text_event}: {$this->_event->title}
567	567	{$text_registrar}: {$this->_registrar->name}
568		URL: {$prefix}registration/view/{$this->_registration->guid}~~.html~~
	568	URL: {$prefix}registration/view/{$this->_registration->guid}/
569	569	EOF;
570	570

trunk/midcom/net.nemein.registrations/handler/registration.php

r17555	r17736
126	126	if ($_MIDCOM->auth->can_do('midgard:update', $this->_registration))
127	127	{
128		$this->_request_data['edit_url'] = "{$prefix}registration/edit/{$this->_registration->guid}~~.html~~";
	128	$this->_request_data['edit_url'] = "{$prefix}registration/edit/{$this->_registration->guid}/";
129	129	}
130	130	else
…	…
135	135	if ($_MIDCOM->auth->can_do('midgard:delete', $this->_registration))
136	136	{
137		$this->_request_data['delete_url'] = "{$prefix}registration/delete/{$this->_registration->guid}~~.html~~";
	137	$this->_request_data['delete_url'] = "{$prefix}registration/delete/{$this->_registration->guid}/";
138	138	}
139	139	else
…	…
147	147	&& ! $this->_request_data['is_approved'])
148	148	{
149		$this->_request_data['manage_form_url'] = "{$prefix}registration/manage/{$this->_registration->guid}~~.html~~";
	149	$this->_request_data['manage_form_url'] = "{$prefix}registration/manage/{$this->_registration->guid}/";
150	150	$this->_request_data['approve_action'] = $this->_approve_action;
151	151	$this->_request_data['reject_action'] = $this->_reject_action;
…	…
191	191	$tmp[] = Array
192	192	(
193		MIDCOM_NAV_URL => "registration/view/{$this->_registration->guid}~~.html~~",
	193	MIDCOM_NAV_URL => "registration/view/{$this->_registration->guid}/",
194	194	MIDCOM_NAV_NAME => sprintf($this->_l10n->get('registration for %s'), $this->_event->title),
195	195	);
…	…
200	200	$tmp[] = Array
201	201	(
202		MIDCOM_NAV_URL => "registration/edit/{$this->_registration->guid}~~.html~~",
	202	MIDCOM_NAV_URL => "registration/edit/{$this->_registration->guid}/",
203	203	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'),
204	204	);
…	…
208	208	$tmp[] = Array
209	209	(
210		MIDCOM_NAV_URL => "registration/delete/{$this->_registration->guid}~~.html~~",
	210	MIDCOM_NAV_URL => "registration/delete/{$this->_registration->guid}/",
211	211	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'),
212	212	);
…	…
280	280	if ($this->_controller->process_form() != 'edit')
281	281	{
282		$_MIDCOM->relocate("registration/view/{$this->_registration->guid}~~.html~~");
	282	$_MIDCOM->relocate("registration/view/{$this->_registration->guid}/");
283	283	// This will exit.
284	284	}
…	…
336	336	{
337	337	// Delete cancelled, relocating to view.
338		$_MIDCOM->relocate("registration/view/{$this->_registration->guid}~~.html~~");
	338	$_MIDCOM->relocate("registration/view/{$this->_registration->guid}/");
339	339	// This will exit.
340	340	}
…	…
393	393	// This will exit.
394	394	}
395		$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}~~.html~~");
	395	$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}/");
396	396	// This will exit.
397	397	}
…	…
411	411	// This will exit.
412	412	}
413		$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}~~.html~~");
	413	$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}/");
414	414	// This will exit.
415	415	}
…	…
429	429	// This will exit.
430	430	}
431		$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}~~.html~~");
	431	$_MIDCOM->relocate("event/list_registrations/{$this->_event->guid}/");
432	432	// This will exit.
433	433	}

trunk/midcom/net.nemein.registrations/handler/welcome.php

r17555	r17736
92	92	Array
93	93	(
94		MIDCOM_TOOLBAR_URL => "events/create~~.html~~",
	94	MIDCOM_TOOLBAR_URL => "events/create/",
95	95	MIDCOM_TOOLBAR_LABEL => $data['l10n']->get('create an event'),
96	96	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
107	107	Array
108	108	(
109		MIDCOM_TOOLBAR_URL => "events/list_all~~.html~~",
	109	MIDCOM_TOOLBAR_URL => "events/list_all/",
110	110	MIDCOM_TOOLBAR_LABEL => $data['l10n']->get('list all events'),
111	111	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
143	143	{
144	144	$registration = $event->get_registration();
145		$data['registration_url'] = "{$prefix}registration/view/{$registration->guid}~~.html~~";
	145	$data['registration_url'] = "{$prefix}registration/view/{$registration->guid}/";
146	146	}
147	147	else
…	…
149	149	$data['registration_url'] = null;
150	150	}
151		$data['view_url'] = "{$prefix}event/view/{$event->guid}~~.html~~";
	151	$data['view_url'] = "{$prefix}event/view/{$event->guid}/";
152	152	$data['event'] =& $event;
153	153

trunk/midcom/net.nemein.registrations/navigation.php

r17359	r17736
69	69	MIDCOM_NAV_SITE => Array
70	70	(
71		MIDCOM_NAV_URL => "event/view/{$event->guid}~~.html~~",
	71	MIDCOM_NAV_URL => "event/view/{$event->guid}/",
72	72	MIDCOM_NAV_NAME => $event->title
73	73	),

trunk/midcom/net.nemein.reservations/handler/admin.php

r17555	r17736
79	79	array
80	80	(
81		MIDCOM_TOOLBAR_URL => "edit/{$this->_resource->guid}~~.html~~",
	81	MIDCOM_TOOLBAR_URL => "edit/{$this->_resource->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 => "delete/{$this->_resource->guid}~~.html~~",
	94	MIDCOM_TOOLBAR_URL => "delete/{$this->_resource->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_resource':
105		$this->_view_toolbar->disable_item("edit/{$this->_resource->guid}~~.html~~");
	105	$this->_view_toolbar->disable_item("edit/{$this->_resource->guid}/");
106	106	break;
107	107	case 'delete_resource':
108		$this->_view_toolbar->disable_item("delete/{$this->_resource->guid}~~.html~~");
	108	$this->_view_toolbar->disable_item("delete/{$this->_resource->guid}/");
109	109	break;
110	110	}
…	…
184	184	$tmp[] = Array
185	185	(
186		MIDCOM_NAV_URL => "edit/{$this->_resource->guid}~~.html~~",
	186	MIDCOM_NAV_URL => "edit/{$this->_resource->guid}/",
187	187	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'),
188	188	);
…	…
191	191	$tmp[] = Array
192	192	(
193		MIDCOM_NAV_URL => "delete/{$this->_resource->guid}~~.html~~",
	193	MIDCOM_NAV_URL => "delete/{$this->_resource->guid}/",
194	194	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'),
195	195	);

trunk/midcom/net.nemein.reservations/handler/create.php

r17555	r17736
227	227	$tmp[] = Array
228	228	(
229		MIDCOM_NAV_URL => "create/{$this->_schema}~~.html~~",
	229	MIDCOM_NAV_URL => "create/{$this->_schema}/",
230	230	MIDCOM_NAV_NAME => sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($this->_schemadb[$this->_schema]->description)),
231	231	);

trunk/midcom/net.nemein.reservations/handler/reservation/admin.php

r17555	r17736
87	87	array
88	88	(
89		MIDCOM_TOOLBAR_URL => "edit/{$this->_event->guid}~~.html~~",
	89	MIDCOM_TOOLBAR_URL => "edit/{$this->_event->guid}/",
90	90	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'),
91	91	MIDCOM_TOOLBAR_HELPTEXT => null,
…	…
100	100	array
101	101	(
102		MIDCOM_TOOLBAR_URL => "delete/{$this->_event->guid}~~.html~~",
	102	MIDCOM_TOOLBAR_URL => "delete/{$this->_event->guid}/",
103	103	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'),
104	104	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
…	…
111	111	{
112	112	case 'edit_reservation':
113		$this->_view_toolbar->disable_item("edit/{$this->_event->guid}~~.html~~");
	113	$this->_view_toolbar->disable_item("edit/{$this->_event->guid}/");
114	114	break;
115	115	case 'delete_reservation':
116		$this->_view_toolbar->disable_item("delete/{$this->_event->guid}~~.html~~");
	116	$this->_view_toolbar->disable_item("delete/{$this->_event->guid}/");
117	117	break;
118	118	}
…	…
197	197	$tmp[] = Array
198	198	(
199		MIDCOM_NAV_URL => "edit/{$this->_event->guid}~~.html~~",
	199	MIDCOM_NAV_URL => "edit/{$this->_event->guid}/",
200	200	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'),
201	201	);
…	…
204	204	$tmp[] = Array
205	205	(
206		MIDCOM_NAV_URL => "delete/{$this->_event->guid}~~.html~~",
	206	MIDCOM_NAV_URL => "delete/{$this->_event->guid}/",
207	207	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'),
208	208	);

trunk/midcom/net.nemein.reservations/handler/reservation/list.php

r17555	r17736
136	136	array
137	137	(
138		MIDCOM_NAV_URL => 'reservation/list/' . date('Y-m-d', $data['show_date']) . '~~.html~~',
	138	MIDCOM_NAV_URL => 'reservation/list/' . date('Y-m-d', $data['show_date']) . '/',
139	139	MIDCOM_NAV_NAME => $data['page_title'],
140	140	),
…	…
145	145	$this->_view_toolbar->add_item(
146	146	Array(
147		MIDCOM_TOOLBAR_URL => 'reservation/list/' . $previous_day . '~~.html~~',
	147	MIDCOM_TOOLBAR_URL => 'reservation/list/' . $previous_day . '/',
148	148	MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('previous day'),
149	149	MIDCOM_TOOLBAR_HELPTEXT => strftime('%x', $day_start - 100),
…	…
155	155	$this->_view_toolbar->add_item(
156	156	Array(
157		MIDCOM_TOOLBAR_URL => 'reservation/list/' . $next_day . '~~.html~~',
	157	MIDCOM_TOOLBAR_URL => 'reservation/list/' . $next_day . '/',
158	158	MIDCOM_TOOLBAR_LABEL => $this->_request_data['l10n']->get('next day'),
159	159	MIDCOM_TOOLBAR_HELPTEXT => strftime('%x', $day_end + 100),
…	…
197	197	continue;
198	198	}
199		$data['event_url'] = "{$data['prefix']}reservation/{$event->guid}~~.html~~";
	199	$data['event_url'] = "{$data['prefix']}reservation/{$event->guid}/";
200	200	$data['view_reservation'] = $this->_datamanager->get_content_html();
201	201	midcom_show_style('view-datereservations-item');

trunk/midcom/net.nemein.reservations/handler/reservation/repeat.php

r17555	r17736
70	70	if (isset($_POST['f_cancel']))
71	71	{
72		$_MIDCOM->relocate("reservation/{$args[0]}~~.html~~");
	72	$_MIDCOM->relocate("reservation/{$args[0]}/");
73	73	// This will exit
74	74	}
…	…
137	137	array
138	138	(
139		MIDCOM_TOOLBAR_URL => "reservation/edit/{$this->_event->guid}~~.html~~",
	139	MIDCOM_TOOLBAR_URL => "reservation/edit/{$this->_event->guid}/",
140	140	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'),
141	141	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',
…	…
148	148	array
149	149	(
150		MIDCOM_TOOLBAR_URL => "reservation/delete/{$this->_event->guid}~~.html~~",
	150	MIDCOM_TOOLBAR_URL => "reservation/delete/{$this->_event->guid}/",
151	151	MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('delete'),
152	152	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
…	…
160	160	array
161	161	(
162		MIDCOM_TOOLBAR_URL => "reservation/repeat/{$this->_event->guid}~~.html~~",
	162	MIDCOM_TOOLBAR_URL => "reservation/repeat/{$this->_event->guid}/",
163	163	MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('repeating'),
164