diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index be3a0880..5ee1348f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -38,7 +38,7 @@ @import "tabler"; @import "tabler.plugins"; -$background-color: #D1E2FF; +$background-color: #F5F7FB; $rule-color: lightblue; .video-container { @@ -50,10 +50,17 @@ $rule-color: lightblue; a { text-decoration: none !important; + cursor: pointer; } -.sessions { - background-color: white; +.bottom-div { + display: flex; + justify-content: flex-end; + flex-direction: column; +} + +.room-section { + background-color: $background-color; } .start-block { @@ -64,8 +71,6 @@ a { .start-button { font-size: 26px; - position: absolute; - bottom: 0; } .main-large { @@ -89,7 +94,7 @@ html, body { height: 100%; //background: linear-gradient(180deg, $background-color 50%, white 50%); //background-repeat: no-repeat; - background-color: $background-color; + background-color: white; } .wrapper { diff --git a/app/views/rooms/sessions.html.erb b/app/views/rooms/sessions.html.erb deleted file mode 100644 index 33b64d01..00000000 --- a/app/views/rooms/sessions.html.erb +++ /dev/null @@ -1,85 +0,0 @@ -
- - <%= render "shared/components/subtitle", subtitle: "Sessions" %> - -
-
-
- - - - - - - - - - - - - <% 3.times do %> - - - - - - - - - - <% end %> - -
NameThumbnailsLengthUsersVisibility
-
Example Meeting
-
- June 21, 2017 (about 3 hours ago) -
- 		- - - - -
- Length -
- 1 hr - 		-
- Users -
- 4 - 		-
- Visibility -
- Unlisted - 		- One - One - -
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
-
-
-
- -Sessions -

-<%= @room.recordings %> - -<% @room.recordings.each do |rec| %> -

<%= rec[:metadata][:meetingName] %>

- <% Array.wrap(rec[:playback][:format]).each do |form| %> - <%= link_to form[:type], form[:url] %> - <% end %> -<% end %> diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 32f99bd5..1cfb3df2 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -1,34 +1,41 @@ -
-
-
-

<%= @room.name %>

- -
- -
- - Copy -
-
- - Email -
-
-

2 Sessions | 3 Recordings

-
-
- <%= link_to "Start", start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %> -
-
- -
- <% (current_user.rooms - [@room]).each do |room| %> -
- <%= link_to room do %> - <%= render "shared/components/room_block", room: room %> - <% end %> +
+
+
+
+

<%= @room.name %>

+

0 Sessions | 0 Recordings

+ +
+
+ + + + +
+
+ + Copy +
+ +
- <% end %> +
+ <%= link_to "Start", start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %> +
+
+ +
+ <% (current_user.rooms - [@room]).each do |room| %> +
+ <%= link_to room do %> + <%= render "shared/components/room_block", room: room %> + <% end %> +
+ <% end %> +
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 54e2843e..b934e359 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -1,8 +1,14 @@ -
+
- <%= 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 %>
@@ -19,18 +25,14 @@ <% end %> <%= current_user.name %> - <%= current_user.subtitle %>
- - Sessions - <%= link_to settings_path, class: "dropdown-item" do %> Settings <% end %>
- + Need help? <%= link_to logout_path, class: "dropdown-item" do %> diff --git a/app/views/shared/_sessions.html.erb b/app/views/shared/_sessions.html.erb index be4cde5c..b5f30b3e 100644 --- a/app/views/shared/_sessions.html.erb +++ b/app/views/shared/_sessions.html.erb @@ -1,7 +1,7 @@
- <%= render "shared/components/subtitle", subtitle: "Sessions" %> + <%= render "shared/components/subtitle", subtitle: "Recordings" %>
@@ -14,6 +14,7 @@ Length Users Visibility + Formats @@ -57,11 +58,10 @@
- Action - Another action - Something else here + Change Visibility + Email Recording
- Separated link + Delete
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb index 33f8922d..dc5ffbad 100644 --- a/app/views/shared/components/_room_block.html.erb +++ b/app/views/shared/components/_room_block.html.erb @@ -3,7 +3,7 @@ @@ -17,8 +17,9 @@
- Action - Another action + <%= button_to root_path, class: "dropdown-item" do %> + Make Home Room + <% end %> <% if room != current_user.main_room %> <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %> Delete diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb index 94aa40e2..6b40be47 100644 --- a/app/views/shared/modals/_create_room_modal.html.erb +++ b/app/views/shared/modals/_create_room_modal.html.erb @@ -13,7 +13,8 @@ - <%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %>
+ <%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %> +
- +