From e759481583c3be2924a32f068b917b2d1f5ad9bb Mon Sep 17 00:00:00 2001
From: Jerome Lacoste <jerome.lacoste@gmail.com>
Date: Thu, 7 Jan 2016 23:07:56 +0100
Subject: [PATCH 1/4] Alternative to PR #524 - add missing close div

---
 lib/assets/summary.html.erb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/assets/summary.html.erb b/lib/assets/summary.html.erb
index 6929098..a1416ac 100644
--- a/lib/assets/summary.html.erb
+++ b/lib/assets/summary.html.erb
@@ -170,24 +170,25 @@
               </p>
             </div>
           <% elsif @screenshots.count > 0 %>
-            <% last_size = nil %>
             <% sc = @screenshots.find_all { |s| s.language == language } %>
-            <% sc.sort {|a, b| [a.screen_size, a.path] <=> [b.screen_size, b.path]}.each do |screenshot| %>
+            <% sc_by_size = sc.group_by { |i| i.screen_size } %>
 
-              <% new_row = (last_size != screenshot.screen_size or last_size == nil) %>
+            <% sc_by_size.keys.sort.each do |screen_size| %>
+              <% screenshots = sc_by_size[screen_size].sort { |a, b| [a.path] <=> [b.path] } %>
 
-              <% if new_row and last_size != nil %>
-                </div>
-              <% end %>
+              <% screenshots.each_with_index do |screenshot, index| %>
 
-              <% if new_row %>
-                <h4><%= screenshot.formatted_name %></h4>
-                <div class="app-screenshot-row">
-              <% end %>
-              
-              <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
+                <% if index == 0 %>
+              <h4><%= screenshot.formatted_name %></h4>
+              <div class="app-screenshot-row">
+                <% end %>
 
-              <% last_size = screenshot.screen_size %>
+                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
+
+                <% if index == (screenshots.count - 1) %>
+              </div>
+                <% end %>
+              <% end %>
             <% end %>
           <% else %>
             <!-- no screenshots -->

From 0aa79a508a01b3ca45ce4194c1324f5deb959a5f Mon Sep 17 00:00:00 2001
From: Jerome Lacoste <jerome.lacoste@gmail.com>
Date: Fri, 8 Jan 2016 12:04:52 +0100
Subject: [PATCH 2/4] Preview screenshots: simplify the looping logic as we can
 make assumptions on the presence of screenshots

---
 lib/assets/summary.html.erb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/assets/summary.html.erb b/lib/assets/summary.html.erb
index a1416ac..97ee73b 100644
--- a/lib/assets/summary.html.erb
+++ b/lib/assets/summary.html.erb
@@ -175,20 +175,14 @@
 
             <% sc_by_size.keys.sort.each do |screen_size| %>
               <% screenshots = sc_by_size[screen_size].sort { |a, b| [a.path] <=> [b.path] } %>
-
-              <% screenshots.each_with_index do |screenshot, index| %>
-
-                <% if index == 0 %>
-              <h4><%= screenshot.formatted_name %></h4>
+              <%# we are guaranteed to have at least one element because of the group_by %>
+              <h4><%= screenshots[0].formatted_name %></h4>
               <div class="app-screenshot-row">
-                <% end %>
 
+              <% screenshots.each do |screenshot| %>
                 <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
-
-                <% if index == (screenshots.count - 1) %>
-              </div>
-                <% end %>
               <% end %>
+              </div>
             <% end %>
           <% else %>
             <!-- no screenshots -->

From c998aba09b3cbef9ab2882c765f9aaaf27987545 Mon Sep 17 00:00:00 2001
From: Jerome Lacoste <jerome.lacoste@gmail.com>
Date: Fri, 8 Jan 2016 13:04:26 +0100
Subject: [PATCH 3/4] Make the Preview document HTML5 valid

---
 lib/assets/summary.html.erb | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/assets/summary.html.erb b/lib/assets/summary.html.erb
