[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10818] Put some xsl-files in fragments folder
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10818] Put some xsl-files in fragments folder |
|
Date: |
Thu, 14 Feb 2013 10:36:30 +0000 |
Revision: 10818
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10818
Author: vator
Date: 2013-02-14 10:36:30 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Put some xsl-files in fragments folder
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/check_list/add_case.xsl
Added Paths:
-----------
trunk/controller/templates/base/check_list/fragments/
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
trunk/controller/templates/base/check_list/fragments/nav_control_plan.xsl
trunk/controller/templates/base/check_list/fragments/select_buildings_on_property.xsl
Removed Paths:
-------------
trunk/controller/templates/base/check_list/nav_control_plan.xsl
trunk/controller/templates/base/check_list/select_buildings_on_property.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2013-02-14 10:08:32 UTC
(rev 10817)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2013-02-14 10:36:30 UTC
(rev 10818)
@@ -282,7 +282,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
- self::render_template_xsl(
array('check_list/add_check_list', 'check_list/nav_control_plan',
'check_list/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/add_check_list', 'check_list/fragments/nav_control_plan',
'check_list/fragments/select_buildings_on_property'), $data );
}
/**
@@ -356,7 +356,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/nav_control_plan', 'check_list/edit_check_list',
'check_list/select_buildings_on_property'), $data);
+
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu',
'check_list/fragments/nav_control_plan', 'check_list/edit_check_list',
'check_list/fragments/select_buildings_on_property'), $data);
}
/**
@@ -513,7 +513,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/nav_control_plan', 'check_list/view_cases_for_check_list',
'check_list/select_buildings_on_property'), $data);
+
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu',
'check_list/fragments/nav_control_plan',
'check_list/view_cases_for_check_list',
'check_list/fragments/select_buildings_on_property'), $data);
}
public function print_check_list()
@@ -603,7 +603,7 @@
phpgwapi_jquery::load_widget('core');
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/nav_control_plan', 'check_list/view_control_info',
'check_list/select_buildings_on_property'), $data);
+
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu',
'check_list/fragments/nav_control_plan', 'check_list/view_control_info',
'check_list/fragments/select_buildings_on_property'), $data);
}
function view_control_details()
@@ -698,7 +698,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/nav_control_plan', 'check_list/add_case',
'check_list/select_buildings_on_property'), $data);
+
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu',
'check_list/fragments/nav_control_plan', 'check_list/add_case',
'check_list/fragments/select_buildings_on_property'), $data);
}
function view_open_cases()
@@ -723,7 +723,7 @@
'check_list'
=> $check_list
);
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_open_cases',
'check_list/case_row', 'check_list/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_open_cases',
'check_list/case_row', 'check_list/fragments/select_buildings_on_property'),
$data );
}
function view_closed_cases()
@@ -740,7 +740,7 @@
'check_list'
=> $check_list
);
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases',
'check_list/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases',
'check_list/fragments/select_buildings_on_property'), $data );
}
function view_control_items()
Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl 2013-02-14
10:08:32 UTC (rev 10817)
+++ trunk/controller/templates/base/check_list/add_case.xsl 2013-02-14
10:36:30 UTC (rev 10818)
@@ -30,7 +30,9 @@
<xsl:call-template name="check_list_tab_menu" />
</div>
-
+ <div style="margin:20px 0;">
+ <xsl:call-template name="select_buildings_on_property"
/>
+ </div>
<div id="view_cases">
Added:
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
===================================================================
---
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
(rev 0)
+++
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
2013-02-14 10:36:30 UTC (rev 10818)
@@ -0,0 +1,72 @@
+<xsl:template name="check_list_tab_menu" xmlns:php="http://php.net/xsl";>
+<xsl:param name="active_tab" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
+<div id="check_list_menu">
+ <!-- ================== LOADS VIEW CHECKLIST DETAILS
===================== -->
+ <div class="left_btns">
+ <a>
+ <xsl:if test="$active_tab = 'view_details'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
+ <a>
+ <xsl:if test="$active_tab = 'view_cases'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis saker
+ </a>
+ <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
+ <a>
+ <xsl:if test="$active_tab =
'view_control_info'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+ </div>
+
+ <div class="right_btns">
+ <!-- ================== REGISTER NEW CASE
===================== -->
+ <a class="btn focus first">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_case</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Registrer sak
+ </a>
+ <!-- ================== REGISTER NEW MESSAGE
===================== -->
+ <a class="btn focus">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Registrer melding
+ </a>
+ </div>
+ </div>
+
+</xsl:template>
Copied:
trunk/controller/templates/base/check_list/fragments/nav_control_plan.xsl (from
rev 10811, trunk/controller/templates/base/check_list/nav_control_plan.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/fragments/nav_control_plan.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/fragments/nav_control_plan.xsl
2013-02-14 10:36:30 UTC (rev 10818)
@@ -0,0 +1,42 @@
+ <xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis kontrolplan for år
+ </a>
+ <a class="last">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month_nr"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis kontrolplan for måned
+ </a>
+ </xsl:template>
\ No newline at end of file
Copied:
trunk/controller/templates/base/check_list/fragments/select_buildings_on_property.xsl
(from rev 10816,
trunk/controller/templates/base/check_list/select_buildings_on_property.xsl)
===================================================================
---
trunk/controller/templates/base/check_list/fragments/select_buildings_on_property.xsl
(rev 0)
+++
trunk/controller/templates/base/check_list/fragments/select_buildings_on_property.xsl
2013-02-14 10:36:30 UTC (rev 10818)
@@ -0,0 +1,28 @@
+<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
+<xsl:template name="select_buildings_on_property">
+
+ <form action="#">
+ <input type="hidden" name="period_type" value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_year"/>
+ </xsl:attribute>
+ </input>
+
+ <select id="choose_building_on_property" class="selectLocation">
+ <option value="">Velg bygg</option>
+ <xsl:for-each select="buildings_on_property">
+ <option>
+ <xsl:if test="id = //current_location/location_code">
+ <xsl:attribute name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value">
+ <xsl:value-of select="id"/>
+ </xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
+
+</xsl:template>
Deleted: trunk/controller/templates/base/check_list/nav_control_plan.xsl
===================================================================
--- trunk/controller/templates/base/check_list/nav_control_plan.xsl
2013-02-14 10:08:32 UTC (rev 10817)
+++ trunk/controller/templates/base/check_list/nav_control_plan.xsl
2013-02-14 10:36:30 UTC (rev 10818)
@@ -1,42 +0,0 @@
- <xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl";>
- <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
-
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis kontrolplan for år
- </a>
- <a class="last">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis kontrolplan for måned
- </a>
- </xsl:template>
\ No newline at end of file
Deleted:
trunk/controller/templates/base/check_list/select_buildings_on_property.xsl
===================================================================
--- trunk/controller/templates/base/check_list/select_buildings_on_property.xsl
2013-02-14 10:08:32 UTC (rev 10817)
+++ trunk/controller/templates/base/check_list/select_buildings_on_property.xsl
2013-02-14 10:36:30 UTC (rev 10818)
@@ -1,28 +0,0 @@
-<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
-<xsl:template name="select_buildings_on_property">
-
- <form action="#">
- <input type="hidden" name="period_type" value="view_year" />
- <input type="hidden" name="year">
- <xsl:attribute name="value">
- <xsl:value-of select="current_year"/>
- </xsl:attribute>
- </input>
-
- <select id="choose_building_on_property" class="selectLocation">
- <option value="">Velg bygg</option>
- <xsl:for-each select="buildings_on_property">
- <option>
- <xsl:if test="id = //current_location/location_code">
- <xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="value">
- <xsl:value-of select="id"/>
- </xsl:attribute>
- <xsl:value-of select="name" />
- </option>
- </xsl:for-each>
- </select>
- </form>
-
-</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10818] Put some xsl-files in fragments folder,
Torstein <=