fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8538]


From: Torstein
Subject: [Fmsystem-commits] [8538]
Date: Mon, 09 Jan 2012 10:22:52 +0000

Revision: 8538
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8538
Author:   vator
Date:     2012-01-09 10:22:51 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/setup/tables_update.inc.php
    trunk/controller/templates/base/check_list/register_errors.xsl
    trunk/controller/templates/base/check_list/view_closed_errors.xsl
    trunk/controller/templates/base/check_list/view_control_details.xsl
    trunk/controller/templates/base/check_list/view_control_items.xsl
    trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
    trunk/controller/templates/base/check_list/view_measurements.xsl
    trunk/controller/templates/base/check_list/view_open_errors.xsl
    trunk/controller/templates/base/css/base.css

Added Paths:
-----------
    trunk/controller/templates/base/case/
    trunk/controller/templates/base/case/create_case.xsl
    trunk/controller/templates/base/case/view_case.xsl

Removed Paths:
-------------
    trunk/controller/templates/base/create_error_report_message.xsl
    trunk/controller/templates/base/view_error_report_message.xsl

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-01-09 10:19:26 UTC 
(rev 8537)
+++ trunk/controller/setup/tables_update.inc.php        2012-01-09 10:22:51 UTC 
(rev 8538)
@@ -389,10 +389,9 @@
                );
                
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_item', 
'measurement',array(
-                       'type' => 'int',
-                       'precision' => 8,
-                       'nullable' => true,
-                       'default' => 0
+                       'type' => 'varchar',
+                       'precision' => 50,
+                       'nullable' => true
                ));
 
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.18';

Copied: trunk/controller/templates/base/case/create_case.xsl (from rev 8487, 
trunk/controller/templates/base/create_error_report_message.xsl)
===================================================================
--- trunk/controller/templates/base/case/create_case.xsl                        
        (rev 0)
+++ trunk/controller/templates/base/case/create_case.xsl        2012-01-09 
10:22:51 UTC (rev 8538)
@@ -0,0 +1,98 @@
+<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
+<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+       
+               <h1>Registrer avviksmelding</h1>
+               
+               <div class="tab_menu">
+                       <a class="active" href="#">Meldingen gjelder</a>
+               </div>  
+               <div id="case_details">
+                       <h3 class="first">Tittel på kontroll: <xsl:value-of 
select="control_array/title"/></h3>
+                       <xsl:choose>
+                               <xsl:when test="check_list/completed_date != 0">
+                                       <h3>Kontroll ble utført 
dato:<xsl:value-of select="php:function('date', $date_format, 
number(check_list/completed_date))"/></h3>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <h3>Kontroll ble utført dato: Ikke 
registrert utført</h3>
+                               </xsl:otherwise>
+                       </xsl:choose>
+                       <h3 class="last">Bygg: <xsl:value-of 
select="location_array/loc1_name"/></h3>
+               </div>
+               
+               <div class="tab_menu">
+                       <a class="active" href="#">Detaljer for meldingen</a>
+               </div>
+               <fieldset id="case_details">
+                       <xsl:choose>
+                               <xsl:when 
test="check_list/check_item_array/child::node()">
+                                       
+                               <form class="frm_save_case" 
action="index.php?menuaction=controller.uicase.save_case" method="post">
+                                       <input>
+                                     <xsl:attribute 
name="name">check_list_id</xsl:attribute>
+                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
+                                     <xsl:attribute name="value">
+                                       <xsl:value-of select="check_list/id"/>
+                                     </xsl:attribute>
+                                   </input>
+                                   <input>
+                                     <xsl:attribute 
name="name">location_code</xsl:attribute>
+                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
+                                     <xsl:attribute name="value">
+                                       <xsl:value-of 
select="location_array/location_code"/>
+                                     </xsl:attribute>
+                                   </input>
+                                   
+                                   <div>
+                                               <label>Tittel på melding</label>
+                                               <input name="message_title" 
type="text" />
+                                       </div>
+                                       
+                                       <div>
+                                               <label>Kategori</label>
+                                                <select name="message_cat_id">
+                                                       <option value="0">Velg 
kategori</option>
+                                                       <xsl:for-each 
select="categories/cat_list">
+                                                               <xsl:variable 
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
+                                                               <option 
value="{$cat_id}">
+                                                                       
<xsl:value-of select="./name"/>
+                                                               </option>       
                
