Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -r1512 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1512) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1532) @@ -100,7 +100,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -r1512 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1512) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1532) @@ -92,7 +92,7 @@ - + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -r1421 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1421) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1532) @@ -41,9 +41,16 @@ submit_event('css','OnMassDecline'); } ) ); - + a_toolbar.AddButton( new ToolBarSeparator('sep2') ); + a_toolbar.AddButton( new ToolBarButton('clone', '', function() { + submit_event('css','OnMassClone'); + } + ) ); + + a_toolbar.AddButton( new ToolBarSeparator('sep3') ); + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); } @@ -57,12 +64,12 @@ - + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl =================================================================== diff -u -r1491 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 1491) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 1532) @@ -93,10 +93,13 @@ + + + @@ -122,6 +125,16 @@ + + + + + + + + + +
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -r1487 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1487) +++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1532) @@ -23,6 +23,46 @@ } /** + * Enter description here... + * + * @param kEvent $event + */ + function OnBeforeItemUpdate(&$event) + { + $this->SerializeSelectorData($event); + } + + /** + * Enter description here... + * + * @param kEvent $event + */ + function OnBeforeItemCreate(&$event) + { + $this->SerializeSelectorData($event); + } + + /** + * Enter description here... + * + * @param kEvent $event + */ + function OnAfterItemUpdate(&$event) + { + $this->UnserializeSelectorData($event); + } + + /** + * Enter description here... + * + * @param kEvent $event + */ + function OnAfterItemCreate(&$event) + { + $this->UnserializeSelectorData($event); + } + + /** * Get's special of main item for linking with subitem * * @param kEvent $event @@ -120,7 +160,7 @@ * * @param kEvent $event */ - function OnSerializeSelectorData(&$event) + function SerializeSelectorData(&$event) { $object =& $event->getObject(); $selector_data = $object->GetDBField('SelectorData'); @@ -138,7 +178,7 @@ * * @param kEvent $event */ - function OnUnserializeSelectorData(&$event) + function UnserializeSelectorData(&$event) { $object =& $event->getObject(); $selector_data = $object->GetDBField('SelectorData'); Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php =================================================================== diff -u -r1487 -r1532 --- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1487) +++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1532) @@ -15,28 +15,6 @@ 'Conditional' => false, 'HookToPrefix' => 'selectors', 'HookToSpecial' => '', - 'HookToEvent' => Array('OnBeforeItemUpdate','OnBeforeItemCreate'), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnSerializeSelectorData', - ), - - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'selectors', - 'HookToSpecial' => '', - 'HookToEvent' => Array('OnAfterItemUpdate','OnAfterItemCreate'), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnUnserializeSelectorData', - ), - - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'selectors', - 'HookToSpecial' => '', 'HookToEvent' => Array('OnItemBuild'), 'DoPrefix' => '', 'DoSpecial' => '', @@ -54,6 +32,18 @@ 'DoEvent' => 'OnPrepareBaseStyles', ), ), + + 'MyHooks' => Array( + Array( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => Array('Prefix1.*', 'Prefix2.Special1'), + 'HookToEvents' => Array('OnBeforeItemUpdate', 'OnBeforeItemCreate'), + 'DoPrefix' => Array('Prefix1.*', 'Prefix2.Special1'), + 'DoEvent' => 'OnMyEvent', + ), + ), + 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -100,13 +90,20 @@ 'VirtualFields' => Array( 'FontStyle' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','normal'=>'normal','italic'=>'italic','oblique'=>'oblique'), 'default'=>'' ), 'FontWeight' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','100'=>'100','200'=>'200','300'=>'300','normal'=>'normal','500'=>'500','600'=>'600','bold'=>'bold','800'=>'800','900'=>'900','lighter'=>'lighter','bolder'=>'bolder') ), + 'StyleCursor' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','default'=>'default','auto'=>'auto','n-resize'=>'n-resize','ne-resize'=>'ne-resize','e-resize'=>'e-resize','se-resize'=>'se-resize','s-resize'=>'s-resize','sw-resize'=>'sw-resize','w-resize'=>'w-resize','nw-resize'=>'nw-resize','crosshair'=>'crosshair','pointer'=>'pointer','move'=>'move','text'=>'text','wait'=>'wait','help'=>'help','hand'=>'hand','all-scroll'=>'all-scroll','col-resize'=>'col-resize','row-resize'=>'row-resize','no-drop'=>'no-drop','not-allowed'=>'not-allowed','progress'=>'progress','vertical-text'=>'vertical-text','alias'=>'alias','cell'=>'cell','copy'=>'copy','count-down'=>'count-down','count-up'=>'count-up','count-up-down'=>'count-up-down','grab'=>'grab','grabbing'=>'grabbing','spinning'=>'spinning') ), + 'StyleDisplay' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','inline'=>'inline','block'=>'block','inline-block'=>'inline-block','list-item'=>'list-item','marker'=>'marker','compact'=>'compact','run-in'=>'run-in','table-header-group'=>'table-header-group','table-footer-group'=>'table-footer-group','table'=>'table','inline-table'=>'inline-table','table-caption'=>'table-caption','table-row'=>'table-row','table-row-group'=>'table-row-group','table-column'=>'table-column','table-column-group'=>'table-column-group') ), + 'TextAlign' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','left'=>'left','right'=>'right','center'=>'center','justify'=>'justify') ), + 'TextDecoration' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','none'=>'none','underline'=>'underline','overline'=>'overline','line-through'=>'line-through','blink'=>'blink') ), + 'StyleVisibility' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','visible'=>'visible','hidden'=>'hidden','collapse'=>'collapse') ), + 'StylePosition' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array(''=>'','inherit'=>'inherit','static'=>'static','relative'=>'relative','absolute'=>'absolute','fixed'=>'fixed') ), ), 'Grids' => Array( 'Default' => Array( 'Icons' => Array('default'=>'icon16_selector.gif'), 'Fields' => Array( 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td'), + 'SelectorName' => Array( 'title'=>'la_col_SelectorName'), 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td' ), ), ),