projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d68db96)
Using new boolean type for options, unified phrase
authorAlexander Ebert <ebert@woltlab.com>
Thu, 18 Jun 2015 12:53:14 +0000 (14:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 18 Jun 2015 12:53:14 +0000 (14:53 +0200)
wcfsetup/install/files/acp/templates/booleanOptionType.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl patch | blob | blame | history
wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php patch | blob | blame | history
wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php patch | blob | blame | history
wcfsetup/install/lang/de.xml patch | blob | blame | history
wcfsetup/install/lang/en.xml patch | blob | blame | history

diff --git a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
index 532f54a5c4512d4ad50497bac6f592adeaa12e2a..22338b3f9a1212d8678277e9859d0d1e7fdeab63 100644 (file)
--- a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
@@ -1 +1,10 @@
-<input type="checkbox" id="{$option->optionName}" {if $value} checked="checked"{/if} name="values[{$option->optionName}]" value="1" {if $disableOptions || $enableOptions}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]" {/if} />
+<ol class="optionTypeBoolean">
+       <li>
+               <input type="radio" id="{$option->optionName}_yes"{if $value == 1} checked="checked"{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+               <label for="{$option->optionName}_yes" class="yes"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+       </li>
+       <li>
+               <input type="radio" id="{$option->optionName}_no"{if $value == 0} checked="checked"{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+               <label for="{$option->optionName}_no" class="no"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+       </li>
+</ol>
diff --git a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
index 9d2cd5094c25c984930e60364d272c83b8bfe6e8..91583a7f462936465f6b31c23817c41bbe81e2bb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
@@ -1,16 +1,16 @@
 <ol class="optionTypeBoolean">
        <li>
                <input type="radio" id="{$option->optionName}_yes"{if $value == 1} checked="checked"{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-               <label for="{$option->optionName}_yes" class="yes"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.group.option.type.boolean.yes{/lang}</label>
+               <label for="{$option->optionName}_yes" class="yes"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
        </li>
        <li>
                <input type="radio" id="{$option->optionName}_no"{if $value == 0} checked="checked"{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-               <label for="{$option->optionName}_no" class="no"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.group.option.type.boolean.no{/lang}</label>
+               <label for="{$option->optionName}_no" class="no"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
        </li>
        {if $group === null || !$group->isEveryone()}
                <li>
                        <input type="radio" id="{$option->optionName}_never"{if $value == -1} checked="checked"{/if} name="values[{$option->optionName}]" value="-1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-                       <label for="{$option->optionName}_never" class="never"><span class="icon icon16 fa-ban"></span> {lang}wcf.acp.group.option.type.boolean.never{/lang}</label>
+                       <label for="{$option->optionName}_never" class="never"><span class="icon icon16 fa-ban"></span> {lang}wcf.acp.option.type.boolean.never{/lang}</label>
                </li>
        {/if}
 </ol>
diff --git a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
index 851b67aec91d238b8eb7b409f09fade372b284ad..923406c004676afe2f490b9910a659890549e2f7 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
@@ -36,17 +36,10 @@ class BooleanOptionType extends AbstractOptionType implements ISearchableUserOpt
         * @see \wcf\system\option\IOptionType::getData()
         */
        public function getData(Option $option, $newValue) {
-               if ($newValue !== null) return 1;
+               if ($newValue == 1) return 1;
                return 0;
        }
        
-       /**
-        * @see \wcf\system\option\IOptionType::getCSSClassName()
-        */
-       public function getCSSClassName() {
-               return 'reversed';
-       }
-       
        /**
         * @see \wcf\system\option\ISearchableUserOption::getSearchFormElement()
         */
diff --git a/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php
index 99b647baaa03ef0f845ef285626809decd8b1fc7..ecc60d485a31a6ba685e90943836eb436333c685 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/group/BooleanUserGroupOptionType.class.php
@@ -40,15 +40,7 @@ class BooleanUserGroupOptionType extends BooleanOptionType implements IUserGroup
         * @see \wcf\system\option\IOptionType::getData()
         */
        public function getData(Option $option, $newValue) {
-               if ($newValue == -1 || $newValue == 1) return $newValue;
-               return 0;
-       }
-       
-       /**
-        * @see \wcf\system\option\IOptionType::getCSSClassName()
-        */
-       public function getCSSClassName() {
-               return '';
+               return ($newValue == -1) ? -1 : parent::getData($option, $newValue);
        }
        
        /**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c838057ba90d15d3f92da60144e825ebf95ae833..246ec3c73939ca822d925512e4e02d9a1221b59b 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -440,9 +440,6 @@
                <item name="wcf.acp.group.copy.copyUserGroupOptions.description"><![CDATA[Die neue Benutzergruppe wird die gleichen Berechtigungen besitzen wie die kopierte Benutzergruppe.]]></item>
                <item name="wcf.acp.group.option.admin.paidSubscription.canManageSubscription"><![CDATA[Kann bezahlte Mitgliedschaften verwalten]]></item>
                <item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Kann Tag sehen]]></item>
-               <item name="wcf.acp.group.option.type.boolean.never"><![CDATA[Nie]]></item>
-               <item name="wcf.acp.group.option.type.boolean.no"><![CDATA[Nein]]></item>
-               <item name="wcf.acp.group.option.type.boolean.yes"><![CDATA[Ja]]></item>
        </category>
        
        <category name="wcf.acp.index">
@@ -1080,6 +1077,9 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixel]]></item>
                <item name="wcf.acp.option.suffix.seconds"><![CDATA[Sekunden]]></item>
                <item name="wcf.acp.option.suffix.years"><![CDATA[Jahre]]></item>
+               <item name="wcf.acp.option.type.boolean.never"><![CDATA[Nie]]></item>
+               <item name="wcf.acp.option.type.boolean.no"><![CDATA[Nein]]></item>
+               <item name="wcf.acp.option.type.boolean.yes"><![CDATA[Ja]]></item>
        </category>
        
        <category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9067773a9597d849f175ee36ad56ec493d9e9f97..e4c900f41f76250e2b52eee876abc1afe49cc94a 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -439,9 +439,6 @@ Examples for medium ID detection:
                <item name="wcf.acp.group.copy.copyUserGroupOptions.description"><![CDATA[The new user group will have the same permissions as the copied user group.]]></item>
                <item name="wcf.acp.group.option.admin.paidSubscription.canManageSubscription"><![CDATA[Can manage paid subscriptions]]></item>
                <item name="wcf.acp.group.option.user.tag.canViewTag"><![CDATA[Can view tags]]></item>
-               <item name="wcf.acp.group.option.type.boolean.never"><![CDATA[Never]]></item>
-               <item name="wcf.acp.group.option.type.boolean.no"><![CDATA[No]]></item>
-               <item name="wcf.acp.group.option.type.boolean.yes"><![CDATA[Yes]]></item>
        </category>
        
        <category name="wcf.acp.index">
@@ -1079,6 +1076,9 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixel]]></item>
                <item name="wcf.acp.option.suffix.seconds"><![CDATA[Seconds]]></item>
                <item name="wcf.acp.option.suffix.years"><![CDATA[Years]]></item>
+               <item name="wcf.acp.option.type.boolean.never"><![CDATA[Never]]></item>
+               <item name="wcf.acp.option.type.boolean.no"><![CDATA[No]]></item>
+               <item name="wcf.acp.option.type.boolean.yes"><![CDATA[Yes]]></item>
        </category>
        
        <category name="wcf.acp.package">
WoltLab Suite Core (previously WoltLab Community Framework)