+                                                       </xsl:for-each>
+                                               </select>
+                                       </div>
+                       
+                                       <h3 class="check_item_details">Velg 
sjekkpunkter som skal være med i avviksmelding</h3>                             
    
+                                       <ul class="check_items">
+                                               <xsl:for-each 
select="check_list/check_item_array">
+                                                       <li>
+                                                               <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
+                                                               <h5><input 
type="checkbox" name="check_item_ids[]" value="{$check_item_id}" 
/><span><xsl:value-of select="control_item/title"/></span></h5>                 
                            
+                                                       </li>
+                                               </xsl:for-each>
+                                       </ul>
+                                       
+                                         <div class="form-buttons">
+                                               <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
+                                               <input class="btn" 
type="submit" name="save_control" value="Registrer avviksmelding" 
title="{$lang_save}" />
+                                         </div>
+                               </form>                 
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       Ingen registrerte avvik
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </fieldset>
+               
+               <a class="btn">
+               <xsl:attribute name="href">
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+                               <xsl:text>&amp;check_list_id=</xsl:text>
+                               <xsl:value-of select="check_list/id"/>
+                       </xsl:attribute>
+             Vis sjekkliste
+           </a>
+                       
+</div>
+</xsl:template>


Property changes on: trunk/controller/templates/base/case/create_case.xsl
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Copied: trunk/controller/templates/base/case/view_case.xsl (from rev 8487, 
trunk/controller/templates/base/view_error_report_message.xsl)
===================================================================
--- trunk/controller/templates/base/case/view_case.xsl                          
(rev 0)
+++ trunk/controller/templates/base/case/view_case.xsl  2012-01-09 10:22:51 UTC 
(rev 8538)
@@ -0,0 +1,68 @@
+<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
+<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+       
+               <h1>Avviksmelding registrert</h1>
+               
+               <div class="tab_menu">
+                       <a class="active" href="#">Meldingen gjaldt</a>
+               </div>  
+               <div id="case_details">
+                       <h3>Bygg: <xsl:value-of 
select="location_array/loc1_name"/></h3>
+                       <h3>Tittel på kontroll: <xsl:value-of 
select="control_array/title"/></h3>
+                       <xsl:choose>
+                               <xsl:when test="check_list/completed_date != 0">
+                                       <h3>Kontroll ble utført dato: 
<xsl:value-of select="php:function('date', $date_format, 
number(check_list/completed_date))"/></h3>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <h3>Kontroll ble utført dato:  Ikke 
registrert utført</h3>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </div>
+               
+               <div class="tab_menu">
+                       <a class="active" href="#">Detaljer for melding</a>
+               </div>
+               <div id="case_details">
+                       <div>       
+                               <label>Tittel på melding</label>
+                               <xsl:value-of select="message_ticket/subject"/>
+                       </div>
+                       
+                       <div>
+                               <label>Kategori</label>
+                               <span><xsl:value-of select="category"/></span> 
+                       </div>
+       
+       
+                       <h3 class="check_item_details">Avviksmeldingen omfattet 
følgende punkter</h3>                                   
+                       <ul class="check_items">
+                               <xsl:for-each 
select="registered_message_check_items">
+                                       <li>
+                                               <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
+                                               <h5><xsl:value-of 
select="control_item/title"/></h5>                                            
+                                       </li>
+                               </xsl:for-each>
+                       </ul>
+               </div>
+               
+               <a class="btn">
+                       <xsl:attribute name="href">
+                               
<xsl:text>index.php?menuaction=controller.uicase.create_case</xsl:text>
+                               <xsl:text>&amp;check_list_id=</xsl:text>
+                               <xsl:value-of select="check_list/id"/>
+                       </xsl:attribute>
+             Registrer ny melding
+           </a>
+               <a class="btn">
+               <xsl:attribute name="href">
+                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+                               <xsl:text>&amp;check_list_id=</xsl:text>
+                               <xsl:value-of select="check_list/id"/>
+                       </xsl:attribute>
+             Endre sjekkliste
+           </a>
+</div>
+</xsl:template>


