Skip to content

Commit

Permalink
Merge branch 'master' into dev-master
Browse files Browse the repository at this point in the history
  • Loading branch information
calvarado194 authored Oct 13, 2018
2 parents 8df1d1c + e31f7ed commit 9139d4b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions templates/index.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
</td>
</tr>
<?php endforeach; ?>
</table>
</table>
</div>
</div>
<div class="pure-g">
Expand Down Expand Up @@ -215,7 +215,7 @@
<a id="reseed-btn" href="http://localhost:8000/celeste/?flags=<?php echo implode($flags) ?>" class="pure-button celeste-font"><?PHP echo $page_text['RESEED_BTN']; ?></a>
<?php else: ?>
<!-- This second statement is used for production, when hosted anywhere but localhost. -->
<a id="reseed-btn" href="http://dev.oneninefour.cl/celeste/?flags=<?php echo implode($flags) ?>" class="pure-button celeste-font"><?PHP echo $page_text['RESEED_BTN']; ?></a>
<a id="reseed-btn" href="https://oneninefour.cl/celeste/?flags=<?php echo implode($flags) ?>" class="pure-button celeste-font"><?PHP echo $page_text['RESEED_BTN']; ?></a>
<?php endif; ?>
<form class="pure-form pure-form-stacked">
<fieldset>
Expand Down Expand Up @@ -271,10 +271,10 @@
}

if(flags == ''){
document.getElementById('reseed-btn').href = "http://dev.oneninefour.cl/celeste/";
document.getElementById('reseed-btn').href = "https://oneninefour.cl/celeste/";
}
else{
document.getElementById('reseed-btn').href = "http://dev.oneninefour.cl/celeste/?flags=" + flags;
document.getElementById('reseed-btn').href = "https://oneninefour.cl/celeste/?flags=" + flags;
}
}

Expand Down

0 comments on commit 9139d4b

Please sign in to comment.