[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17380] more on controller: responsive design
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17380] more on controller: responsive design |
|
Date: |
Fri, 1 Dec 2017 05:14:37 -0500 (EST) |
Revision: 17380
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17380
Author: sigurdne
Date: 2017-12-01 05:14:37 -0500 (Fri, 01 Dec 2017)
Log Message:
-----------
more on controller: responsive design
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicomponent.inc.php
trunk/controller/inc/class.uidocument.inc.php
trunk/controller/templates/base/css/base.css
trunk/controller/templates/mobilefrontend/case/add_case.xsl
trunk/controller/templates/mobilefrontend/case/case_row.xsl
trunk/controller/templates/mobilefrontend/case/view_open_cases.xsl
trunk/controller/templates/mobilefrontend/css/base.css
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2017-11-30 22:33:29 UTC
(rev 17379)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2017-12-01 10:14:37 UTC
(rev 17380)
@@ -414,8 +414,8 @@
'integration' =>
$this->_get_component_integration($location_id, $component_arr)
);
- $GLOBALS['phpgw']->jqcal->add_listener('planned_date');
-
$GLOBALS['phpgw']->jqcal->add_listener('completed_date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('planned_date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('completed_date');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
@@ -598,8 +598,8 @@
);
- $GLOBALS['phpgw']->jqcal->add_listener('planned_date');
-
$GLOBALS['phpgw']->jqcal->add_listener('completed_date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('planned_date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('completed_date');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
@@ -1703,7 +1703,27 @@
{
$location_id = $check_list->get_location_id();
$component_id = $check_list->get_component_id();
+ $location_info =
$GLOBALS['phpgw']->locations->get_name($location_id);
+ if (substr($location_info['location'], 1, 8) ==
'location')
+ {
+ $get_locations = true;
+
+ $type_info = explode('.',
$location_info['location']);
+ $level = $type_info[2];
+ $item_arr =
createObject('property.solocation')->read_single('', array('location_id' =>
$location_id,
+ 'id' => $component_id), true);
+ $location_code =
$item_arr['location_code'];
+
$check_list->set_location_code($location_code);
+ $location_name =
execMethod('property.bolocation.get_location_name', $location_code);
+ $short_desc = $location_name;
+ }
+ else
+ {
+ $short_desc =
execMethod('property.soentity.get_short_description', array(
+ 'location_id' => $location_id,
'id' => $component_id));
+ }
+
foreach ($required_control_items as
$required_control_item)
{
$_ok =
$this->so_case->get_cases_by_component($location_id, $component_id,
$required_control_item['id'], $check_list->get_id());
@@ -1711,8 +1731,7 @@
{
$error_message = lang('missing
value for required') . "</br>";
$error_message .=
"\"{$required_control_item['title']}\"</br>";
- $error_message .=
execMethod('property.soentity.get_short_description', array(
- 'location_id' =>
$location_id, 'id' => $component_id));
+ $error_message .= $short_desc;
$error_message .= "</br>";
phpgwapi_cache::message_set($error_message, 'error');
// echo $error_message;
@@ -1719,6 +1738,7 @@
$ok = false;
}
}
+
}
else
{
Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php 2017-11-30 22:33:29 UTC
(rev 17379)
+++ trunk/controller/inc/class.uicomponent.inc.php 2017-12-01 10:14:37 UTC
(rev 17380)
@@ -50,16 +50,18 @@
class controller_uicomponent extends phpgwapi_uicommon_jquery
{
- private $so;
- private $_category_acl;
- private $read;
- private $add;
- private $edit;
- private $delete;
- private $org_units;
- private $custom;
- private $get_locations;
- private $user_id;
+ private
+ $so,
+ $_category_acl,
+ $read,
+ $add,
+ $edit,
+ $delete,
+ $org_units,
+ $custom,
+ $get_locations,
+ $user_id,
+ $currentapp;
public $public_functions = array
(
'index' => true,
@@ -106,6 +108,7 @@
$this->custom = createObject('phpgwapi.custom_fields');
$user_id = phpgw::get_var('user_id', 'string',
'REQUEST', -1);
$this->user_id = $user_id == 'all' ? 0 : (int) $user_id;
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
@@ -268,7 +271,7 @@
/* Unselect user if filter on component */
if (phpgw::get_var('component_id', 'int'))
{
- $default_value['selected'] = 0;
+// $default_value['selected'] = 0;
}
unset($_my_negative_self);
@@ -1117,7 +1120,14 @@
$data['control_id'] = $type_array[2];
$data['control_type'] =
$control_names[$type_array[2]];
- $data['component_url'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php', $item_link_data) . "\"
target='_blank'>{$item_id}{$entry[0]['component']['xml_short_desc']}</a>";
+
if($GLOBALS['phpgw_info']['server']['template_set'] == 'mobilefrontend')
+ {
+ $data['component_url'] =
"{$item_id}{$entry[0]['component']['xml_short_desc']}";
+ }
+ else
+ {
+ $data['component_url'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php', $item_link_data) . "\"
target='_blank'>{$item_id}{$entry[0]['component']['xml_short_desc']}</a>";
+ }
$data['component_id'] = $item_id;
$data['location_id'] = $location_id;
$data['location_code'] = $_location_code;
@@ -1287,7 +1297,7 @@
$row['choose'] = "<input
id=\"master_component\" type=\"radio\" name=\"master_component\" value =
\"{$entry['location_id']}_{$entry['component_id']}_{$entry['control_id']}\" >";
}
$row['year'] = $year;
- $row['descr'] =
"Frekvens<br/>Status<br/>Utførende<br/>Tidsbruk";
+ $row['descr'] =
"Frekvens<br/>Status<br/>Utførende<br/><br/>Tidsbruk";
}
else if ($choose_master)
{
@@ -1532,7 +1542,7 @@
$repeat_type = $param['repeat_type'];
// $responsible = '---';
- $assigned_to = $param['info']['assigned_to'] > 0 ?
$GLOBALS['phpgw']->accounts->id2lid($param['info']['assigned_to']) : ' ';
+ $assigned_to = $param['info']['assigned_to'] > 0 ?
$GLOBALS['phpgw']->accounts->id2name($param['info']['assigned_to']) :
' <br/>';
// $service_time = $param['info']['service_time']
? $param['info']['service_time'] : ' ';
// $controle_time =
$param['info']['controle_time'] ? $param['info']['controle_time'] : ' ';
$time = $param['info']['service_time'] +
$param['info']['controle_time'];
Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php 2017-11-30 22:33:29 UTC
(rev 17379)
+++ trunk/controller/inc/class.uidocument.inc.php 2017-12-01 10:14:37 UTC
(rev 17380)
@@ -35,12 +35,13 @@
class controller_uidocument extends phpgwapi_uicommon_jquery
{
- private $so;
- private $so_procedure;
- private $read;
- private $add;
- private $edit;
- private $delete;
+ private
+ $so,
+ $so_procedure,
+ $read,
+ $add,
+ $edit,
+ $delete;
public $public_functions = array
(
'query' => true,
@@ -60,7 +61,6 @@
$this->add =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_ADD, 'controller');//2
$this->edit =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_EDIT, 'controller');//4
$this->delete =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_DELETE, 'controller');//8
-//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function query()
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2017-11-30 22:33:29 UTC
(rev 17379)
+++ trunk/controller/templates/base/css/base.css 2017-12-01 10:14:37 UTC
(rev 17380)
@@ -941,7 +941,7 @@
input.date {
text-align: right;
- width: 65px;
+ width: 125px;
}
/* ======================================= CHECK LIST
========================================= */
Modified: trunk/controller/templates/mobilefrontend/case/add_case.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/add_case.xsl 2017-11-30
22:33:29 UTC (rev 17379)
+++ trunk/controller/templates/mobilefrontend/case/add_case.xsl 2017-12-01
10:14:37 UTC (rev 17380)
@@ -50,12 +50,11 @@
<xsl:for-each select="control_items">
<li>
<h4>
-
<img src="controller/images/arrow_right.png" />
<span>
<xsl:value-of select="title"/>
</span>
</h4>
-
<form class="frm_register_case expand_item"
action="{$action_url}" method="post">
+
<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">
@@ -123,10 +122,10 @@
</div>
<div>
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr" >
+
<textarea name="case_descr"
class="pure-input-1">
<xsl:if test="required
= 1">
<xsl:attribute
name="class" >
-
<xsl:text>required</xsl:text>
+
<xsl:text>required pure-input-1</xsl:text>
</xsl:attribute>
</xsl:if>
@@ -149,10 +148,10 @@
</div>
<div class="pure-control-group">
<label
class="comment">Registrer målingsverdi</label>
-
<input>
+
<input class="pure-input-1">
<xsl:if test="required
= 1">
<xsl:attribute
name="class" >
-
<xsl:text>required</xsl:text>
+
<xsl:text>required pure-input-1</xsl:text>
</xsl:attribute>
</xsl:if>
@@ -165,7 +164,7 @@
</div>
<div class="pure-control-group">
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
+
<textarea name="case_descr"
class="pure-input-1">
<xsl:value-of
select="comment"/>
</textarea>
</div>
@@ -207,7 +206,7 @@
</div>
<div class="pure-control-group">
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
+
<textarea name="case_descr"
class="pure-input-1">
<xsl:value-of
select="comment"/>
</textarea>
</div>
@@ -250,7 +249,7 @@
</div>
<div class="pure-control-group">
<label
class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
+
<textarea name="case_descr"
class="pure-input-1">
<xsl:value-of
select="comment"/>
</textarea>
</div>
Modified: trunk/controller/templates/mobilefrontend/case/case_row.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-11-30
22:33:29 UTC (rev 17379)
+++ trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-12-01
10:14:37 UTC (rev 17380)
@@ -4,7 +4,7 @@
<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>
- <li class="check_item_case">
+ <fieldset>
<xsl:choose>
<xsl:when test="cases_array/child::node()">
<h4>
@@ -33,7 +33,6 @@
<!-- ==================== COL2: CASE CONTENT
===================== -->
<div class="col_2">
<div class="case_info">
-
<xsl:choose>
<xsl:when test="component_descr != ''">
<div class="row">
@@ -116,7 +115,7 @@
</div>
<!-- =================== UPDATE CASE FORM ===================
-->
- <form class="frm_update_case">
+ <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>
@@ -201,7 +200,7 @@
<!-- DESCRIPTION -->
<label>Beskrivelse:</label>
<div class="row">
- <textarea name="case_descr">
+ <textarea name="case_descr" class="pure-input-1">
<xsl:value-of select="descr"/>
</textarea>
</div>
@@ -235,5 +234,5 @@
</ul>
</xsl:when>
</xsl:choose>
- </li>
+ </fieldset>
</xsl:template>
Modified: trunk/controller/templates/mobilefrontend/case/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/view_open_cases.xsl
2017-11-30 22:33:29 UTC (rev 17379)
+++ trunk/controller/templates/mobilefrontend/case/view_open_cases.xsl
2017-12-01 10:14:37 UTC (rev 17380)
@@ -1,56 +1,54 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div id="main_content" class="medium">
- <xsl:call-template name="check_list_top_section">
- <xsl:with-param name="active_tab">view_cases</xsl:with-param>
- </xsl:call-template>
+ <div id="main_content" class="medium">
+ <xsl:call-template name="check_list_top_section">
+ <xsl:with-param
name="active_tab">view_cases</xsl:with-param>
+ </xsl:call-template>
- <xsl:choose>
- <xsl:when test="buildings_on_property/child::node()">
- <div id="choose-building-wrp">
- <xsl:call-template
name="select_buildings_on_property" />
+ <xsl:choose>
+ <xsl:when test="buildings_on_property/child::node()">
+ <div id="choose-building-wrp">
+ <xsl:call-template
name="select_buildings_on_property" />
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <div id="view_cases">
+ <xsl:call-template name="cases_tab_menu">
+ <xsl:with-param
name="active_tab">view_open_cases</xsl:with-param>
+ </xsl:call-template>
+
+ <div class="tab_item active">
+ <xsl:choose>
+ <xsl:when
test="open_check_items_and_cases/child::node()">
+ <xsl:for-each
select="open_check_items_and_cases">
+ <xsl:choose>
+ <!--
==================== CONTROL TYPE 1 ===================== -->
+ <xsl:when
test="control_item/type = 'control_item_type_1'">
+
<xsl:call-template name="case_row">
+
<xsl:with-param name="control_item_type">control_item_type_1</xsl:with-param>
+
</xsl:call-template>
+ </xsl:when>
+ <!--
==================== CONTROL TYPE 2 ===================== -->
+ <xsl:when
test="control_item/type = 'control_item_type_2'">
+
<xsl:call-template name="case_row">
+
<xsl:with-param name="control_item_type">control_item_type_2</xsl:with-param>
+
</xsl:call-template>
+ </xsl:when>
+ <!--
==================== CONTROL TYPE 3 ELLER CONTROL TYPE 4 =====================
-->
+ <xsl:when
test="control_item/type = 'control_item_type_3' or control_item/type =
'control_item_type_4'">
+
<xsl:call-template name="case_row">
+
<xsl:with-param name="control_item_type">control_item_type_3</xsl:with-param>
+
</xsl:call-template>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <p>Ingen åpne saker eller
målinger</p>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
- </xsl:when>
- </xsl:choose>
- <div id="view_cases">
- <xsl:call-template name="cases_tab_menu">
- <xsl:with-param name="active_tab">view_open_cases</xsl:with-param>
- </xsl:call-template>
-
- <div class="tab_item active">
- <xsl:choose>
- <xsl:when test="open_check_items_and_cases/child::node()">
- <ul class="check_items">
- <xsl:for-each select="open_check_items_and_cases">
- <xsl:choose>
- <!-- ==================== CONTROL TYPE 1
===================== -->
- <xsl:when test="control_item/type = 'control_item_type_1'">
- <xsl:call-template name="case_row">
- <xsl:with-param
name="control_item_type">control_item_type_1</xsl:with-param>
-
</xsl:call-template>
- </xsl:when>
- <!-- ==================== CONTROL TYPE 2
===================== -->
- <xsl:when test="control_item/type = 'control_item_type_2'">
- <xsl:call-template name="case_row">
- <xsl:with-param
name="control_item_type">control_item_type_2</xsl:with-param>
-
</xsl:call-template>
- </xsl:when>
- <!-- ==================== CONTROL TYPE 3 ELLER CONTROL TYPE
4 ===================== -->
- <xsl:when test="control_item/type = 'control_item_type_3' or
control_item/type = 'control_item_type_4'">
- <xsl:call-template name="case_row">
- <xsl:with-param
name="control_item_type">control_item_type_3</xsl:with-param>
-
</xsl:call-template>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </ul>
- </xsl:when>
- <xsl:otherwise>
- <p>Ingen åpne saker eller målinger</p>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
-</div>
+ </div>
+ </div>
</xsl:template>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2017-11-30
22:33:29 UTC (rev 17379)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2017-12-01
10:14:37 UTC (rev 17380)
@@ -13,7 +13,7 @@
input.date {
text-align: right;
- width: 100px;
+ width: 125px;
}
#save_check_list
@@ -58,4 +58,10 @@
body {margin-left:10px;
padding:0;
-}
\ No newline at end of file
+}
+.frm_update_case{
+ display: none;
+}
+.frm_update_case label {
+ display: block;
+}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17380] more on controller: responsive design,
sigurdne <=