[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10856] Moved view_closed_cases and view_open_cases t
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10856] Moved view_closed_cases and view_open_cases to case folder |
|
Date: |
Fri, 15 Feb 2013 14:41:19 +0000 |
Revision: 10856
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10856
Author: vator
Date: 2013-02-15 14:41:17 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Moved view_closed_cases and view_open_cases to case folder
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/case/add_case.xsl
trunk/controller/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/case/view_case_message.xsl
trunk/controller/templates/base/check_list/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/mobilefrontend/css/base.css
Added Paths:
-----------
trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
Removed Paths:
-------------
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/cases_menu.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/select_buildings_on_property.xsl
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2013-02-15 13:43:18 UTC (rev
10855)
+++ trunk/controller/inc/class.uicase.inc.php 2013-02-15 14:41:17 UTC (rev
10856)
@@ -249,7 +249,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
self::render_template_xsl(array('check_list/fragments/check_list_tab_menu',
'case/create_case_message'), $data);
+
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'case/create_case_message'), $data);
}
function send_case_message(){
@@ -416,7 +416,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',
'case/view_case_message'), $data);
+
self::render_template_xsl(array('check_list/check_list_menu',
'case/view_case_message'), $data);
}
public function updateStatusForCases($location_id,
$location_item_id, $updateStatus = 0){
@@ -528,7 +528,7 @@
'check_list'
=> $check_list
);
- self::render_template_xsl(
array('check_list/fragments/cases_tab_menu', 'check_list/view_open_cases',
'check_list/fragments/case_row',
'check_list/fragments/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/fragments/cases_tab_menu', 'case/view_open_cases',
'check_list/fragments/case_row',
'check_list/fragments/select_buildings_on_property'), $data );
}
function view_closed_cases()
@@ -545,7 +545,7 @@
'check_list'
=> $check_list
);
- self::render_template_xsl(
array('check_list/fragments/cases_tab_menu', 'check_list/view_closed_cases',
'check_list/fragments/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/fragments/cases_tab_menu', 'case/view_closed_cases',
'check_list/fragments/select_buildings_on_property'), $data );
}
function get_location_level($location_code)
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2013-02-15 13:43:18 UTC
(rev 10855)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2013-02-15 14:41:17 UTC
(rev 10856)
@@ -50,15 +50,15 @@
class controller_uicheck_list extends phpgwapi_uicommon
{
- private $so;
- private $so_control;
- private $so_control_item;
- private $so_check_item;
- private $so_procedure;
- private $so_control_group_list;
- private $so_control_group;
- private $so_control_item_list;
- private $location_finder;
+ protected $so;
+ protected $so_control;
+ protected $so_control_item;
+ protected $so_check_item;
+ protected $so_procedure;
+ protected $so_control_group_list;
+ protected $so_control_group;
+ protected $so_control_item_list;
+ protected $location_finder;
var $public_functions = array(
'index'
=> true,
@@ -283,7 +283,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/fragments/nav_control_plan',
'check_list/fragments/select_buildings_on_property'), $data );
+ self::render_template_xsl(
array('check_list/add_check_list', 'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/fragments/select_buildings_on_property'), $data );
}
/**
@@ -357,7 +357,7 @@
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
-
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);
+
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section', 'check_list/edit_check_list',
'check_list/fragments/select_buildings_on_property'), $data);
}
/**
@@ -515,7 +515,7 @@
self::add_javascript('controller', 'controller',
'ajax.js');
self::add_javascript('controller', 'controller', 'case.js');
-
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);
+
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/view_cases_for_check_list',
'check_list/fragments/select_buildings_on_property'), $data);
}
@@ -578,7 +578,7 @@
phpgwapi_jquery::load_widget('core');
-
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);
+
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan', 'check_list/view_control_info',
'check_list/fragments/select_buildings_on_property'), $data);
}
function view_control_details()
@@ -595,7 +595,6 @@
self::render_template_xsl('check_list/view_control_details', $data);
}
- // Displays control groups and control items for a check list
function add_case()
{
$check_list_id = phpgw::get_var('check_list_id');
@@ -675,7 +674,7 @@
self::add_javascript('controller', 'controller',
'ajax.js');
self::add_javascript('controller', 'controller', 'case.js');
-
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);
+
self::render_template_xsl(array('check_list/fragments/check_list_menu',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section', 'case/add_case',
'check_list/fragments/select_buildings_on_property'), $data);
}
function view_control_items()
Modified: trunk/controller/templates/base/case/add_case.xsl
===================================================================
--- trunk/controller/templates/base/case/add_case.xsl 2013-02-15 13:43:18 UTC
(rev 10855)
+++ trunk/controller/templates/base/case/add_case.xsl 2013-02-15 14:41:17 UTC
(rev 10856)
@@ -27,7 +27,7 @@
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu" />
+ <xsl:call-template name="check_list_menu" />
</div>
<div style="margin:20px 0;">
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -63,7 +63,7 @@
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu" />
+ <xsl:call-template name="check_list_menu" />
</div>
<!-- ======================= INFO ABOUT MESSAGE
========================= -->
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2013-02-15
13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2013-02-15
14:41:17 UTC (rev 10856)
@@ -64,7 +64,7 @@
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu" />
+ <xsl:call-template name="check_list_menu" />
</div>
<!-- ======================= INFO ABOUT MESSAGE
========================= -->
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -4,41 +4,8 @@
<!-- ================== ADD CHECKLIST ========================= -->
<div id="main_content" class="medium">
- <div id="check-list-heading">
- <div class="box-1">
- <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="location_level
= 1">
- <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- <div class="box-2 select-box">
- <xsl:call-template name="nav_control_plan" />
- </div>
- </div>
-
- <div id="check_list_menu">
- <a href="#" class="active">
- Vis detaljer for sjekkliste
- </a>
- <a href="#">
- Vis saker
- </a>
- <a href="#">
- Vis info om kontroll
- </a>
- </div>
+
+ <xsl:call-template name="check_list_top_section" />
<!-- ================== CHECKLIST DETAILS ===================== -->
<div id="check_list_details">
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -5,38 +5,8 @@
<div id="main_content" class="medium">
- <!-- ================== EDIT CHECKLIST ========================= -->
-
- <div id="check-list-heading">
- <div class="box-1">
- <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="location_level
= 1">
- <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <div class="box-2 select-box">
- <xsl:call-template name="nav_control_plan" />
- </div>
-
- <!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu">
- <xsl:with-param
name="active_tab">view_details</xsl:with-param>
- </xsl:call-template>
- </div>
-
+ <xsl:call-template name="check_list_top_section" />
+
<!-- ================== CHECKLIST DETAILS ===================== -->
<div id="check_list_details">
<h3 class="box_header">Sjekklistedetaljer</h3>
Copied:
trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl (from
rev 10844,
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -0,0 +1,83 @@
+<xsl:template name="check_list_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 class="first">
+ <xsl:choose>
+ <xsl:when test="$active_tab = 'view_details'">
+ <xsl:attribute name="class">first active</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="class">first</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <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:choose>
+ <xsl:when test="$active_tab = 'view_control_info'">
+ <xsl:attribute name="class">last active</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="class">last</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <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>
Deleted:
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
===================================================================
---
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -1,72 +0,0 @@
-<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/check_list_top_section.xsl
(from rev 10844,
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl)
===================================================================
---
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl
(rev 0)
+++
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -0,0 +1,36 @@
+<xsl:template name="check_list_top_section" 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>
+
+<!-- ================== CHECKLIST DETAILS INFO ========================= -->
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="box-2 select-box">
+ <xsl:call-template name="nav_control_plan" />
+ </div>
+
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="check_list_menu">
+ <xsl:with-param
name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
+ </div>
+
+</xsl:template>
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -84,7 +84,7 @@
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu">
+ <xsl:call-template name="check_list_menu">
<xsl:with-param
name="active_tab">view_cases</xsl:with-param>
</xsl:call-template>
</div>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -91,7 +91,7 @@
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_tab_menu">
+ <xsl:call-template name="check_list_menu">
<xsl:with-param
name="active_tab">view_control_info</xsl:with-param>
</xsl:call-template>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2013-02-15 13:43:18 UTC
(rev 10855)
+++ trunk/controller/templates/base/css/base.css 2013-02-15 14:41:17 UTC
(rev 10856)
@@ -1641,12 +1641,11 @@
#check_list_menu a {
background: none repeat scroll 0 0 #F4EDE3;
- border: 1px solid #EDE4D8;
+ border: 1px solid #D9D4CE;
color: #444444;
cursor: pointer;
display: inline-block;
font-weight: bold;
- margin-right: 3px;
padding: 18px 0;
text-align: center;
text-decoration: none;
@@ -1654,16 +1653,18 @@
}
#check_list_menu a.first {
- border-radius: 3px 3px 3px 3px:
+ border-radius: 4px 0 0 4px;
+ border-right: 0 none;
}
#check_list_menu a.last {
- border-radius: 3px 3px 3px 3px:
+ border-radius: 0 4px 4px 0;
+ border-left: 0;
}
#check_list_menu a.active {
- background: none repeat scroll 0 0 #CAE3FB;
- border: 1px solid #CAE3FB;
+ background: none repeat scroll 0 0 #D9D4CE;
+ border: 1px solid #D9D4CE;
}
#check_list_menu .left_btns {
Deleted:
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -1,133 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
-
-<div id="main_content" class="medium">
-
- <!-- ================== EDIT CHECKLIST ========================= -->
-
- <div id="check-list-heading">
- <div class="box-1">
- <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="location_level
= 1">
- <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="cases_menu">
- <xsl:with-param
name="active_tab">reg_case</xsl:with-param>
- </xsl:call-template>
- </div>
-
- <!-- ================== CHECKLIST DETAILS ===================== -->
- <div id="check_list_details">
- <h3 class="box_header">Sjekklistedetaljer</h3>
- <xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
- <form id="frm_update_check_list" action="{$action_url}"
method="post">
- <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
- <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
-
- <fieldset class="col_1">
- <div class="row">
- <label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select id="status" name="status">
- <xsl:choose>
- <xsl:when
test="check_list/status = 0">
- <option
value="1">Utført</option>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when
test="check_list/status = 1">
- <option
value="1" SELECTED="SELECTED">Utført</option>
- <option
value="0">Ikke utført</option>
- <option value="3">Kansellert</option>
- </xsl:when>
- <xsl:when test="check_list/status = 3">
- <option
value="3" SELECTED="SELECTED">Kansellert</option>
- <option
value="0">Ikke utført</option>
- <option value="1">Utført</option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="0" SELECTED="SELECTED">Ikke utført</option>
- <option
value="1">Utført</option>
- <option value="3">Kansellert</option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </div>
- <div class="row">
- <label>Skal utføres innen</label>
- <input class="date">
- <xsl:attribute
name="id">deadline_date</xsl:attribute>
- <xsl:attribute
name="name">deadline_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/deadline != 0 or
check_list/deadline != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div class="row">
- <label>Planlagt dato</label>
- <input class="date">
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/planned_date != 0 and
check_list/planned_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div class="row">
- <label>Utført dato</label>
- <input class="date">
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/completed_date != 0
and check_list/completed_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- </fieldset>
- <fieldset class="col_2">
- <div class="row">
- <label>Antall åpne saker</label>
- <xsl:value-of
select="check_list/num_open_cases"/>
- </div>
- <div class="row">
- <label>Antall ventende saker</label>
- <xsl:value-of
select="check_list/num_pending_cases"/>
- </div>
- </fieldset>
-
- <div class="comment">
- <label>Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of select="check_list/comment"/>
- </textarea>
- </div>
-
- <div class="form-buttons">
- <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input class="btn" type="submit"
name="save_control" value="Lagre detaljer" />
- </div>
- </form>
- </div>
- </div>
-</xsl:template>
\ No newline at end of file
Deleted:
trunk/controller/templates/mobilefrontend/check_list/fragments/cases_menu.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/cases_menu.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/cases_menu.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -1,43 +0,0 @@
-<xsl:template name="cases_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">
- <a class="btn focus first">
- <xsl:if test="$active_tab = 'reg_cases'">
- <xsl:attribute name="class">active</xsl:attribute>
- </xsl:if>
- <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>
- <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 åpne saker
- </a>
- <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 lukkede saker
- </a>
-</div>
-</xsl:template>
Copied:
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
(from rev 10849,
trunk/controller/templates/mobilefrontend/check_list/fragments/cases_menu.xsl)
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
(rev 0)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -0,0 +1,43 @@
+<xsl:template name="cases_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">
+ <a class="first">
+ <xsl:if test="$active_tab = 'reg_cases'">
+ <xsl:attribute name="class">active</xsl:attribute>
+ </xsl:if>
+ <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>
+ <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 åpne saker
+ </a>
+ <a class="last">
+ <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 lukkede saker
+ </a>
+</div>
+</xsl:template>
Copied:
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
(from rev 10844,
trunk/controller/templates/base/check_list/fragments/check_list_tab_menu.xsl)
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
(rev 0)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -0,0 +1,36 @@
+<xsl:template name="check_list_top_section" 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>
+
+<!-- ================== CHECKLIST DETAILS INFO ========================= -->
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <div class="box-2 select-box">
+ <xsl:call-template name="nav_control_plan" />
+ </div>
+
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="check_list_menu">
+ <xsl:with-param
name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
+ </div>
+
+</xsl:template>
Deleted:
trunk/controller/templates/mobilefrontend/check_list/fragments/select_buildings_on_property.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/select_buildings_on_property.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/select_buildings_on_property.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -1,19 +0,0 @@
-<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
-<xsl:template name="select_buildings_on_property">
-
- <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>
-
-</xsl:template>
Deleted:
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
+++
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
2013-02-15 14:41:17 UTC (rev 10856)
@@ -1,104 +0,0 @@
-<!-- $Id: edit_check_list.xsl 8513 2012-01-07 10:38:09Z vator $ -->
-<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
-<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
-
-<div id="main_content" class="medium">
- <script>
-
- // ====================== LASTER FANEN view_open_errors NÅR
SIDEN LASTES FØRSTE GANG ===================
- $(document).ready(function() {
- var requestUrl = $("#view_open_cases").attr("href");
- load_tab(requestUrl);
- });
-
- // ====================== FUNKSJONALITET FOR LASTING AV TABS
===================
- $(function() {
-
- $("#register_case").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_open_cases").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_closed_cases").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_measurements").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
- });
-
- function load_tab(requestUrl){
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#load_view_content").html(data);
- },
- error: function(XMLHttpRequest, textStatus,
errorThrown) {
- if (XMLHttpRequest.status === 401) {
- location.href = '/';
- }
- }
- });
- }
- </script>
-
- <div id="check-list-heading">
- <div class="box-1">
- <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="location_level
= 1">
- <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </div>
-
- <!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="cases_menu">
- <xsl:with-param
name="active_tab">view_cases</xsl:with-param>
- </xsl:call-template>
- </div>
-
- <a id="view_open_cases">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
-
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- </a>
-
- <div style="margin:20px 0;">
- <xsl:call-template name="select_buildings_on_property"
/>
- </div>
- <div id="load_view_content"></div>
-</div>
-</xsl:template>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2013-02-15
13:43:18 UTC (rev 10855)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2013-02-15
14:41:17 UTC (rev 10856)
@@ -1,4 +1,13 @@
#main_content.medium {
text-align: left;
- width: 98%;
+ width: 96%;
+}
+
+#check-list-heading .box-1 {
+ float: none;
+ width: 100%;
+}
+
+#check_list_menu {
+ margin: 20px 0;
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10856] Moved view_closed_cases and view_open_cases to case folder,
Torstein <=