fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8493]


From: Torstein
Subject: [Fmsystem-commits] [8493]
Date: Thu, 05 Jan 2012 10:00:12 +0000

Revision: 8493
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8493
Author:   vator
Date:     2012-01-05 10:00:11 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------


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

Removed Paths:
-------------
    trunk/controller/templates/base/choose_control_items.xsl
    trunk/controller/templates/base/control.xsl
    trunk/controller/templates/base/control_group.xsl
    trunk/controller/templates/base/control_groups.xsl
    trunk/controller/templates/base/control_item.xsl
    trunk/controller/templates/base/control_tabs.xsl
    trunk/controller/templates/base/sort_check_list.xsl
    trunk/controller/templates/base/view_control_item_list.xsl
    trunk/controller/templates/base/view_control_items.xsl

Deleted: trunk/controller/templates/base/choose_control_items.xsl
===================================================================
--- trunk/controller/templates/base/choose_control_items.xsl    2012-01-05 
09:53:55 UTC (rev 8492)
+++ trunk/controller/templates/base/choose_control_items.xsl    2012-01-05 
10:00:11 UTC (rev 8493)
@@ -1,58 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-       <div>
-          <!-- ===========================  CHOOSE CONTROL ITEMS  
=============================== -->  
-          <h2>Velg dine kontrollpunkt</h2>
-          
-          <!-- ==== CHOOSE NONE/ALL ===== -->
-               <h4 class="expand_header"><div class="expand_all">Vis 
alle</div><div class="collapse_all">Skjul alle</div></h4>
-               
-               <form id="frm_control_items" 
action="index.php?menuaction=controller.uicontrol.save_control_items" 
method="post">       
-                       <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
-                       <input type="hidden" name="control_id" 
value="{$control_id}" />
-                       
-                       <xsl:variable name="control_group_ids"><xsl:value-of 
select="control_group_ids"/></xsl:variable>
-                       <input type="hidden" name="control_group_ids" 
value="{control_group_ids}" />            
-                       
-                       <ul class="control_items">
-                               <xsl:for-each 
select="groups_with_control_items">
-                                       <ul class="itemlist expand_list">
-                                       <li>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="group_control_items/child::node()">
-                                                               <h4><img 
src="controller/images/arrow_left.png" width="14"/><span><xsl:value-of 
select="control_group/group_name"/></span></h4>
-                                                               <xsl:variable 
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
-                                                               <ul>            
-                                                                       
<xsl:for-each select="group_control_items">
-                                                                               
<xsl:variable name="control_item_id"><xsl:value-of 
select="control_item/id"/></xsl:variable>
-                                                                               
<xsl:choose>
-                                                                               
        <xsl:when test="checked = 1">
-                                                                               
                <li><xsl:number/>.  <input type="checkbox"  checked="checked" 
id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
-                                                                               
        </xsl:when>
-                                                                               
        <xsl:otherwise>
-                                                                               
                <li><xsl:number/>.  <input type="checkbox"  
id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
-                                                                               
        </xsl:otherwise>
-                                                                               
</xsl:choose>
-                                                                       
</xsl:for-each>
-                                                               </ul>
-                                                       </xsl:when>
-                                               <xsl:otherwise>
-                                                       <div 
class="empty_list"><span><xsl:value-of 
select="control_group/group_name"/></span></div>
-                                                       <div>Ingen 
kontrollpunkt</div>
-                                               </xsl:otherwise>
-                                               </xsl:choose>
-                                       </li>
-                               </ul>
-                               </xsl:for-each>
-                       </ul>
-                       
-                       <div>
-                               <xsl:variable name="lang_save"><xsl:value-of 
select="php:function('lang', 'save')" /></xsl:variable>
-                               <input type="submit" name="save_control_items" 
value="{$lang_save}" title = "{$lang_save}" />
-                       </div>
-               </form>                                 
-       </div>
-</div>
-</xsl:template>

