[Fmsystem-commits] [8639]

[Torstein]

Revision: 8639
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8639
Author:   vator
Date:     2012-01-21 11:56:20 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol_group.inc.php

Added Paths:
-----------
    trunk/controller/templates/base/control_group/control_group_items.xsl
    trunk/controller/templates/base/control_group/control_group_tabs.xsl

Removed Paths:
-------------
    trunk/controller/templates/base/control_group_items.xsl
    trunk/controller/templates/base/control_group_tabs.xsl

Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php  2012-01-21 11:36:06 UTC 
(rev 8638)
+++ trunk/controller/inc/class.uicontrol_group.inc.php  2012-01-21 11:56:20 UTC 
(rev 8639)
@@ -365,7 +365,7 @@
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Control_group');
 
                                self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-                               
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
 $data);
+                               
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
 $data);
                        }
                        else if(isset($_POST['save_control_group_items']))
                        {
@@ -490,7 +490,7 @@
        //                      $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'controller.item', 'controller' );
 
                                self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-                               
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
 $data);
+                               
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
 $data);
                        }
                }
 
@@ -654,7 +654,7 @@
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Control group');
 
                                self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-                               
self::render_template_xsl(array('control_group_tabs','control_group','control_group_items'),
 $data);
+                               
self::render_template_xsl(array('control_group/control_group_tabs','control_group/control_group','control_group/control_group_items'),
 $data);
                        }
                }
 

Copied: trunk/controller/templates/base/control_group/control_group_items.xsl 
(from rev 8487, trunk/controller/templates/base/control_group_items.xsl)
===================================================================
--- trunk/controller/templates/base/control_group/control_group_items.xsl       
                        (rev 0)
+++ trunk/controller/templates/base/control_group/control_group_items.xsl       
2012-01-21 11:56:20 UTC (rev 8639)
@@ -0,0 +1,54 @@
+<!-- $Id$ -->
+<xsl:template name="control_group_items" 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_items')" />
+</h1>
+</div>
+
+<div class="yui-content">
+       <div>
+               <xsl:if test="selected_control_items">
+                       <h2>Valgte kontrollpunkt</h2>
+                       <form action="#" method="post"> 
+                               <ul class="control_items">
+                                       <xsl:for-each 
select="selected_control_items">
+                                               <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+                                               <li><xsl:if 
test="//editable"><input type="checkbox"  name="item_remove_ids[]" 
value="{$control_item_id}"/></xsl:if><xsl:value-of select="title"/></li>
+                                       </xsl:for-each>
+                               </ul>
+                               <xsl:if test="//editable">
+                                       <div class="form-buttons">
+                                               <xsl:variable 
name="lang_remove"><xsl:value-of select="php:function('lang', 'remove')" 
/></xsl:variable>
+                                               <input type="submit" 
name="remove_control_group_items" value="{$lang_remove}" title = 
"{$lang_remove}" />
+                                       </div>
+                               </xsl:if>
+                       </form>
+               </xsl:if>
+          <!-- ===========================  CHOOSE CONTROL ITEMS  
=============================== -->
+          <xsl:choose>
+               <xsl:when test="editable">
+                       <h2>Velg kontrollpunkt</h2>
+                       <form action="#" method="post"> 
+                       
+                       <xsl:variable name="control_group_id"><xsl:value-of 
select="value_id"/></xsl:variable>
+                       <input type="hidden" name="control_group_id" 
value="{control_group_id}" />
+                       
+                       <ul class="control_items">
+                               <xsl:for-each select="control_items">
+                                       <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+                                       <li><input type="checkbox"  
name="control_tag_ids[]" value="{$control_item_id}" /><xsl:value-of 
select="title"/></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="submit" 
name="save_control_group_items" value="{$lang_save}" title = "{$lang_save}" />
+                       </div>
+                       </form>
+               </xsl:when>
+          </xsl:choose>
+       </div>
+</div>
+</xsl:template>


Property changes on: 
trunk/controller/templates/base/control_group/control_group_items.xsl
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Revision Author Id

