[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.soentity.inc.php inc/class.u...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.soentity.inc.php inc/class.u... |
|
Date: |
Fri, 20 Oct 2006 08:10:26 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/20 08:10:26
Modified files:
inc : class.soentity.inc.php class.uientity.inc.php
setup : phpgw_en.lang phpgw_no.lang phpgw_no.lang_latin
templates/base : attributes_form.xsl help.tpl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soentity.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang_latin?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/attributes_form.xsl?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/help.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: inc/class.soentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- inc/class.soentity.inc.php 19 Oct 2006 21:39:09 -0000 1.25
+++ inc/class.soentity.inc.php 20 Oct 2006 08:10:26 -0000 1.26
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.soentity.inc.php,v 1.25 2006/10/19 21:39:09
sigurdne Exp $
+ * @version $Id: class.soentity.inc.php,v 1.26 2006/10/20 08:10:26
sigurdne Exp $
*/
/**
@@ -737,7 +737,8 @@
$this->db->query("SELECT helpmsg FROM
fm_entity_attribute WHERE entity_id ='$entity_id' AND cat_id ='$cat_id' AND id
= '$attrib_id'");
$this->db->next_record();
- $helpmsg =
str_replace("\n","<br>",stripslashes($this->db->f('helpmsg')));
+// $helpmsg =
str_replace("\n","<br>",stripslashes($this->db->f('helpmsg')));
+ $helpmsg = stripslashes($this->db->f('helpmsg'));
return $helpmsg;
}
}
Index: inc/class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- inc/class.uientity.inc.php 19 Oct 2006 21:39:09 -0000 1.34
+++ inc/class.uientity.inc.php 20 Oct 2006 08:10:26 -0000 1.35
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.uientity.inc.php,v 1.34 2006/10/19 21:39:09
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.35 2006/10/20 08:10:26
sigurdne Exp $
*/
/**
@@ -1064,8 +1064,9 @@
$t->set_file('help','help.tpl');
- $t->set_var('title',lang('Help') . '<br>' .
$entity_category['descr'] . ' - "' . $attrib_name);
+ $t->set_var('title',lang('Help') . '<br>' .
$entity_category['descr'] . ' - "' . $attrib_name . '"');
$t->set_var('help_msg',$help_msg );
+ $t->set_var('lang_close',lang('close') );
$GLOBALS['phpgw']->common->phpgw_header();
$t->pfp('out','help');
Index: setup/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_en.lang,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- setup/phpgw_en.lang 18 Oct 2006 09:11:44 -0000 1.9
+++ setup/phpgw_en.lang 20 Oct 2006 08:10:26 -0000 1.10
@@ -710,6 +710,7 @@
Group property en Group
grouping property en grouping
Groups property en Groups
+Help property en Help
Helpdesk property en Helpdesk
help message property en help message
Highest property en Highest
Index: setup/phpgw_no.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- setup/phpgw_no.lang 18 Oct 2006 09:11:44 -0000 1.19
+++ setup/phpgw_no.lang 20 Oct 2006 08:10:26 -0000 1.20
@@ -695,6 +695,7 @@
grouping property no Gruppering
groups property no Grupper
Groups property no Grupper
+Help property no Hjelp
helpdesk property no Meldinger
Helpdesk property no Meldinger
help message property no hjelpetekst
Index: setup/phpgw_no.lang_latin
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang_latin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/phpgw_no.lang_latin 18 Oct 2006 09:11:44 -0000 1.4
+++ setup/phpgw_no.lang_latin 20 Oct 2006 08:10:26 -0000 1.5
@@ -695,6 +695,7 @@
grouping property no Gruppering
groups property no Grupper
Groups property no Grupper
+Help property no Hjelp
helpdesk property no Meldinger
Helpdesk property no Meldinger
help message property no hjelpetekst
Index: templates/base/attributes_form.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/attributes_form.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- templates/base/attributes_form.xsl 18 Oct 2006 09:11:44 -0000 1.5
+++ templates/base/attributes_form.xsl 20 Oct 2006 08:10:26 -0000 1.6
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_form.xsl,v 1.5 2006/10/18 09:11:44 sigurdne Exp $ -->
+<!-- $Id: attributes_form.xsl,v 1.6 2006/10/20 08:10:26 sigurdne Exp $ -->
<xsl:template name="attributes_form">
<xsl:apply-templates select="attributes_values"/>
@@ -23,11 +23,12 @@
<td class="{class}" align="left" valign="top">
<xsl:value-of select="input_text"/>
-
<xsl:choose>
<xsl:when test="helpmsg=1">
<xsl:variable
name="help_url"><xsl:value-of select="//help_url"/>&attrib_id=<xsl:value-of
select="attrib_id"/></xsl:variable>
- <a
href="{$help_url}" target = "_blank"><xsl:text> [</xsl:text><xsl:value-of
select="//lang_help"/><xsl:text>]</xsl:text></a>
+ <xsl:variable
name="lang_help"><xsl:value-of select="//lang_help"/></xsl:variable>
+ <a href="javascript:var
w=window.open('{$help_url}','','width=550,height=400,scrollbars')">
+ <xsl:text>
[</xsl:text><xsl:value-of select="$lang_help"/><xsl:text>]</xsl:text></a>
</xsl:when>
</xsl:choose>
<xsl:choose>
Index: templates/base/help.tpl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/help.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/help.tpl 19 Oct 2006 21:39:09 -0000 1.1
+++ templates/base/help.tpl 20 Oct 2006 08:10:26 -0000 1.2
@@ -13,6 +13,7 @@
</td>
</tr>
</table>
+<p align="center"><a href="javascript:this.window.close()">{lang_close}</a></p>
</body>
</html>