Deleted: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2012-01-05 09:53:55 UTC (rev 
8492)
+++ trunk/controller/templates/base/control.xsl 2012-01-05 10:00:11 UTC (rev 
8493)
@@ -1,212 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="control" xmlns:php="http://php.net/xsl";>
-
-<xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
-<xsl:variable name="control_area_id"><xsl:value-of 
select="control/control_area_id"/></xsl:variable>
-<xsl:variable name="control_procedure_id"><xsl:value-of 
select="control/procedure_id"/></xsl:variable>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<script>
-               $(function() {
-                       $( "#start_date" ).datepicker({ 
-                               monthNames: 
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
-                               dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 
'Fr', 'Lø'],
-                               dateFormat: 'd/m-yy' 
-                       });
-                       $( "#end_date" ).datepicker({ 
-                               monthNames: 
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
-                               dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 
'Fr', 'Lø'],
-                               dateFormat: 'd/m-yy' 
-                       });     
-               });
-       </script>
-
-<div class="yui-content">
-       <div id="control_details">
-               <form 
action="index.php?menuaction=controller.uicontrol.save_control_details" 
method="post">
-                       <input type="hidden" name="control_id" 
value="{$control_id}" /> 
-       
-                       <dl class="proplist-col">
-                               <dt>
-                                       <label>Kontrollområde</label>
-                               </dt>
-                               <dd>
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <select id="control_area_id" 
name="control_area_id">
-                                                       <xsl:for-each 
select="control_areas_array">
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="id != $control_area_id">
-                                                                               
<option value="{id}">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="title"/>
-                                                                               
</option>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<option value="{id}" selected="selected">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="title"/>
-                                                                               
</option>
-                                                                       
</xsl:otherwise>
-                                                               </xsl:choose>   
                                                        
-                                                       </xsl:for-each>
-                                               </select>
-                                               <select id="control_area_id" 
name="control_area_id">
-                                                       <xsl:apply-templates 
select="control_areas_array2/options"/>
-                                               </select>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of 
select="control/control_area_name" />
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               </dd>
-                               <dt>
-                                       <label>Prosedyre</label>
-                               </dt>
-                               <dd>
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <select id="procedure_id" 
name="procedure_id">
-                                                       <xsl:for-each 
select="procedures_array">
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="id != $control_procedure_id">
-                                                                               
<option value="{id}">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="title"/>
-                                                                               
</option>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<option value="{id}" selected="selected">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="title"/>
-                                                                               
</option>
-                                                                       
</xsl:otherwise>
-                                                               </xsl:choose>   
                                                        
