fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [16653] formatting


From: sigurdne
Subject: [Fmsystem-commits] [16653] formatting
Date: Fri, 28 Apr 2017 10:14:50 -0400 (EDT)

Revision: 16653
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16653
Author:   sigurdne
Date:     2017-04-28 10:14:50 -0400 (Fri, 28 Apr 2017)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/helpdesk/inc/class.uitts.inc.php
    trunk/helpdesk/templates/base/files.xsl
    trunk/helpdesk/templates/base/tts.xsl
    trunk/phpgwapi/templates/base/files.xsl
    trunk/phpgwapi/templates/portico/css/base.css
    trunk/phpgwapi/templates/pure/css/demo_mmenu.css
    trunk/preferences/templates/base/index.tpl
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/templates/base/group_select.xsl
    trunk/property/templates/base/user_id_select.xsl

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-04-28 14:14:50 UTC (rev 
16653)
@@ -1327,7 +1327,7 @@
                                'lang_part_of_town' => lang('Part of town'),
                                'lang_no_part_of_town' => lang('No part of 
town'),
                                'cat_select' => 
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
-                                       'selected' => $this->cat_id, 'use_acl' 
=> $this->_category_acl, 'required' => true)),
+                                       'selected' => $this->cat_id, 'use_acl' 
=> $this->_category_acl, 'required' => true,'class'=>'pure-input-1-2')),
                                'pref_send_mail' => 
(isset($GLOBALS['phpgw_info']['user']['preferences']['helpdesk']['tts_user_mailnotification'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['helpdesk']['tts_user_mailnotification']
 : ''),
                                'fileupload' => 
true,//(isset($this->bo->config->config_data['fmttsfileupload']) ? 
$this->bo->config->config_data['fmttsfileupload'] : ''),
                                'tabs' => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab)
@@ -1848,7 +1848,7 @@
 //_debug_array($supervisor_email);die();
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
                        $cat_select = 
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
-                               'selected' => $this->cat_id, 'use_acl' => 
$this->_category_acl, 'required' => true));
+                               'selected' => $this->cat_id, 'use_acl' => 
$this->_category_acl, 'required' => true,'class'=>'pure-input-1-2'));
 
                        $_ticket_cat_found = false;
                        if (isset($cat_select['cat_list']) && 
is_array($cat_select['cat_list']))

Modified: trunk/helpdesk/templates/base/files.xsl
===================================================================
--- trunk/helpdesk/templates/base/files.xsl     2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/helpdesk/templates/base/files.xsl     2017-04-28 14:14:50 UTC (rev 
16653)
@@ -1,149 +1,53 @@
-<xsl:template name="file_list">
-       <tr>
-               <td width="19%" align="left" valign="top">
-                       <xsl:value-of select="//lang_files"/>
-               </td>
-               <td>
-                       <table>
-                               <tr class="th">
-                                       <td class="th_text" width="85%" 
align="left">
-                                               <xsl:value-of 
select="lang_filename"/>
-                                       </td>
-                                       <td class="th_text" width="15%" 
align="center">
-                                               <xsl:value-of 
select="lang_file_action"/>
-                                       </td>
-                               </tr>
-                               <xsl:for-each select="files" >
-                                       <tr>
-                                               <xsl:attribute name="class">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="@class">
-                                                                       
<xsl:value-of select="@class"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="position() mod 2 = 0">
-                                                                       
<xsl:text>row_off</xsl:text>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:text>row_on</xsl:text>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                               <td align="left">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//link_to_files!=''">
-                                                                       
<xsl:variable name="link_to_file"><xsl:value-of 
select="//link_to_files"/>/<xsl:value-of select="directory"/>/<xsl:value-of 
select="file_name"/></xsl:variable>
-                                                                       <a 
href="{$link_to_file}" target="_blank" 
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:variable name="link_view_file"><xsl:value-of 
select="//link_view_file"/>&amp;file_name=<xsl:value-of 
select="file_name"/></xsl:variable>
-                                                                       <a 
href="{$link_view_file}" target="_blank" 
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:text> </xsl:text>
-                                               </td>
-                                               <td align="center">
-                                                       <input type="checkbox" 
name="values[file_action][]" value="{name}"  
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="//lang_file_action_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                               </xsl:for-each>
-                       </table>
-               </td>
-       </tr>
+
+<!-- $Id: files.xsl 15892 2016-10-24 13:50:59Z sigurdne $ -->
+
+<xsl:template name="multi_upload">
+       <xsl:apply-templates select="multi_upload"/>
 </xsl:template>
 
