Skip to content

Commit

Permalink
mona the diva wanted a new photo
Browse files Browse the repository at this point in the history
  • Loading branch information
cws13003 committed Dec 6, 2017
1 parent 5ca3c77 commit c8952e2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
4 changes: 1 addition & 3 deletions www/application/views/home.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- header used to be here -->

<div class="home container">
<h1>All Tweets</h1>
<h1>My Feed</h1>

<?php $this->load->library('form_validation'); ?>
<form class="form" action="/index.php/all_tweets/search_keyword" method="post">
Expand All @@ -24,7 +24,6 @@
<div class="row">
<div class="col-md-6">
<?php echo "<h3>No tweets found</h3>"; ?>

</div>
</div>
<div class="row tweet">
Expand All @@ -47,7 +46,6 @@
<div class="row">
<div class="col-md-6">
<?php echo "<h3>" . $row['first_name'] . " " . $row['last_name'] . " " . "<span class=\"handle\">" . "@" . $row['username'] . "</span>" . "</h3>"; ?>

</div>
<div class="col-md-3 date">
<?php
Expand Down
18 changes: 9 additions & 9 deletions www/application/views/templates/nav.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="/index.php/all_tweets">
<img class="home-icon" alt="Twitter" src="../../img/twitter.png">
</a>
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="/index.php/all_tweets">
<img class="home-icon" alt="Twitter" src="../../img/twitter.png">
</a>
</div>
<ul class="nav navbar-nav">
<li><a href="/index.php/all_tweets">Feed</a></li>
<li><a href="/index.php/user_tweets">Profile</a></li>
</div>
<ul class="nav navbar-nav">
<li><a href="/index.php/all_tweets">Home</a></li>
<li><a href="/index.php/user_tweets">Profile</a></li>
</div>
</nav>
2 changes: 1 addition & 1 deletion www/application/views/user.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
<div class="home container">
<h1>My Tweets</h1>
<h1>My Profile</h1>

<?php $this->load->library('form_validation'); ?>
<?php echo form_open('user_tweets/create'); ?>
Expand Down
Binary file modified www/img/mona.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c8952e2

Please sign in to comment.