From f3b0dbaa669159ec880848f7b70220791a1427fa Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 9 Oct 2012 08:40:44 +0200
Subject: - users own room

---
 templates/apps/auth/login.html  | 4 ++--
 templates/apps/room/launch.html | 5 ++++-
 templates/base.html             | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/apps/auth/login.html b/templates/apps/auth/login.html
index e72e73a..6ac85c3 100644
--- a/templates/apps/auth/login.html
+++ b/templates/apps/auth/login.html
@@ -4,8 +4,8 @@
 {% block content %}
 <div class="hero-unit">
     <h1>Online Meetings</h1>
-	<p>Welcome to the meeting tools. Either <a class="btn btn-small btn-primary" href="/accounts/login-federated">Login</a> to manage
+	<p>Welcome to the meeting tools. Either <a class="btn btn-small btn-primary" href="{{LOGIN_URL}}?next=/rooms">Login</a> to manage
         your meeting rooms and recordings, or ...</p>
-	<a class="btn btn-large btn-success pull-right" href="/accounts/login-federated?next=/user/myroom">Click here to Start a Meeting Now &raquo;&raquo;</a>
+	<a class="btn btn-large btn-success pull-right" href="/myroom">Click here to Start a Meeting Now &raquo;&raquo;</a>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/apps/room/launch.html b/templates/apps/room/launch.html
index 54b30c4..a7b495c 100644
--- a/templates/apps/room/launch.html
+++ b/templates/apps/room/launch.html
@@ -18,12 +18,15 @@
 				If you are hosting this meeting and are comfortable with the Adobe Connect software you may press 'Enter as Host' below to become the first host.
 				{% endif %}
 			</p>
+            <p>
+                The public URL of this room is <code>{{BASE_URL}}go/{{room.id}}</code>. Give this to other participants.
+            </p>
 		</div>
 	</div>
 	<br/>
 	<div>
         <form id="launch" method="GET">
-            <a class="btn btn-large" href="/rooms#{{room.id}}">Cancel</a>
+            <button class="btn btn-large cancel" href="#">Cancel</button>
             {%if room.nhosts == 0 %}
             <a class="btn btn-large btn-success submitter" data-form="#launch" href="/promote/{{room.id}}">Enter as Host</a>
             {% endif %}
diff --git a/templates/base.html b/templates/base.html
index ba3b06d..90d516e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -43,6 +43,12 @@
 	$(function() {
         prettyPrint();
         $(".submitter").submitter()
+        $(".cancel").each(function(that) {
+            that.click(function(ev) {
+                ev.preventDefault();
+                document.location = document.referrer;
+            })
+        });
 	    {% block widgets %}{% endblock %}
 	});
 	</script>
-- 
cgit v1.1