|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [15835] formatting |
| Date: | Sun, 16 Oct 2016 15:30:10 +0000 (UTC) |
Revision: 15835
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15835
Author: sigurdne
Date: 2016-10-16 15:30:10 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/admin/inc/class.ui_custom.inc.php
trunk/admin/templates/base/custom.xsl
Modified: trunk/admin/inc/class.ui_custom.inc.php
===================================================================
--- trunk/admin/inc/class.ui_custom.inc.php 2016-10-16 15:29:25 UTC (rev
15834)
+++ trunk/admin/inc/class.ui_custom.inc.php 2016-10-16 15:30:10 UTC (rev
15835)
@@ -920,18 +920,7 @@
'name' =>
'location',
'text' =>
lang('location'),
'list' =>
$location_list,
- ),
- array
- (
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'admin.ui_custom.edit_attrib_group',
-
'appname' => $this->appname,
-
'menu_selection' => $this->menu_selection
- )),
- 'class' =>
'new_item'
- ),
+ )
)
)
),
@@ -942,6 +931,10 @@
'phpgw_return_as' =>
'json'
)),
'allrows' => true,
+ 'new_item' => self::link(array(
+
'menuaction' => 'admin.ui_custom.edit_attrib_group',
+
'appname' => $this->appname,
+
'menu_selection' => $this->menu_selection)),
'editor_action' => '',
'field' => array(
array(
Modified: trunk/admin/templates/base/custom.xsl
===================================================================
--- trunk/admin/templates/base/custom.xsl 2016-10-16 15:29:25 UTC (rev
15834)
+++ trunk/admin/templates/base/custom.xsl 2016-10-16 15:30:10 UTC (rev
15835)
@@ -298,7 +298,7 @@
<xsl:value-of
select="php:function('lang', 'input text')" />
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" maxlength="20">
+ <input type="text"
name="values[input_text]" value="{value_input_text}" maxlength="200">
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'enter the input text for records')" />
</xsl:attribute>
@@ -1172,26 +1172,28 @@
</xsl:template>
<xsl:template name="choice" xmlns:php="http://php.net/xsl";>
- <table cellpadding="2" cellspacing="2" width="80%" align="left">
+ <table class="pure-table pure-table-bordered" border="0"
cellspacing="2" cellpadding="2">
<xsl:choose>
<xsl:when test="value_choice!=''">
- <tr class="th">
- <td class="th_text" width="5%"
align="left">
+ <thead>
+ <tr>
+ <th width="5%" align="left">
<xsl:value-of
select="php:function('lang', 'id')" />
- </td>
- <td class="th_text" width="40%"
align="left">
+ </th>
+ <th width="40%" align="left">
<xsl:value-of
select="php:function('lang', 'value')" />
- </td>
- <td class="th_text" width="40%"
align="left">
+ </th>
+ <th width="40%" align="left">
<xsl:value-of
select="php:function('lang', 'title')" />
- </td>
- <td class="th_text" width="5%"
align="left">
+ </th>
+ <th width="5%" align="left">
<xsl:value-of
select="php:function('lang', 'order')" />
- </td>
- <td class="th_text" width="10%"
align="center">
+ </th>
+ <th width="10%" align="center">
<xsl:value-of
select="lang_delete_value"/>
- </td>
+ </th>
</tr>
+ </thead>
<xsl:for-each select="value_choice" >
<tr>
<xsl:attribute name="class">
@@ -1199,12 +1201,9 @@
<xsl:when
test="@class">
<xsl:value-of select="@class"/>
</xsl:when>
- <xsl:when
test="position() mod 2 = 0">
-
<xsl:text>row_off</xsl:text>
+ <xsl:when
test="position() mod 2 != 0">
+
<xsl:text>pure-table-odd</xsl:text>
</xsl:when>
- <xsl:otherwise>
-
<xsl:text>row_on</xsl:text>
- </xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<td align="left">
@@ -1233,10 +1232,8 @@
</td>
<td align="center">
<input type="checkbox"
name="values[delete_choice][]" value="{id}">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:attribute
name="title">
<xsl:value-of select="//lang_delete_choice_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -1245,9 +1242,6 @@
</xsl:when>
</xsl:choose>
<tr>
- <td valign="top" colspan='2'>
- <xsl:value-of select="lang_new_value"/>
- </td>
<td valign="top">
<input type="text" name="values[new_choice_id]"
size = '3'>
<xsl:attribute name="title">
@@ -1256,14 +1250,19 @@
</input>
</td>
<td valign="top">
- <input type="text" name="values[new_choice]"
onMouseout="window.status='';return true;">
- <xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input type="text" name="values[new_choice]">
+ <xsl:attribute name="title">
<xsl:value-of
select="lang_new_value_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
</td>
+ <td valign="top">
+ <input type="text"
name="values[new_title_choice]">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'title')" />
+ </xsl:attribute>
+ </input>
+ </td>
</tr>
</table>
</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |