diff --git a/app/views/coding/display.html.erb b/app/views/coding/display.html.erb index adfb5a9..cec1cfb 100644 --- a/app/views/coding/display.html.erb +++ b/app/views/coding/display.html.erb @@ -79,23 +79,13 @@ -
-
- -
-
- -
-
-
- - - <% @ratios.each do |v,r| %> - <% hidden_field_tag "v#{v}", r %> - <% end %> - - <%= hidden_field_tag "number_of_column", @ratios.length %> - <%= hidden_field_tag "number_of_rows", @thread.media.length %> + + <% @ratios.each do |v,r| %> + <% hidden_field_tag "v#{v}", r %> + <% end %> + +<%= hidden_field_tag "number_of_column", @ratios.length %> +<%= hidden_field_tag "number_of_rows", @thread.media.length %>
@@ -127,27 +117,29 @@
- <% @thread.images.by_media(m).each_with_index do |image, ic| %> -
" style="margin-bottom: 4px" class="span1 <%= "thum_image#{ic+1}" %>" image_name="<%= image.image_name %>"> - ' title=""> + <% @thread.images.each_with_index do |image, ic| %> + <% if @images[ic].media == m %> +
" style="margin-bottom: 4px" class="span1 <%= "thum_image#{ic+1}" %>" image_name="<%= image.image_name %>"> + ' title=""> - <% #image_tag "/assets#{@thread.images[ic].local_path}", id: "image#{ic+1}", style: " opacity: 0.8;", image_size: @images[ic].size%> - - <% if @images[ic].local_path == "404.jpg" %> - " style=" opacity: 0.7;" image_size="<%= @images[ic].size %>" /> - <% else %> - <% if @thread.image_coded? @images[ic] %> - " class="thum-img" style=" opacity: 0.4;" image_size="<%= @images[ic].size %>" name="<%= @images[ic].image_name %>" /> + <% #image_tag "/assets#{@thread.images[ic].local_path}", id: "image#{ic+1}", style: " opacity: 0.8;", image_size: @images[ic].size%> + + <% if @images[ic].local_path == "404.jpg" %> + " style=" opacity: 0.7;" image_size="<%= @images[ic].size %>" /> <% else %> - " class="thum-img" style=" opacity: 0.8;" image_size="<%= @images[ic].size %>" name="<%= @images[ic].image_name %>" /> + <% if @thread.image_coded? @images[ic] %> + " class="thum-img" style=" opacity: 0.3;" image_size="<%= @images[ic].size %>" name="<%= @images[ic].image_name %>" /> + <% else %> + " class="thum-img" style=" opacity: 0.7;" image_size="<%= @images[ic].size %>" name="<%= @images[ic].image_name %>" /> + <% end %> <% end %> + + + <% @thread.highlighted_areas_for_image(image).each do |ha| %> +
" style="position: absolute; overflow: hidden; z-index: 0; left: 0px; top: 0px; width: 0px; height: 0px; display: block; opacity: 0.7;" class="">
<% end %> - - - <% @thread.highlighted_areas_for_image(image).each do |ha| %> -
" style="position: absolute; overflow: hidden; z-index: 0; left: 0px; top: 0px; width: 0px; height: 0px; display: block; opacity: 0.7;" class="">
+
<% end %> -
<% end %>