|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16944] booking: preselected filters |
| Date: | Wed, 2 Aug 2017 07:15:29 -0400 (EDT) |
Revision: 16944
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16944
Author: sigurdne
Date: 2017-08-02 07:15:29 -0400 (Wed, 02 Aug 2017)
Log Message:
-----------
booking: preselected filters
Modified Paths:
--------------
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/inc/class.uidashboard.inc.php
trunk/booking/inc/class.uisystem_message.inc.php
trunk/booking/templates/base/application_edit.xsl
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/rental/templates/base/rental_schedule.xsl
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2017-08-02 09:06:56 UTC
(rev 16943)
+++ trunk/booking/inc/class.uiapplication.inc.php 2017-08-02 11:15:29 UTC
(rev 16944)
@@ -271,7 +271,8 @@
),
array(
'id' => 'NEW',
-
'name' => lang('NEW')
+
'name' => lang('NEW'),
+
'selected' => 1
),
array(
'id' => 'PENDING',
Modified: trunk/booking/inc/class.uidashboard.inc.php
===================================================================
--- trunk/booking/inc/class.uidashboard.inc.php 2017-08-02 09:06:56 UTC (rev
16943)
+++ trunk/booking/inc/class.uidashboard.inc.php 2017-08-02 11:15:29 UTC (rev
16944)
@@ -92,7 +92,8 @@
'list' => array(
array(
'id' => '',
-
'name' => lang('All')
+
'name' => lang('All'),
+
'selected' => 1
),
array(
'id' => 'NEW',
Modified: trunk/booking/inc/class.uisystem_message.inc.php
===================================================================
--- trunk/booking/inc/class.uisystem_message.inc.php 2017-08-02 09:06:56 UTC
(rev 16943)
+++ trunk/booking/inc/class.uisystem_message.inc.php 2017-08-02 11:15:29 UTC
(rev 16944)
@@ -55,7 +55,8 @@
),
array(
'id' => 'NEW',
-
'name' => lang('NEW')
+
'name' => lang('NEW'),
+
'selected' => 1
),
array(
'id' => 'CLOSED',
Modified: trunk/booking/templates/base/application_edit.xsl
===================================================================
--- trunk/booking/templates/base/application_edit.xsl 2017-08-02 09:06:56 UTC
(rev 16943)
+++ trunk/booking/templates/base/application_edit.xsl 2017-08-02 11:15:29 UTC
(rev 16944)
@@ -76,7 +76,7 @@
</div>
<div
class="pure-control-group">
<label
for="field_description">
-
<xsl:value-of select="php:function('lang', 'Description')" />
+
<xsl:value-of select="php:function('lang', 'Information about the event')" />
</label>
<xsl:if
test="config/application_description">
<p>
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-08-02 09:06:56 UTC
(rev 16943)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2017-08-02 11:15:29 UTC
(rev 16944)
@@ -228,48 +228,39 @@
</script>
</xsl:when>
<xsl:when
test="type = 'filter'">
-
<xsl:variable name="name">
-
<xsl:value-of select="name"/>
-
</xsl:variable>
-
<script type="text/javascript">
-
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of
select="$name"/>';
-
</script>
-
<select id="{$name}" name="{$name}" class="pure-u-24-24">
-
<xsl:attribute name="title">
-
<xsl:value-of select="phpgw:conditional(not(text), '',
text)"/>
-
</xsl:attribute>
-
<xsl:for-each select="list">
-
<xsl:variable name="id">
-
<xsl:value-of select="id"/>
-
</xsl:variable>
-
<xsl:choose>
-
<xsl:when test="id = 'NEW'">
-
<option value="{$id}" selected="selected">
-
<xsl:value-of select="name"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:choose>
-
<xsl:when test="selected = 'selected'">
-
<option value="{$id}"
selected="selected">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:when>
-
<xsl:when test="selected = '1'">
-
<option value="{$id}"
selected="selected">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$id}">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:for-each>
-
</select>
+
<xsl:variable name="name">
+
<xsl:value-of select="name"/>
+
</xsl:variable>
+ <script
type="text/javascript">
+
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of
select="$name"/>';
+
</script>
+ <select
id="{$name}" name="{$name}" class="pure-u-24-24">
+
<xsl:attribute name="title">
+
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
+
</xsl:attribute>
+
<xsl:for-each select="list">
+
<xsl:variable name="id">
+
<xsl:value-of select="id"/>
+
</xsl:variable>
+
<xsl:choose>
+
<xsl:when test="selected = 'selected'">
+
<option value="{$id}" selected="selected">
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:when test="selected = '1'">
+
<option value="{$id}" selected="selected">
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{$id}">
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:for-each>
+
</select>
</xsl:when>
<xsl:when
test="type = 'link'">
<label>
Modified: trunk/rental/templates/base/rental_schedule.xsl
===================================================================
--- trunk/rental/templates/base/rental_schedule.xsl 2017-08-02 09:06:56 UTC
(rev 16943)
+++ trunk/rental/templates/base/rental_schedule.xsl 2017-08-02 11:15:29 UTC
(rev 16944)
@@ -50,7 +50,7 @@
<thead>
<tr>
<th>Name</th>
- <th>!item</th>
+ <th>item</th>
</tr>
</thead>
<tbody>
@@ -71,29 +71,20 @@
<xsl:value-of select="id"/>
</xsl:variable>
<xsl:choose>
-
<xsl:when test="id = 'NEW'">
+
<xsl:when test="selected = 'selected'">
<option value="{$id}"
selected="selected">
<xsl:value-of select="name"/>
</option>
</xsl:when>
+
<xsl:when test="selected = '1'">
+
<option value="{$id}"
selected="selected">
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:when>
<xsl:otherwise>
-
<xsl:choose>
-
<xsl:when test="selected =
'selected'">
-
<option value="{$id}"
selected="selected">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:when>
-
<xsl:when test="selected = '1'">
-
<option value="{$id}"
selected="selected">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$id}">
-
<xsl:value-of
select="name"/>
-
</option>
-
</xsl:otherwise>
-
</xsl:choose>
+
<option value="{$id}">
+
<xsl:value-of select="name"/>
+
</option>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
| [Prev in Thread] | Current Thread | [Next in Thread] |