-<xsl:template name="file_list_view">
-       <tr>
-               <td align="left" valign="top">
-                       <xsl:value-of select="//lang_files"/>
-               </td>
-               <td>
-                       <table>
-                               <tr class="th">
-                                       <td class="th_text" width="85%" 
align="left">
-                                               <xsl:value-of 
select="lang_filename"/>
-                                       </td>
-                               </tr>
-                               <xsl:for-each select="files" >
-                                       <tr>
-                                               <xsl:attribute name="class">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="@class">
-                                                                       
<xsl:value-of select="@class"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="position() mod 2 = 0">
-                                                                       
<xsl:text>row_off</xsl:text>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:text>row_on</xsl:text>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:attribute>
-                                               <td align="left">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//link_to_files!=''">
-                                                                       
<xsl:variable name="link_to_file"><xsl:value-of 
select="//link_to_files"/>/<xsl:value-of select="directory"/>/<xsl:value-of 
select="file_name"/></xsl:variable>
-                                                                       <a 
href="{$link_to_file}" target="_blank" 
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:variable name="link_view_file"><xsl:value-of 
select="//link_view_file"/>&amp;file_name=<xsl:value-of 
select="file_name"/></xsl:variable>
-                                                                       <a 
href="{$link_view_file}" target="_blank" 
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:text> </xsl:text>
-                                               </td>
-                                       </tr>
-                               </xsl:for-each>
-                       </table>
-               </td>
-       </tr>
+<xsl:template xmlns:php="http://php.net/xsl"; match="multi_upload">
+       <xsl:call-template name="multi_upload_file"/>
 </xsl:template>
 
-<xsl:template name="file_upload" xmlns:php="http://php.net/xsl";>
-       <tr>
-               <td valign="top">
-                       <xsl:value-of select="lang_upload_file"/>
-               </td>
-               <td>
-                       <input type="file" name="file" size="40" 
onMouseout="window.status='';return true;">
-                               <xsl:attribute name="title">
-                                       <xsl:value-of 
select="//lang_file_statustext"/>
-                               </xsl:attribute>
-                       </input>
-               </td>
-       </tr>
+
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
+       <div class="pure-control-group">
+               <label>
+                       <xsl:value-of select="php:function('lang', 'upload 
files')"/>
+               </label>
+               <input type="file" name="file" size="40" class="pure-input-1-2" 
>
+                       <xsl:attribute name="title">
+                               <xsl:value-of select="php:function('lang', 
'Select file to upload')"/>
+                       </xsl:attribute>
+               </input>
+       </div>
        <xsl:choose>
                <xsl:when test="multiple_uploader!=''">
-                       <tr>
-                               <td>
+                       <div class="pure-control-group">
+                               <label>
                                        <a href="javascript:fileuploader()">
                                                <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="php:function('lang', 'upload multiple files')" />
+                                                       <xsl:value-of 
select="php:function('lang', 'upload multiple files')"/>
                                                </xsl:attribute>
-                                               <xsl:value-of 
select="php:function('lang', 'upload multiple files')" />
+                                               <xsl:value-of 
select="php:function('lang', 'upload multiple files')"/>
                                        </a>
-                               </td>
-                               <td>
-                               </td>
-                       </tr>
+                               </label>
+                       </div>
                </xsl:when>
        </xsl:choose>
 </xsl:template>
 
-<xsl:template name="jasper_upload" xmlns:php="http://php.net/xsl";>
-       <tr>
-               <td valign="top">
+<!-- New template-->
+<xsl:template xmlns:php="http://php.net/xsl"; name="jasper_upload">
+       <div class="pure-control-group">
+               <label>
                        <xsl:value-of select="php:function('lang', 'jasper 
upload')"/>
-               </td>
-               <td>
-                       <input type="file" name="jasperfile" size="40">
-                               <xsl:attribute name="title">
-                                       <xsl:value-of 
select="php:function('lang', 'upload a jasper definition file')"/>
-                               </xsl:attribute>
-                       </input>
-               </td>
-       </tr>
+               </label>
+               <input type="file" name="jasperfile" size="40">
+                       <xsl:attribute name="title">
+                               <xsl:value-of select="php:function('lang', 
'upload a jasper definition file')"/>
+                       </xsl:attribute>
+               </input>
+       </div>
 </xsl:template>

