zero merge

lib/Dojo.pm

@@ -56,13 +56,15 @@ sub startup {
   $logged_in->get('/radio')->to('home#radio');
   # ===================
 
-  # login user grulla =
+  # login any temp pass=
+  my $usert = $r->under('/')->to('users#is_tmp');
   # common  grulla user
   my $user = $r->under('/')->to('users#is_grulla');
   $user->any('/ccast')->to('home#bcast');
   # personal 
   my $guest = $r->under('/')->to('users#is_grulla_tmp');
   $guest->any('/bcast')->to('home#bcast');
+  $guest->any('/radiop')->to('home#radiop');
   # ===================
 
   # admin =======================================================================

lib/Dojo/Controller/Home.pm

@@ -116,6 +116,13 @@ sub radio{
   $c->stash(nick=>$c->session("nick"));
 }
 
+sub radiop{
+  my $c=shift;
+  $c->stash(layout=> "defaultContact");
+  $c->stash($c->dbv->mod);
+  $c->stash(nick=>$c->session("nick"));
+}
+  
 sub candy{
   my $c=shift;
   $c->stash( css=>["/ext/candy/libs.min.css","/home/candy/default.css"]);

lib/Dojo/Controller/Users.pm

@@ -64,6 +64,7 @@ sub is_admin {
   $self->redirect_to('login');
 }
 
+
 sub is_grulla {
   my $self = shift;
     return 1 if (($self->session('pmid')//0)>=2);

public/home/home/bcast.js

@@ -17,6 +17,9 @@ window.onload = function(){
           else if (d.icestats.source.listenurl == radio_listen_url){
           console.log("transmitiendo radio"); 
           onliner(d); } 
+          else if (d.icestats.source.listenurl == radiop_listen_url){
+          console.log("transmitiendo radio"); 
+          onlinerp(d); } 
           else {
           console.warn("otro canal");
           offline(); }}                                 
@@ -55,11 +58,11 @@ window.onload = function(){
       .on("click",function(){window.location="bcast";});
     dataUpdate();
 }
-  function onliner(d){
+  function onlinerp(d){
     d3.selectAll(".broadcast")
       .style("display","block");
     d3.selectAll("article.broadcast,p.broadcast")
-      .on("click",function(){window.location="radio";});
+      .on("click",function(){window.location="radiop";});
     dataUpdate();
 }
 

templates/home/radiop.html.ep

@@ -0,0 +1,46 @@
+% stash css=>["/home/radio/radio.css"];
+% stash js=>["/home/radio/link.js","/home/radio/radio.js"];
+<section class="flex title">
+  <article class="title"> <p>Radio Vuelo de grulla</p> </article>
+</section>
+
+<section class="flex uname">
+  <article class="uname"><p> <%= $nick %></p></article>
+</section>
+
+<section class="flex rmod">
+  <article><p id="rmod"> <%= $rmod %></p> </article> 
+</section>
+
+<section class="flex logout"> <article class="logout">
+  <a href=" logout "><p id="logout"> Salir </p></a>
+</article> </section>
+
+<section class="flex info">
+  <article class="online"> 
+    <p>Estás escuchando a</p>
+    <p id="prof"></p>
+  </article>
+  <article class="offline"> 
+    <p>Todavía no comenzamos</p>
+    <p>Por favor espera unos minutos</p>
+  </article> 
+  <article class="spot">
+  <div class="spot" id="spot"></div>
+  <div id="clink" class="chat">Entra al Chat</div> 
+  </article>
+</section>
+
+<section class="flex radio"><article class="radio">
+ <p id="now"></p>
+<audio id="ra" controls="controls" preload="none" ></audio>
+</article> </section>
+
+<section class="flex chat"><article>
+</section></article> </section>
+<script> 
+ const nick="<%= $nick %>";
+ const radio_server="<%= $config->{radio_server} %>";
+ const listen_url="<%= $config->{radiop_server_name} %>";
+ const channel="<%= $config->{radiop_channel} %>";
+</script>

templates/users/logint.html.ep

@@ -1,4 +1,4 @@
-%stash css=>["/users/login/formu.css"];
+%stash css=>["/users/login/formt.css"];
 <section class="hero">
 <article class="login">
   <p>Bienvenido</p>