Made yes/no switch configurable

misago/core/forms.py

@@ -24,7 +24,7 @@ class YesNoSwitchBase(TypedChoiceField):
 
 def YesNoSwitch(**kwargs):
     yes_label = kwargs.pop('yes_label', _("Yes"))
-    no_label = kwargs.pop('yes_label', _("No"))
+    no_label = kwargs.pop('no_label', _("No"))
 
     return YesNoSwitchBase(
         coerce=int,

misago/static/misago/admin/css/misago/yesnoswitch.less

@@ -14,6 +14,7 @@
 // Real input
 .yes-no-switch {
   margin-top: 5px;
+  margin-bottom: 0px;
 
   cursor: pointer;
 

misago/static/misago/admin/js/misago-yesnoswitch.js

@@ -5,7 +5,7 @@ function enableYesNoSwitch(selector) {
     var value = $control.find("input:checked").val() * 1;
 
     // hide original switch options
-    $control.children().addClass('hidden-original-switch');
+    $control.find('label').addClass('hidden-original-switch');
 
     var yes_label = $.trim($control.find('label').first().text());
     var no_label = $.trim($control.find('label').last().text());
@@ -18,7 +18,7 @@ function enableYesNoSwitch(selector) {
     var $icon = $('<span class="' + toggle_off + '"></span>');
     var $label = $('<strong class="yes-no-label"></strong>');
 
-    $control.append($new_switch);
+    $control.prepend($new_switch);
     $new_switch.append($icon);
     $new_switch.append($label);
 

misago/static/misago/css/misago/yesnoswitch.less

@@ -14,6 +14,7 @@
 // Real input
 .yes-no-switch {
   margin-top: 5px;
+  margin-bottom: 0px;
 
   cursor: pointer;
 

misago/static/misago/js/misago-yesnoswitch.js

@@ -5,7 +5,7 @@ function enableYesNoSwitch(selector) {
     var value = $control.find("input:checked").val() * 1;
 
     // hide original switch options
-    $control.children().addClass('hidden-original-switch');
+    $control.find('label').addClass('hidden-original-switch');
 
     var yes_label = $.trim($control.find('label').first().text());
     var no_label = $.trim($control.find('label').last().text());
@@ -18,7 +18,7 @@ function enableYesNoSwitch(selector) {
     var $icon = $('<span class="' + toggle_off + '"></span>');
     var $label = $('<strong class="yes-no-label"></strong>');
 
-    $control.append($new_switch);
+    $control.prepend($new_switch);
     $new_switch.append($icon);
     $new_switch.append($label);