Changeset 22786

plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/modules.yml

r22551	r22786
2	2	Configuration:
3	3	dmConfigPanel:
4		name: Configuration panel ~~\| Configuration panel~~
	4	name: Configuration panel
5	5	credentials: config_panel
6	6	Translation:
…	…
15	15	Logs:
16	16	dmUserLog:
17		name: User log ~~\| User log~~
	17	name: User log
18	18	credentials: user_log
19	19	dmActionLog:
20		name: Action log ~~\| Action log~~
	20	name: Action log
21	21	credentials: action_log
22	22	Accessibility:
…	…
31	31	name: Media
32	32	credentials: media_library
	33	"Search engine":
	34	dmSearchEngine:
	35	name: Manage index
	36	credentials: search_engine
33	37
34	38	Seo:
…	…
42	46	Sitemap:
43	47	dmSitemap:
44		name: Generate sitemap~~\|Generate sitemap~~
	48	name: Generate sitemap
45	49	credentials: sitemap
46	50	Metas:
…	…
85	89	Dev:
86	90	dmDiagram:
87		name: ~~"See diagrams \| See diagrams"~~
	91	name: See diagrams
88	92	credentials: system
89	93	dmCodeEditor:
90		name: ~~"Code Editor \| Code Editor"~~
	94	name: Code Editor
91	95	credentials: code_editor
92	96	dmConsole:
93		name: ~~"Diem Console \| Diem Console"~~
	97	name: Diem Console
94	98	credentials: system
95		~~dmSearchEngine:~~
96		~~name: "Search Engine \| Search Engine"~~
97		~~credentials: search_engine~~
98	99	dmServer:
99		name: ~~"Server \| Server"~~
	100	name: Server
100	101	credentials: system
101		~~# Media:~~
102		~~# dmMediaFolder:~~
103		~~# name: Folder~~
104		~~# dmMedia:~~
105		~~# name: File~~
106		~~Page:~~
107		~~dmPage:~~
108		~~name: Page~~
109		~~credentials: system~~
110		~~dmPageView:~~
111		~~name: Page View~~
112		~~credentials: system~~
113		~~dmLayout:~~
114		~~name: Layout~~
115		~~credentials: system~~
116		~~dmArea:~~
117		~~name: Area~~
118		~~credentials: system~~
119		~~dmZone:~~
120		~~name: Zone~~
121		~~credentials: system~~
122		~~dmWidget:~~
123		~~name: Widget~~
124		~~credentials: system~~

plugins/diemPlugin/trunk/dmAdminPlugin/config/dm/project.yml

r22606	r22786
18	18	admin:
19	19	max_per_page: [ 3, 5, 10, 15, 20, 30, 50, 100, ∞ ] # admin lists paginators
20		list_truncate: 200 # truncate big descriptions in admin lists
	20	list_truncate: 120 # truncate big descriptions in admin lists
21	21
22	22	console: # emulate a linux shell

plugins/diemPlugin/trunk/dmAdminPlugin/config/dmAdminPluginConfiguration.class.php

r22680	r22786
5	5	$dependencies = array(),
6	6	$helpers = array('Dm'),
7		$externalModules = array('sfGuardUser', 'sfGuardPermission', 'sfGuardGroup', 'sfPixlr'),
8		$disabledModules = array('dmPage', 'dmPageView', 'dmLayout', 'dmArea', 'dmZone', 'dmWidget', 'dmMedia', 'dmMediaFolder');
	7	$externalModules = array('sfGuardPermission', 'sfGuardGroup', 'sfPixlr');
9	8
10	9	public function configure()
…	…
39	38	$modules[] = basename($dir);
40	39	}
41
42		~~$modules = array_diff(array_merge(self::$externalModules, $modules), self::$disabledModules);~~
43	40
44		return ~~$modules~~;
	41	return array_merge($modules, self::$externalModules);
45	42	}
46	43

plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/parts/processFormAction.php

r22539	r22786
14	14	$this->getUser()->setFlash('notice', $notice.' You can add another one below.');
15	15
16		$~~this->redirect('@<?php echo $this->getUrlForAction('new') ?>')~~;
	16	$redirection = '@<?php echo $this->getUrlForAction('new') ?>';
17	17	}
18	18	elseif ($request->hasParameter('_save_and_list'))
…	…
20	20	$this->getUser()->setFlash('notice', $notice);
21	21
22		$~~this->redirect('@<?php echo $this->getUrlForAction('list') ?>')~~;
	22	$redirection = '@<?php echo $this->getUrlForAction('list') ?>';
23	23	}
24	24	elseif ($request->hasParameter('_save_and_next'))
…	…
26	26	$this->getUser()->setFlash('notice', $notice);
27	27	$<?php echo $this->getSingularName() ?> = dmArray::get($<?php echo $this->getSingularName() ?>->getPrevNextRecords($this->buildQuery()), 'next', $this->form->getObject());
28		$~~this->redirect('@<?php echo $this->getUrlForAction('edit') ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>)~~;
	28	$redirection = '@<?php echo $this->getUrlForAction('edit') ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>;
29	29	}
30	30	else
…	…
32	32	$this->getUser()->setFlash('notice', $notice);
33	33
34		$~~this->redirect(array('sf_route' => '<?php echo $this->getUrlForAction('edit') ?>', 'sf_subject' => $<?php echo $this->getSingularName() ?>)~~);
	34	$redirection = array('sf_route' => '<?php echo $this->getUrlForAction('edit') ?>', 'sf_subject' => $<?php echo $this->getSingularName() ?>);
35	35	}
	36
	37	$this->redirect($redirection);
36	38	}
37	39	else

plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/lib/helper.php

r22539	r22786
40	40	public function linkToDelete($object, $params)
41	41	{
	42	$title = __($params['title'], array('%1%' => strtolower($this->getModule()->getName())));
42	43	return '<li class="sf_admin_action_delete">'.link_to1(__($params['label']), array(
43	44	'sf_route' => $this->getUrlForAction('delete'),
…	…
46	47	array(
47	48	'class' => 's16 s16_delete ml10 mr10 dm_delete_link',
48		'title' => ~~__($params['title'], array('%1%' => strtolower($this->getModule()->getName())))~~,
	49	'title' => $title,
49	50	'method' => 'delete',
50		'confirm' => ~~false~~
	51	'confirm' => $title.' ?'
51	52	)).'</li>';
52	53	}

plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/_search.php

r22551	r22786
3	3	$currentSearch = $sf_user->getAppliedSearchOnModule('<?php echo $this->getModuleName(); ?>');
4	4	printf('<form action="%s" method="get">', url_for1(array('sf_route' => '<?php echo $this->getModule()->getUnderscore(); ?>')));
5		printf('<input id="dm_module_search_input" type="text" title="%s" value="%s" name="search"/>',
	5	printf('<input id="dm_module_search_input" class="ui-corner-left" type="text" title="%s" value="%s" name="search"/>',
6	6	__('Search in %1%', array('%1%' => __("<?php echo $this->getModule()->getPlural(); ?>"))),
7	7	$currentSearch
8	8	);
	9	printf('<input type="submit" class="dm_submit ui-corner-right" value="%s" />', __('Search'));
9	10	if ($currentSearch)
10	11	{
11		printf('<a href="%s" class="s16 s16_cross" title="%s"> </a>', url_for1(array('sf_route' => '<?php echo $this->getModule()->getUnderscore(); ?>')).'?search=', __('Cancel search'));
	12	printf('<a href="%s" class="s16 s16_cross ml5 mr5" title="%s"> </a>', url_for1(array('sf_route' => '<?php echo $this->getModule()->getUnderscore(); ?>')).'?search=', __('Cancel search'));
12	13	}
13		~~printf('<input type="submit" class="dm_submit" value="%s" />', __('Search'));~~
14	14	?]
15	15	</form>

plugins/diemPlugin/trunk/dmAdminPlugin/lib/config/dmAdminRoutingConfigHandler.php

r22408	r22786
91	91	);
92	92	}
93
	93
