fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16011] more on integration


From: sigurdne
Subject: [Fmsystem-commits] [16011] more on integration
Date: Mon, 21 Nov 2016 15:12:28 +0000 (UTC)

Revision: 16011
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16011
Author:   sigurdne
Date:     2016-11-21 15:12:27 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/js/portico/project.edit.js
    trunk/property/js/portico/workorder.edit.js
    trunk/property/templates/base/project.xsl

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/inc/class.botts.inc.php      2016-11-21 15:12:27 UTC (rev 
16011)
@@ -1906,7 +1906,7 @@
                                $supervisors[$supervisor_id] = array('id' => 
$supervisor_id, 'required' => false, 'default' => true);
                        }
 
-                       return $this->get_supervisor_email($supervisors, 
$order_id);
+                       return $this->get_supervisor_approval($supervisors, 
$order_id);
                }
 
                public function check_external_register($param)
@@ -1951,7 +1951,7 @@
                        return json_decode($result, true);
                }
 
-               protected function get_supervisor_email($supervisors, $order_id)
+               protected function get_supervisor_approval($supervisors, 
$order_id)
                {
                        $need_approval = 
isset($this->config->config_data['workorder_approval']) ? 
$this->config->config_data['workorder_approval'] : '';
 
@@ -2002,29 +2002,27 @@
                                        $requests = 
$pending_action->get_pending_action($action_params);
 
                                        $prefs = 
$this->bocommon->create_preferences('property', $supervisor_id);
-                                       if (isset($prefs['email']) && 
$prefs['email'])
+                                       if (!empty($prefs['email']))
                                        {
-                                               $supervisor_email[] = array(
-                                                       'id' => $supervisor_id,
-                                                       'address' => 
$prefs['email'],
-                                                       'required'      => 
$info['required'],
-                                                       'default'       => 
!!$info['default'],
-                                                       'requested'     => 
!!$requests[0]['action_requested'],
-                                                       'requested_time'=> 
$GLOBALS['phpgw']->common->show_date($requests[0]['action_requested'], 
$dateformat),
-                                                       'approved'      => 
!!$approvals[0]['action_performed'],
-                                                       'approved_time'  => 
$GLOBALS['phpgw']->common->show_date($approvals[0]['action_performed'], 
$dateformat),
-                                                       'is_user'       => 
$supervisor_id == $this->account ? true : false
-                                               );
+                                               $address = $prefs['email'];
                                        }
                                        else
                                        {
-                                               $supervisor_email[] = array(
-                                                       'id' => $supervisor_id,
-                                                       'address' => 
$GLOBALS['phpgw']->accounts->id2name($supervisor_id) . '@bergen.kommune.no',
-                                                       'required'      => 
$info['required'],
-                                                       'default'       => 
!!$info['default']
-                                               );
+                                               $email_domain = 
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ? 
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+                                               $address = 
$GLOBALS['phpgw']->accounts->id2name($supervisor_id) . '<' . 
$GLOBALS['phpgw']->accounts->id2lid($supervisor_id) . "@{$email_domain}>";
                                        }
+
+                                       $supervisor_email[] = array(
+                                               'id' => $supervisor_id,
+                                               'address' => $address,
+                                               'required'      => 
$info['required'],
+                                               'default'       => 
!!$info['default'],
+                                               'requested'     => 
!!$requests[0]['action_requested'],
+                                               'requested_time'=> 
$GLOBALS['phpgw']->common->show_date($requests[0]['action_requested'], 
$dateformat),
+                                               'approved'      => 
!!$approvals[0]['action_performed'],
+                                               'approved_time'  => 
$GLOBALS['phpgw']->common->show_date($approvals[0]['action_performed'], 
$dateformat),
+                                               'is_user'       => 
$supervisor_id == $this->account ? true : false
+                                       );
                                
                                        unset($prefs);
                                }

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/inc/class.uiproject.inc.php  2016-11-21 15:12:27 UTC (rev 
16011)
@@ -1412,21 +1412,22 @@
                                        );
                                }
 
-                               $default_ecodimb = 
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['dimb']) ? 
$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'] : '');
-                               if(isset($values['ecodimb']) && 
$values['ecodimb'] && $values['ecodimb'] != $default_ecodimb)
-                               {
-                                       
$GLOBALS['phpgw']->preferences->add('property', 'dimb', $values['ecodimb'], 
'user');
-                                       
$GLOBALS['phpgw']->preferences->save_repository();
-                               }
+                       }
 
