Merge branch 'master' of https://github.uconn.edu/shs12010/twitter-clone

shs12010 · Dec 3, 2017 · 54bade5 · 54bade5
2 parents 6fa68d4 + 8d045ad
commit 54bade5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/www/application/config/autoload.php b/www/application/config/autoload.php
@@ -58,7 +58,7 @@
 |
 |	$autoload['libraries'] = array('user_agent' => 'ua');
 */
-$autoload['libraries'] = array('database');
+$autoload['libraries'] = array();
 
 /*
 | -------------------------------------------------------------------

diff --git a/www/application/views/login.php b/www/application/views/login.php
@@ -3,15 +3,22 @@
   echo validation_errors();
   echo form_open('login'); ?>
 
-  <h5>Username</h5>
-  <input type="text" name="username" value="<?php echo set_value('username'); ?>" size="50" />
-  <?php echo form_error('username'); ?>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-2 col-md-offset-5">
+        <h1>Twitter</h1>
+        <img src="../img/twitter.png" alt="Twitter icon.">
+        <h5>Username</h5>
+        <input type="text" name="username" value="<?php echo set_value('username'); ?>" size="50" />
+        <?php echo form_error('username'); ?>
 
-  <h5>Password</h5>
-  <input type="password" name="password" value="<?php echo set_value('password'); ?>" size="50" />
-  <?php echo form_error('password'); ?>
+        <h5>Password</h5>
+        <input type="password" name="password" value="<?php echo set_value('password'); ?>" size="50" />
+        <?php echo form_error('password'); ?>
 
-  <br><br>
-  <div><input type="submit" value="Submit"/></div>
-
-  </form>
+        <br><br>
+        <div><input class="btn" type="submit" value="Submit"/></div>
+        </form>
+      </div>
+    </div>
+  </div>
diff --git a/www/application/views/templates/footer.php b/www/application/views/templates/footer.php
@@ -1,5 +1,5 @@
         <em>&copy; 2017</em>
-        <script type="text/javascript" src="assets/js/bootstrap.js"></script>
-        <script type="text/javascript" src="assets/js/jQuery-1.10.2.js"></script>
+        <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
       </body>
 </html>
diff --git a/www/application/views/templates/header.php b/www/application/views/templates/header.php
@@ -1,7 +1,7 @@
 <html>
         <head>
                 <title>Twitter</title>
-                <link rel="stylesheet" href="assets/css/bootstrap.css"/>
+                <link type="text/css" rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
         </head>
         <body>
 

diff --git a/www/img/twitter.png b/www/img/twitter.png