[Fmsystem-commits] [8427]

[Torstein]

Revision: 8427
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8427
Author:   vator
Date:     2011-12-23 13:01:54 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/create_error_report_message.xsl
    trunk/controller/templates/base/edit_check_list.xsl

Modified: trunk/controller/templates/base/create_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/create_error_report_message.xsl     
2011-12-23 13:00:42 UTC (rev 8426)
+++ trunk/controller/templates/base/create_error_report_message.xsl     
2011-12-23 13:01:54 UTC (rev 8427)
@@ -9,39 +9,53 @@
                <h2>Kontroll <xsl:value-of select="control_array/title"/></h2>
                <h2>Utført dato <xsl:value-of select="php:function('date', 
$date_format, number(check_list/completed_date))"/></h2>
                                
-               <div class="tab_menu">
-                       <div class="active ext"><a 
href="#control_items_list">1: Velg sjekkpunkter</a></div>
-                       <div><a href="#check_list_not_fixed_list">2: Detaljer 
for avviksmelding</a></div>
-                       <div><a href="#check_list_fixed_list">3: Kvittering for 
avviksmelding</a></div>
-               </div>
-               
-               <div id="control_items_list" class="tab_item active">
+               <div id="error_report_message_details">
                        <h2 class="check_item_details">Velg sjekkpunkter som 
skal være med i avviksmelding</h2>
 
                        <xsl:choose>
                                <xsl:when 
test="check_list/check_item_array/child::node()">
                                        
-                               <form class="frm_save_check_item" 
action="index.php?menuaction=controller.uicheck_list_for_location.register_error_report_message"
 method="post">
+                               <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>
+                                   
+                                       <label>Tittel på melding</label>
+                                       <input name="title" type="text" />
+                                                               
                                        <ul class="check_items expand_list">
                                                <xsl:for-each 
select="check_list/check_item_array">
                                                        <li>
                                                                <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
-                                                               <h4><input 
type="checkbox" name="check_item_id[]" value="{$check_item_id}" /><xsl:number 
/>. <span><xsl:value-of select="control_item/title"/></span></h4>               
                               
+                                                               <h4><input 
type="checkbox" name="check_item_ids[]" value="{$check_item_id}" 
/><span><xsl:value-of select="control_item/title"/></span></h4>                 
                            
                                                        </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 type="button" 
name="save_control" value="{$lang_save}" title="{$lang_save}" />
+                                               <input type="submit" 
name="save_control" value="{$lang_save}" title="{$lang_save}" />
                                          </div>
-                                       </form>                 
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               Ingen sjekkpunkter
-                                       </xsl:otherwise>
+                               </form>                 
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       Ingen sjekkpunkter
+                               </xsl:otherwise>
                        </xsl:choose>
                </div>
+               
+               
                        
 </div>
 </xsl:template>

Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2011-12-23 13:00:42 UTC 
(rev 8426)
+++ trunk/controller/templates/base/edit_check_list.xsl 2011-12-23 13:01:54 UTC 
(rev 8427)
@@ -122,7 +122,7 @@
                
                <a>
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.create_error_report_message</xsl:text>
+                               
<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>