index 97ee73b..15fdd35 100644
--- a/lib/assets/summary.html.erb
+++ b/lib/assets/summary.html.erb
@@ -1,9 +1,10 @@
+<!DOCTYPE html>
 <html>
     <head>
         <title>deliver - <%= @app_name %></title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-16">
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <style>
-          #app-name {
+          .app-name {
               font-size: 42px;
               font-family: 'Helvetica Neue', HelveticaNeue, Helvetica Neue;
               font-weight: 300;
@@ -12,7 +13,7 @@
               margin-right: 25px;
           }
 
-          #app-urls {
+          .app-urls {
               margin-left: 25px;
               font-size: 14px;
               margin-top: 4px;
@@ -40,7 +41,7 @@
               margin-right: 10px;
           }
 
-          #app-keyword {
+          .app-keyword {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
@@ -53,24 +54,24 @@
 
 
 
-          #app-description {
+          .app-description {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
           }
 
-          #app-description-text {
+          .app-description-text {
               font-weight: 300;
           }
 
-          #app-changelog {
+          .app-changelog {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
               font-weight: 300;
           }
 
-          #app-screenshots {
+          .app-screenshots {
               margin-left: 15px;
               margin-right: 15px;
               margin-top: 22px;
@@ -112,16 +113,16 @@
     <body>
       <% @languages.each do |language| %>
         <% if @options[:name] %>
-          <div id="app-name">
+          <div class="app-name">
             <%= language %>: <%= @options[:name][language] %>
           </div>
         <% else %>
-          <div id="app-name">
+          <div class="app-name">
             <%= language %>
           </div>
         <% end %>
 
-        <div id="app-urls">
+        <div class="app-urls">
           <% all_keys = [:support_url, :marketing_url] %>
           <% all_keys.each do |key| %>
             <% value = @options[key][language] if @options[key] %>
@@ -134,7 +135,7 @@
         </div>
         
         <% if @options[:keywords] and @options[:keywords][language] %>
-          <div id="app-keyword">
+          <div class="app-keyword">
               <div class="cat-headline">Keywords</div>
               <ul class="app-keyword-list">
                 <% @options[:keywords][language].split(" ").each do |keyword| %>
@@ -145,22 +146,22 @@
         <% end %>
         
         <% if @options[:description] %>
-          <div id="app-description">
+          <div class="app-description">
                <div class="cat-headline">Description</div>
-               <div id="app-description-text">
+               <div class="app-description-text">
                   <%= (@options[:description][language] || '').gsub("\n", "<br />") %>
                </div>
           </div>
         <% end %>
         
         <% if @options[:release_notes] %>
-          <div id="app-changelog">
+          <div class="app-changelog">
               <div class="cat-headline">Changelog</div>
               <%= (@options[:release_notes][language] || '').gsub("\n", "<br />") %>
           </div>
         <% end %>
         
-        <div id="app-screenshots">
+        <div class="app-screenshots">
           <div class="cat-headline">Screenshots</div>
 
           <% if options[:skip_screenshots] %>
@@ -179,8 +180,8 @@
               <h4><%= screenshots[0].formatted_name %></h4>
               <div class="app-screenshot-row">
 
-              <% screenshots.each do |screenshot| %>
-                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
+              <% screenshots.each_with_index do |screenshot, index| %>
+                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>" alt="Screenshot #<%=index%> for <%=language%>"></a>
               <% end %>
               </div>
             <% end %>

From 30954954597ae952851517428eeaec2d11ab7213 Mon Sep 17 00:00:00 2001
From: Jerome Lacoste <jerome.lacoste@gmail.com>
Date: Fri, 8 Jan 2016 13:28:47 +0100
Subject: [PATCH 4/4] Better HTML5 img :)

---
 lib/assets/summary.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/assets/summary.html.erb b/lib/assets/summary.html.erb
index 15fdd35..dc638ad 100644
--- a/lib/assets/summary.html.erb
+++ b/lib/assets/summary.html.erb
@@ -181,7 +181,7 @@
               <div class="app-screenshot-row">
 
               <% screenshots.each_with_index do |screenshot, index| %>
-                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>" alt="Screenshot #<%=index%> for <%=language%>"></a>
+                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>" title="Screenshot #<%=index%> for <%=language%>"></a>
               <% end %>
               </div>
             <% end %>