94	94	// module routes
95	95	foreach($moduleManager->getModules() as $module)

plugins/diemPlugin/trunk/dmAdminPlugin/lib/generator/dmAdminDoctrineGenerator.php

r22539	r22786
158	158	else
159	159	{
160		$html = '$'.$this->getSingularName()."->get('".$relation->getLocalColumnName()."') ? $".$this->getSingularName()."->get('".$relation->getAlias()."') : '-'";
	160	$localModule = dmContext::getInstance()->getModuleManager()->getModuleByModel($relation->getClass());
	161
	162	if ($localModule && $localModule->hasAdmin())
	163	{
	164	$html = "(\$sf_user->canAccessToModule('{$localModule->getUnderscore()}')
	165	? £link(array('sf_route' => '{$localModule->getUnderscore()}_edit', 'sf_subject' => \${$this->getSingularName()}->get('{$relation->getAlias()}')))
	166	->text(\${$this->getSingularName()}->get('{$relation->getAlias()}')->__toString())
	167	->title(__('Open'))
	168	->set('.associated_record.s16right.s16_arrow_up_right_medium')
	169	: $".$this->getSingularName()."->get('".$relation->getAlias()."'))";
	170	}
	171	else
	172	{
	173	$html = "$".$this->getSingularName()."->get('".$relation->getAlias()."')";
	174	}
	175
	176	$html = '$'.$this->getSingularName()."->get('".$relation->getLocalColumnName()."') ? ".$html." : '-'";
161	177	}
162	178	}
…	…
185	201	{
186	202	$html = 'htmlentities(dmString::truncate('.$html.', '.$field->getConfig('truncate', sfConfig::get('dm_admin_list_truncate', 120)).'), ENT_QUOTES, \'UTF-8\')';
	203
	204	if ($this->module->getTable()->isMarkdownColumn($fieldName))
	205	{
	206	$html = "str_replace(array('*', '#'), '', ".$html.");";
	207	}
187	208	}
188	209
189	210	if ($field->isLink())
190	211	{
191		$html = sprintf("~~link_to(%s, '%s', \$%s)", $html, $this->getUrlForAction('edit'), $this->getSingularName()~~);
	212	$html = sprintf("£link(\$%s)->text(%s)->title('Open')", $this->getSingularName(), $html);
192	213	}
193	214
194	215	return $html;
	216	}
	217
	218	/**
	219	* Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
	220	*
	221	* @param string $column The column name
	222	* @param boolean $developed true if you want developped method names, false otherwise
	223	* @param string $prefix The prefix value
	224	*
	225	* @return string PHP code
	226	*/
	227	public function getColumnGetter($column, $developed = false, $prefix = '')
	228	{
	229	$getter = 'get(\''.$column.'\')';
	230	if ($developed)
	231	{
	232	$getter = sprintf('$%s%s->%s', $prefix, $this->getSingularName(), $getter);
	233	}
	234
	235	return $getter;
	236	}
	237
	238	/**
	239	* Returns PHP code to add to a URL for primary keys.
	240	*
	241	* @param string $prefix The prefix value
	242	*
	243	* @return string PHP code
	244	*/
	245	public function getPrimaryKeyUrlParams($prefix = '', $full = false)
	246	{
	247	$params = array();
	248	foreach ($this->getPrimaryKeys() as $pk)
	249	{
	250	$fieldName = sfInflector::underscore($pk);
	251
	252	if ($full)
	253	{
	254	$params[] = sprintf("%s='.%s->%s", $fieldName, $prefix, $this->getColumnGetter($fieldName, false));
	255	}
	256	else
	257	{
	258	$params[] = sprintf("%s='.%s", $fieldName, $this->getColumnGetter($fieldName, true, $prefix));
	259	}
	260	}
	261
	262	return implode(".'&", $params);
195	263	}
196	264

plugins/diemPlugin/trunk/dmAdminPlugin/lib/menu/dmAdminMenu.php

