Fixed Minor Issues and formatting

Author: actuallyakash

language/en-GB/en-GB.mod_jdsimplecontactform.ini

@@ -48,7 +48,7 @@ MOD_JDSCF_SHOW_LABEL_DESC="Select to display the label before the field."
 MOD_JDSCF_OPTIONS_LAYOUT_LBL="Options Layout"
 MOD_JDSCF_OPTIONS_LAYOUT_DESC="Select to display checkboxes and radios in vertically or stacked layout."
 
-MOD_JDSCF_FORM_SUBMIT_LBL="Submit button text"
+MOD_JDSCF_FORM_SUBMIT_LBL="Submit Button Text"
 MOD_JDSCF_FORM_SUBMIT_DESC="Enter to change text for the submit button. Default is <b>Submit</b>."
 MOD_JDSCF_FORM_SUBMIT_DEFAULT="Submit"
 
@@ -158,7 +158,7 @@ MOD_JDSCF_THANKYOU_MESSAGE_DESC="Enter a Thank you message to be displayed after
 MOD_JDSCF_REDIRECT_LBL="Redirect URL"
 MOD_JDSCF_REDIRECT_DESC="Enter a URL to redirect users after submission. Leave blank to if not required. (<b>You can use {field:label} & {field:value} to render dynamic values in this field</b>)"
 
-MOD_JDSCF_SUBMITBTN_CLASS_LBL="Submit button class"
+MOD_JDSCF_SUBMITBTN_CLASS_LBL="Submit Button Class"
 MOD_JDSCF_SUBMITBTN_CLASS_DESC=""
 
 MOD_JDSCF_UNSUPPORTED_FILE_ERROR="Unsupported Filetype"

layouts/fields/singlecc.php

@@ -11,4 +11,7 @@
 $singleCCName = $params->get('singleSendCopyEmail_field', '');
 $singleCCTitle = $params->get('singleSendCopyEmailField_title', 'MOD_JDSCF_SINGLE_SEND_COPY_LBL_TITLE');
 ?>
-<label><input type="checkbox" name="jdscf[<?php echo $singleCCName; ?>][single_cc]" value="1" /> <?php echo JText::_($singleCCTitle); ?></label>
+<div class="form-group form-check">
+    <label class="form-check-label"><input type="checkbox" name="jdscf[<?php echo $singleCCName; ?>][single_cc]" value="1" /> 
+</div>
+<?php echo JText::_($singleCCTitle); ?></label>

layouts/fields/submit.php

@@ -13,5 +13,5 @@
 $buttonWidth = $params->get('submit_btn_width', '12');
 ?>
 <div class="jdscf-col-md-<?php echo $buttonWidth ?>">
-   <button type="submit" class="form-control btn<?php echo!empty($buttonClass) ? ' ' . $buttonClass : ''; ?>  btn-block"><?php echo JText::_($buttonText); ?></button>
+   <button type="submit" class="form-control btn<?php echo!empty($buttonClass) ? ' ' . $buttonClass : ''; ?> btn-block"><?php echo JText::_($buttonText); ?></button>
 </div>

mod_jdsimplecontactform.xml

@@ -79,22 +79,6 @@
                description="MOD_JDSCF_SUBMITBTN_CLASS_DESC"
                default="btn-primary"
             />
-            <field
-               name="thankyou_message"
-               type="editor"
-               label="MOD_JDSCF_THANKYOU_MESSAGE_LBL"
-               description="MOD_JDSCF_THANKYOU_MESSAGE_DESC"
-               filter="safehtml"
-            />
-            <field
-               name="redirect_url"
-               type="url"
-               label="MOD_JDSCF_REDIRECT_LBL"
-               description="MOD_JDSCF_REDIRECT_DESC"
-            />
-         </fieldset>
-         <fieldset name="fields" label="MOD_JDSCF_FORM_FIELDS_OPTIONS_LBL">
-            <field name="fields" type="subform" formsource="modules/mod_jdsimplecontactform/forms/fielditem.xml" multiple="true" label="MOD_JDSCF_FIELDS_LBL" />
             <field
                name="submit_btn_width"
                type="list"
@@ -112,6 +96,22 @@
                <option value="3">3</option>
                <option value="2">2</option>
             </field>
+            <field
+               name="thankyou_message"
+               type="editor"
+               label="MOD_JDSCF_THANKYOU_MESSAGE_LBL"
+               description="MOD_JDSCF_THANKYOU_MESSAGE_DESC"
+               filter="safehtml"
+            />
+            <field
+               name="redirect_url"
+               type="url"
+               label="MOD_JDSCF_REDIRECT_LBL"
+               description="MOD_JDSCF_REDIRECT_DESC"
+            />
+         </fieldset>
+         <fieldset name="fields" label="MOD_JDSCF_FORM_FIELDS_OPTIONS_LBL">
+            <field name="fields" type="subform" formsource="modules/mod_jdsimplecontactform/forms/fielditem.xml" multiple="true" label="MOD_JDSCF_FIELDS_LBL" />
          </fieldset>
          <fieldset name="email" label="MOD_JDSCF_EMAIL_OPTIONS_LBL">
             <field

tmpl/default.php

@@ -65,15 +65,13 @@
                   }
                }               
             ?>
-
-            <div class="form-group">
-               <?php
-                  if($single_cc_enable) {
-                     $singleCC = new JLayoutFile('fields.singlecc', JPATH_SITE . '/modules/mod_jdsimplecontactform/layouts');
-                     echo $singleCC->render(['params' => $params]);
-                  } 
-               ?>
-            </div>
+            
+            <?php
+               if($single_cc_enable) {
+                  $singleCC = new JLayoutFile('fields.singlecc', JPATH_SITE . '/modules/mod_jdsimplecontactform/layouts');
+                  echo $singleCC->render(['params' => $params]);
+               } 
+            ?>
 
             <?php
                $submit = new JLayoutFile('fields.submit', JPATH_SITE . '/modules/mod_jdsimplecontactform/layouts');