Navigation

← Previous Changeset
Next Changeset →

Changeset 17731

Timestamp:

09/26/08 14:23:22 (2 months ago)

Author:

bergie

Message:

Remove .html suffixes, refs #47

Files:

trunk/midcom/midcom.core/midcom/application.php (modified) (1 diff)
trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php (modified) (3 diffs)
trunk/midcom/midcom.core/midcom/baseclasses/components/navigation.php (modified) (3 diffs)
trunk/midcom/midcom.core/midcom/core/handler/configdm.php (modified) (3 diffs)
trunk/midcom/midcom.core/midcom/core/handler/configdm2.php (modified) (1 diff)
trunk/midcom/midcom.core/midcom/helper/_basicnav.php (modified) (1 diff)
trunk/midcom/midcom.core/midcom/helper/nav.php (modified) (1 diff)
trunk/midcom/midcom.core/midcom/helper/toolbar.php (modified) (1 diff)
trunk/midcom/midcom.core/midcom/services/toolbars.php (modified) (10 diffs)

Legend:

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

trunk/midcom/midcom.core/midcom/application.php

r17578	r17731
544	544	*
545	545	* <code>
546		* $blog = '/blog/latest/3~~.html~~';
	546	* $blog = '/blog/latest/3/';
547	547	* $substyle = 'homepage';
548	548	* $_MIDCOM->dynamic_load("/midcom-substyle-{$substyle}/{$blog}");

trunk/midcom/midcom.core/midcom/baseclasses/components/interface.php

r17358	r17731
181	181	* }
182	182	*
183		* return "{$article->name}~~.html~~";
	183	* return "{$article->name}/";
184	184	* }
185	185	* }
…	…
768	768	*
769	769	* If the guid could be successfully resolved, a URL local to the given topic without a
770		* leading slash must be returned (f.x. 'article~~.html~~'), empty strings ('') are allowed
	770	* leading slash must be returned (f.x. 'article/'), empty strings ('') are allowed
771	771	* indicating root page access. If the GUID is invalid, null will be returned.
772	772	*
…	…
984	984	*
985	985	* If the guid could be successfully resolved, a URL local to the given topic without a
986		* leading slash must be returned (f.x. 'article~~.html~~'), empty strings ('') are allowed
	986	* leading slash must be returned (f.x. 'article/'), empty strings ('') are allowed
987	987	* indicating root page access. If the GUID is invalid, null will be returned.
988	988	*

trunk/midcom/midcom.core/midcom/baseclasses/components/navigation.php