Copied: trunk/controller/templates/base/control_group/control_group_tabs.xsl 
(from rev 8487, trunk/controller/templates/base/control_group_tabs.xsl)
===================================================================
--- trunk/controller/templates/base/control_group/control_group_tabs.xsl        
                        (rev 0)
+++ trunk/controller/templates/base/control_group/control_group_tabs.xsl        
2012-01-21 11:56:20 UTC (rev 8639)
@@ -0,0 +1,20 @@
+<!-- $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_group_tabview">
+               <xsl:value-of disable-output-escaping="yes" select="tabs" />
+               <div class="yui-content">
+                       <div id="control_group">
+                               <xsl:call-template name="control_group" />
+                       </div>
+                       <div id="control_items">
+                               <xsl:call-template name="control_group_items" />
+                       </div>
+               </div>
+       </div>
+       <!--  script type="text/javascript">
+               var resource_id = <xsl:value-of select="resource/id"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
+       </script-->
+</xsl:template>


Property changes on: 
trunk/controller/templates/base/control_group/control_group_tabs.xsl
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Revision Author Id

Deleted: trunk/controller/templates/base/control_group_items.xsl
===================================================================
--- trunk/controller/templates/base/control_group_items.xsl     2012-01-21 
11:36:06 UTC (rev 8638)
+++ trunk/controller/templates/base/control_group_items.xsl     2012-01-21 
11:56:20 UTC (rev 8639)
@@ -1,54 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="control_group_items" 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_items')" />
-</h1>
-</div>
-
-<div class="yui-content">
-       <div>
-               <xsl:if test="selected_control_items">
-                       <h2>Valgte kontrollpunkt</h2>
-                       <form action="#" method="post"> 
-                               <ul class="control_items">
-                                       <xsl:for-each 
select="selected_control_items">
-                                               <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-                                               <li><xsl:if 
test="//editable"><input type="checkbox"  name="item_remove_ids[]" 
value="{$control_item_id}"/></xsl:if><xsl:value-of select="title"/></li>
-                                       </xsl:for-each>
-                               </ul>
-                               <xsl:if test="//editable">
-                                       <div class="form-buttons">
-                                               <xsl:variable 
name="lang_remove"><xsl:value-of select="php:function('lang', 'remove')" 
/></xsl:variable>
-                                               <input type="submit" 
name="remove_control_group_items" value="{$lang_remove}" title = 
"{$lang_remove}" />
-                                       </div>
-                               </xsl:if>
-                       </form>
-               </xsl:if>
-          <!-- ===========================  CHOOSE CONTROL ITEMS  
=============================== -->
-          <xsl:choose>
-               <xsl:when test="editable">
-                       <h2>Velg kontrollpunkt</h2>
-                       <form action="#" method="post"> 
-                       
-                       <xsl:variable name="control_group_id"><xsl:value-of 
select="value_id"/></xsl:variable>
-                       <input type="hidden" name="control_group_id" 
value="{control_group_id}" />
-                       
-                       <ul class="control_items">
-                               <xsl:for-each select="control_items">
-                                       <xsl:variable 
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-                                       <li><input type="checkbox"  
name="control_tag_ids[]" value="{$control_item_id}" /><xsl:value-of 
select="title"/></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="submit" 
name="save_control_group_items" value="{$lang_save}" title = "{$lang_save}" />
-                       </div>
-                       </form>
-               </xsl:when>
-          </xsl:choose>
-       </div>
-</div>
-</xsl:template>

Deleted: trunk/controller/templates/base/control_group_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_group_tabs.xsl      2012-01-21 
11:36:06 UTC (rev 8638)
+++ trunk/controller/templates/base/control_group_tabs.xsl      2012-01-21 
11:56:20 UTC (rev 8639)
@@ -1,20 +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_group_tabview">
-               <xsl:value-of disable-output-escaping="yes" select="tabs" />
-               <div class="yui-content">
-                       <div id="control_group">
-                               <xsl:call-template name="control_group" />
-                       </div>
-                       <div id="control_items">
-                               <xsl:call-template name="control_group_items" />
-                       </div>
-               </div>
-       </div>
-       <!--  script type="text/javascript">
-               var resource_id = <xsl:value-of select="resource/id"/>;
-               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
-       </script-->
-</xsl:template>