ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-27 04:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added styling to movie pages

Browse source
This commit is contained in:
Luke Barratt 2014-04-26 22:28:06 +01:00
parent cf8f4e89af
commit c471ccff22
8 changed files with 242 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/assets/stylesheets/pages/_files.scss
View file

@ -44,3 +44,47 @@
margin-top: em(20); margin-top: em(20);
} }
} }
/*
Movies List
*/
#movies {
.filters {
@include span-columns(12);
margin-bottom: em(20);
}
}
table.movie {
.controls {
@include span-columns(12);
margin: em(20) 0;
}
}
.movie-full {
.title {
display: none;
}
#player {
display: block;
position: relative;
width: 100%;
height: 0px;
padding-bottom: 56%;
padding-top: 50px;
margin-bottom: em(20);
object {
position: absolute;
width: 100%;
height: 100%;
top: 0;
}
}
}

81
app/views/movies/_form.html.erb
View file

@ -1,49 +1,50 @@
<div class="wide box"> <%= form_for @movie, html: { multipart: true, class: 'square' } do |f| %>
<%= form_for @movie, :html => { :multipart => true } do |f| %> <%= render 'shared/errors', messages: @movie.errors.full_messages %>
<%= f.error_messages %>
<% if @movie.file %> <% if @movie.file %>
<%= link_to "Go to file", edit_data_file_path(@movie.file) %> <%= link_to "View File", edit_data_file_path(@movie.file), class: 'button tiny' %>
<% end %> <% end %>
<p> <div class="fields horizontal">
<%= f.label :name %><br /> <%= f.label :name %>
<%= f.text_field :name, {:value => @movie.file.to_s} %> <%= f.text_field :name, { value: @movie.file.to_s } %>
</p> </div>
<p> <div class="fields horizontal">
<%= f.label :category_id %><br /> <%= f.label :category_id %>
<%= f.select :category_id, Category.ordered.collect{|c| ["#{c.domains[c.domain]} - #{c}", c.id]} %> <%= f.select :category_id, Category.ordered.collect { |c| ["#{c.domains[c.domain]} - #{c}", c.id] } %>
</p> </div>
<p> <div class="fields horizontal">
<%= f.label :content %><br /> <%= f.label :content %>
<%= f.text_field :content %> <%= f.text_field :content %>
</p> </div>
<p> <div class="fields horizontal">
<%= f.label :format %><br /> <%= f.label :format %>
<%= f.text_field :format %> <%= f.text_field :format %>
</p> </div>
<p> <div class="fields horizontal">
<%= f.label :length, "Length in seconds" %><br /> <%= f.label :length, "Length in seconds" %>
<%= f.text_field :length %> <%= f.text_field :length %>
</p> </div>
<p> <div class="fields horizontal">
<%= link_to_function 'Author', "findUser('movie[user_name]')" %><br /> <%= f.label :user_name, "Author" %>
<%= f.text_field :user_name, {:value => @movie.get_user} %> <%= f.text_field :user_name, { value: @movie.get_user } %>
</p> </div>
<p> <div class="fields horizontal">
<%= f.label :file %><br /> <%= f.label :file %>
<%= f.select :file_id, DataFile.movies.collect{|d| ["#{d.name}", d.id]}, {:include_blank => true} %> <div class="inputs">
</p> <%= f.select :file_id, DataFile.movies.collect { |d| ["#{d.name}", d.id] }, { include_blank: true } %>
<p> </div>
<%= f.label :preview_id %><br /> </div>
<%= f.select :preview_id, @movie.all_files.collect{|d| ["#{d.name}", d.id]}, {:include_blank => true} %> <div class="fields horizontal">
</p> <%= f.label :preview_id %>
<p> <%= f.select :preview_id, @movie.all_files.collect { |d| ["#{d.name}", d.id] }, { include_blank: true } %>
<%= f.label :picture %><br /> </div>
<div class="fields horizontal">
<%= f.label :picture %>
<%= f.file_field :picture %> <%= f.file_field :picture %>
</p> </div>
<p>
<div class="controls">
<%= f.submit 'Save' %> <%= f.submit 'Save' %>
</p> </div>
<% end %> <% end %>
</div>

32
app/views/movies/_movie.html.erb
View file

