Merge branch 'feature-theme' into 'develop'

add new field in contact us

See merge request manzarH/dic-global-dev!152

themes/custom/envigo/envigo.theme

@@ -20,44 +20,3 @@ function envigo_preprocess_html(&$variables) {
   }
 }
 
-function envigo_form_contact_message_feedback_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-
-  // Name
-  $form['name']['#prefix'] = '<div class="row"><div class="col-md-6"><div class="form-group">';
-  $form['name']['#suffix'] = '</div>';
-  $form['name']['#attributes']['placeholder'][] = $form['name']['#title'].'*';
-  $form['name']['#attributes']['class'][] = 'form-control';
-  unset($form['name']['#title']);
-
-  // Mail
-  $form['mail']['#prefix'] = '<div class="form-group">';
-  $form['mail']['#suffix'] = '</div>';
-  $form['mail']['#attributes']['placeholder'][] = $form['mail']['#title'].'*';
-  $form['mail']['#attributes']['class'][] = 'form-control';
-  unset($form['mail']['#title']);
-
-
-  // Subject
-  $form['subject']['widget'][0]['value']['#attributes']['class'][] = 'form-control';
-  $form['subject']['widget'][0]['value']['#attributes']['placeholder'][] = $form['subject']['widget'][0]['#title'].'*';
-  $form['subject']['widget'][0]['#title'] = '';
-  unset($form['subject']['widget'][0]['value']['#title']);
-  $form['subject']['widget'][0]['#prefix'] = '<div class="form-group">';
-  $form['subject']['widget'][0]['#suffix'] = '</div></div>';
-
-  // Message
-  $form['message']['widget'][0]['value']['#attributes']['class'][] = 'form-control';
-  $form['message']['widget'][0]['value']['#attributes']['placeholder'][] = $form['message']['widget'][0]['#title'].'*';
-  $form['message']['widget'][0]['#title'] = '';
-  unset($form['message']['widget'][0]['value']['#title']);
-  $form['message']['widget'][0]['#prefix'] = '<div class="col-md-6"><div class="form-group">';
-  $form['message']['widget'][0]['#suffix'] = '</div></div></div>';
-
-  // Submit
-  $form['actions']['#prefix'] = '<div class="clearfix">';
-  $form['actions']['#suffix'] = '</div>';
-  $form['actions']['submit']['#attributes']['class'][] = 'btn';
-  $form['actions']['submit']['#attributes']['class'][] = 'btn-success';
-  $form['actions']['submit']['#attributes']['class'][] = 'pull-right';
-
-}
\ No newline at end of file

themes/custom/envigo/templates/webform/webform--contact.html.twig

@@ -32,7 +32,48 @@
                     <div class="col">
                     {{ element.elements.name }}
                     </div>
-                   </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.last_name }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.email }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.mobile_no }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.subject }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.postcode }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.country }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.state }}
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="col">
+                    {{ element.elements.message }}
+                    </div>
+                  </div>
+
 				  {{ children }}
 				  {{ title_suffix }}
 				</form>