Merge branch 'it18205152' into 'develop'

UI Updated - about-us,contact-us,sign-in,sign-up

See merge request !16

FE-InHome/contact-us_page.html

@@ -75,28 +75,27 @@
         <div class="row">
           <div class="col-lg-6">
             <h3 class="text-uppercase">Get In Touch</h3>
-            <p>The most happiest time of the day!. Suspendisse condimentum porttitor cursus. Duis nec nulla
-              turpis. Nulla lacinia laoreet odio, non lacinia nisl malesuada vel. Aenean malesuada
-              fermentum bibendum.</p>
-            <p>The most happiest time of the day!. Morbi sagittis, sem quis lacinia faucibus, orci ipsum
-              gravida tortor, vel interdum mi sapien ut justo. Nulla varius consequat magna, id molestie
-              ipsum volutpat quis. A true story, that never been told!. Fusce id mi diam, non ornare orci.
-              Pellentesque ipsum erat, facilisis ut venenatis eu, sodales vel dolor.</p>
+            <p>
+              Even if you're not afraid of speaking in public, practice helps you give a more effective speech. If you're in a rush, 
+              you may be tempted to skip practicing your speech to save time. While skipping practice may seem like a good idea, it's really not.
+            </p>
+            <p>Practicing your speech improves your public presentation skills. It also increases your familiarity with the presentation. As a result, your speech will go smoothly. 
+              This Website includes a handy checklist to help you practice your speech</p>
             <div class="row m-t-40">
               <div class="col-lg-6">
                 <address>
-                  <strong>Polo, Inc.</strong><br>
-                  795 Folsom Ave, Suite 600<br>
-                  San Francisco, CA 94107<br>
-                  <abbr title="Phone">P:</h4> (123) 456-7890
+                  <strong>SLIIT</strong><br>
+                 New Kandy Road<br>
+                  Malabe, Sri Lanka<br>
+                  <abbr title="Phone"></h4> (+94)11 456-7890
                 </address>
               </div>
               <div class="col-lg-6">
                 <address>
-                  <strong>Polo Office</strong><br>
-                  795 Folsom Ave, Suite 600<br>
-                  San Francisco, CA 94107<br>
-                  <abbr title="Phone">P:</h4> (123) 456-7890
+                  <strong>SLIIT Metro</strong><br>
+                  Galle Road<br>
+                  Colobo 2, Sri Lanka<br>
+                  <abbr title="Phone"></h4> (+94)11 856-7890
                 </address>
               </div>
             </div>

FE-InHome/sign-in_page.html

@@ -95,7 +95,7 @@
                       <div class="form-row">
                         <div class="form-group col-md-6">
                           <label for="username">Username</label>
-                          <input type="text" class="form-control" name="username" placeholder="Enter username" required>
+                          <input type="text" class="form-control" name="username" placeholder="Enter username" >
                         </div>
                       </div>
                       <div class="form-row">
@@ -103,7 +103,7 @@
                           <label for="password">Password</label>
                           <div class="input-group show-hide-password">
                             <input class="form-control" name="password" placeholder="Enter password" type="password"
-                              required>
+                              >
                             <div class="input-group-append">
                               <span class="input-group-text"><i class="icon-eye-off" aria-hidden="true"
                                   style="cursor: pointer;"></i></span>
@@ -111,7 +111,7 @@
                           </div>
                         </div>
                       </div>
-                      <button type="submit" class="btn m-t-30 mt-3">Login</button>
+                      <button type="submit" href="/home_page.html" class="btn m-t-30 mt-3">Login</button>
                     </form>
                   </div>
                 </div>

FE-InHome/sign-up_page.html

@@ -82,19 +82,18 @@
                   <div class="form-row">
                     <div class="form-group col-md-6">
                       <label for="username">Username</label>
-                      <input type="text" class="form-control" name="username" placeholder="Enter username" required>
+                      <input type="text" class="form-control" name="username" placeholder="Enter username" >
                     </div>
                     <div class="form-group col-md-6">
                       <label for="email">Email address</label>
