[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11914] property: more on org_unit
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11914] property: more on org_unit |
Date: |
Wed, 23 Apr 2014 13:12:52 +0000 |
Revision: 11914
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11914
Author: sigurdne
Date: 2014-04-23 13:12:52 +0000 (Wed, 23 Apr 2014)
Log Message:
-----------
property: more on org_unit
Modified Paths:
--------------
trunk/frontend/inc/class.uientity.inc.php
trunk/frontend/templates/base/base.css
trunk/frontend/templates/base/entityview.xsl
trunk/property/js/yahoo/property.js
trunk/property/setup/phpgw_no.lang
Modified: trunk/frontend/inc/class.uientity.inc.php
===================================================================
--- trunk/frontend/inc/class.uientity.inc.php 2014-04-23 07:14:37 UTC (rev
11913)
+++ trunk/frontend/inc/class.uientity.inc.php 2014-04-23 13:12:52 UTC (rev
11914)
@@ -743,6 +743,24 @@
);
}
+ if($this->acl_add)
+ {
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name' =>
'add_tinybox',
+ 'text' =>
lang('add'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uientity.edit',
+ 'location_id' =>
$location_id,
+ 'lean'
=> true,
+ 'noframework' => true,
+ 'target'
=> '_tinybox',
+ )),
+ 'parameters'
=> array('parameter' => array(array('name'=> 'dummy','source' => 'id')))
+ );
+ }
+
$GLOBALS['phpgw']->js->validate_file('tinybox2',
'packed' , 'property');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
Modified: trunk/frontend/templates/base/base.css
===================================================================
--- trunk/frontend/templates/base/base.css 2014-04-23 07:14:37 UTC (rev
11913)
+++ trunk/frontend/templates/base/base.css 2014-04-23 13:12:52 UTC (rev
11914)
@@ -515,6 +515,8 @@
margin-left: 5px;
}
+div#paging {
+ margin-top: 40px;
+ }
-
Modified: trunk/frontend/templates/base/entityview.xsl
===================================================================
--- trunk/frontend/templates/base/entityview.xsl 2014-04-23 07:14:37 UTC
(rev 11913)
+++ trunk/frontend/templates/base/entityview.xsl 2014-04-23 13:12:52 UTC
(rev 11914)
@@ -35,7 +35,7 @@
refresh_entity = function(location_id, id)
{
- parent.location.reload(true)
+ parent.location.reload();
}
Modified: trunk/property/js/yahoo/property.js
===================================================================
--- trunk/property/js/yahoo/property.js 2014-04-23 07:14:37 UTC (rev 11913)
+++ trunk/property/js/yahoo/property.js 2014-04-23 13:12:52 UTC (rev 11914)
@@ -277,6 +277,17 @@
sUrl=html_entity_decode(sUrl);
window.open(sUrl,'_self');
}
+ if(values_ds.rights[i].my_name == 'add_tinybox')
+ {
+ //NEW is always the last options in arrays
RIGHTS
+ sUrl = values_ds.rights[i].action;
+ //Convert all HTML entities to their applicable
characters
+ sUrl=html_entity_decode(sUrl);
+ TINY.box.show({iframe:sUrl,
boxid:'frameless',width:750,height:550,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true,
+ close: true,
+ closejs:function(){parent.location.reload()}
+ });
+ }
}
}
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2014-04-23 07:14:37 UTC (rev 11913)
+++ trunk/property/setup/phpgw_no.lang 2014-04-23 13:12:52 UTC (rev 11914)
@@ -1271,6 +1271,8 @@
please enter a value for either material cost, labour cost or both !
property no angi enten material kostnader, arbeidskostnader eller
begge
please enter a workorder title ! property no Angi en
bestillings tittel
please enter either a budget or contrakt sum property no Angi
enten budsjett eller konstraktsum (eller begge)
+Please enter value for attribute %1 property no Angi verdi for
felt %1
+Please enter integer for attribute %1 property no Angi heltall
for felt %1
please enter precision as integer ! property no Angi heltall
for presisjon
please enter scale as integer ! property no Angi heltall
for skalering
please give som details ! property no Angi detaljer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11914] property: more on org_unit,
Sigurd Nes <=