r22680	r22786
80	80	foreach($space->getModules() as $moduleKey => $module)
81	81	{
82		if (!$module->isProject() && !in_array($moduleKey, sfConfig::get('sf_enabled_modules')))
83		{
84		continue;
85		}
86
87		if(!$module->hasAdmin())
88		{
89		continue;
90		}
91
92		if ($module->getParam('credentials') && !$this->user->can($module->getParam('credentials')))
	82	if (!$this->user->canAccessToModule($module))
93	83	{
94	84	continue;

plugins/diemPlugin/trunk/dmAdminPlugin/lib/user/dmAdminUser.php

r22128	r22786
4	4	{
5	5	protected
6		$theme;
	6	$theme,
	7	$availableModules = array();
7	8
8	9	/*
…	…
50	51	}
51	52
	53	public function canAccessToModule($moduleKey)
	54	{
	55	if ($moduleKey instanceof dmModule)
	56	{
	57	$moduleKey = $moduleKey->getKey();
	58	}
	59
	60	if (isset($this->availableModules[$moduleKey]))
	61	{
	62	return $this->availableModules[$moduleKey];
	63	}
	64
	65	if ($moduleKey instanceof dmModule)
	66	{
	67	$module = $moduleKey;
	68	}
	69	else
	70	{
	71	$module = dmContext::getInstance()->getModuleManager()->getModule($moduleKey);
	72	}
	73
	74	return $this->availableModules[$module->getKey()] =
	75	$module->hasAdmin()
	76	&& ($module->isProject() \|\| in_array($moduleKey, sfConfig::get('sf_enabled_modules')))
	77	&& (!$module->getParam('credentials') \|\| $this->can($module->getParam('credentials')));
	78	}
	79
52	80	}

plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdminGenerator/templates/_relationAssociation.php

r22552	r22786
15	15	{
16	16	echo £('li',
17		~~dmAdminLinkTag::build~~(array(
	17	£link(array(
18	18	'sf_route' => $associationModule->getUnderscore().'_edit',
19	19	'sf_subject' => $associationRecord
20		))->text($associationRecord)
	20	))
	21	->text($associationRecord->__toString())
	22	->title(__('Open'))
	23	->set('.associated_record.s16right.s16_arrow_up_right_medium')
21	24	);
22	25	}

plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdminGenerator/templates/_relationForeign.php

r22552	r22786
35	35	'sf_route' => $foreignModule->getUnderscore().'_edit',
36	36	'sf_subject' => $foreignRecord
37		))->text($foreignRecord)
	37	))
	38	->text($foreignRecord->__toString())
	39	->title(__('Open'))
	40	->set('.associated_record.s16right.s16_arrow_up_right_medium')
38	41	);
39	42	}

plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmAdminGenerator/templates/_sort.php

r22552	r22786
21	21	echo $form->open();
22	22
23		echo £('div.fleft', £link('@'.$~~module~~->getUnderscore())->text('« '.__('Back to list')));
	23	echo £('div.fleft', £link('@'.$form->getModule()->getUnderscore())->text('« '.__('Back to list')));
24	24
25	25	echo $submit;

plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_flash.php

r22552	r22786
2	2
3	3	$html = '';
	4
4	5	foreach(array('info', 'notice', 'alert', 'error') as $log_type)
5	6	{
6	7	foreach(array('dm_log_', '') as $prefix)
7	8	{
8		if (count($messages = (array)$sf_user->getFlash($prefix.$log_type)))
	9	if (count($messages = (array) $sf_user->getFlash($prefix.$log_type)))
9	10	{
10	11	$class = $log_type === 'notice' ? 'info' : $log_type;
…	…
24	25	if ($html)
25	26	{
26		echo £(~~"div#flash"~~, $html);
	27	echo £('div#flash', array('title' => __('Close')), $html);
27	28	}

plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLayout/config/generator.yml

r22552	r22786
14	14	display:
15	15	- =name
16		~~- page_views_list~~
17		~~- areas_list~~
18	16	- css_class
19	17	sort:
…	…
21	19	- asc
22	20	max_per_page: 8
23		table_method: ~~joinAll~~
	21	table_method: ~
24	22	table_count_method: ~
25	23	filter:

plugins/diemPlugin/trunk/dmAdminPlugin/web/css/flash.css

r21423	r22786
1	1	#flash {
2	2	margin-bottom: 5px;
	3	cursor: pointer;
3	4	}
4	5
5		#flash .flash {
	6	#flash li.flash {
6	7	border: 1px solid;
7	8	padding: 5px;
…	…
10	11	}
11	12
12		#flash .info {
	13	#flash li.info {
13	14	background: #DFE9B8 url(../images/flash/green.gif) repeat-x top left;
14	15	border-color: #CAD3A6;
15	16	}
16	17
17		#flash .alert {
	18	#flash li.alert {
18	19	background: #F8F2B7 url(../images/flash/yellow.gif) repeat-x top left;
19	20	border-color: #DBD6A1;
20	21	}
21	22
22		#flash .error {
	23	#flash li.error {
23	24	background: #F6DCD9 url(../images/flash/red.gif) repeat-x top left;
24	25	border-color: #D7BBB8;

plugins/diemPlugin/trunk/dmAdminPlugin/web/css/list.css

r22539	r22786
62	62	}
63	63
64		div.dm_form_pagination strong
65		{
66		color: #000;
	64	div.dm_form_pagination strong {
67	65	}
68	66
…	…
101	99
102	100	.sf_admin_list tr.even {
103		background: #F~~1F5FE~~;
	101	background: #F0F4FC;
104	102	}
105	103
…	…
107	105	border: none;
108	106	padding: 5px 5px;
	107	color: #222;
109	108	}
110	109

plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css

r22539	r22786
8	8	h2{font-size:123.1%;}
9	9	h3{font-size:108%;}
10		h1,h2,h3,h4,h5,h6,strong{color: #~~555~~; font-weight:bold;}
	10	h1,h2,h3,h4,h5,h6,strong{color: #333; font-weight:bold;}
11	11	h1 { letter-spacing: 1px; }
12	12	abbr,acronym{border-bottom:1px dotted #000;cursor:help;}

plugins/diemPlugin/trunk/dmAdminPlugin/web/css/module.css

r22539	r22786
10	10	color: #666;
11	11	}
12
13	12
14	13	.dm_module_type_show .title {
…	…
44	43	#dm_module_search_input {
45	44	width: 300px;
46		margin-right: 5px;
	45	padding:2px;
	46	border: 1px solid #ccc;
47	47	}
	48
	49	div.dm_module_search input.dm_submit {
	50	padding:1px 5px;
	51	border: 1px solid #ccc;
	52	margin-left: -1px;
	53	border-left: none;
	54	background: url(../../core/images/default_bg.png) center left repeat-x;
	55	color: #444;
	56	cursor: pointer;
	57	}
	58	div.dm_module_search input.dm_submit:hover {
	59	color: #046BCA;
	60	}
	61
	62	a.associated_record {
	63	background-position: right -1072px;
	64	padding-left: 0px !important;
	65	padding-right: 18px;
	66	text-decoration: none;
	67	color: inherit;
	68	}
	69
	70	a.associated_record:hover {
	71	background-position: right -1056px;
	72	color: #046BCA;
	73	text-decoration: underline;
	74	}

plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js

r22539	r22786
108	108	$("input.datepicker_me", this.$).datepicker({});
109	109	}
	110	},
	111
	112	flashMessages: function()
	113	{
	114	$("#flash").click(function()
	115	{
	116	$(this).remove();
	117	});
110	118	}
111	119

plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js

r22539	r22786
8	8	this.$ = $("#dm_admin_content");
9	9
10		~~this.deleteLink();~~
11	10	this.focusFirstInput();
12	11	this.markitup();
…	…
16	15	this.hotKeys();
17	16	},
18
19		~~deleteLink: function()~~
20		{
21		~~$('a.dm_delete_link', this.$).each(function() {~~
22		~~$(this).click(function(e)~~
23		{
24		~~e.stopPropagation();~~
25		~~if (!confirm($(this).attr('title')+ ' ?'))~~
26		{
27		~~return false;~~
28		}
29		~~});~~
30		~~});~~
31		},
32	17
33	18	focusFirstInput: function()

plugins/diemPlugin/trunk/dmCorePlugin/config/doctrine/page_schema.yml

r22604	r22786
37	37	Layout:
38	38	class: DmLayout
	39	local: dm_layout_id
	40	foreign: id
39	41	onDelete: CASCADE
40	42	foreignAlias: PageViews
…	…
63	65	Layout:
64	66	class: DmLayout
	67	local: dm_layout_id
	68	foreign: id
	69	foreignAlias: Areas
65	70	onDelete: CASCADE
66		~~foreignAlias: Areas~~
67	71	PageView:
68	72	class: DmPageView
69	73	local: dm_page_view_id
70	74	foreign: id
	75	foreignAlias: Area
71	76	onDelete: CASCADE
72	77
…	…
81	86	Area:
82	87	class: DmArea
	88	local: dm_area_id
	89	foreign: id
	90	foreignAlias: Zones
83	91	onDelete: CASCADE
84		~~foreignAlias: Zones~~
85	92
86	93	DmWidget:
…	…
96	103	Zone:
97	104	class: DmZone
	105	local: dm_zone_id
	106	foreign: id
	107	foreignAlias: Widgets
98	108	onDelete: CASCADE
99		~~foreignAlias: Widgets~~
100	109
101	110	package: dmCorePlugin.lib.model.doctrine.page

plugins/diemPlugin/trunk/dmCorePlugin/data/generator/dmDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php

r22276	r22786
15	15	parent::setupInheritance();
16	16
	17	<?php foreach ($this->getColumns() as $column): ?>
	18	$this->widgetSchema ['<?php echo $column->getFieldName() ?>'] = new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>);
	19	$this->validatorSchema['<?php echo $column->getFieldName() ?>'] = new <?php echo $this->getValidatorClassForColumn($column) ?>(<?php echo $this->getValidatorOptionsForColumn($column) ?>);
	20
	21	<?php endforeach; ?>
17	22	<?php foreach ($this->getManyToManyRelations() as $relation): ?>
18	23	$this->widgetSchema ['<?php echo $this->underscore($relation['alias']) ?>_list'] = new sfWidgetFormDoctrineChoice(array('multiple' => true, 'model' => '<?php echo $relation['table']->getOption('name') ?>'));
…	…
65	70	}
66	71
67		if (~~null === $con~~)
	72	if (is_null($con))
68	73	{
69	74	$con = $this->getConnection();

plugins/diemPlugin/trunk/dmCorePlugin/data/i18n/en_fr.yml

r22539	r22786
	1	"Open": "Ouvrir"
1	2	"Delete": "Supprimer"
2	3	"Add": "Ajouter"

plugins/diemPlugin/trunk/dmCorePlugin/data/incrementalSkeleton/sf_test_dir/bootstrap/functional.php

r22213	r22786
25	25	require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php';
26	26	$configuration = ProjectConfiguration::getApplicationConfiguration($app, $env, $debug);
27		dm~~Context::createInstance~~($configuration);
	27	dm::createContext($configuration);
28	28
29	29	// remove all cache

plugins/diemPlugin/trunk/dmCorePlugin/data/sprites/16

r22539	r22786
65	65	arrow_up_right
66	66	arrow_left
	67	arrow_up_right_medium
	68	arrow_up_right_medium

plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php

r22474	r22786
154	154	}
155	155	}
	156
	157	$moduleKeys = array();
	158	foreach($this->config as $typeName => $typeConfig)
	159	{
	160	foreach($typeConfig as $spaceName => $modulesConfig)
	161	{
	162	foreach($modulesConfig as $moduleKey => $moduleConfig)
	163	{
	164	if (in_array($moduleKey, $moduleKeys))
	165	{
	166	$this->throwException('The module '.$moduleKey.' is declared twice');
	167	}
	168	else
	169	{
	170	$moduleKeys[] = $moduleKey;
	171	}
	172	}
	173	}
	174	}
156	175	}
157	176

plugins/diemPlugin/trunk/dmCorePlugin/lib/controller/dmFrontWebController.php

r22213	r22786
13	13	public function redirect($url, $delay = 0, $statusCode = 302)
14	14	{
15		$this->dispatcher->notify(new sfEvent($this, 'dm.controller.redirect', array($url)));
	15	$url = $this->genUrl($url, true);
	16
	17	$this->dispatcher->notify(new sfEvent($this, 'dm.controller.redirect'));
16	18
17	19	parent::redirect($url, $delay, $statusCode);

plugins/diemPlugin/trunk/dmCorePlugin/lib/core/dm.php

r22539	r22786
1	1	<?php
	2
	3	require_once(dirname(__FILE__).'/dmBase.php');
2	4
3	5	/*
4	6	* Provides shortcuts to Symfony & Diem static methods
5	7	*/
6		class dm
	8	class dm extends dmBase
7	9	{
8	10
9		~~protected static~~
10		~~$startTime,~~
11		~~$version,~~
12		~~$dir;~~
13
14		~~public static function register($dir)~~
15		{
16		~~if (null !== self::$dir)~~
17		{
18		~~throw new Exception('Diem has already been registered');~~
19		}
20
21		~~self::resetStartTime();~~
22
23		~~self::$dir = $dir;~~
24
25		~~require_once(self::$dir.'/dmCorePlugin/lib/config/dmProjectConfiguration.php');~~
26		}
27
28		~~public static function resetStartTime()~~
29		{
30		~~self::$startTime = microtime(true);~~
31		}
32
33		~~public static function getDir()~~
34		{
35		~~return self::$dir;~~
36		}
37
38		~~public static function getStartTime()~~
39		{
40		~~return self::$startTime;~~
41		}
42
43
44		~~public static function checkServer()~~
45		{
46		~~$configuration = ProjectConfiguration::getApplicationConfiguration('admin', 'test', true);~~
47		~~dmContext::createInstance($configuration);~~
48
49		~~$serverCheck = new dmServerCheck;~~
50
51		~~print $serverCheck->render();~~
52
53		~~exit;~~
54		}
55
56		/*
57		* Symfony common objects accessors
58		*/
59
60		~~public static function getRouting()~~
61		{
62		~~return dmContext::getInstance()->getRouting();~~
63		}
64
65		/*
66		* @return dmWebRequest
67		*/
68		~~public static function getRequest()~~
69		{
70		~~return dmContext::getInstance()->getRequest();~~
71		}
72
73		~~public static function getResponse()~~
74		{
75		~~return dmContext::getInstance()->getResponse();~~
76		}
77
78		~~public static function getController()~~
79		{
80		~~return dmContext::getInstance()->getController();~~
81		}
82
83		~~public static function getEventDispatcher()~~
84		{
85		~~return dmContext::hasInstance()~~
86		~~? dmContext::getInstance()->getEventDispatcher()~~
87		~~: ProjectConfiguration::getActive()->getEventDispatcher();~~
88		}
89
90		~~public static function getUser()~~
91		{
92		~~return dmContext::getInstance()->getUser();~~
93		}
94
95		~~public static function getI18n()~~
96		{
97		~~return dmContext::getInstance()->getI18n();~~
98		}
99
100		~~public static function loadHelpers($helpers)~~
101		{
102		~~return dmContext::getInstance()->getConfiguration()->loadHelpers($helpers);~~
103		}
104
105		/*
106		* Diem common features shortcuts
107		*/
108
109		~~public static function version()~~
110		{
111		~~return sfConfig::get('dm_version');~~
112		}
113
114		/*
115		* Gadgets
116		*/
117
118		/*
119		* Diem code size
120		* returns array(files, lines, characters)
121		*/
122		~~public static function getDiemSize()~~
123		{
124		~~$timer = dmDebug::timerOrNull('dm::getDiemSize()');~~
125
126		~~$pluginsDir = sfConfig::get('sf_plugins_dir').'/';~~
127
128		~~$files = sfFinder::type('file')~~
129		~~->prune('om')~~
130		~~->prune('map')~~
131		~~->prune('base')~~
132		~~->prune('vendor')~~
133		~~->name('\.php', '\.css', '\.js', '\.yml')~~
134		~~->in($pluginsDir.'dmCorePlugin', $pluginsDir.'dmAdminPlugin', $pluginsDir.'dmFrontPlugin');~~
135
136		~~foreach($files as $key => $file)~~
137		{
138		~~if(strpos($file, '/web/lib/'))~~
139		{
140		~~unset($files[$key]);~~
141		}
142		}
143
144		~~$lines = 0;~~
145		~~$characters = 0;~~
146
147		~~foreach($files as $file)~~
148		{
149		~~$content = file($file);~~
150		~~$lines += count($content);~~
151		~~$characters += strlen(implode(' ', $content));~~
152		}
153
154		~~$response = array(~~
155		~~'nb_files' => count($files),~~
156		~~'lines' => $lines,~~
157		~~'characters' => $characters~~
158		);
159
160		~~$timer && $timer->addTime();~~
161
162		~~return $response;~~
163		}
164	11	}

plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/pager/dmDoctrinePager.php

r22539	r22786
3	3	class dmDoctrinePager extends sfDoctrinePager
4	4	{
	5
	6	/**
	7	* Get all the results for the pager instance
	8	*
	9	* @param integer $hydrationMode Doctrine::HYDRATE_* constants
	10	*
	11	* @return Doctrine_Collection\|array
	12	*/
	13	public function getResults($hydrationMode = Doctrine::HYDRATE_RECORD)
	14	{
	15	if(null !== $this->results)
	16	{
	17	return $this->results;
	18	}
	19
	20	return $this->results = $this->getQuery()->execute(array(), $hydrationMode)->getData();
	21	}
5	22
6	23	public function getCountQuery()

plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php

r22539	r22786
315	315	}
316	316
	317	public function isMarkdownColumn($columnName)
	318	{
	319	return strpos(dmArray::get($this->getColumnDefinition($columnName), 'extra', ''), 'markdown') !== false;
	320	}
	321
317	322	/*
318	323	* Please override getSortColumnName instead

plugins/diemPlugin/trunk/dmCorePlugin/lib/form/dmForm.php

r22539	r22786
114	114	}
115	115
116		if (strpos($action, '#') === false)
117		{
118		$action .= '#'.$this->getKey();
119		}
	116	// if (strpos($action, '#') === false)
	117	// {
	118	// $action .= '#'.$this->getKey();
	119	// }
120	120
121	121	if (isset($opt['action'])) unset($opt['action']);

plugins/diemPlugin/trunk/dmCorePlugin/lib/helper/DmHelper.php

r22539	r22786
59	59	}
60	60
	61	function unMarkdown($markdown)
	62	{
	63	return dmContext::getInstance()->get('markdown')->toText($markdown);
	64	}
	65
61	66	/*
62	67	* a, class='tagada ergrg' id=zegf, contenu

plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/page/PluginDmLayout.class.php

r22128	r22786
28	28	}
29	29
30		foreach($this->~~Areas~~ as $area)
	30	foreach($this->get('Areas') as $area)
31	31	{
32	32	if($area->get('type') == $type)

plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/page/PluginDmPageTable.class.php

r22680	r22786
72	72	foreach($ids as $index => $id)
73	73	{
74		if (isset($this->recordPageCache[$module][$i~~ndex~~]))
	74	if (isset($this->recordPageCache[$module][$id]))
75	75	{
76	76	unset($ids[$index]);
…	…
83	83	}
84	84
85		$pages = $this->createQuery('p ~~INDEXBY p.record_id~~')
	85	$pages = $this->createQuery('p')
86	86	->withI18n()
87	87	->select('p.id, p.module, p.action, p.record_id, p.is_secure, p.lft, p.rgt, pTranslation.slug, pTranslation.name, pTranslation.is_active')
…	…
91	91	->getData();
92	92
93		foreach($pages as $~~recordId => $~~page)
94		{
95		$this->recordPageCache[$module][$~~recordId~~] = $page;
	93	foreach($pages as $page)
	94	{
	95	$this->recordPageCache[$module][$page->get('record_id')] = $page;
96	96	}
97	97
…	…
199	199	$module = $record->getDmModule()->getKey();
200	200
201		~~// if (!isset($this->recordPageCache[$module]))~~
202		~~// {~~
203		~~// $this->prepareRecordPageCache($module);~~
204		~~// }~~
205
206	201	if (isset($this->recordPageCache[$module][$record->get('id')]))
207	202	{

plugins/diemPlugin/trunk/dmCorePlugin/lib/response/asset/compressor/dmStylesheetCompressor.php

r22128	r22786
38	38	}
39	39
40		protected function fixCssPaths($content, $path)
	40
	41
	42	public function fixCssPaths($content, $path)
41	43	{
42	44	if (preg_match_all("/url$\s?[\'\|\"]?(.+)[\'\|\"]?\s?$/ix", $content, $urlMatches))

plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchEngine.php

r22128	r22786
16	16	}
17	17
	18	public function setLogger(sfLogger $logger)
	19	{
	20	$this->logger = $logger;
	21	}
	22
18	23	protected function configure()
19	24	{
…	…
22	27	$index = $this->serviceContainer->getService('search_index');
23	28	$index->setCulture($culture);
	29	$index->setLogger($this->logger);
24	30	$this->addIndex($index->getName(), $index);
25	31	}
…	…
71	77
72	78	$oldCulture = $this->user->getCulture();
73
	79
74	80	foreach ($this->getIndices() as $name => $index)
75	81	{
…	…
85	91	$this->logger->log($this->getName().' : Group populated in "' . round(microtime(true) - $start, 2) . '" seconds.');
86	92
	93	$this->logger->log('-----> Search index population successfully completed');
	94
87	95	return true;
88	96	}

plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchIndex.php

r22213	r22786
29	29	$this->logger = $logger;
30	30	}
	31
	32
	33	public function setLogger(sfLogger $logger)
	34	{
	35	$this->logger = $logger;
	36	}
31	37
32	38	public function setCulture($culture)
…	…
99	105	}
100	106
	107	$nb = 0;
	108	$nbMax = count($pages);
101	109	foreach ($pages as $page)
102	110	{
103		$this->logger->log($this->getName().' : '.$page->get('slug'));
	111	++$nb;
	112	$this->logger->log($this->getName().' '.$nb.'/'.$nbMax.' : '.$page->get('slug'));
104	113	$this->index->addDocument(new dmSearchPageDocument($page));
105	114	}

plugins/diemPlugin/trunk/dmCorePlugin/lib/search/dmSearchPageDocument.php

r22213	r22786
17	17	$this->store('page_id', $page->get('id'));
18	18
19		$this->index('body', $this->getPageBodyText($page));
	19	$this->index('body', $this->getPageBodyText($page), 1);
20	20
21	21	$this->index('slug', dmString::unSlugify($i18n->get('slug')), 2);
…	…
56	56	}
57	57
	58	$helper = dmContext::getInstance()->get('page_helper');
	59
58	60	dmContext::getInstance()->setPage($page);
59	61
60		$area = dmDb::query('DmArea a, a.Zones z, z.Widgets w')
61		->select('a.id, z.width, z.css_class, w.module, w.action, w.value, w.css_class')
62		->where('a.type = ? AND a.dm_page_view_id = ?', array('content', $page->get('PageView')->get('id')))
	62	$area = dmDb::query('DmPageView pv, pv.Area a')
	63	->select('a.id')
	64	->where('pv.module = ? AND pv.action = ?', array($page->get('module'), $page->get('action')))
	65	->fetchPDO();
	66
	67	$zones = dmDb::query('DmZone z, z.Widgets w')
	68	->select('z.dm_area_id, w.module, w.action, w.value')
	69	->where('z.dm_area_id = ?',$area[0][0])
63	70	->fetchArray();
64	71
65		~~$helper = dmContext::getInstance()->get('page_helper'~~);
	72	sfConfig::set('dm_search_populating', true);
66	73
67	74	$html = '';
68	75
69		foreach($~~area[0]['Zones']~~ as $zone)
	76	foreach($zones as $zone)
70	77	{
71	78	foreach($zone['Widgets'] as $widget)
…	…
78	85	}
79	86
80		~~unset($area~~);
	87	sfConfig::set('dm_search_populating', false);
81	88
82	89	$indexableText = dmSearchIndex::cleanText($html);
	90
	91	unset($area, $html, $helper);
83	92
84	93	return $indexableText;

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmAdminGenerateTask.class.php

r22229	r22786
34	34	if (!sfContext::hasInstance())
35	35	{
36		dm~~Context::createInstance~~($this->configuration);
	36	dm::createContext($this->configuration);
37	37	}
38	38

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDataTask.class.php

r22229	r22786
28	28	if (!sfContext::hasInstance())
29	29	{
30		dm~~Context::createInstance~~($this->configuration);
	30	dm::createContext($this->configuration);
31	31	}
32	32

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDoctrineBuildFormsTask.class.php

r22229	r22786
27	27	if (!sfContext::hasInstance())
28	28	{
29		dm~~Context::createInstance~~($this->configuration);
	29	dm::createContext($this->configuration);
30	30	}
31	31

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDoctrineBuildModelTask.class.php

r22128	r22786
94	94	$import->setOptions($options);
95	95	$import->importSchema(array($tmpPath, $config['yaml_schema_path']), 'yml', $config['models_path']);
	96
	97	$properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
	98	$finder = sfFinder::type('file')->name('*'.$options['suffix'])->maxdepth(0);
	99	$this->getFilesystem()->replaceTokens($finder->in($config['models_path']), '##', '##', array(
	100	'PACKAGE' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
	101	'SUBPACKAGE' => 'model',
	102	'NAME' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
	103	'EMAIL' => isset($properties['symfony']['email']) ? $properties['symfony']['email'] : 'you@email.com',
	104	));
	105
	106	$finder = sfFinder::type('file')->name('*Table'.$options['suffix'])->maxdepth(0);
	107	foreach ($finder->in($config['models_path']) as $file)
	108	{
	109	$contents = file_get_contents($file);
	110	$contents = strtr(sfToolkit::stripComments($contents), array(
	111	"{\n\n}" => "{\n}\n",
	112	));
	113	file_put_contents($file, $contents);
	114	}
96	115	}
97	116

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmFrontGenerateTask.class.php

r22229	r22786
31	31	if (!sfContext::hasInstance())
32	32	{
33		dm~~Context::createInstance~~($this->configuration);
	33	dm::createContext($this->configuration);
34	34	}
35	35

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmFrontPageIndexableContentTask.class.php

r22229	r22786
41	41	if (!sfContext::hasInstance())
42	42	{
43		dm~~Context::createInstance~~($this->configuration);
	43	dm::createContext($this->configuration);
44	44	}
45	45	$databaseManager = new sfDatabaseManager($this->configuration);

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmLoremizeTask.class.php

r22229	r22786
32	32	if (!sfContext::hasInstance())
33	33	{
34		dm~~Context::createInstance~~($this->configuration);
	34	dm::createContext($this->configuration);
35	35	}
36	36

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSearchUpdateTask.class.php

r22229	r22786
27	27	if (!sfContext::hasInstance())
28	28	{
29		dm~~Context::createInstance~~($this->configuration);
	29	dm::createContext($this->configuration);
30	30	}
31	31
…	…
35	35
36	36	$index = dmContext::getInstance()->get('search_engine');
37		$index->setLogger(new ~~dmLoggerTask($this->dispatcher, $this->formatt~~er));
	37	$index->setLogger(new sfConsoleLogger($this->dispatcher));
38	38
39	39	$index->populate();

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSetupTask.class.php

r22229	r22786
37	37	// if (!sfContext::hasInstance())
38	38	// {
39		// dm~~Context::createInstance~~($this->configuration);
	39	// dm::createContext($this->configuration);
40	40	// }
41	41	//

plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmSpriteTask.class.php

r22254	r22786
26	26	protected function execute($arguments = array(), $options = array())
27	27	{
28		dm~~Context::createInstance~~($this->configuration);
	28	dm::createContext($this->configuration);
29	29	return $this->executeService("dmSprite", $options);
30	30	}

plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php

r22213	r22786
55	55	$configuration = ProjectConfiguration::getApplicationConfiguration($this->options['app'], $this->options['env'], $this->options['debug']);
56	56
57		dm~~Context::createInstance~~($configuration);
	57	dm::createContext($configuration);
58	58
59	59	// remove all cache

plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmTestBrowser.php

r22213	r22786
29	29
30	30	// create context
31		$this->context = dm~~Context::createInstance~~($configuration);
	31	$this->context = dm::createContext($configuration);
32	32	unset($currentConfiguration);
33	33

plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmLinkTag.php

r22166	r22786
129	129	);
130	130	}
	131
131	132	unset($attributes['params']);
132	133	}

plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/media/tag/dmMediaTagImage.php

r22680	r22786
124	124	protected function prepareMediaAttributes(array $attributes)
125	125	{
126		if ($this->hasSize())
	126	if ($this->hasSize() && !sfConfig::get('dm_search_populating'))
127	127	{
128	128	try

plugins/diemPlugin/trunk/dmCorePlugin/test/bootstrap/functional.php

r22213	r22786
21	21	require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php';
22	22	$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
23		dm~~Context::createInstance~~($configuration);
	23	dm::createContext($configuration);
24	24
25	25	// remove all cache

plugins/diemPlugin/trunk/dmCorePlugin/web/css/editMode.css

r21654	r22786
55	55	background: #fff;
56	56	}
	57
	58	.dm .ui-state-default, .dm .ui-widget-content .ui-state-default {
	59	background-image: url(../images/default_bg.png);
	60	}

plugins/diemPlugin/trunk/dmCorePlugin/web/css/sprite16.css

r22539	r22786
65	65	.s16_arrow_up_right { background-position: 0 -1024px; }
66	66	.s16_arrow_left { background-position: 0 -1040px; }
	67	.s16_arrow_up_right_medium { background-position: 0 -1056px; }
	68	.s16_arrow_up_right_medium { background-position: 0 -1072px; }

plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditCtrl.js

r22598	r22786
14	14	}
15	15	});
	16
16	17	$('div.ui-dialog a.close_dialog').live('click', function()
17	18	{
18	19	$(this).closest('div.ui-dialog-content').dialog('close');
19	20	});
	21
20	22	$('input.hint').hint();
21	23	},
…	…
115	117
116	118	return $dialog;
117		},
118
119		~~flashMessages: function()~~
120		{
121		~~$("#flash").click(function()~~
122		{
123		~~$(this).remove();~~
124		~~});~~
125	119	}
126	120	});

plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml

r22474	r22786
9	9	pageBar: dmFrontPageBar
10	10	mediaBar: dmFrontMediaBar
	11	codeEditor: dmFrontCodeEditor
11	12	page: page/dmPage
12	13	area: page/dmArea

plugins/diemPlugin/trunk/dmFrontPlugin/lib/action/dmFrontModuleComponents.php

r22680	r22786
152	152	$records = $records->getData();
153	153	}
154
	154
155	155	if (!empty($records))
156	156	{

plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/text/dmWidgetContentTextView.php

r22539	r22786
42	42	extract($vars);
43	43
44		$html = '';
45
46		echo dmStaticHelper::£o('div.dm_text.text_'.$style);
	44	$html = dmHelper::£o('div.dm_text.text_'.$style);
47	45
48	46	if ($title && $titlePosition == 'outside')
49	47	{
50		$html .= dm~~Static~~Helper::£('h2.text_title.outside', $title);
	48	$html .= dmHelper::£('h2.text_title.outside', $title);
51	49	}
52	50
53		$html .= dm~~Static~~Helper::£o('div.text_content.clearfix');
	51	$html .= dmHelper::£o('div.text_content.clearfix');
54	52
55	53	if ($media && $mediaPosition != 'bottom')
56	54	{
57		$html .= dm~~Static~~Helper::£('div.text_image'.$mediaClass, $media);
	55	$html .= dmHelper::£('div.text_image'.$mediaClass, $media);
58	56	}
59	57
60	58	if ($title && $titlePosition == 'inside')
61	59	{
62		$html .= dm~~Static~~Helper::£('h2.text_title.inside', $title);
	60	$html .= dmHelper::£('h2.text_title.inside', $title);
63	61	}
64	62
65		$html .= dm~~Static~~Helper::£('text_markdown', dmContext::getInstance()->get('markdown')->toHtml($text));
	63	$html .= dmHelper::£('text_markdown', dmContext::getInstance()->get('markdown')->toHtml($text));
66	64
67	65	if ($media && $mediaPosition == 'bottom')
68	66	{
69		$html .= dm~~Static~~Helper::£('div.text_image'.$mediaClass, $media);
	67	$html .= dmHelper::£('div.text_image'.$mediaClass, $media);
70	68	}
71	69
72		$html .= dm~~Static~~Helper::£c('div');
	70	$html .= dmHelper::£c('div');
73	71
74		$html .= dm~~Static~~Helper::£c('div');
	72	$html .= dmHelper::£c('div');
75	73
76	74	return $html;

plugins/diemPlugin/trunk/dmFrontPlugin/lib/pager/dmFrontDoctrinePager.php

r22539	r22786
10	10	$navigationCache =array();
11	11
12		/**
13		* Get all the results for the pager instance
14		*
15		* @param integer $hydrationMode Doctrine::HYDRATE_* constants
16		*
17		* @return Doctrine_Collection\|array
18		*/
19		~~public function getResults($hydrationMode = Doctrine::HYDRATE_RECORD)~~
20		{
21		~~return parent::getResults($hydrationMode)->getData();~~
22		}
23
24	12	public function configureNavigation(array $navigationConfiguration)
25	13	{

plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/asset/dmFrontAssetConfig.php

r22598	r22786
13	13	'lib.ui',
14	14	'lib.ui-dialog',
15		~~'lib.ui-resizable',~~
16		~~'lib.ui-tabs',~~
17		~~'lib.markitup',~~
18		~~'lib.markitupSet',~~
19	15	'core.util',
20	16	'core.editMode',
…	…
56	52	'lib.ui-sortable',
57	53	'lib.ui-dialog',
58		~~'lib.ui-resizable',~~
59		~~'lib.ui-tabs',~~
60	54	'lib.blockUI',
61	55	'lib.form',
62	56	'lib.hotkeys',
63		~~'lib.markitup',~~
64		~~'lib.markitupSet',~~
65	57	'core.config',
66	58	'core.plugins',
…	…
69	61	'core.editCtrl',
70	62	'core.form',
71		~~'core.tabForm',~~
72	63	'core.toolBar',
73	64	'core.pageBar',

plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/link/tag/dmFrontLinkTagPage.php

r22213	r22786
44	44	unset($preparedAttributes['tag']);
45	45
46		if ($tagName == 'span')
	46	if ($tagName === 'span')
47	47	{
48	48	unset($preparedAttributes['href'], $preparedAttributes['target']);
49	49	}
50	50
51		$attributes = $this->convertAttributesToHtml($preparedAttributes);
52
53		$tag = sprintf('<%s%s>%s</%s>',
54		$tagName,
55		$attributes,
56		$this->renderText(),
57		$tagName
58		);
59
60		return $tag;
	51	return '<'.$tagName.$this->convertAttributesToHtml($preparedAttributes).'>'.$this->renderText().'</'.$tagName.'>';
61	52	}
62	53
…	…
65	56	$attributes = parent::prepareAttributesForHtml($attributes);
66	57
67		if~~($currentPage = self::$context->getPage(~~))
	58	if (!sfConfig::get('dm_search_populating'))
68	59	{
69		if ~~($currentPage->get('id') === $this->page->get('id'~~))
	60	if($currentPage = self::$context->getPage())
70	61	{
71		$attributes['class'][] = 'dm_current';
72
73		if(dmConfig::get('link_current_span', true))
	62	if ($currentPage->get('id') === $this->page->get('id'))
74	63	{
75		$attributes['tag'] = 'span';
	64	$attributes['class'][] = 'dm_current';
	65
	66	if(dmConfig::get('link_current_span', true))
	67	{
	68	$attributes['tag'] = 'span';
	69	}
76	70	}
77		}
78		~~elseif($currentPage->getNode()->isDescendantOf($this->page))~~
79		{
80		~~$attributes['class'][] = 'dm_parent';~~
	71	elseif($currentPage->getNode()->isDescendantOf($this->page))
	72	{
	73	$attributes['class'][] = 'dm_parent';
	74	}
81	75	}
82	76	}

plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/page/dmFrontPageHelper.php

r22474	r22786
225	225	public function renderWidgetInner(array $widget, dmWidgetType $widgetType = null)
226	226	{
227		~~// ob_start();~~
228
229	227	try
230	228	{
…	…
241	239
242	240	$html = $this->serviceContainer->getService('widget_view')->render();
243
244		~~// ob_clean();~~
245	241	}
246	242	catch(Exception $e)
247	243	{
248		// ob_clean();
249		if (sfConfig::get('dm_debug'))
	244	if (sfConfig::get('dm_debug') \|\| sfConfig::get('dm_serach_populating'))
250	245	{
251	246	throw $e;

plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php

r22379	r22786
7	7	{
8	8	$this->fileMenu = new dmHtmlMenu($this->getFileMenu());
	9
	10	$assetAliases = include($this->context->get('config_cache')->checkConfig('config/dm/assets.yml'));
9	11
10	12	$js =
11		file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), ~~sfConfig::get('dm_core_asset'), 'lib/jquery-ui/js/ui.tabs.min.js'~~)).
	13	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.lib.ui-tabs'])).
12	14	dmJsMinifier::transform(
13		file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), ~~sfConfig::get('dm_core_asset'), 'js/dmCoreCodeArea.js'))~~.
14		file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), ~~sfConfig::get('dm_front_asset'), 'js/dmFrontCodeEditor.js'~~))
	15	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.core.codeArea'])).';'.
	16	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.front.codeEditor']))