-                      <input type="email" class="form-control" name="email" placeholder="Enter your email" required>
+                      <input type="email" class="form-control" name="email" placeholder="Enter your email" >
                     </div>
                   </div>
                   <div class="form-row">
                     <div class="form-group col-md-6">
                       <label for="password">Password</label>
                       <div class="input-group show-hide-password">
-                        <input class="form-control" name="password" placeholder="Enter password" type="password"
-                          required>
+                        <input class="form-control" name="password" placeholder="Enter password" type="password">
                         <div class="input-group-append">
                           <span class="input-group-text"><i class="icon-eye-off" aria-hidden="true"
                               style="cursor: pointer;"></i></span>
@@ -104,8 +103,7 @@
                     <div class="form-group col-md-6">
                       <label for="password2">Confirm Password</label>
                       <div class="input-group show-hide-password">
-                        <input class="form-control" name="password2" placeholder="Enter password" type="password"
-                          required>
+                        <input class="form-control" name="password2" placeholder="Enter password" type="password">
                         <div class="input-group-append">
                           <span class="input-group-text"><i class="icon-eye-off" aria-hidden="true"
                               style="cursor: pointer;"></i></span>
@@ -116,17 +114,17 @@
                   <div class="form-row">
                     <div class="form-group col-md-6">
                       <label for="name">Name</label>
-                      <input type="text" class="form-control" name="name" placeholder="Enter your Name" required>
+                      <input type="text" class="form-control" name="name" placeholder="Enter your Name" >
                     </div>
                     <div class="form-group col-md-6">
                       <label for="surname">Surname</label>
-                      <input type="text" class="form-control" name="surname" placeholder="Enter your Surname" required>
+                      <input type="text" class="form-control" name="surname" placeholder="Enter your Surname" >
                     </div>
                   </div>
                   <div class="form-row">
                     <div class="form-group col-md-6">
                       <label for="gender">Gender</label>
-                      <select class="form-control" name="gender" required>
+                      <select class="form-control" name="gender" >
                         <option value="">Select your gender</option>
                         <option>Female</option>
                         <option>Male</option>
@@ -135,20 +133,18 @@
                     </div>
                     <div class="form-group col-md-6">
                       <label for="gender">Date of Birth</label>
-                      <input class="form-control" type="date" name="dateofbirth" required>
+                      <input class="form-control" type="date" name="dateofbirth" >
                     </div>
                   </div>
                   <div class="form-row">
                     <div class="form-group col-md-6">
                       <label for="telephone">Telephone</label>
-                      <input class="form-control" type="tel" name="telephone" placeholder="Enter your Telephone number"
-                        required>
+                      <input class="form-control" type="tel" name="telephone" placeholder="Enter your Telephone number">
                     </div>
                   </div>
                   <div class="form-group mb-1 mt-5">
                     <div class="custom-control custom-checkbox">
-                      <input type="checkbox" name="reminders" id="reminders" class="custom-control-input" value="1"
-                        required>
+                      <input type="checkbox" name="reminders" id="reminders" class="custom-control-input" value="1">
                       <label class="custom-control-label" for="reminders">Send me occasional
                         reminders
                         about these settings</a></label>
@@ -157,14 +153,14 @@
                   <div class="form-group">
                     <div class="custom-control custom-checkbox">
                       <input type="checkbox" name="terms_conditions" id="terms_conditions" class="custom-control-input"
-                        value="1" required>
+                        value="1">
                       <label class="custom-control-label" for="terms_conditions">By checking
                         this
                         option, you agree to acceot with the <a href="#">Terms and
                           Conditions</a>.</label>
                     </div>
                   </div>
-                  <button type="submit" class="btn m-t-30 mt-3">Submit</button>
+                  <button type="submit" href= "/sign-in_page.html" class="btn m-t-30 mt-3">Submit</button>
                 </form>
               </div>
             </div>