From 6276fd8df4a0faa37b92496a6f47a35ba8312de6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 6 Aug 2015 16:54:40 -0400
Subject: store settings state

---
 views/pages/lobby.ejs       | 8 ++------
 views/pages/room.ejs        | 9 ++-------
 views/partials/chat.ejs     | 8 ++++++++
 views/partials/scripts.ejs  | 2 ++
 views/partials/settings.ejs | 6 ++++++
 5 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 views/partials/chat.ejs
 create mode 100644 views/partials/settings.ejs

(limited to 'views')

diff --git a/views/pages/lobby.ejs b/views/pages/lobby.ejs
index 80bbf88..cc4e8c4 100644
--- a/views/pages/lobby.ejs
+++ b/views/pages/lobby.ejs
@@ -8,12 +8,8 @@
 
 <div id="bg"></div>
 
-<div id="login">
-  <form>
-    please enter your nick..<br>
-    <input type="text" id="username">
-  </form>
-</div>
+<% include ../partials/login %>
+<% include ../partials/settings %>
 
 <div id="lobby">
   <form>
diff --git a/views/pages/room.ejs b/views/pages/room.ejs
index 29fb027..f3d5592 100644
--- a/views/pages/room.ejs
+++ b/views/pages/room.ejs
@@ -11,14 +11,9 @@
 
 <div id="video"></div>
 
-<div id="chat">
-  <div id="messages"></div>
-  <form autocomplete="off">
-    <input type="text" id="message" autocomplete="off">
-  </form>
-</div>
-
+<% include ../partials/chat %>
 <% include ../partials/login %>
+<% include ../partials/settings %>
 
 <script type="text/html" id="message_template">
   <div class="row">
diff --git a/views/partials/chat.ejs b/views/partials/chat.ejs
new file mode 100644
index 0000000..f80796a
--- /dev/null
+++ b/views/partials/chat.ejs
@@ -0,0 +1,8 @@
+<div id="chat">
+  <div id="messages"></div>
+  <form autocomplete="off">
+    <input type="text" id="message" autocomplete="off">
+  </form>
+</div>
+
+<div id="userlist"></div>
\ No newline at end of file
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index d3a8c82..4e96975 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -8,6 +8,7 @@
 <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/sha1.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>
@@ -18,6 +19,7 @@
 <script src="/js/lib/ws.js"></script>
 <script src="/js/lib/views/room/room.js"></script>
 <script src="/js/lib/views/room/chat.js"></script>
+<script src="/js/lib/views/room/settings.js"></script>
 <script src="/js/lib/views/room/userlist.js"></script>
 <script src="/js/lib/views/lobby/lobby.js"></script>
 <script src="/js/lib/views/login.js"></script>
diff --git a/views/partials/settings.ejs b/views/partials/settings.ejs
new file mode 100644
index 0000000..91cb348
--- /dev/null
+++ b/views/partials/settings.ejs
@@ -0,0 +1,6 @@
+<div id="settings">
+  <button class="open">@</button>
+  <form class="inner">
+    <input type="text" name="bg">
+  </form>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2