[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16149] more on rental
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16149] more on rental |
Date: |
Wed, 11 Jan 2017 02:41:25 -0500 (EST) |
Revision: 16149
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16149
Author: sigurdne
Date: 2017-01-11 02:41:24 -0500 (Wed, 11 Jan 2017)
Log Message:
-----------
more on rental
Modified Paths:
--------------
trunk/rental/inc/class.uicomposite.inc.php
trunk/rental/inc/class.uiemail_out.inc.php
trunk/rental/setup/phpgw_no.lang
trunk/rental/templates/base/email_out.xsl
Modified: trunk/rental/inc/class.uicomposite.inc.php
===================================================================
--- trunk/rental/inc/class.uicomposite.inc.php 2017-01-09 22:09:02 UTC (rev
16148)
+++ trunk/rental/inc/class.uicomposite.inc.php 2017-01-11 07:41:24 UTC (rev
16149)
@@ -135,6 +135,7 @@
$user_rows_per_page = $length > 0 ? $length :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$search = phpgw::get_var('search');
+ $query = phpgw::get_var('query');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int', 'REQUEST', 1);
$columns = phpgw::get_var('columns');
@@ -145,6 +146,8 @@
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
$search_for = (is_array($search)) ? $search['value'] :
$search;
$search_for = $search_for ? $search_for : '';
+ $search_for = $query ? $query : $search_for; //from
autocomplete
+
$search_type = phpgw::get_var('search_option',
'string', 'REQUEST', 'all');
$export = phpgw::get_var('export', 'bool');
Modified: trunk/rental/inc/class.uiemail_out.inc.php
===================================================================
--- trunk/rental/inc/class.uiemail_out.inc.php 2017-01-09 22:09:02 UTC (rev
16148)
+++ trunk/rental/inc/class.uiemail_out.inc.php 2017-01-11 07:41:24 UTC (rev
16149)
@@ -52,7 +52,7 @@
{
parent::__construct();
self::set_active_menu('rental::email_out');
- $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('email_out');
+ $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('email out');
$this->bo = createObject('rental.boemail_out');
$this->fields = rental_email_out::get_fields();
$this->permissions =
rental_email_out::get_instance()->get_permission_array();
@@ -155,11 +155,15 @@
$tabs = array();
$tabs['first_tab'] = array(
- 'label' => lang('email_out'),
- 'link' => '#first_tab',
- 'function' => "set_tab('first_tab')"
+ 'label' => lang('email out'),
+ 'link' => '#first_tab'
);
+ $tabs['recipient'] = array(
+ 'label' => lang('recipient'),
+ 'link' => '#recipient',
+ );
+
$bocommon = CreateObject('property.bocommon');
$comments = (array)$email_out->comments;
@@ -196,8 +200,9 @@
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'value_active_tab' => $active_tab
);
+ phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_jquery::formvalidator_generate(array());
- self::add_javascript('rental', 'portico',
'email_out.edit.js');
+ self::add_javascript('rental', 'rental',
'email_out.edit.js');
self::render_template_xsl(array('email_out',
'datatable_inline'), array($mode => $data));
}
Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang 2017-01-09 22:09:02 UTC (rev 16148)
+++ trunk/rental/setup/phpgw_no.lang 2017-01-11 07:41:24 UTC (rev 16149)
@@ -653,4 +653,6 @@
delete file rental no Slett fil
user rental no Bruker
note rental no Merknad
-report is already recorded for %1 rental no Rapport finnes allerede
for %1
\ No newline at end of file
+report is already recorded for %1 rental no Rapport finnes allerede
for %1
+email out rental no Epost ut
+recipient rental no Adressat
\ No newline at end of file
Modified: trunk/rental/templates/base/email_out.xsl
===================================================================
--- trunk/rental/templates/base/email_out.xsl 2017-01-09 22:09:02 UTC (rev
16148)
+++ trunk/rental/templates/base/email_out.xsl 2017-01-11 07:41:24 UTC (rev
16149)
@@ -107,6 +107,33 @@
</div>
</fieldset>
</div>
+ <div id="recipient">
+
+ <fieldset>
+
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_composite">
+ <xsl:value-of
select="php:function('lang', 'composite')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_composite"/>
+ </label>
+ <input type="hidden"
id="composite_id" name="composite_id" value="">
+ <xsl:attribute
name="placeholder">
+
<xsl:value-of select="$lang_composite"/>
+ </xsl:attribute>
+ </input>
+ <input type="text"
id="composite_name" name="composite_name" value="">
+ <xsl:attribute
name="placeholder">
+
<xsl:value-of select="$lang_composite"/>
+ </xsl:attribute>
+ </input>
+ <div
id="composite_container"/>
+ </div>
+ </fieldset>
+
+ </div>
+
</div>
<div class="proplist-col">
<input type="submit" class="pure-button
pure-button-primary" name="save">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16149] more on rental,
sigurdne <=