Added Chat and Updates
Still need an iframe for irc
This commit is contained in:
parent
18be30194b
commit
c55d196eae
5 changed files with 19 additions and 1 deletions
|
@ -13,7 +13,7 @@ server {
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Put all the pages here so Angular doesn't fail.
|
# Put all the pages here so Angular doesn't fail.
|
||||||
location ~^/(about|login|register|scoreboard)$ {
|
location ~^/(about|login|register|scoreboard|chat|updates)$ {
|
||||||
default_type text/html;
|
default_type text/html;
|
||||||
try_files /index.html /index.html;
|
try_files /index.html /index.html;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
<ul class="nav navbar-nav navbar-fixed">
|
<ul class="nav navbar-nav navbar-fixed">
|
||||||
<li><a href="/about">About</a></li>
|
<li><a href="/about">About</a></li>
|
||||||
|
<li><a href="/updates">Updates</a></li>
|
||||||
|
<li><a href="/chat">Chat</a></li>
|
||||||
<li><a href="/scoreboard">Scoreboard</a></li>
|
<li><a href="/scoreboard">Scoreboard</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
|
|
|
@ -16,6 +16,14 @@ app.config(function($routeProvider, $locationProvider) {
|
||||||
templateUrl: "pages/login.html",
|
templateUrl: "pages/login.html",
|
||||||
controller: "mainController"
|
controller: "mainController"
|
||||||
})
|
})
|
||||||
|
.when("/chat", {
|
||||||
|
templateUrl: "pages/chat.html",
|
||||||
|
controller: "mainController"
|
||||||
|
})
|
||||||
|
.when("/updates", {
|
||||||
|
templateUrl: "pages/updates.html",
|
||||||
|
controller: "mainController"
|
||||||
|
})
|
||||||
.when("/scoreboard", {
|
.when("/scoreboard", {
|
||||||
templateUrl: "pages/scoreboard.html",
|
templateUrl: "pages/scoreboard.html",
|
||||||
controller: "mainController"
|
controller: "mainController"
|
||||||
|
|
4
web/pages/chat.html
Normal file
4
web/pages/chat.html
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<center>
|
||||||
|
<h1>EasyCTF IRC</h1>
|
||||||
|
<h2>(Insert iFrame with IRC here)</h2>
|
||||||
|
</center>
|
4
web/pages/updates.html
Normal file
4
web/pages/updates.html
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<center>
|
||||||
|
<h1>News / Updates</h1>
|
||||||
|
<iframe id="twitter-widget-0" scrolling="no" frameborder="0" allowtransparency="true" allowfullscreen="true" class="twitter-timeline twitter-timeline-rendered" data-widget-id="661431758655782912" data-user-id="3239603087" title="Twitter Timeline" style="position: static; visibility: visible; display: inline-block; width: 100%; height: 600px; padding: 0px; border: none; max-width: 520px; min-width: 180px; margin-top: 0px; margin-bottom: 0px; min-height: 200px;"></iframe>
|
||||||
|
</center>
|
Loading…
Reference in a new issue