@ -1,44 +1,34 @@
<div class="wide box sub"> <table class="movie">
<table id="movie">
<tr> <tr>
<td> <td>
<br />&nbsp;<br />
<% if movie.picture %> <% if movie.picture %>
<%= image_tag movie.picture.url, :class => "centered" %> <%= image_tag movie.picture.url, :class => "centered" %>
<% end %> <% end %>
</td> </td>
<td> <td>
<h3 class="center"> <h3 class="title"><%= namelink movie %></h3>
<%= namelink movie %>
</h3>
<%= cascade movie, ["content", "format", ["Author", :user], "length_s", ["Views", "view_count"], ["Date", "file.created_at"]] %> <%= cascade movie, ["content", "format", ["Author", :user], "length_s", ["Views", "view_count"], ["Date", "file.created_at"]] %>
<% (params[:action] == "show" ? movie.all_files : [movie.file]).each do |file| %> <% (params[:action] == "show" ? movie.all_files : [movie.file]).each do |file| %>
<p>
<b>File: </b> <%= link_to File.basename(file.name.to_s), file.url %> <b>File: </b> <%= link_to File.basename(file.name.to_s), file.url %>
</p>
<ul> <ul>
<li> <li>
<b>MD5:</b> <%= file.md5_s %> <strong>MD5:</strong> <%= file.md5_s %>
</li> </li>
<li> <li>
<b>Size:</b> <%= file.size_s %> MB <strong>Size:</strong> <%= file.size_s %> MB
</li> </li>
</ul> </ul>
<% end %> <% end %>
<% if cuser and movie.can_update? cuser %> <% if cuser and movie.can_update? cuser %>
<p> <div class="controls">
<%= link_to 'Edit', edit_movie_path(movie) %> | <%= link_to 'Edit', edit_movie_path(movie), class: 'button tiny' %>
<%= link_to 'Make a Preview', :action => "preview", :id => movie %> | <%= link_to 'Make a Preview', { action: "preview", id: movie }, class: 'button tiny' %>
<%= link_to 'Destroy', movie, :confirm => 'Are you sure?', :method => :delete %> <%= link_to 'Destroy', movie, confirm: 'Are you sure?', method: :delete, class: 'button tiny' %>
</p> </div>
<% end %> <% end %>
</td> </td>
</tr> </tr>
</table> </table>
<div class="clear">
</div>
</div>

105
app/views/movies/edit.html.erb
View file

@ -1,60 +1,65 @@
<h1>Editing movie</h1> <h1>Editing Movie</h1>
<%= render :partial => "form" %> <%= render partial: 'form' %>
<div class="wide box"> <div class="preview">
<h3> <h3>Make a Preview</h3>
Make a preview
</h3>
<p> <p>
This will produce a MP4-version preview of the file. It will take usually 3-4 times the movie length. This will produce a MP4-version preview of the file. It will take usually 3-4 times the movie length.
The program will run in the background and the preview file will automatically added to the movie. The program will run in the background and the preview file will automatically added to the movie.
</p> </p>
<%= form_tag :action => "preview", :id => @movie.id do %> <%= form_tag({ action: "preview", id: @movie.id }, { class: 'square' }) do %>
<p> <div class="fields horizontal">
Resolution: <%= text_field_tag "x", "800", :size => 2 %> x <%= text_field_tag "y", "600", :size => 2 %> <%= label_tag "Resolution" %>
</p> <div class="inputs">
<%= text_field_tag "x", "800", size: 2 %> x <%= text_field_tag "y", "600", size: 2 %>
<p> </div>
<%= submit_tag "Make a preview" %>
</p>
<% end %>
<br />
<h3>
Take a snapshot
</h3>
<%= form_tag :action => "snapshot", :id => @movie.id do %>
<p>
Secs: <%= text_field_tag "secs" %>
</p>
<p>
<%= submit_tag "Take snapshot" %>
</p>
<% end %>
<h3>
Download (stream)
</h3>
<%= form_tag :action => "download", :id => @movie.id do %>
<p>
This will start downloading the video from an IP and Port.
</p>
<p>
IP: <%= text_field_tag "ip", "", :size => 12 %> : <%= text_field_tag "port", "", :size => 3 %>
</p>
<p>
<%= submit_tag "Download" %>
</p>
<% end %>
</div> </div>
<%= link_to 'Show', @movie %> | <div class="controls">
<%= link_to 'Back', movies_path %> <%= submit_tag "Make a Preview" %>
</div>
<% end %>
</div>
<div class="snapshot">
<h3>Take a Snapshot</h3>
<%= form_tag({ action: "snapshot", id: @movie.id }, { class: 'square' }) do %>
<div class="fields horizontal">
<%= label_tag "Seconds" %>
<%= text_field_tag "secs" %>
</div>
<div class="controls">
<%= submit_tag "Take Snapshot" %>
</div>
<% end %>
</div>
<div class="stream">
<h3>Download (Stream)</h3>
<%= form_tag({ action: "download", id: @movie.id }, { class: 'square' }) do %>
<p>This will start downloading the video from an IP and Port.</p>
<div class="fields horizontal">
<%= label_tag "IP" %>
<%= text_field_tag "ip", "", size: 12 %>
</div>
<div class="fields horizontal">
<%= label_tag "Port" %>
<%= text_field_tag "port", "", size: 3 %>
</div>
<div class="controls">
<%= submit_tag "Download" %>
</div>
<% end %>
</div>

57
app/views/movies/index.html.erb
View file

