|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [17385] more on contrloller: mobilefrontend |
| Date: | Sat, 2 Dec 2017 14:52:37 -0500 (EST) |
Revision: 17385
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17385
Author: sigurdne
Date: 2017-12-02 14:52:37 -0500 (Sat, 02 Dec 2017)
Log Message:
-----------
more on contrloller: mobilefrontend
Modified Paths:
--------------
trunk/controller/js/controller/check_list.js
trunk/controller/templates/mobilefrontend/case/case_row.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/css/base.css
trunk/phpgwapi/templates/base/files.xsl
trunk/phpgwapi/templates/mobilefrontend/css/base.css
Modified: trunk/controller/js/controller/check_list.js
===================================================================
--- trunk/controller/js/controller/check_list.js 2017-12-02 13:17:59 UTC
(rev 17384)
+++ trunk/controller/js/controller/check_list.js 2017-12-02 19:52:37 UTC
(rev 17385)
@@ -95,7 +95,7 @@
this.fileuploader = function ()
{
var sUrl = phpGWLink('index.php', multi_upload_parans);
- var width = Math.min(Math.floor(getWidth() * 0.95), 750);
+ var width = Math.min(Math.floor(getWidth() * 0.9), 750);
TINY.box.show({iframe: sUrl, boxid: 'frameless', width: width, height:
450, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true,
close: true,
closejs: function ()
Modified: trunk/controller/templates/mobilefrontend/case/case_row.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-12-02
13:17:59 UTC (rev 17384)
+++ trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-12-02
19:52:37 UTC (rev 17385)
@@ -2,237 +2,243 @@
<xsl:template name="case_row" xmlns:php="http://php.net/xsl";>
- <xsl:param name="control_item_type" />
- <xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
- <fieldset>
- <xsl:choose>
- <xsl:when test="cases_array/child::node()">
- <h4>
- <span>
- <xsl:value-of select="control_item/title"/>
- </span>
- <xsl:if test="$control_item_type = 'control_item_type_2' or
$control_item_type = 'control_item_type_3' or $control_item_type =
'control_item_type_4'">
- <span style="margin-left:3px;">(Måling)</span>
- </xsl:if>
- </h4>
- <span class="control_item_type ext_info">
- <xsl:value-of select="control_item/type" />
- </span>
- <ul>
- <xsl:for-each select="cases_array">
- <xsl:variable name="cases_id">
- <xsl:value-of select="id"/>
- </xsl:variable>
- <li>
- <!-- ==================== COL1: ORDERNR =====================
-->
- <div class="col_1">
- <span class="order_nr">
- <xsl:number />
- </span>.
- </div>
- <!-- ==================== COL2: CASE CONTENT
===================== -->
- <div class="col_2">
- <div class="case_info">
- <xsl:choose>
- <xsl:when test="component_descr != ''">
- <div class="row">
- <label>
-
<xsl:value-of select="php:function('lang','component')" />
- </label>
- </div>
- <div class="component_descr">
- <xsl:value-of
select="component_descr"/>
- </div>
- </xsl:when>
- </xsl:choose>
+ <xsl:param name="control_item_type" />
+ <xsl:variable name="session_url">
+ <xsl:text>&</xsl:text>
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
+ <fieldset>
+ <xsl:choose>
+ <xsl:when test="cases_array/child::node()">
+ <h4>
+ <span>
+ <xsl:value-of
select="control_item/title"/>
+ </span>
+ <xsl:if test="$control_item_type =
'control_item_type_2' or $control_item_type = 'control_item_type_3' or
$control_item_type = 'control_item_type_4'">
+ <span
style="margin-left:3px;">(Måling)</span>
+ </xsl:if>
+ </h4>
+ <span class="control_item_type ext_info">
+ <xsl:value-of
select="php:function('lang',$control_item_type)" />
+ <!--xsl:value-of
select="control_item/type" /-->
+ </span>
+ <ul>
+ <xsl:for-each select="cases_array">
+ <xsl:variable name="cases_id">
+ <xsl:value-of
select="id"/>
+ </xsl:variable>
+ <li>
+ <!--
==================== COL1: ORDERNR ===================== -->
+ <div class="col_1">
+ <span
class="order_nr">
+
<xsl:number />
+ </span>.
+ </div>
+ <!--
==================== COL2: CASE CONTENT ===================== -->
+ <div class="col_2">
+ <div
class="case_info">
+
<xsl:choose>
+
<xsl:when test="component_descr != ''">
+
<div class="row">
+
<label>
+
<xsl:value-of select="php:function('lang','component')"
/>
+
</label>
+
</div>
+
<div class="component_descr">
+
<xsl:value-of select="component_descr"/>
+
</div>
+
</xsl:when>
+
</xsl:choose>
- <!-- STATUS -->
+ <!--
STATUS -->
- <div class="row first">
- <label>Status:</label>
- <span class="case_status">
- <xsl:choose>
- <xsl:when test="status = 0">Åpen</xsl:when>
- <xsl:when test="status = 1">Lukket</xsl:when>
- <xsl:when test="status = 2">Venter på
tilbakemelding</xsl:when>
- </xsl:choose>
- </span>
- </div>
+ <div
class="row first">
+
<label>Status:</label>
+
<span class="case_status">
+
<xsl:choose>
+
<xsl:when test="status = 0">Åpen</xsl:when>
+
<xsl:when test="status = 1">Lukket</xsl:when>
+
<xsl:when test="status = 2">Venter på tilbakemelding</xsl:when>
+
</xsl:choose>
+
</span>
+ </div>
- <xsl:if test="$control_item_type =
'control_item_type_2' or $control_item_type = 'control_item_type_3' or
$control_item_type = 'control_item_type_4'">
+ <xsl:if
test="$control_item_type = 'control_item_type_2' or $control_item_type =
'control_item_type_3' or $control_item_type = 'control_item_type_4'">
- <!-- MEASUREMENT -->
- <div class="row">
- <label>Måleverdi:</label>
- <span class="measurement">
- <xsl:value-of select="measurement"/>
- </span>
- </div>
- </xsl:if>
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label>Måleverdi:</label>
+
<span class="measurement">
+
<xsl:value-of select="measurement"/>
+
</span>
+
</div>
+
</xsl:if>
- <!-- DESCRIPTION -->
- <div class="row">
- <label>Beskrivelse:</label>
- </div>
- <div class="case_descr">
- <xsl:value-of select="descr"/>
- </div>
+ <!--
DESCRIPTION -->
+ <div
class="row">
+
<label>Beskrivelse:</label>
+ </div>
+ <div
class="case_descr">
+
<xsl:value-of select="descr"/>
+ </div>
- <!-- === QUICK EDIT MENU === -->
- <div class="quick_menu">
- <a class="quick_edit_case first" href="">
- endre
- </a>
- <a class="close_case">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
- <xsl:text>&case_id=</xsl:text>
- <xsl:value-of select="id"/>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="//check_list/id"/>
- <xsl:text>&phpgw_return_as=json</xsl:text>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- lukk
- </a>
- <xsl:choose>
- <xsl:when test="location_item_id = 0">
- <a class="delete_case">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
- <xsl:text>&case_id=</xsl:text>
- <xsl:value-of select="id"/>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="//check_list/id"/>
- <xsl:text>&phpgw_return_as=json</xsl:text>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- slett
- </a>
- </xsl:when>
- </xsl:choose>
- </div>
- </div>
+ <!--
=== QUICK EDIT MENU === -->
+ <div
class="quick_menu">
+
<a class="quick_edit_case first" href="">
+
endre
+
</a>
+
<a class="close_case">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+
lukk
+
</a>
+
<xsl:choose>
+
<xsl:when test="location_item_id = 0">
+
<a class="delete_case">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+
slett
+
</a>
+
</xsl:when>
+
</xsl:choose>
+ </div>
+ </div>
- <!-- =================== UPDATE CASE FORM ===================
-->
- <form class="pure-form pure-form-stacked frm_update_case">
- <xsl:attribute name="action">
-
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
- <xsl:text>&case_id=</xsl:text>
- <xsl:value-of select="id"/>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="//check_list/id"/>
- <xsl:text>&control_item_type=</xsl:text>
- <xsl:value-of select="//control_item/type" />
- <xsl:text>&phpgw_return_as=json</xsl:text>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- <input type="hidden" name="control_item_type">
- <xsl:attribute name="value"><xsl:value-of
select="//control_item/type" /></xsl:attribute>
- </input>
+ <!--
=================== UPDATE CASE FORM =================== -->
+ <form
class="pure-form pure-form-stacked frm_update_case">
+
<xsl:attribute name="action">
+
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&control_item_type=</xsl:text>
+
<xsl:value-of select="//control_item/type" />
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+ <input
type="hidden" name="control_item_type">
+
<xsl:attribute name="value">
+
<xsl:value-of select="//control_item/type" />
+
</xsl:attribute>
+ </input>
- <!-- STATUS -->
- <div class="row first">
- <label>Status:</label>
- <select name="case_status">
- <xsl:choose>
- <xsl:when test="status = 0">
- <option value="0" SELECTED="SELECTED">Åpen</option>
- <option value="2">Venter på
tilbakemelding</option>
- </xsl:when>
- <xsl:when test="status = 1">
- <option value="0">Åpen</option>
- <option value="2">Venter på
tilbakemelding</option>
- </xsl:when>
- <xsl:when test="status = 2">
- <option value="0">Åpen</option>
- <option value="2" SELECTED="SELECTED">Venter på
tilbakemelding</option>
- </xsl:when>
- </xsl:choose>
- </select>
- </div>
- <xsl:if test="$control_item_type = 'control_item_type_2' or
$control_item_type = 'control_item_type_3' or $control_item_type =
'control_item_type_4'">
- <xsl:choose>
- <xsl:when test="$control_item_type =
'control_item_type_2'">
- <!-- MEASUREMENT -->
- <div class="row">
- <label>Måleverdi:</label>
- <input type="text" name="measurement">
- <xsl:attribute name="value">
- <xsl:value-of select="measurement"/>
- </xsl:attribute>
- </input>
- </div>
- </xsl:when>
- <xsl:when test="$control_item_type =
'control_item_type_3'">
- <!-- MEASUREMENT -->
- <div class="row">
- <label class="comment">Velg verdi fra liste</label>
- <select name="measurement">
- <xsl:for-each
select="../control_item/options_array">
- <option>
- <xsl:attribute name="value">
- <xsl:value-of select="option_value"/>
- </xsl:attribute>
- <xsl:value-of select="option_value"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
- </xsl:when>
- <xsl:when test="$control_item_type =
'control_item_type_4'">
- <!-- MEASUREMENT -->
- <div class="row">
- <label class="comment">Velg verdi fra liste</label>
- <xsl:for-each
select="../control_item/options_array">
- <input type="radio" name="measurement"
value="female">
- <xsl:attribute name="value">
- <xsl:value-of select="option_value"/>
- </xsl:attribute>
- </input>
- <xsl:value-of select="option_value"/>
- </xsl:for-each>
- </div>
- </xsl:when>
- </xsl:choose>
- </xsl:if>
+ <!--
STATUS -->
+ <div
class="row first">
+
<label>Status:</label>
+
<select name="case_status">
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<option value="0" SELECTED="SELECTED">Åpen</option>
+
<option value="2">Venter på tilbakemelding</option>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<option value="0">Åpen</option>
+
<option value="2">Venter på tilbakemelding</option>
+
</xsl:when>
+
<xsl:when test="status = 2">
+
<option value="0">Åpen</option>
+
<option value="2" SELECTED="SELECTED">Venter på
tilbakemelding</option>
+
</xsl:when>
+
</xsl:choose>
+
</select>
+ </div>
+ <xsl:if
test="$control_item_type = 'control_item_type_2' or $control_item_type =
'control_item_type_3' or $control_item_type = 'control_item_type_4'">
+
<xsl:choose>
+
<xsl:when test="$control_item_type = 'control_item_type_2'">
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label>Måleverdi:</label>
+
<input type="text" name="measurement">
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+
</div>
+
</xsl:when>
+
<xsl:when test="$control_item_type = 'control_item_type_3'">
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label class="comment">Velg verdi fra liste</label>
+
<select name="measurement">
+
<xsl:for-each
select="../control_item/options_array">
+
<option>
+
<xsl:attribute name="value">
+
<xsl:value-of
select="option_value"/>
+
</xsl:attribute>
+
<xsl:value-of
select="option_value"/>
+
</option>
+
</xsl:for-each>
+
</select>
+
</div>
+
</xsl:when>
+
<xsl:when test="$control_item_type = 'control_item_type_4'">
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label class="comment">Velg verdi fra liste</label>
+
<xsl:for-each select="../control_item/options_array">
+
<input type="radio" name="measurement"
value="female">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="option_value"/>
+
</xsl:attribute>
+
</input>
+
<xsl:value-of select="option_value"/>
+
</xsl:for-each>
+
</div>
+
</xsl:when>
+
</xsl:choose>
+
</xsl:if>
- <!-- DESCRIPTION -->
- <label>Beskrivelse:</label>
- <div class="row">
- <textarea name="case_descr" class="pure-input-1">
- <xsl:value-of select="descr"/>
- </textarea>
- </div>
- <div>
- <input class='btn_m' type='submit' value='Oppdater' />
- <input class='btn_m cancel' type='button' value='Avbryt' />
- </div>
- </form>
- </div>
- <!-- ==================== COL3: MESSAGE LINK
===================== -->
- <div class="col_3">
- <xsl:choose>
- <xsl:when test="location_item_id > 0">
- <a target="_blank">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
- <xsl:text>&id=</xsl:text>
- <xsl:value-of select="location_item_id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis melding
- </a>
- </xsl:when>
- <xsl:otherwise>
- <span class="message">Ingen melding</span>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </li>
- </xsl:for-each>
- </ul>
- </xsl:when>
- </xsl:choose>
- </fieldset>
+ <!--
DESCRIPTION -->
+
<label>Beskrivelse:</label>
+ <div
class="row">
+
<textarea name="case_descr" class="pure-input-1">
+
<xsl:value-of select="descr"/>
+
</textarea>
+ </div>
+ <div>
+
<input class='btn_m' type='submit' value='Oppdater' />
+
<input class='btn_m cancel' type='button' value='Avbryt' />
+ </div>
+ </form>
+ </div>
+ <!--
==================== COL3: MESSAGE LINK ===================== -->
+ <div class="col_3">
+ <xsl:choose>
+
<xsl:when test="location_item_id > 0">
+
<a target="_blank">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of select="location_item_id"/>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<span class="message">Ingen melding</span>
+
</xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ </xsl:choose>
+ </fieldset>
</xsl:template>
Modified:
trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-02 13:17:59 UTC (rev 17384)
+++ trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-02 19:52:37 UTC (rev 17385)
@@ -16,43 +16,46 @@
<!-- ================== CHECKLIST DETAILS
===================== -->
<div id="check_list_details">
- <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></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_add_check_list" action="{$action_url}"
method="post" class="pure-form pure-form-aligned">
- <xsl:variable name="control_id">
- <xsl:value-of select="control/id"/>
- </xsl:variable>
- <input type="hidden" name="control_id"
value="{$control_id}" />
- <input type="hidden" name="serie_id"
value="{$serie_id}" />
- <xsl:variable name="type">
- <xsl:value-of select="type"/>
- </xsl:variable>
- <input type="hidden" name="type"
value="{$type}" />
+ <form id="frm_add_check_list" action="{$action_url}"
method="post" class="pure-form pure-form-stacked">
+ <fieldset>
+ <legend>
+
<h3>Sjekklistedetaljer::<xsl:value-of select="current_month_name"/></h3>
+ </legend>
+ <xsl:variable name="control_id">
+ <xsl:value-of
select="control/id"/>
+ </xsl:variable>
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="serie_id"
value="{$serie_id}" />
+ <xsl:variable name="type">
+ <xsl:value-of select="type"/>
+ </xsl:variable>
+ <input type="hidden" name="type"
value="{$type}" />
- <xsl:variable name="location_code">
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:variable>
+ <xsl:variable name="location_code">
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:variable>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:variable
name="location_id">
- <xsl:value-of
select="check_list/location_id"/>
- </xsl:variable>
- <input type="hidden"
name="location_id" value="{$location_id}" />
- <xsl:variable
name="component_id">
- <xsl:value-of
select="check_list/component_id"/>
- </xsl:variable>
- <input type="hidden"
name="component_id" value="{$component_id}" />
- <input type="hidden"
name="location_code" value="{$location_code}" />
- </xsl:when>
- <xsl:otherwise>
- <input type="hidden"
name="location_code" value="{$location_code}" />
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="type =
'component'">
+ <xsl:variable
name="location_id">
+ <xsl:value-of
select="check_list/location_id"/>
+ </xsl:variable>
+ <input type="hidden"
name="location_id" value="{$location_id}" />
+ <xsl:variable
name="component_id">
+ <xsl:value-of
select="check_list/component_id"/>
+ </xsl:variable>
+ <input type="hidden"
name="component_id" value="{$component_id}" />
+ <input type="hidden"
name="location_code" value="{$location_code}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="hidden"
name="location_code" value="{$location_code}" />
+ </xsl:otherwise>
+ </xsl:choose>
<!-- STATUS -->
<div class="pure-control-group">
@@ -154,63 +157,58 @@
</xsl:if>
</input>
</div>
- <!-- ASSIGNMET -->
- <div class="pure-control-group">
- <label>Tildelt</label>
- <select name="assigned_to">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </xsl:attribute>
- <option value="0">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </option>
- <xsl:apply-templates
select="user_list/options"/>
- </select>
- </div>
- <xsl:if test="required_actual_hours = 1">
+ <!-- ASSIGNMET -->
<div class="pure-control-group">
- <label>Egne Timer</label>
- <input class="date">
- <xsl:attribute
name="id">billable_hours</xsl:attribute>
- <xsl:attribute
name="name">billable_hours</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- </input>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="check_list/billable_hours"/>
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
</div>
- </xsl:if>
+ <xsl:if test="required_actual_hours =
1">
+ <div class="pure-control-group">
+ <label>Egne
Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
- <!-- COMMENT -->
- <div class="pure-control-group">
- <label>Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of
select="check_list/comment"/>
- </textarea>
- </div>
- <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">
+ <!-- COMMENT -->
+ <div class="pure-control-group">
+ <label>Kommentar</label>
+ <textarea class="pure-input-1">
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
+ </div>
+ <div id="submit_group">
+ <input id="save_check_list"
class="pure-button pure-button-primary" type="submit" name="save_check_list">
<xsl:attribute
name="value">
<xsl:value-of
select="php:function('lang', 'plan')" />
</xsl:attribute>
</input>
- </div>
- <div class="pure-u-1-4">
- <input id="submit_ok"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="submit_ok">
+ <input id="submit_ok"
class="pure-button pure-button-primary" type="submit" name="submit_ok">
<xsl:attribute
name="value">
<xsl:value-of
select="php:function('lang', 'ok')" />
</xsl:attribute>
</input>
- </div>
- <div class="pure-u-1-4">
- <input id="submit_deviation"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="submit_deviation">
+ <input id="submit_deviation"
class="pure-button pure-button-primary" type="submit" name="submit_deviation">
<xsl:attribute
name="value">
<xsl:value-of
select="php:function('lang', 'deviation')" />
</xsl:attribute>
</input>
</div>
- </div>
+ </fieldset>
</form>
</div>
<xsl:for-each select="integration">
Modified:
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-02 13:17:59 UTC (rev 17384)
+++ trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-02 19:52:37 UTC (rev 17385)
@@ -17,198 +17,196 @@
<!-- ================== CHECKLIST DETAILS
===================== -->
<div id="check_list_details">
- <h3
class="box_header">Sjekklistedetaljer::<xsl:value-of
select="current_month_name"/></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" class="pure-form pure-form-aligned">
- <div class="pure-control-group">
- <label>Antall åpne saker</label>
- <xsl:value-of
select="check_list/num_open_cases"/>
- </div>
- <div class="pure-control-group">
- <label>Antall ventende saker</label>
- <xsl:value-of
select="check_list/num_pending_cases"/>
- </div>
- <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}" />
- <xsl:if test="check_list_locked = '1'">
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
+ <form id="frm_update_check_list" action="{$action_url}"
method="post" class="pure-form pure-form-stacked">
+
+ <fieldset>
+ <legend>
+
<h3>Sjekklistedetaljer::<xsl:value-of select="current_month_name"/></h3>
+ </legend>
+
+ <div class="pure-control-group">
+ <label>Antall åpne saker</label>
+ <xsl:value-of
select="check_list/num_open_cases"/>
</div>
- </xsl:if>
- <div class="pure-control-group">
- <label>Status</label>
- <xsl:variable name="status">
- <xsl:value-of
select="check_list/status"/>
+ <div class="pure-control-group">
+ <label>Antall ventende
saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ </div>
+ <xsl:variable name="check_list_id">
+ <xsl:value-of
select="check_list/id"/>
</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="pure-control-group">
- <label>Skal utføres innen</label>
- <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
- <input id="deadline_date"
name="deadline_date" type="hidden">
- <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>
- <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
- <xsl:attribute name="value">
- <xsl:value-of
select="check_list/original_deadline"/>
- </xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="check_list/error_msg_array/planned_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/planned_date" />
- </xsl:variable>
+ <input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
+ <xsl:if test="check_list_locked = '1'">
<div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
+ <xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
</div>
</xsl:if>
- <label>Planlagt dato</label>
- <input class="date" readonly="readonly">
- <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="pure-control-group">
- <xsl:if
test="check_list/error_msg_array/completed_date != ''">
- <xsl:variable name="error_msg">
- <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ <div class="pure-control-group">
+ <label>Status</label>
+ <xsl:variable name="status">
+ <xsl:value-of
select="check_list/status"/>
</xsl:variable>
- <div class='input_error_msg'>
- <xsl:value-of
select="php:function('lang', $error_msg)" />
- </div>
- </xsl:if>
- <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 != ''">
+ <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="pure-control-group">
+ <label>Skal utføres
innen</label>
+ <xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
+ <input id="deadline_date"
name="deadline_date" type="hidden">
+ <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>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
<xsl:attribute
name="value">
- <xsl:value-of
select="php:function('date', $date_format, number(check_list/completed_date))"/>
+ <xsl:value-of
select="check_list/original_deadline"/>
</xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/planned_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/planned_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
</xsl:if>
- </input>
- </div>
- <!-- ASSIGNMET -->
- <div class="pure-control-group">
- <label>Tildelt</label>
- <select name="assigned_to">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </xsl:attribute>
- <option value="0">
- <xsl:value-of
select="php:function('lang', 'select')"/>
- </option>
- <xsl:apply-templates
select="user_list/options"/>
- </select>
- </div>
- <xsl:if test="required_actual_hours = 1">
- <div class="pure-control-group">
- <label>Egne Timer</label>
- <input class="date">
- <xsl:attribute
name="id">billable_hours</xsl:attribute>
- <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <label>Planlagt dato</label>
+ <input class="date"
readonly="readonly">
+ <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>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="check_list/billable_hours"/>
</div>
- </xsl:if>
- <div class="pure-control-group">
- <label>Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of
select="check_list/comment"/>
- </textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'files')"/>
- </label>
- <div class="pure-u pure-custom" >
- <xsl:for-each
select="datatable_def">
- <xsl:if test="container
= 'datatable-container_0'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl'/>
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
-
<xsl:with-param name="data" select ='data'/>
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="config" select ='config'/>
-
</xsl:call-template>
+ <div class="pure-control-group">
+ <xsl:if
test="check_list/error_msg_array/completed_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="check_list/error_msg_array/completed_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <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>
- </xsl:for-each>
+ </input>
</div>
- </div>
- <script type="text/javascript">
- var multi_upload_parans = <xsl:value-of
select="multi_upload_parans"/>;
- </script>
- <div class="pure-control-group">
+ <!-- ASSIGNMET -->
+ <div class="pure-control-group">
+ <label>Tildelt</label>
+ <select name="assigned_to">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </xsl:attribute>
+ <option value="0">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ <xsl:if test="required_actual_hours =
1">
+ <div class="pure-control-group">
+ <label>Egne
Timer</label>
+ <input class="date">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ </input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
+ </div>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label>Kommentar</label>
+ <textarea class="pure-input-1">
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <div class="pure-u pure-custom"
>
+ <xsl:for-each
select="datatable_def">
+ <xsl:if
test="container = 'datatable-container_0'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+
<xsl:with-param name="data" select ='data'/>
+
<xsl:with-param name="tabletools" select ='tabletools' />
+
<xsl:with-param name="config" select ='config'/>
+
</xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ </div>
+ <script type="text/javascript">
+ var multi_upload_parans =
<xsl:value-of select="multi_upload_parans"/>;
+ </script>
<xsl:call-template name="file_upload"/>
- </div>
- <xsl:if test="check_list_locked != '1'">
- <!--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-->
- <div id="submit_group" class="pure-g">
- <div >
+ <xsl:if test="check_list_locked != '1'">
+ <!--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-->
+ <div id="submit_group"
class="pure-button-group" role="group">
<input
id="save_check_list" class="pure-button pure-button-primary" type="submit"
name="save_check_list">
<xsl:attribute
name="value">
<xsl:value-of select="php:function('lang', 'save_check_list')" />
</xsl:attribute>
</input>
- </div>
- <xsl:if test =
"check_list/num_open_cases = 0">
- <div>
+ <xsl:if test =
"check_list/num_open_cases = 0">
<input
id="submit_ok" class="pure-button pure-button-primary" type="submit"
name="submit_ok">
<xsl:attribute name="value">
<xsl:value-of select="php:function('lang', 'ok')" />
</xsl:attribute>
</input>
- </div>
- </xsl:if>
- <div> <!-- class="pure-u-1-4"-->
+ </xsl:if>
<input
id="submit_deviation" class="pure-button pure-button-primary" type="submit"
name="submit_deviation">
<xsl:attribute
name="value">
<xsl:value-of select="php:function('lang', 'deviation')" />
@@ -215,9 +213,8 @@
</xsl:attribute>
</input>
</div>
- </div>
- </xsl:if>
-
+ </xsl:if>
+ </fieldset>
</form>
</div>
<xsl:for-each select="integration">
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2017-12-02
13:17:59 UTC (rev 17384)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2017-12-02
19:52:37 UTC (rev 17385)
@@ -35,14 +35,6 @@
width: 140px;
}
-#submit_group {
- position: relative;
- float: none;
- margin-left: 150px;
- margin-bottom: 10px;
-
-}
-
.case_saved
{
background-color: #4CAF50; /* Green */
@@ -71,3 +63,6 @@
display: block;
}
+#check_list_details fieldset {
+ padding: 0px 40px 10px 40px;
+}
Modified: trunk/phpgwapi/templates/base/files.xsl
===================================================================
--- trunk/phpgwapi/templates/base/files.xsl 2017-12-02 13:17:59 UTC (rev
17384)
+++ trunk/phpgwapi/templates/base/files.xsl 2017-12-02 19:52:37 UTC (rev
17385)
@@ -18,7 +18,7 @@
<xsl:choose>
<xsl:when test="multiple_uploader!=''">
<label>
- <a
href="javascript:fileuploader('{$section}')">
+ <a
href="javascript:fileuploader('{$section}')" class="pure-button">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</xsl:attribute>
Modified: trunk/phpgwapi/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/css/base.css 2017-12-02
13:17:59 UTC (rev 17384)
+++ trunk/phpgwapi/templates/mobilefrontend/css/base.css 2017-12-02
19:52:37 UTC (rev 17385)
@@ -46,7 +46,9 @@
border: 1px solid red
}
-
+.pure-menu-disabled, .pure-menu-heading, .pure-menu-link {
+ padding: 0 0;
+}
.bigmenubutton
{
padding: 32px 5px;
@@ -112,4 +114,23 @@
td:last-of-type, th:last-of-type {
border-right: none;
-}
\ No newline at end of file
+}
+
+fieldset {
+margin-right: 20px;
+}
+
+textarea
+{
+ height: 8em;
+}
+
+#app_header
+{
+ font-weight: bold;
+ font-size: 120%;
+}
+label
+{
+ font-weight: bold;
+}
| [Prev in Thread] | Current Thread | [Next in Thread] |