-                               $ecodimb_data = 
$this->bocommon->initiate_ecodimb_lookup(array
-                                       (
-                                       'ecodimb' => $values['ecodimb'] ? 
$values['ecodimb'] : $default_ecodimb,
-                                       'ecodimb_descr' => 
$values['ecodimb_descr'],
-                                       'disabled' => $mode == 'view'
-                               ));
+                       $default_ecodimb = 
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['dimb']) ? 
$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'] : '');
+                       if(isset($values['ecodimb']) && $values['ecodimb'] && 
$values['ecodimb'] != $default_ecodimb)
+                       {
+                               $GLOBALS['phpgw']->preferences->add('property', 
'dimb', $values['ecodimb'], 'user');
+                               
$GLOBALS['phpgw']->preferences->save_repository();
                        }
 
+                       $ecodimb_data = 
$this->bocommon->initiate_ecodimb_lookup(array
+                               (
+                               'ecodimb' => $values['ecodimb'] ? 
$values['ecodimb'] : $default_ecodimb,
+                               'ecodimb_descr' => $values['ecodimb_descr'],
+                               'disabled' => $mode == 'view'
+                       ));
+
                        $contact_data = 
$this->bocommon->initiate_ui_contact_lookup(array
                                (
                                'contact_id' => $values['contact_id'],

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/inc/class.uitts.inc.php      2016-11-21 15:12:27 UTC (rev 
16011)
@@ -2158,6 +2158,17 @@
                                $bcc = '';//$coordinator_email;
                                foreach ($values['approval'] as $_account_id => 
$_address)
                                {
+                                       $prefs = 
$this->bocommon->create_preferences('property', $_account_id);
+                                       if (!empty($prefs['email']))
+                                       {
+                                               $_address = $prefs['email'];
+                                       }
+                                       else
+                                       {
+                                               $email_domain = 
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ? 
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+                                               $_address = 
$GLOBALS['phpgw']->accounts->id2lid($_account_id) . "@{$email_domain}";
+                                       }
+
                                        $action_params['responsible'] = 
$_account_id;
                                        try
                                        {
@@ -2165,14 +2176,14 @@
                                                if ($rcpt)
                                                {
                                                        
phpgwapi_cache::message_set(lang('%1 is notified', $_address),'message');
+                                                       $historylog->add('AR', 
$id, $GLOBALS['phpgw']->accounts->get($_account_id)->__toString() . 
"::{$_budget_amount}");
+                                                       
execMethod('property.sopending_action.set_pending_action', $action_params);
                                                }
                                        }
                                        catch (Exception $exc)
                                        {
-                                               $receipt['error'][] = 
array('msg' => $exc->getMessage());
+                                               
phpgwapi_cache::message_set($exc->getMessage(),'error');
                                        }
-                                       $historylog->add('AR', $id, 
$GLOBALS['phpgw']->accounts->get($_account_id)->__toString() . 
"::{$_budget_amount}");
-                                       
execMethod('property.sopending_action.set_pending_action', $action_params);
                                }
                                
                        }

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2016-11-21 14:45:29 UTC 
(rev 16010)
+++ trunk/property/inc/class.uiworkorder.inc.php        2016-11-21 15:12:27 UTC 
(rev 16011)
@@ -1002,6 +1002,17 @@
                                        $bcc = '';//$coordinator_email;
                                        foreach ($values['approval'] as 
$_account_id => $_address)
                                        {
+                                               $prefs = 
$this->bocommon->create_preferences('property', $_account_id);
+                                               if (!empty($prefs['email']))
+                                               {
+                                                       $_address = 
$prefs['email'];
+                                               }
+                                               else
+                                               {
+                                                       $email_domain = 
!empty($GLOBALS['phpgw_info']['server']['email_domain']) ? 
$GLOBALS['phpgw_info']['server']['email_domain'] : 'bergen.kommune.no';
+                                                       $_address = 
$GLOBALS['phpgw']->accounts->id2lid($_account_id) . "@{$email_domain}";
+                                               }
+
                                                $action_params['responsible'] = 
$_account_id;
                                                try
                                                {
@@ -1009,16 +1020,15 @@
                                                        if ($rcpt)
                                                        {
                                                                
phpgwapi_cache::message_set(lang('%1 is notified', $_address),'message');
+                                                               
$historylog->add('AP', $id, 
$GLOBALS['phpgw']->accounts->get($_account_id)->__toString() . 
"::{$_budget_amount}");
+                                                               
execMethod('property.sopending_action.set_pending_action', $action_params);
                                                        }
                                                }
                                                catch (Exception $exc)
                                                {
-                                                       $receipt['error'][] = 
array('msg' => $exc->getMessage());
+                                                       
phpgwapi_cache::message_set($exc->getMessage(),'error');
                                                }
-                                               $historylog->add('AP', $id, 
$GLOBALS['phpgw']->accounts->get($_account_id)->__toString() . 
"::{$_budget_amount}");
-                                               
execMethod('property.sopending_action.set_pending_action', $action_params);
                                        }
-
                                }
 
                                if (!empty($values['do_approve']) && 
is_array($values['do_approve']))
@@ -1485,8 +1495,8 @@
                                'type' => $mode));
 
                        $b_account_data = 
