From 79d5661ca79cc440ad8e81dd974a698a38ed1e29 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 29 Dec 2011 14:55:39 +0100
Subject: [PATCH] Adjusts the option type template names to match the class
 names

---
 com.woltlab.wcf/option.xml                             |  6 +++---
 .../{optionTypeBoolean.tpl => booleanOptionType.tpl}   |  0
 ...onTypeMultiselect.tpl => multiSelectOptionType.tpl} |  0
 ...nTypeRadiobuttons.tpl => radioButtonOptionType.tpl} |  0
 .../{optionTypeSelect.tpl => selectOptionType.tpl}     |  0
 .../template/textI18nOptionType.tpl                    |  0
 .../{optionTypeText.tpl => textOptionType.tpl}         |  0
 .../template/textareaI18nOptionType.tpl                |  0
 .../{optionTypeTextarea.tpl => textareaOptionType.tpl} |  0
 .../{optionTypeBoolean.tpl => booleanOptionType.tpl}   |  0
 ...onTypeMultiselect.tpl => multiSelectOptionType.tpl} |  0
 ...nTypeRadiobuttons.tpl => radioButtonOptionType.tpl} |  0
 .../{optionTypeSelect.tpl => selectOptionType.tpl}     |  0
 .../install/files/acp/templates/textI18nOptionType.tpl | 10 ++++++++++
 .../{optionTypeText.tpl => textOptionType.tpl}         |  0
 .../files/acp/templates/textareaI18nOptionType.tpl     | 10 ++++++++++
 .../{optionTypeTextarea.tpl => textareaOptionType.tpl} |  0
 .../lib/system/option/BooleanOptionType.class.php      |  2 +-
 ...nType.class.php => MultiSelectOptionType.class.php} |  6 +++---
 ...nType.class.php => RadioButtonOptionType.class.php} |  4 ++--
 .../files/lib/system/option/SelectOptionType.class.php |  2 +-
 .../lib/system/option/TextI18nOptionType.class.php     |  2 +-
 .../files/lib/system/option/TextOptionType.class.php   |  2 +-
 .../lib/system/option/TextareaI18nOptionType.class.php |  2 +-
 .../lib/system/option/TextareaOptionType.class.php     |  2 +-
 .../lib/system/option/TimezoneOptionType.class.php     |  2 +-
 26 files changed, 35 insertions(+), 15 deletions(-)
 rename com.woltlab.wcf/template/{optionTypeBoolean.tpl => booleanOptionType.tpl} (100%)
 rename com.woltlab.wcf/template/{optionTypeMultiselect.tpl => multiSelectOptionType.tpl} (100%)
 rename com.woltlab.wcf/template/{optionTypeRadiobuttons.tpl => radioButtonOptionType.tpl} (100%)
 rename com.woltlab.wcf/template/{optionTypeSelect.tpl => selectOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl => com.woltlab.wcf/template/textI18nOptionType.tpl (100%)
 rename com.woltlab.wcf/template/{optionTypeText.tpl => textOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl => com.woltlab.wcf/template/textareaI18nOptionType.tpl (100%)
 rename com.woltlab.wcf/template/{optionTypeTextarea.tpl => textareaOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/{optionTypeBoolean.tpl => booleanOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/{optionTypeMultiselect.tpl => multiSelectOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/{optionTypeRadiobuttons.tpl => radioButtonOptionType.tpl} (100%)
 rename wcfsetup/install/files/acp/templates/{optionTypeSelect.tpl => selectOptionType.tpl} (100%)
 create mode 100644 wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
 rename wcfsetup/install/files/acp/templates/{optionTypeText.tpl => textOptionType.tpl} (100%)
 create mode 100644 wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
 rename wcfsetup/install/files/acp/templates/{optionTypeTextarea.tpl => textareaOptionType.tpl} (100%)
 rename wcfsetup/install/files/lib/system/option/{MultiselectOptionType.class.php => MultiSelectOptionType.class.php} (91%)
 rename wcfsetup/install/files/lib/system/option/{RadiobuttonsOptionType.class.php => RadioButtonOptionType.class.php} (94%)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 4f151a458f..edcae45185 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -157,7 +157,7 @@
 			<!-- general.image -->
 			<option name="image_adapter_type">
 				<categoryname>general.image</categoryname>
-				<optiontype>radiobuttons</optiontype>
+				<optiontype>radioButton</optiontype>
 				<defaultvalue><![CDATA[gd]]></defaultvalue>
 				<selectoptions>
 					<![CDATA[gd:wcf.acp.option.image_adapter_type.gd
@@ -285,7 +285,7 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 			<!-- mail.send -->
 			<option name="mail_send_method">
 				<categoryname>general.mail.send</categoryname>
-				<optiontype>radiobuttons</optiontype>
+				<optiontype>radioButton</optiontype>
 				<defaultvalue><![CDATA[php]]></defaultvalue>
 				<selectoptions><![CDATA[php:wcf.acp.option.mail_send_method.php
 smtp:wcf.acp.option.mail_send_method.smtp
@@ -328,7 +328,7 @@ debug:mail_debug_logfile_path,!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,
 			<!-- general.cache -->
 			<option name="cache_source_type">
 				<categoryname>general.cache.general</categoryname>
-				<optiontype>radiobuttons</optiontype>
+				<optiontype>radioButton</optiontype>
 				<defaultvalue><![CDATA[disk]]></defaultvalue>
 				<selectoptions><![CDATA[disk:wcf.acp.option.cache_source_type.disk
 memcache:wcf.acp.option.cache_source_type.memcache
diff --git a/com.woltlab.wcf/template/optionTypeBoolean.tpl b/com.woltlab.wcf/template/booleanOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeBoolean.tpl
rename to com.woltlab.wcf/template/booleanOptionType.tpl
diff --git a/com.woltlab.wcf/template/optionTypeMultiselect.tpl b/com.woltlab.wcf/template/multiSelectOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeMultiselect.tpl
rename to com.woltlab.wcf/template/multiSelectOptionType.tpl
diff --git a/com.woltlab.wcf/template/optionTypeRadiobuttons.tpl b/com.woltlab.wcf/template/radioButtonOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeRadiobuttons.tpl
rename to com.woltlab.wcf/template/radioButtonOptionType.tpl
diff --git a/com.woltlab.wcf/template/optionTypeSelect.tpl b/com.woltlab.wcf/template/selectOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeSelect.tpl
rename to com.woltlab.wcf/template/selectOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl b/com.woltlab.wcf/template/textI18nOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeTextI18n.tpl
rename to com.woltlab.wcf/template/textI18nOptionType.tpl
diff --git a/com.woltlab.wcf/template/optionTypeText.tpl b/com.woltlab.wcf/template/textOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeText.tpl
rename to com.woltlab.wcf/template/textOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl b/com.woltlab.wcf/template/textareaI18nOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeTextareaI18n.tpl
rename to com.woltlab.wcf/template/textareaI18nOptionType.tpl
diff --git a/com.woltlab.wcf/template/optionTypeTextarea.tpl b/com.woltlab.wcf/template/textareaOptionType.tpl
similarity index 100%
rename from com.woltlab.wcf/template/optionTypeTextarea.tpl
rename to com.woltlab.wcf/template/textareaOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeBoolean.tpl
rename to wcfsetup/install/files/acp/templates/booleanOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeMultiselect.tpl b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeMultiselect.tpl
rename to wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeRadiobuttons.tpl
rename to wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/optionTypeSelect.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeSelect.tpl
rename to wcfsetup/install/files/acp/templates/selectOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
new file mode 100644
index 0000000000..8caccffa7c
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+	//<![CDATA[
+	$(function() {
+		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+		var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+		new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+	});
+	//]]>
+</script>
+<input type="{@$inputType}" id="{$option->optionName}" name="{$option->optionName}" value="{$i18nPlainValues[$option->optionName]}" />
diff --git a/wcfsetup/install/files/acp/templates/optionTypeText.tpl b/wcfsetup/install/files/acp/templates/textOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeText.tpl
rename to wcfsetup/install/files/acp/templates/textOptionType.tpl
diff --git a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
new file mode 100644
index 0000000000..ecc8981bc2
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+	//<![CDATA[
+	$(function() {
+		var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
+		var $optionValues = { {implode from=$i18nValues[$option->optionName] key=languageID item=value}'{@$languageID}': '{$value}'{/implode} };
+		new WCF.MultipleLanguageInput('{$option->optionName}', false, $optionValues, $availableLanguages);
+	});
+	//]]>
+</script>
+<textarea id="{$option->optionName}" name="{$option->optionName}" cols="40" rows="10">{$i18nPlainValues[$option->optionName]}</textarea>
diff --git a/wcfsetup/install/files/acp/templates/optionTypeTextarea.tpl b/wcfsetup/install/files/acp/templates/textareaOptionType.tpl
similarity index 100%
rename from wcfsetup/install/files/acp/templates/optionTypeTextarea.tpl
rename to wcfsetup/install/files/acp/templates/textareaOptionType.tpl
diff --git a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
index 39458dc3b9..a1b6fbf63c 100644
--- a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
@@ -28,7 +28,7 @@ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOpt
 			'option' => $option,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeBoolean');
+		return WCF::getTPL()->fetch('booleanOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
similarity index 91%
rename from wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
rename to wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index 329ff7b93b..af3f05efc8 100644
--- a/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -7,7 +7,7 @@ use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 
 /**
- * MultiselectOptionType is an implementation of IOptionType for multiple 'select' tags.
+ * MultiSelectOptionType is an implementation of IOptionType for multiple 'select' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -16,7 +16,7 @@ use wcf\util\ArrayUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class MultiselectOptionType extends SelectOptionType {
+class MultiSelectOptionType extends SelectOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
@@ -26,7 +26,7 @@ class MultiselectOptionType extends SelectOptionType {
 			'selectOptions' => $option->parseSelectOptions(),
 			'value' => explode("\n", $value)
 		));
-		return WCF::getTPL()->fetch('optionTypeMultiselect');
+		return WCF::getTPL()->fetch('multiSelectOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
similarity index 94%
rename from wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
rename to wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
index 5677daee47..675438f03f 100644
--- a/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
@@ -16,12 +16,12 @@ use wcf\util\StringUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class RadiobuttonsOptionType extends AbstractOptionType implements ISearchableUserOption {
+class RadioButtonOptionType extends AbstractOptionType implements ISearchableUserOption {
 	/**
 	 * name of the template that contains the form element of this option type
 	 * @var	string
 	 */
-	public $templateName = 'optionTypeRadiobuttons';
+	public $templateName = 'radioButtonOptionType';
 
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
diff --git a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
index 00229c4950..58e2b5bec1 100644
--- a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
@@ -28,7 +28,7 @@ class SelectOptionType extends RadiobuttonsOptionType {
 			'selectOptions' => $option->parseSelectOptions(),
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeSelect');
+		return WCF::getTPL()->fetch('selectOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
index 8b0392f175..dee53c4c8c 100644
--- a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
@@ -33,7 +33,7 @@ class TextI18nOptionType extends TextOptionType {
 			'inputType' => $this->inputType,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeTextI18n');
+		return WCF::getTPL()->fetch('textI18nOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index 38117881b2..05245fe0c0 100644
--- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -40,7 +40,7 @@ class TextOptionType extends AbstractOptionType implements ISearchableUserOption
 			'inputClass' => $this->inputClass,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeText');
+		return WCF::getTPL()->fetch('textOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
index 0678c37e63..50eb0a9abb 100644
--- a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
@@ -32,7 +32,7 @@ class TextareaI18nOptionType extends TextareaOptionType {
 			'option' => $option,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeTextareaI18n');
+		return WCF::getTPL()->fetch('textareaI18nOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
index 082b0f1854..83dce00058 100644
--- a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
@@ -22,6 +22,6 @@ class TextareaOptionType extends TextOptionType {
 			'option' => $option,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeTextarea');
+		return WCF::getTPL()->fetch('textareaOptionType');
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
index 52d973caf5..3885f09ee3 100644
--- a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
@@ -31,7 +31,7 @@ class TimezoneOptionType extends AbstractOptionType {
 			'selectOptions' => $timezoneOptions,
 			'value' => $value
 		));
-		return WCF::getTPL()->fetch('optionTypeSelect');
+		return WCF::getTPL()->fetch('selectOptionType');
 	}
 	
 	/**
-- 
2.20.1