|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14709] more fixes |
| Date: | Tue, 09 Feb 2016 10:01:58 +0000 |
Revision: 14709
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14709
Author: sigurdne
Date: 2016-02-09 10:01:57 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
more fixes
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang
branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
branches/dev-syncromind/property/inc/class.uilookup.inc.php
branches/dev-syncromind/property/templates/base/location_form.xsl
branches/dev-syncromind/property/templates/base/location_form2.xsl
branches/dev-syncromind/property/templates/base/project.xsl
Modified: branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang 2016-02-08
18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang 2016-02-09
10:01:57 UTC (rev 14709)
@@ -161,5 +161,5 @@
up common no opp
down common no ned
no access common no Ingen Tilgang
-toolbar common no Filter
-collection common no Verktøy
\ No newline at end of file
+toolbar common no Verktøy
+collection common no Samling..
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-08 18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-09 10:01:57 UTC (rev 14709)
@@ -90,6 +90,9 @@
</label>
<div id="toolbar">
+ <script type="text/javascript">
+ var number_of_toolbar_items = 0;
+ </script>
<!--xsl:if test="item/text and normalize-space(item/text)"-->
<xsl:if test="item">
<table id="toolbar_table" class="pure-table">
@@ -105,6 +108,10 @@
</thead>
<tbody>
<xsl:for-each select="item">
+ <script type="text/javascript">
+ number_of_toolbar_items
+= 1;
+ </script>
+
<tr>
<xsl:variable
name="filter_key" select="concat('filter_', name)"/>
<xsl:variable
name="filter_key_name" select="concat(concat('filter_', name), '_name')"/>
@@ -223,6 +230,11 @@
<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"/>
@@ -878,7 +890,7 @@
ajax: {
url: ajax_url,
data: {},
- type: 'GET'
+ type: 'POST'
},
fnServerParams: function (
aoData ) {
if(typeof(aoData.order)
!= 'undefined')
@@ -967,6 +979,11 @@
}
}
} );
+
+ if(number_of_toolbar_items < 4)
+ {
+ $('#header1').prop("checked",
true);
+ }
});
]]>
Modified: branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
2016-02-08 18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/property/inc/class.uiinvoice.inc.php
2016-02-09 10:01:57 UTC (rev 14709)
@@ -378,20 +378,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('new'),
- 'href' =>
self::link(array(
-
'menuaction' => 'property.uiinvoice.add'
- )),
- 'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('Save'),
- 'onclick' =>
'onSave()',
- 'class' =>
'new_item'
- )
)
)
),
@@ -421,7 +407,12 @@
'field' => array()
)
);
-
+ if($this->acl_add)
+ {
+ $data['datatable']['new_item'] =
self::link(array(
+
'menuaction' => 'property.uiinvoice.add'
+ ));
+ }
if($paid)
{
$data['form']['toolbar']['item'][] = array
Modified: branches/dev-syncromind/property/inc/class.uilookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilookup.inc.php 2016-02-08
18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/property/inc/class.uilookup.inc.php 2016-02-09
10:01:57 UTC (rev 14709)
@@ -545,10 +545,18 @@
function b_account()
{
$role = phpgw::get_var('role');
- $parent = phpgw::get_var('parent');
- $parent = $this->cat_id ? $this->cat_id : $parent;
+ $cat_id = phpgw::get_var('cat_id', 'int', 'POST');
+ if(isset($_POST['cat_id']))
+ {
+ $parent = $cat_id;
+ }
+ else
+ {
+ $parent = phpgw::get_var('parent');
+ }
+
if(phpgw::get_var('phpgw_return_as') == 'json')
{
$search = phpgw::get_var('search');
Modified: branches/dev-syncromind/property/templates/base/location_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/location_form.xsl
2016-02-08 18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/property/templates/base/location_form.xsl
2016-02-09 10:01:57 UTC (rev 14709)
@@ -20,7 +20,7 @@
</xsl:otherwise>
</xsl:choose>
</label>
- <input size="{size}" type="{input_type}"
name="{input_name}" value="{value}" onClick="{lookup_function_call}">
+ <input size="{size}" type="{input_type}"
id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
<xsl:attribute name="title">
<xsl:value-of select="statustext"/>
</xsl:attribute>
@@ -41,14 +41,14 @@
<xsl:for-each select="extra">
<xsl:choose>
<xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
</xsl:attribute>
Modified: branches/dev-syncromind/property/templates/base/location_form2.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/location_form2.xsl
2016-02-08 18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/property/templates/base/location_form2.xsl
2016-02-09 10:01:57 UTC (rev 14709)
@@ -23,7 +23,7 @@
<xsl:choose>
<xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
<xsl:if test="input_type !=
'hidden' and required = 1">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
@@ -38,7 +38,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
<xsl:if test="input_type !=
'hidden'">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
@@ -50,14 +50,14 @@
<xsl:for-each select="extra">
<xsl:choose>
<xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
<xsl:attribute
name="title">
<xsl:value-of
select="statustext"/>
</xsl:attribute>
Modified: branches/dev-syncromind/property/templates/base/project.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/project.xsl 2016-02-08
18:41:24 UTC (rev 14708)
+++ branches/dev-syncromind/property/templates/base/project.xsl 2016-02-09
10:01:57 UTC (rev 14709)
@@ -581,25 +581,25 @@
</xsl:otherwise>
</xsl:choose>
<!--/div-->
- <div class="pure-control-group">
- <label for="name">
- <xsl:value-of
select="php:function('lang', 'invoice')"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if test="container
= 'datatable-container_2'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
- </div>
- </div>
+ <!--div class="pure-control-group"-->
+ <label for="name">
+ <xsl:value-of
select="php:function('lang', 'invoice')"/>
+ </label>
+ <!--div class="pure-custom"-->
+ <xsl:for-each select="datatable_def">
+ <xsl:if test="container =
'datatable-container_2'">
+ <xsl:call-template
name="table_setup">
+ <xsl:with-param
name="container" select ='container'/>
+ <xsl:with-param
name="requestUrl" select ='requestUrl' />
+ <xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
+ <xsl:with-param
name="tabletools" select ='tabletools' />
+ <xsl:with-param
name="data" select ='data' />
+ <xsl:with-param
name="config" select ='config' />
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ <!--/div-->
+ <!--/div-->
<!--/fieldset-->
</div>
@@ -617,25 +617,21 @@
<input type="hidden"
id="notify_contact" name="notify_contact" value=""
title="{$lang_contact_statustext}"></input>
<input type="hidden"
name="notify_contact_name" value="" onClick="notify_contact_lookup();"
readonly="readonly" title="{$lang_contact_statustext}"/>
</div>
- <div class="pure-control-group">
- <label for="name">
- <xsl:value-of
select="php:function('lang', 'notify')"/>
- </label>
- <div class="pure-custom">
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_3'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
- </div>
- </div>
+ <label for="name">
+ <xsl:value-of
select="php:function('lang', 'notify')"/>
+ </label>
+ <xsl:for-each select="datatable_def">
+ <xsl:if test="container =
'datatable-container_3'">
+ <xsl:call-template
name="table_setup">
+ <xsl:with-param
name="container" select ='container'/>
+ <xsl:with-param
name="requestUrl" select ='requestUrl' />
+ <xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
+ <xsl:with-param
name="tabletools" select ='tabletools' />
+ <xsl:with-param
name="data" select ='data' />
+ <xsl:with-param
name="config" select ='config' />
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
<xsl:choose>
<xsl:when
test="suppresscoordination =''">
<div
class="pure-control-group">
@@ -710,31 +706,29 @@
<xsl:when test="value_project_id > 0">
<div id="documents">
<fieldset>
- <div
class="pure-control-group">
- <label
for="name">
-
<xsl:value-of select="php:function('lang', 'files')"/>
- </label>
- <div
class="pure-custom">
-
<xsl:for-each select="datatable_def">
-
<xsl:if test="container = 'datatable-container_5'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="data" select ='data' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
-
</xsl:if>
-
</xsl:for-each>
- </div>
+ <label for="name">
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <div>
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_5'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl' />
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+ </xsl:for-each>
</div>
<xsl:call-template
name="file_upload"/>
</fieldset>
</div>
<div id="history">
<fieldset>
- <div
class="pure-custom">
+ <div>
<xsl:for-each
select="datatable_def">
<xsl:if
test="container = 'datatable-container_4'">
<xsl:call-template name="table_setup">
| [Prev in Thread] | Current Thread | [Next in Thread] |