fixed email in profiles

6 files changed, 53 insertions, 44 deletions

diff --git a/frontend/templates/admin.html b/frontend/templates/admin.html
index c486260..bef2360 100755
--- a/frontend/templates/admin.html
+++ b/frontend/templates/admin.html
@@ -66,12 +66,12 @@
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/src/debug.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/src/api.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/admin.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/like.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/like.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/src/auth.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/chat.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/chat.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/room.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/player.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/youtube.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/player.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/youtube.js"></script>
 <!--
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/main.js"></script>
 -->
diff --git a/frontend/templates/calendar.html b/frontend/templates/calendar.html
index 306ef5a..5c8df56 100755
--- a/frontend/templates/calendar.html
+++ b/frontend/templates/calendar.html
@@ -74,17 +74,17 @@
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/datepicker/datepicker.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundmanager2.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/player.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/vimeo.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/youtube.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundcloud.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/audio.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/like.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/chat.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/player.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/vimeo.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/youtube.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundcloud.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/audio.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/calendar.js"></script> 
 <script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>
 </html>
diff --git a/frontend/templates/profile.html b/frontend/templates/profile.html
index 233bf5d..9df2a44 100755
--- a/frontend/templates/profile.html
+++ b/frontend/templates/profile.html
@@ -59,9 +59,9 @@
 </div> 
 
 <div id="contact">
-	<img src="{{ STATIC_PREFIX }}/img/runner.gif" class="avatar">
+	<img src="{{ STATIC_PREFIX }}/static/img/runner.gif" class="avatar">
 	<p id="bio"></p>
-	<img src="{{ STATIC_PREFIX }}/img/runner.gif" class="avatar">
+	<img src="{{ STATIC_PREFIX }}/static/img/runner.gif" class="avatar">
 </div>
 
 <div id="bg">
@@ -98,6 +98,10 @@
 	<textarea id="profile-bio"></textarea><br/>
 	<div class="shim"></div>
 
+	<label>enter email here (private, for administrative use only)</label>
+	<input type="text" id="profile-email"><br/>
+	<div class="shim"></div>
+
 	<label>&nbsp;</label><button id="profile-settings-save">save</button><br />
 	<div class="shim"></div>
 	<div class="shim"></div>
@@ -131,19 +135,19 @@ var now = {{NOW}}
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundmanager2.js"></script>
 <!--not sure what debug is -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
 <!--really not sure why chat and like are here -->
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/player.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/vimeo.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/youtube.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundcloud.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/audio.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/like.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/chat.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/player.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/vimeo.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/youtube.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundcloud.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/audio.js"></script> 
 <!-- I guess the probz you were talking about would be in profile.js -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/profile.js"></script>
 <!--
diff --git a/frontend/templates/profile_img.html b/frontend/templates/profile_img.html
index 65db188..1e75dac 100755
--- a/frontend/templates/profile_img.html
+++ b/frontend/templates/profile_img.html
@@ -59,9 +59,9 @@
 </div> 
 
 <div id="contact">
-	<img src="{{ STATIC_PREFIX }}/img/runner.gif" class="avatar">
+	<img src="{{ STATIC_PREFIX }}/static/img/runner.gif" class="avatar">
 	<p id="bio"></p>
-	<img src="{{ STATIC_PREFIX }}/img/runner.gif" class="avatar">
+	<img src="{{ STATIC_PREFIX }}/static/img/runner.gif" class="avatar">
 </div>
 
 <div id="bg">
@@ -128,19 +128,19 @@ var now = {{NOW}}
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundmanager2.js"></script>
 <!--not sure what debug is -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
 <!--really not sure why chat and like are here -->
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/player.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/vimeo.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/youtube.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundcloud.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/audio.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/like.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/chat.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/player.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/vimeo.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/youtube.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/soundcloud.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/audio.js"></script> 
 <!-- I guess the probz you were talking about would be in profile.js -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/profile.js"></script>
 <!--
diff --git a/frontend/templates/register.html b/frontend/templates/register.html
index f041a50..2d75d5d 100755
--- a/frontend/templates/register.html
+++ b/frontend/templates/register.html
@@ -147,6 +147,11 @@ img
 
 	<label></label>
 	<button id="register-go">REGISTER</button>
+  <div>--or--</div> 
+  <div id="password_reset">
+    <a href="{% url "password_reset_recover" %}">Reset Password</a>
+  </div>
+
 </section>
 <section id="success">
 	<!--
@@ -166,9 +171,9 @@ img
 <section id="plant"><img src="{{ STATIC_PREFIX }}img/plant.gif" height="700" /></section>
 </body>
 <script type="text/javascript">document.getElementById("plea").style.display="none"</script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery-1.5.2.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery.md5.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/swfobject.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/register.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery-1.5.2.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery.md5.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/swfobject.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/register.js"></script>
 </html>
 
diff --git a/frontend/templates/topvideos.html b/frontend/templates/topvideos.html
index 5684a68..4f8bbe7 100755
--- a/frontend/templates/topvideos.html
+++ b/frontend/templates/topvideos.html
@@ -112,17 +112,17 @@ var topVideoQueueTitle = "All Time"
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery-1.5.2.min.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery.md5.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/swfobject.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/soundmanager2.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/soundmanager2.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/debug.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/api.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/auth.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/like.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/chat.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/player.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/vimeo.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/youtube.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/soundcloud.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/audio.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/like.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/chat.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/player.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/vimeo.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/youtube.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/soundcloud.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/audio.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/top.js"></script> 
 <script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>
 </html>