-                                                       </xsl:for-each>
-                                               </select>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of 
select="control/procedure_name" />
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               </dd>
-                               <dt>
-                                       <label for="title">Tittel</label>
-                               </dt>
-                               <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="title" id="title" value="{control/title}" size="80"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control/title" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </dd>
-                               <dt>
-                                       <label 
for="start_date">Startdato</label>
-                               </dt>
-                               <dd>
-                                       <input>
-                                     <xsl:attribute 
name="id">start_date</xsl:attribute>
-                                     <xsl:attribute 
name="name">start_date</xsl:attribute>
-                                     <xsl:attribute 
name="type">text</xsl:attribute>
-                                     <xsl:if test="control/start_date != ''">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(control/start_date))"/></xsl:attribute>
-                                     </xsl:if>
-                                   </input>
-                               </dd>
-                               <dt>
-                                       <label for="end_date">Sluttdato</label>
-                               </dt>
-                               <dd>
-                                       <input>
-                                     <xsl:attribute 
name="id">end_date</xsl:attribute>
-                                     <xsl:attribute 
name="name">end_date</xsl:attribute>
-                                     <xsl:attribute 
name="type">text</xsl:attribute>
-                                     <xsl:if test="control/end_date != 0">
-                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(control/end_date))"/></xsl:attribute>
-                                     </xsl:if>
-                                   </input>
-                               </dd>
-                               <dt>
-                                       <label>Frekvenstype</label>
-                               </dt>
-                               <dd>
-                                       <select id="repeat_type" 
name="repeat_type">
-                                               <option value="0">Ikke 
angitt</option>
-                                               <option value="1">Dag</option>
-                                               <option value="2">Uke</option>
-                                               <option value="3">Måned</option>
-                                               <option value="5">År</option>
-                                       </select>
-                               </dd>
-                               <dt>
-                                       <label>Frekvens</label>
-                               </dt>
-                               <dd>
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <input size="2" type="text" 
name="repeat_interval" value="{control/repeat_interval}" />
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of 
select="control/repeat_interval" />
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               </dd>
-                               <dt>
-                                       <label>Rolle</label>
-                               </dt>
-                               <dd>
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <select id="responsibility_id" 
name="responsibility_id">
-                                                       <xsl:for-each 
select="role_array">
-                                                               <option 
value="{id}">
-                                                                       
<xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                               </option>
-                                                       </xsl:for-each>
-                                               </select>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of 
select="control/role_name" />
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               </dd>
-                               <dt>
-                                       <label 
for="description">Beskrivelse</label>
-                               </dt>
-                               <dd>
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <textarea cols="70" rows="5" 
name="description" id="description"><xsl:value-of select="control/description" 
/></textarea>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of 
select="control/description" disable-output-escaping="yes"/>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                               </dd>
-                       </dl>
-                       
-                       <div class="form-buttons">
-                               <xsl:choose>
-                                       <xsl:when test="editable">
-                                               <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                               <input type="submit" 
name="save_control" value="{$lang_save}" title = "{$lang_save}" />
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:variable 
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')" 
/></xsl:variable>
-                                               <input type="submit" 
name="edit_control" value="{$lang_edit}" title = "{$lang_edit}" />
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </div>
-               </form>                                 
-       </div>
-</div>
-</xsl:template>
-
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected != 0">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>
-

Deleted: trunk/controller/templates/base/control_group.xsl
===================================================================
--- trunk/controller/templates/base/control_group.xsl   2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/control_group.xsl   2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -1,117 +0,0 @@
-<!-- $Id$ -->
-<!-- item  -->
-<xsl:template name="control_group" xmlns:php="http://php.net/xsl";>
-<!-- <xsl:template match="data" xmlns:php="http://php.net/xsl";>  -->
-
-<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><img src="{img_go_home}" /> 
-               <xsl:value-of select="php:function('lang', 'Control_group')" />
-</h1>
-</div>
-
-<div class="yui-content">
-               <div id="details">
-                       <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{value_id}">
-                               </input>
-                               <dl class="proplist-col">
-                                       <dt>
-                                               <label 
for="title">Tittel</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="group_name" id="group_name" value="{control_group/group_name}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_group/group_name"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="control_area">Kontrollområde</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select 
id="control_area" name="control_area">
-                                                               
<xsl:apply-templates select="control_area/options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_group/control_area_name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="proecdure">Prosedyre</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select id="procedure" 
name="procedure">
-                                                               
<xsl:apply-templates select="procedure/options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_group/procedure_name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="building_part">Bygningsdel</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select 
id="building_part" name="building_part">
-                                                               
<xsl:apply-templates select="building_part/building_part_options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_group/building_part_id" /> - <xsl:value-of 
select="control_group/building_part_descr" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                               </dl>
-                               
-                               <div class="form-buttons">
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="save_control_group" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_control_group" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="edit_control_group" value="{$lang_edit}" title = "{$lang_edit}" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                               
-                       </form>
-                                               
-               </div>
-       </div>
-</xsl:template>
-       
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected != 0">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>
-
-<xsl:template match="building_part_options">
-       <option value="{id}">
-               <xsl:if test="selected != 0">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of select="id"/> - <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>
-

