[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12279] ie-fixes
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12279] ie-fixes |
|
Date: |
Mon, 10 Nov 2014 14:34:30 +0000 |
Revision: 12279
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12279
Author: sigurdne
Date: 2014-11-10 14:34:29 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
ie-fixes
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.uiadmin.inc.php
branches/dev-syncromind/property/templates/base/admin.xsl
branches/dev-syncromind/property/templates/base/admin_entity.xsl
branches/dev-syncromind/property/templates/base/admin_location.xsl
branches/dev-syncromind/property/templates/base/user_id_filter.xsl
Modified: branches/dev-syncromind/property/inc/class.uiadmin.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiadmin.inc.php 2014-11-07
22:43:04 UTC (rev 12278)
+++ branches/dev-syncromind/property/inc/class.uiadmin.inc.php 2014-11-10
14:34:29 UTC (rev 12279)
@@ -777,6 +777,7 @@
'lang_default_vendor_category_statustext'=> lang('Select default vendor
category'),
'lang_no_cat'
=> lang('No category'),
+ 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiadmin.contact_info')),
'lang_user_statustext'
=> lang('Select the user to edit email'),
'select_user_name'
=> 'user_id',
Modified: branches/dev-syncromind/property/templates/base/admin.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/admin.xsl 2014-11-07
22:43:04 UTC (rev 12278)
+++ branches/dev-syncromind/property/templates/base/admin.xsl 2014-11-10
14:34:29 UTC (rev 12279)
@@ -833,6 +833,10 @@
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit_id">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="90%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -843,10 +847,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<xsl:call-template name="id_table_header"/>
<xsl:apply-templates select="id_values"/>
<tr height="50">
@@ -861,7 +861,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable name="done_action">
@@ -914,11 +916,9 @@
<td>
<input type="hidden"
name="user_id" value="{value_user_id}"/>
<input type="hidden"
name="values[old_email]" value="{value_old_email}"/>
- <input type="text"
size="30" name="values[email]" value="{value_email}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
size="30" name="values[email]" value="{value_email}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_email_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -929,11 +929,9 @@
</td>
<td>
<input type="hidden"
name="values[old_phone]" value="{value_old_phone}"/>
- <input type="text"
size="30" name="values[phone]" value="{value_phone}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text"
size="30" name="values[phone]" value="{value_phone}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_phone_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -947,7 +945,7 @@
<xsl:variable
name="lang_approval_from_statustext">
<xsl:value-of
select="lang_approval_from_statustext"/>
</xsl:variable>
- <select
name="values[approval_from]" class="forms"
onMouseover="window.status='{$lang_approval_from_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[approval_from]" title="{$lang_approval_from_statustext}">
<option
value="">
<xsl:value-of select="lang_no_user"/>
</option>
@@ -964,7 +962,7 @@
<xsl:variable
name="lang_default_vendor_category_statustext">
<xsl:value-of
select="lang_default_vendor_category_statustext"/>
</xsl:variable>
- <select
name="values[default_vendor_category]" class="forms"
onMouseover="window.status='{$lang_default_vendor_category_statustext}'; return
true;" onMouseout="window.status='';return true;">
+ <select
name="values[default_vendor_category]"
title="{$lang_default_vendor_category_statustext}">
<option
value="">
<xsl:value-of select="lang_no_cat"/>
</option>
@@ -978,7 +976,7 @@
</td>
<td align="left">
<input type="hidden"
name="values[old_default_tts_category]"
value="{value_old_default_tts_category}"/>
- <select
name="values[default_tts_category]" class="forms"
title="{lang_default_tts_category_statustext}">
+ <select
name="values[default_tts_category]"
title="{lang_default_tts_category_statustext}">
<option
value="">
<xsl:value-of select="lang_no_cat"/>
</option>
@@ -1019,11 +1017,9 @@
<xsl:variable
name="lang_save">
<xsl:value-of
select="lang_save"/>
</xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_save_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1040,11 +1036,9 @@
<xsl:value-of
select="lang_done"/>
</xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_done_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</form>
Modified: branches/dev-syncromind/property/templates/base/admin_entity.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/admin_entity.xsl
2014-11-07 22:43:04 UTC (rev 12278)
+++ branches/dev-syncromind/property/templates/base/admin_entity.xsl
2014-11-10 14:34:29 UTC (rev 12279)
@@ -434,6 +434,10 @@
<!-- add / edit -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form name="form" method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -444,10 +448,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form name="form" method="post"
action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_entity"/>
@@ -910,7 +910,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -1269,6 +1271,11 @@
<!-- add attribute group / edit attribute group -->
<xsl:template match="edit_attrib_group" xmlns:php="http://php.net/xsl";>
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
+
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1279,10 +1286,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_entity"/>
@@ -1386,7 +1389,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -1413,6 +1418,11 @@
<!-- add attribute / edit attribute -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
+
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1423,10 +1433,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="php:function('lang', 'entity')"/>
@@ -1772,7 +1778,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -1950,6 +1958,10 @@
<!-- add custom_function / edit custom_function -->
<xsl:template match="edit_custom_function"
xmlns:php="http://php.net/xsl";>
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -1960,10 +1972,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td class="th_text"
align="left">
<xsl:value-of
select="lang_entity"/>
@@ -2081,7 +2089,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -2452,4 +2462,4 @@
</xsl:if>
<xsl:value-of disable-output-escaping="yes"
select="name"/>
</option>
- </xsl:template>
+ </xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/property/templates/base/admin_location.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/admin_location.xsl
2014-11-07 22:43:04 UTC (rev 12278)
+++ branches/dev-syncromind/property/templates/base/admin_location.xsl
2014-11-10 14:34:29 UTC (rev 12279)
@@ -245,6 +245,11 @@
<!-- edit_config -->
<xsl:template match="edit_config">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
+
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -255,10 +260,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<xsl:for-each select="location_list">
<tr>
<td class="th_text"
align="left">
@@ -298,7 +299,9 @@
</input>
</td>
</tr>
- </form>
+ </table>
+ </form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -359,6 +362,11 @@
<!-- add / edit -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+
+ <form method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -369,10 +377,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td valign="top">
<xsl:choose>
@@ -482,7 +486,9 @@
</input>
</td>
</tr>
+ </table>
</form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
@@ -658,6 +664,10 @@
<!-- add attribute / edit attribute -->
<xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
<div align="left">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form method="post" action="{$form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -668,10 +678,6 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" action="{$form_action}">
<tr>
<td valign="top">
<xsl:choose>
@@ -907,7 +913,9 @@
</input>
</td>
</tr>
- </form>
+ </table>
+ </form>
+ <table>
<tr>
<td>
<xsl:variable
name="done_action">
Modified: branches/dev-syncromind/property/templates/base/user_id_filter.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/user_id_filter.xsl
2014-11-07 22:43:04 UTC (rev 12278)
+++ branches/dev-syncromind/property/templates/base/user_id_filter.xsl
2014-11-10 14:34:29 UTC (rev 12279)
@@ -9,8 +9,7 @@
<xsl:variable name="lang_submit">
<xsl:value-of select="lang_submit"/>
</xsl:variable>
- <form method="post" action="{$select_action}">
- <select name="{$select_user_name}"
onChange="this.form.submit();" onMouseout="window.status='';return true;">
+ <select name="{$select_user_name}">
<xsl:attribute name="title">
<xsl:value-of
select="lang_user_statustext"/>
</xsl:attribute>
@@ -19,11 +18,16 @@
</option>
<xsl:apply-templates select="user_list"/>
</select>
- <noscript>
- <xsl:text> </xsl:text>
- <input type="submit" name="submit"
value="{$lang_submit}"/>
- </noscript>
- </form>
+ <script>
+ $(document).ready(function(){
+ $('select[name="<xsl:value-of
select="$select_user_name"/>"]').change( function( e ) {
+ var strURL = "<xsl:value-of
select="$select_action"/>";
+ user_id = $(this).val();
+ strURL += '&' + "<xsl:value-of
select="$select_user_name"/>=" + user_id;
+ window.location.replace(strURL);
+ });
+ });
+ </script>
</xsl:template>
<!-- New template-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12279] ie-fixes,
Sigurd Nes <=