Author: ornicar2
Date: 2010-01-26 15:05:02 +0100 (Tue, 26 Jan 2010)
New Revision: 27194
Added:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetNavigationMenu.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/css/widgetForm/
plugins/diemPlugin/trunk/dmFrontPlugin/web/css/widgetForm/menu.css
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetForms.js
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetNavigationMenuForm.js
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidgetForms.js
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/main.css
plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/menu/dmWidgetNavigationMenuForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
Log:
[Diem]
- hidden non-ready for production menu widget
- removed deprecated partials
- removed default project navigation stylesheet
- added partial, css and js form the menu widget form
- reordered front assets
- cleaned up dmWidgetListForm
- removed accessibility links from new projects default pageSuccess.php
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
2010-01-26 14:04:58 UTC (rev 27193)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/widget_types.yml
2010-01-26 14:05:02 UTC (rev 27194)
@@ -26,8 +26,8 @@
breadCrumb:
cache: true
- menu:
- cache: true
+# menu:
+# cache: true
dmWidgetSearch:
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/main.css
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/main.css
2010-01-26 14:04:58 UTC (rev 27193)
+++ plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/main.css
2010-01-26 14:05:02 UTC (rev 27194)
@@ -27,4 +27,8 @@
h4 {
font-size: 1.2em;
font-weight: bold;
+}
+
+.breadCrumb li, .pager li {
+ display: inline;
}
\ No newline at end of file
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
2010-01-26 14:04:58 UTC (rev 27193)
+++
plugins/diemPlugin/trunk/dmCorePlugin/data/skeleton/web/theme/css/navigation.css
2010-01-26 14:05:02 UTC (rev 27194)
@@ -1,9 +0,0 @@
-.breadCrumb li, .pager li {
- display: inline;
-}
-
-/* Hide accessibility links */
-.dm_access_links {
- position: absolute;
- left: -9000px;
-}
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml 2010-01-26
14:04:58 UTC (rev 27193)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/config/dm/assets.yml 2010-01-26
14:05:02 UTC (rev 27194)
@@ -12,7 +12,8 @@
area: page/dmArea
zone: page/dmZone
widget: page/dmWidget
- widgetForms: page/dmWidgetForms
+ widgetForms: widgetForm/dmWidgetForms
+ widgetMenuForm: widgetForm/dmWidgetNavigationMenuForm
pageEditForm: dmFrontPageEditForm
pageAddForm: dmFrontPageAddForm
ajaxPager: dmFrontAjaxPager
@@ -29,4 +30,5 @@
zone: zone
widget: widget
codeEditor: codeEditor
- pageEditForm: pageEditForm
\ No newline at end of file
+ pageEditForm: pageEditForm
+ widgetMenuForm: widgetForm/menu
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
2010-01-26 14:04:58 UTC (rev 27193)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/list/dmWidgetListForm.php
2010-01-26 14:05:02 UTC (rev 27194)
@@ -118,7 +118,7 @@
protected function renderContent($attributes)
{
- return
self::$serviceContainer->getService('helper')->renderPartial('dmWidget',
'forms/dmWidgetList', array('form' => $this));
+ return $this->getHelper()->renderPartial('dmWidget', 'forms/dmWidgetList',
array('form' => $this));
}
protected function getAvailableOrderFields()
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/menu/dmWidgetNavigationMenuForm.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/menu/dmWidgetNavigationMenuForm.php
2010-01-26 14:04:58 UTC (rev 27193)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/menu/dmWidgetNavigationMenuForm.php
2010-01-26 14:05:02 UTC (rev 27194)
@@ -5,7 +5,38 @@
public function configure()
{
+ if (!$this->getDefault('items'))
+ {
+ $this->setDefault('items', array());
+ }
+
parent::configure();
}
+ public function getStylesheets()
+ {
+ return array(
+ 'lib.ui-tabs',
+ 'front.widgetMenuForm'
+ );
+ }
+
+ public function getJavascripts()
+ {
+ return array(
+ 'lib.ui-tabs',
+ 'core.tabForm',
+ 'front.widgetMenuForm'
+ );
+ }
+
+ protected function renderContent($attributes)
+ {
+ return $this->getHelper()->renderPartial('dmWidget',
'forms/dmWidgetNavigationMenu', array(
+ 'form' => $this,
+ 'items' => $this->getValueOrDefault('items'),
+ 'baseTabId' => 'dm_widget_menu_'.$this->dmWidget->get('id')
+ ));
+ }
+
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
2010-01-26 14:04:58 UTC (rev 27193)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmFront/templates/pageSuccess.php
2010-01-26 14:05:02 UTC (rev 27194)
@@ -11,8 +11,6 @@
<div id="dm_page" class="<?php $isEditMode && print 'edit' ?>">
- <?php echo $helper->renderAccessLinks() ?>
-
<div class="layout">
<?php echo $helper->renderArea('top', '.clearfix') ?>
Added:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetNavigationMenu.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetNavigationMenu.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/templates/forms/dmWidgetNavigationMenu.php
2010-01-26 14:05:02 UTC (rev 27194)
@@ -0,0 +1,28 @@
+<?php
+
+echo
+
+$form->renderGlobalErrors(),
+
+£o('div.dm_tabbed_form'),
+
+£('ul.tabs',
+ £('li', £link('#'.$baseTabId.'_items')->text(__('Items'))).
+ £('li', £link('#'.$baseTabId.'_advanced')->text(__('Advanced')))
+),
+
+£('div#'.$baseTabId.'_items.drop_zone',
+ £('ol.items_list', array('json' => array(
+ 'items' => $items,
+ 'delete_message' => __('Remove this item')
+ )), '').
+ £('div.dm_help.no_margin', __('Drag & drop links here from the left PAGE
panel'))
+),
+
+£('div#'.$baseTabId.'_advanced',
+ £('ul.dm_form_elements',
+ $form['cssClass']->renderRow()
+ )
+),
+
+£c('div'); //div.dm_tabbed_form
\ No newline at end of file
Added: plugins/diemPlugin/trunk/dmFrontPlugin/web/css/widgetForm/menu.css
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/widgetForm/menu.css
(rev 0)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/css/widgetForm/menu.css
2010-01-26 14:05:02 UTC (rev 27194)
@@ -0,0 +1,64 @@
+div.dm_widget_navigation_menu_form .items_list {
+ min-height: 100px;
+ max-height: 250px;
+ overflow-y: auto;
+}
+
+div.dm_widget_navigation_menu_form .dm_help.no_margin {
+ margin-left: 0;
+}
+
+div.dm_widget_navigation_menu_form li.item_element {
+ padding: 3px;
+ border-bottom: 1px solid #D3D3D3;
+ height: 40px;
+ position: relative;
+}
+
+div.dm_widget_navigation_menu_form li.item_element .delete_item_element {
+ width: 9px;
+ height: 8px;
+ position: absolute;
+ top: 3px;
+ cursor: pointer;
+}
+
+div.dm_widget_navigation_menu_form li.item_element:hover {
+ background: #F0F4FC;
+}
+
+div.dm_widget_navigation_menu_form li.item_element img {
+ position: absolute;
+ top: 3px;
+ left: 0;
+ cursor: move;
+}
+
+div.dm_widget_navigation_menu_form li.item_element .wrap {
+ margin: 2px 0 2px 110px;
+}
+
+div.dm_widget_navigation_menu_form li.item_element label {
+ float: left;
+ width: 15%;
+}
+
+div.dm_widget_navigation_menu_form li.item_element input {
+ border: 1px solid #FFF;
+ background: none;
+ width: 78%
+}
+
+div.dm_widget_navigation_menu_form li.item_element input:hover,
+div.dm_widget_navigation_menu_form li.item_element input:active {
+ background: #FFF;
+}
+
+
+div.dm_widget_navigation_menu_form li.item_element input.droppable_active {
+ background: url(../../../dm/core/images/default_bg_yellow.png) repeat-x
scroll 50% 50%;
+}
+
+div.dm_widget_navigation_menu_form li.item_element input.droppable_hover {
+ background: url(../../../dm/core/images/default_bg_green.png) repeat-x
scroll 50% 50%;
+}
\ No newline at end of file
Deleted: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidgetForms.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidgetForms.js
2010-01-26 14:04:58 UTC (rev 27193)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidgetForms.js
2010-01-26 14:05:02 UTC (rev 27194)
@@ -1,53 +0,0 @@
-(function($) {
-
-$.fn.extend({
-
- dmWidgetContentBaseMediaForm: function(widget, droppableOptions)
- {
- var self = this,
- $form = self.find('form:first'),
- formName = self.metadata().form_name;
-
- $form.append('<input type="hidden" name="'+formName+'[widget_width]"
value="'+widget.element.width()+'" />');
-
- $('input.dm_media_receiver', $form).droppable($.extend({
- accept: '#dm_media_bar li.file',
- activeClass: 'droppable_active',
- hoverClass: 'droppable_hover',
- tolerance: 'touch',
- drop: function(event, ui) {
- $('input.dm_media_id',
$form).val(ui.draggable.attr('id').replace(/dmm/, ''));
- $form.submit();
- }
- }, droppableOptions || {}));
-
- $('a.show_media_fields', $form).click(function() {
- $('ul.media_fields', $form).toggle();
- });
- },
-
- dmWidgetContentImageForm: function(widget)
- {
- var $form = this.find('form:first');
-
- this.dmWidgetContentBaseMediaForm(widget, {
- accept: '#dm_media_bar li.file.image'
- });
-
- $('select.dm_media_method', $form).bind('change', function() {
- $('li.background', $form)[$(this).val() == 'fit' ? 'show' : 'hide']();
- }).trigger('change');
- },
-
- dmWidgetContentTextForm: function(widget)
- {
- var $form = this.find('form:first');
-
- $form.find('div.dm_tabbed_form').dmCoreTabForm({});
-
- this.dmWidgetContentImageForm(widget);
- }
-
-});
-
-})(jQuery);
\ No newline at end of file
Added: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetForms.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetForms.js
(rev 0)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetForms.js
2010-01-26 14:05:02 UTC (rev 27194)
@@ -0,0 +1,53 @@
+(function($) {
+
+$.fn.extend({
+
+ dmWidgetContentBaseMediaForm: function(widget, droppableOptions)
+ {
+ var self = this,
+ $form = self.find('form:first'),
+ formName = self.metadata().form_name;
+
+ $form.append('<input type="hidden" name="'+formName+'[widget_width]"
value="'+widget.element.width()+'" />');
+
+ $('input.dm_media_receiver', $form).droppable($.extend({
+ accept: '#dm_media_bar li.file',
+ activeClass: 'droppable_active',
+ hoverClass: 'droppable_hover',
+ tolerance: 'touch',
+ drop: function(event, ui) {
+ $('input.dm_media_id',
$form).val(ui.draggable.attr('id').replace(/dmm/, ''));
+ $form.submit();
+ }
+ }, droppableOptions || {}));
+
+ $('a.show_media_fields', $form).click(function() {
+ $('ul.media_fields', $form).toggle();
+ });
+ },
+
+ dmWidgetContentImageForm: function(widget)
+ {
+ var $form = this.find('form:first');
+
+ this.dmWidgetContentBaseMediaForm(widget, {
+ accept: '#dm_media_bar li.file.image'
+ });
+
+ $('select.dm_media_method', $form).bind('change', function() {
+ $('li.background', $form)[$(this).val() == 'fit' ? 'show' : 'hide']();
+ }).trigger('change');
+ },
+
+ dmWidgetContentTextForm: function(widget)
+ {
+ var $form = this.find('form:first');
+
+ $form.find('div.dm_tabbed_form').dmCoreTabForm({});
+
+ this.dmWidgetContentImageForm(widget);
+ }
+
+});
+
+})(jQuery);
\ No newline at end of file
Property changes on:
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetForms.js
___________________________________________________________________
Added: svn:executable
+ *
Added:
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetNavigationMenuForm.js
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetNavigationMenuForm.js
(rev 0)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/widgetForm/dmWidgetNavigationMenuForm.js
2010-01-26 14:05:02 UTC (rev 27194)
@@ -0,0 +1,74 @@
+$.fn.extend({
+
+ dmWidgetNavigationMenuForm: function(widget)
+ {
+ var self = this,
+
+ formName = self.metadata().form_name,
+
+ $form = self.find('form:first'),
+
+ $tabs = $form.find('div.dm_tabbed_form').dmCoreTabForm(),
+
+ $items = $form.find('.items_list'),
+
+ deleteMessage = $items.metadata().delete_message,
+
+ createItemElement = function(item)
+ {
+ item = $.extend({
+ position: 0,
+ link: '',
+ text: ''
+ }, item);
+
+ var $li = $('<li class="item_element">')
+ .html(' \
+<input class="id" type="hidden" name="'+formName+'[link][]"
value="'+item.link+'" /> \
+<input class="position" type="hidden" name="'+formName+'[item_position][]"
value="'+item.position+'" /> \
+<div class="item_text">'+item.text+'</div> \
+<img src="'+$.dm.ctrl.options.dm_core_asset_root+'images/cross-small.png"
class="delete_item_element" title="'+deleteMessage+'" />'
+ )
+ .block();
+
+ $items.append($li);
+
+ self.dmFrontForm('linkDroppable');
+
+ if ($items.hasClass('ui-sortable'))
+ {
+ $items.sortable('refresh').trigger('resort');
+ }
+ };
+
+ $.each($items.metadata().items, function() {
+ createMediaElement(this);
+ });
+
+ $items.droppable({
+ accept: '#dm_page_bar li',
+ activeClass: 'droppable_active',
+ hoverClass: 'droppable_hover',
+ tolerance: 'touch',
+ drop: function(event, ui)
+ {
+ createItemElement({link:
'page:'+ui.draggable.attr('id').replace(/dmp/, '')});
+
+ $items.attr('scrollTop', 999999);
+ }
+ }).sortable({
+ opacity: 0.5,
+ distance: 5,
+ revert: false,
+ scroll: true,
+ tolerance: 'pointer',
+ stop: function(e, ui) {
+ $(this).trigger('resort');
+ }
+ }).bind('resort', function() {
+ $('li.item_element', $items).each(function(index) {
+ $('input.position', $(this)).val(index);
+ });
+ });
+ }
+});
\ No newline at end of file
--
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.
