Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -r1422 -r1469
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1422)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1469)
@@ -38,7 +38,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
//Relations related:
- a_toolbar.AddButton( new ToolBarButton('new_block_style', '',
+ a_toolbar.AddButton( new ToolBarButton('new_selector', '',
function() {
set_hidden_field('remove_specials[selectors.block]',1);
std_new_item('selectors.block', 'in-commerce/stylesheets/block_style_edit')
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -r1422 -r1469
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1422)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1469)
@@ -37,7 +37,7 @@
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
- a_toolbar.AddButton( new ToolBarButton('new_base_style', '',
+ a_toolbar.AddButton( new ToolBarButton('new_selector', '',
function() {
set_hidden_field('remove_specials[selectors.base]',1);
std_new_item('selectors.base', 'in-commerce/stylesheets/base_style_edit')
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php
===================================================================
diff -u -r1422 -r1469
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1422)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 1469)
@@ -37,11 +37,22 @@
'Conditional' => false,
'HookToPrefix' => 'selectors',
'HookToSpecial' => '',
- 'HookToEvent' => Array('OnItemBuild','OnListBuild'),
+ 'HookToEvent' => Array('OnItemBuild'),
'DoPrefix' => '',
'DoSpecial' => '',
'DoEvent' => 'OnPrepareBaseStyles',
),
+
+ Array(
+ 'Mode' => hAFTER,
+ 'Conditional' => false,
+ 'HookToPrefix' => 'selectors',
+ 'HookToSpecial' => 'block',
+ 'HookToEvent' => Array('OnListBuild'),
+ 'DoPrefix' => '',
+ 'DoSpecial' => 'block',
+ 'DoEvent' => 'OnPrepareBaseStyles',
+ ),
),
'QueryString' => Array(
1 => 'id',
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php
===================================================================
diff -u -r1423 -r1469
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php (.../selectors_item.php) (revision 1423)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php (.../selectors_item.php) (revision 1469)
@@ -10,7 +10,7 @@
function CompileStyle()
{
$selector_data = $this->GetDBField('SelectorData');
- $ret = $this->GetDBField('Type') == STYLE_BASE ? '.' : '';
+ $ret = '';
$ret .= $this->GetDBField('SelectorName')." {\n";
foreach($selector_data as $property_name => $property_value)