Deleted: trunk/controller/templates/base/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_groups.xsl  2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/control_groups.xsl  2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -1,38 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="control_groups" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-       <div id="control_groups">
-       
-               <h2><xsl:value-of select="control_area/title"/></h2>
-               
-               <form 
action="index.php?menuaction=controller.uicontrol.save_control_groups" 
method="post">
-                       <xsl:variable name="control_area_id"><xsl:value-of 
select="control_area/id"/></xsl:variable>
-                       <input type="hidden" name="control_area_id" 
value="{$control_area_id}" />
-                       
-                       <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
-                       <input type="hidden" name="control_id" 
value="{$control_id}" />
-                       
-                       <ul class="itemlist">
-                               <xsl:for-each select="//control_groups">
-                                       <xsl:variable 
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
-                                       
-                                       <xsl:choose>
-                                               <xsl:when test="checked = 1">
-                                                       <li><input 
type="checkbox" checked="checked" name="control_group_ids[]" 
value="{$control_group_id}" /><xsl:value-of 
select="control_group/group_name"/></li>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <li><input 
type="checkbox" name="control_group_ids[]" value="{$control_group_id}" 
/><xsl:value-of select="control_group/group_name"/></li>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       
-                               </xsl:for-each>
-                       </ul>
-                       <div>
-                               <xsl:variable name="lang_save"><xsl:value-of 
select="php:function('lang', 'save')" /></xsl:variable>
-                               <input type="submit" name="save_control_groups" 
value="{$lang_save}" title = "{$lang_save}" />
-                       </div>
-               </form>                                 
-       </div>
-</div>
-</xsl:template>

Deleted: trunk/controller/templates/base/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item.xsl    2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/control_item.xsl    2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -1,156 +0,0 @@
-<!-- $Id$ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><img src="{img_go_home}" /> 
-               <xsl:value-of select="php:function('lang', 'Control_item')" />
-</h1>
-</div>
-
-<ul class="check_list">
-                       <xsl:for-each select="check_list_array">
-                               <li>
-                                       <span>Tittel:</span><xsl:value-of 
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
-                               </li>
-                       </xsl:for-each>
-               </ul>                                   
-               
-       <div class="yui-content">
-               <div id="details">
-                       <form action="#" method="post">
-                               <input type="hidden" name="id" value = 
"{value_id}">
-                               </input>
-                               <dl class="proplist-col">
-                                       <dt>
-                                               <label 
for="title">Tittel</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="title" id="title" value="{control_item/title}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_item/title"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="required">Obligatorisk</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:variable 
name="required_item"><xsl:value-of select="control_item/required" 
/></xsl:variable>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="$required_item=1">
-                                                                       <input 
type="checkbox" name="required" id="required" checked="true"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="required" id="required"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="$required_item=1">
-                                                                       <input 
type="checkbox" name="required" id="required" checked="true" disabled="true"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="required" id="required" disabled="true" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label for="what_to_do">Hva 
skal utføres</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <textarea 
name="what_to_do" id="what_to_do" rows="5" cols="60"><xsl:value-of 
select="control_item/what_to_do" disable-output-escaping="yes" /></textarea>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_item/what_to_do" disable-output-escaping="yes" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="how_to_do">Utførelsesbeskrivelse</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <textarea 
name="how_to_do" id="how_to_do" rows="5" cols="60"><xsl:value-of 
select="control_item/how_to_do" disable-output-escaping="yes" /></textarea>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_item/how_to_do" disable-output-escaping="yes" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="control_group">Kontrollgruppe</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select 
id="control_group" name="control_group">
-                                                               <option 
value="0">Ingen valgt</option>
-                                                               
<xsl:apply-templates select="control_group/options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_item/control_group_name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="control_area">Kontrollområde</label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <select 
id="control_area" name="control_area">
-                                                               
<xsl:apply-templates select="control_area/options"/>
-                                                       </select>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="control_item/control_area_name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>                           
-                               </dl>
-                               
-                               <div class="form-buttons">
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="save_control_item" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_control_item" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="edit_control_item" value="{$lang_edit}" title = "{$lang_edit}" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                               
-                       </form>
-                                               
-               </div>
-       </div>
-</xsl:template>
-       
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected != 0">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>
-

