Adapting public spaces webconferences to show links to invite instead…

… of join when there is no user logged.

And join_mobile is only shown for logged users.

Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: git://github.com/mconf/bigbluebutton_rails.git
-  revision: 8d64e8a013d2d986b320497b0210a75a76467327
+  revision: a4546db1976b8a135f05ba8361c94030b0fad575
   specs:
     bigbluebutton_rails (0.0.4)
       bigbluebutton-api-ruby (~> 0.0.10)

app/views/spaces/show.html.erb

@@ -85,6 +85,12 @@
 
 <% end %>
 
+<% if logged_in? %>
+  <% webconf_join_link = space_join_room_path(space, @bbb_room) %>
+<% else %>
+  <% webconf_join_link = space_invite_room_path(space, @bbb_room) %>
+<% end %>
+
 <%= content_for :search do  %>
   <%= render :partial => 'search/form' %>
 <%end%>
@@ -99,10 +105,12 @@
             <div class="float_right more_info"><%= link_to t('more'), space_webconference_path(space) %></div>
           </h3>
           <div class="float_right">
-            <%= link_to ("<span>" + t('button.join') + "</span>").html_safe, space_join_room_path(space, @bbb_room), :class => 'basic_button small_button orange_pale_button' %>
+            <%= link_to ("<span>" + t('button.join') + "</span>").html_safe, webconf_join_link, :class => 'basic_button small_button orange_button' %>
           </div>
           <div class="float_right">
-            <%= mobile_icon_link(space_join_mobile_room_path(space, @bbb_room)) %>
+            <% if logged_in? %>
+              <%= mobile_icon_link(space_join_mobile_room_path(space, @bbb_room)) %>
+            <% end %>
           </div>
           <div class="content">
             <% if @bbb_room.is_running? %>
@@ -165,9 +173,9 @@
 
 <% if @bbb_room.is_running? %>
   <div id="space_webconference_alert">
-    <%= t('webconference.currently_running', :count => @bbb_room.participant_count) %>.
-    <a href="<%= space_join_room_path(space, @bbb_room) %>"><%= t('webconference.space.join_now') %></a> or
-      <a href="<%= space_webconference_path(space) %>"><%= t('webconference.space.see_more') %></a>.
+    <%= t('webconference.currently_running', :count => @bbb_room.participant_count) %>,
+    <%= link_to t('webconference.space.join_now'), webconf_join_link %> <%= t('or') %>
+    <%= link_to t('webconference.space.see_more'), space_webconference_path(space) %>.
   </div>
 <% end %>
 

app/views/webconferences/_sidebar.html.erb

@@ -1,10 +1,17 @@
-<%= link_to ("<span>" + t('button.join_webconference') + "</span>").html_safe, space_join_room_path(space, @bbb_room),
+<% if logged_in? %>
+  <% join_link = space_join_room_path(space, @bbb_room) %>
+<% else %>
+  <% join_link = space_invite_room_path(space, @bbb_room) %>
+<% end %>
+<%= link_to ("<span>" + t('button.join_webconference') + "</span>").html_safe, join_link,
       :class => 'big_button orange_button bigbluebutton_button' %>
 
 <div class="clearer"></div>
 <br/>
 
-<% ico = "<div class=\"webconference_join_mobile_ico\"></div>" %>
-<%= link_to ("<span>" + ico + t('button.join_webconference_mobile') + "</span>").html_safe, space_join_mobile_room_path(space, @bbb_room),
-      :class => 'big_button orange_button bigbluebutton_button', :id => "join_mobile_button" %>
+<% if logged_in? %>
+  <% ico = "<div class=\"webconference_join_mobile_ico\"></div>" %>
+  <%= link_to ("<span>" + ico + t('button.join_webconference_mobile') + "</span>").html_safe, space_join_mobile_room_path(space, @bbb_room),
+        :class => 'big_button orange_button bigbluebutton_button', :id => "join_mobile_button" %>
+<% end %>
 

app/views/webconferences/show.html.erb

@@ -42,10 +42,12 @@
       <span><%= t('webconference.space.share') %></span>
     </div>
     <span class="only_url"><%= t('url_plain') %>: </span><span class="blue"><%= space_invite_room_url(space, @bbb_room) %></span>
-    <div class="invite_button">
-      <%= link_to t('button.invite'), inviteroom_invite_path(:roomName => space.name,
-            :roomUrl => space_invite_room_url(space, @bbb_room)), :id => 'invite_bbb_link', :class => 'basic_button' %>
-    </div>
+    <% if logged_in? %>
+      <div class="invite_button">
+        <%= link_to t('button.invite'), inviteroom_invite_path(:roomName => space.name,
+              :roomUrl => space_invite_room_url(space, @bbb_room)), :id => 'invite_bbb_link', :class => 'basic_button' %>
+      </div>
+    <% end %>
   </div>
 </div>
 

config/locales/pt-br.yml

@@ -2138,8 +2138,7 @@ pt-br:
       name: ! 'Nome:'
       name_enter: Insira seu nome
       password: ! 'Senha:'
-      password_filled: Está sala é pública. A senha foi preenchida com a senha do
-        atendente
+      password_filled: Esta sala é pública. A senha foi preenchida automaticamente.
       password_role: Digite a senha de moderador ou participante.
       status: ! 'Status da reunião: '
     join:
@@ -2148,7 +2147,7 @@ pt-br:
         que ela começar.
       title: ! 'Sala: %{name}'
     not_running: inativa.
-    refresh: forçar recarregamento
+    refresh: atualizar status
     running: rodando!
   save: Salvar
   save_ch: Salvar alterações
@@ -2733,7 +2732,7 @@ pt-br:
         <b>%{status}</b> <br/> Clique no botão no topo da barra lateral para ingressar
         na webconferência. <br/> Você também pode compartilhar o link abaixo (ou clicar
         em "convidar") para convidar outras pessoas.'
-      join_now: participar agora
+      join_now: participe agora
       see_more: saiba mais
       share: Compartilhar
     title_people_conf: Pessoas na sala