lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #96 from zach-chai/home_page_rework2 

Home page rework2
This commit is contained in:
Zachary Chai 2017-01-26 07:55:52 -08:00 committed by GitHub
parent e3e154b99c ac74041aca
commit 31a8c0ea66
6 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/landing.js
View File

@ -140,7 +140,12 @@
$(".page-wrapper.meetings").data('id', newId);
$('.meeting-url').val(Meeting.getInstance().getURL());
$('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
})
if (newId === '') {
$('.invite-join-wrapper').addClass('hidden');
} else {
$('.invite-join-wrapper').removeClass('hidden');
}
});
// enable tooltips
var options = {

2
app/assets/javascripts/meeting.coffee
View File

@ -36,7 +36,7 @@ class @Meeting
_meetingInstance = null
@buildMeetingURL: (id, type) ->
return @buildFullDomainURL() + '/' + type + '/' + id
return @buildFullDomainURL() + '/' + type + '/' + encodeURIComponent(id)
@buildFullDomainURL: ->
url = location.protocol + '//' + location.hostname

13
app/views/landing/_invite_join.html.erb Normal file
View File

@ -0,0 +1,13 @@
<div class="invite-join-wrapper hidden">
<div class="col-xs-6">
<%= render 'shared/title', title: t('invite') do %>
<span><%= t('invite_description') %></span>
<% end %>
<%= render 'shared/meeting_url', hidden: false %>
</div>
<div class="verticle-line"></div>
<div class="col-xs-6">
<%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %>
<%= render 'shared/join_form' %>
</div>
</div>

6
app/views/landing/_previously_joined.html.erb Normal file
View File

@ -0,0 +1,6 @@
<div class="previously-joined-wrapper hidden">
<div class="list-group text-center">
<h4><%= t('previously_joined_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
</div>

28
app/views/landing/index.html.erb
View File

@ -28,33 +28,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<%= render 'shared/meeting_name_form' %>
<div class="row">
<div class="previously-joined-wrapper hidden">
<div class="list-group text-center">
<h4><%= t('previously_joined_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
</div>
<%= render 'landing/previously_joined' %>
</div>
<div class="row invite-join-wrapper">
<div class="col-xs-6">
<div class="title-wrapper text-center">
<div class="title-invite">
<h2><%= t('invite') %></h2>
<span><%= t('invite_description') %></span>
</div>
</div>
<%= render 'shared/meeting_url', hidden: false %>
</div>
<div class="verticle-line"></div>
<div class="col-xs-6">
<div class="title-wrapper text-center">
<div class="title-join">
<h2 class="join-meeting-title"><%= t('join') %></h2>
</div>
</div>
<%= render 'shared/join_form' %>
</div>
<div class="row">
<%= render 'landing/invite_join' %>
</div>
</div>

7
app/views/shared/_title.html.erb Normal file
View File

@ -0,0 +1,7 @@
<% title_class ||= '' %>
<div class="title-wrapper text-center">
<div class="title">
<h2 class="<%= title_class if title_class %>"><%= title %></h2>
<%= yield %>
</div>
</div>