Deleted: trunk/controller/templates/base/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_tabs.xsl    2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/control_tabs.xsl    2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -1,53 +0,0 @@
-<!-- $Id$ -->
-<!-- separate tabs and  inline tables-->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div class="yui-navset yui-navset-top" id="control_tabview">
-       <xsl:choose>
-               <xsl:when test="view = 'control_details'">
-               <xsl:call-template name="yui_booking_i18n"/>
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Control')"/></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="control" />
-               </xsl:when>
-               <xsl:when test="view = 'control_groups'">
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Control_groups')"/> for <xsl:value-of select="control/title" /></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="control_groups" />
-               </xsl:when>
-               <xsl:when test="view = 'control_locations'">
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Control_locations')"/> for <xsl:value-of select="control/title" /></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="control_locations" />
-               </xsl:when>
-               <xsl:when test="view = 'control_component'">
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Control_component')"/> for <xsl:value-of select="control/title" /></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="control_component" />
-               </xsl:when>
-               <xsl:when test="view = 'control_items'">
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Control_items')"/> for <xsl:value-of select="control/title" /></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="control_items" />
-               </xsl:when>
-               <xsl:when test="view = 'sort_check_list'">
-                       <div class="identifier-header">
-                               <h1><xsl:value-of select="php:function('lang', 
'Check_list')"/> for <xsl:value-of select="control/title" /></h1>
-                       </div>
-                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
-                       <xsl:call-template name="sort_check_list" />
-               </xsl:when>
-       </xsl:choose>
-</div>
-       
-</xsl:template>

Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/edit_check_list.xsl 2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -173,7 +173,7 @@
                                <xsl:attribute name="href">
                                        <xsl:text>#register_errors</xsl:text>
                                </xsl:attribute>
-                               Registrer avvik/måling
+                               Registrer sak/måling
                        </a>
                        <a class="btn">
                                <xsl:attribute name="id">

Deleted: trunk/controller/templates/base/sort_check_list.xsl
===================================================================
--- trunk/controller/templates/base/sort_check_list.xsl 2012-01-05 09:53:55 UTC 
(rev 8492)
+++ trunk/controller/templates/base/sort_check_list.xsl 2012-01-05 10:00:11 UTC 
(rev 8493)
@@ -1,60 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="sort_check_list" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-               
-         <!-- ===========================  SHOWS CONTROL ITEMS RECEIPT   
=============================== -->
-
-               <xsl:variable name="control_id"><xsl:value-of 
select="control_id"/></xsl:variable>
-               <input type="hidden" id="control_id" name="control_id" 
value="{control_id}" />
-               
-               <ul class="groups">
-                       <xsl:for-each select="saved_groups_with_items_array">
-                               <li class="drag_group list_item">
-                                       <h3><span 
class="group_order_nr"><xsl:number/></span>. <xsl:value-of 
select="control_group/group_name"/></h3>
-                       
-                                       <form 
action="index.php?menuaction=controller.uicontrol_item.save_item_order" 
class="frm_save_order">
-                                               <xsl:variable 
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
-                                               <input type="hidden" 
name="control_group_id" value="{$control_group_id}" />
-                               
-                                               <ul id="list">
-                                                       <xsl:for-each 
select="control_items">
-                                                               <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-                                                               <xsl:variable 
name="order_tag">
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="order_nr > 0">
-                                                                               
        <xsl:value-of select="order_nr"/>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <xsl:number/>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>:<xsl:value-of select="id"/>
-                                                               </xsl:variable>
-                                                                               
                                                
-                                                               <li 
class="list_item">
-                                                                       <span 
class="drag">
-                                                                               
<span class="order_nr"><xsl:number/></span>. <xsl:value-of 
select="title"/><input type="hidden" name="order_nr[]" value="{$order_tag}" />
-                                                                       </span>
-                                                                       <a 
class="delete">
-                                                                               
<xsl:attribute name="href">
-                                                                               
        
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-                                                                               
        <xsl:text>&amp;control_id=</xsl:text>
-                                                                               
        <xsl:value-of select="//control_id"/>
-                                                                               
        <xsl:text>&amp;control_item_id=</xsl:text>
-                                                                               
        <xsl:value-of select="id"/>