Modified: trunk/helpdesk/templates/base/tts.xsl
===================================================================
--- trunk/helpdesk/templates/base/tts.xsl       2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/helpdesk/templates/base/tts.xsl       2017-04-28 14:14:50 UTC (rev 
16653)
@@ -115,7 +115,7 @@
                                                                        
<xsl:variable name="select_priority_name">
                                                                                
<xsl:value-of select="select_priority_name"/>
                                                                        
</xsl:variable>
-                                                                       <select 
name="{$select_priority_name}" title="{$lang_priority_statustext}">
+                                                                       <select 
name="{$select_priority_name}" title="{$lang_priority_statustext}" 
class="pure-input-1-2" >
                                                                                
<xsl:apply-templates select="priority_list/options"/>
                                                                        
</select>
                                                                </div>
@@ -125,7 +125,7 @@
                                                                        
<xsl:value-of select="php:function('lang', 'status')"/>
                                                                </label>
 
-                                                               <select 
id="status_id" name="values[status]">
+                                                               <select 
id="status_id" name="values[status]" class="pure-input-1-2" >
                                                                        
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="php:function('lang', 'Set the status of the ticket')"/>
                                                                        
</xsl:attribute>
@@ -154,7 +154,7 @@
                                                        <xsl:value-of 
select="php:function('lang', 'subject')"/>
                                                </label>
 
-                                               <input type="text" 
name="values[subject]" value="{value_subject}" size="60" >
+                                               <input type="text" 
name="values[subject]" value="{value_subject}" size="60"  
class="pure-input-1-2" >
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="php:function('lang', 'Enter the subject of this ticket')"/>
                                                        </xsl:attribute>
@@ -174,7 +174,7 @@
                                                        <xsl:value-of 
select="php:function('lang', 'Details')"/>
                                                </label>
 
-                                               <textarea cols="60" rows="10" 
name="values[details]" >
+                                               <textarea cols="60" rows="10" 
name="values[details]"  class="pure-input-1-2" >
                                                        <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="php:function('lang', 'Enter the details of this ticket')"/>
                                                        </xsl:attribute>
@@ -209,7 +209,7 @@
                                                        <br/>
                                                        <xsl:text>Ctrl + 
V</xsl:text>
                                                </label>
-                                               <canvas title="Copy image data 
into clipboard and press Ctrl+V" style="border:1px solid grey;" id="my_canvas" 
width="100" height="100">
+                                               <canvas title="Copy image data 
into clipboard and press Ctrl+V" style="border:1px solid grey;" id="my_canvas" 
width="100" height="100" class="pure-input-1-2" >
                                                </canvas>
                                                <input type="hidden" 
id="pasted_image" name="pasted_image"></input>
                                                <input type="hidden" 
id="pasted_image_is_blank" name="pasted_image_is_blank" value="1"></input>
@@ -417,7 +417,7 @@
                                                                        
<xsl:variable name="select_priority_name">
                                                                                
<xsl:value-of select="select_priority_name"/>
                                                                        
</xsl:variable>
-                                                                       <select 
name="{$select_priority_name}" class="forms" 
title="{$lang_priority_statustext}" 
onMouseover="window.status='{$lang_priority_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                       <select 
name="{$select_priority_name}" title="{$lang_priority_statustext}" 
class="pure-input-1-2" >
                                                                                
<xsl:apply-templates select="priority_list/options"/>
                                                                        
</select>
                                                                </div>
@@ -426,7 +426,7 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'status')"/>
                                                                </label>
-                                                               <select 
id="status_id" name="values[status]" class="forms">
+                                                               <select 
id="status_id" name="values[status]" class="pure-input-1-2" >
                                                                        
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="php:function('lang', 'Set the status of the ticket')"/>
                                                                        
</xsl:attribute>
@@ -548,7 +548,7 @@
                                                        <br/>
                                                        <xsl:text>Ctrl + 
V</xsl:text>
                                                </label>
