Author: ornicar2
Date: 2010-02-03 22:36:40 +0100 (Wed, 03 Feb 2010)
New Revision: 27516
Removed:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/config/view.yml
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/map/
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/mousewheel/
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/actions/actions.class.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/templates/indexSuccess.php
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
Log:
[Diem]
- removed jQuery map and jQuery mousewheel
- fixed admin dependency injection diagrams
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/actions/actions.class.php
2010-02-03 21:35:14 UTC (rev 27515)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/actions/actions.class.php
2010-02-03 21:36:40 UTC (rev 27516)
@@ -12,7 +12,7 @@
try
{
- foreach(array('admin'/*, 'front'*/) as $appName)
+ foreach(array('admin', 'front') as $appName)
{
$this->dicImages[$appName] = $this->getDiagramImage($appName);
}
@@ -96,7 +96,7 @@
'concentrate' => 'false',
'bgcolor' => 'transparent',
'ratio' => 'fill',
- 'size' => '10,4'
+ 'size' => '20,8'
),
'node' => array('fontsize' => 20, 'fontname' => 'Arial', 'shape' =>
'Mrecord'),
'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' =>
'grey', 'arrowhead' => 'open', 'arrowsize' => 1),
Deleted:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/config/view.yml
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/config/view.yml
2010-02-03 21:35:14 UTC (rev 27515)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/config/view.yml
2010-02-03 21:36:40 UTC (rev 27516)
@@ -1,3 +0,0 @@
-indexSuccess:
-
- javascripts: [ lib.mousewheel, lib.map, admin.diagram ]
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/templates/indexSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/templates/indexSuccess.php
2010-02-03 21:35:14 UTC (rev 27515)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmDiagram/templates/indexSuccess.php
2010-02-03 21:36:40 UTC (rev 27516)
@@ -7,36 +7,21 @@
</style>
<?php
-$jQueryMap = false;
-
foreach($dicImages as $appName => $image)
{
if (!$image) continue;
- if($jQueryMap)
- {
- echo _tag('div.dm_box.big.diagram',
- _tag('div.title',
- _tag('h2', dmString::camelize($appName).' : Dependency Injection
Container'._link($image)->text('Download'))).
- _tag('div.dm_box_inner',
- ($withDispatcherLinks
- ? _tag('p.s16.s16_info',
_link('+/dmDiagram/index?with_dispatcher_links=0')->text('Hide dispatcher
dependencies'))
- : _tag('p.s16.s16_info', 'As nearly all modules have a reference to
dispatcher, these dependencies are hidden.
'._link('+/dmDiagram/index?with_dispatcher_links=1')->text('Click here to see
them'))
- ).
- _tag('div.viewport',
- _tag('div.toplevel height=300px').
- _tag('div', array('width' => _media($image)->getWidth(), 'height' =>
_media($image)->getHeight()),
- _media($image).
- _tag('div.mapcontent')
- )
- )
- )
- );
- }
- else
- {
- echo _media($image);
- }
+ echo _tag('div.dm_box.big.diagram',
+ _tag('div.title',
+ _tag('h2', dmString::camelize($appName).' : Dependency Injection
Container'._link($image)->text('Download'))).
+ _tag('div.dm_box_inner',
+ ($withDispatcherLinks
+ ? _tag('p.s16.s16_info',
_link('+/dmDiagram/index?with_dispatcher_links=0')->text('Hide dispatcher
dependencies'))
+ : _tag('p.s16.s16_info', 'As nearly all modules have a reference to
dispatcher, these dependencies are hidden.
'._link('+/dmDiagram/index?with_dispatcher_links=1')->text('Click here to see
them'))
+ ).
+ _media($image)
+ )
+ );
}
if (!empty($mldProjectImage))
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-02-03
21:35:14 UTC (rev 27515)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-02-03
21:36:40 UTC (rev 27516)
@@ -49,8 +49,6 @@
tree-component: jsTree/source/tree_component.min
tree-css: jsTree/source/css
fieldSelection: jquery-fieldselection/jquery-fieldselection
- map: map/jquery.map
- mousewheel: mousewheel/jquery.mousewheel
css:
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.