Skip to content

Commit

Permalink
fixing broken templates
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Bewick committed Jan 22, 2012
1 parent 1982c90 commit ba55bb5
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 289 deletions.
8 changes: 1 addition & 7 deletions application/controllers/artists.php
View file
Expand Up @@ -16,19 +16,13 @@ function index()
$this->load->view('artists/index'); $this->load->view('artists/index');
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }
<<<<<<< HEAD
=======


function render() function render()
{ {
$this->load->view('templates/header'); $this->load->view('templates/header');
$this->load->view('artists/render'); $this->load->view('artists/render');
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }


>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
} }


/* End of file welcome.php */ /* End of file welcome.php */
Expand Down
3 changes: 0 additions & 3 deletions application/controllers/events.php
View file
Expand Up @@ -16,8 +16,6 @@ function index()
$this->load->view('events/index'); $this->load->view('events/index');
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }
<<<<<<< HEAD
=======




function render() function render()
Expand All @@ -27,7 +25,6 @@ function render()
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }


>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
} }


/* End of file welcome.php */ /* End of file welcome.php */
Expand Down
3 changes: 0 additions & 3 deletions application/controllers/groups.php
View file
Expand Up @@ -16,8 +16,6 @@ function index()
$this->load->view('groups/index'); $this->load->view('groups/index');
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }
<<<<<<< HEAD
=======




function render() function render()
Expand All @@ -27,7 +25,6 @@ function render()
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }


>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
} }


/* End of file welcome.php */ /* End of file welcome.php */
Expand Down
3 changes: 0 additions & 3 deletions application/controllers/places.php
View file
Expand Up @@ -16,8 +16,6 @@ function index()
$this->load->view('places/index'); $this->load->view('places/index');
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }
<<<<<<< HEAD
=======




function render() function render()
Expand All @@ -27,7 +25,6 @@ function render()
$this->load->view('templates/footer'); $this->load->view('templates/footer');
} }


>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
} }


