Skip to content

Commit 10a7117

Browse files
benkeenbenkeen
committed
3.0.6
1 parent eccdbfd commit 10a7117

File tree

9 files changed

+432
-403
lines changed

9 files changed

+432
-403
lines changed

‎code/Module.class.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class Module extends FormToolsModule
2626
protected $author = "Ben Keen";
2727
protected $authorEmail = "[email protected]";
2828
protected $authorLink = "https://formtools.org";
29-
protected $version = "3.0.5";
30-
protected $date = "2018-01-28";
29+
protected $version = "3.0.6";
30+
protected $date = "2018-03-27";
3131
protected $originLanguage = "en_us";
3232
protected $jsFiles = array(
3333
"{MODULEROOT}/scripts/admin.js",
@@ -176,7 +176,6 @@ public function displayExportOptions($template_name, $params)
176176

177177
private function addHtmlExportGroup()
178178
{
179-
$LANG = Core::$L;
180179
$L = $this->getLangStrings();
181180

182181
$smarty_template =<<< END
@@ -223,7 +222,7 @@ private function addHtmlExportGroup()
223222
{/if}
224223
{/if}
225224
<input type="button" onclick="window.close()" value="{\$LANG.word_close}" />
226-
<input type="button" onclick="window.print()" value="{\$LANG.word_print}" />
225+
<input type="button" onclick="window.print()" value="{\$L.word_print}" />
227226
</span>
228227
<span id="export_group_name">{eval var=\$export_group_name}</span>
229228
</div>
@@ -327,7 +326,7 @@ private function addHtmlExportGroup()
327326
{/foreach}
328327
</table>
329328
{if !\$smarty.foreach.row.last}
330-
<div class="no_print"><i>- {\$LANG.phrase_new_page} -</i></div>
329+
<div class="no_print"><i>- {\$L.phrase_new_page} -</i></div>
331330
<br class="page_break" />
332331
{/if}
333332
{/foreach}
@@ -680,6 +679,7 @@ public function export ($params)
680679
$placeholders["export_types"] = $export_types;
681680
$placeholders["export_type_smarty_template"] = $export_type_smarty_template;
682681

682+
$placeholders["L"] = $L;
683683
$page = CoreGeneral::evalSmartyString($template, $placeholders);
684684

685685
if ($export_group_info["action"] == "new_window" || $export_group_info["action"] == "popup") {

‎lang/en_us.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,28 @@
77
$L["module_description"] = "Define your own ways of exporting form submission data for view / download. Excel, Printer-friendly HTML, XML and CSV are included by default.";
88

99
// custom fields
10+
$L["word_action"] = "Action";
1011
$L["word_all"] = "all";
12+
$L["word_csv"] = "CSV";
1113
$L["word_display"] = "Display";
1214
$L["word_download"] = "Download";
13-
$L["word_help"] = "Help";
15+
$L["word_excel"] = "Excel";
16+
$L["word_export"] = "Export";
1417
$L["word_filename"] = "Filename";
18+
$L["word_generate"] = "Generate";
19+
$L["word_headers"] = "Headers";
20+
$L["word_height_c"] = "Height";
21+
$L["word_help"] = "Help";
22+
$L["word_hide"] = "Hide";
1523
$L["word_icon"] = "Icon";
1624
$L["word_none"] = "None";
17-
$L["word_action"] = "Action";
18-
$L["word_headers"] = "Headers";
19-
$L["word_excel"] = "Excel";
20-
$L["word_generate"] = "Generate";
21-
$L["word_welcome"] = "Welcome!";
22-
$L["word_csv"] = "CSV";
23-
$L["word_xml"] = "XML";
25+
$L["word_print"] = "Print";
26+
$L["word_selected"] = "selected";
2427
$L["word_settings"] = "Settings";
2528
$L["word_visibility"] = "Visibility";
26-
$L["word_height_c"] = "Height";
29+
$L["word_welcome"] = "Welcome!";
2730
$L["word_width_c"] = "Width";
28-
$L["word_export"] = "Export";
31+
$L["word_xml"] = "XML";
2932

3033
$L["phrase_html_printer_friendly"] = "HTML / Printer-friendly";
3134
$L["phrase_add_export_type"] = "Add Export Type";
@@ -59,6 +62,7 @@
5962
$L["phrase_generate_files_folder_url"] = "Generated files folder URL";
6063
$L["phrase_cache_multi_select_fields"] = "Cache multi-select field values for duration of session";
6164
$L["phrase_reset_defaults"] = "Reset to Defaults";
65+
$L["phrase_new_page"] = "new page";
6266

6367
$L["notify_no_export_groups"] = "There are currently no export groups. Click the button below to add a new one.";
6468
$L["notify_no_export_types"] = "There are currently no export types defined in the database. Click the button below to add a new one.";

‎templates/export_groups/add.tpl

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
{ft_include file='modules_header.tpl'}
22

3-
<table cellpadding="0" cellspacing="0" class="margin_bottom_large">
4-
<tr>
5-
<td width="45"><a href="../"><img src="../images/icon_export.gif" border="0" width="34" height="34" /></a></td>
6-
<td class="title">
7-
<a href="../../../admin/modules">{$LANG.word_modules}</a>
8-
<span class="joiner">&raquo;</span>
9-
<a href="../">{$L.module_name}</a>
10-
<span class="joiner">&raquo;</span>
11-
{$L.phrase_add_export_group}
12-
</td>
13-
</tr>
14-
</table>
15-
16-
<div class="margin_bottom_large">
3+
<table cellpadding="0" cellspacing="0" class="margin_bottom_large">
4+
<tr>
5+
<td width="45"><a href="../"><img src="../images/icon_export.gif" border="0" width="34" height="34"/></a></td>
6+
<td class="title">
7+
<a href="../../../admin/modules">{$LANG.word_modules}</a>
8+
<span class="joiner">&raquo;</span>
9+
<a href="../">{$L.module_name}</a>
10+
<span class="joiner">&raquo;</span>
11+
{$L.phrase_add_export_group}
12+
</td>
13+
</tr>
14+
</table>
15+
16+
<div class="margin_bottom_large">
1717
{$L.text_export_group_summary}
18-
</div>
18+
</div>
1919

20-
{ft_include file='messages.tpl'}
20+
{ft_include file='messages.tpl'}
2121

22-
<form action="../" method="post" onsubmit="return rsv.validate(this, rules)">
22+
<form action="../" method="post" onsubmit="return rsv.validate(this, rules)">
2323

2424
<table border="0" width="500" class="add_export_group_table">
25-
<tr>
26-
<td width="130" class="medium_grey">{$L.phrase_export_group_name}</td>
27-
<td>
28-
<input type="text" name="group_name" value="" style="width:200px" maxlength="50" />
29-
</td>
30-
</tr>
31-
<tr>
32-
<td class="medium_grey">{$L.word_visibility}</td>
33-
<td>
34-
<input type="radio" name="visibility" value="show" id="st1" checked />
35-
<label for="st1" class="green">{$LANG.word_show}</label>
36-
<input type="radio" name="visibility" value="hide" id="st2" />
37-
<label for="st2" class="red">{$LANG.word_hide}</label>
38-
</td>
39-
</tr>
40-
<tr>
41-
<td valign="top" class="medium_grey">{$L.word_icon}</td>
42-
<td>
43-
<input type="hidden" name="icon" id="icon" value="" />
44-
<ul class="icon_list">
45-
<li class="no_icon selected"></li>
46-
{foreach from=$icons item=icon name=i}
47-
{assign var=index value=$smarty.foreach.i.iteration}
48-
<li><img src="{$g_root_url}/modules/export_manager/images/icons/{$icon}" /></li>
49-
{/foreach}
50-
</ul>
51-
</td>
52-
</tr>
25+
<tr>
26+
<td width="130" class="medium_grey">{$L.phrase_export_group_name}</td>
27+
<td>
28+
<input type="text" name="group_name" value="" style="width:200px" maxlength="50"/>
29+
</td>
30+
</tr>
31+
<tr>
32+
<td class="medium_grey">{$L.word_visibility}</td>
33+
<td>
34+
<input type="radio" name="visibility" value="show" id="st1" checked/>
35+
<label for="st1" class="green">{$LANG.word_show}</label>
36+
<input type="radio" name="visibility" value="hide" id="st2"/>
37+
<label for="st2" class="red">{$L.word_hide}</label>
38+
</td>
39+
</tr>
40+
<tr>
41+
<td valign="top" class="medium_grey">{$L.word_icon}</td>
42+
<td>
43+
<input type="hidden" name="icon" id="icon" value=""/>
44+
<ul class="icon_list">
45+
<li class="no_icon selected"></li>
46+
{foreach from=$icons item=icon name=i}
47+
{assign var=index value=$smarty.foreach.i.iteration}
48+
<li><img src="{$g_root_url}/modules/export_manager/images/icons/{$icon}"/></li>
49+
{/foreach}
50+
</ul>
51+
</td>
52+
</tr>
5353
</table>
5454

5555
<p>
56-
<input type="submit" name="add_export_group" value="{$L.phrase_add_export_group}" />
56+
<input type="submit" name="add_export_group" value="{$L.phrase_add_export_group}"/>
5757
</p>
5858

59-
</form>
59+
</form>
6060

6161
{ft_include file='modules_footer.tpl'}

‎templates/export_groups/tab_add_export_type.tpl

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
1-
{ft_include file='messages.tpl'}
1+
{ft_include file='messages.tpl'}
22

3-
<form action="{$same_page}" method="post" onsubmit="return rsv.validate(this, page_ns.rules)">
4-
<input type="hidden" name="page" value="export_types" />
5-
<input type="hidden" name="export_group_id" value="{$export_group_id}" />
3+
<form action="{$same_page}" method="post" onsubmit="return rsv.validate(this, page_ns.rules)">
4+
<input type="hidden" name="page" value="export_types"/>
5+
<input type="hidden" name="export_group_id" value="{$export_group_id}"/>
66

77
<table cellspacing="1" cellpadding="2" border="0">
8-
<tr>
9-
<td width="120" class="medium_grey">{$L.phrase_export_type_name}</td>
10-
<td>
11-
<input type="text" name="export_type_name" value="" style="width:200px" maxlength="50" />
12-
</td>
13-
</tr>
14-
<tr>
15-
<td valign="top" class="medium_grey">{$L.word_visibility}</td>
16-
<td>
17-
<input type="radio" name="visibility" value="show" id="st1" checked />
18-
<label for="st1" class="green">{$LANG.word_show}</label>
19-
<input type="radio" name="visibility" value="hide" id="st2" />
20-
<label for="st2" class="red">{$LANG.word_hide}</label>
21-
22-
<div class="light_grey">{$L.notify_export_type_visibility}</div>
23-
</td>
24-
</tr>
25-
<tr>
26-
<td class="medium_grey">{$L.word_filename}</td>
27-
<td>
28-
<input type="text" name="filename" value="{literal}submissions-{$M}.{$j}.html{/literal}" style="width:200px" maxlength="50" />
29-
<a href="http://modules.formtools.org/export_manager/documentation.php?page=filename_placeholders">{$L.phrase_view_available_placeholders}</a>
30-
</td>
31-
</tr>
8+
<tr>
9+
<td width="120" class="medium_grey">{$L.phrase_export_type_name}</td>
10+
<td>
11+
<input type="text" name="export_type_name" value="" style="width:200px" maxlength="50"/>
12+
</td>
13+
</tr>
14+
<tr>
15+
<td valign="top" class="medium_grey">{$L.word_visibility}</td>
16+
<td>
17+
<input type="radio" name="visibility" value="show" id="st1" checked/>
18+
<label for="st1" class="green">{$LANG.word_show}</label>
19+
<input type="radio" name="visibility" value="hide" id="st2"/>
20+
<label for="st2" class="red">{$L.word_hide}</label>
21+
22+
<div class="light_grey">{$L.notify_export_type_visibility}</div>
23+
</td>
24+
</tr>
25+
<tr>
26+
<td class="medium_grey">{$L.word_filename}</td>
27+
<td>
28+
<input type="text" name="filename" value="{literal}submissions-{$M}.{$j}.html{/literal}"
29+
style="width:200px" maxlength="50"/>
30+
<a href="http://modules.formtools.org/export_manager/documentation.php?page=filename_placeholders">{$L.phrase_view_available_placeholders}</a>
31+
</td>
32+
</tr>
3233
</table>
3334
3435
<p class="bold">{$L.phrase_smarty_template}</p>
3536
3637
<div class="editor_wrapper" style="width: 100%">
37-
<textarea name="smarty_template" id="smarty_template"></textarea>
38+
<textarea name="smarty_template" id="smarty_template"></textarea>
3839
</div>
3940
4041
<script type="text/javascript">
41-
var html_editor = new CodeMirror.fromTextArea(document.getElementById("smarty_template"), {literal}{{/literal}
42-
mode: "smarty"
43-
{literal}});{/literal}
42+
var html_editor = new CodeMirror.fromTextArea(document.getElementById("smarty_template"), {literal}{{/literal}
43+
mode: "smarty"
44+
{literal}});{/literal}
4445
</script>
4546
4647
<p>
47-
<input type="submit" name="add_export_type" value="{$L.phrase_add_export_type}" />
48+
<input type="submit" name="add_export_type" value="{$L.phrase_add_export_type}"/>
4849
</p>
4950
50-
</form>
51+
</form>

‎templates/export_groups/tab_edit_export_type.tpl

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
1-
{ft_include file='messages.tpl'}
1+
{ft_include file='messages.tpl'}
22

3-
<form action="{$same_page}" method="post" onsubmit="return rsv.validate(this, page_ns.rules)">
4-
<input type="hidden" name="export_type_id" value="{$export_type.export_type_id}" />
5-
<input type="hidden" name="export_group_id" value="{$export_type.export_group_id}" />
6-
<input type="hidden" name="page" value="edit_export_type" />
3+
<form action="{$same_page}" method="post" onsubmit="return rsv.validate(this, page_ns.rules)">
4+
<input type="hidden" name="export_type_id" value="{$export_type.export_type_id}"/>
5+
<input type="hidden" name="export_group_id" value="{$export_type.export_group_id}"/>
6+
<input type="hidden" name="page" value="edit_export_type"/>
77

88
<table cellspacing="1" cellpadding="2" border="0">
9-
<tr>
10-
<td width="120" class="medium_grey">{$L.phrase_export_type_name}</td>
11-
<td>
12-
<input type="text" name="export_type_name" value="{$export_type.export_type_name}" style="width:100%" maxlength="255" />
13-
</td>
14-
</tr>
15-
<tr>
16-
<td valign="top" class="medium_grey">{$L.word_visibility}</td>
17-
<td>
18-
<input type="radio" name="visibility" value="show" id="st1" {if $export_type.export_type_visibility == "show"}checked{/if} />
19-
<label for="st1" class="green">{$LANG.word_show}</label>
20-
<input type="radio" name="visibility" value="hide" id="st2" {if $export_type.export_type_visibility == "hide"}checked{/if} />
21-
<label for="st2" class="red">{$LANG.word_hide}</label>
22-
<div class="light_grey">{$L.notify_export_type_visibility}</div>
23-
</td>
24-
</tr>
25-
<tr>
26-
<tr>
27-
<td valign="top" class="medium_grey">{$L.word_filename}</td>
28-
<td>
29-
<input type="text" name="filename" value="{$export_type.filename}" style="width:100%" maxlength="50" />
30-
<div class="light_grey">
31-
{$L.notify_filename_explanation}
32-
</div>
33-
</td>
34-
</tr>
9+
<tr>
10+
<td width="120" class="medium_grey">{$L.phrase_export_type_name}</td>
11+
<td>
12+
<input type="text" name="export_type_name" value="{$export_type.export_type_name}" style="width:100%"
13+
maxlength="255"/>
14+
</td>
15+
</tr>
16+
<tr>
17+
<td valign="top" class="medium_grey">{$L.word_visibility}</td>
18+
<td>
19+
<input type="radio" name="visibility" value="show" id="st1"
20+
{if $export_type.export_type_visibility == "show"}checked{/if} />
21+
<label for="st1" class="green">{$LANG.word_show}</label>
22+
<input type="radio" name="visibility" value="hide" id="st2"
23+
{if $export_type.export_type_visibility == "hide"}checked{/if} />
24+
<label for="st2" class="red">{$L.word_hide}</label>
25+
<div class="light_grey">{$L.notify_export_type_visibility}</div>
26+
</td>
27+
</tr>
28+
<tr>
29+
<tr>
30+
<td valign="top" class="medium_grey">{$L.word_filename}</td>
31+
<td>
32+
<input type="text" name="filename" value="{$export_type.filename}" style="width:100%" maxlength="50"/>
33+
<div class="light_grey">
34+
{$L.notify_filename_explanation}
35+
</div>
36+
</td>
37+
</tr>
3538
</table>
3639

3740
<p class="bold">{$L.phrase_smarty_template}</p>
3841

3942
<div class="editor_wrapper" style="width: 100%">
40-
<textarea name="smarty_template" id="smarty_template">{$export_type.export_type_smarty_template}</textarea>
43+
<textarea name="smarty_template" id="smarty_template">{$export_type.export_type_smarty_template}</textarea>
4144
</div>
4245

4346
<script>
44-
var html_editor = new CodeMirror.fromTextArea(document.getElementById("smarty_template"), {literal}{{/literal}
45-
mode: "smarty"
46-
{literal}});{/literal}
47+
var html_editor = new CodeMirror.fromTextArea(document.getElementById("smarty_template"), {literal}{{/literal}
48+
mode: "smarty"
49+
{literal}});{/literal}
4750
</script>
4851
4952
<p>
50-
<input type="submit" name="update_export_type" value="{$LANG.word_update}" />
53+
<input type="submit" name="update_export_type" value="{$LANG.word_update}"/>
5154
</p>
5255
53-
</form>
56+
</form>

0 commit comments

Comments
 (0)