-                                                                               
</xsl:attribute>
-                                                                               
<span>x</span>
-                                                                       </a>
-                                                               </li>
-                                                       </xsl:for-each>
-                                               </ul>
-                                               <div>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')" 
/></xsl:variable>
-                                                       <input type="submit" 
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" 
style="opacity: 0.5;" disabled="disabled"/>
-                                               </div>
-                                       </form>
-                               </li>
-                       </xsl:for-each>
-               </ul>
-</div>
-</xsl:template>

Deleted: trunk/controller/templates/base/view_control_item_list.xsl
===================================================================
--- trunk/controller/templates/base/view_control_item_list.xsl  2012-01-05 
09:53:55 UTC (rev 8492)
+++ trunk/controller/templates/base/view_control_item_list.xsl  2012-01-05 
10:00:11 UTC (rev 8493)
@@ -1,62 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
-
-<div id="main_content">
-               
-         <!-- ===========================  SHOWS CONTROL ITEMS RECEIPT   
=============================== -->
-
-               <xsl:variable name="control_id"><xsl:value-of 
select="control_id"/></xsl:variable>      
-               <input type="hidden" id="control_id" name="control_id" 
value="{control_id}" />
-               
-               <fieldset>
-                       <label>Tittel</label><xsl:value-of 
select="control_as_array/title"/><br/>
-                       <label>Startdato</label><xsl:value-of 
select="control_as_array/start_date"/><br/>
-                       <label>Sluttdato</label><xsl:value-of 
select="control_as_array/end_date"/><br/>
-                       <label>Syklustype</label><xsl:value-of 
select="control_as_array/repeat_type"/><br/>
-                       <label>Syklusfrekvens</label><xsl:value-of 
select="control_as_array/repeat_interval"/><br/>
-               </fieldset>
-               
-               <ul class="check_list">
-                       <xsl:for-each select="saved_groups_with_items_array">
-                               <li>
-                                       <h3><span 
class="group_order_nr"><xsl:number/></span>. <xsl:value-of 
select="control_group/group_name"/></h3>
-                       
-                                       <xsl:variable 
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
-                                       <input type="hidden" 
name="control_group_id" value="{$control_group_id}" />
-                       
-                                       <ul id="list">
-                                               <xsl:for-each 
select="control_items">
-                                                       <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-                                                       <xsl:variable 
name="order_tag">
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="order_nr > 0">
-                                                                               
<xsl:value-of select="order_nr"/>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<xsl:number/>
-                                                                       
</xsl:otherwise>
-                                                               
</xsl:choose>:<xsl:value-of select="id"/>
-                                                       </xsl:variable>
-                                                                               
                                        
-                                                       <li>
-                                                               <span 
class="drag">
-                                                                       <span 
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input 
type="hidden" name="order_nr[]" value="{$order_tag}" />
-                                                               </span>
-                                                       </li>
-                                               </xsl:for-each>
-                                       </ul>
-                               </li>
-                       </xsl:for-each>
-               </ul>
-               <div style="margin:20px 0;">
-                       <a  
style="text-decoration:underline;font-size:20px;color:#333;">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
-                                       <xsl:text>&amp;control_id=</xsl:text>
-                                               <xsl:value-of 
select="control_as_array/id"/>
-                               </xsl:attribute>
-                               Lag sjekkliste for kontroll
-                       </a>            
-               </div>
-</div>
-</xsl:template>

Deleted: trunk/controller/templates/base/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/view_control_items.xsl      2012-01-05 
09:53:55 UTC (rev 8492)
+++ trunk/controller/templates/base/view_control_items.xsl      2012-01-05 
10:00:11 UTC (rev 8493)
@@ -1,16 +0,0 @@
-<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template name="view_control_items" xmlns:php="http://php.net/xsl";>
-<div>
-       <ul class="control_items">
-               <xsl:for-each select="control_items_array">
-                       <li>
-                               <h4><xsl:value-of 
select="control_item/title"/></h4>
-                       </li>
-               </xsl:for-each>
-       </ul>
-               
-       <div>
-               <input class="btn" type="submit" name="save_control_items" 
value="Print" title = "{$lang_save}" />
-       </div>                          
-</div>
-</xsl:template>




reply via email to

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