$this->bocommon->initiate_ui_budget_account_lookup(array(
-                               'b_account_id' => $project['b_account_id'] ? 
$project['b_account_id'] : $values['b_account_id'],
-                               'b_account_name' => $values['b_account_name'],
+                               'b_account_id' => $values['b_account_id'] ? 
$values['b_account_id'] : $project['b_account_id'],
+//                             'b_account_name' => $values['b_account_name'],
                                'disabled' => '',
                                'parent' => $project['b_account_group'],
                                'type' => $mode,

Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js   2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/js/portico/project.edit.js   2016-11-21 15:12:27 UTC (rev 
16011)
@@ -1,206 +1,4 @@
-$(document).ready(function ()
-{
 
-       /*
-        Float Submit Button To Right Edge Of Window
-        Version 1.0
-        April 11, 2010
-
-        Will Bontrager
-        http://www.willmaster.com/
-        Copyright 2010 Bontrager Connection, LLC
-
-        Generated with customizations on February 23, 2016 at
-        
http://www.willmaster.com/library/manage-forms/floating-submit-button.php
-
-        Bontrager Connection, LLC grants you
-        a royalty free license to use or modify
-        this software provided this notice appears
-        on all copies. This software is provided
-        "AS IS," without a warranty of any kind.
-        */
-
-//*****************************//
-
-       /** Five places to customize **/
-
-// Place 1:
-// The id value of the button.
-
-       var ButtonId = "submitform";
-
-
-// Place 2:
-// The width of the button.
-
-       var ButtonWidth = 60;
-
-
-// Place 3:
-// Left/Right location of button (specify "left" or "right").
-
-       var ButtonLocation = "right";
-
-
-// Place 4:
-// How much space (in pixels) between button and window left/right edge.
-
-       var SpaceBetweenButtonAndEdge = 30;
-
-
-// Place 5:
-// How much space (in pixels) between button and window top edge.
-
-       var SpaceBetweenButtonAndTop = 100;
-
-
-       /** No other customization required. **/
-
-//************************************//
-
-       TotalWidth = parseInt(ButtonWidth) + 
parseInt(SpaceBetweenButtonAndEdge);
-       ButtonLocation = ButtonLocation.toLowerCase();
-       ButtonLocation = ButtonLocation.substr(0, 1);
-       var ButtonOnLeftEdge = (ButtonLocation == 'l') ? true : false;
-
-       function AddButtonPlacementEvents(f)
-       {
-               var cache = window.onload;
-               if (typeof window.onload != 'function')
-               {
-                       window.onload = f;
-               }
-               else
-               {
-                       window.onload = function ()
-                       {
-                               if (cache)
-                               {
-                                       cache();
-                               }
-                               f();
-                       };
-               }
-               cache = window.onresize;
-               if (typeof window.onresize != 'function')
-               {
-                       window.onresize = f;
-               }
-               else
-               {
-                       window.onresize = function ()
-                       {
-                               if (cache)
-                               {
-                                       cache();
-                               }
-                               f();
-                       };
-               }
-       }
-
-       function WindowHasScrollbar()
-       {
-               var ht = 0;
-               if (document.all)
-               {
-                       if (document.documentElement)
-                       {
-                               ht = document.documentElement.clientHeight;
-                       }
-                       else
-                       {
-                               ht = document.body.clientHeight;
-                       }
-               }
-               else
-               {
-                       ht = window.innerHeight;
-               }
-               if (document.body.offsetHeight > ht)
-               {
-                       return true;
-               }
-               else
-               {
-                       return false;
-               }
-       }
-
-       function GlueButton(ledge)
-       {
-               var test = document.getElementById('add_sub_entry');
-
-               var left_submit = 400;
-               var left_cancel = 800;
-               if(test != null )
-               {
-                       $("#add_sub_entry").css({
-                               top: SpaceBetweenButtonAndTop + "px",
-                               left: (ledge - 80) + "px",
-                               display : "block",
-                               zIndex : "9999",
-                               position:'fixed'
-                       });
-
-                       ledge -= 140;
-               }
-
-               $("#submitform").css({
-                       top: SpaceBetweenButtonAndTop + "px",
-                       width : ButtonWidth + "px",
-                       left: (ledge - 100 )+ "px",
-                       display : "block",
-                       zIndex : "9999",
-                       position:'fixed'
-               });
-
-               $("#cancelform").css({
-                       top: SpaceBetweenButtonAndTop + "px",
-                       width : ButtonWidth + "px",
-                       left: (ledge -20)+ "px",
-                       display : "block",
-                       zIndex : "9999",
-                       position:'fixed'
-               });
-
-
-       }
-
-       function PlaceTheButton()
-       {
-               if (ButtonOnLeftEdge)
-               {
-                       GlueButton(SpaceBetweenButtonAndEdge);
-                       return;
-               }
-               if (document.documentElement && 
document.documentElement.clientWidth)
-               {
-                       GlueButton(document.documentElement.clientWidth - 
TotalWidth);
-               }
-               else
-               {
-                       if (navigator.userAgent.indexOf('MSIE') > 0)
-                       {
-                               GlueButton(document.body.clientWidth - 
TotalWidth + 19);
-                       }
-                       else
-                       {
-                               var scroll = WindowHasScrollbar() ? 0 : 15;
-                               if (typeof window.innerWidth == 'number')
-                               {
-                                       GlueButton(window.innerWidth - 
TotalWidth - 15 + scroll);
-                               }
-                               else
-                               {
-                                       GlueButton(document.body.clientWidth - 
TotalWidth + 15);
-                               }
-                       }
-               }
-       }
-
-       AddButtonPlacementEvents(PlaceTheButton);
-});
 var sUrl_workorder = phpGWLink('index.php', {'menuaction': 
'property.uiworkorder.edit'});
 var sUrl_invoice = phpGWLink('index.php', {'menuaction': 
'property.uiinvoice.index'});
 
@@ -369,8 +167,69 @@
        var api2 = oTable2.api();
        api2.on('draw', sum_columns_table_invoice);
 
+
+// -- buttons--//
+
+       $("#submitbox").css({
+               position: 'absolute',
+               right: '10px',
+               border: '1px solid #B5076D',
+               padding: '0 10px 10px 10px',
+               width: $("#submitbox").width() + 'px',
+               "background - color": '#FFF',
+               display: "block",
+       });
+
+       var offset = $("#submitbox").offset();
+       var topPadding = 180;
+
+       if ($("#center_content").length === 1)
+       {
+               $("#center_content").scroll(function ()
+               {
+                       if ($("#center_content").scrollTop() > offset.top)
+                       {
+                               $("#submitbox").stop().animate({
+                                       marginTop: 
$("#center_content").scrollTop() - offset.top + topPadding
+                               }, 100);
+                       }
+                       else
+                       {
+                               $("#submitbox").stop().animate({
+                                       marginTop: 0
+                               }, 100);
+                       }
+                       ;
+               });
+       }
+       else
+       {
+               $(window).scroll(function ()
+               {
+                       if ($(window).scrollTop() > offset.top)
+                       {
+                               $("#submitbox").stop().animate({
+                                       marginTop: $(window).scrollTop() - 
offset.top + topPadding
+                               }, 100);
+                       }
+                       else
+                       {
+                               $("#submitbox").stop().animate({
+                                       marginTop: 0
+                               }, 100);
+                       }
+                       ;
+               });
+       }
+
+
 });
 
