profile form

10 files changed, 94 insertions, 4 deletions

diff --git a/views/pages/editcomment.ejs b/views/pages/comment_form.ejs
index 97a8402..97a8402 100644
--- a/views/pages/editcomment.ejs
+++ b/views/pages/comment_form.ejs
diff --git a/views/pages/mailbox.ejs b/views/pages/mailbox.ejs
index 386e857..d06bd7a 100644
--- a/views/pages/mailbox.ejs
+++ b/views/pages/mailbox.ejs
@@ -1,8 +1,10 @@
 <% include ../partials/header %>
+
 <div class="subtitle">
   <a href='/'>&lt; Home</a> &middot;
   <a href='/mail/compose'>New Message</a>
 </div>
+
 <div id="content">
   
   <h3 id="no_messages">
diff --git a/views/pages/message.ejs b/views/pages/message.ejs
index d46b5fb..6a81d46 100644
--- a/views/pages/message.ejs
+++ b/views/pages/message.ejs
@@ -1,4 +1,5 @@
 <% include ../partials/header %>
+
 <div class="subtitle">
   <a href='/'>&lt; Home</a> &middot;
   <a href='/mail/'>Inbox</a>
diff --git a/views/pages/profile.ejs b/views/pages/profile.ejs
index 79260e9..86c17f6 100644
--- a/views/pages/profile.ejs
+++ b/views/pages/profile.ejs
@@ -1,7 +1,7 @@
 <% include ../partials/header %>
 
 <div class="subtitle">
-  <a href="/">&lt; Home</a>
+  <a href="/">&lt; Home</a> <span class="edit_profile">&middot; <a href="">Edit Profile</a></span>
 </div>
 
 <div id="profile">
diff --git a/views/pages/profile_form.ejs b/views/pages/profile_form.ejs
new file mode 100644
index 0000000..01b0fae
--- /dev/null
+++ b/views/pages/profile_form.ejs
@@ -0,0 +1,84 @@
+<% include ../partials/header %>
+
+<div class="subtitle">
+  <a href="/">&lt; Home</a> &middot; <a href="/profile">View profile</a></span>
+</div>
+
+<div id="content">
+
+<div id="profile_form">
+  <form>
+    <div>
+      <label for="profile-realname">Real name</label>
+      <input type="text" id="profile-realname" name="realname">
+    </div>
+
+    <div>
+      <label for="profile-location">Location</label>
+      <input type="text" id="profile-location" name="location">
+    </div>
+
+    <div>
+      <label for="profile-email">Email address</label>
+      <input type="text" id="profile-email" name="email">
+    </div>
+
+    <div>
+      <label for="profile-phone">Phone</label>
+      <input type="text" id="profile-phone" name="phone">
+    </div>
+    <br>
+
+    <div>
+      <label for="profile-pic">Profile picture</label>
+      <div>
+        <img id="profile-pic-embed" />
+        <input type="file" id="profile-pic" name="pic">
+      </div>
+    </div>
+    <br>
+
+    <div>
+      <label for="profile-webpage">Website</label>
+      <input type="text" id="profile-webpage" name="webpage">
+    </div>
+
+    <div>
+      <label for="profile-fb">Facebook</label>
+      <input type="text" id="profile-fb" name="fb">
+    </div>
+
+    <div>
+      <label for="profile-tw">Twitter</label>
+      <input type="text" id="profile-tw" name="tw">
+    </div>
+    <br>
+
+    <div>
+      <label for="profile-password">Change password?</label>
+      <input type="password" id="profile-password" name="password">
+    </div>
+
+    <div>
+      <label for="profile-password2">again:</label>
+      <input type="password" id="profile-password2" name="password2">
+    </div>
+    <br>
+    
+    <div>
+      <label for="profile-submit"></label>
+      <button id="profile-submit">SAVE PROFILE</button>
+    </div>
+
+    <br>
+    <div>
+      <label></label>
+      <span class="errors">&nbsp;</span>
+    </div>
+
+  </form>
+</div>
+
+</div>
+
+<% include ../partials/footer %>
diff --git a/views/pages/search.ejs b/views/pages/search.ejs
index b942621..d830682 100644
--- a/views/pages/search.ejs
+++ b/views/pages/search.ejs
@@ -1,4 +1,5 @@
 <% include ../partials/header %>
+
 <div class="subtitle">
   <a href="/">&lt; Home</a>
 </div>
diff --git a/views/partials/comments.ejs b/views/partials/comments.ejs
index 907040f..b47702c 100644
--- a/views/partials/comments.ejs
+++ b/views/partials/comments.ejs
@@ -2,7 +2,7 @@
   <script class="template" type="text/html">
     <tr>
       <td class="user">
-        <a href="/profile/{{username}}"><div class="avatar" style="background-image:url(/data/profile/{{username}}.jpg)"></div></a>
+        <a href="/profile/{{username}}"><div class="avatar" style="background-image:url({{image}})"></div></a>
         <a href="/profile/{{username}}">{{username}}</a>
       </td>
       <td colspan="2" class="comment">
diff --git a/views/partials/hootbox.ejs b/views/partials/hootbox.ejs
index 0f6fce4..fe0298b 100644
--- a/views/partials/hootbox.ejs
+++ b/views/partials/hootbox.ejs
@@ -7,7 +7,7 @@
   <table id="hoots">
     <script class="template" type="text/html">
       <tr>
-        <td class="avatar" style="background-image:url(/data/profile/{{username}}.jpg)"><a href="/profile/{{username}}"></a></td>
+        <td class="avatar" style="background-image:url({{image}})"><a href="/profile/{{username}}"></a></td>
         <td>
           {{comment}}
         </td>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 9563442..e80bdda 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -26,7 +26,9 @@
 <script src="/assets/js/lib/views/index/threadform.js"></script>
 
 <script src="/assets/js/lib/views/search/results.js"></script>
+
 <script src="/assets/js/lib/views/profile/profile.js"></script>
+<script src="/assets/js/lib/views/profile/profile_edit.js"></script>
 
 <script src="/assets/js/lib/views/details/index.js"></script>
 <script src="/assets/js/lib/views/details/settings.js"></script>
diff --git a/views/partials/threads.ejs b/views/partials/threads.ejs
index 5c8e8a5..e429219 100644
--- a/views/partials/threads.ejs
+++ b/views/partials/threads.ejs
@@ -10,7 +10,7 @@
         <a href="/post/">Start a new thread!</a> |
         <a href="/mail">Inbox</a> |
         <a href="/profile">Profile</a> |
-        <a href="/logout">Logout</a>
+        <a href="/logout" class="logout">Logout</a>
       </td>
     </tr>
   </script>