-                                               <canvas title="Copy image data 
into clipboard and press Ctrl+V" style="border:1px solid grey;" id="my_canvas" 
width="100" height="100">
+                                               <canvas title="Copy image data 
into clipboard and press Ctrl+V" style="border:1px solid grey;" id="my_canvas" 
width="100" height="100" class="pure-input-1-2" >
                                                </canvas>
                                                <input type="hidden" 
id="pasted_image" name="pasted_image"></input>
                                        </div>

Modified: trunk/phpgwapi/templates/base/files.xsl
===================================================================
--- trunk/phpgwapi/templates/base/files.xsl     2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/phpgwapi/templates/base/files.xsl     2017-04-28 14:14:50 UTC (rev 
16653)
@@ -14,28 +14,28 @@
 <xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
        <div class="pure-control-group">
                <label>
-                               <xsl:value-of select="php:function('lang', 
'upload files')"/>
+                       <xsl:value-of select="php:function('lang', 'upload 
files')"/>
                </label>
-                               <input type="file" name="file" size="40">
-                                       <xsl:attribute name="title">
-                                               <xsl:value-of 
select="php:function('lang', 'Select file to upload')"/>
-                                       </xsl:attribute>
-                               </input>
+               <input type="file" name="file" size="40" class="pure-input-1-2" 
>
+                       <xsl:attribute name="title">
+                               <xsl:value-of select="php:function('lang', 
'Select file to upload')"/>
+                       </xsl:attribute>
+               </input>
        </div>
-               <xsl:choose>
-                       <xsl:when test="multiple_uploader!=''">
+       <xsl:choose>
+               <xsl:when test="multiple_uploader!=''">
                        <div class="pure-control-group">
                                <label>
-                                               <a 
href="javascript:fileuploader()">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="php:function('lang', 'upload multiple files')"/>
-                                                       </xsl:attribute>
+                                       <a href="javascript:fileuploader()">
+                                               <xsl:attribute name="title">
                                                        <xsl:value-of 
select="php:function('lang', 'upload multiple files')"/>
-                                               </a>
+                                               </xsl:attribute>
+                                               <xsl:value-of 
select="php:function('lang', 'upload multiple files')"/>
+                                       </a>
                                </label>
                        </div>
-                       </xsl:when>
-               </xsl:choose>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
@@ -42,12 +42,12 @@
 <xsl:template xmlns:php="http://php.net/xsl"; name="jasper_upload">
        <div class="pure-control-group">
                <label>
-                               <xsl:value-of select="php:function('lang', 
'jasper upload')"/>
+                       <xsl:value-of select="php:function('lang', 'jasper 
upload')"/>
                </label>
-                               <input type="file" name="jasperfile" size="40">
-                                       <xsl:attribute name="title">
-                                               <xsl:value-of 
select="php:function('lang', 'upload a jasper definition file')"/>
-                                       </xsl:attribute>
-                               </input>
+               <input type="file" name="jasperfile" size="40">
+                       <xsl:attribute name="title">
+                               <xsl:value-of select="php:function('lang', 
'upload a jasper definition file')"/>
+                       </xsl:attribute>
+               </input>
        </div>
 </xsl:template>

