Author: ornicar2
Date: 2010-01-29 11:45:35 +0100 (Fri, 29 Jan 2010)
New Revision: 27298
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmSearchEngine/templates/indexSuccess.php
plugins/diemPlugin/trunk/dmAdminPlugin/web/css/bars.css
plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
plugins/diemPlugin/trunk/dmCorePlugin/modules/dmCore/lib/BasedmCoreActions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmMenuPlugin/lib/dmMenu.php
Log:
[Diem]
- fixed first ajax ping when user just logged ing
- fixed possible issue in dmMenu
- made ajax ping server action faster when user is alone
- minor CSS improvements
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmSearchEngine/templates/indexSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmSearchEngine/templates/indexSuccess.php
2010-01-29 09:51:33 UTC (rev 27297)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmSearchEngine/templates/indexSuccess.php
2010-01-29 10:45:35 UTC (rev 27298)
@@ -10,7 +10,7 @@
£('div.dm_third',
£('h2.mb10', __('Search')).
$form->open('method=get').
- $form['query']->label()->field()->error().
+ $form['query']->label(null, '.mr10')->field()->error().
$form->submit(__('Search')).
$form->close()
).
@@ -20,7 +20,7 @@
).
£('div.dm_third',
£('h2.mb10', __('Index maintenance')).
- £link('dmSearchEngine/reload')->text(__('Reload index'))
+ £link('dmSearchEngine/reload')->text(__('Reload
index'))->set('.dm_medium_button')
)
);
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/css/bars.css
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/css/bars.css 2010-01-29
09:51:33 UTC (rev 27297)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/css/bars.css 2010-01-29
10:45:35 UTC (rev 27298)
@@ -146,7 +146,7 @@
background: #FFFFFF;
color: #000000;
float: left;
- margin-top: 5px;
+ margin-top: 4px;
margin-left: 5px;
opacity: 0.7;
padding: 2px 5px;
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css 2010-01-29
09:51:33 UTC (rev 27297)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/css/main.css 2010-01-29
10:45:35 UTC (rev 27298)
@@ -103,8 +103,8 @@
background-image: url(../../core/images/default_bg.png);
}
-.dm_big_button {
- padding: 20px;
+.dm_big_button,
+.dm_medium_button {
background: url(../../core/images/default_bg.png) center left repeat-x;
font-size: 13px;
border: 1px solid #D3D3D3;
@@ -113,8 +113,16 @@
-webkit-border-radius: 40px;
color: #046BCA;
}
+.dm_big_button {
+ padding: 20px;
+}
-.dm_big_button:hover {
+.dm_medium_button {
+ padding: 5px 20px;
+}
+
+.dm_big_button:hover,
+.dm_medium_button:hover{
text-decoration: none;
background: url(../../core/images/default_bg_green.png) center left repeat-x;
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-01-29 09:51:33 UTC (rev 27297)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-01-29 10:45:35 UTC (rev 27298)
@@ -70,12 +70,10 @@
{
$lock = $this->findOneByData($data);
- if(!$lock)
+ if($lock = $this->findOneByData($data))
{
- throw new dmException('No lock for '.implode(', ', $data));
+ $lock->merge($data)->save();
}
-
- $lock->merge($data)->save();
$this->removeOldLocks();
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/modules/dmCore/lib/BasedmCoreActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/modules/dmCore/lib/BasedmCoreActions.class.php
2010-01-29 09:51:33 UTC (rev 27297)
+++
plugins/diemPlugin/trunk/dmCorePlugin/modules/dmCore/lib/BasedmCoreActions.class.php
2010-01-29 10:45:35 UTC (rev 27298)
@@ -20,17 +20,25 @@
dmDb::table('DmLock')->ping($data);
$users = dmDb::table('DmLock')->getUserNames();
- $locks = $recordId ? dmDb::table('DmLock')->getLocks($data) : array();
- if(!empty($locks))
+ if($recordId && count($users) > 1)
{
- foreach($locks as $index => $lock)
+ $locks = $recordId ? dmDb::table('DmLock')->getLocks($data) : array();
+
+ if(!empty($locks))
{
- $locks[$index] = $this->getService('i18n')->__('%user% is browsing
this page, you should not modify it now.', array(
- '%user%' => '<strong>'.$lock.'</strong>'
- ));
+ foreach($locks as $index => $lock)
+ {
+ $locks[$index] = $this->getService('i18n')->__('%user% is browsing
this page, you should not modify it now.', array(
+ '%user%' => '<strong>'.$lock.'</strong>'
+ ));
+ }
}
}
+ else
+ {
+ $locks = array();
+ }
return $this->renderJson(array(
'users' => implode('|', $users),
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmMenuPlugin/lib/dmMenu.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmMenuPlugin/lib/dmMenu.php
2010-01-29 09:51:33 UTC (rev 27297)
+++ plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmMenuPlugin/lib/dmMenu.php
2010-01-29 10:45:35 UTC (rev 27298)
@@ -201,12 +201,12 @@
public function getFirstChild()
{
- return current($this->children);
+ return dmArray::first($this->children);
}
public function getLastChild()
{
- return end($this->children);
+ return dmArray::last($this->children);
}
public function getChild($name)
--
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.