r17359	r17731
136	136	* while ($articles->fetch ()) {
137	137	* // Match the toolbar to the correct URL.
138		* $toolbar[50][MIDCOM_TOOLBAR_URL] = "edit/{$articles->id}~~.html~~";
139		* $toolbar[51][MIDCOM_TOOLBAR_URL] = "delete/{$articles->id}~~.html~~";
	138	* $toolbar[50][MIDCOM_TOOLBAR_URL] = "edit/{$articles->id}/";
	139	* $toolbar[51][MIDCOM_TOOLBAR_URL] = "delete/{$articles->id}/";
140	140	*
141	141	* $leaves[$articles->id] = array
…	…
143	143	* MIDCOM_NAV_SITE => Array
144	144	* (
145		* MIDCOM_NAV_URL => $articles->name . "~~.html~~",
	145	* MIDCOM_NAV_URL => $articles->name . "/",
146	146	* MIDCOM_NAV_NAME => ($articles->title != "") ? $articles->title : $articles->name
147	147	* ),
…	…
184	184	* $toolbar[100] = Array
185	185	* (
186		* MIDCOM_TOOLBAR_URL => 'config~~.html~~',
	186	* MIDCOM_TOOLBAR_URL => 'config/',
187	187	* MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
188	188	* MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),

trunk/midcom/midcom.core/midcom/core/handler/configdm.php

r17556	r17731
49	49	*
50	50	* $this->_node_toolbar->add_item(Array(
51		* MIDCOM_TOOLBAR_URL => 'config~~.html~~',
	51	* MIDCOM_TOOLBAR_URL => 'config/',
52	52	* MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
53	53	* MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
…	…
217	217	$tmp[] = Array
218	218	(
219		MIDCOM_NAV_URL => 'config~~.html~~',
	219	MIDCOM_NAV_URL => 'config/',
220	220	MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('component configuration', 'midcom'),
221	221	);
…	…
224	224	// Hide the button in toolbar
225	225	// TODO: Figure out the real URL of the config editor
226		// $this->_node_toolbar->hide_item('config~~.html~~');
	226	// $this->_node_toolbar->hide_item('config/');
227	227
228	228	// Set page title

trunk/midcom/midcom.core/midcom/core/handler/configdm2.php

r17557	r17731
191	191	$tmp[] = Array
192	192	(
193		MIDCOM_NAV_URL => "config~~.html~~",
	193	MIDCOM_NAV_URL => "config/",
194	194	MIDCOM_NAV_NAME => $this->_l10n_midcom->get('component configuration'),
195	195	);

trunk/midcom/midcom.core/midcom/helper/_basicnav.php

r17694	r17731
104	104	* );
105	105	* $toolbar[100] = Array(
106		* MIDCOM_TOOLBAR_URL => 'config~~.html~~',
	106	* MIDCOM_TOOLBAR_URL => 'config/',
107	107	* MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
108	108	* MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),

trunk/midcom/midcom.core/midcom/helper/nav.php

r17558	r17731
655	655	* Array
656	656	* (
657		* MIDCOM_NAV_URL => "list/{$this->_category}/{$this->_mode}/1~~.html~~",
	657	* MIDCOM_NAV_URL => "list/{$this->_category}/{$this->_mode}/1/",
658	658	* MIDCOM_NAV_NAME => $this->_category_name,
659	659	* ),

trunk/midcom/midcom.core/midcom/helper/toolbar.php

r17558	r17731
209	209	if (is_null($component))
210	210	{
211		$uri = "__ais/help/{$help_id}~~.html~~";
	211	$uri = "__ais/help/{$help_id}/";
212	212	}
213	213	else
214	214	{
215		$uri = "__ais/help/{$component}/{$help_id}~~.html~~";
	215	$uri = "__ais/help/{$component}/{$help_id}/";
216	216	}
217	217

trunk/midcom/midcom.core/midcom/services/toolbars.php

r17568	r17731
340	340	array
341	341	(
342		MIDCOM_TOOLBAR_URL => "__ais/folder/edit~~.html~~",
	342	MIDCOM_TOOLBAR_URL => "__ais/folder/edit/",
343	343	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('edit folder', 'midcom.admin.folder'),
344	344	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',
…	…
352	352	array
353	353	(
354		MIDCOM_TOOLBAR_URL => "__ais/folder/metadata/{$topic->guid}~~.html~~",
	354	MIDCOM_TOOLBAR_URL => "__ais/folder/metadata/{$topic->guid}/",
355	355	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('edit folder metadata', 'midcom.admin.folder'),
356	356	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/metadata.png',
…	…
366	366	array
367	367	(
368		MIDCOM_TOOLBAR_URL => "__ais/folder/move/{$topic->guid}~~.html~~",
	368	MIDCOM_TOOLBAR_URL => "__ais/folder/move/{$topic->guid}/",
369	369	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('move', 'midcom.admin.folder'),
370	370	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/save-as.png',
…	…
377	377	array
378	378	(
379		MIDCOM_TOOLBAR_URL => "__ais/folder/order~~.html~~",
	379	MIDCOM_TOOLBAR_URL => "__ais/folder/order/",
380	380	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('order navigation', 'midcom.admin.folder'),
381	381	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/topic-score.png',
…	…
409	409	array
410	410	(
411		MIDCOM_TOOLBAR_URL => "__ais/folder/unapprove~~.html~~",
	411	MIDCOM_TOOLBAR_URL => "__ais/folder/unapprove/",
412	412	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('unapprove topic', 'midcom'),
413	413	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('approved', 'midcom'),
…	…
428	428	array
429	429	(
430		MIDCOM_TOOLBAR_URL => "__ais/folder/approve~~.html~~",
	430	MIDCOM_TOOLBAR_URL => "__ais/folder/approve/",
431	431	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('approve topic', 'midcom'),
432	432	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('unapproved', 'midcom'),
…	…
475	475	array
476	476	(
477		MIDCOM_TOOLBAR_URL => "__ais/folder/create~~.html~~",
	477	MIDCOM_TOOLBAR_URL => "__ais/folder/create/",
478	478	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('create subfolder', 'midcom.admin.folder'),
479	479	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/new-dir.png',
…	…
489	489	array
490	490	(
491		MIDCOM_TOOLBAR_URL => "__ais/folder/delete~~.html~~",
	491	MIDCOM_TOOLBAR_URL => "__ais/folder/delete/",
492	492	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('delete folder', 'midcom.admin.folder'),
493	493	MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
…	…
710	710	{
711	711	$toolbar->add_item(Array(
712		MIDCOM_TOOLBAR_URL => "{$prefix}__ais/folder/unapprove~~.html~~",
	712	MIDCOM_TOOLBAR_URL => "{$prefix}__ais/folder/unapprove/",
713	713	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('unapprove', 'midcom'),
714	714	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('approved', 'midcom'),
…	…
726	726	{
727	727	$toolbar->add_item(Array(
728		MIDCOM_TOOLBAR_URL => "{$prefix}__ais/folder/approve~~.html~~",
	728	MIDCOM_TOOLBAR_URL => "{$prefix}__ais/folder/approve/",
729	729	MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('approve', 'midcom'),
730	730	MIDCOM_TOOLBAR_HELPTEXT => $_MIDCOM->i18n->get_string('unapproved', 'midcom'),

Navigation

Changeset 17731

Legend:

Download in other formats: