[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17393] Stable: Merge 17381:17392 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17393] Stable: Merge 17381:17392 from trunk |
|
Date: |
Mon, 4 Dec 2017 04:30:02 -0500 (EST) |
Revision: 17393
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17393
Author: sigurdne
Date: 2017-12-04 04:30:02 -0500 (Mon, 04 Dec 2017)
Log Message:
-----------
Stable: Merge 17381:17392 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
branches/Version-2_0-branch/controller/js/controller/case.js
branches/Version-2_0-branch/controller/js/controller/check_list.js
branches/Version-2_0-branch/controller/setup/phpgw_no.lang
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/add_case.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/case_row.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/create_case_message.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/view_case_message.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/add_check_list.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/view_control_info.xsl
branches/Version-2_0-branch/controller/templates/mobilefrontend/css/base.css
branches/Version-2_0-branch/mobilefrontend/controller/class.uicase.inc.php
branches/Version-2_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/css/HISTORY.md
branches/Version-2_0-branch/phpgwapi/templates/pure/css/LICENSE.md
branches/Version-2_0-branch/phpgwapi/templates/pure/css/README.md
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/bower.json
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables.css
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/templates/base/font-awesome/
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/base.css
Removed Paths:
-------------
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch 2017-12-04 09:30:02 UTC (rev 17393)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392
\ No newline at end of property
Modified: branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/controller/inc/class.uicomponent.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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;
@@ -1297,7 +1307,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/><br/>Tidsbruk";
+ $row['descr'] =
"Frekvens<br/>Status<br/>Utførende<br/>Tidsbruk";
}
else if ($choose_master)
{
@@ -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: branches/Version-2_0-branch/controller/js/controller/case.js
===================================================================
--- branches/Version-2_0-branch/controller/js/controller/case.js
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/controller/js/controller/case.js
2017-12-04 09:30:02 UTC (rev 17393)
@@ -55,10 +55,10 @@
}
else
{
-
$(submitBnt).val('Lagre sak');
+
$(submitBnt).val('Lagre ny sak');
}
-
$(submitBnt).addClass("not_active");
+
$(submitBnt).addClass("case_saved");
}, 1000);
/*
Modified: branches/Version-2_0-branch/controller/js/controller/check_list.js
===================================================================
--- branches/Version-2_0-branch/controller/js/controller/check_list.js
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/controller/js/controller/check_list.js
2017-12-04 09:30:02 UTC (rev 17393)
@@ -83,10 +83,20 @@
});
});
+function getWidth() {
+ return Math.max(
+ document.body.scrollWidth,
+ document.documentElement.scrollWidth,
+ document.body.offsetWidth,
+ document.documentElement.offsetWidth,
+ document.documentElement.clientWidth
+ );
+}
this.fileuploader = function ()
{
var sUrl = phpGWLink('index.php', multi_upload_parans);
- TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 750, height:
450, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true,
+ 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: branches/Version-2_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-12-04
09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/controller/setup/phpgw_no.lang 2017-12-04
09:30:02 UTC (rev 17393)
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/add_case.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/add_case.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/add_case.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/case_row.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/case_row.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/case_row.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/cases_tab_menu.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -11,7 +11,7 @@
<xsl:if test="$active_tab = 'view_open_cases'">
<xsl:attribute
name="class">pure-menu-item pure-menu-selected</xsl:attribute>
</xsl:if>
- <a id="view_open_cases" class="pure-menu-link">
+ <a id="view_open_cases" class="pure-menu-link
bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -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>
@@ -25,7 +27,7 @@
<xsl:if test="$active_tab =
'view_closed_cases'">
<xsl:attribute
name="class">pure-menu-item pure-menu-selected</xsl:attribute>
</xsl:if>
- <a id="view_closed_cases"
class="pure-menu-link">
+ <a id="view_closed_cases" class="pure-menu-link
bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.view_closed_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/create_case_message.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/create_case_message.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/create_case_message.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -34,7 +34,7 @@
<xsl:when test="type =
'component'">
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
<xsl:text>&year=</xsl:text>
@@ -52,7 +52,7 @@
</xsl:when>
<xsl:otherwise>
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
<xsl:text>&year=</xsl:text>
@@ -65,7 +65,7 @@
</li>
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
<xsl:text>&year=</xsl:text>
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/view_case_message.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/view_case_message.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/case/view_case_message.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -32,7 +32,7 @@
<xsl:when test="type =
'component'">
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
<xsl:text>&year=</xsl:text>
@@ -50,7 +50,7 @@
</xsl:when>
<xsl:otherwise>
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
<xsl:text>&year=</xsl:text>
@@ -63,7 +63,7 @@
</li>
<li
class="pure-menu-item">
- <a
class="pure-menu-link">
+ <a
class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
<xsl:text>&year=</xsl:text>
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/add_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/add_check_list.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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,57 @@
</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"
type="number" step="0.01">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</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 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">
- <xsl:value-of
select="php:function('lang', 'plan')" />
- </xsl:attribute>
- </input>
+ <!-- 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 class="pure-u-1-4">
- <input id="submit_ok"
class="pure-button pure-button-primary pure-input-1" type="submit"
name="submit_ok">
- <xsl:attribute
name="value">
- <xsl:value-of
select="php:function('lang', 'ok')" />
- </xsl:attribute>
- </input>
+ <div id="submit_group">
+ <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>
- <div class="pure-u-1-4">
- <input id="submit_deviation"
class="pure-button pure-button-primary pure-input-1" 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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/edit_check_list.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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>
@@ -17,207 +18,183 @@
<!-- ================== 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')" />
- </div>
- </xsl:if>
- <div class="pure-control-group">
- <label>Status</label>
- <xsl:variable name="status">
- <xsl:value-of
select="check_list/status"/>
+ <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>
+
+ <label>Antall åpne saker</label>
+ <xsl:value-of
select="check_list/num_open_cases"/>
+ <label>Antall ventende
saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ <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" />
+ <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>
+ <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>
+ <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>
- </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>
- </xsl:if>
- </xsl:for-each>
- </div>
- </div>
- <script type="text/javascript">
- var multi_upload_parans = <xsl:value-of
select="multi_upload_parans"/>;
- </script>
- <div class="pure-control-group">
- <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 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:if
test="check_list/planned_date != 0 and check_list/planned_date != ''">
<xsl:attribute
name="value">
-
<xsl:value-of select="php:function('lang', 'save_check_list')" />
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/planned_date))"/>
</xsl:attribute>
- </input>
- </div>
- <xsl:if test =
"check_list/num_open_cases = 0">
- <div class="pure-u-1-4">
- <input
id="submit_ok" class="pure-button pure-button-primary pure-input-1"
type="submit" name="submit_ok">
-
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('lang', 'ok')" />
-
</xsl:attribute>
- </input>
+ </xsl:if>
+ </input>
+ <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>
- <div class="pure-u-1-4">
- <input
id="submit_deviation" class="pure-button pure-button-primary pure-input-1"
type="submit" name="submit_deviation">
+ <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('lang', 'deviation')" />
+
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/>
</xsl:attribute>
+ </xsl:if>
+ </input>
+ <!-- ASSIGNMET -->
+ <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>
+ <xsl:if test="required_actual_hours =
1">
+ <div class="pure-control-group">
+ <label>Egne
Timer</label>
+ <input class="date"
type="number" step="0.01">
+ <xsl:attribute
name="id">billable_hours</xsl:attribute>
+ <xsl:attribute
name="name">billable_hours</xsl:attribute>
</input>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="check_list/billable_hours"/>
</div>
- </div>
- </xsl:if>
-
+ </xsl:if>
+ <label>Kommentar</label>
+ <textarea class="pure-input-1">
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of
select="check_list/comment"/>
+ </textarea>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'files')"/>
+ </label>
+ <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>
+ <script type="text/javascript">
+ var multi_upload_parans =
<xsl:value-of select="multi_upload_parans"/>;
+ </script>
+ <xsl:call-template name="file_upload"/>
+ <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">
+ <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">
+ <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>
+ <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>
</form>
</div>
<xsl:for-each select="integration">
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/add_check_list_menu.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -3,25 +3,25 @@
<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">Vis detaljer for
sjekkliste</a>
+ <a href="#" class="pure-menu-link bigmenubutton">Vis detaljer
for sjekkliste</a>
</li>
<li class="pure-menu-item pure-menu-disabled">
- <a href="#" class="pure-menu-link">Vis saker</a>
+ <a href="#" class="pure-menu-link bigmenubutton">Vis saker</a>
</li>
<li class="pure-menu-item pure-menu-disabled">
- <a href="#" class="pure-menu-link">Vis info om kontroll</a>
+ <a href="#" class="pure-menu-link bigmenubutton">Vis info om
kontroll</a>
</li>
<li class="pure-menu-item pure-menu-disabled">
- <a href="#" class="pure-menu-link">
+ <a href="#" class="pure-menu-link bigmenubutton">
<xsl:value-of select="php:function('lang', 'add
case')"/>
</a>
</li>
<li class="pure-menu-item pure-menu-disabled">
- <a href="#" class="pure-menu-link">
+ <a href="#" class="pure-menu-link bigmenubutton">
<xsl:value-of select="php:function('lang', 'add
ticket')"/>
</a>
</li>
-
+-->
</xsl:template>
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_menu.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -11,7 +11,7 @@
<xsl:attribute name="class">pure-menu-item
pure-menu-selected</xsl:attribute>
</xsl:when>
</xsl:choose>
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -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>
@@ -26,7 +27,7 @@
<xsl:if test="$active_tab = 'view_cases'">
<xsl:attribute name="class">pure-menu-item
pure-menu-selected</xsl:attribute>
</xsl:if>
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -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>
@@ -43,7 +46,7 @@
<xsl:attribute name="class">pure-menu-item
pure-menu-selected</xsl:attribute>
</xsl:when>
</xsl:choose>
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -50,12 +53,14 @@
<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>
<!-- ================== REGISTER NEW CASE ===================== -->
<li class="pure-menu-item">
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.add_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -62,12 +67,14 @@
<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>
<!-- ================== REGISTER NEW MESSAGE ===================== -->
<li class="pure-menu-item">
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/check_list_top_section.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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')" />
@@ -42,15 +42,15 @@
<xsl:choose>
<xsl:when
test="check_list/status = 0">
<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">
+ <input
id="status_submit" type="submit" class="pure-button pure-button-primary
bigmenubutton">
<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>
<xsl:otherwise>
<input
id='update-check-list-status-value' type="hidden" name="status" value="0" />
- <input
type="submit" class="pure-button pure-button-primary">
+ <input
type="submit" class="pure-button pure-button-primary bigmenubutton">
<xsl:attribute name="value">
<xsl:value-of select="php:function('lang', 'is_executed')" />
</xsl:attribute>
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -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>
@@ -8,7 +8,7 @@
<xsl:choose>
<xsl:when test="type = 'component'">
<li class="pure-menu-item">
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
<xsl:text>&year=</xsl:text>
@@ -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>
@@ -26,7 +27,7 @@
</xsl:when>
<xsl:otherwise>
<li class="pure-menu-item">
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
<xsl:text>&year=</xsl:text>
@@ -34,11 +35,12 @@
<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>
<li class="pure-menu-item">
- <a class="pure-menu-link">
+ <a class="pure-menu-link bigmenubutton">
<xsl:attribute name="href">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
<xsl:text>&year=</xsl:text>
@@ -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:
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/view_control_info.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/view_control_info.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/check_list/view_control_info.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -78,7 +78,7 @@
<div class="pure-menu pure-menu-horizontal pure-menu-scrollable">
<ul class="pure-menu-list">
<li class="pure-menu-item pure-menu-selected">
- <a id="view_control_details"
class="pure-menu-link">
+ <a id="view_control_details"
class="pure-menu-link bigmenubutton">
<xsl:attribute name="value">
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_details</xsl:text>
<xsl:text>&control_id=</xsl:text>
@@ -92,7 +92,7 @@
</a>
</li>
<li class="pure-menu-item">
- <a id="view_control_items"
class="pure-menu-link">
+ <a id="view_control_items"
class="pure-menu-link bigmenubutton">
<xsl:attribute name="value">
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -104,7 +104,7 @@
</a>
</li>
<li class="pure-menu-item">
- <a id="view_procedures" class="pure-menu-link">
+ <a id="view_procedures" class="pure-menu-link
bigmenubutton">
<xsl:attribute name="value">
<xsl:text>index.php?menuaction=controller.uiprocedure.view_procedures_for_control</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
Modified:
branches/Version-2_0-branch/controller/templates/mobilefrontend/css/base.css
===================================================================
---
branches/Version-2_0-branch/controller/templates/mobilefrontend/css/base.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/controller/templates/mobilefrontend/css/base.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -18,27 +18,31 @@
#save_check_list
{
- text-align: center;
- padding: 32px 5px;
- margin-bottom: 10px;
+/* text-align: center;*/
+ width: 140px;
}
-#submit_ok {
- text-align: center;
- background-color: #4CAF50; /* Green */
- padding: 32px 5px;
- margin-bottom: 10px;
+
+#submit_ok
+{
+ /* text-align: center;*/
+ background-color: #4CAF50;
+ width: 140px;
}
+
#submit_deviation {
- text-align: center;
+/* text-align: center;*/
background-color: #f44336;
- padding: 32px 5px;
- margin-bottom: 10px;
+ width: 140px;
}
-#submit_group {
- position: relative;
- float: left;
- margin-left: 150px;
+
+.pure-button
+{
+ width: 140px;
}
+.case_saved
+{
+ background-color: #4CAF50;
+}
ul.add-cases {
list-style-type: none;
}
@@ -56,9 +60,6 @@
padding: 7px 10px;
}
-body {margin-left:10px;
- padding:0;
-}
.frm_update_case{
display: none;
}
@@ -65,3 +66,56 @@
.frm_update_case label {
display: block;
}
+
+#check_list_details fieldset {
+ padding: 0px 40px 10px 40px;
+}
+
+* {
+ box-sizing: border-box;
+}
+
+
+html, body {
+ max-width: 100vw;
+}
+
+/*A table..*/
+#components {
+ margin: auto;
+ border-collapse: collapse;
+ overflow-x: auto;
+ display: block;
+ width: fit-content;
+ max-width: 100%;
+ box-shadow: 0 0 1px 1px rgba(0, 0, 0, .1);
+}
+
+td, th {
+ border: solid rgb(200, 200, 200) 1px;
+ padding: .5rem;
+}
+
+th {
+ text-align: left;
+ background-color: rgb(190, 220, 250);
+ /* text-transform: uppercase;*/
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ border-bottom: rgb(50, 50, 100) solid 2px;
+ border-top: none;
+}
+
+td {
+ white-space: nowrap;
+ border-bottom: none;
+ color: rgb(20, 20, 20);
+}
+
+td:first-of-type, th:first-of-type {
+ border-left: none;
+}
+
+td:last-of-type, th:last-of-type {
+ border-right: none;
+}
Modified:
branches/Version-2_0-branch/mobilefrontend/controller/class.uicase.inc.php
===================================================================
--- branches/Version-2_0-branch/mobilefrontend/controller/class.uicase.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/mobilefrontend/controller/class.uicase.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -37,6 +37,6 @@
parent::__construct();
$GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
+ //
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
===================================================================
---
branches/Version-2_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -37,7 +37,7 @@
parent::__construct();
$GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
+ //
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
/**
* Public function for displaying the edit check list form
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/files.xsl
2017-12-04 09:30:02 UTC (rev 17393)
@@ -18,10 +18,12 @@
<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>
+ <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: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -234,7 +234,7 @@
// $tpl_vars['org_url'] =
"/bookingfrontend/?menuaction=bookingfrontend.uiorganization.show&id=".$orgid;
}
$tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
- $tpl_vars['login_url'] = 'logout.php';
+ $tpl_vars['login_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/logout.php', array());
}
else
{
Modified:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -224,7 +224,7 @@
$tpl_vars['org_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/',
array('menuaction'=>'bookingfrontend.uiorganization.show', 'id'=> $orgid));
}
$tpl_vars['login_text'] = $bouser->orgnr . ' :: ' .
lang('Logout');
- $tpl_vars['login_url'] = 'logout.php';
+ $tpl_vars['login_url'] =
$GLOBALS['phpgw']->link('/bookingfrontend/logout.php', array());
}
else
{
Copied:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/base.css
(from rev 17392, trunk/phpgwapi/templates/mobilefrontend/css/base.css)
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/base.css
(rev 0)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/base.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -0,0 +1,86 @@
+
+/* CSS for newlayout */
+
+
+#wrapper{
+background-color: #fff;
+width: 100%;
+textalign: left;
+margin: 0 auto;
+padding: 0 0px 40px;
+}
+
+#header{
+overflow: hidden;
+line-height: 1;
+width: 100%;
+background-image: none !important;
+height: 40px !important;
+}
+
+.clearBoth {
+ clear: both;
+}
+.messages {
+ font-size: 15px;
+}
+.messages table {
+ display: inline;
+ position: absolute;
+}
+
+body {
+ text-align: left;
+}
+
+body{
+color: #575757;
+width:100%;
+height:100%;
+/*background: #fff;*/
+/*url('../images/newlayout/bodyBg.gif') repeat-x;text-align: left;width:100%;*/
+}
+
+.required
+{
+ border: 1px solid red
+}
+
+.pure-menu-disabled, .pure-menu-heading, .pure-menu-link {
+ padding: 0 0;
+}
+.bigmenubutton
+{
+ padding: 32px 5px;
+ border: 1px solid #E7E1DA;
+}
+
+.pure-button
+{
+ padding: 32px 10px;
+}
+
+body {
+ margin-left:5px;
+ margin-right:5px;
+ padding:0;
+}
+
+fieldset {
+margin-right: 20px;
+}
+
+textarea
+{
+ height: 8em;
+}
+
+#app_header
+{
+ font-weight: bold;
+ font-size: 120%;
+}
+label
+{
+ font-weight: bold;
+}
Deleted:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,518 +0,0 @@
-body {
- font: normal small verdana,sans-serif;
- margin: 0;
- text-align: left;
- background: white;
-}
-button { padding: .3em .6em; margin: .4em 0;}
-a:link, a:visited { color: black;}
-div#wrapper {}
-ul#metanav {
- float: right;
- list-style-type: none;
- padding-top: 10px;
-}
-ul#metanav a, ul#sidebar a { color: #700; }
-div#content {
- margin: 0 2em;
- min-height: 500px;
-}
-#header-search {
- float: right;
- margin: -1.5em 1em 1em 1em;
-}
-#header-search.hidden { display: none; }
-#header-search .query { width: 15em;}
-
-div#header {
- background: url(../images/header_bg.png) repeat-x;
- height: 129px;
-}
-div#header a {
- float: left;
-}
-div#logo {
- width: 125px;
- height: 114px;
- margin-left: 10px;
-}
-div#centerimage {
- background: url(../images/header_fg.png) no-repeat;
- background-position: bottom center;
- margin: 0 auto;
- padding-top: 4px;
- height: 109px;
- overflow: hidden;
-}
-div#footer {
- border-top: 1px solid #aaa;
- padding-top: .3em;
- color: #666;
- font-size: 90%;
-}
-ul.nav {
- list-style-type: 0;
- padding-left: 0;
-}
-div.clr {clear: both;}
-ul.nav a { color: inherit; }
-ul.nav li { display: inline;}
-ul.nav li:before { content: '⇒ '; font-size: 90%; color: #444;}
-ul.nav li:first-child:before { display: none; }
-#login-bar {
- clear: right;
- float: right;
- padding: .5em 1em 0 0;
-}
-form#search {
- text-align: center;
- padding-top: 5em;
-}
-input#search {
- font-size: 120%;
- color: #666;
- width: 20em;
-}
-div.hint {
- margin-top: 0.4em;
- font-size: 90%;
- color: #444;
-}
-div.hint i { color: #383;}
-
-ol#result {
- padding-left: 0;
-}
-ol#result dl { margin: 0; }
-
-ol#result .header {
- font-size: 120%;
- background-color: #eee;
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- padding: .1em 0em .25em .2em;
- margin-top: .5em;
-}
-ol#result .details {
-}
-ol#result .details h4 {
- margin: 0.2em 0 0 0;
- font-weight: normal;
- font-style: italic;
- color: #888;
-}
-ol#result .details .col {
- padding: 0em 0.2em 0.4em 0.2em;
- /*float: left;*/
- width: 50%;
- /*border: 1px solid #eee;*/
-}
-ol#result .details .moreInfo {
- margin-top: .4em;
-}
-
-ol#result li:last-child {
- border-bottom: 1px solid #ccc;
-}
-
-dl.form {}
-
-dl.form dt {
- font-style: italic;
- font-weight: bolder;
- margin: .5em 0 .1em 0;
- color: #002;
-}
-
-dl.form dt label { font-size: 90%; color: #733; font-style: italic;}
-dl.form dd {
- float: left;
- margin: 0 0 0 .4em;
-}
-table.fancyTable {
- border-spacing: 0;
- border: 1px solid #ccc;
-}
-table.fancyTable thead th {
- font-weight: normal;
- border-bottom: 1px solid #777;
- padding: .1em .3em;
- font-size: 85%;
- font-style: italic;
- color: #744;
-}
-table.fancyTable tbody td {
- padding: .2em .7em;
- border-bottom: 1px solid white;
-}
-table.fancyTable tbody tr:hover td {
- background: #ffe;
- border-bottom-color: #cca;
-}
-table.fancyTable tbody td.godkand { color: #474; }
-table.fancyTable tbody td.avslag { color: #744; }
-table.fancyTable tbody td.inskickad { color: #447; }
-table.fancyTable tbody td.ny { color: #447; }
-table.fancyTable tbody td a{ color: inherit; text-decoration: inherit;}
-
-div#help {
- width: 15em;
- float: right;
- background: #3287d8;
- border: 1px solid #66a;
- border-radius: .6em;
- -moz-border-radius: .6em;
- -webkit-border-radius: .6em;
- color: white;
-}
-div#help dl { margin: .2em .8em; min-height: 10em;}
-div#help dl dd { font-style: italic;}
-div#help h2 {
- margin: 0;
- font-size: 80%;
- padding: .1em .5em;
- font-weight: normal;
- border-bottom: 1px solid #67b1ff;
-}
-#weekView tr.time td { border-top: 1px solid #aaa;}
-#weekView tr td:first-child { background: #ddd;}
-
-
-#cloud {
- text-align: center;
- list-style-type: none;
- padding-left: 0;
- color: #888;
- margin: 3em 0;
- font-size: 120%;
-}
-#cloud div { padding: .2em};
-#cloud strong { padding: .2em};
-
-#cloud li { display: inline; white-space: nowrap; padding: 0 .2em;}
-#cloud li.small { font-size: 100%;}
-#cloud li.medium { font-size: 130%;}
-#cloud li.large { font-size: 200%; color: #777;}
-#cloud li.xlarge { font-size: 240%; color: #555;}
-#cloud li:hover { text-decoration: underline; cursor: pointer; }
-
-dl.tooltip { width: 300px;}
-
-dl.tooltip dt {
- float: left;
- clear: left;
- width: 7em;
- font-style: italic;
-}
-
-dl.tooltip dd {
- float: left;
-}
-
-div.info:hover {
- background-image: url(../images/info.png);
- background-repeat: no-repeat;
- background-position: 100% 0%;
-}
-
-dl.contactinfo {}
-dl.contactinfo dt {
- margin-left: 1em;
-}
-dl.contactinfo dd {
- margin-left: 2em;
-}
-
-/*#frontend {
- width: 900px;
-}*/
-
-#frontend dl.proplist-col {
- width: 300px;
-}
-
-#frontend dl.proplist-col.main {
- width: 400px;
-}
-
-#frontend dl.proplist-col.images {
- float:right;
- clear:right;
-}
-
-
-
-#frontend h2 { margin-bottom: 0.1em;}
-#frontend dl.proplist.images dd img { width: 300px; border:1px solid #777;
padding: 1px;}
-#frontend dl.proplist.images dl { margin-bottom: 1.5em; }
-
-#frontend #result dl.proplist.images dt { display: none;}
-#frontend #result dl.proplist.images dd { display: inline; padding-right: 1em;}
-#frontend #result dl.proplist.images dd img { width: auto; height: 120px;
border:1px solid black;}
-
-
-#agegroup {
- background: #eee;
- white-space: nowrap;
-}
-#agegroup, #agegroup td, #agegroup th { width: 1%; }
-#agegroup td, #agegroup th { padding: .1em .3em;}
-#agegroup td input { width: 3em; }
-
-#overlay-info { padding: 1em; }
-#overlay-info h3 { margin: 0 0 .9em 0; }
-#overlay-info dt { font-style: italic; font-weight: bolder; font-size: 90%;}
-#overlay-info dd { padding-left: 2em; }
-#overlay-info .close { float: right; }
-#overlay-info .actions { margin-top: 1em;}
-
-.yui-calendar td.calcell {
- border:0px !important;
-}
-.yui-skin-sam .yui-dt TABLE TH{
- border: none !important;
-}
-.yui-skin-sam .yui-dt TABLE TD{
- border: none !important;
-}
-
-/* CSS for newlayout */
-body{
-color: #575757;
-margin:0;
-padding:0;
-width:100%;
-height:100%;
-background: #fff url('../images/newlayout/bodyBg.gif') repeat-x;text-align:
left;width:100%;
-}
-
-#wrapper{
-background-color: #fff;
-width: 100%;
-textalign: left;
-margin: 0 auto;
-padding: 0 0px 40px;
-}
-
-#header{
-overflow: hidden;
-line-height: 1;
-width: 100%;
-background-image: none !important;
-height: 40px !important;
-}
-
-#login-bar{
-margin-top:10px;
-}
-
-#login-bar a{
-border-right: 1px solid #575757;
-padding: 0 0.5em;
-line-height: 1.2em;
-}
-#home-menu{
-margin: 0 0 0 16px !important;
-}
-
-
-#home-menu a{
-border-right: 1px solid #575757;
-padding: 0 0.5em;
-line-height: 1.2em;
-}
-
-#app-menu{
-margin: 0 0 0 16px !important;
-}
-
-#app-menu a{
-border-right: 1px solid #575757;
-padding: 0 0.5em;
-line-height: 1.2em;
-}
-
-#applications{
-margin: 0 0 0 16px !important;
-}
-
-#applications a{
-border-right: 1px solid #575757;
-padding: 0 0.5em;
-line-height: 1.2em;
-}
-
-
-#logo{
-background: url(../images/newlayout/logo.png) no-repeat;
-float: left;
-height: 75px;
-width: 102px;
-margin: 14px 0 0 49px !important;
-}
-
-#centerimage{
-display: block !important;
-margin-right: 5px !important;
-width: 172px !important;
-height: 108px !important;
-background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
-background-position: bottom center !important;
-padding: 22px 0px 0px 100px !important;
-}
-
-#header-search{
-margin: -3em 1em 1em 1em;
-}
-
-#frontend{
-background-image: url(../images/newlayout/pageContainerBg.gif);
-background-repeat: repeat-x;
-}
-
-#line{
-border-top: 5px solid #B11F24;
-clear: left;
-height: 30px;
-width: 100%;
-margin-left: 0px;
-}
- #content{
-text-align:left;
-}
-
-#cloud{
-text-align:left;
-margin-left: 280px;
-}
-
-#footer{
-border: none !important;
-/*background:url('../images/newlayout/footerFjell_inkl_bunnlinje.gif')
no-repeat scroll center top transparent;*/
-clear:both;
-overflow:auto;
-height:20px;
-}
-
-#footer_address{
-padding-top: 1.5em;
-}
-
-#yui-history-iframe {
- height: 1px;
- left: 0;
- position: absolute;
- top: 0;
- visibility: hidden;
- width: 1px;
-}
-
-
-.requirement {
- line-height:2;
-}
-.requirement hr {
- border: 1px solid white;
-}
-.requirement-responsibility-left {
- float: left;
- margin-left: 1em;
-}
-.requirement-responsibility-left h2 {
- text-transform: uppercase;
- margin-bottom: 0em;;
-}
-.requirement-responsibility-left-sub {
- float: left;
-}
-.requirement-responsibility-right {
- float: right;
- margin-left: 1em;
-}
-
-.requirement-responsibility-right .proplist-col {
- width: auto;
-}
-.requirement-description {
- margin-left: 1em;
- margin-bottom: 1em;
-}
-.requirement-condition {
- margin-left: 1em;
- line-height: 2.2;
-}
-.requirement-related {
- margin-left: 1em;
-}
-.requirement-action-left {
- float:left;
- width: 20%;
- margin-left:1em;
- border-right: 1px solid white;
-}
-.requirement-action-right {
- margin-left: 1em;
- width: 75%;
- float:right;
-}
-.requirement-action-label {
- width: 45%;
-}
-.requirement-action-label-wide {
- width: 45%;
-}
-.requirement-action-sub-left {
- float:left;
- width:45%;
-}
-.requirement-action-sub-left div {
- line-height: 2;
-}
-.requirement-action-sub-right {
- float: right;
- text-align: left;
- width: 50%;
-}
-.requirement-action-sub-right div {
- line-height: 2;
-}
-.clearBoth {
- clear: both;
-}
-.messages {
- font-size: 15px;
-}
-.messages table {
- display: inline;
- position: absolute;
-}
-.coordinator_select dd select{
- width:300px;
-}
-.controlButton {
- margin-left: 2em;
- margin-right: 1.5em;
- float: right;
-}
-.requirement-condition .proplist-col table tr td table {
- border: none;
- padding-left: 2px;
- padding-right: 2px;
-}
-.requirement-condition .proplist-col table tr td table th {
- border: none;
- background: none;
- font-weight: bold;
- padding-right: 1em;
-}
-.requirement-condition .proplist-col table tr td table td {
- border: none;
- padding-right: 1em;
- text-align: center;
- font-weight: bold;
-}
-
-.required {
-border: 1px solid red
-}
-
Modified:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -31,8 +31,10 @@
$stylesheets[] = "/phpgwapi/templates/bookingfrontend/css/frontend.css";
$stylesheets[] = "/bookingfrontend/css/bookingfrontend.css";
-// $stylesheets[] = "/phpgwapi/templates/mobilefrontend/css/frontend.css";
+ $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:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
2017-12-04 09:30:02 UTC (rev 17393)
@@ -29,19 +29,19 @@
$topmenu = <<<HTML
- <div class="pure-menu pure-menu-horizontal">
+ <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">{$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">{$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">{$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">{$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">{$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">{$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;
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/HISTORY.md
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/HISTORY.md
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/HISTORY.md
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,6 +1,14 @@
Pure Change History
===================
+1.0.0 (2017-06-05)
+------------------
+
+The community has battle-tested Pure and provided valuable feedback. We are
now at a place where we can guarantee backwards compatibility through all
subsequent 1.x releases.
+
+We hope you have found Pure to be useful and unobtrusive.. To provide
feedback, please comment on this GitHub issue, or file a new issue to have it
tracked as a separate thread.
+
+
0.6.2 (2017-01-05)
------------------
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/LICENSE.md
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/LICENSE.md
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/LICENSE.md
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,7 +1,7 @@
Software License Agreement (BSD License)
========================================
-Copyright 2013 Yahoo! Inc.
+Copyright 2014 Yahoo! Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/README.md
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/README.md
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/README.md
2017-12-04 09:30:02 UTC (rev 17393)
@@ -8,12 +8,12 @@
[][Build Status]
[](https://david-dm.org/yahoo/pure?type=dev)
-[](https://gitter.im/yahoo/pure?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://gitter.im/yahoo/pure?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
**Use From the CDN:**
```html
-<link rel="stylesheet"
href="https://unpkg.com/address@hidden/build/pure-min.css";>
+<link rel="stylesheet"
href="https://unpkg.com/address@hidden/build/pure-min.css";>
```
Note: You can [customize which Pure modules you need][customize].
@@ -76,7 +76,7 @@
CDN:
```html
-<link rel="stylesheet"
href="https://unpkg.com/address@hidden/build/pure-min.css";>
+<link rel="stylesheet"
href="https://unpkg.com/address@hidden/build/pure-min.css";>
```
You can also install Pure using [Bower][], using the following command:
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/base.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/base.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/base.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/bower.json
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/bower.json
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/bower.json
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,9 +1,9 @@
{
"name": "pure",
"description": "Use Pure's ridiculously tiny CSS to start any web project.",
- "version": "0.6.0",
+ "version": "0.6.2",
"main": "pure.css",
"devDependencies": {
"normalize-css": "^3.0"
}
-}
\ No newline at end of file
+}
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable-min.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable.css
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable.css
2017-12-04 09:26:07 UTC (rev 17392)
+++
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified:
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables-min.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables-min.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables-min.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables.css
2017-12-04 09:26:07 UTC (rev 17392)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables.css
2017-12-04 09:30:02 UTC (rev 17393)
@@ -1,5 +1,5 @@
/*!
-Pure v0.6.2
+Pure v1.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/yahoo/pure/blob/master/LICENSE.md
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17393] Stable: Merge 17381:17392 from trunk,
sigurdne <=