SD-SimpleDesk

Re-merged changes version specific since it doesn't make much sense to keep the separated when one of the two versions is broken due to images (there may be a better way)
Parent 8ea7402
emanuele

emanuele commited on 2012-10-25 06:23:20
Showing 6 changed files, with 38 additions and 329 deletions. 

Signed-off-by: emanuele <emanuele45@gmail.com>
install-xml/install-2.0.xml
View file @ 8ea7402
... ... 
@@ -1,32 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
3 
-<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
4 
-	<id>SimpleDeskTeam:SimpleDesk</id>
5 
-	<version>2.0</version>
6 
-
7 
-	<file name="$sourcedir/ManagePosts.php"><!-- at the same time we modify the post settings, make sure we check and update SD's if necessary -->
8 
-		<operation>
9 
-			<search position="before"><![CDATA[$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));]]></search>
10 
-			<add><![CDATA[
11 
-					$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'mediumtext'));]]></add>
12 
-		</operation>
13 
-		<operation>
14 
-			<search position="before"><![CDATA[$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));]]></search>
15 
-			<add><![CDATA[
16 
-					$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'text'));]]></add>
17 
-		</operation>
18 
-	</file>
19 
-
20 
-	<file name="$sourcedir/ManageServer.php"><!-- Language file handling -->
21 
-		<operation>
22 
-			<search position="after"><![CDATA[	// Check we have themes with a path and a name - just in case - and add the path.]]></search>
23 
-			<add><![CDATA[	// Add SimpleDesk to the list of possible places to look.
24 
-	$themes['shd'] = array('name' => 'SimpleDesk', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_language');
25 
-	$lang_dirs['shd'] = $settings['default_theme_dir'] . '/languages/sd_language';
26 
-	$themes['shd_plugins'] = array('name' => 'SimpleDesk Plugins', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_plugins_lang');
27 
-	$lang_dirs['shd_plugins'] = $settings['default_theme_dir'] . '/languages/sd_plugins_lang';
28 
-
29 
-]]></add>
30 
-		</operation>
31 
-	</file>
32 
-</modification>
33 0 
\ No newline at end of file
install-xml/install-2.1.xml
View file @ 8ea7402
... ... 
@@ -1,41 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
3 
-<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
4 
-	<id>SimpleDeskTeam:SimpleDesk</id>
5 
-	<version>2.0</version>
6 
-
7 
-	<file name="$sourcedir/ManageMaintenance.php"><!-- at the same time we modify the post settings, make sure we check and update SD's if necessary -->
8 
-		<operation>
9 
-			<search position="replace"><![CDATA[
10 
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));]]></search>
11 
-			<add><![CDATA[
12 
-		{
13 
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
14 
-			$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'mediumtext'));
15 
-		}]]></add>
16 
-		</operation>
17 
-		<operation>
18 
-			<search position="replace"><![CDATA[
19 
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));]]></search>
20 
-			<add><![CDATA[
21 
-		{
22 
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
23 
-			$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'text'));
24 
-		}]]></add>
25 
-		</operation>
26 
-		<!-- @todo: add the check for tickets longer than xxx chars -->
27 
-	</file>
28 
-
29 
-	<file name="$sourcedir/ManageLanguages.php"><!-- Language file handling -->
30 
-		<operation>
31 
-			<search position="after"><![CDATA[	// Check we have themes with a path and a name - just in case - and add the path.]]></search>
32 
-			<add><![CDATA[	// Add SimpleDesk to the list of possible places to look.
33 
-	$themes['shd'] = array('name' => 'SimpleDesk', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_language');
34 
-	$lang_dirs['shd'] = $settings['default_theme_dir'] . '/languages/sd_language';
35 
-	$themes['shd_plugins'] = array('name' => 'SimpleDesk Plugins', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_plugins_lang');
36 
-	$lang_dirs['shd_plugins'] = $settings['default_theme_dir'] . '/languages/sd_plugins_lang';
37 
-
38 
-]]></add>
39 
-		</operation>
40 
-	</file>
41 
-</modification>
42 0 
\ No newline at end of file
install-xml/install-packages-2.0.xml
View file @ 8ea7402
... ... 
@@ -1,113 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
3 
-<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
4 
-	<id>SimpleDeskTeam:SimpleDesk</id>
5 
-	<version>2.0</version>
6 
-
7 
-	<file name="$sourcedir/Packages.php"><!-- Sorts the SD plugin packages into the relevant container. -->
8 
-		<operation>
9 
-			<search position="after"><![CDATA[			// Other stuff.
10 
-			else
11 
-				$context['available_other'][] = $packageInfo;]]></search>
12 
-			<add><![CDATA[			// SimpleDesk Plugins
13 
-			elseif ($packageInfo['type'] == 'sdplugin')
14 
-			{
15 
-				if (empty($context['available_sdplugins']))
16 
-					$context['available_sdplugins'] = array();
17 
-				$context['available_sdplugins'][] = $packageInfo;
18 
-			}
19 
-]]></add>
20 
-		</operation>
21 
-	</file>
22 
-
23 
-	<file name="$themedir/Packages.template.php"><!-- Displays them -->
24 
-		<operation>
25 
-			<search position="after"><![CDATA[	if (!empty($context['available_languages']))]]></search>
26 
-			<add><![CDATA[	// Add SimpleDesk Plugins
27 
-	if (!empty($context['available_sdplugins']))
28 
-	{
29 
-		echo '
30 
-		<br />
31 
-		<div class="title_bar">
32 
-			<h3 class="titlebg">', $txt['shd_admin_plugins_packman'], '</h3>
33 
-		</div>
34 
-
35 
-		<table class="table_grid" width="100%">
36 
-		<thead>
37 
-			<tr class="catbg">
38 
-				<th class="first_th" width="32"></th>
39 
-				<th class="lefttext" width="25%">', $txt['mod_name'], '</th>
40 
-				<th class="lefttext" width="25%">', $txt['mod_version'], '</th>
41 
-				<th class="last_th" width="49%"></th>
42 
-			</tr>
43 
-		</thead>
44 
-		<tbody>';
45 
-
46 
-		$alt = false;
47 
-		foreach ($context['available_sdplugins'] as $i => $package)
48 
-		{
49 
-			echo '
50 
-			<tr class="', $alt ? 'windowbg2' : 'windowbg', '">
51 
-				<td>', ++$i, '.</td>
52 
-				<td>', $package['name'], '</td>
53 
-				<td>
54 
-					', $package['version'];
55 
-
56 
-			if ($package['is_installed'] && !$package['is_newer'])
57 
-				echo '
58 
-					<img src="', $settings['images_url'], '/icons/package_', $package['is_current'] ? 'installed' : 'old', '.png" alt="" align="middle" style="margin-left: 2ex;" />';
59 
-
60 
-			echo '
61 
-				</td>
62 
-				<td align="right">';
63 
-
64 
-			if ($package['can_uninstall'])
65 
-				echo '
66 
-					<a href="', $scripturl, '?action=admin;area=packages;sa=uninstall;package=', $package['filename'], ';pid=', $package['installed_id'], '">[ ', $txt['uninstall'], ' ]</a>';
67 
-			elseif ($package['can_upgrade'])
68 
-				echo '
69 
-					<a href="', $scripturl, '?action=admin;area=packages;sa=install;package=', $package['filename'], '">[ ', $txt['package_upgrade'], ' ]</a>';
70 
-			elseif ($package['can_install'])
71 
-				echo '
72 
-					<a href="', $scripturl, '?action=admin;area=packages;sa=install;package=', $package['filename'], '">[ ', $txt['install_mod'], ' ]</a>';
73 
-
74 
-			echo '
75 
-					<a href="', $scripturl, '?action=admin;area=packages;sa=list;package=', $package['filename'], '">[ ', $txt['list_files'], ' ]</a>
76 
-					<a href="', $scripturl, '?action=admin;area=packages;sa=remove;package=', $package['filename'], ';', $context['session_var'], '=', $context['session_id'], '"', $package['is_installed'] && $package['is_current'] ? ' onclick="return confirm(\'' . $txt['package_delete_bad'] . '\');"' : '', '>[ ', $txt['package_delete'], ' ]</a>
77 
-				</td>
78 
-			</tr>';
79 
-			$alt = !$alt;
80 
-		}
81 
-
82 
-		echo '
83 
-		</tbody>
84 
-		</table>';
85 
-	}
86 
-
87 
-]]></add>
88 
-		</operation>
89 
-	</file>
90 
-
91 
-	<file name="$sourcedir/PackageGet.php"><!-- Make the install button available after an upload or a download. Code's the same, just gotta run twice. -->
92 
-		<operation>
93 
-			<search position="replace"><![CDATA[	if ($context['package']['type'] == 'modification')
94 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
95 
-	elseif ($context['package']['type'] == 'avatar')]]></search>
96 
-			<add><![CDATA[	if ($context['package']['type'] == 'modification')
97 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
98 
-	elseif ($context['package']['type'] == 'sdplugin')
99 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['shd_install_plugin'] . ' ]</a>';
100 
-	elseif ($context['package']['type'] == 'avatar')]]></add>
101 
-		</operation>
102 
-		<operation>
103 
-			<search position="replace"><![CDATA[	if ($context['package']['type'] == 'modification')
104 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
105 
-	elseif ($context['package']['type'] == 'avatar')]]></search>
106 
-			<add><![CDATA[	if ($context['package']['type'] == 'modification')
107 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
108 
-	elseif ($context['package']['type'] == 'sdplugin')
109 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['shd_install_plugin'] . ' ]</a>';
110 
-	elseif ($context['package']['type'] == 'avatar')]]></add>
111 
-		</operation>
112 
-	</file>
113 
-</modification>
114 0 
\ No newline at end of file
install-xml/install-packages-2.1.xml
View file @ 8ea7402
... ... 
@@ -1,55 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
3 
-<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
4 
-	<id>SimpleDeskTeam:SimpleDesk</id>
5 
-	<version>2.0</version>
6 
-
7 
-	<file name="$sourcedir/Packages.php"><!-- Sorts the SD plugin packages into the relevant container. -->
8 
-		<operation>
9 
-			<search position="before"><![CDATA[$context['modification_types'] = $installed ? array('modification') : array('modification', 'avatar', 'language']]></search>
10 
-			<add><![CDATA[, 'sdplugin']]></add>
11 
-		</operation>
12 
-		<operation>
13 
-			<search position="after"><![CDATA[	$context['available_languages'] = array();]]></search>
14 
-			<add><![CDATA[	$context['available_sdplugin'] = array();
15 
-]]></add>
16 
-		</operation>
17 
-		<operation>
18 
-			<search position="after"><![CDATA[				// Other stuff.
19 
-				else
20 
-				{
21 
-					$sort_id['unknown']++;]]></search>
22 
-			<add><![CDATA[				// SimpleDesk Plugins
23 
-				elseif ($packageInfo['type'] == 'sdplugin')
24 
-				{
25 
-					$sort_id['sdplugin']++;
26 
-					$packages['sdplugin'][strtolower($packageInfo[$sort])] = md5($package);
27 
-					$context['available_sdplugin'][md5($package)] = $packageInfo;
28 
-				}
29 
-]]></add>
30 
-		</operation>
31 
-	</file>
32 
-
33 
-	<file name="$sourcedir/PackageGet.php"><!-- Make the install button available after an upload or a download. Code's the same, just gotta run twice. -->
34 
-		<operation>
35 
-			<search position="replace"><![CDATA[	if ($context['package']['type'] == 'modification')
36 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
37 
-	elseif ($context['package']['type'] == 'avatar')]]></search>
38 
-			<add><![CDATA[	if ($context['package']['type'] == 'modification')
39 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
40 
-	elseif ($context['package']['type'] == 'sdplugin')
41 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['shd_install_plugin'] . ' ]</a>';
42 
-	elseif ($context['package']['type'] == 'avatar')]]></add>
43 
-		</operation>
44 
-		<operation>
45 
-			<search position="replace"><![CDATA[	if ($context['package']['type'] == 'modification')
46 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
47 
-	elseif ($context['package']['type'] == 'avatar')]]></search>
48 
-			<add><![CDATA[	if ($context['package']['type'] == 'modification')
49 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
50 
-	elseif ($context['package']['type'] == 'sdplugin')
51 
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['shd_install_plugin'] . ' ]</a>';
52 
-	elseif ($context['package']['type'] == 'avatar')]]></add>
53 
-		</operation>
54 
-	</file>
55 
-</modification>
56 0 
\ No newline at end of file
install-xml/install.xml
View file @ 18c8051
... ... 
@@ -239,4 +239,39 @@ require_once($sourcedir . '/sd_source/SimpleDesk-SSI.php');]]></add>
239 239 
 	}]]></add>
240 240 
 		</operation>
241 241 
 	</file>
242 
+
243 
+	<file name="$sourcedir/ManageMaintenance.php"><!-- at the same time we modify the post settings, make sure we check and update SD's if necessary -->
244 
+		<operation>
245 
+			<search position="replace"><![CDATA[
246 
+			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));]]></search>
247 
+			<add><![CDATA[
248 
+		{
249 
+			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
250 
+			$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'mediumtext'));
251 
+		}]]></add>
252 
+		</operation>
253 
+		<operation>
254 
+			<search position="replace"><![CDATA[
255 
+			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));]]></search>
256 
+			<add><![CDATA[
257 
+		{
258 
+			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
259 
+			$smcFunc['db_change_column']('{db_prefix}helpdesk_ticket_replies', 'body', array('type' => 'text'));
260 
+		}]]></add>
261 
+		</operation>
262 
+		<!-- @todo: add the check for tickets longer than xxx chars -->
263 
+	</file>
264 
+
265 
+	<file name="$sourcedir/ManageLanguages.php"><!-- Language file handling -->
266 
+		<operation>
267 
+			<search position="after"><![CDATA[	// Check we have themes with a path and a name - just in case - and add the path.]]></search>
268 
+			<add><![CDATA[	// Add SimpleDesk to the list of possible places to look.
269 
+	$themes['shd'] = array('name' => 'SimpleDesk', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_language');
270 
+	$lang_dirs['shd'] = $settings['default_theme_dir'] . '/languages/sd_language';
271 
+	$themes['shd_plugins'] = array('name' => 'SimpleDesk Plugins', 'theme_dir' => $settings['default_theme_dir'] . '/languages/sd_plugins_lang');
272 
+	$lang_dirs['shd_plugins'] = $settings['default_theme_dir'] . '/languages/sd_plugins_lang';
273 
+
274 
+]]></add>
275 
+		</operation>
276 
+	</file>
242 277 
 </modification>
243 278 
\ No newline at end of file
package-info.xml
View file @ 18c8051
... ... 
@@ -11,102 +11,18 @@
11 11 
 	</install>
12 12
13 13 
 	<install for="2.0, 2.0.1-2.0.99">
14 
-		<!-- readme files -->
15 
-		<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>
16 
-
17 
-		<!-- general edits -->
18 
-		<modification format="xml" type="file">install-xml/install.xml</modification>
19 
-		<modification format="xml" type="file">install-xml/install-2.0.xml</modification>
20 
-		<modification format="xml" type="file">install-xml/install-attachments.xml</modification>
21 
-		<modification format="xml" type="file">install-xml/install-trackip.xml</modification>
22 
-		<modification format="xml" type="file">install-xml/install-packages-2.0.xml</modification>
23 
-		<modification format="xml" type="file">install-xml/install-parsebbc.xml</modification>
24 
-
25 
-		<!-- language files -->
26 
-		<require-dir name="sd_language" destination="$themes_dir/default/languages" />
27 
-
28 
-		<!-- sources -->
29 
-		<require-dir name="sd_source" destination="$sourcedir" />
30 
-
31 
-		<!-- templates -->
32 
-		<require-dir name="sd_template" destination="$themedir" />
33 
-
34 
-		<!-- images -->
35 
-		<require-dir name="images/simpledesk" destination="$themes_dir/default/images" />
36 
-		<require-dir name="images/sd_plugins" destination="$themes_dir/default/images" />
37 
-		<require-dir name="images/shd" destination="$imagesdir/admin" />
38 
-		<require-file name="images/feature_shd.png" destination="$themes_dir/default/images/admin" /><!-- explicitly called from default theme in ACP -->
39 
-
40 
-		<!-- css -->
41 
-		<require-file name="css/helpdesk.css" destination="$themedir/css" />
42 
-		<require-file name="css/helpdesk_admin.css" destination="$themedir/css" />
43 
-		<require-file name="css/helpdesk_ie6.css" destination="$themedir/css" />
44 
-
45 
-		<!-- scripts -->
46 
-		<require-file name="scripts/helpdesk_admin.js" destination="$themedir/scripts" />
47 
-		<require-file name="scripts/helpdesk.js" destination="$themedir/scripts" />
48 
-
49 
-		<!-- bundled plugins -->
50 
-		<require-dir name="sd_plugins_source" destination="$sourcedir" />
51 
-		<require-dir name="sd_plugins_template" destination="$themes_dir/default" />
52 
-		<require-dir name="sd_plugins_lang" destination="$languagedir" />
53 
-
54 
-		<!-- database changes -->
55 
-		<database>install.php</database>
56 
-
57 
-		<redirect url="?action=admin;area=corefeatures#js_feature_shd" />
14 
+		<readme lang="english" parsebbc="true" type="inline">This package is for SMF 2.1+, to install SimpleDesk on your version of SMF use the proper package.</readme>
58 15 
 	</install>
59 16
60 
-	<uninstall for="2.0,2.0.1-2.0.99">
61 
-		<!-- database changes, undone -->
62 
-		<database>uninstall-optional.php</database>
63 
-		<code type="file">uninstall-required.php</code>
64 
-
65 
-		<!-- general edits, undone -->
66 
-		<modification format="xml" type="file" reverse="true">install-xml/install.xml</modification>
67 
-		<modification format="xml" type="file" reverse="true">install-xml/install-2.0.xml</modification>
68 
-		<modification format="xml" type="file" reverse="true">install-xml/install-attachments.xml</modification>
69 
-		<modification format="xml" type="file" reverse="true">install-xml/install-trackip.xml</modification>
70 
-		<modification format="xml" type="file" reverse="true">install-xml/install-packages-2.0.xml</modification>
71 
-		<modification format="xml" type="file" reverse="true">install-xml/install-parsebbc.xml</modification>
72 
-
73 
-		<!-- language files, removed -->
74 
-		<remove-dir name="$themes_dir/default/languages/sd_language" />
75 
-
76 
-		<!-- source files, removed -->
77 
-		<remove-dir name="$sourcedir/sd_source" />
78 
-
79 
-		<!-- template files, removed -->
80 
-		<remove-dir name="$themedir/sd_template" />
81 
-
82 
-		<!-- images, removed -->
83 
-		<remove-dir name="$themes_dir/default/images/simpledesk" />
84 
-		<remove-dir name="$imagesdir/admin/shd" />
85 
-		<remove-file name="$themes_dir/default/images/admin/feature_shd.png" />
86 
-
87 
-		<!-- css, removed -->
88 
-		<remove-file name="$themedir/css/helpdesk.css" />
89 
-		<remove-file name="$themedir/css/helpdesk-admin.css" />
90 
-		<remove-file name="$themedir/css/helpdesk-ie6.css" />
91 
-
92 
-		<!-- bundled plugins removed (NOTE: done one by one to avoid eating existing plugins on upgrade) -->
93 
-		<remove-dir name="$languagedir/sd_plugin_lang" />
94 
-
95 
-		<!-- scripts, removed -->
96 
-		<remove-file name="$themedir/scripts/helpdesk-admin.js" />
97 
-		<remove-file name="$themedir/scripts/helpdesk.js" />
98 
-	</uninstall>
99 
-
100 17 
 	<install for="2.1 alpha 1">
101 18 
 		<!-- readme files -->
102 19 
 		<readme lang="english" parsebbc="true" type="file">language-readme/readme.english.txt</readme>
103 20
104 21 
 		<!-- general edits -->
105 22 
 		<modification format="xml" type="file">install-xml/install.xml</modification>
106 
-		<modification format="xml" type="file">install-xml/install-2.1.xml</modification>
107 23 
 		<modification format="xml" type="file">install-xml/install-attachments.xml</modification>
108 24 
 		<modification format="xml" type="file">install-xml/install-trackip.xml</modification>
109 
-		<modification format="xml" type="file">install-xml/install-packages-2.1.xml</modification>
25 
+		<modification format="xml" type="file">install-xml/install-packages.xml</modification>
110 26 
 		<modification format="xml" type="file">install-xml/install-parsebbc.xml</modification>
111 27
112 28 
 		<!-- language files -->
... ... 
@@ -151,10 +67,9 @@
151 67
152 68 
 		<!-- general edits, undone -->
153 69 
 		<modification format="xml" type="file" reverse="true">install-xml/install.xml</modification>
154 
-		<modification format="xml" type="file" reverse="true">install-xml/install-2.1.xml</modification>
155 70 
 		<modification format="xml" type="file" reverse="true">install-xml/install-attachments.xml</modification>
156 71 
 		<modification format="xml" type="file" reverse="true">install-xml/install-trackip.xml</modification>
157 
-		<modification format="xml" type="file" reverse="true">install-xml/install-packages-2.1.xml</modification>
72 
+		<modification format="xml" type="file" reverse="true">install-xml/install-packages.xml</modification>
158 73 
 		<modification format="xml" type="file" reverse="true">install-xml/install-parsebbc.xml</modification>
159 74
160 75 
 		<!-- language files, removed -->
161 76