Modified: trunk/phpgwapi/templates/portico/css/base.css
===================================================================
--- trunk/phpgwapi/templates/portico/css/base.css       2017-04-28 07:20:21 UTC 
(rev 16652)
+++ trunk/phpgwapi/templates/portico/css/base.css       2017-04-28 14:14:50 UTC 
(rev 16653)
@@ -57,6 +57,7 @@
 H1 A:visited ,
 H1 A:hover {
        color: #C30 !important;
+
 }
 
 H2 {
@@ -139,7 +140,8 @@
 
 #navigation {
        padding: 5px 5px 7px 3em;
-       background-color: #A4C2C2;
+/*     background-color: #A4C2C2;*/
+       background-color: rgba(224, 224, 224, 1);
        border-top: 1px solid #FFF;
        border-bottom: 1px solid #FFF;
        text-align:             right;
@@ -416,7 +418,8 @@
 
 .ui-layout-north {
        border-bottom: none;
-       background-color: #677;
+       background-color: rgba(21, 123, 175, 1);
+       /*background-color: #677;*/
 }
 
 .ui-layout-west {
@@ -524,7 +527,8 @@
        padding-right:  1px;
 }
 .button-bar {
-    background-color: #a4c2c2;
+  /*  background-color: #a4c2c2;*/
+       background-color: rgba(224, 224, 224, 1);
     border-bottom: 1px solid #fff;
     border-top: 1px solid #fff;
     padding: 5px 5px 7px 3em;

Modified: trunk/phpgwapi/templates/pure/css/demo_mmenu.css
===================================================================
--- trunk/phpgwapi/templates/pure/css/demo_mmenu.css    2017-04-28 07:20:21 UTC 
(rev 16652)
+++ trunk/phpgwapi/templates/pure/css/demo_mmenu.css    2017-04-28 14:14:50 UTC 
(rev 16653)
@@ -59,7 +59,7 @@
 .header,
 .footer
 {
-       background: #677;
+       background: rgba(21, 123, 175, 1);
        font-size: 16px;
        font-weight: bold;
        color: #fff;
@@ -73,6 +73,12 @@
        padding: 0 50px;
 }
 
+.header select
+{
+       color: black;
+       font-weight: normal;
+       font-size: 12px;
+}
 .header.mm-fixed-top
 {
        position: fixed;
@@ -114,10 +120,16 @@
 
 .content
 {
-       padding: 15px 0px 50px 0px;
+       padding: 20px 0px 50px 0px;
 }
 
 div.dt-buttons {
     float: none !important;
     text-align: left;
+}
+div.error, div.warn div.msg_good{
+    padding: 20px;
+}
+.msg_good{
+    padding: 20px;
 }
\ No newline at end of file

Modified: trunk/preferences/templates/base/index.tpl
===================================================================
--- trunk/preferences/templates/base/index.tpl  2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/preferences/templates/base/index.tpl  2017-04-28 14:14:50 UTC (rev 
16653)
@@ -1,5 +1,5 @@
 <!-- BEGIN list -->
-<div id="preferences-index">
+<div id="preferences-index" class="content">
        <div id="tab-content">
        {tabs}
                <div id="user">

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/property/inc/class.botts.inc.php      2017-04-28 14:14:50 UTC (rev 
16653)
@@ -1288,38 +1288,55 @@
                                $body .= lang('Group') . ': ' . $group_name . 
"\n";
                        }
 
-                       /*                       * 
************************************************************\
-                        * Display additional notes                             
        *
-                         
\************************************************************* */
-//                     if($fields_updated)
+                       if ($timestampclosed)
                        {
-                               $i = 1;
+                               $body .= lang('Date Closed') . ': ' . 
$timestampclosed . "\n\n";
+                       }
 
-                               $history_array = 
$this->historylog->return_array(array(), array('C'), 'history_id', 'DESC', $id);
+                       $body .= lang('Opened By') . ': ' . 
$ticket['user_name'] . "\n\n";
+                       $body = nl2br($body);
 
-                               foreach ($history_array as $value)
-                               {
-                                       $body .= lang('Date') . ': ' . 
$GLOBALS['phpgw']->common->show_date($value['datetime']) . "\n";
-                                       $body .= lang('User') . ': ' . 
$value['owner'] . "\n";
-                                       $body .=lang('Note') . ': ' . 
nl2br(stripslashes($value['new_value'])) . "\n\n";
-                                       $i++;
-                               }
-                               $subject .= "::{$i}";
-                       }
-                       /*                       * 
************************************************************\
-                        * Display record history                               
        *
-                         
\************************************************************* */
+                       $i = 1;
+                       $lang_date = lang('date');
+                       $lang_user = lang('user');
+                       $lang_note = lang('note');
+                       $table_content = <<<HTML
+               <thead>
+                       <tr>
+                               <th>
+                                       #
+                               </th>
+                               <th>
+                                       {$lang_date}
+                               </th>
+                               <th>
+                                       {$lang_user}
+                               </th>
+                               <th>
+                                       {$lang_note}
+                               </th>
+                       </tr>
+               </thead>
+HTML;
+                       $table_content .= 
"<tr><td>{$i}</td><td>{$entry_date}</td><td>{$ticket['user_name']}</td><td>{$ticket['details']}</td></tr>";
 
-                       if ($timestampclosed)
+                       $history_array = 
$this->historylog->return_array(array(), array('C'), 'history_id', 'DESC', $id);
+
+                       foreach ($history_array as $value)
                        {
-                               $body .= lang('Date Closed') . ': ' . 
$timestampclosed . "\n\n";
+                               $i++;
+                               $_date =  
$GLOBALS['phpgw']->common->show_date($value['datetime']);
+                               $_note =  stripslashes($value['new_value']);
+                               $table_content .= 
"<tr><td>{$i}</td><td>{$_date}</td><td>{$value['owner']}</td><td>{$_note}</td></tr>";
                        }
+                       $body.= "<table class='pure-table pure-table-bordered 
pure-table-striped'>{$table_content}</table>";
+                       $subject .= "::{$i}";
 
 
-                       $body .= lang('Opened By') . ': ' . 
$ticket['user_name'] . "\n\n";
-                       $body .= lang('First Note Added') . ":\n";
-                       $body .= stripslashes(strip_tags($ticket['details'])) . 
"\n\n";
+               //      $body .= lang('First Note Added') . ":\n";
 
+               //      $body .= stripslashes(strip_tags($ticket['details'])) . 
"\n\n";
+
                        if ($get_message)
                        {
                                return array('subject' => $subject, 'body' => 
$body);
@@ -1440,8 +1457,6 @@
                        if ($toarray)
                        {
                                $to = implode(';', $toarray);
-                               $body = nl2br($body);
-
                                if 
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) && 
$GLOBALS['phpgw_info']['server']['smtp_server'])
                                {
                                        try

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2017-04-28 07:20:21 UTC (rev 
16652)
+++ trunk/property/inc/class.uitts.inc.php      2017-04-28 14:14:50 UTC (rev 
16653)
@@ -230,13 +230,29 @@
                        $id = phpgw::get_var('id', 'int');
 
                        $ticket = $this->bo->mail_ticket($id, $fields_updated = 
true, $receipt = array(), $location_code = '', $get_message = true);
+                       $lang_print = lang('print');
 
-                       $html = 
"<html><head><title>{$ticket['subject']}</title></head>";
-                       $html .= "<body>";
-                       $html .= $ticket['subject'] . '</br></br>';
-                       $html .= nl2br($ticket['body']);
-                       $html .= "</body></html>";
+                       $html = <<<HTML
 
+                       <!DOCTYPE html>
+                       <html>
+                               <head>
+                                       <title>{$ticket['subject']}</title>
+                                       <link 
href="{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/pure/css/pure-min.css"
 type="text/css" rel="StyleSheet">
+                               </head>
+                               <body>
+                                       <script type="text/javascript">
+                                                       
document.write("<form><input type=button "
+                                                       
+"value=\"{$lang_print}\" onClick=\"window.print();\"></form>");
+                                       </script>
+
+
+                                       {$ticket['subject']}<br/><br/>
+                                       {$ticket['body']}
+                               </body>
+                       </html>
+HTML;
+
                        echo $html;
                }
 

Modified: trunk/property/templates/base/group_select.xsl
===================================================================
--- trunk/property/templates/base/group_select.xsl      2017-04-28 07:20:21 UTC 
(rev 16652)
+++ trunk/property/templates/base/group_select.xsl      2017-04-28 14:14:50 UTC 
(rev 16653)
@@ -7,7 +7,7 @@
                <xsl:variable name="select_group_name">
                        <xsl:value-of select="select_group_name"/>
                </xsl:variable>
-               <select name="{$select_group_name}" id="group_id" class="forms" 
title="{$lang_group_statustext}">
+               <select name="{$select_group_name}" id="group_id" 
title="{$lang_group_statustext}" class="pure-input-1-2" >
                        <option value="">
                                <xsl:value-of select="lang_no_group"/>
                        </option>

Modified: trunk/property/templates/base/user_id_select.xsl
===================================================================
--- trunk/property/templates/base/user_id_select.xsl    2017-04-28 07:20:21 UTC 
(rev 16652)
+++ trunk/property/templates/base/user_id_select.xsl    2017-04-28 14:14:50 UTC 
(rev 16653)
@@ -7,7 +7,7 @@
                <xsl:variable name="select_user_name">
                        <xsl:value-of select="select_user_name"/>
                </xsl:variable>
-               <select name="{$select_user_name}" id="user_id" class="forms" 
title="{$lang_user_statustext}">
+               <select name="{$select_user_name}" id="user_id" 
title="{$lang_user_statustext}" class="pure-input-1-2" >
                        <option value="">
                                <xsl:value-of select="lang_no_user"/>
                        </option>




reply via email to

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