15	17	);
16	18
17	19	$this->css = dmCssMinifier::transform(
18		file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), sfConfig::get('dm_front_asset'), 'css/codeEditor.css'))
	20	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['css.lib.ui-tabs'])).
	21	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['css.front.codeEditor']))
19	22	);
20	23

plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/templates/_launch.php

r22379	r22786
1	1	<?php
2	2
3		echo '<style type="text/css">'~~.$css.~~'</style>';
	3	echo '<style type="text/css">', $css, '</style>';
4	4
5	5	echo £o('div.dm_code_editor_wrap');

plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/actions/actions.class.php

r22584	r22786
55	55	}
56	56	}
	57
	58	$html = $this->renderEdit($form, $widgetType);
	59
	60	$js = '';
	61	$css = '';
	62
	63	if (strpos($html, 'dm_tabbed_form'))
	64	{
	65	$assetAliases = include($this->context->get('config_cache')->checkConfig('config/dm/assets.yml'));
	66
	67	$js .=
	68	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.lib.ui-tabs'])).
	69	dmJsMinifier::transform(
	70	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.core.tabForm']))
	71	);
	72
	73	$css .= file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['css.lib.ui-tabs']));
	74	}
	75
	76	if (strpos($html, 'dm_markdown'))
	77	{
	78	$assetAliases = include($this->context->get('config_cache')->checkConfig('config/dm/assets.yml'));
	79
	80	$js .=
	81	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.lib.ui-resizable'])).
	82	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.lib.markitup'])).
	83	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases['js.lib.markitupSet']))
	84	;
	85
	86	$stylesheetCompressor = $this->context->get('stylesheet_compressor');
	87
	88	foreach(array('css.lib.markitup', 'css.lib.markitupSet', 'css.lib.ui-resizable') as $cssKey)
	89	{
	90	$css .= $stylesheetCompressor->fixCssPaths(
	91	file_get_contents(dmOs::join(sfConfig::get('sf_web_dir'), $assetAliases[$cssKey])),
	92	$assetAliases[$cssKey]
	93	);
	94	}
	95
	96	$css = dmCssMinifier::transform($css);
	97	}
	98
	99	if ($css)
	100	{
	101	$html = '<style type="text/css">'.$css.'</style>' . $html;
	102	}
