[Fmsystem-commits] [10327] Controller: Changed setting of view from ui-class to xsl-file

[Torstein]

Revision: 10327
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10327
Author:   vator
Date:     2012-10-24 08:07:17 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controller: Changed setting of view from ui-class to xsl-file

Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/templates/base/case/view_case_message.xsl

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-10-24 07:57:40 UTC (rev 
10326)
+++ trunk/controller/inc/class.uicase.inc.php   2012-10-24 08:07:17 UTC (rev 
10327)
@@ -396,7 +396,7 @@
                        $data = array
                        (
                                'control'                                       
                                => $control->toArray(),
-                               //'message_ticket_id'                   => 
$message_ticket_id,
+                               'message_ticket_id'                             
=> $message_ticket_id,
                                'message_ticket'                                
        => $message_ticket,
                                'category'                                      
                        => $category[0]['name'],
                                'location_array'                                
        => $location_array,
@@ -408,20 +408,7 @@
                                'current_month_nr'                              
=> $month,
                                'type'                                          
                                => $type,
                                'building_location_code'        => 
$building_location_code,
-                               'location_level'                                
        => $level,
-                               'url_ticket_view'                               
        =>      $GLOBALS['phpgw']->link('/index.php', array
-                                                                               
                                                                                
(
-                                                                               
                                                                                
        'menuaction'    => 'property.uitts.view', 
-                                                                               
                                                                                
        'id'                    => $message_ticket_id
-                                                                               
                                                                                
)
-                                                                               
                                                                        ),
-
-                               'url_ticket_new'                                
        =>      $GLOBALS['phpgw']->link('/index.php', array
-                                                                               
                                                                                
(
-                                                                               
                                                                                
        'menuaction'    => 'controller.uicase.create_case_message', 
-                                                                               
                                                                                
        'check_list_id' => $check_list->get_id()
-                                                                               
                                                                                
)
-                                                                               
                                                                        ),
+                               'location_level'                                
        => $level
                        );
                        
                        phpgwapi_jquery::load_widget('core');

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2012-10-24 07:57:40 UTC (rev 
10326)
+++ trunk/controller/setup/phpgw_no.lang        2012-10-24 08:07:17 UTC (rev 
10327)
@@ -361,3 +361,5 @@
 error_msg_no_controls_in_period        controller      no      Ingen 
kontroller for bygg i denne perioden
 error_msg_no_controls_for_component    controller      no      Ingen 
kontroller for komponent i denne perioden
 role at location       controller      no      Tildeling av rolle
+Register new message   controller      no      Registrer ny melding
+Show message   controller      no      Vis melding
\ No newline at end of file

Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl  2012-10-24 
07:57:40 UTC (rev 10326)
+++ trunk/controller/templates/base/case/view_case_message.xsl  2012-10-24 
08:07:17 UTC (rev 10327)
@@ -72,9 +72,15 @@
        <h3 class="box_header ext">Melding registrert</h3>
        <div id="caseMessage" class="box ext">
                
-                       <a id="showMessage" target="_blank" 
href="{url_ticket_view}">
-                       Vis melding
-                       </a>
+                               <xsl:variable name="show_ticket_params">
+                                       
<xsl:text>menuaction:property.uitts.view, id:</xsl:text>
+                                       <xsl:value-of 
select="message_ticket_id" />
+                               </xsl:variable>
+                               <xsl:variable name="show_ticket_url">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $show_ticket_params )" />
+                               </xsl:variable>
+                               <a id="showMessage" target="_blank" 
href="{$show_ticket_url}"><xsl:value-of select="php:function('lang', 'Show 
message')" /></a>
+               
                    <!-- === TITLE === -->
                    <div class="row">                           
                                <label>Tittel på 
melding:</label><span><xsl:value-of select="message_ticket/subject"/></span>
@@ -109,9 +115,15 @@
                                </xsl:choose>
                        </xsl:for-each>
                </ul>
-               <a class="btn" href="{url_ticket_new}">
-             Registrer ny melding
-               </a>
+               
+               <xsl:variable name="new_ticket_params">
+                       
<xsl:text>menuaction:controller.uicase.create_case_message, 
check_list_id:</xsl:text>
+                       <xsl:value-of select="check_list/id" />
+               </xsl:variable>
+               <xsl:variable name="new_ticket_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $new_ticket_params)" />
+               </xsl:variable>
+               <a class="btn" href="{$new_ticket_url}"><xsl:value-of 
select="php:function('lang', 'Register new message')" /></a>
        </div>
 </div>
 </xsl:template>