Skip to content

Commit

Permalink
Fix links in Home Refs #32
Browse files Browse the repository at this point in the history
  • Loading branch information
@MathieuNls
MathieuNls committed Jun 17, 2015
1 parent da21ece commit dadff46
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 16 deletions.
37 changes: 27 additions & 10 deletions application/views/footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer>
<?php if(!$this->agent->is_mobile()){ ?>
<div class="publication">
<div id="publication_footer" class="publication">

<a href="http://www.fratellowatches.com/toolwatch-measure-the-accuracy-of-your-watch/"><img src="<?php echo img_url('fratello_logos_transparant.png'); ?>"></a>
<a href="http://wristreview.com/?p=16698"><img src="http://wristreview.com/wp-content/uploads/2015/04/wr-logo-V21.png"></a>
Expand All @@ -16,22 +16,39 @@
<div class="logo"></div>
</div>
<div class="links col-md-offset-1 col-sm-1">
<a href="#features">Features</a>
<a href="<?php echo base_url(); ?>#demo-screen">Features</a>
</div>
<div class="links col-sm-1">
<a href="#features">Blog</a>
</div>
<div class="links col-sm-1">
<a href="#features">Login</a>
</div>
<div class="links col-sm-1">
<a href="/about/">Measures</a>
<a href="<?php echo base_url(); ?>/blog/watch-tips/">Blog</a>
</div>

<?php
if($userIsLoggedIn)
{
echo '<div class="links col-sm-1">
<a href="/logout">Logout</a>
</div>
<div class="links col-sm-1">
<a href="/measures/">Measures</a>
</div>';
}
else
{
echo '<div class="links col-sm-1">
<a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">Login</a>
</div>
<div class="links col-sm-1">
<a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">Measures</a>
</div>';
}
?>


<div class="links col-sm-1">
<a href="/about/">About</a>
</div>
<div class="links col-sm-1">
<a href="/about/">Contact</a>
<a href="/contact/">Contact</a>
</div>
<div class="social col-sm-3">
<a href="https://instagram.com/toolwatchapp/" target="_blank" title="Instagram"><span class="fa fa-instagram"></span></a>
Expand Down
2 changes: 1 addition & 1 deletion application/views/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<a href="<?php echo base_url(); ?>"><div class="logo"></div></a>
</div>
<div style="margin-top: 10px" class="col-md-1 col-md-offset-5 text-center">
<a href="#features">Features</a>
<a href="<?php echo base_url(); ?>#demo-screen">Features</a>
</div>
<div style="margin-top: 10px" class="col-md-1 text-center">
<a href="/blog/watch-tips/">Blog</a>
Expand Down
27 changes: 24 additions & 3 deletions application/views/home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@
<div class="row">
<div class="col-md-12">
<center>
<a class="btn btn-lg btn-white" href="#" title="Signup" data-toggle="modal" data-target="#pageModal"
data-modal-update="true" data-cta="MEASURE_NOW" data-href="/sign-up/">Measure your watch now!</a>

<?php
if($userIsLoggedIn)
{
echo '<a class="btn btn-lg btn-white" href="/measures/">Measure your watch now!</a>';
}
else
{

echo '<a class="btn btn-lg btn-white" href="#" title="Signup" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-cta="MEASURE_NOW" data-href="/sign-up/">Measure your watch now!</a>';
}
?>

</center>
</div>
</div>
Expand Down Expand Up @@ -85,7 +96,17 @@
<p>Toolwatch's accuracy measure is built for speed and ease to use. Measuring the accuracy of your mechanical watch is so simple that you'll actually use it.
Toolwatch helps you keep your loved ones on time.</p>
<center>
<a class="btn btn-default btn-xlarge" href="#" title="Signup" data-cta="GET_STARTED" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/sign-up/">GET STARTED <i class="fa fa-arrow-right"></i></a>

<?php
if($userIsLoggedIn)
{
echo '<a class="btn btn-default btn-xlarge" href="/measures/">GET STARTED <i class="fa fa-arrow-right"></i></a>';
}
else
{
echo '<a class="btn btn-default btn-xlarge" href="#" title="Signup" data-cta="GET_STARTED" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/sign-up/">GET STARTED <i class="fa fa-arrow-right"></i></a>';
}
?>
</center>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion assets/js/home.logic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var delta = Math.floor((Math.random() * 10) + 1) - 5;
var d;

var activeIndex = 0;
var possibleIndex = ["home-video", "demo-screen", "mosa-screen"];
var possibleIndex = ["home-video", "demo-screen", "mosa-screen", "publication_footer"];
var animationUnderWay = false;
var timeouts = [];

Expand Down Expand Up @@ -44,6 +44,8 @@ $( document ).ready(function() {

if(activeIndex === -1){
activeIndex = 0;
}else if(activeIndex === 4){
activeIndex = 3;
}

if(activeIndex!==0){
Expand Down
2 changes: 1 addition & 1 deletion assets/js/home.logic.mobile.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$( document ).ready(function() {

$('video,audio').mediaelementplayer({features: []});
$('video,audio').mediaelementplayer();

$( ".slogan-home" ).animate({
marginTop: "-="+$("video").height()/2
Expand Down

0 comments on commit dadff46

Please sign in to comment.