fix #523: cleaned up form rows

misago/emberapp/app/templates/components/form-row.hbs

@@ -1,5 +1,5 @@
-<label for="{{for}}" class="{{label-class}} control-label">{{label}}</label>
-<div class="{{control-class}}">
+<label for="{{for}}" class="{{labelClass}} control-label">{{label}}</label>
+<div class="{{controlClass}}">
   {{yield}}
 
   {{#if hasFeedback}}
@@ -14,7 +14,7 @@
     </div>
   {{/if}}
 
-  {{#if help_text}}
-    <p class="help-block">{{help_text}}</p>
+  {{#if helpText}}
+    <p class="help-block">{{helpText}}</p>
   {{/if}}
 </div>

misago/emberapp/app/templates/components/forms/change-username-form.hbs

@@ -8,10 +8,10 @@
 
       {{#form-row
           label=(gettext "New username:")
-          help_text=changesLeftMessage
+          helpText=changesLeftMessage
           for="id_username"
-          label-class="col-md-4"
-          control-class="col-md-8"
+          labelClass="col-md-4"
+          controlClass="col-md-8"
           validation=validation.username}}
 
         {{input id="id_username" type="text" class="form-control" autocomplete="off" value=username}}

misago/emberapp/app/templates/components/forms/forum-options-form.hbs

@@ -8,22 +8,22 @@
       <legend>{{gettext "Privacy settings"}}</legend>
 
       {{#form-row
-        label=(gettext "Hide my presence:")
-        help_text=(gettext "If you hide your presence, only members with permission to see hidden users will see when you are online.")
-        for="id_is_hiding_presence"
-        label-class="col-md-5"
-        control-class="col-md-7"
-        validation=validation.is_hiding_presence}}
+          label=(gettext "Hide my presence:")
+          helpText=(gettext "If you hide your presence, only members with permission to see hidden users will see when you are online.")
+          for="id_is_hiding_presence"
+          labelClass="col-md-5"
+          controlClass="col-md-7"
+          validation=validation.is_hiding_presence}}
 
         {{yes-no-switch id="id_is_hiding_presence" value=is_hiding_presence}}
       {{/form-row}}
 
       {{#form-row
-        label=(gettext "Private thread invitations:")
-        for="id_limits_private_thread_invites_to"
-        label-class="col-md-5"
-        control-class="col-md-7"
-        validation=validation.limits_private_thread_invites_to}}
+          label=(gettext "Private thread invitations:")
+          for="id_limits_private_thread_invites_to"
+          labelClass="col-md-5"
+          controlClass="col-md-7"
+          validation=validation.limits_private_thread_invites_to}}
 
         {{view "select"
           id="id_limits_private_thread_invites_to"
@@ -39,11 +39,11 @@
       <legend>{{gettext "Automatic subscriptions"}}</legend>
 
       {{#form-row
-        label=(gettext "Threads I start:")
-        for="id_subscribe_to_started_threads"
-        label-class="col-md-5"
-        control-class="col-md-7"
-        validation=validation.subscribe_to_started_threads}}
+          label=(gettext "Threads I start:")
+          for="id_subscribe_to_started_threads"
+          labelClass="col-md-5"
+          controlClass="col-md-7"
+          validation=validation.subscribe_to_started_threads}}
 
         {{view "select"
           id="id_subscribe_to_started_threads"
@@ -55,11 +55,11 @@
       {{/form-row}}
 
       {{#form-row
-        label=(gettext "Threads I reply to:")
-        for="id_subscribe_to_replied_threads"
-        label-class="col-md-5"
-        control-class="col-md-7"
-        validation=validation.subscribe_to_replied_threads}}
+          label=(gettext "Threads I reply to:")
+          for="id_subscribe_to_replied_threads"
+          labelClass="col-md-5"
+          controlClass="col-md-7"
+          validation=validation.subscribe_to_replied_threads}}
 
         {{view "select"
           id="id_subscribe_to_replied_threads"

misago/emberapp/app/templates/components/forms/register-form.hbs

@@ -1,15 +1,34 @@
 {{#if isLoaded}}
 <div class="modal-body">
 
-  {{#form-row label=(gettext "Username:") for="id_username" label-class="col-md-4" control-class="col-md-8" validation=validation.username}}
+  {{#form-row
+      label=(gettext "Username:")
+      for="id_username"
+      labelClass="col-md-4"
+      controlClass="col-md-8"
+      validation=validation.username}}
+
     {{input id="id_username" type="text" class="form-control" autocomplete="off" value=username}}
   {{/form-row}}
 
-  {{#form-row label=(gettext "E-mail:") for="id_email" label-class="col-md-4" control-class="col-md-8" validation=validation.email}}
+  {{#form-row
+      label=(gettext "E-mail:")
+      for="id_email"
+      labelClass="col-md-4"
+      controlClass="col-md-8"
+      validation=validation.email}}
+
     {{input id="id_email" type="text" class="form-control" autocomplete="off" value=email}}
   {{/form-row}}
 
-  {{#form-row label=(gettext "Password:") help_text=passwordHelpText for="id_password" label-class="col-md-4" control-class="col-md-8" validation=validation.password}}
+  {{#form-row
+      label=(gettext "Password:")
+      helpText=passwordHelpText
+      for="id_password"
+      labelClass="col-md-4"
+      controlClass="col-md-8"
+      validation=validation.password}}
+
     {{input id="id_password" type="password" class="form-control" autocomplete="off" value=password}}
 
     {{#if passwordHelpText}}
@@ -27,7 +46,7 @@
         {{gettext "Anti-spam test completed."}}
       </p>
     {{else}}
-      {{component captcha.field validation=validation.captcha label-class="col-md-4" control-class="col-md-8"}}
+      {{component captcha.field validation=validation.captcha labelClass="col-md-4" controlClass="col-md-8"}}
     {{/if}}
   {{/if}}
 

misago/emberapp/app/templates/components/qacaptcha-field.hbs

@@ -1,5 +1,5 @@
-<label for="captcha-question" class="{{label-class}} control-label">{{model.question}}</label>
-<div class="{{control-class}}">
+<label for="captcha-question" class="{{labelClass}} control-label">{{model.question}}</label>
+<div class="{{controlClass}}">
   {{input id="captcha-question" type="text" class="form-control" value=value}}
 
   {{#if hasFeedback}}