3.0.0

benkeen · benkeen · commit 9121a9e90c4c · 2017-10-05T19:59:32.000-07:00
diff --git a/code/ExportGroups.class.php b/code/ExportGroups.class.php
@@ -87,6 +87,8 @@ public static function addExportGroup($info, $L)
             "popup_height" => null,
             "popup_width" => null,
             "action" => "new_window",
+            "action_button_text" => $L["word_generate"],
+            "smarty_template" => "",
             "headers" => ""
         ), $info);
 
diff --git a/code/Module.class.php b/code/Module.class.php
@@ -338,7 +338,6 @@ public function addExcelExportGroup()
         list ($success, $message, $export_group_id) = ExportGroups::addExportGroup(array(
             "group_name" => $L["word_excel"],
             "icon" => "xls.gif",
-            "action_button_text" => $L["word_generate"],
             "headers" => "Pragma: public\nCache-Control: max-age=0\nContent-Type: application/vnd.ms-excel; charset=utf-8\nContent-Disposition: attachment; filename={\$filename}",
             "smarty_template" => "<html>\n<head>\n</head>\n<body>\n\n{\$export_type_smarty_template}\n\n</body>\n</html>"
         ), $L);
@@ -388,7 +387,7 @@ private function addXmlExportGroup ()
             "group_name" => $L["word_xml"],
             "visibility" => "hide",
             "icon" => "xml.jpg",
-            "action_button_text" => $L["word_generate"],
+            "headers" => "Content-type: application/xml; charset=\"octet-stream\"\r\nContent-Disposition: attachment; filename={\$filename}",
             "smarty_template" => "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n\r\n{\$export_type_smarty_template}"
         ), $L);
 
@@ -442,8 +441,7 @@ private function addCsvExportGroup()
             "group_name" => $L["word_csv"],
             "visibility" => "hide",
             "icon" => "csv.gif",
-            "action_button_text" => $L["word_generate"],
-            "headers" => "Content-type: text/csv; charset=\"octet-stream\"\r\nContent-Disposition: attachment; filename={\$filename}",
+            "headers" => "Content-type: text/csv;\r\nContent-Disposition: attachment; filename={\$filename}",
             "smarty_template" => "{\$export_type_smarty_template}"
         ), $L);
 
diff --git a/css/styles.css b/css/styles.css
@@ -79,6 +79,7 @@ ul.icon_list li {
   -moz-border-radius: 4px;
   border-radius: 4px;
   float: left;
+  cursor: pointer;
 }
 ul.icon_list li:hover, ul.icon_list li.selected {
   background-color: #bad7eb;
diff --git a/export.php b/export.php
@@ -137,12 +137,8 @@
 $placeholders["export_types"] = $export_types;
 $placeholders["export_type_smarty_template"] = $export_type_smarty_template;
 
-//print_r($placeholders);
-//exit;
-
 $page = CoreGeneral::evalSmartyString($template, $placeholders);
 
-
 if ($export_group_info["action"] == "new_window" || $export_group_info["action"] == "popup") {
 
     // if required, send the HTTP headers
diff --git a/lang/en_us.php b/lang/en_us.php
@@ -82,8 +82,8 @@
 
 $L["text_export_group_summary"] = "Add the new export group below. After this step you will be able to edit all aspects of the new export group.";
 $L["text_export_manager_intro"] = "Welcome to the Export Manager module! This module lets you control the various ways in which your form submissions can be viewed and downloaded.";
-$L["text_help_link"] = "For help on how to use this module, please see the <a href=\"https://docs.formtools.org/modules/export_manager/\">module help documentation</a>.";
-$L["text_reset_defaults"] = "This page lets you reset all the configurations for the Export Manager's export groups and types. This is convenient if you've accidentally broken something. If you're upgrading to 2.1.0, resetting to the defaults is <b>required</b> because earlier export type code is no longer compatible. Please note that any client permissions will be lost by resetting to the defaults here.";
+$L["text_help_link"] = "For help on how to use this module, please see the <a href=\"https://docs.formtools.org/modules/export_manager/\" target=\"_blank\">module help documentation</a>.";
+$L["text_reset_defaults"] = "This page lets you reset all the configurations for the Export Manager's export groups and types. This is convenient if you've accidentally broken something.";
 
 $L["validation_select_rows_to_export"] = "Please select those rows you would like to export.";
 $L["validation_no_export_group_name"] = "Please enter the export group name.";
diff --git a/module_config.php b/module_config.php

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ ul.icon_list li {`
`79`	`79`	`-moz-border-radius: 4px;`
`80`	`80`	`border-radius: 4px;`
`81`	`81`	`float: left;`
	`82`	`+ cursor: pointer;`
`82`	`83`	`}`
`83`	`84`	`ul.icon_list li:hover, ul.icon_list li.selected {`
`84`	`85`	`background-color: #bad7eb;`