+function addSubEntry()
+{
+       document.add_sub_entry_form.submit();
+}
+
 function check_and_submit_valid_session()
 {
        var oArgs = {menuaction: 'property.bocommon.confirm_session'};

Modified: trunk/property/js/portico/workorder.edit.js
===================================================================
--- trunk/property/js/portico/workorder.edit.js 2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/js/portico/workorder.edit.js 2016-11-21 15:12:27 UTC (rev 
16011)
@@ -11,7 +11,6 @@
        document.getElementsByName("calculate_workorder")[0].value = 1;
        check_and_submit_valid_session();
 }
-;
 
 function submit_workorder()
 {

Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl   2016-11-21 14:45:29 UTC (rev 
16010)
+++ trunk/property/templates/base/project.xsl   2016-11-21 15:12:27 UTC (rev 
16011)
@@ -15,13 +15,18 @@
 <!-- New template-->
 <!-- add / edit -->
 <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
+       <style type="text/css">
+               #floating-box {
+               position: relative;
+               z-index: 10;
+               }
+               #submitbox {
+               display: none;
+               }
+       </style>
        <script type="text/javascript">
                self.name="first_Window";
                <xsl:value-of select="lookup_functions"/>
-               function add_sub_entry()
-               {
-               document.add_sub_entry_form.submit();
-               }
                var project_type_id = '<xsl:value-of 