Property changes on: trunk/controller/templates/base/case/view_case.xsl
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/controller/templates/base/check_list/register_errors.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_errors.xsl      
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/register_errors.xsl      
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="register_errors" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
 
 <div id="error_message_menu">
        <a class="btn" id="view_open_errors">                                   
@@ -8,6 +8,7 @@
                        
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
+                       <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                </xsl:attribute>
                Vis avvik/måling
        </a>

Modified: trunk/controller/templates/base/check_list/view_closed_errors.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_errors.xsl   
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_closed_errors.xsl   
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="view_closed_errors">
+<xsl:template match="data">
 
 <div id="error_message_menu">
        <a class="btn" id="register_errors">                                    
@@ -14,7 +14,7 @@
        </a>
        <a class="btn">
                <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+                       
<xsl:text>index.php?menuaction=controller.uicase.create_case</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
                </xsl:attribute>

Modified: trunk/controller/templates/base/check_list/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl 
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl 
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,7 +1,7 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 <xsl:variable name="date_format">d/m-Y</xsl:variable>
 
-<xsl:template match="view_control_details" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
        
 
        <fieldset>

Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl   
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="view_control_items">
+<xsl:template match="data">
 
 <ul class="groups">
        <xsl:for-each select="saved_groups_with_items_array">

Modified: 
trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl   
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl   
2012-01-09 10:22:51 UTC (rev 8538)
@@ -6,11 +6,13 @@
                
        <script>
        
+               // ======================  LASTER FANEN view_open_errors NÅR 
SIDEN LASTES FØRSTE GANG  ===================
                $(document).ready(function() {
-                               var requestUrl = 
$("#view_open_errors").attr("href");
-                               load_tab(requestUrl);
-                       });
+                       var requestUrl = $("#view_open_errors").attr("href");
+                       load_tab(requestUrl);
+               });
                        
