|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [17382] more on controller |
| Date: | Fri, 1 Dec 2017 11:54:02 -0500 (EST) |
Revision: 17382
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17382
Author: sigurdne
Date: 2017-12-01 11:54:02 -0500 (Fri, 01 Dec 2017)
Log Message:
-----------
more on controller
Modified Paths:
--------------
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/mobilefrontend/case/add_case.xsl
trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
trunk/controller/templates/mobilefrontend/css/base.css
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2017-12-01 10:17:56 UTC (rev
17381)
+++ trunk/controller/setup/phpgw_no.lang 2017-12-01 16:54:02 UTC (rev
17382)
@@ -414,4 +414,5 @@
save check list controller no Lagre verdier
plan controller no Planlegg
modified date controller no Dato siste endring
-modified by controller no Endret av
\ No newline at end of file
+modified by controller no Endret av
+set status: done controller no Sett status: utført
\ No newline at end of file
Modified: trunk/controller/templates/mobilefrontend/case/add_case.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/add_case.xsl 2017-12-01
10:17:56 UTC (rev 17381)
+++ trunk/controller/templates/mobilefrontend/case/add_case.xsl 2017-12-01
16:54:02 UTC (rev 17382)
@@ -32,238 +32,240 @@
<xsl:choose>
<xsl:when
test="control_items/child::node()">
<li>
- <h3
class="expand-trigger">
-
<img src="controller/images/arrow_right.png" />
-
<xsl:value-of select="control_group/group_name"/>
- </h3>
- <ul
class="expand_list" style="display:none;">
-
<xsl:choose>
-
<xsl:when test="components_at_location/child::node()">
-
<select name="component_at_control_group_{control_group/id}"
id="component_at_control_group_{control_group/id}">
-
<xsl:apply-templates
select="components_at_location/component_options"/>
-
</select>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:variable name="control_group_id">
-
<xsl:value-of select="control_group/id"/>
-
</xsl:variable>
-
<xsl:for-each select="control_items">
-
<li>
-
<h4>
-
<span>
-
<xsl:value-of select="title"/>
-
</span>
-
</h4>
-
<form class="pure-form pure-form-stacked frm_register_case"
action="{$action_url}" method="post">
-
<!--input type="hidden" name="location_code" value=""
class="required" /-->
-
<input type="hidden" name="location_code" value="" >
-
<xsl:if test="//location_required = 1">
-
<xsl:attribute name="class" >
-
<xsl:text>required</xsl:text>
+
<fieldset>
+
<h3 class="expand-trigger">
+
<img src="controller/images/arrow_right.png" />
+
<xsl:value-of select="control_group/group_name"/>
+
</h3>
+
<ul class="expand_list" style="display:none;">
+
<xsl:choose>
+
<xsl:when test="components_at_location/child::node()">
+
<select
name="component_at_control_group_{control_group/id}"
id="component_at_control_group_{control_group/id}">
+
<xsl:apply-templates
select="components_at_location/component_options"/>
+
</select>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:variable name="control_group_id">
+
<xsl:value-of select="control_group/id"/>
+
</xsl:variable>
+
<xsl:for-each select="control_items">
+
<li>
+
<h4>
+
<span>
+
<xsl:value-of select="title"/>
+
</span>
+
</h4>
+
<form class="pure-form pure-form-stacked
frm_register_case" action="{$action_url}" method="post">
+
<!--input type="hidden" name="location_code"
value="" class="required" /-->
+
<input type="hidden" name="location_code"
value="" >
+
<xsl:if test="//location_required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
</input>
+
<input type="hidden" name="control_group_id"
value="{$control_group_id}" />
+
<input type="hidden"
name="component_location_id">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="//check_list/location_id"/>
</xsl:attribute>
-
</xsl:if>
-
</input>
-
<input type="hidden" name="control_group_id"
value="{$control_group_id}" />
-
<input type="hidden" name="component_location_id">
-
<xsl:attribute name="value">
-
<xsl:value-of
select="//check_list/location_id"/>
-
</xsl:attribute>
-
</input>
-
<input type="hidden" name="component_id">
-
<xsl:attribute name="value">
-
<xsl:value-of
select="//check_list/component_id"/>
-
</xsl:attribute>
-
</input>
-
<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 type="hidden" name="check_list_id">
-
<xsl:attribute name="value">
-
<xsl:value-of select="//check_list/id"/>
-
</xsl:attribute>
-
</input>
+
</input>
+
<input type="hidden" name="component_id">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="//check_list/component_id"/>
+
</xsl:attribute>
+
</input>
+
<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 type="hidden" name="check_list_id">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="//check_list/id"/>
+
</xsl:attribute>
+
</input>
-
<xsl:choose>
-
<xsl:when test="what_to_do !=''">
-
<!-- WHAT TO DO -->
-
<div class="pure-control-group
what-to-do">
-
<label>Hva skal sjekkes:</label>
-
<div>
-
<xsl:value-of
disable-output-escaping="yes" select="what_to_do"/>
+
<xsl:choose>
+
<xsl:when test="what_to_do !=''">
+
<!-- WHAT TO DO -->
+
<div class="pure-control-group
what-to-do">
+
<label>Hva skal
sjekkes:</label>
+
<div>
+
<xsl:value-of
disable-output-escaping="yes" select="what_to_do"/>
+
</div>
</div>
-
</div>
-
</xsl:when>
-
</xsl:choose>
+
</xsl:when>
+
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="how_to_do !=''">
-
<!-- HOW TO DO -->
-
<div class="pure-control-group
how-to-do">
-
<label>Utførelsesbeskrivelse:</label>
+
<xsl:choose>
+
<xsl:when test="how_to_do !=''">
+
<!-- HOW TO DO -->
+
<div class="pure-control-group
how-to-do">
+
<label>Utførelsesbeskrivelse:</label>
+
<div>
+
<xsl:value-of
disable-output-escaping="yes" select="how_to_do"/>
+
</div>
+
</div>
+
</xsl:when>
+
</xsl:choose>
+
+
<xsl:choose>
+
<xsl:when test="type =
'control_item_type_1'">
+
<input type="hidden"
name="status" value="0" />
+
<input type="hidden"
name="type" value="control_item_type_1" />
+
<div class="pure-control-group">
+
<label>Status</label>
+
<select name="status"
class="pure-button">
+
<option
value="0" SELECTED="SELECTED">Åpen</option>
+
<option
value="1" >Lukket</option>
+
<option
value="2" >Venter på tilbakemelding</option>
+
</select>
+
</div>
<div>
-
<xsl:value-of
disable-output-escaping="yes" select="how_to_do"/>
+
<label
class="comment">Beskrivelse av sak</label>
+
<textarea
name="case_descr" class="pure-input-1">
+
<xsl:if
test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required pure-input-1</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
+
<xsl:value-of
select="comment"/>
+
</textarea>
</div>
-
</div>
-
</xsl:when>
-
</xsl:choose>
+
<input type="submit"
class="pure-button pure-button-primary" name="save_control" value="Lagre sak" />
-
<xsl:choose>
-
<xsl:when test="type = 'control_item_type_1'">
-
<input type="hidden" name="status"
value="0" />
-
<input type="hidden" name="type"
value="control_item_type_1" />
-
<div class="pure-control-group">
-
<label>Status</label>
-
<select name="status"
class="pure-button">
-
<option value="0"
SELECTED="SELECTED">Åpen</option>
-
<option value="1"
>Lukket</option>
-
<option value="2"
>Venter på tilbakemelding</option>
-
</select>
-
</div>
-
<div>
-
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr"
class="pure-input-1">
-
<xsl:if test="required
= 1">
-
<xsl:attribute
name="class" >
-
<xsl:text>required pure-input-1</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
+
</xsl:when>
+
<xsl:when test="type =
'control_item_type_2'">
+
<input name="type"
type="hidden" value="control_item_type_2" />
-
<xsl:value-of
select="comment"/>
-
</textarea>
-
</div>
-
<input type="submit" class="pure-button
pure-button-primary" name="save_control" value="Lagre sak" />
+
<div class="pure-control-group">
+
<label>Status</label>
+
<select name="status"
class="pure-button">
+
<option
value="0" SELECTED="SELECTED">Åpen</option>
+
<option
value="1" >Lukket</option>
+
<option
value="2" >Venter på tilbakemelding</option>
+
</select>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Registrer målingsverdi</label>
+
<input
class="pure-input-1">
+
<xsl:if
test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required pure-input-1</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
-
</xsl:when>
-
<xsl:when test="type = 'control_item_type_2'">
-
<input name="type" type="hidden"
value="control_item_type_2" />
-
-
<div class="pure-control-group">
-
<label>Status</label>
-
<select name="status"
class="pure-button">
-
<option value="0"
SELECTED="SELECTED">Åpen</option>
-
<option value="1"
>Lukket</option>
-
<option value="2"
>Venter på tilbakemelding</option>
-
</select>
-
</div>
-
<div class="pure-control-group">
-
<label
class="comment">Registrer målingsverdi</label>
-
<input class="pure-input-1">
-
<xsl:if test="required
= 1">
-
<xsl:attribute
name="class" >
-
<xsl:text>required pure-input-1</xsl:text>
+
<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>
-
</xsl:if>
+
</input>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Beskrivelse av sak</label>
+
<textarea
name="case_descr" class="pure-input-1">
+
<xsl:value-of
select="comment"/>
+
</textarea>
+
</div>
+
<xsl:variable name="lang_save">
+
<xsl:value-of
select="php:function('lang', 'register_error')" />
+
</xsl:variable>
+
<input type="submit"
class="pure-button pure-button-primary" name="save_control" value="Lagre
måling" title="{$lang_save}" />
-
<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 class="pure-control-group">
-
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr"
class="pure-input-1">
-
<xsl:value-of
select="comment"/>
-
</textarea>
-
</div>
-
<xsl:variable name="lang_save">
-
<xsl:value-of
select="php:function('lang', 'register_error')" />
-
</xsl:variable>
-
<input type="submit" class="pure-button
pure-button-primary" name="save_control" value="Lagre måling"
title="{$lang_save}" />
+
</xsl:when>
+
<xsl:when test="type =
'control_item_type_3'">
+
<input name="type"
type="hidden" value="control_item_type_3" />
-
</xsl:when>
-
<xsl:when test="type = 'control_item_type_3'">
-
<input name="type" type="hidden"
value="control_item_type_3" />
-
-
<div class="pure-control-group">
-
<label>Status</label>
-
<select name="status"
class="pure-button">
-
<option value="0"
SELECTED="SELECTED">Åpen</option>
-
<option value="1"
>Lukket</option>
-
<option value="2"
>Venter på tilbakemelding</option>
-
</select>
-
</div>
-
<div class="pure-control-group">
-
<label class="comment">Velg
verdi fra liste</label>
-
<select name="option_value"
class="pure-button">
-
<xsl:if test="required
= 1">
-
<xsl:attribute
name="class" >
-
<xsl:text>pure-button required</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
-
<option value=""
>Velg</option>
-
<xsl:for-each
select="options_array">
-
<option>
-
<xsl:attribute name="value">
+
<div class="pure-control-group">
+
<label>Status</label>
+
<select name="status"
class="pure-button">
+
<option
value="0" SELECTED="SELECTED">Åpen</option>
+
<option
value="1" >Lukket</option>
+
<option
value="2" >Venter på tilbakemelding</option>
+
</select>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Velg verdi fra liste</label>
+
<select
name="option_value" class="pure-button">
+
<xsl:if
test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>pure-button required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<option
value="" >Velg</option>
+
<xsl:for-each
select="options_array">
+
<option>
+
<xsl:attribute name="value">
+
<xsl:value-of select="option_value"/>
+
</xsl:attribute>
<xsl:value-of select="option_value"/>
-
</xsl:attribute>
-
<xsl:value-of select="option_value"/>
-
</option>
-
</xsl:for-each>
-
</select>
-
</div>
-
<div class="pure-control-group">
-
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr"
class="pure-input-1">
-
<xsl:value-of
select="comment"/>
-
</textarea>
-
</div>
-
<xsl:variable name="lang_save">
-
<xsl:value-of
select="php:function('lang', 'register_error')" />
-
</xsl:variable>
-
<input type="submit" class="pure-button
pure-button-primary" name="save_control" value="Lagre sak/måling"
title="{$lang_save}" />
+
</option>
+
</xsl:for-each>
+
</select>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Beskrivelse av sak</label>
+
<textarea
name="case_descr" class="pure-input-1">
+
<xsl:value-of
select="comment"/>
+
</textarea>
+
</div>
+
<xsl:variable name="lang_save">
+
<xsl:value-of
select="php:function('lang', 'register_error')" />
+
</xsl:variable>
+
<input type="submit"
class="pure-button pure-button-primary" name="save_control" value="Lagre
sak/måling" title="{$lang_save}" />
-
</xsl:when>
-
<xsl:when test="type = 'control_item_type_4'">
+
</xsl:when>
+
<xsl:when test="type =
'control_item_type_4'">
-
<input name="type" type="hidden"
value="control_item_type_4" />
+
<input name="type"
type="hidden" value="control_item_type_4" />
-
<div class="pure-control-group">
-
<label>Status</label>
-
<select name="status"
class="pure-button">
-
<option value="0"
SELECTED="SELECTED">Åpen</option>
-
<option value="1"
>Lukket</option>
-
<option value="2"
>Venter på tilbakemelding</option>
-
</select>
-
</div>
-
<div class="pure-control-group">
-
<label class="comment">Velg
verdi fra lister</label>
-
<select name="option_value">
-
<xsl:if test="required
= 1">
-
<xsl:attribute
name="class" >
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
-
<option value=""
>Velg</option>
-
<xsl:for-each
select="options_array">
-
<option>
-
<xsl:attribute name="value">
+
<div class="pure-control-group">
+
<label>Status</label>
+
<select name="status"
class="pure-button">
+
<option
value="0" SELECTED="SELECTED">Åpen</option>
+
<option
value="1" >Lukket</option>
+
<option
value="2" >Venter på tilbakemelding</option>
+
</select>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Velg verdi fra lister</label>
+
<select
name="option_value">
+
<xsl:if
test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<option
value="" >Velg</option>
+
<xsl:for-each
select="options_array">
+
<option>
+
<xsl:attribute name="value">
+
<xsl:value-of select="option_value"/>
+
</xsl:attribute>
<xsl:value-of select="option_value"/>
-
</xsl:attribute>
-
<xsl:value-of select="option_value"/>
-
</option>
-
</xsl:for-each>
-
</select>
-
</div>
-
<div class="pure-control-group">
-
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr"
class="pure-input-1">
-
<xsl:value-of
select="comment"/>
-
</textarea>
-
</div>
-
<xsl:variable name="lang_save">
-
<xsl:value-of
select="php:function('lang', 'register_error')" />
-
</xsl:variable>
-
<input type="submit" class="pure-button
pure-button-primary" name="save_control" value="Lagre sak/måling"
title="{$lang_save}" />
+
</option>
+
</xsl:for-each>
+
</select>
+
</div>
+
<div class="pure-control-group">
+
<label
class="comment">Beskrivelse av sak</label>
+
<textarea
name="case_descr" class="pure-input-1">
+
<xsl:value-of
select="comment"/>
+
</textarea>
+
</div>
+
<xsl:variable name="lang_save">
+
<xsl:value-of
select="php:function('lang', 'register_error')" />
+
</xsl:variable>
+
<input type="submit"
class="pure-button pure-button-primary" name="save_control" value="Lagre
sak/måling" title="{$lang_save}" />
-
</xsl:when>
-
</xsl:choose>
-
</form>
-
</li>
-
</xsl:for-each>
- </ul>
+
</xsl:when>
+
</xsl:choose>
+
</form>
+
</li>
+
</xsl:for-each>
+
</ul>
+
</fieldset>
</li>
</xsl:when>
<xsl:otherwise>
Modified:
trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-01 10:17:56 UTC (rev 17381)
+++ trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-01 16:54:02 UTC (rev 17382)
@@ -188,7 +188,7 @@
<xsl:value-of
select="check_list/comment"/>
</textarea>
</div>
- <div class = "pure-g">
+ <div id="submit_group" class="pure-g">
<div class="pure-u-1-4">
<input id="save_check_list"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="save_check_list">
<xsl:attribute
name="value">
Modified:
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-01 10:17:56 UTC (rev 17381)
+++ trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-01 16:54:02 UTC (rev 17382)
@@ -191,7 +191,7 @@
</xsl:variable>
<input class="btn"
type="submit" name="save_control" value="Lagre detaljer" />
</div-->
- <div class = "pure-g">
+ <div id="submit_group" class="pure-g">
<div class="pure-u-1-4">
<input
id="save_check_list" class="pure-button pure-button-primary pure-input-1"
type="submit" name="save_check_list">
<xsl:attribute
name="value">
Modified:
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
2017-12-01 10:17:56 UTC (rev 17381)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
2017-12-01 16:54:02 UTC (rev 17382)
@@ -32,7 +32,7 @@
<!-- ================== CHANGE STATUS FOR CHECKLIST
===================== -->
<xsl:choose>
- <xsl:when test="check_list/id != 0">
+ <xsl:when test="check_list/id != 0 and $active_tab !=
'view_details'">
<div class="box-2 select-box">
<xsl:variable name="action_url">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.update_status,phpgw_return_as:json')" />
@@ -44,7 +44,7 @@
<input
id='update-check-list-status-value' type="hidden" name="status" value="1" />
<input
id="status_submit" type="submit" class="pure-button pure-button-primary">
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('lang', 'Status not done')" />
+
<xsl:value-of select="php:function('lang', 'set status: done')" />
</xsl:attribute>
</input>
</xsl:when>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2017-12-01
10:17:56 UTC (rev 17381)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2017-12-01
16:54:02 UTC (rev 17382)
@@ -36,7 +36,7 @@
}
#submit_group {
position: relative;
- float: left;
+ float: none;
margin-left: 150px;
}
ul.add-cases {
@@ -56,8 +56,10 @@
padding: 7px 10px;
}
-body {margin-left:10px;
- padding:0;
+body {
+ margin-left:5px;
+ margin-right:5px;
+ padding:0;
}
.frm_update_case{
display: none;
| [Prev in Thread] | Current Thread | [Next in Thread] |