/* End of file welcome.php */ /* End of file welcome.php */
Expand Down
54 changes: 1 addition & 53 deletions application/views/artists/index.php
View file
Expand Up @@ -11,46 +11,13 @@
<li>Aliquam tincidunt mauris eu risus.</li> <li>Aliquam tincidunt mauris eu risus.</li>
<li>Vestibulum auctor dapibus neque.</li> <li>Vestibulum auctor dapibus neque.</li>
</ul> </ul>
<<<<<<< HEAD
<a class="btn danger" href="reg1.html">Sign up as an artist!</a>
=======
<a class="btn danger" href="<?php echo base_url(); ?>index.php/auth/register">Sign up as an artist!</a> <a class="btn danger" href="<?php echo base_url(); ?>index.php/auth/register">Sign up as an artist!</a>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
<hr /> <hr />
<h2>Latest Artists</h2> <h2>Latest Artists</h2>
<hr /> <hr />
<ul class="search-results"> <ul class="search-results">
<li> <li>
<<<<<<< HEAD
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Oils</span> <span class="label important">Watercolour</span> <a class="pull-right" href="#">View profile &raquo;</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Acrylic</span> <a class="pull-right" href="#">View profile &raquo;</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Oils</span> <a class="pull-right" href="#">View profile &raquo;</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Mixed media</span> <a class="pull-right" href="#">View profile &raquo;</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Mixed media</span> <span class="label important">Oils</span> <a class="pull-right" href="#">View profile &raquo;</a>
=======
<ul class="media-grid"><li><a href="<?php echo base_url(); ?>index.php/artists/render"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul> <ul class="media-grid"><li><a href="<?php echo base_url(); ?>index.php/artists/render"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="<?php echo base_url(); ?>index.php/artists/render">Artist Name</a></h3> <h3><a href="<?php echo base_url(); ?>index.php/artists/render">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p> <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
Expand Down Expand Up @@ -79,28 +46,17 @@
<h3><a href="<?php echo base_url(); ?>index.php/artists/render">Artist Name</a></h3> <h3><a href="<?php echo base_url(); ?>index.php/artists/render">Artist Name</a></h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p> <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label important">Mixed media</span> <span class="label important">Oils</span> <a class="pull-right" href="<?php echo base_url(); ?>index.php/artists/render">View profile &raquo;</a> <span class="label important">Mixed media</span> <span class="label important">Oils</span> <a class="pull-right" href="<?php echo base_url(); ?>index.php/artists/render">View profile &raquo;</a>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</li> </li>
</ul> </ul>
<div class="pagination"> <div class="pagination">
<ul> <ul>
<<<<<<< HEAD
<li class="prev disabled"><a href="#">&larr; Previous</a></li> <li class="prev disabled"><a href="#">&larr; Previous</a></li>
<li class="active"><a href="#">1</a></li> <li class="active"><a href="#">1</a></li>
<li><a href="#">2</a></li> <li><a href="#">2</a></li>
<li><a href="#">3</a></li> <li><a href="#">3</a></li>
<li><a href="#">4</a></li> <li><a href="#">4</a></li>
<li><a href="#">5</a></li> <li><a href="#">5</a></li>
<li class="next"><a href="#">Next &rarr;</a></li> <li class="next"><a href="#">Next &rarr;</a></li>
=======
<li class="prev disabled"><a href="<?php echo base_url(); ?>index.php/artists/render">&larr; Previous</a></li>
<li class="active"><a href="<?php echo base_url(); ?>index.php/artists/render">1</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">2</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">3</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">4</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">5</a></li>
<li class="next"><a href="<?php echo base_url(); ?>index.php/artists/render">Next &rarr;</a></li>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</ul> </ul>
</div> </div>
</div> </div>
Expand All @@ -110,19 +66,11 @@
<br /><br /> <br /><br />
<h3>Popular Artists</h3> <h3>Popular Artists</h3>
<ul class="events unstyled"> <ul class="events unstyled">
<<<<<<< HEAD
<li><a href="#">Artist 1</a></li> <li><a href="#">Artist 1</a></li>
<li><a href="#">Artist 2</a></li> <li><a href="#">Artist 2</a></li>
<li><a href="#">Artist 3</a></li> <li><a href="#">Artist 3</a></li>
<li><a href="#">Artist 4</a></li> <li><a href="#">Artist 4</a></li>
<li><a href="#">Artist 5</a></li> <li><a href="#">Artist 5</a></li>
=======
<li><a href="<?php echo base_url(); ?>index.php/artists/render">Artist 1</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">Artist 2</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">Artist 3</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">Artist 4</a></li>
<li><a href="<?php echo base_url(); ?>index.php/artists/render">Artist 5</a></li>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</ul> </ul>
</div> </div>
</div> </div>
57 changes: 0 additions & 57 deletions application/views/events/index.php
View file
Expand Up @@ -11,46 +11,12 @@
<li>Aliquam tincidunt mauris eu risus.</li> <li>Aliquam tincidunt mauris eu risus.</li>
<li>Vestibulum auctor dapibus neque.</li> <li>Vestibulum auctor dapibus neque.</li>
</ul> </ul>
<<<<<<< HEAD
<a class="btn info" href="reg1.html">Create an event!</a>
=======
<a class="btn info" href="<?php echo base_url(); ?>index.php/auth/register">Create an event!</a> <a class="btn info" href="<?php echo base_url(); ?>index.php/auth/register">Create an event!</a>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
<hr /> <hr />
<h2>Upcoming events</h2> <h2>Upcoming events</h2>
<hr /> <hr />
<ul class="search-results"> <ul class="search-results">
<li> <li>
<<<<<<< HEAD
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Event title 1</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Workshop</span> <a href="#">More details</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Event title 2</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Gallery</span> <a href="#">More details</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Event title 3</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Screening</span> <a href="#">More details</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Event title 4</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Workshop</span> <a href="#">More details</a>
</li>
<li>
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="#">Event title 5</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Gallery</span> <a href="#">More details</a>
=======
<ul class="media-grid"><li><a href="<?php echo base_url(); ?>index.php/events/render"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul> <ul class="media-grid"><li><a href="<?php echo base_url(); ?>index.php/events/render"><img alt="" src="http://placehold.it/60x60" class="thumbnail"></a></li></ul>
<h3><a href="<?php echo base_url(); ?>index.php/events/render">Event title 1</a> - xx/xx/12</h3> <h3><a href="<?php echo base_url(); ?>index.php/events/render">Event title 1</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p> <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
Expand Down Expand Up @@ -79,28 +45,17 @@
<h3><a href="<?php echo base_url(); ?>index.php/events/render">Event title 5</a> - xx/xx/12</h3> <h3><a href="<?php echo base_url(); ?>index.php/events/render">Event title 5</a> - xx/xx/12</h3>
<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p> <p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>
<span class="label notice">Gallery</span> <a href="<?php echo base_url(); ?>index.php/events/render">More details</a> <span class="label notice">Gallery</span> <a href="<?php echo base_url(); ?>index.php/events/render">More details</a>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</li> </li>
</ul> </ul>
<div class="pagination"> <div class="pagination">
<ul> <ul>
<<<<<<< HEAD
<li class="prev disabled"><a href="#">&larr; Previous</a></li> <li class="prev disabled"><a href="#">&larr; Previous</a></li>
<li class="active"><a href="#">1</a></li> <li class="active"><a href="#">1</a></li>
<li><a href="#">2</a></li> <li><a href="#">2</a></li>
<li><a href="#">3</a></li> <li><a href="#">3</a></li>
<li><a href="#">4</a></li> <li><a href="#">4</a></li>
<li><a href="#">5</a></li> <li><a href="#">5</a></li>
<li class="next"><a href="#">Next &rarr;</a></li> <li class="next"><a href="#">Next &rarr;</a></li>
=======
<li class="prev disabled"><a href="<?php echo base_url(); ?>index.php/events/render">&larr; Previous</a></li>
<li class="active"><a href="<?php echo base_url(); ?>index.php/events/render">1</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">2</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">3</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">4</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">5</a></li>
<li class="next"><a href="<?php echo base_url(); ?>index.php/events/render">Next &rarr;</a></li>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</ul> </ul>
</div> </div>
</div> </div>
Expand All @@ -109,7 +64,6 @@
<input class="span3" type="text" placeholder="Search..." /> <a href="<?= base_url(); ?>index.php/search/" class="btn primary" />Go</a> <input class="span3" type="text" placeholder="Search..." /> <a href="<?= base_url(); ?>index.php/search/" class="btn primary" />Go</a>