+               // ======================  FUNKSJONALITET FOR LASTING AV TABS 
===================
                $(function() {
                                        
                        $("#register_errors").live("click", function(){

Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl    
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="view_measurements">
+<xsl:template match="data">
 
 <div id="error_message_menu">
        <a class="btn" id="register_errors">                                    
@@ -8,12 +8,13 @@
                        
<xsl:text>index.php?menuaction=controller.uicheck_list.register_errors</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
+                       <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                </xsl:attribute>
                Registrer sak/måling
        </a>
        <a class="btn">
                <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+                       
<xsl:text>index.php?menuaction=controller.uicase.create_case</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
                </xsl:attribute>
@@ -38,6 +39,7 @@
                                
<xsl:text>index.php?menuaction=controller.uicheck_list.view_closed_errors</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
+                               
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                        </xsl:attribute>
                        Vis lukkede saker
                </a>

Modified: trunk/controller/templates/base/check_list/view_open_errors.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_errors.xsl     
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/check_list/view_open_errors.xsl     
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,6 +1,6 @@
 <!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
 
-<xsl:template match="view_open_errors" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
 
 <div id="error_message_menu">
        <a class="btn" id="register_errors">                                    
@@ -8,12 +8,13 @@
                        
<xsl:text>index.php?menuaction=controller.uicheck_list.register_errors</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
+                       <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                </xsl:attribute>
                Registrer sak/måling
        </a>
        <a class="btn">
                <xsl:attribute name="href">
-                       
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+                       
<xsl:text>index.php?menuaction=controller.uicase.create_case</xsl:text>
                        <xsl:text>&amp;check_list_id=</xsl:text>
                        <xsl:value-of select="check_list/id"/>
                </xsl:attribute>
@@ -38,6 +39,7 @@
                                
<xsl:text>index.php?menuaction=controller.uicheck_list.view_closed_errors</xsl:text>
                                <xsl:text>&amp;check_list_id=</xsl:text>
                                <xsl:value-of select="check_list/id"/>
+                               
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
                        </xsl:attribute>
                        Vis lukkede saker
                </a>

Deleted: trunk/controller/templates/base/create_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/create_error_report_message.xsl     
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/create_error_report_message.xsl     
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,98 +0,0 @@
-<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
-<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-       
-               <h1>Registrer avviksmelding</h1>
-               
-               <div class="tab_menu">
-                       <a class="active" href="#">Meldingen gjelder</a>
-               </div>  
-               <div id="error_report_message_details">
-                       <h3 class="first">Tittel på kontroll: <xsl:value-of 
select="control_array/title"/></h3>
-                       <xsl:choose>
-                               <xsl:when test="check_list/completed_date != 0">
-                                       <h3>Kontroll ble utført 
dato:<xsl:value-of select="php:function('date', $date_format, 
number(check_list/completed_date))"/></h3>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <h3>Kontroll ble utført dato: Ikke 
registrert utført</h3>
-                               </xsl:otherwise>
-                       </xsl:choose>
-                       <h3 class="last">Bygg: <xsl:value-of 
select="location_array/loc1_name"/></h3>
-               </div>
-               
-               <div class="tab_menu">
-                       <a class="active" href="#">Detaljer for meldingen</a>
-               </div>
-               <fieldset id="error_report_message_details">
-                       <xsl:choose>
-                               <xsl:when 
test="check_list/check_item_array/child::node()">
-                                       
-                               <form class="frm_save_error_report_message" 
action="index.php?menuaction=controller.uierror_report_message.save_error_report_message"
 method="post">
-                                       <input>
-                                     <xsl:attribute 
name="name">check_list_id</xsl:attribute>
-                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
-                                     <xsl:attribute name="value">
-                                       <xsl:value-of select="check_list/id"/>
-                                     </xsl:attribute>
-                                   </input>
-                                   <input>
-                                     <xsl:attribute 
name="name">location_code</xsl:attribute>
-                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
-                                     <xsl:attribute name="value">
-                                       <xsl:value-of 
select="location_array/location_code"/>
-                                     </xsl:attribute>
-                                   </input>
-                                   
-                                   <div>
-                                               <label>Tittel på melding</label>
-                                               <input name="message_title" 
type="text" />
-                                       </div>
-                                       
-                                       <div>
-                                               <label>Kategori</label>
-                                                <select name="message_cat_id">
-                                                       <option value="0">Velg 
kategori</option>
-                                                       <xsl:for-each 
select="categories/cat_list">
-                                                               <xsl:variable 
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
-                                                               <option 
value="{$cat_id}">
-                                                                       
<xsl:value-of select="./name"/>
-                                                               </option>       
                
-                                                       </xsl:for-each>
-                                               </select>
-                                       </div>
-                       
-                                       <h3 class="check_item_details">Velg 
sjekkpunkter som skal være med i avviksmelding</h3>                             
    
-                                       <ul class="check_items">
-                                               <xsl:for-each 
select="check_list/check_item_array">
-                                                       <li>
-                                                               <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
-                                                               <h5><input 
type="checkbox" name="check_item_ids[]" value="{$check_item_id}" 
/><span><xsl:value-of select="control_item/title"/></span></h5>                 
                            
-                                                       </li>
-                                               </xsl:for-each>
-                                       </ul>
-                                       
-                                         <div class="form-buttons">
-                                               <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                               <input class="btn" 
type="submit" name="save_control" value="Registrer avviksmelding" 
title="{$lang_save}" />
-                                         </div>
-                               </form>                 
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       Ingen registrerte avvik
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </fieldset>
-               
-               <a class="btn">
-               <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-                               <xsl:text>&amp;check_list_id=</xsl:text>
-                               <xsl:value-of select="check_list/id"/>
-                       </xsl:attribute>
-             Vis sjekkliste
-           </a>
-                       
-</div>
-</xsl:template>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-01-09 10:19:26 UTC 
(rev 8537)
+++ trunk/controller/templates/base/css/base.css        2012-01-09 10:22:51 UTC 
(rev 8538)
@@ -1145,6 +1145,17 @@
     border: 1px solid #173073;
     cursor: pointer;
 }
+
+.focus{
+       background: none repeat scroll 0 0 #DD624B;
+    border-bottom: 1px solid #CB563F;
+    border-top: 1px solid #EE836F;
+    box-shadow: 0 1px 0 #A9422E, 0 -1px 0 #A9422E;
+    color: #FFFFFF;
+    margin-top: 1px;   
+}
+
+
 #frm_update_check_list input[type="submit"]{
        width: 140px;   
 }

Deleted: trunk/controller/templates/base/view_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/view_error_report_message.xsl       
2012-01-09 10:19:26 UTC (rev 8537)
+++ trunk/controller/templates/base/view_error_report_message.xsl       
2012-01-09 10:22:51 UTC (rev 8538)
@@ -1,68 +0,0 @@
-<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
-<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-       
-               <h1>Avviksmelding registrert</h1>
-               
-               <div class="tab_menu">
-                       <a class="active" href="#">Meldingen gjaldt</a>
-               </div>  
-               <div id="error_report_message_details">
-                       <h3>Bygg: <xsl:value-of 
select="location_array/loc1_name"/></h3>
-                       <h3>Tittel på kontroll: <xsl:value-of 
select="control_array/title"/></h3>
-                       <xsl:choose>
-                               <xsl:when test="check_list/completed_date != 0">
-                                       <h3>Kontroll ble utført dato: 
<xsl:value-of select="php:function('date', $date_format, 
number(check_list/completed_date))"/></h3>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <h3>Kontroll ble utført dato:  Ikke 
registrert utført</h3>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </div>
-               
-               <div class="tab_menu">
-                       <a class="active" href="#">Detaljer for melding</a>
-               </div>
-               <div id="error_report_message_details">
-                       <div>       
-                               <label>Tittel på melding</label>
-                               <xsl:value-of select="message_ticket/subject"/>
-                       </div>
-                       
-                       <div>
-                               <label>Kategori</label>
-                               <span><xsl:value-of select="category"/></span> 
-                       </div>
-       
-       
-                       <h3 class="check_item_details">Avviksmeldingen omfattet 
følgende punkter</h3>                                   
-                       <ul class="check_items">
-                               <xsl:for-each 
select="registered_message_check_items">
-                                       <li>
-                                               <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
-                                               <h5><xsl:value-of 
select="control_item/title"/></h5>                                            
-                                       </li>
-                               </xsl:for-each>
-                       </ul>
-               </div>
-               
-               <a class="btn">
-                       <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
-                               <xsl:text>&amp;check_list_id=</xsl:text>
-                               <xsl:value-of select="check_list/id"/>
-                       </xsl:attribute>
-             Registrer ny melding
-           </a>
-               <a class="btn">
-               <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-                               <xsl:text>&amp;check_list_id=</xsl:text>
-                               <xsl:value-of select="check_list/id"/>
-                       </xsl:attribute>
-             Endre sjekkliste
-           </a>
-</div>
-</xsl:template>




reply via email to

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