Author: ornicar2
Date: 2010-02-04 02:27:06 +0100 (Thu, 04 Feb 2010)
New Revision: 27531
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/_form_pagination.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
plugins/diemPlugin/trunk/dmAdminPlugin/web/css/list.css
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
Log:
[Diem]
- more fixes for google chrome
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/_form_pagination.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/_form_pagination.php
2010-02-04 01:21:35 UTC (rev 27530)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/_form_pagination.php
2010-02-04 01:27:06 UTC (rev 27531)
@@ -4,7 +4,7 @@
{
if ($previousRecord = $nearRecords['prev'])
{
- echo _link($helper->getRouteArrayForAction('edit',
$previousRecord))->textTitle($previousRecord)->set('.previous.s16block.s16_previous');
+ echo _link($helper->getRouteArrayForAction('edit',
$previousRecord))->text('')->title($previousRecord)->set('.previous.s16block.s16_previous');
}
else
{
@@ -13,7 +13,7 @@
if ($nextRecord = $nearRecords['next'])
{
- echo _link($helper->getRouteArrayForAction('edit',
$nextRecord))->textTitle($nextRecord)->set('.next.s16block.s16_next');
+ echo _link($helper->getRouteArrayForAction('edit',
$nextRecord))->text('')->title($nextRecord)->set('.next.s16block.s16_next');
}
else
{
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
2010-02-04 01:21:35 UTC (rev 27530)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/link/dmAdminLinkTag.php
2010-02-04 01:27:06 UTC (rev 27531)
@@ -22,13 +22,6 @@
catch(Exception $e)
{
return '<a class="link">'.$e->getMessage().'</a>';
-// if (sfConfig::get('sf_debug'))
-// {
-// return $this
-// ->text('[EXCEPTION] '.$this->exception->getMessage())
-// ->param('dm_debug', 1)
-// ->title('Click me to see the exception details');
-// }
}
}
@@ -151,7 +144,7 @@
protected function renderText()
{
- if (empty($this->options['text']))
+ if (!isset($this->options['text']))
{
if(is_object($this->resource))
{
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-04 01:21:35 UTC (rev 27530)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-04 01:27:06 UTC (rev 27531)
@@ -2,11 +2,11 @@
echo _open('div#dm_tool_bar.clearfix.'.sfConfig::get('dm_toolBar_flavour',
'blue'));
- echo _link('dmAuth/signout')->textTitle($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
+ echo _link('dmAuth/signout')->text('')->title($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
if ($sf_user->can('clear_cache'))
{
- echo _link('dmCore/refresh')->textTitle(__('Update
project'))->set('.dm_refresh_link.widget16.s16block.s16_clear');
+ echo _link('dmCore/refresh')->text('')->title(__('Update
project'))->set('.dm_refresh_link.widget16.s16block.s16_clear');
}
echo _tag('div.dm_menu.widget16', $menu->render());
@@ -25,7 +25,7 @@
->text(sprintf('<span style="height: %dpx;"></span>',
round($apcLoad['percent'] * 0.21)));
}
- echo _link('app:front')->textTitle(__('Go to site'))->set('.widget16.ml10');
+ echo _link('app:front')->text(__('Go to site'))->set('.widget16.ml10');
if(sfConfig::get('dm_locks_enabled'))
{
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/css/list.css
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/css/list.css 2010-02-04
01:21:35 UTC (rev 27530)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/css/list.css 2010-02-04
01:27:06 UTC (rev 27531)
@@ -130,7 +130,8 @@
cursor: pointer;
}
-.dm_list_action_bar .sf_admin_actions {
+.dm_list_action_bar .sf_admin_actions input {
+ margin-right: 5px;
}
div.dm_list_global_actions {
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-02-04 01:21:35 UTC (rev 27530)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-02-04 01:27:06 UTC (rev 27531)
@@ -112,7 +112,11 @@
self.$.find('input.sf_admin_batch_checkbox,
input.sf_admin_list_batch_checkbox').change(function()
{
- self.$.find('div.sf_admin_actions > input').attr('disabled',
!self.$.find('input.sf_admin_batch_checkbox:checked').length);
+ // google chrome requires setTimeout
+ setTimeout(function()
+ {
+ self.$.find('div.sf_admin_actions > input').attr('disabled',
!self.$.find('input.sf_admin_batch_checkbox:checked').length);
+ }, 50);
});
self.$.find('select.dm_max_per_page').each(function()
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-04 01:21:35 UTC (rev 27530)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmInterface/templates/_toolBar.php
2010-02-04 01:27:06 UTC (rev 27531)
@@ -4,18 +4,18 @@
echo
_tag('a.show_tool_bar_toggle.s16block.s16_chevron_'.($sf_user->getShowToolBar()
? 'down' : 'up'), '+');
- echo _link('+/dmAuth/signout')->textTitle($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
+ echo _link('+/dmAuth/signout')->text('')->title($sf_user->getUsername().' :
'.__('Logout'))->set('.widget16.s16block.s16_signout');
- echo
_link('app:admin')->textTitle(__('Administration'))->set('.widget16.s16block.s16_home');
+ echo
_link('app:admin')->text('')->title(__('Administration'))->set('.widget16.s16block.s16_home');
if ($sf_user->can('clear_cache'))
{
- echo _link('+/dmCore/refresh')->textTitle(__('Clear
cache'))->set('.dm_refresh_link.widget16.s16block.s16_clear');
+ echo _link('+/dmCore/refresh')->text('')->title(__('Clear
cache'))->set('.dm_refresh_link.widget16.s16block.s16_clear');
}
if($sf_user->can('code_editor'))
{
- echo _link('+/dmCodeEditor/launch')->textTitle(__('Code
Editor'))->set('.code_editor.widget16.s16block.s16_code_editor');
+ echo _link('+/dmCodeEditor/launch')->text('')->title(__('Code
Editor'))->set('.code_editor.widget16.s16block.s16_code_editor');
}
if (isset($cultureSelect))
@@ -30,19 +30,17 @@
if ($sf_user->can('page_edit'))
{
- echo
_link('+/dmPage/edit')->set('a.page_edit_form.widget24.s24block.s24_page_edit')->textTitle(__('Edit
page'));
+ echo
_link('+/dmPage/edit')->set('a.page_edit_form.widget24.s24block.s24_page_edit')->text('')->title(__('Edit
page'));
}
if ($sf_user->can('page_add'))
{
- echo
_link('+/dmPage/new')->set('a.page_add_form.widget24.s24block.s24_page_add')->textTitle(__('Add
new page'));
+ echo
_link('+/dmPage/new')->set('a.page_add_form.widget24.s24block.s24_page_add')->text('')->title(__('Add
new page'));
}
if ($sf_user->can('zone_add, widget_add'))
{
- echo
_tag('a.edit_toggle.widget24.s24block.s24_view_'.($sf_user->getIsEditMode() ?
'on' : 'off'), array('title' => __('Show page structure')),
- __('Add')
- );
+ echo
_tag('a.edit_toggle.widget24.s24block.s24_view_'.($sf_user->getIsEditMode() ?
'on' : 'off'), array('title' => __('Show page structure')), '');
}
if($sf_user->can('widget_add'))
--
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.
