|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14679] organize menu items |
| Date: | Mon, 25 Jan 2016 15:07:41 +0000 |
Revision: 14679
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14679
Author: sigurdne
Date: 2016-01-25 15:07:40 +0000 (Mon, 25 Jan 2016)
Log Message:
-----------
organize menu items
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.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uitts.inc.php
Modified: branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang 2016-01-25
13:18:50 UTC (rev 14678)
+++ branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang 2016-01-25
15:07:40 UTC (rev 14679)
@@ -1,3 +1,4 @@
+select none common no Velg ingen
bookmarks common no Snarveier
bookmark added common no Snarvei er lagret
bookmark deleted common no Snarvei er slettet
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-01-25 13:18:50 UTC (rev 14678)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-01-25 15:07:40 UTC (rev 14679)
@@ -717,29 +717,42 @@
</xsl:when>
</xsl:choose>
];
-
<xsl:choose>
-
<xsl:when test="ungroup_buttons">
-
JqueryPortico.TableTools = {
-
"sSwfPath":
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
-
"sRowSelect": "multi",
-
"aButtons": button_def
-
};
+
<xsl:when test="group_buttons = '1'">
+
var group_buttons = true;
</xsl:when>
<xsl:otherwise>
-
JqueryPortico.TableTools = {
+
var group_buttons = false;
+
</xsl:otherwise>
+ </xsl:choose>
+
+
if($(document).width() < 1000)
+ {
+
group_buttons = true;
+ }
+
+
if(group_buttons === true)
+ {
+
JqueryPortico.TableTools = {
+
"sSwfPath":
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
+
"sRowSelect": "multi",
+
"aButtons": [
+
{
+
"sExtends": "collection",
+
"sButtonText": "<xsl:value-of select="php:function('lang',
'collection')"/>",
+
"aButtons": button_def
+
}
+
]
+ };
+ }
+ else
+ {
+
JqueryPortico.TableTools = {
"sSwfPath":
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
"sRowSelect": "multi",
-
"aButtons": [
-
{
-
"sExtends": "collection",
-
"sButtonText": "<xsl:value-of
select="php:function('lang', 'collection')"/>",
-
"aButtons": button_def
-
}
-
]
+
"aButtons": button_def
};
-
</xsl:otherwise>
- </xsl:choose>
+ }
</xsl:when>
<xsl:otherwise>
JqueryPortico.TableTools = false;
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-01-25 13:18:50 UTC (rev 14678)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-01-25 15:07:40 UTC (rev 14679)
@@ -1476,7 +1476,6 @@
'allrows' => true,
'download_type' =>
'responsiblility_role'
)),
- 'ungroup_buttons' => true,
'allrows' => true,
'editor_action' => '',
'field' => array()
Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php 2016-01-25
13:18:50 UTC (rev 14678)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php 2016-01-25
15:07:40 UTC (rev 14679)
@@ -406,10 +406,10 @@
return lang('sorry - insufficient rights');
}
- $new_priority = phpgw::get_var('new_priority',
'string', 'GET');
+ $new_priority = phpgw::get_var('new_priority', 'int');
$id = phpgw::get_var('id', 'int');
- $ticket = $this->bo->read_single($id);
+// $ticket = $this->bo->read_single($id);
$receipt = $this->bo->update_priority(array('priority'
=> $new_priority), $id);
if((isset($this->bo->config->config_data['mailnotification']) &&
$this->bo->config->config_data['mailnotification']) ||
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me']
== 1 && $this->bo->fields_updated
@@ -864,7 +864,8 @@
'export' => true, 'allrows' =>
true)),
'allrows' => true,
'editor_action' =>
self::link(array('menuaction' => 'property.uitts.edit_survey_title')),
- 'field' => $this->_get_fields()
+ 'field' => $this->_get_fields(),
+ 'group_buttons' => true,
)
);
@@ -948,8 +949,25 @@
if(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
+ (
+ 'status'
=> lang('closed'),
+ );
+ $status['O'] = array
+ (
+ 'status'
=> isset($this->bo->config->config_data['tts_lang_open']) &&
$this->bo->config->config_data['tts_lang_open'] ?
$this->bo->config->config_data['tts_lang_open'] : lang('Open'),
+ );
- unset($status['C']);
+ $custom_status =
$this->bo->get_custom_status();
+
+ foreach($custom_status as $custom)
+ {
+ $status["C{$custom['id']}"] = array
+ (
+ 'status'
=> $custom['name'],
+ );
+ }
+
foreach($status as $status_code => $status_info)
{
$data['datatable']['actions'][] = array
@@ -979,7 +997,8 @@
}
$_priorities = $this->bo->get_priority_list();
- foreach($_priorities as $_priority =>
$_priority_info)
+
+ foreach($_priorities as $_priority_info)
{
$data['datatable']['actions'][] = array
(
@@ -991,7 +1010,7 @@
(
'menuaction' =>
'property.uitts.edit_priority',
'edit_status' => true,
- 'new_priority' =>
$_priority,
+ 'new_priority' =>
$_priority_info['id'],
'second_display' =>
true,
'sort' => $this->sort,
'order' => $this->order,
@@ -1008,6 +1027,10 @@
}
}
+ if(count($data['datatable']['actions']) < 10)
+ {
+ $data['datatable']['group_buttons'] = false;
+ }
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
| [Prev in Thread] | Current Thread | [Next in Thread] |