[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17058] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17058] more on eventplanner |
|
Date: |
Mon, 11 Sep 2017 12:06:18 -0400 (EDT) |
Revision: 17058
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17058
Author: sigurdne
Date: 2017-09-11 12:06:18 -0400 (Mon, 11 Sep 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.uiapplication.inc.php
trunk/eventplanner/js/portico/application.edit.js
trunk/eventplanner/templates/base/application.xsl
trunk/eventplanner/templates/base/config.tpl
trunk/eventplannerfrontend/inc/class.uimetasettings.inc.php
trunk/eventplannerfrontend/inc/model/class.metasettings.inc.php
trunk/eventplannerfrontend/js/portico/application.edit.js
trunk/eventplannerfrontend/setup/phpgw_no.lang
trunk/eventplannerfrontend/templates/base/application.xsl
trunk/eventplannerfrontend/templates/base/metasettings.xsl
Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php 2017-09-11 14:53:28 UTC
(rev 17057)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php 2017-09-11 16:06:18 UTC
(rev 17058)
@@ -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: trunk/eventplanner/js/portico/application.edit.js
===================================================================
--- trunk/eventplanner/js/portico/application.edit.js 2017-09-11 14:53:28 UTC
(rev 17057)
+++ trunk/eventplanner/js/portico/application.edit.js 2017-09-11 16:06:18 UTC
(rev 17058)
@@ -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: trunk/eventplanner/templates/base/application.xsl
===================================================================
--- trunk/eventplanner/templates/base/application.xsl 2017-09-11 14:53:28 UTC
(rev 17057)
+++ trunk/eventplanner/templates/base/application.xsl 2017-09-11 16:06:18 UTC
(rev 17058)
@@ -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: trunk/eventplanner/templates/base/config.tpl
===================================================================
--- trunk/eventplanner/templates/base/config.tpl 2017-09-11 14:53:28 UTC
(rev 17057)
+++ trunk/eventplanner/templates/base/config.tpl 2017-09-11 16:06:18 UTC
(rev 17058)
@@ -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: trunk/eventplannerfrontend/inc/class.uimetasettings.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.uimetasettings.inc.php 2017-09-11
14:53:28 UTC (rev 17057)
+++ trunk/eventplannerfrontend/inc/class.uimetasettings.inc.php 2017-09-11
16:06:18 UTC (rev 17058)
@@ -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: trunk/eventplannerfrontend/inc/model/class.metasettings.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-11 14:53:28 UTC (rev 17057)
+++ trunk/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-11 16:06:18 UTC (rev 17058)
@@ -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: trunk/eventplannerfrontend/js/portico/application.edit.js
===================================================================
--- trunk/eventplannerfrontend/js/portico/application.edit.js 2017-09-11
14:53:28 UTC (rev 17057)
+++ trunk/eventplannerfrontend/js/portico/application.edit.js 2017-09-11
16:06:18 UTC (rev 17058)
@@ -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: trunk/eventplannerfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/eventplannerfrontend/setup/phpgw_no.lang 2017-09-11 14:53:28 UTC
(rev 17057)
+++ trunk/eventplannerfrontend/setup/phpgw_no.lang 2017-09-11 16:06:18 UTC
(rev 17058)
@@ -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: trunk/eventplannerfrontend/templates/base/application.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application.xsl 2017-09-11
14:53:28 UTC (rev 17057)
+++ trunk/eventplannerfrontend/templates/base/application.xsl 2017-09-11
16:06:18 UTC (rev 17058)
@@ -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: trunk/eventplannerfrontend/templates/base/metasettings.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/metasettings.xsl 2017-09-11
14:53:28 UTC (rev 17057)
+++ trunk/eventplannerfrontend/templates/base/metasettings.xsl 2017-09-11
16:06:18 UTC (rev 17058)
@@ -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">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17058] more on eventplanner,
sigurdne <=