select="project_type_id"/>';
                var project_id = '<xsl:value-of select="value_project_id"/>';
                var location_item_id = '<xsl:value-of 
select="location_item_id"/>';
@@ -36,22 +41,6 @@
                        </dl>
                </xsl:when>
        </xsl:choose>
-       <table cellpadding="2" cellspacing="2" align="center">
-               <xsl:choose>
-                       <xsl:when test="value_project_id &gt; 0  and 
mode='edit'">
-                               <td valign="top">
-                                       <xsl:variable name="lang_add_sub_entry">
-                                               <xsl:value-of 
select="lang_add_sub_entry"/>
-                                       </xsl:variable>
-                                       <input type="button" class="pure-button 
pure-button-primary" id="add_sub_entry" name="add_sub_entry" 
value="{$lang_add_sub_entry}" onClick="add_sub_entry()">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_add_sub_entry_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </xsl:when>
-               </xsl:choose>
-       </table>
        <form ENCTYPE="multipart/form-data" method="post" id="form" name="form" 
action="{form_action}" class= "pure-form pure-form-aligned">
                <xsl:variable name="decimal_separator">
                        <xsl:value-of select="decimal_separator"/>
@@ -59,6 +48,69 @@
                <input id="project_tab" type="hidden" name="tab" value=""/>
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
+
+                       <div id="floating-box">
+                               <div id="submitbox">
+                                       <table>
+                                               <tbody>
+                                                       <tr>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="value_project_id &gt; 0  and mode='edit'">
+                                                                               
<td valign="top">
+                                                                               
        <xsl:variable name="lang_add_sub_entry">
+                                                                               
                <xsl:value-of select="lang_add_sub_entry"/>
+                                                                               
        </xsl:variable>
+                                                                               
        <input type="button" class="pure-button pure-button-primary" 
id="add_sub_entry" name="add_sub_entry" value="{$lang_add_sub_entry}" 
onClick="addSubEntry();">
+                                                                               
                <xsl:attribute name="title">
+                                                                               
                        <xsl:value-of select="lang_add_sub_entry_statustext"/>
+                                                                               
                </xsl:attribute>
+                                                                               
        </input>
+                                                                               
</td>
+                                                                       
</xsl:when>
+                                                               </xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="mode='edit'">
+                                                                               
<xsl:variable name="lang_save">
+                                                                               
        <xsl:value-of select="lang_save"/>
+                                                                               
</xsl:variable>
+                                                                               
<td>
+                                                                               
        <input type="hidden" name='save'  value=""/>
+                                                                               
        <input type="submit" id="submitform" class="pure-button 
pure-button-primary" name="values[save]" value="{$lang_save}">
+                                                                               
                <xsl:attribute name="title">
+                                                                               
                        <xsl:value-of select="lang_save_statustext"/>
+                                                                               
                </xsl:attribute>
+                                                                               
        </input>
+                                                                               
</td>
+                                                                       
</xsl:when>
+                                                                       
<xsl:when test="mode='view'">
+                                                                               
<xsl:variable name="lang_edit">
+                                                                               
        <xsl:value-of select="lang_edit"/>
+                                                                               
</xsl:variable>
+                                                                               
<td>
+                                                                               
        <input type="button" id="editform" class="pure-button 
pure-button-primary" name="edit" value="{$lang_edit}" 
onClick="document.edit_form.submit();">
+                                                                               
                <xsl:attribute name="title">
+                                                                               
                        <xsl:value-of select="lang_edit_statustext"/>
