[Fmsystem-commits] [7620]

[Torstein]

Revision: 7620
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7620
Author:   vator
Date:     2011-09-16 08:22:13 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/control_item.php
    trunk/controller/templates/base/control_item.xsl
    trunk/controller/templates/base/control_item_list.php

Modified: trunk/controller/templates/base/control_item.php
===================================================================
--- trunk/controller/templates/base/control_item.php    2011-09-16 08:22:03 UTC 
(rev 7619)
+++ trunk/controller/templates/base/control_item.php    2011-09-16 08:22:13 UTC 
(rev 7620)
@@ -49,13 +49,13 @@
                                                </select>
                                        </dd>
                                        <dt>
-                                               <label 
for="control_type">Kontrolltype</label>
+                                               <label 
for="control_area">Kontrolltype</label>
                                        </dt>
                                        <dd>
-                                               <select id="control_type" 
name="control_type">
+                                               <select id="control_area" 
name="control_area">
                                                        <?php 
-                                                               foreach 
($control_type_array as $control_type) {
-                                                                       echo 
"<option value='" . $control_type->get_id() . "'>" . $control_type->get_title() 
. "</option>";
+                                                               foreach 
($control_area_array as $control_area) {
+                                                                       echo 
"<option value='" . $control_area->get_id() . "'>" . $control_area->get_title() 
. "</option>";
                                                                }
                                                        ?>
                                                </select>

Modified: trunk/controller/templates/base/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item.xsl    2011-09-16 08:22:03 UTC 
(rev 7619)
+++ trunk/controller/templates/base/control_item.xsl    2011-09-16 08:22:13 UTC 
(rev 7620)
@@ -48,11 +48,11 @@
                                                </select>
                                        </dd>
                                        <dt>
-                                               <label 
for="control_type">Kontrolltype</label>
+                                               <label 
for="control_area">Kontrolltype</label>
                                        </dt>
                                        <dd>
-                                               <select id="control_type" 
name="control_type">
-                                                       <xsl:apply-templates 
select="control_type/options"/>
+                                               <select id="control_area" 
name="control_area">
+                                                       <xsl:apply-templates 
select="control_area/options"/>
                                                </select>
                                        </dd>                           
                                </dl>

Modified: trunk/controller/templates/base/control_item_list.php
===================================================================
--- trunk/controller/templates/base/control_item_list.php       2011-09-16 
08:22:03 UTC (rev 7619)
+++ trunk/controller/templates/base/control_item_list.php       2011-09-16 
08:22:13 UTC (rev 7620)
@@ -55,8 +55,8 @@
                        label: "control_group_id"
                },
                {
-                       key: "control_type_id",
-                       label: "control_type_id"
+                       key: "control_area_id",
+                       label: "control_area_id"
                },
                {
                        key: "ajax",