[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17389] more on contrloller: mobilefrontend
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17389] more on contrloller: mobilefrontend |
|
Date: |
Sun, 3 Dec 2017 12:14:37 -0500 (EST) |
Revision: 17389
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17389
Author: sigurdne
Date: 2017-12-03 12:14:37 -0500 (Sun, 03 Dec 2017)
Log Message:
-----------
more on contrloller: mobilefrontend
Modified Paths:
--------------
trunk/controller/inc/class.uicomponent.inc.php
trunk/controller/templates/mobilefrontend/case/cases_tab_menu.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/add_check_list_menu.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
trunk/phpgwapi/templates/base/files.xsl
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php 2017-12-03 16:47:00 UTC
(rev 17388)
+++ trunk/controller/inc/class.uicomponent.inc.php 2017-12-03 17:14:37 UTC
(rev 17389)
@@ -1087,6 +1087,16 @@
"3" => lang('year')
);
+
+ if($GLOBALS['phpgw_info']['server']['template_set'] ==
'mobilefrontend')
+ {
+ $url_target = '_self';
+ }
+ else
+ {
+ $url_target = '_blank';
+ }
+
$values = array();
foreach ($components_with_calendar_array as $dummy =>
$entry)
{
@@ -1126,7 +1136,7 @@
}
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_url'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php', $item_link_data) . "\"
target='{$url_target}'>{$item_id}{$entry[0]['component']['xml_short_desc']}</a>";
}
$data['component_id'] = $item_id;
$data['location_id'] = $location_id;
@@ -1265,7 +1275,7 @@
$data['control_id'] = 0;
$data['control_type'] = '';
- $data['component_url'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php', $item_link_data) . "\"
target='_blank'>{$item_id}
{$location_type_name[$location_id]}</br>{$short_description}</a>";
+ $data['component_url'] = '<a href="' .
$GLOBALS['phpgw']->link('/index.php', $item_link_data) . "\"
target='{$url_target}'>{$item_id}
{$location_type_name[$location_id]}</br>{$short_description}</a>";
$data['component_id'] = $item_id;
$data['location_id'] = $location_id;
$data['location_code'] =
$_location_code;
@@ -1538,7 +1548,7 @@
'assigned_to' =>
$param['info']['assigned_to']
);
}
- $link = "<a href=\"" .
$GLOBALS['phpgw']->link('/index.php', $control_link_data) . "\"
target=\"_blank\">{$img}</a>";
+ $link = "<a href=\"" .
$GLOBALS['phpgw']->link('/index.php', $control_link_data) . "\"
target=\"{$url_target}\">{$img}</a>";
$repeat_type = $param['repeat_type'];
// $responsible = '---';
Modified: trunk/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++ trunk/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -18,6 +18,8 @@
<xsl:value-of
select="check_list/id"/>
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-exclamation-triangle"
aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Åpne saker
</a>
</li>
@@ -32,6 +34,8 @@
<xsl:value-of
select="check_list/id"/>
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-check-square-o"
aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Lukkede saker
</a>
</li>
Modified:
trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++ trunk/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -173,10 +173,9 @@
<xsl:if test="required_actual_hours =
1">
<div class="pure-control-group">
<label>Egne
Timer</label>
- <input class="date">
+ <input class="date"
type="number" step="0.01">
<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"/>
@@ -192,21 +191,21 @@
</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>
- <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>
- <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>
+ <button id="save_check_list"
class="pure-button pure-button-primary" type="submit" name="save_check_list"
value="1">
+ <i class="fa
fa-floppy-o" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'plan')" />
+ </button>
+ <button id="submit_ok"
class="pure-button pure-button-primary" type="submit" name="submit_ok"
value="1">
+ <i class="fa
fa-check-square-o" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'ok')" />
+ </button>
+ <button id="submit_deviation"
class="pure-button pure-button-primary" type="submit" name="submit_deviation"
value="1">
+ <i class="fa
fa-exclamation-triangle" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'deviation')" />
+ </button>
</div>
</fieldset>
</form>
Modified:
trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++ trunk/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -1,5 +1,6 @@
<!-- $Id$ -->
<xsl:template match="data" name="edit_check_list"
xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:variable name="date_format">
<xsl:value-of select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')" />
</xsl:variable>
@@ -27,14 +28,10 @@
<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>
- <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>
@@ -44,7 +41,6 @@
<xsl:value-of
select="php:function('lang', 'error_msg_control_passed_due_date')" />
</div>
</xsl:if>
- <div class="pure-control-group">
<label>Status</label>
<xsl:variable name="status">
<xsl:value-of
select="check_list/status"/>
@@ -73,8 +69,6 @@
</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">
@@ -89,8 +83,6 @@
<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" />
@@ -110,8 +102,6 @@
</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" />
@@ -131,9 +121,7 @@
</xsl:attribute>
</xsl:if>
</input>
- </div>
<!-- ASSIGNMET -->
- <div class="pure-control-group">
<label>Tildelt</label>
<select name="assigned_to">
<xsl:attribute
name="title">
@@ -144,31 +132,25 @@
</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">
+ <input class="date"
type="number" step="0.01">
<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">
@@ -181,8 +163,6 @@
</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>
@@ -195,23 +175,23 @@
<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>
+ <button
id="save_check_list" class="pure-button pure-button-primary" type="submit"
name="save_check_list" value="1">
+ <i class="fa
fa-floppy-o" aria-hidden="true"></i>
+ <xsl:text>
</xsl:text>
+ <xsl:value-of
select="php:function('lang', 'save')" />
+ </button>
<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>
+ <button
id="submit_ok" class="pure-button pure-button-primary" type="submit"
name="submit_ok" value="1">
+ <i
class="fa fa-check-square-o" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'ok')" />
+ </button>
</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')" />
- </xsl:attribute>
- </input>
+ <button
id="submit_deviation" class="pure-button pure-button-primary" type="submit"
name="submit_deviation" value="1">
+ <i class="fa
fa-exclamation-triangle" aria-hidden="true"></i>
+ <xsl:text>
</xsl:text>
+ <xsl:value-of
select="php:function('lang', 'deviation')" />
+ </button>
</div>
</xsl:if>
</fieldset>
Modified:
trunk/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -3,7 +3,7 @@
<xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
-
+<!--
<li class="pure-menu-item pure-menu-disabled">
<a href="#" class="pure-menu-link bigmenubutton">Vis detaljer
for sjekkliste</a>
</li>
@@ -23,5 +23,5 @@
<xsl:value-of select="php:function('lang', 'add
ticket')"/>
</a>
</li>
-
+-->
</xsl:template>
Modified:
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -18,6 +18,7 @@
<xsl:value-of select="check_list/id"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-home fa-fw" aria-hidden="true"></i>
Vis detaljer for sjekkliste
</a>
</li>
@@ -33,6 +34,8 @@
<xsl:value-of select="check_list/id"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-list-ol" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Vis saker
</a>
</li>
@@ -50,6 +53,8 @@
<xsl:value-of select="check_list/id"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-info-circle" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Vis info om kontroll
</a>
</li>
@@ -62,6 +67,8 @@
<xsl:value-of select="check_list/id"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-flag" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
<xsl:value-of select="php:function('lang', 'add
case')"/>
</a>
</li>
@@ -74,6 +81,8 @@
<xsl:value-of select="check_list/id"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
+ <i class="fa fa-bolt" aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
<xsl:value-of select="php:function('lang', 'add
ticket')"/>
</a>
</li>
Modified:
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-03 16:47:00 UTC (rev 17388)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-03 17:14:37 UTC (rev 17389)
@@ -1,6 +1,6 @@
<xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl";>
<xsl:param name="inactive" />
- <xsl:variable name="session_url">
+ <xsl:variable name="session_url">
<xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
@@ -20,6 +20,7 @@
<xsl:text>&get_locations=</xsl:text>
<xsl:value-of
select="get_locations"/>
</xsl:attribute>
+ <i class="fa fa-calendar"
aria-hidden="true"></i>
Kontrollplan for komponent (år)
</a>
</li>
@@ -34,6 +35,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location_array/location_code"/>
</xsl:attribute>
+ <i class="fa fa-calendar"
aria-hidden="true"></i>
Kontrollplan for bygg/eiendom (år)
</a>
</li>
@@ -48,6 +50,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location_array/location_code"/>
</xsl:attribute>
+ <i class="fa fa-calendar"
aria-hidden="true"></i>
Kontrolplan for bygg/eiendom (måned)
</a>
</li>
Modified: trunk/phpgwapi/templates/base/files.xsl
===================================================================
--- trunk/phpgwapi/templates/base/files.xsl 2017-12-03 16:47:00 UTC (rev
17388)
+++ trunk/phpgwapi/templates/base/files.xsl 2017-12-03 17:14:37 UTC (rev
17389)
@@ -22,6 +22,8 @@
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</xsl:attribute>
+ <i class="fa fa-upload"
aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</a>
</label>
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-12-03
16:47:00 UTC (rev 17388)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-12-03
17:14:37 UTC (rev 17389)
@@ -33,6 +33,8 @@
$stylesheets[] = "/phpgwapi/templates/mobilefrontend/css/base.css";
+ $stylesheets[] =
"/phpgwapi/templates/base/font-awesome/css/font-awesome.min.css";
+
foreach ( $stylesheets as $stylesheet )
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
Modified: trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2017-12-03
16:47:00 UTC (rev 17388)
+++ trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2017-12-03
17:14:37 UTC (rev 17389)
@@ -32,16 +32,16 @@
<div class="pure-menu pure-menu-horizontal
pure-menu-scrollable">
<ul class="pure-menu-list">
<li class="pure-menu-heading pure-menu-link
pure-menu-selected">
- <a href="{$site_url}"
class="pure-menu-link
bigmenubutton">{$GLOBALS['phpgw_info']['user']['fullname']}</a>
+ <a href="{$site_url}"
class="pure-menu-link bigmenubutton"><i class="fa fa-home fa-fw"
aria-hidden="true"></i>{$GLOBALS['phpgw_info']['user']['fullname']}</a>
</li>
<li class="pure-menu-item">
- <a href="{$controller_url}"
class="pure-menu-link bigmenubutton">{$controller_text}</a>
+ <a href="{$controller_url}"
class="pure-menu-link bigmenubutton"><i class="fa fa-check-square-o"
aria-hidden="true"></i> {$controller_text}</a>
</li>
<li class="pure-menu-item">
- <a href="{$tts_url}"
class="pure-menu-link bigmenubutton">{$tts_text}</a>
+ <a href="{$tts_url}"
class="pure-menu-link bigmenubutton"><i class="fa fa-bolt"
aria-hidden="true"></i> {$tts_text}</a>
</li>
<li class="pure-menu-item">
- <a href="{$condition_survey_url}"
class="pure-menu-link bigmenubutton">{$condition_survey_text}</a>
+ <a href="{$condition_survey_url}"
class="pure-menu-link bigmenubutton"><i class="fa
fa-thermometer-three-quarters"
aria-hidden="true"></i> {$condition_survey_text}</a>
</li>
HTML;
@@ -49,7 +49,7 @@
{
$topmenu .= <<<HTML
<li class="pure-menu-item">
- <a href="{$movein_url}"
class="pure-menu-link bigmenubutton">{$movein_text}</a>
+ <a href="{$movein_url}"
class="pure-menu-link bigmenubutton"><i class="fa fa-suitcase"
aria-hidden="true"></i> {$movein_text}</a>
</li>
HTML;
@@ -58,7 +58,7 @@
{
$topmenu .= <<<HTML
<li class="pure-menu-item">
- <a href="{$moveout_url}"
class="pure-menu-link bigmenubutton">{$moveout_text}</a>
+ <a href="{$moveout_url}"
class="pure-menu-link bigmenubutton"><i class="fa fa-suitcase"
aria-hidden="true"></i> {$moveout_text}</a>
</li>
HTML;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17389] more on contrloller: mobilefrontend,
sigurdne <=