[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12465] Add tooltip (title) to multiple values within
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12465] Add tooltip (title) to multiple values within listbox |
|
Date: |
Mon, 15 Dec 2014 16:29:34 +0000 |
Revision: 12465
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12465
Author: sigurdne
Date: 2014-12-15 16:29:34 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------
Add tooltip (title) to multiple values within listbox
Modified Paths:
--------------
trunk/admin/templates/base/custom.xsl
trunk/phpgwapi/inc/class.custom_fields.inc.php
trunk/phpgwapi/setup/setup.inc.php
trunk/phpgwapi/setup/tables_current.inc.php
trunk/phpgwapi/setup/tables_update.inc.php
trunk/property/templates/base/attributes_form.xsl
Modified: trunk/admin/templates/base/custom.xsl
===================================================================
--- trunk/admin/templates/base/custom.xsl 2014-12-15 15:32:09 UTC (rev
12464)
+++ trunk/admin/templates/base/custom.xsl 2014-12-15 16:29:34 UTC (rev
12465)
@@ -858,13 +858,16 @@
<td class="th_text" width="5%"
align="left">
<xsl:value-of
select="php:function('lang', 'id')" />
</td>
- <td class="th_text" width="85%"
align="left">
+ <td class="th_text" width="40%"
align="left">
<xsl:value-of
select="php:function('lang', 'value')" />
</td>
- <td class="th_text" width="85%"
align="left">
+ <td class="th_text" width="40%"
align="left">
+ <xsl:value-of
select="php:function('lang', 'title')" />
+ </td>
+ <td class="th_text" width="5%"
align="left">
<xsl:value-of
select="php:function('lang', 'order')" />
</td>
- <td class="th_text" width="15%"
align="center">
+ <td class="th_text" width="10%"
align="center">
<xsl:value-of
select="lang_delete_value"/>
</td>
</tr>
@@ -893,6 +896,13 @@
</xsl:attribute>
</input>
</td>
+ <td align="left">
+ <input type="textbox"
name="values[title_choice][{id}]" value="{title}" size='15'>
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'value')" />
+ </xsl:attribute>
+ </input>
+ </td>
<td align="center">
<input type="textbox"
name="values[order_choice][{id}]" value="{order}" size='4'>
<xsl:attribute
name="title">
@@ -901,7 +911,7 @@
</input>
</td>
<td align="center">
- <input type="checkbox"
name="values[delete_choice][]" value="{id}"
onMouseout="window.status='';return true;">
+ <input type="checkbox"
name="values[delete_choice][]" value="{id}">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of select="//lang_delete_choice_statustext"/>
Modified: trunk/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.custom_fields.inc.php 2014-12-15 15:32:09 UTC
(rev 12464)
+++ trunk/phpgwapi/inc/class.custom_fields.inc.php 2014-12-15 16:29:34 UTC
(rev 12465)
@@ -948,7 +948,8 @@
{
$choice_id = (int) $choice_id;
$value =
$this->_db->db_addslashes($value);
- $sql = "UPDATE phpgw_cust_choice SET
value = '{$value}'"
+ $title =
$this->_db->db_addslashes($attrib['title_choice'][$choice_id]);
+ $sql = "UPDATE phpgw_cust_choice SET
value = '{$value}', title ='{$title}'"
. " WHERE location_id =
{$location_id}"
. " AND attrib_id =
{$attrib_id}"
. " AND id =
{$choice_id}";
@@ -1763,6 +1764,7 @@
(
'id' => $this->_db->f('id'),
'value' => $this->_db->f('value', true),
+ 'title' => $this->_db->f('title', true),
'order' => $this->_db->f('choice_sort')
);
}
Modified: trunk/phpgwapi/setup/setup.inc.php
===================================================================
--- trunk/phpgwapi/setup/setup.inc.php 2014-12-15 15:32:09 UTC (rev 12464)
+++ trunk/phpgwapi/setup/setup.inc.php 2014-12-15 16:29:34 UTC (rev 12465)
@@ -12,7 +12,7 @@
// Basic information about this app
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'phpgwapi';
- $setup_info['phpgwapi']['version'] = '0.9.17.546';
+ $setup_info['phpgwapi']['version'] = '0.9.17.547';
$setup_info['phpgwapi']['versions']['current_header'] = '1.31';
$setup_info['phpgwapi']['versions']['system'] = '1.0';
$setup_info['phpgwapi']['enable'] = 3;
Modified: trunk/phpgwapi/setup/tables_current.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_current.inc.php 2014-12-15 15:32:09 UTC (rev
12464)
+++ trunk/phpgwapi/setup/tables_current.inc.php 2014-12-15 16:29:34 UTC (rev
12465)
@@ -615,6 +615,7 @@
'attrib_id' => array('type' =>
'int','precision' => 4,'nullable' => false),
'id' => array('type' => 'int','precision' =>
4,'nullable' => false),
'value' => array('type' => 'text','nullable' =>
false),
+ 'title' => array('type' => 'text','nullable' =>
true),
'choice_sort' => array('type' =>
'int','precision' => 4,'nullable' => false, 'default' => 0)
),
'pk' => array('location_id', 'attrib_id', 'id'),
Modified: trunk/phpgwapi/setup/tables_update.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_update.inc.php 2014-12-15 15:32:09 UTC (rev
12464)
+++ trunk/phpgwapi/setup/tables_update.inc.php 2014-12-15 16:29:34 UTC (rev
12465)
@@ -3254,4 +3254,27 @@
$GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.546';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
- }
\ No newline at end of file
+ }
+
+ $test[] = '0.9.17.546';
+ /**
+ * Add tooltip (title) to multiple values within listbox
+ *
+ * @return string the new version number
+ */
+ function phpgwapi_upgrade0_9_17_546()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_cust_choice','title',array(
+ 'type' => 'text',
+ 'nullable' => True
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.547';
+ return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ }
+ }
+
Modified: trunk/property/templates/base/attributes_form.xsl
===================================================================
--- trunk/property/templates/base/attributes_form.xsl 2014-12-15 15:32:09 UTC
(rev 12464)
+++ trunk/property/templates/base/attributes_form.xsl 2014-12-15 16:29:34 UTC
(rev 12465)
@@ -114,11 +114,17 @@
<xsl:choose>
<xsl:when test="checked='checked'">
<option value="{$id}" selected="selected">
+
<xsl:attribute name="title">
+
<xsl:value-of disable-output-escaping="yes"
select="title"/>
+
</xsl:attribute>
<xsl:value-of disable-output-escaping="yes"
select="value"/>
</option>
</xsl:when>
<xsl:otherwise>
<option value="{$id}">
+
<xsl:attribute name="title">
+
<xsl:value-of disable-output-escaping="yes"
select="title"/>
+
</xsl:attribute>
<xsl:value-of disable-output-escaping="yes"
select="value"/>
</option>
</xsl:otherwise>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12465] Add tooltip (title) to multiple values within listbox,
Sigurd Nes <=