[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8633]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8633] |
|
Date: |
Sat, 21 Jan 2012 11:21:32 +0000 |
Revision: 8633
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8633
Author: vator
Date: 2012-01-21 11:21:32 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/controller/templates/base/control_location/add_location_to_control.xsl
trunk/controller/templates/base/control_location/control_location_tabs.xsl
trunk/controller/templates/base/control_location/control_locations.xsl
Removed Paths:
-------------
trunk/controller/templates/base/add_location_to_control.xsl
trunk/controller/templates/base/control_location_tabs.xsl
trunk/controller/templates/base/control_locations.xsl
Deleted: trunk/controller/templates/base/add_location_to_control.xsl
===================================================================
--- trunk/controller/templates/base/add_location_to_control.xsl 2012-01-21
11:20:10 UTC (rev 8632)
+++ trunk/controller/templates/base/add_location_to_control.xsl 2012-01-21
11:21:32 UTC (rev 8633)
@@ -1,200 +0,0 @@
-<!-- $Id$ -->
-<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
-
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
-</func:function>
-
-<xsl:template name="add_location_to_control">
- <!-- IMPORTANT!!! Loads YUI javascript -->
- <xsl:call-template name="common"/>
-
- <div class="yui-content">
- <div id="control_details">
- <xsl:call-template name="yui_booking_i18n"/>
- <xsl:apply-templates select="control_filters" />
- <xsl:apply-templates select="filter_form" />
- <xsl:apply-templates select="paging"/>
- <xsl:apply-templates select="datatable"/>
- <xsl:apply-templates select="form/list_actions"/>
- </div>
- </div>
-</xsl:template>
-
-<xsl:template match="control_filters" name="control_filters">
- <div style="margin: 10px;padding: 10px; width: 25%;">
-
- <!-- When control area is chosen, an ajax request is executed.
The operation fetches controls from db and populates the control list.
- The ajax opearation is handled in ajax.js -->
- <select style="float:left;" id="control_area_list"
name="control_area_list">
- <xsl:for-each select="control_area_array">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$control_area_id}">
- <xsl:value-of select="title"/>
- </option>
- </xsl:for-each>
- </select>
-
- <form id="loc_form" action="" method="GET">
- <select id="control_id" name="control_id">
- <xsl:choose>
- <xsl:when
test="control_array/child::node()">
- <xsl:for-each
select="control_array">
- <xsl:variable
name="control_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_id}">
- <xsl:value-of
select="title"/>
- </option>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <option>
- Ingen kontroller
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </form>
- </div>
-</xsl:template>
-
-<xsl:template match="filter_form">
- <form id="queryForm">
- <xsl:attribute name="method">
- <xsl:value-of select="phpgw:conditional(not(method),
'GET', method)"/>
- </xsl:attribute>
-
- <xsl:attribute name="action">
- <xsl:value-of select="phpgw:conditional(not(action),
'', action)"/>
- </xsl:attribute>
- <xsl:call-template name="filter_list"/>
- </form>
-
- <form id="update_table_dummy" method='POST' action='' >
- </form>
-
-</xsl:template>
-
-<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
- <div>
- <ul id="filters">
- <li>
- <select id="type_id" name="type_id">
- <option value="">
- <xsl:value-of select="php:function('lang',
'Choose_building_type')"/>
- </option>
- <xsl:for-each select="building_types">
- <xsl:variable
name="building_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$building_type_id}">
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </li>
- <li>
- <select id="cat_id" name="cat_id">
- <option value="">
- <xsl:value-of select="php:function('lang',
'Choose_building_category')"/>
- </option>
- <xsl:for-each select="category_types">
- <xsl:variable
name="category_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$category_type_id}">
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </li>
- <li>
- <select id="district_id" name="district_id">
- <option value="">
- <xsl:value-of
select="php:function('lang', 'Choose_district')"/>
- </option>
- <xsl:for-each select="district_list">
- <xsl:variable name="district_id"><xsl:value-of
select="id"/></xsl:variable>
- <option value="{$district_id}">
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </li>
- <li>
- <select id="part_of_town_id" name="part_of_town_id">
- <option value="">
- <xsl:value-of
select="php:function('lang', 'Choose_part_of_town')"/>
- </option>
- <xsl:for-each select="part_of_town_list">
- <xsl:variable
name="part_of_town_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$part_of_town_id}">
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </li>
- </ul>
- <ul id="search_list">
- <li>
- <input type="text" name="query" />
- </li>
- <li>
- <xsl:variable name="lang_search"><xsl:value-of
select="php:function('lang', 'Search')" /></xsl:variable>
- <input type="submit" name="search"
value="{$lang_search}" title = "{$lang_search}" />
- </li>
- </ul>
-
- </div>
-</xsl:template>
-
-<xsl:template match="datatable">
- <div id="data_paginator"/>
- <div id="datatable-container"/>
- <xsl:call-template name="datasource-definition" />
-</xsl:template>
-
-
-<xsl:template name="datasource-definition">
- <script>
- YAHOO.namespace('controller');
-
- YAHOO.controller.columnDefs = [
- <xsl:for-each select="//datatable/field">
- {
- key: "<xsl:value-of
select="key"/>",
- <xsl:if test="label">
- label: "<xsl:value-of
select="label"/>",
- </xsl:if>
- sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
- <xsl:if test="hidden">
- hidden: true,
- </xsl:if>
- <xsl:if test="formatter">
- formatter: <xsl:value-of
select="formatter"/>,
- </xsl:if>
- className: "<xsl:value-of
select="className"/>"
- }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
- </xsl:for-each>
- ];
-
- var main_source = '<xsl:value-of select="source"/>';
- var main_columnDefs = YAHOO.controller.columnDefs;
- var main_form = 'queryForm';
- var main_filters = ['type_id', 'cat_id', 'district_id',
'part-of_town_list', 'responsibility_roles_list'];
- var main_container = 'datatable-container';
- var main_table_id = 'datatable';
- var main_pag = 'data_paginator';
- var related_table = new Array('locations_table');
-
- setDataSource(main_source, main_columnDefs, main_form,
main_filters, main_container, main_pag, main_table_id, related_table );
-
- </script>
-
-</xsl:template>
Copied:
trunk/controller/templates/base/control_location/add_location_to_control.xsl
(from rev 8487, trunk/controller/templates/base/add_location_to_control.xsl)
===================================================================
---
trunk/controller/templates/base/control_location/add_location_to_control.xsl
(rev 0)
+++
trunk/controller/templates/base/control_location/add_location_to_control.xsl
2012-01-21 11:21:32 UTC (rev 8633)
@@ -0,0 +1,200 @@
+<!-- $Id$ -->
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
+<xsl:template name="add_location_to_control">
+ <!-- IMPORTANT!!! Loads YUI javascript -->
+ <xsl:call-template name="common"/>
+
+ <div class="yui-content">
+ <div id="control_details">
+ <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:apply-templates select="control_filters" />
+ <xsl:apply-templates select="filter_form" />
+ <xsl:apply-templates select="paging"/>
+ <xsl:apply-templates select="datatable"/>
+ <xsl:apply-templates select="form/list_actions"/>
+ </div>
+ </div>
+</xsl:template>
+
+<xsl:template match="control_filters" name="control_filters">
+ <div style="margin: 10px;padding: 10px; width: 25%;">
+
+ <!-- When control area is chosen, an ajax request is executed.
The operation fetches controls from db and populates the control list.
+ The ajax opearation is handled in ajax.js -->
+ <select style="float:left;" id="control_area_list"
name="control_area_list">
+ <xsl:for-each select="control_area_array">
+ <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
+ <option value="{$control_area_id}">
+ <xsl:value-of select="title"/>
+ </option>
+ </xsl:for-each>
+ </select>
+
+ <form id="loc_form" action="" method="GET">
+ <select id="control_id" name="control_id">
+ <xsl:choose>
+ <xsl:when
test="control_array/child::node()">
+ <xsl:for-each
select="control_array">
+ <xsl:variable
name="control_id"><xsl:value-of select="id"/></xsl:variable>
+ <option
value="{$control_id}">
+ <xsl:value-of
select="title"/>
+ </option>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <option>
+ Ingen kontroller
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </form>
+ </div>
+</xsl:template>
+
+<xsl:template match="filter_form">
+ <form id="queryForm">
+ <xsl:attribute name="method">
+ <xsl:value-of select="phpgw:conditional(not(method),
'GET', method)"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="action">
+ <xsl:value-of select="phpgw:conditional(not(action),
'', action)"/>
+ </xsl:attribute>
+ <xsl:call-template name="filter_list"/>
+ </form>
+
+ <form id="update_table_dummy" method='POST' action='' >
+ </form>
+
+</xsl:template>
+
+<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
+ <div>
+ <ul id="filters">
+ <li>
+ <select id="type_id" name="type_id">
+ <option value="">
+ <xsl:value-of select="php:function('lang',
'Choose_building_type')"/>
+ </option>
+ <xsl:for-each select="building_types">
+ <xsl:variable
name="building_type_id"><xsl:value-of select="id"/></xsl:variable>
+ <option value="{$building_type_id}">
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </li>
+ <li>
+ <select id="cat_id" name="cat_id">
+ <option value="">
+ <xsl:value-of select="php:function('lang',
'Choose_building_category')"/>
+ </option>
+ <xsl:for-each select="category_types">
+ <xsl:variable
name="category_type_id"><xsl:value-of select="id"/></xsl:variable>
+ <option value="{$category_type_id}">
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </li>
+ <li>
+ <select id="district_id" name="district_id">
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'Choose_district')"/>
+ </option>
+ <xsl:for-each select="district_list">
+ <xsl:variable name="district_id"><xsl:value-of
select="id"/></xsl:variable>
+ <option value="{$district_id}">
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </li>
+ <li>
+ <select id="part_of_town_id" name="part_of_town_id">
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'Choose_part_of_town')"/>
+ </option>
+ <xsl:for-each select="part_of_town_list">
+ <xsl:variable
name="part_of_town_id"><xsl:value-of select="id"/></xsl:variable>
+ <option value="{$part_of_town_id}">
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </li>
+ </ul>
+ <ul id="search_list">
+ <li>
+ <input type="text" name="query" />
+ </li>
+ <li>
+ <xsl:variable name="lang_search"><xsl:value-of
select="php:function('lang', 'Search')" /></xsl:variable>
+ <input type="submit" name="search"
value="{$lang_search}" title = "{$lang_search}" />
+ </li>
+ </ul>
+
+ </div>
+</xsl:template>
+
+<xsl:template match="datatable">
+ <div id="data_paginator"/>
+ <div id="datatable-container"/>
+ <xsl:call-template name="datasource-definition" />
+</xsl:template>
+
+
+<xsl:template name="datasource-definition">
+ <script>
+ YAHOO.namespace('controller');
+
+ YAHOO.controller.columnDefs = [
+ <xsl:for-each select="//datatable/field">
+ {
+ key: "<xsl:value-of
select="key"/>",
+ <xsl:if test="label">
+ label: "<xsl:value-of
select="label"/>",
+ </xsl:if>
+ sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
+ <xsl:if test="hidden">
+ hidden: true,
+ </xsl:if>
+ <xsl:if test="formatter">
+ formatter: <xsl:value-of
select="formatter"/>,
+ </xsl:if>
+ className: "<xsl:value-of
select="className"/>"
+ }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ </xsl:for-each>
+ ];
+
+ var main_source = '<xsl:value-of select="source"/>';
+ var main_columnDefs = YAHOO.controller.columnDefs;
+ var main_form = 'queryForm';
+ var main_filters = ['type_id', 'cat_id', 'district_id',
'part-of_town_list', 'responsibility_roles_list'];
+ var main_container = 'datatable-container';
+ var main_table_id = 'datatable';
+ var main_pag = 'data_paginator';
+ var related_table = new Array('locations_table');
+
+ setDataSource(main_source, main_columnDefs, main_form,
main_filters, main_container, main_pag, main_table_id, related_table );
+
+ </script>
+
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_location/add_location_to_control.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied:
trunk/controller/templates/base/control_location/control_location_tabs.xsl
(from rev 8487, trunk/controller/templates/base/control_location_tabs.xsl)
===================================================================
--- trunk/controller/templates/base/control_location/control_location_tabs.xsl
(rev 0)
+++ trunk/controller/templates/base/control_location/control_location_tabs.xsl
2012-01-21 11:21:32 UTC (rev 8633)
@@ -0,0 +1,27 @@
+<!-- $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_location_tabview">
+ <xsl:choose>
+ <xsl:when test="view = 'view_locations_for_control'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Locations_for_control')"/></h1>
+ </div>
+ <!-- Prints tabs array -->
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+
+ <xsl:call-template name="view_locations_for_control" />
+ </xsl:when>
+ <xsl:when test="view = 'add_location_to_control'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Add_location_to_control')"/></h1>
+ </div>
+ <!-- Prints tabs array -->
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="add_location_to_control" />
+ </xsl:when>
+ </xsl:choose>
+</div>
+
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_location/control_location_tabs.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied: trunk/controller/templates/base/control_location/control_locations.xsl
(from rev 8487, trunk/controller/templates/base/control_locations.xsl)
===================================================================
--- trunk/controller/templates/base/control_location/control_locations.xsl
(rev 0)
+++ trunk/controller/templates/base/control_location/control_locations.xsl
2012-01-21 11:21:32 UTC (rev 8633)
@@ -0,0 +1,24 @@
+<!-- $Id$ -->
+<xsl:template name="control_locations" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content">
+ <div>
+
+ <!-- =========================== CHOOSE CONTROL LOCATIONS
=============================== -->
+ <h2>Velg Byggkategori/Eiendom/Bygg</h2>
+
+ <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="#" method="post">
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id" value="{control_id}" />
+ <strong>Liste over byggkategorier/eiendommer/bygg el.</strong>
+ <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_locations"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+
+ </div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/control_location/control_locations.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Deleted: trunk/controller/templates/base/control_location_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control_location_tabs.xsl 2012-01-21
11:20:10 UTC (rev 8632)
+++ trunk/controller/templates/base/control_location_tabs.xsl 2012-01-21
11:21:32 UTC (rev 8633)
@@ -1,27 +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_location_tabview">
- <xsl:choose>
- <xsl:when test="view = 'view_locations_for_control'">
- <div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Locations_for_control')"/></h1>
- </div>
- <!-- Prints tabs array -->
- <xsl:value-of disable-output-escaping="yes"
select="tabs" />
-
- <xsl:call-template name="view_locations_for_control" />
- </xsl:when>
- <xsl:when test="view = 'add_location_to_control'">
- <div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Add_location_to_control')"/></h1>
- </div>
- <!-- Prints tabs array -->
- <xsl:value-of disable-output-escaping="yes"
select="tabs" />
- <xsl:call-template name="add_location_to_control" />
- </xsl:when>
- </xsl:choose>
-</div>
-
-</xsl:template>
Deleted: trunk/controller/templates/base/control_locations.xsl
===================================================================
--- trunk/controller/templates/base/control_locations.xsl 2012-01-21
11:20:10 UTC (rev 8632)
+++ trunk/controller/templates/base/control_locations.xsl 2012-01-21
11:21:32 UTC (rev 8633)
@@ -1,24 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="control_locations" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content">
- <div>
-
- <!-- =========================== CHOOSE CONTROL LOCATIONS
=============================== -->
- <h2>Velg Byggkategori/Eiendom/Bygg</h2>
-
- <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="#" method="post">
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" name="control_id" value="{control_id}" />
- <strong>Liste over byggkategorier/eiendommer/bygg el.</strong>
- <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_locations"
value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
-
- </div>
-</div>
-</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8633],
Torstein <=