From 677ed0f569eb606c4372da37c17d193e0517eed0 Mon Sep 17 00:00:00 2001
From: Chris <christopher.stumper@uconn.edu>
Date: Tue, 5 Dec 2017 14:57:56 -0500
Subject: [PATCH] fixed error report location

---
 www/application/config/config.php          |  2 +-
 www/application/views/home.php             |  4 +---
 www/application/views/login.php            |  3 +--
 www/application/views/register.php         |  1 -
 www/application/views/templates/footer.php |  2 ++
 www/application/views/user.php             | 15 ++++++---------
 www/css/styles.css                         |  3 +--
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/www/application/config/config.php b/www/application/config/config.php
index 24bf583..06b5638 100755
--- a/www/application/config/config.php
+++ b/www/application/config/config.php
@@ -23,7 +23,7 @@
 | a PHP script and you can easily do that on your own.
 |
 */
-$config['base_url'] = 'http://twitter-clone.lndo.site/';
+$config['base_url'] = 'http://' . $_SERVER['HTTP_HOST'] . '/';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/www/application/views/home.php b/www/application/views/home.php
index e3eafcf..6fef44d 100644
--- a/www/application/views/home.php
+++ b/www/application/views/home.php
@@ -13,9 +13,7 @@
 	<h1>All Tweets</h1>
 
 	<?php $this->load->library('form_validation'); ?>
-	<?php echo validation_errors();  ?>
-	<?php //echo form_open('all_tweets/search_keyword'); ?>
-	<form class="form" action="all_tweets/search_keyword" method="post">
+	<form class="form" action="/index.php/all_tweets/search_keyword" method="post">
 		<div class="form-group">
 			<input type="text" name="keyword" class="form-control" placeholder="What would you like to find?">
 		</div>
diff --git a/www/application/views/login.php b/www/application/views/login.php
index a7fb579..da6ddee 100644
--- a/www/application/views/login.php
+++ b/www/application/views/login.php
@@ -1,6 +1,5 @@
 <?php
   $this->load->library('form_validation');
-  echo validation_errors();
   echo form_open('login');
   ?>
   <div class="login container">
@@ -15,7 +14,7 @@
         <input class="form-control" type="password" name="password" value="<?php echo set_value('password'); ?>" placeholder="Enter password"/>
         <?php echo form_error('password'); ?>
     </div>
-    <button type="submit" class="btn btn-primary">Submit</button><span> or <a href="register">Create an account</a></span>
+    <button type="submit" class="btn btn-primary">Login</button><span> or <a href="register">Create an account</a></span>
 
     </form>
 
diff --git a/www/application/views/register.php b/www/application/views/register.php
index 3045c72..47a10f7 100644
--- a/www/application/views/register.php
+++ b/www/application/views/register.php
@@ -1,6 +1,5 @@
 <?php
   $this->load->library('form_validation');
-  echo validation_errors();
   echo form_open('register'); ?>
   <div class="login register container">
     <img class="icon reg" src="../img/twitter.png" alt="Twitter">
diff --git a/www/application/views/templates/footer.php b/www/application/views/templates/footer.php
index 4d7767a..b404e09 100644
--- a/www/application/views/templates/footer.php
+++ b/www/application/views/templates/footer.php
@@ -1,4 +1,6 @@
+        <br><br>
         <em class="footer">&copy; 2017 Stingh Design</em>
+        <br><br>
         <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>
diff --git a/www/application/views/user.php b/www/application/views/user.php
index b61a197..92c30e9 100644
--- a/www/application/views/user.php
+++ b/www/application/views/user.php
@@ -3,17 +3,14 @@
   <h1>My Tweets</h1>
 
   <?php $this->load->library('form_validation'); ?>
-  <?php echo validation_errors();  ?>
   <?php echo form_open('user_tweets/create'); ?>
-  <div class="form-group">
-    <!--<input class="form-control" type="text" name="tweet" value="<?php echo set_value('tweet'); ?>" placeholder="What's on your mind?"/>-->
-    <textarea class="form-control" rows="3" name="tweet" value="<?php echo set_value('tweet'); ?>" placeholder="What's on your mind?"></textarea>
-    <?php echo form_error('tweet'); ?>
-  </div>
-  <button class="btn btn-primary" type="submit">Tweet</button>
-    <!--<input type="hidden" name="user_id" value="<?php echo 'id' // USER ID HERE for tweet creation ?>"/>-->
-  </form>
 
+    <div class="form-group">
+      <textarea class="form-control" rows="3" name="tweet" value="<?php echo set_value('tweet'); ?>" placeholder="What's on your mind?"></textarea>
+      <?php echo form_error('tweet'); ?>
+    </div>
+    <button class="btn btn-primary" type="submit">Tweet</button>
+  </form>
 
   <?php foreach($posts as $post){ ?>
 	<div class="tweet-container">
diff --git a/www/css/styles.css b/www/css/styles.css
index 6670c45..8c78b30 100644
--- a/www/css/styles.css
+++ b/www/css/styles.css
@@ -63,6 +63,5 @@ img.icon.reg {
 }
 
 .footer {
-  margin-bottom: 5px;
-  margin-left: 5px;
+  margin-left: 2em;
 }