[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17059] Stable: Merge 17056:17058 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17059] Stable: Merge 17056:17058 from trunk |
|
Date: |
Mon, 11 Sep 2017 12:07:21 -0400 (EDT) |
Revision: 17059
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17059
Author: sigurdne
Date: 2017-09-11 12:07:20 -0400 (Mon, 11 Sep 2017)
Log Message:
-----------
Stable: Merge 17056:17058 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/js/portico/application.edit.js
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
branches/Version-2_0-branch/eventplannerfrontend/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/js/mmenu.js
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/templates/frontend/css/ie.css
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch 2017-09-11 16:07:20 UTC (rev 17059)
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
\ 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
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-09-11 16:07:20 UTC (rev 17059)
@@ -263,8 +263,9 @@
$config = CreateObject('phpgwapi.config',
'eventplanner')->read();
$default_category =
!empty($config['default_application_category']) ?
$config['default_application_category'] : null;
- $application_files_text =
!empty($config['application_files_text']) ? $config['application_files_text'] :
null;
+ $config_frontend = CreateObject('phpgwapi.config',
'eventplannerfrontend')->read();
+ $application_condition =
!empty($config_frontend['application_condition']) ?
$config_frontend['application_condition'] : null;
$tabs = array();
$tabs['first_tab'] = array(
'label' => lang('application'),
@@ -526,7 +527,7 @@
'value_active_tab' => $active_tab,
'multi_upload_parans' =>
"{menuaction:'{$this->currentapp}.uiapplication.build_multi_upload_file',
id:'{$id}'}",
'multiple_uploader' => true,
- 'application_files_text' =>
$application_files_text
+ 'application_condition' =>
$application_condition
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
Modified:
branches/Version-2_0-branch/eventplanner/js/portico/application.edit.js
===================================================================
--- branches/Version-2_0-branch/eventplanner/js/portico/application.edit.js
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/eventplanner/js/portico/application.edit.js
2017-09-11 16:07:20 UTC (rev 17059)
@@ -76,10 +76,18 @@
if (active_tab === 'first_tab')
{
$('#tab-content').responsiveTabs('activate', 1);
- $("#save_button").val(lang['save']);
- $("#save_button_bottom").val(lang['save']);
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
$("#active_tab").val('demands');
}
+ else if (active_tab === 'demands')
+ {
+ $('#tab-content').responsiveTabs('activate', 2);
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
+ $("#active_tab").val('files');
+ document.form.submit();
+ }
else
{
document.form.submit();
@@ -217,6 +225,21 @@
$("#floating-box").show();
$("#submit_group_bottom").show();
}
+ else if (tab === 'demands')
+ {
+ if (id > 0)
+ {
+ $("#save_button").val(lang['save']);
+ $("#save_button_bottom").val(lang['save']);
+ }
+ else
+ {
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
+ }
+ $("#floating-box").show();
+ $("#submit_group_bottom").show();
+ }
else
{
$("#save_button").val(lang['save']);
Modified:
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-09-11 16:07:20 UTC (rev 17059)
@@ -92,6 +92,7 @@
</div>
<input type="hidden" id="active_tab"
name="active_tab" value="{value_active_tab}"/>
<div id="first_tab">
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
<legend>
<xsl:value-of
select="php:function('lang', 'application')"/>
@@ -727,7 +728,7 @@
<script type="text/javascript">
var multi_upload_parans
= <xsl:value-of select="multi_upload_parans"/>;
</script>
- <xsl:value-of
disable-output-escaping="yes" select="application_files_text"/>
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
<legend>
<xsl:text>Curriculum vitae</xsl:text>
Modified: branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/eventplanner/templates/base/config.tpl
2017-09-11 16:07:20 UTC (rev 17059)
@@ -63,13 +63,6 @@
</td>
</tr>
<tr>
- <td>{lang_application_files_text}:</td>
- <td>
- <textarea
name="newsettings[application_files_text]">{value_application_files_text}</textarea>
- </td>
- </tr>
-
- <tr>
<td>{lang_uploader_filetypes}: jpg,gif,png</td>
<td><input name="newsettings[uploader_filetypes]"
value="{value_uploader_filetypes}"></td>
</tr>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
2017-09-11 16:06:18 UTC (rev 17058)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
2017-09-11 16:07:20 UTC (rev 17059)
@@ -96,6 +96,7 @@
$meta['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::rich_text_editor('field_frontpage_text');
+ self::rich_text_editor('application_condition');
self::render_template_xsl('metasettings',
array('config_data' => $config->config_data,
'meta' => $meta));
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-11 16:06:18 UTC (rev 17058)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-11 16:07:20 UTC (rev 17059)
@@ -78,6 +78,10 @@
'frontpage_text' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'html',
'history' => false
+ ),
+ 'application_condition' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'html',
+ 'history' => false
)
);
return $fields;
Modified:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-09-11 16:06:18 UTC (rev 17058)
+++
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-09-11 16:07:20 UTC (rev 17059)
@@ -68,10 +68,18 @@
if (active_tab === 'first_tab')
{
$('#tab-content').responsiveTabs('activate', 1);
- $("#save_button").val(lang['save']);
- $("#save_button_bottom").val(lang['save']);
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
$("#active_tab").val('demands');
}
+ else if (active_tab === 'demands')
+ {
+ $('#tab-content').responsiveTabs('activate', 2);
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
+ $("#active_tab").val('files');
+ document.form.submit();
+ }
else
{
document.form.submit();
@@ -209,6 +217,21 @@
$("#floating-box").show();
$("#submit_group_bottom").show();
}
+ else if (tab === 'demands')
+ {
+ if (id > 0)
+ {
+ $("#save_button").val(lang['save']);
+ $("#save_button_bottom").val(lang['save']);
+ }
+ else
+ {
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
+ }
+ $("#floating-box").show();
+ $("#submit_group_bottom").show();
+ }
else
{
$("#save_button").val(lang['save']);
Modified: branches/Version-2_0-branch/eventplannerfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/setup/phpgw_no.lang
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/eventplannerfrontend/setup/phpgw_no.lang
2017-09-11 16:07:20 UTC (rev 17059)
@@ -1,3 +1,5 @@
eventplannerfrontend common no TurneplanleggerFrontend
new user eventplannerfrontend no Ny bruker
-my applications eventplannerfrontend no Mine søknader
\ No newline at end of file
+my applications eventplannerfrontend no Mine søknader
+frontpage text eventplannerfrontend no Fremsidetekst
+application condition eventplannerfrontend no krav til utfylling av
søknad
\ No newline at end of file
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-09-11 16:06:18 UTC (rev 17058)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-09-11 16:07:20 UTC (rev 17059)
@@ -79,6 +79,7 @@
</div>
<input type="hidden" id="active_tab"
name="active_tab" value="{value_active_tab}"/>
<div id="first_tab">
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
<legend>
<xsl:value-of
select="php:function('lang', 'application')"/>
@@ -246,6 +247,9 @@
<xsl:value-of select="php:function('lang', 'program description')"/>
</label>
<textarea
cols="47" rows="7" name="description" class="pure-input-1-2" >
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'might be published')"/>
</xsl:attribute>
@@ -644,7 +648,7 @@
<script type="text/javascript">
var multi_upload_parans
= <xsl:value-of select="multi_upload_parans"/>;
</script>
- <xsl:value-of
disable-output-escaping="yes" select="application_files_text"/>
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
<legend>
<xsl:text>Curriculum vitae</xsl:text>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
2017-09-11 16:06:18 UTC (rev 17058)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
2017-09-11 16:07:20 UTC (rev 17059)
@@ -56,6 +56,16 @@
</textarea>
</div>
</div>
+ <div class="pure-control-group">
+ <label
for="application_condition">
+ <xsl:value-of
select="php:function('lang', 'application condition')"/>
+ </label>
+ <div class="pure-custom">
+ <textarea
id="application_condition" class="full-width" name="application_condition">
+ <xsl:value-of
disable-output-escaping="yes" select="config_data/application_condition"/>
+ </textarea>
+ </div>
+ </div>
</div>
</div>
<div class="form-buttons">
Copied: branches/Version-2_0-branch/phpgwapi/templates/frontend/css/ie.css
(from rev 17058, trunk/phpgwapi/templates/frontend/css/ie.css)
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/css/ie.css
(rev 0)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/css/ie.css
2017-09-11 16:07:20 UTC (rev 17059)
@@ -0,0 +1,9 @@
+
+.pure-menu-list {
+ padding-top: 2.5em;
+}
+
+.mm-menu {
+ margin-top: 5.5em;
+
+}
\ No newline at end of file
Modified: branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-09-11 16:07:20 UTC (rev 17059)
@@ -54,7 +54,6 @@
phpgwapi_cache::message_set($message, 'error');
}
-
$stylesheets = array();
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
@@ -75,6 +74,11 @@
// $stylesheets[] = "/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.css";
$stylesheets[] =
"/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.all.css";
+ if (!preg_match('/Firefox/i', $_SERVER['HTTP_USER_AGENT']))
+ {
+ $stylesheets[] = "/phpgwapi/templates/frontend/css/ie.css";
+ }
+
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
$stylesheets[] =
"/phpgwapi/templates/frontend/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/js/mmenu.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/js/mmenu.js
2017-09-11 16:06:18 UTC (rev 17058)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/js/mmenu.js
2017-09-11 16:07:20 UTC (rev 17059)
@@ -27,13 +27,13 @@
'title',
'close'
]
- },
- {
- position: 'bottom',
- content: [
- '<a href="' + HomeUrl + '">Home</a>'
- ]
- }
+ }
+// ,{
+// position: 'bottom',
+// content: [
+// '<a href="' + HomeUrl + '">Home</a>'
+// ]
+// }
]
});
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17059] Stable: Merge 17056:17058 from trunk,
sigurdne <=