Fix rendering issues

Author: akatsoulas

kitsune/wiki/forms.py

@@ -98,10 +98,10 @@ class DocumentForm(forms.ModelForm):
     )
 
     is_localizable = forms.BooleanField(
-        initial=True, label=_lazy("Allow translations:"), required=False
+        initial=True, label=_lazy("Allow translations"), required=False
     )
 
-    is_archived = forms.BooleanField(label=_lazy("Obsolete:"), required=False)
+    is_archived = forms.BooleanField(label=_lazy("Obsolete"), required=False)
 
     restrict_to_groups = forms.ModelMultipleChoiceField(
         required=False,
@@ -111,15 +111,15 @@ class DocumentForm(forms.ModelForm):
     )
 
     allow_discussion = forms.BooleanField(
-        label=_lazy("Allow discussion on this article?"), initial=True, required=False
+        label=_lazy("Allow discussion on this article"), initial=True, required=False
     )
 
     category = forms.ChoiceField(
         choices=CATEGORIES,
         # Required for non-translations, which is
         # enforced in Document.clean().
         required=False,
-        label=_lazy("Category:"),
+        label=_lazy("Category"),
         help_text=_lazy("Type of article"),
     )
 
@@ -136,15 +136,15 @@ class DocumentForm(forms.ModelForm):
     )
 
     related_documents = forms.MultipleChoiceField(
-        label=_lazy("Related documents:"), required=False, widget=RelatedDocumentsWidget()
+        label=_lazy("Related documents"), required=False, widget=RelatedDocumentsWidget()
     )
 
     locale = forms.CharField(widget=forms.HiddenInput())
 
-    needs_change = forms.BooleanField(label=_lazy("Needs change:"), initial=False, required=False)
+    needs_change = forms.BooleanField(label=_lazy("Needs change"), initial=False, required=False)
 
     needs_change_comment = forms.CharField(
-        label=_lazy("Comment:"), widget=forms.Textarea(), required=False
+        label=_lazy("Comment"), widget=forms.Textarea(), required=False
     )
 
     def clean_slug(self):
@@ -211,16 +211,16 @@ class Meta:
         fields = (
             "title",
             "slug",
+            "related_documents",
             "category",
-            "is_localizable",
             "products",
             "topics",
             "locale",
             "is_archived",
             "allow_discussion",
             "needs_change",
             "needs_change_comment",
-            "related_documents",
+            "is_localizable",
             "restrict_to_groups",
         )
 

kitsune/wiki/jinja2/wiki/edit_metadata.html

@@ -45,22 +45,23 @@ <h1 class="sumo-page-heading">{{ _('<em>Editing Metadata For:</em><br>{title}')|
                 </fieldset>
               </div>
             {% endif %}
-              {% for field in document_form.visible_fields() if
-                (field.name != 'restrict_to_groups') and (field.name != 'is_localizable' or not document.translations.exists()) %}
-                <div class="field has-large-textarea">
-                  {{ field|label_with_help }}
-                  {% if field.name in ['products', 'topics'] %}
-                    <span id="relevant-{{ field.name }}-disabled-message" hidden>{{ _("Disabled " + field.name + " are not available given the selections") }}</span>
-                    <img id="relevant-{{ field.name }}-selected-checkmark" class="relevant-{{ field.name }}-selected" src="{{ webpack_static('sumo/img/green-checkmark.svg') }}" alt="checkmark" hidden/>
-                    <span id="relevant-{{ field.name }}-selected-message" class="relevant-{{ field.name }}-selected" hidden></span>
-                    <a href="#" id="relevant-{{ field.name }}-clear-selected" class="relevant-{{ field.name }}-selected" hidden>{{ _("Clear") }}</a>
+              {% for field in document_form.visible_fields() if field.name != 'restrict_to_groups' %}
+                <div class="field {% if field.field.widget.input_type == 'checkbox' %}checkbox{% else %}has-large-textarea{% endif %}">
+                  {% if field.field.widget.input_type == 'checkbox' %}
+                    {{ field }}
+                    <label for="{{ field.auto_id }}" title="{{ field.help_text }}">{{ field.label }}</label>
+                  {% else %}
+                    {{ field|label_with_help }}
+                    {% if field.name in ['products', 'topics'] %}
+                      <span id="relevant-{{ field.name }}-disabled-message" hidden>{{ _("Disabled " + field.name + " are not available given the selections") }}</span>
+                      <img id="relevant-{{ field.name }}-selected-checkmark" class="relevant-{{ field.name }}-selected" src="{{ webpack_static('sumo/img/green-checkmark.svg') }}" alt="checkmark" hidden/>
+                      <span id="relevant-{{ field.name }}-selected-message" class="relevant-{{ field.name }}-selected" hidden></span>
+                      <a href="#" id="relevant-{{ field.name }}-clear-selected" class="relevant-{{ field.name }}-selected" hidden>{{ _("Clear") }}</a>
+                    {% endif %}
+                    {{ field }}
                   {% endif %}
-                  {{ field }}
                 </div>
               {% endfor %}
-            {% if document.translations.exists() %}
-              {{ document_form.is_localizable.as_hidden()|safe }}
-            {% endif %}
             <input type="hidden" name="form" value="doc" />
             <div class="submit sumo-button-wrap align-end">
               <button class="sumo-button primary-button" type="submit">{{ _('Save') }}</button>