+                                                                               
                </xsl:attribute>
+                                                                               
        </input>
+                                                                               
</td>
+                                                                       
</xsl:when>
+                                                               </xsl:choose>
+                                                               <xsl:variable 
name="lang_done">
+                                                                       
<xsl:value-of select="lang_done"/>
+                                                               </xsl:variable>
+                                                               <td>
+                                                                       <input 
type="button" id="cancelform" class="pure-button pure-button-primary" 
name="done" value="{$lang_done}" onClick="document.done_form.submit();">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_done_statustext"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               </div>
+                       </div>
+
                        <div id="general">
                                <fieldset>
                                        <xsl:choose>
@@ -377,33 +429,33 @@
                                        <div id="ecodimb_container"/>
                                </div>
                                <xsl:if test="b_account_data =''">
-                               <div class="pure-control-group">
-                                       <xsl:variable 
name="lang_budget_account">
-                                               <xsl:value-of 
select="php:function('lang', 'budget account group')"/>
-                                       </xsl:variable>
-                                       <label>
-                                               <xsl:value-of 
select="$lang_budget_account"/>
-                                       </label>
-                                       <input type="hidden" 
id="b_account_group" name="values[b_account_group]"  
value="{b_account_group_data/value_b_account_id}"/>
-                                       <input type="text" 
id="b_account_group_name" name="values[b_account_group_name]" 
value="{b_account_group_data/value_b_account_name}">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="mode='edit'">
-                                                               <xsl:attribute 
name="data-validation">
-                                                                       
<xsl:text>required</xsl:text>
-                                                               </xsl:attribute>
-                                                               <xsl:attribute 
name="data-validation-error-msg">
-                                                                       
<xsl:value-of select="$lang_budget_account"/>
-                                                               </xsl:attribute>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               <xsl:attribute 
name="disabled">
-                                                                       
<xsl:text>disabled</xsl:text>
-                                                               </xsl:attribute>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </input>
-                                       <div id="b_account_group_container"/>
-                               </div>
+                                       <div class="pure-control-group">
+                                               <xsl:variable 
name="lang_budget_account">
+                                                       <xsl:value-of 
select="php:function('lang', 'budget account group')"/>
+                                               </xsl:variable>
+                                               <label>
+                                                       <xsl:value-of 
select="$lang_budget_account"/>
+                                               </label>
+                                               <input type="hidden" 
id="b_account_group" name="values[b_account_group]"  
value="{b_account_group_data/value_b_account_id}"/>
+                                               <input type="text" 
id="b_account_group_name" name="values[b_account_group_name]" 
value="{b_account_group_data/value_b_account_name}">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="mode='edit'">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="$lang_budget_account"/>
+                                                                       
</xsl:attribute>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                       
<xsl:attribute name="disabled">
+                                                                               
<xsl:text>disabled</xsl:text>
+                                                                       
</xsl:attribute>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                               </input>
+                                               <div 
id="b_account_group_container"/>
+                                       </div>
                                </xsl:if>
 
                                <xsl:if test="b_account_data !=''">
@@ -871,39 +923,6 @@
                </div>
 
                <!--/div-->
-               <div class="proplist-col">
-                       <xsl:choose>
-                               <xsl:when test="mode='edit'">
-                                       <xsl:variable name="lang_save">
-                                               <xsl:value-of 
select="lang_save"/>
-                                       </xsl:variable>
-                                       <input type="hidden" name='save'  
value=""/>
-                                       <input type="submit" id="submitform" 
class="pure-button pure-button-primary" name="values[save]" 
value="{$lang_save}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_save_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </xsl:when>
-                               <xsl:when test="mode='view'">
-                                       <xsl:variable name="lang_edit">
-                                               <xsl:value-of 
select="lang_edit"/>
-                                       </xsl:variable>
-                                       <input type="button" id="editform" 
class="pure-button pure-button-primary" name="edit" value="{$lang_edit}" 
onClick="document.edit_form.submit();">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_edit_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="lang_done">
-                               <xsl:value-of select="lang_done"/>
-                       </xsl:variable>
-                       <input type="button" id="cancelform" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}" 
onClick="document.done_form.submit();">
-                               <xsl:attribute name="title">
-                                       <xsl:value-of 
select="lang_done_statustext"/>
-                               </xsl:attribute>
-                       </input>
-               </div>
        </form>
        
        <xsl:variable name="done_action">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]