@ -1,23 +1,25 @@
<h1> <div id="movies">
ENSL Movie Archive <h1 class="title">Movie Archive</h1>
</h1> <p>We recommend <%= link_to "VLC Player", "http://www.videolan.org/vlc/" %> for movie playback.</p>
<p> <div class="filters">
We recommend <%= link_to "VLC Player", "http://www.videolan.org/vlc/" %> for movie playback. <%= form_tag movies_url, method: "get" do %>
</p> <div class="fields">
<%= form_tag movies_url(), :method => "get" do %>
Limit to:
<%= select_tag :filter, options_for_select({"5 stars" => 5, "4 stars" => 4, "3 stars" => 3, "2 stars" => 2, "1 stars" => 1}) %> <%= select_tag :filter, options_for_select({"5 stars" => 5, "4 stars" => 4, "3 stars" => 3, "2 stars" => 2, "1 stars" => 1}) %>
Order by: </div>
<div class="fields">
<%= select_tag :order, options_for_select({"Ratings" => :ratings, "Date" => :date, "Author" => :author}) %> <%= select_tag :order, options_for_select({"Ratings" => :ratings, "Date" => :date, "Author" => :author}) %>
</div>
<div class="controls">
<%= submit_tag "Filter" %> <%= submit_tag "Filter" %>
<% end %> </div>
<% end %>
</div>
<br /> <div id="movie" class="tabbed">
<ul id="movie-nav" class="tabs">
<div id="movieTabs">
<ul id="movieTabs-nav" class="tabs">
<% Category.domain(Category::DOMAIN_MOVIES).ordered.each do |cat| %> <% Category.domain(Category::DOMAIN_MOVIES).ordered.each do |cat| %>
<li> <li>
<a href="#<%= cat.id %>"><%= cat %></a> <a href="#<%= cat.id %>"><%= cat %></a>
@ -25,24 +27,25 @@
<% end %> <% end %>
</ul> </ul>
<div class="box wide tabs"> <div class="tabbed-contents">
<% Category.domain(Category::DOMAIN_MOVIES).each do |cat| %> <% Category.domain(Category::DOMAIN_MOVIES).each do |cat| %>
<div class="tab" id="<%= cat.id %>"> <div class="tab" id="<%= cat.id %>">
<div id="movieList">
<% @movies.each do |m| %> <% @movies.each do |m| %>
<% next if m.category != cat %> <% next if m.category != cat %>
<%= render :partial => "movie", :object => m %> <%= render partial: "movie", object: m %>
<% end %>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>
<script type="text/javascript">
new Yetii({
id: 'movie'
});
</script>
<% if cuser and DataFile.new(directory_id: Directory::MOVIES).can_create? cuser %>
<%= link_to "New Movie", { controller: "data_files", action: "new", id: Directory::MOVIES }, { class: 'button' } %>
<% end %> <% end %>
</div>
</div> </div>
<script type="text/javascript">
var tabber1 = new Yetii({id: 'movieTabs'});
</script>
<% if cuser and DataFile.new(:directory_id => Directory::MOVIES).can_create? cuser %>
<%= link_to "New Movie", :controller => "data_files", :action => "new", :id => Directory::MOVIES %>
<% end %>

6
app/views/movies/new.html.erb
View file

@ -1,5 +1,3 @@
<h1>New movie</h1> <h1>New Movie</h1>
<%= render :partial => "form" %> <%= render partial: 'form' %>
<%= link_to 'Back', movies_path %>

32
app/views/movies/show.html.erb
View file

@ -1,32 +1,26 @@
<div class="box"> <div class="movie-full">
<h2> <h1 class="fancy">
<%= namelink @movie %> <span><%= namelink @movie %></span>
</h2> </h1>
<%= render :partial => "movie", :object => @movie %>
<%= render partial: "movie", object: @movie %>
<% if @movie.preview %> <% if @movie.preview %>
<div class="nbox wide center"> <div class="player">
<%= javascript_include_tag 'flowplayer' %> <%= javascript_include_tag 'flowplayer' %>
<script> <script>
flowplayer("player", "/flash/flowplayer-3.1.3.swf", flowplayer("player", "/flash/flowplayer-3.1.3.swf", {
{ clip: {
clip:
{
autoPlay: false, autoPlay: false,
autoBuffering: false autoBuffering: false
} }
}); });
</script> </script>
<a
href="<%= @movie.preview.url %>"
style="display:block;width:520px;height:330px"
id="player" class="centered">
</a>
<p> <a id="player" href="<%= @movie.preview.url %>"></a>
This is a low quality version. Please download better version from above. <br />
We recommend <%= link_to "VLC Player", "http://www.videolan.org/vlc/" %> for movie playback. <p>This is a low quality version. Please download better version from above.</p>
</p>
</div> </div>
<% end %> <% end %>
</div> </div>

6
app/views/users/_movies.html.erb
View file

@ -1,7 +1,5 @@
<h2> <h2>Movies</h2>
Movies
</h2>
<div class="userData"> <div class="userData">
<%= render :partial => "movies/movie_user", :collection => @user.movies %> <%= render partial: "movies/movie_user", collection: @user.movies %>
</div> </div>