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

more ui tweaks

Browse Source
This commit is contained in:
Josh
2018-05-31 16:54:48 -04:00
parent ede80075c1
commit 39414e269b
8 changed files with 87 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/shared/_header.html.erb
View File

@ -1,8 +1,14 @@
<div class="header py-4 mb-6">
<div class="header py-4">
<div class="container">
<div class="d-flex">
<%= link_to root_path, class: "header-brand" do %>
<%= image_tag("logo_with_text.png", class: "header-brand-img") %>
<% if current_user %>
<%= link_to current_user.main_room, class: "header-brand" do %>
<%= image_tag("logo_with_text.png", class: "header-brand-img") %>
<% end %>
<% else %>
<%= link_to root_path, class: "header-brand" do %>
<%= image_tag("logo_with_text.png", class: "header-brand-img") %>
<% end %>
<% end %>
<div class="d-flex order-lg-2 ml-auto">
@ -19,18 +25,14 @@
<% end %>
<span class="ml-2 d-none d-lg-block">
<span class="text-default"><%= current_user.name %></span>
<small class="text-muted d-block mt-1"><%= current_user.subtitle %></small>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow" x-placement="bottom-end" style="position: absolute; transform: translate3d(-56px, 32px, 0px); top: 0px; left: 0px; will-change: transform;">
<a class="dropdown-item" href="#">
<i class="dropdown-icon fe fe-user"></i> Sessions
</a>
<%= link_to settings_path, class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-settings"></i> Settings
<% end %>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">
<a class="dropdown-item" href="http://docs.bigbluebutton.org/support/faq.html">
<i class="dropdown-icon fe fe-help-circle"></i> Need help?
</a>
<%= link_to logout_path, class: "dropdown-item" do %>

10
app/views/shared/_sessions.html.erb
View File

@ -1,7 +1,7 @@
<div class="sessions pb-5">
<div class="container pt-6">
<%= render "shared/components/subtitle", subtitle: "Sessions" %>
<%= render "shared/components/subtitle", subtitle: "Recordings" %>
<div class="col-12">
<div class="card">
@ -14,6 +14,7 @@
<th class="text-left">Length</th>
<th class="text-left">Users</th>
<th class="text-left">Visibility</th>
<th>Formats</th>
<th class="text-center"><i class="icon-settings"></i></th>
</tr>
</thead>
@ -57,11 +58,10 @@
<div class="item-action dropdown">
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-tag"></i> Action </a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-edit-2"></i> Another action </a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-message-square"></i> Something else here</a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon far fa-eye"></i> Change Visibility</a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon far fa-envelope"></i> Email Recording</a>
<div class="dropdown-divider"></div>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-link"></i> Separated link</a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-trash"></i> Delete</a>
</div>
</div>
</td>

7
app/views/shared/components/_room_block.html.erb
View File

@ -3,7 +3,7 @@
<table class="table table-hover table-outline table-vcenter text-nowrap card-table">
<tbody>
<td>
<span class="stamp stamp-md bg-azure mr-3">
<span class="stamp stamp-md bg-primary mr-3">
<i class="fas fa-<%= room.icon %>"></i>
</span>
</td>
@ -17,8 +17,9 @@
<div class="item-action dropdown">
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-tag"></i> Action </a>
<a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-edit-2"></i> Another action </a>
<%= button_to root_path, class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-home"></i> Make Home Room
<% end %>
<% if room != current_user.main_room %>
<%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-trash"></i> Delete

3
app/views/shared/modals/_create_room_modal.html.erb
View File

@ -13,7 +13,8 @@
<span class="input-icon-addon">
<i class="fas fa-chalkboard-teacher"></i>
</span>
<%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %> </div>
<%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %>
</div>
<label class="custom-switch mt-5 mb-5 float-left">
<%= f.check_box :auto_join, class: "custom-switch-input", checked: true %>
<span class="custom-switch-indicator"></span>