[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10801] controller: prepare for mobilefrontend
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10801] controller: prepare for mobilefrontend |
|
Date: |
Wed, 13 Feb 2013 13:04:49 +0000 |
Revision: 10801
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10801
Author: sigurdne
Date: 2013-02-13 13:04:48 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
controller: prepare for mobilefrontend
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol.inc.php
Added Paths:
-----------
trunk/controller/templates/mobilefrontend/
trunk/controller/templates/mobilefrontend/control/
trunk/controller/templates/mobilefrontend/control/control.xsl
trunk/controller/templates/mobilefrontend/control/control_details.xsl
trunk/controller/templates/mobilefrontend/control/control_tabs.xsl
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2013-02-13 09:28:10 UTC
(rev 10800)
+++ trunk/controller/inc/class.uicontrol.inc.php 2013-02-13 13:04:48 UTC
(rev 10801)
@@ -78,7 +78,7 @@
public function __construct()
{
- parent::__construct();
+ parent::__construct('controller');
$read = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_READ, 'controller');//1
$add = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_ADD, 'controller');//2
Added: trunk/controller/templates/mobilefrontend/control/control.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/control/control.xsl
(rev 0)
+++ trunk/controller/templates/mobilefrontend/control/control.xsl
2013-02-13 13:04:48 UTC (rev 10801)
@@ -0,0 +1,246 @@
+<!-- $Id: control.xsl 10339 2012-10-24 13:34:09Z vator $ -->
+<xsl:template name="control" xmlns:php="http://php.net/xsl";>
+
+<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
+<xsl:variable name="control_area_id"><xsl:value-of
select="control/control_area_id"/></xsl:variable>
+<xsl:variable name="control_procedure_id"><xsl:value-of
select="control/procedure_id"/></xsl:variable>
+<xsl:variable name="control_repeat_type"><xsl:value-of
select="control/repeat_type"/></xsl:variable>
+<xsl:variable name="control_role"><xsl:value-of
select="control/responsibility_id"/></xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+
+<div class="yui-content">
+ <div id="control_details">
+
+ <xsl:variable name="action_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicontrol.save_control_details')" />
+ </xsl:variable>
+ <form id="frm_save_control_details" action="{$action_url}"
method="post">
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="saved_control_area_id"
value="{$control_area_id}" />
+
+ <dl class="proplist-col">
+ <dt>
+ <label>Kontrollområde</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/control_area_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/control_area_id"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <select class="required"
id="control_area_id" name="control_area_id">
+ <option value="">Velg
kontrollområde</option>
+ <xsl:for-each
select="control_areas_array">
+ <xsl:choose>
+
<xsl:when test="cat_id = $control_area_id">
+
<option value="{cat_id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{cat_id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <span class="help_text
line">Angi hvilket kontrollområde kontrollen skal gjelde for</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/control_area_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Prosedyre</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/procedure_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/procedure_id"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <select id="procedure_id"
name="procedure_id">
+ <option value="">Velg
prosedyre</option>
+ <xsl:for-each
select="procedures_array">
+ <xsl:choose>
+
<xsl:when test="id = $control_procedure_id">
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <span class="help_text
line">Angi hvilken prosedyre som ligger til grunn for kontrollen</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/procedure_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="title">Tittel</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/title != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/title"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input class="required"
type="text" name="title" id="title" value="{control/title}" size="70"/>
+ <div class="help_text
below">Angi tittel på kontrollen</div>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/title" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <xsl:if
test="control/error_msg_array/start_date != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/start_date"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input class="required date"
id="start_date" name="start_date" type="text">
+ <xsl:if test="control/start_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text line">Angi startdato for
kontrollen</span>
+ </dd>
+ <dt>
+ <label for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <xsl:if
test="control/error_msg_array/end_date != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/end_date"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input class="date" id="end_date"
name="end_date" type="text">
+ <xsl:if test="control/end_date != 0">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ <span class="help_text line">Angi sluttdato
for kontrollen. Hvis kontrollen ikke har sluttdato, lar du feltet være
tomt</span>
+ </dd>
+ <dt>
+ <label>Frekvenstype</label>
+ </dt>
+ <dd>
+ <xsl:if
test="control/error_msg_array/repeat_type != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/repeat_type"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <select class="required"
id="repeat_type" name="repeat_type">
+ <option value="">Velg
frekvenstype</option>
+ <xsl:for-each
select="repeat_type_array">
+ <xsl:choose>
+ <xsl:when
test="id = //control/repeat_type">
+ <option
value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <span class="help_text line">Angi
hvilken frekvenstype kontrollen skal ha</span>
+ </dd>
+ <dt>
+ <label>Frekvens</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/repeat_interval != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of select="control/error_msg_array/repeat_interval"
/></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <input class="required"
id="repeat_interval" size="2" type="text" name="repeat_interval"
value="{control/repeat_interval}" />
+ <span class="help_text
line">Angi frekvensintervall. 2, betyr det eksempelvis at kontrollen
gjennomføres annenhver dag</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/repeat_interval" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Tildelt rolle</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:if
test="control/error_msg_array/responsibility_id != ''">
+ <xsl:variable
name="error_msg"><xsl:value-of
select="control/error_msg_array/responsibility_id" /></xsl:variable>
+ <div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
+ </xsl:if>
+ <select class="required"
id="responsibility_id" name="responsibility_id">
+ <xsl:for-each
select="role_array">
+ <xsl:choose>
+
<xsl:when test="id = $control_role">
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ <span class="help_text
line">Angi hvilken rolle som skal ha ansvar for å gjennomføre kontrollen på de
ulike byggene</span>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/role_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label
for="description">Beskrivelse</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ </dl>
+
+ <div class="form-buttons">
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <input type="submit"
name="save_control" value="{$lang_save}" title = "{$lang_save}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
+ <input type="submit"
name="edit_control" value="{$lang_edit}" title = "{$lang_edit}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
+</div>
+</xsl:template>
Added: trunk/controller/templates/mobilefrontend/control/control_details.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/control/control_details.xsl
(rev 0)
+++ trunk/controller/templates/mobilefrontend/control/control_details.xsl
2013-02-13 13:04:48 UTC (rev 10801)
@@ -0,0 +1,40 @@
+<!-- $Id: control.xsl 9951 2012-08-31 10:14:12Z vator $ -->
+<xsl:template match="data" name="control_details"
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>
+ <div id="show-control-details-box">
+ <h3>Detaljer for kontroll</h3>
+
+ <ul class='elem-wrp'>
+ <li><label>Kontrollområde</label><xsl:value-of
select="control/control_area_name" /></li>
+ <li><label>Prosedyre</label><xsl:value-of
select="control/procedure_name" /></li>
+ <li><label for="start_date">Startdato</label>
+ <xsl:value-of select="php:function('date',
$date_format, number(control/start_date))"/>
+ </li>
+ <li>
+ <label for="end_date">Sluttdato</label>
+ <xsl:choose>
+ <xsl:when test="control/end_date != 0">
+ <xsl:value-of
select="php:function('date', $date_format, number(control/end_date))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ Løpende
+ </xsl:otherwise>
+ </xsl:choose>
+ </li>
+ <li><label>Frekvens</label>
+ <xsl:choose>
+ <xsl:when test="control/repeat_interval = 1">
+ <span class="pre">Hver</span>
+ </xsl:when>
+ <xsl:when test="control/repeat_interval = 2">
+ <span class="pre">Annenhver</span>
+ </xsl:when>
+ <xsl:when test="control/repeat_interval > 2">
+ <span class="pre">Hver</span><span><xsl:value-of
select="control/repeat_interval"/>.</span>
+ </xsl:when>
+ </xsl:choose>
+ <span class="val"><xsl:value-of
select="control/repeat_type_label"/></span>
+ </li>
+ </ul>
+ </div>
+</xsl:template>
Added: trunk/controller/templates/mobilefrontend/control/control_tabs.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/control/control_tabs.xsl
(rev 0)
+++ trunk/controller/templates/mobilefrontend/control/control_tabs.xsl
2013-02-13 13:04:48 UTC (rev 10801)
@@ -0,0 +1,54 @@
+<!-- $Id: control_tabs.xsl 9951 2012-08-31 10:14:12Z vator $ -->
+<!-- separate tabs and inline tables-->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<div class="yui-navset yui-navset-top" id="control_tabview">
+
+ <xsl:choose>
+ <xsl:when test="view = 'control_details'">
+ <xsl:call-template name="yui_phpgw_i18n"/>
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control')"/></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control" />
+ </xsl:when>
+ <xsl:when test="view = 'control_groups'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_groups')"/> for <xsl:value-of select="control/title" /></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_groups" />
+ </xsl:when>
+ <xsl:when test="view = 'control_locations'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_locations')"/> for <xsl:value-of select="control/title" /></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_locations" />
+ </xsl:when>
+ <xsl:when test="view = 'control_component'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_component')"/> for <xsl:value-of select="control/title" /></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_component" />
+ </xsl:when>
+ <xsl:when test="view = 'control_items'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Control_items')"/> for <xsl:value-of select="control/title" /></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="control_items" />
+ </xsl:when>
+ <xsl:when test="view = 'sort_check_list'">
+ <div class="identifier-header">
+ <h1><xsl:value-of select="php:function('lang',
'Check_list')"/> for <xsl:value-of select="control/title" /></h1>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:call-template name="sort_check_list" />
+ </xsl:when>
+ </xsl:choose>
+</div>
+
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10801] controller: prepare for mobilefrontend,
Sigurd Nes <=