[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16224] property: configure simplified interface for
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16224] property: configure simplified interface for tts |
|
Date: |
Wed, 1 Feb 2017 09:57:51 -0500 (EST) |
Revision: 16224
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16224
Author: sigurdne
Date: 2017-02-01 09:57:51 -0500 (Wed, 01 Feb 2017)
Log Message:
-----------
property: configure simplified interface for tts
Modified Paths:
--------------
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/config.tpl
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2017-02-01 14:57:17 UTC (rev
16223)
+++ trunk/property/inc/class.botts.inc.php 2017-02-01 14:57:51 UTC (rev
16224)
@@ -87,6 +87,16 @@
$this->config->read();
+ $default_interface =
isset($this->config->config_data['tts_default_interface']) ?
$this->config->config_data['tts_default_interface'] : '';
+
+ /*
+ * Inverted logic
+ */
+ if($default_interface == 'simplified')
+ {
+ $this->simple = true;
+ }
+
$user_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
$simple_group =
isset($this->config->config_data['fmttssimple_group']) ?
$this->config->config_data['fmttssimple_group'] : array();
@@ -111,12 +121,18 @@
reset($user_groups);
$user_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
- $simple_group =
isset($this->config->config_data['fmttssimple_group']) ?
$this->config->config_data['fmttssimple_group'] : array();
foreach ($user_groups as $group => $dummy)
{
if (in_array($group, $simple_group))
{
- $this->simple = true;
+ if($default_interface == 'simplified')
+ {
+ $this->simple = false;
+ }
+ else
+ {
+ $this->simple = true;
+ }
break;
}
}
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-02-01 14:57:17 UTC (rev
16223)
+++ trunk/property/inc/class.uitts.inc.php 2017-02-01 14:57:51 UTC (rev
16224)
@@ -1077,20 +1077,24 @@
'parameters' => json_encode($parameters)
);
}
- $data['datatable']['actions'][] = array
- (
- 'my_name' => 'docs',
- 'statustext' => lang('documents'),
- 'text' => lang('documents'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+
+ if(!$this->simple)
+ {
+ $data['datatable']['actions'][] = array
(
- 'menuaction' =>
'property.uidocument.list_doc',
- )),
- 'target' => '_blank',
- 'parameters' =>
json_encode($parameters_location)
- );
+ 'my_name' => 'docs',
+ 'statustext' => lang('documents'),
+ 'text' => lang('documents'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uidocument.list_doc',
+ )),
+ 'target' => '_blank',
+ 'parameters' =>
json_encode($parameters_location)
+ );
+ }
- if
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'] ==
'yes' && $this->acl_edit)
+ if (!$this->simple &&
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'] ==
'yes' && $this->acl_edit)
{
$status['X'] = array
(
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2017-02-01 14:57:17 UTC (rev 16223)
+++ trunk/property/setup/phpgw_no.lang 2017-02-01 14:57:51 UTC (rev 16224)
@@ -2073,4 +2073,5 @@
request for approval property no Anmodning om godkjenning
approval from %1 is required for order %2 property no
Godkjenning fra %1 er påkrevd for ordre %2
missing recipient for order %1 property no Mangler mottaker for
ordre %1
-export property no Eksport
\ No newline at end of file
+export property no Eksport
+simplified property no Forenklet
\ No newline at end of file
Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl 2017-02-01 14:57:17 UTC (rev
16223)
+++ trunk/property/templates/base/config.tpl 2017-02-01 14:57:51 UTC (rev
16224)
@@ -342,6 +342,15 @@
</td>
</tr>
<tr>
+ <td >{lang_TTS_default_interface}:</td>
+ <td>
+ <select
name="newsettings[tts_default_interface]">
+ <option value=""
{selected_tts_default_interface_}>Full</option>
+ <option value="simplified"
{selected_tts_default_interface_simplified}>{lang_simplified}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td valign =
'top'>{lang_TTS_simplified_group}:</td>
<td>
<!--to be able to blank the setting -
need an empty value-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16224] property: configure simplified interface for tts,
sigurdne <=