diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-05 12:53:38 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-05 12:53:38 -0400 |
| commit | b9aaeaf616ed0a46a81e313bede00f1598d245ca (patch) | |
| tree | 0d2256c9332b6d0ef97bb56e1c771a976f3497db /views | |
| parent | 21e31e46ff167ede7cb5ad4452cbd406236bc83d (diff) | |
| parent | 3b7da491072e5c366738ff549e8958d97948076a (diff) | |
mergez
Diffstat (limited to 'views')
| -rw-r--r-- | views/pages/index.ejs | 15 | ||||
| -rw-r--r-- | views/pages/lobby.ejs | 26 | ||||
| -rw-r--r-- | views/pages/room.ejs | 7 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 28 |
4 files changed, 54 insertions, 22 deletions
diff --git a/views/pages/index.ejs b/views/pages/index.ejs deleted file mode 100644 index 97d16d2..0000000 --- a/views/pages/index.ejs +++ /dev/null @@ -1,15 +0,0 @@ -<!doctype html> -<html> -<head> -<title>yt-chat</title> -<link rel="stylesheet" href="/css/css.css"> -<style> -</style> -</head> -<body> - -<input type="text" id="create-room" placeholder="enter a url to make a room"> - -</body> -<% include ../partials/scripts %> -</html>
\ No newline at end of file diff --git a/views/pages/lobby.ejs b/views/pages/lobby.ejs new file mode 100644 index 0000000..80bbf88 --- /dev/null +++ b/views/pages/lobby.ejs @@ -0,0 +1,26 @@ +<!doctype html> +<html> +<head> +<title>yt-chat</title> +<link rel="stylesheet" href="/css/css.css"> +</head> +<body> + +<div id="bg"></div> + +<div id="login"> + <form> + please enter your nick..<br> + <input type="text" id="username"> + </form> +</div> + +<div id="lobby"> + <form> + <input type="text" id="create-room" placeholder="enter a url to make a room"> + </form> +</div> + +</body> +<% include ../partials/scripts %> +</html>
\ No newline at end of file diff --git a/views/pages/room.ejs b/views/pages/room.ejs index 36e4140..568a136 100644 --- a/views/pages/room.ejs +++ b/views/pages/room.ejs @@ -7,6 +7,7 @@ </head> <body> +<div id="bg"></div> <div id="video"></div> @@ -17,6 +18,11 @@ </form> </div> +<div id="login"> + please enter your nick..<br> + <input type="text" id="username"> +</div> + <script type="text/html" id="message_template"> <div class="row"> <span class="nick"></span> @@ -24,7 +30,6 @@ </div> </script> - </body> [[ include ../partials/scripts ]] </html>
\ No newline at end of file diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 95192b9..d67bdc0 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -1,12 +1,28 @@ <script src="//[[- config.host ]]/socket.io/socket.io.js"></script> <script src="js/vendor/zepto.min.js"></script> -<script src="js/lib/view/view.js"></script> -<script src="js/lib/view/formview.js"></script> -<script src="js/lib/view/router.js"></script> -<script src="js/lib/parser.js"></script> -<script src="js/lib/ws.js"></script> -<script src="js/lib/user.js"></script> +<script src="js/vendor/lodash.min.js"></script> +<script src="js/vendor/mx/mx.js"></script> +<script src="js/vendor/mx/mx.soundcloud.js"></script> +<script src="js/vendor/mx/mx.video.js"></script> +<script src="js/vendor/mx/mx.vimeo.js"></script> +<script src="js/vendor/mx/mx.youtube.js"></script> +<script src="js/vendor/oktween.js"></script> +<script src="js/vendor/parser.js"></script> +<script src="js/vendor/util.js"></script> +<script src="js/vendor/view/view.js"></script> +<script src="js/vendor/view/formview.js"></script> +<script src="js/vendor/view/router.js"></script> +<script src="js/lib/bg.js"></script> <script src="js/lib/chat.js"></script> +<script src="js/lib/user.js"></script> +<script src="js/lib/video.js"></script> +<script src="js/lib/ws.js"></script> +<script src="js/lib/views/room/index.js"></script> +<script src="js/lib/views/lobby/index.js"></script> +<script src="js/lib/views/login.js"></script> +<script src="js/lib/views/index.js"></script> <script src="js/index.js"></script> +<!-- <script type="text/javascript" src="http://www.youtube.com/player_api"></script> + --> |