<h3>Events Calendar</h3> <h3>Events Calendar</h3>
<<<<<<< HEAD
<ul class="media-grid pull-left"><li><a href="#"><img alt="" src="http://placehold.it/210x210" class="thumbnail"></a></li></ul> <ul class="media-grid pull-left"><li><a href="#"><img alt="" src="http://placehold.it/210x210" class="thumbnail"></a></li></ul>


<h3>Popular Events</h3> <h3>Popular Events</h3>
Expand All @@ -119,17 +73,6 @@
<li><a href="#">Event 3</a></li> <li><a href="#">Event 3</a></li>
<li><a href="#">Event 4</a></li> <li><a href="#">Event 4</a></li>
<li><a href="#">Event 5</a></li> <li><a href="#">Event 5</a></li>
=======
<ul class="media-grid pull-left"><li><a href="<?php echo base_url(); ?>index.php/events/render"><img alt="" src="http://placehold.it/210x210" class="thumbnail"></a></li></ul>

<h3>Popular Events</h3>
<ul class="events unstyled">
<li><a href="<?php echo base_url(); ?>index.php/events/render">Event 1</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">Event 2</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">Event 3</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">Event 4</a></li>
<li><a href="<?php echo base_url(); ?>index.php/events/render">Event 5</a></li>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</ul> </ul>
</div> </div>
</div> </div>
13 changes: 0 additions & 13 deletions application/views/explore/index.php
View file
Expand Up @@ -14,11 +14,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="active" id="artists"> <div class="active" id="artists">
<h3>Find local artists</h3> <h3>Find local artists</h3>
<<<<<<< HEAD
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/550x300" class="thumbnail"></a></li></ul>
=======
<ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/550x350" class="thumbnail"></a></li></ul> <ul class="media-grid"><li><a href="#"><img alt="" src="http://placehold.it/550x350" class="thumbnail"></a></li></ul>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
<h4>Filter options</h4> <h4>Filter options</h4>
<input type="checkbox"/> Oils&nbsp;&nbsp;&nbsp; <input type="checkbox"/> Acryllic&nbsp;&nbsp;&nbsp; <input type="checkbox"/> watercolour&nbsp;&nbsp;&nbsp; <input type="checkbox"/> mixed media <input type="checkbox"/> Oils&nbsp;&nbsp;&nbsp; <input type="checkbox"/> Acryllic&nbsp;&nbsp;&nbsp; <input type="checkbox"/> watercolour&nbsp;&nbsp;&nbsp; <input type="checkbox"/> mixed media
</div> </div>
Expand Down Expand Up @@ -52,21 +48,12 @@
<dt>Media</dt> <dt>Media</dt>
<dd>oils, watercolour, mixed media</dd> <dd>oils, watercolour, mixed media</dd>
</dl> </dl>
<<<<<<< HEAD
<a href="#">View full profile &raquo;</a>
<hr />
<h3>Groups</h3>
<ul class="events unstyled">
<li><a href="#">Team Rocket</a></li>
<li><a href="#">Naked Painters</a></li>
=======
<a href="<?php echo base_url(); ?>index.php/artists/render">View full profile &raquo;</a> <a href="<?php echo base_url(); ?>index.php/artists/render">View full profile &raquo;</a>
<hr /> <hr />
<h3>Groups</h3> <h3>Groups</h3>
<ul class="events unstyled"> <ul class="events unstyled">
<li><a href="<?php echo base_url(); ?>index.php/groups/render">Team Rocket</a></li> <li><a href="<?php echo base_url(); ?>index.php/groups/render">Team Rocket</a></li>
<li><a href="<?php echo base_url(); ?>index.php/groups/render">Naked Painters</a></li> <li><a href="<?php echo base_url(); ?>index.php/groups/render">Naked Painters</a></li>
>>>>>>> 2b91b7a61b063b4df8998d6c8fd45c8aa3b56d0e
</ul> </ul>
</div> </div>
</div> </div>

0 comments on commit ba55bb5

Please sign in to comment.