57	103
58	104	return $this->renderJson(array(
59	105	'type' => 'form',
60		'html' => $this->renderEdit($form, $widgetType)
	106	'html' => $html,
	107	'js' => $js
61	108	));
62	109	}
…	…
90	137	$codeEditorLinks = '<div class="code_editor_links">'.$codeEditorLinks.'</div>';
91	138	}
92
93		return
94		'<div class="dm dm_widget_edit {form_class: \''.$widgetType->getFullKey().'\'}">'.
	139
	140	return '<div class="dm dm_widget_edit {form_class: \''.$widgetType->getFullKey().'Form\'}">'.
95	141	$form->render('.dm_form.list.little').
96	142	$codeEditorLinks.

plugins/diemPlugin/trunk/dmFrontPlugin/web/css/form.css

r22094	r22786
67	67
68	68	.dm .dm_tabbed_form .ui-tabs-panel {
69		padding: 5px 0 0 0;
	69	padding: 5px 0 0 0 !important;
70	70	}
71	71

plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontEditCtrl.js

r21423	r22786
9	9
10	10	this.bars();
11
12		~~this.flashMessages();~~
13	11
14	12	this.liveEvents();

plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidgetForms.js

r21489	r22786
32	32	{
33	33	var self = this, $form = self.find('form:first'), $tabs = $form.find('div.dm_tabbed_form').dmCoreTabForm({});
34
35	34	self.dmWidgetContentMediaForm(widget);
36	35	},

	About Installation Documentation Plugins Community Blog Development

Development Changeset 22786
You must first sign up to be able to contribute.

r22128	r22786
38	38	}
39	39
40		protected function fixCssPaths($content, $path)
	40
	41
	42	public function fixCssPaths($content, $path)
41	43	{
42	44	if (preg_match_all("/url\(\s?[\'\|\"]?(.+)[\'\|\"]?\s?\)/ix", $content, $urlMatches))

Development

Navigation

Changeset 22786

Legend:

Download in other formats: