Author: Jonathan.Wage
Date: 2010-02-12 17:52:36 +0100 (Fri, 12 Feb 2010)
New Revision: 27958
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/_form_fieldset.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/admin.js
Log:
[1.4][sfSympalPlugin][1.0] Fix for specificity of admin generator candy
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/_form_fieldset.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/_form_fieldset.php
2010-02-12 16:51:54 UTC (rev 27957)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/data/generator/sfDoctrineModule/sympal_admin/template/templates/_form_fieldset.php
2010-02-12 16:52:36 UTC (rev 27958)
@@ -1,6 +1,6 @@
<fieldset id="sf_fieldset_[?php echo preg_replace('/[^a-z0-9_]/', '_',
strtolower($fieldset)) ?]">
[?php if ('NONE' != $fieldset): ?]
- <h2>[?php echo __($fieldset, array(), '<?php echo
$this->getI18nCatalogue() ?>') ?]</h2>
+ <h2 class="sf_fieldset_h2">[?php echo __($fieldset, array(), '<?php echo
$this->getI18nCatalogue() ?>') ?]</h2>
[?php endif; ?]
[?php foreach ($fields as $name => $field): ?]
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-02-12 16:51:54 UTC (rev 27957)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/templates/indexSuccess.php
2010-02-12 16:52:36 UTC (rev 27958)
@@ -13,7 +13,7 @@
<?php echo $form->renderHiddenFields() ?>
<?php foreach ($groups as $group): ?>
<fieldset id="sf_fieldset_config_<?php echo strtolower($group) ?>">
- <h2><?php echo ucwords(sfInflector::humanize(str_replace('-', '_',
preg_replace('/sfSympal(.*)Plugin/', '$1', $group)))) ?></h2>
+ <h2 class="sf_fieldset_h2"><?php echo
ucwords(sfInflector::humanize(str_replace('-', '_',
preg_replace('/sfSympal(.*)Plugin/', '$1', $group)))) ?></h2>
<?php echo $form->renderGroup($group) ?>
</fieldset>
<?php endforeach; ?>
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-02-12 16:51:54 UTC (rev 27957)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content/templates/edit_slotsSuccess.php
2010-02-12 16:52:36 UTC (rev 27958)
@@ -6,7 +6,7 @@
<?php foreach ($sf_sympal_content->getSlots() as $slot): ?>
<?php if (!$slot->is_column): ?>
<fieldset id="sf_fieldset_<?php echo $slot->getName() ?>">
- <h2><?php echo $slot ?></h2>
+ <h2 class="sf_fieldset_h2"><?php echo $slot ?></h2>
<div class="sf_admin_form_row">
<?php echo get_sympal_content_slot_editor($sf_sympal_content,
$slot) ?>
</div>
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
2010-02-12 16:51:54 UTC (rev 27957)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/css/default.css
2010-02-12 16:52:36 UTC (rev 27958)
@@ -212,7 +212,7 @@
color: #fff;
}
-#sf_admin_container fieldset h2
+#sf_admin_container fieldset h2.sf_fieldset_h2
{
text-shadow: #4E89D5 1px 1px 1px;
padding: 3px;
@@ -228,7 +228,7 @@
background: url(../images/expand.gif) no-repeat 10px 8px;
}
-#sf_admin_container fieldset h2:hover {
+#sf_admin_container fieldset h2.sf_fieldset_h2:hover {
text-shadow: #fff 0px 0px 3px;
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/admin.js
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/admin.js
2010-02-12 16:51:54 UTC (rev 27957)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/web/js/admin.js
2010-02-12 16:52:36 UTC (rev 27958)
@@ -3,7 +3,7 @@
{
$('.sf_admin_form input:text:visible:first').focus();
- $('.sf_admin_form fieldset h2').click(function() {
+ $('.sf_admin_form fieldset h2.sf_fieldset_h2').click(function() {
var name = $('.sf_admin_form').parent('div').attr('id');
var current = $.cookie($('.sf_admin_form').parent('div').attr('id'));
@@ -12,7 +12,7 @@
if (current && current !== clicked && $('#' + current).length)
{
- $('#' + current + ' h2').css('background-image', $('#' + current + '
h2').css('background-image').replace('collapse', 'expand'));
+ $('#' + current + ' h2.sf_fieldset_h2').css('background-image', $('#' +
current + ' h2.sf_fieldset_h2').css('background-image').replace('collapse',
'expand'));
$('#' + current + ' .sf_admin_form_row').slideUp('fast');
}
@@ -33,20 +33,20 @@
}
});
- if ($('.sf_admin_form fieldset h2').length)
+ if ($('.sf_admin_form fieldset h2.sf_fieldset_h2').length)
{
$('.sf_admin_form_row').hide();
var current = $.cookie($('.sf_admin_form').parent('div').attr('id'));
if (!current)
{
- current = $('.sf_admin_form fieldset
h2:first-child').parent('fieldset').attr('id');
+ current = $('.sf_admin_form fieldset
h2.sf_fieldset_h2:first-child').parent('fieldset').attr('id');
$.cookie($('.sf_admin_form').parent('div').attr('id'), current);
}
if (current && $('#' + current).length)
{
- $('#' + current + ' h2').css('background-image', $('#' + current + '
h2').css('background-image').replace('expand', 'collapse'));
+ $('#' + current + ' h2.sf_fieldset_h2').css('background-image', $('#' +
current + ' h2.sf_fieldset_h2').css('background-image').replace('expand',
'collapse'));
$('#' + current + ' .sf_admin_form_row').show();
}
}
--
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.
