Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bobylito/Slidez
base: ee44e8b0a9
...
head fork: bobylito/Slidez
compare: 85530ee1ad
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
15 app/controllers/Application.scala
@@ -34,11 +34,6 @@ object Application extends Controller {
Ok(views.html.secret(streams))
}
- val broadcastForm = Form(
- tuple(
- "id" -> number,
- "page" -> nonEmptyText,
- "tick" -> number))
/**
* Creates the database entry and display the slides
*/
@@ -49,7 +44,8 @@ object Application extends Controller {
LiveStream.create( LiveStream(NotAssigned, "Presentation hackday slidez", url) )
.map(id => {
PresentationWorker.ref ! NewPresentation(id)
- Ok(views.html.speaker(id, url))
+ //Ok(views.html.speaker(id, url))
+ Redirect(routes.Application.speakerViewAgain(id))
})
.getOrElse( BadRequest )
})
@@ -66,6 +62,12 @@ object Application extends Controller {
})
.getOrElse(BadRequest )
}
+
+ val broadcastForm = Form(
+ tuple(
+ "id" -> number,
+ "page" -> nonEmptyText,
+ "tick" -> number))
/**
* Update the state of the slides and broadcast the info to listeners
@@ -75,7 +77,6 @@ object Application extends Controller {
formWithErrors => BadRequest("NOT GOOD! Try again"),
{
case (id, page, tick) =>
- print(tick)
LogSlide.insert(LogSlide(NotAssigned, id, page, tick))
PresentationWorker.ref ! ChangePage(id, page)
Ok("broadCast")
View
2  app/views/index.scala.html
@@ -21,7 +21,7 @@
<h2>On air</h2>
<ul>
@livePrez.map { prez =>
- <li><a href="@routes.Application.view(prez.id.get)">@prez.name</a></li>
+ <li><a href="@routes.Application.view(prez.id.get)">@prez.name</a></li>
}
</ul>
View
8 app/views/speaker.scala.html
@@ -1,6 +1,5 @@
@(idPresentation: Long, url: String)
@main("SlideZ"){
-<title>Slidez</title>
<div id="present">
<iframe></iframe>
@@ -252,8 +251,13 @@
if (aEvent.source === this.views.present) {
if (argv[0] === "NOTES" && argc === 2)
$("#notes > #content").innerHTML = this.notes = argv[1];
- if (argv[0] === "REGISTERED" && argc === 3)
+ if (argv[0] === "REGISTERED" && argc === 3){
$("#slidecount").innerHTML = argv[2];
+ jQuery.ajax(window.location.toString()+'?name='+argv[1],
+ {
+ type:'PUT'
+ });
+ }
}
}
View
1  conf/routes
@@ -9,6 +9,7 @@ POST /broadCast controllers.Application.broadCast
GET /view/:id controllers.Application.view(id : Long)
POST /speakerview controllers.Application.speakerView
GET /speakerview/:id controllers.Application.speakerViewAgain(id : Long)
+PUT /speakerview/:id controllers.Application.updateSlidesName(id : Long, name : String)
GET /viewStream/:id controllers.Application.viewStream(id : Long)
PUT /slides/:id controllers.Application.updateSlidesName(id: Long, name: String)

No commit comments for this range

Something went wrong with that request. Please try again.