[Fmsystem-commits] [17147] More on helpdesk

[sigurdne]

Revision: 17147
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17147
Author:   sigurdne
Date:     2017-10-10 04:41:23 -0400 (Tue, 10 Oct 2017)
Log Message:
-----------
More on helpdesk

Modified Paths:
--------------
    trunk/helpdesk/js/portico/tts.add.js
    trunk/helpdesk/templates/base/tts.xsl

Modified: trunk/helpdesk/js/portico/tts.add.js
===================================================================
--- trunk/helpdesk/js/portico/tts.add.js        2017-10-10 08:03:06 UTC (rev 
17146)
+++ trunk/helpdesk/js/portico/tts.add.js        2017-10-10 08:41:23 UTC (rev 
17147)
@@ -87,7 +87,7 @@
        var image_data = canvas.toDataURL('image/png');
        $('#pasted_image').val(image_data);
        $('#pasted_image_is_blank').val(0);
-       confirm_session('apply');
+//     confirm_session('apply');
 }
 
 $(document).ready(function ()
@@ -189,7 +189,7 @@
                                                        
this.paste_createImage(source);
                                                }
                                        }
-                                       e.preventDefault();
+               //                      e.preventDefault();
                                }
                                else
                                {

Modified: trunk/helpdesk/templates/base/tts.xsl
===================================================================
--- trunk/helpdesk/templates/base/tts.xsl       2017-10-10 08:03:06 UTC (rev 
17146)
+++ trunk/helpdesk/templates/base/tts.xsl       2017-10-10 08:41:23 UTC (rev 
17147)
@@ -665,34 +665,27 @@
                                        <div class="pure-control-group">
                                                <label>
                                                        <a 
href="javascript:notify_contact_lookup()" title="{$lang_contact_statustext}">
-                                                               <xsl:value-of 
select="php:function('lang', 'contact')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'add')"/>
                                                        </a>
                                                </label>
                                                <input type="hidden" 
id="notify_contact" name="notify_contact" value="">
                                                </input>
                                                <input type="hidden" 
name="notify_contact_name" value="" onClick="notify_contact_lookup();" 
readonly="readonly"/>
+                                               <div class="pure-u-md-1-2" >
+                                                       <xsl:for-each 
select="datatable_def">
+                                                               <xsl:if 
test="container = 'datatable-container_6'">
+                                                                       
<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="data" select ='data'/>
+                                                                               
<xsl:with-param name="tabletools" select ='tabletools'/>
+                                                                               
<xsl:with-param name="config" select ='config'/>
+                                                                       
</xsl:call-template>
+                                                               </xsl:if>
+                                                       </xsl:for-each>
+                                               </div>
                                        </div>
-                                       <div class="pure-control-group">
-                                               <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'notify')"/>
-                                               </label>
-
-                                               <!--div id="paging_5"> </div>
-                                               <div class="pure-table" 
id="datatable-container_5"/>
-                                               <div 
id="datatable-buttons_5"/-->
-                                               <xsl:for-each 
select="datatable_def">
-                                                       <xsl:if test="container 
= 'datatable-container_6'">
-                                                               
<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="data" select ='data'/>
-                                                                       
<xsl:with-param name="tabletools" select ='tabletools'/>
-                                                                       
<xsl:with-param name="config" select ='config'/>
-                                                               
</xsl:call-template>
-                                                       </xsl:if>
-                                               </xsl:for-each>
-                                       </div>
                                </fieldset>
                        </div>
                        <div id="history">
@@ -717,10 +710,10 @@
                        <input type="hidden" id="save" name="values[save]" 
value=""/>
                        <input type="button" class="pure-button 
pure-button-primary" name="save" onClick="confirm_session('save');">
                                <xsl:attribute name="value">
-                                       <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                       <xsl:value-of 
select="php:function('lang', 'send')"/>
                                </xsl:attribute>
                                <xsl:attribute name="title">
-                                       <xsl:value-of 
select="php:function('lang', 'save the ticket')"/>
+                                       <xsl:value-of 
select="php:function('lang', 'send')"/>
                                </xsl:attribute>
                        </input>
                        <xsl:variable name="lang_done">
@@ -804,7 +797,7 @@
                                                <xsl:variable name="name">
                                                        <xsl:value-of 
select="name"/>
                                                </xsl:variable>
-                                               <input type="submit" 
class="pure-button pure-button-primary" name="location" value="{$name}" 
onMouseout="window.status='';return true;">
+                                               <input type="submit" 
class="pure-button pure-button-primary" name="location" value="{$name}">
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="lang_start_statustext"/>
                                                        </xsl:attribute>