[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8578]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8578] |
|
Date: |
Mon, 16 Jan 2012 07:32:59 +0000 |
Revision: 8578
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8578
Author: vator
Date: 2012-01-16 07:32:59 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/case/view_case_message.xsl
trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/check_list/view_closed_cases.xsl
trunk/controller/templates/base/check_list/view_measurements.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-01-15 20:23:54 UTC (rev
8577)
+++ trunk/controller/inc/class.uicase.inc.php 2012-01-16 07:32:59 UTC (rev
8578)
@@ -146,7 +146,7 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
- self::render_template_xsl('case/create_case_message',
$data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/create_case_message'), $data);
}
function register_case_message(){
@@ -264,7 +264,7 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
- self::render_template_xsl('case/view_case_message',
$data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'case/view_case_message'), $data);
}
public function updateStatusForCases($location_id,
$location_item_id, $updateStatus = 0){
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-15 20:23:54 UTC
(rev 8577)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-16 07:32:59 UTC
(rev 8578)
@@ -387,7 +387,7 @@
'check_list' => $check_list->toArray()
);
- self::render_template_xsl('check_list/register_case',
$data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
}
function view_open_cases(){
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-16 07:32:59 UTC (rev 8578)
@@ -60,10 +60,10 @@
'add_location_to_control' => true,
'add_check_list_for_location' => true,
'save_check_list_for_location' => true,
-
'edit_check_list_for_location' => true,
+
'edit_check_list' => true,
'create_case_message' => true,
'view_control_info' => true,
-
'view_errors_for_check_list' => true
+
'view_cases_for_check_list' => true
);
function __construct()
@@ -365,7 +365,7 @@
self::render_template_xsl(array('add_check_list_for_location'), $data);
}
- function edit_check_list_for_location(){
+ function edit_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->get_single($check_list_id);
@@ -389,10 +389,10 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
- self::render_template_xsl('check_list/edit_check_list',
$data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
}
- function view_errors_for_check_list(){
+ function view_cases_for_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->get_single($check_list_id);
@@ -416,7 +416,7 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
self::render_template_xsl('check_list/view_errors_for_check_list', $data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
function save_check_list_for_location(){
@@ -441,7 +441,7 @@
$check_list_id = $this->so_check_list->add($check_list);
- $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list_for_location',
'check_list_id'=>$check_list_id));
+ $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list',
'check_list_id'=>$check_list_id));
}
function create_case_message(){
@@ -520,7 +520,7 @@
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
self::render_template_xsl('check_list/view_control_info', $data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
function get_timestamp_from_date( $date_string ){
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -6,16 +6,7 @@
<h1>Registrer avviksmelding</h1>
- <div id="edit_check_list_menu" class="hor_menu">
- <a class="btn active">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Tilbake til sjekkliste
- </a>
- </div>
+ <xsl:call-template name="check_list_tab_menu" />
<h3 class="box_header">Meldingen gjelder</h3>
<div id="case_details">
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2012-01-15
20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2012-01-16
07:32:59 UTC (rev 8578)
@@ -6,26 +6,8 @@
<h1>Avviksmelding registrert</h1>
- <div id="edit_check_list_menu" class="hor_menu">
- <a class="btn active">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Tilbake til sjekkliste
- </a>
- <a class="btn active">
- <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:attribute>
- Registrer ny melding
- </a>
- </div>
+ <xsl:call-template name="check_list_tab_menu" />
-
<h3 class="box_header" href="#">Meldingen gjaldt</h3>
<div id="case_details">
<h3>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h3>
@@ -72,5 +54,13 @@
</xsl:for-each>
</ul>
</div>
+ <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:attribute>
+ Registrer ny melding
+ </a>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -40,7 +40,7 @@
<div>
<a class="btn focus first">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
@@ -48,7 +48,7 @@
</a>
<a class="btn focus">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+
<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:attribute>
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -2,103 +2,89 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div id="error_message_menu">
- <a class="btn" id="view_open_cases">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.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:attribute>
- Vis avvik/måling
- </a>
- <a class="btn">
- <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:attribute>
- Registrer avviksmelding
- </a>
-</div>
+<div id="main_content">
+ <h1>Registrer avviksmelding</h1>
+
+ <xsl:call-template name="check_list_tab_menu" />
-<div id="register_errors_content">
- <div class="tab_menu"><a class="active">Registrer
sak/måling</a></div>
-
- <div class="tab_item active">
+ <div id="view_cases">
+
+ <h3 class="box_header">Registrer sak/måling</h3>
+ <div class="tab_item active">
+
+ <xsl:choose>
+ <xsl:when
test="control_items_for_check_list/child::node()">
- <xsl:choose>
- <xsl:when
test="control_items_for_check_list/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="control_items_list"
class="check_items expand_list">
- <xsl:for-each
select="control_items_for_check_list">
- <li>
- <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
- <form
id="frm_register_case"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
-
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <input
type="hidden" name="control_item_id" value="{$control_item_id}" />
- <input
name="check_list_id" type="hidden">
-
<xsl:attribute name="value">
-
<xsl:value-of select="//check_list/id"/>
-
</xsl:attribute>
- </input>
- <input
name="status" type="hidden" value="0" />
-
- <xsl:choose>
-
<xsl:when test="type = 'control_item_type_1'">
-
<input name="type" type="hidden" value="control_item_type_1" />
-
-
<div class="check_item">
-
<div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
-
</div>
+ <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
+
+ <ul id="control_items_list" class="check_items
expand_list">
+ <xsl:for-each
select="control_items_for_check_list">
+ <li>
+ <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
+ <form
id="frm_register_case"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <input
type="hidden" name="control_item_id" value="{$control_item_id}" />
+ <input
name="check_list_id" type="hidden">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="//check_list/id"/>
+ </xsl:attribute>
+ </input>
+ <input
name="status" type="hidden" value="0" />
+
+ <xsl:choose>
+ <xsl:when
test="type = 'control_item_type_1'">
+ <input
name="type" type="hidden" value="control_item_type_1" />
+
+ <div
class="check_item">
+ <div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+ <div
class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
</div>
-
</xsl:when>
-
<xsl:when test="type = 'control_item_type_2'">
-
<input name="type" type="hidden" value="control_item_type_2" />
-
<div class="check_item">
-
<div>
-
<label class="comment">Registrer målingsverdi</label>
-
<input>
-
<xsl:attribute name="name">measurement</xsl:attribute>
-
<xsl:attribute name="type">text</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="measurement"/>
-
</xsl:attribute>
-
</input>
-
</div>
-
<div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Registrer sak"
class="not_active" title="{$lang_save}" />
-
</div>
+ </div>
+ </xsl:when>
+ <xsl:when
test="type = 'control_item_type_2'">
+ <input
name="type" type="hidden" value="control_item_type_2" />
+ <div
class="check_item">
+ <div>
+ <label
class="comment">Registrer målingsverdi</label>
+
<input>
+
<xsl:attribute name="name">measurement</xsl:attribute>
+
<xsl:attribute name="type">text</xsl:attribute>
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+ </div>
+ <div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+ <div
class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Registrer sak"
class="not_active" title="{$lang_save}" />
</div>
-
</xsl:when>
- </xsl:choose>
-
- </form>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- Alle sjekkpunkter for kontroll
er registert som åpent/håndtert avvik eller måling
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
+ </form>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Alle sjekkpunkter for kontroll er
registert som åpent/håndtert avvik eller måling
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+</div>
+</div>
</xsl:template>
Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -1,28 +1,8 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data">
-
-<div id="error_message_menu">
- <a class="btn" id="register_case">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</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:attribute>
- Registrer sak/måling
- </a>
- <a class="btn">
- <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:attribute>
- Registrer avviksmelding
- </a>
-</div>
-<div id="view_errors">
+<div id="view_cases">
<xsl:call-template name="cases_tab_menu">
<xsl:with-param
name="active_tab">view_closed_cases</xsl:with-param>
Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -1,28 +1,8 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data">
-
-<div id="error_message_menu">
- <a class="btn" id="register_case">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</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:attribute>
- Registrer sak/måling
- </a>
- <a class="btn">
- <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:attribute>
- Registrer avviksmelding
- </a>
-</div>
-<div id="view_errors">
+<div id="view_cases">
<xsl:call-template name="cases_tab_menu">
<xsl:with-param
name="active_tab">view_measurements</xsl:with-param>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-15 20:23:54 UTC (rev 8577)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-16 07:32:59 UTC (rev 8578)
@@ -2,7 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div id="view_errors">
+<div id="view_cases">
<xsl:call-template name="cases_tab_menu">
<xsl:with-param
name="active_tab">view_open_cases</xsl:with-param>
@@ -47,7 +47,16 @@
</xsl:choose>
</xsl:for-each>
</ul>
-
+
+ <a style="font-size: 11px;margin-top: 20px;padding: 3px
20px;" class="btn focus">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Registrer melding
+ </a>
+
</xsl:when>
<xsl:otherwise>
Ingen registrerte åpne avvik
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-15 20:23:54 UTC
(rev 8577)
+++ trunk/controller/templates/base/css/base.css 2012-01-16 07:32:59 UTC
(rev 8578)
@@ -1063,7 +1063,7 @@
border: 1px solid #A3A3A3;
margin: 0 318px 0 0;
padding: 15px;
- width: 628px;
+ width: 800px;
}
.tab_item h2{
margin:0 0 10px;
@@ -1188,9 +1188,9 @@
display:block;
}
-#view_errors {
- float:left;
- margin: 20px 0 0 10px;
+#view_cases {
+ float: left;
+ margin: 20px 0 0 0;
}
#register_errors_content {
float: right;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8578],
Torstein <=