add progit2 links, Bens name, bigger ebook downloads

Author: schacon

TODO.txt

@@ -1,10 +1,7 @@
 PG2:
 
- * link ebooks to show page
- * easier to find the epub/mobi/pdf?
  * translation page?
- * update percent_complete and urls on new builds
- * seperate link for translation sources
+ * link for translation sources
  * show that newer content is available for missed slugs (fallback to v1)
 
 3.1 Launch:

app/assets/stylesheets/book.css.scss

@@ -1,3 +1,7 @@
+.ebooks img {
+  padding: 5px;
+}
+
 #book-container {
   position: relative;
   @extend .callout;

app/views/books/show.html.erb

@@ -14,6 +14,25 @@
       <img  src="/images/progit2.png" width="118" height="157"/>
       <div style="light">2nd Edition (2014)</div>
       <div class="switch"><a href="/book/<%= @book.code %>/v1">Switch to 1st Edition</a></div>
+      <div class="ebook-download">
+        <h2>Download Ebook</h2>
+        <div class="ebooks">
+          <% if @book.ebook_pdf %>
+            <a href="<%= @book.ebook_pdf %>"><img width="50px" src="/images/pdf.png"/></a>
+          <% end %>
+          <% if @book.ebook_epub %>
+            <a href="<%= @book.ebook_epub %>"><img width="50px" src="/images/epub.png"/></a>
+          <% end %>
+        </div>
+        <div class="ebooks">
+          <% if @book.ebook_mobi %>
+            <a href="<%= @book.ebook_mobi %>"><img width="50px" src="/images/mobi.png"/></a>
+          <% end %>
+          <% if @book.ebook_html %>
+            <a href="<%= @book.ebook_html %>"><img width="50px" src="/images/html.png"/></a>
+          <% end %>
+        </div>
+      </div>
     </div>
   <% else %>
     <div style="float:right;margin: -20px 40px 0 40px;">
@@ -25,12 +44,12 @@
     </div>
   <% end %>
   <p>
-  The entire Pro Git book, written by Scott Chacon and Ben Straub and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>.  Print versions of the book are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.</>
+  The entire Pro Git book, written by Scott Chacon and Ben Straub and published by Apress, is available here. All content is licensed under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="http://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.</>
   </p>
   <ol class='book-toc'>
     <% @book.chapters.each do |chapter| %>
     <li class='chapter'>
-    <h2><%= chapter.cs_number %>. <a href="/book/<%= @book.code %>/v<%= @book.edition %>/<%=u chapter.sections.first.slug %>"><%=raw chapter.title %></a></h2>
+    <h2><%= chapter.cs_number %>. <a href="/book/<%= @book.code %>/v<%= @book.edition %>/<%=u chapter.sections.first.slug %>"><%= chapter.title %></a></h2>
       <ol>
         <% chapter.sections.each do |section| %>
           <% if !section.title.empty? %>

app/views/doc/index.html.erb

@@ -36,7 +36,7 @@
     <div id="book-intro">
 
       <p>
-        Pro Git is written by Scott Chacon and published by Apress.
+        Pro Git is written by Scott Chacon and Ben Straub and published by Apress.
       </p>
 
       <p>

app/views/doc/rebase.html.haml

@@ -4,7 +4,7 @@
 - content_for :sidebar do
   %div.callout
     %p
-      The entire <strong><a href="#">Pro Git book</a></strong> written by Scott Chacon is available to <a href="#">read online for free</a>. Dead tree versions are available on <a href="#">Amazon.com</a>.
+      The entire <strong><a href="#">Pro Git book</a></strong> written by Scott Chacon and Ben Straub is available to <a href="#">read online for free</a>. Dead tree versions are available on <a href="#">Amazon.com</a>.
 
 %div#reference-version
   =link_to "Topics ▾", "#", {:class => 'dropdown-trigger', :id => 'reference-topics-trigger', 'data-panel-id' => 'topics-dropdown'}
@@ -120,15 +120,15 @@
 
 
   =link_to "Version 1.7.9.4 ▾", "#", {:class => 'dropdown-trigger', :id => 'reference-versions-trigger', 'data-panel-id' => 'previous-versions-dropdown'}
-  <span class="light">git-rebase last updated in 1.7.7.1</span> 
+  <span class="light">git-rebase last updated in 1.7.7.1</span>
   %div#previous-versions-dropdown.dropdown-panel.left
     %header
       Changes in the <strong>git-rebase</strong> manual
     %ol.reference-previous-versions
       %li.no-change
         <span>1.7.7.1 → 1.7.9.4 no changes</span>
       %li
-        <a href="#"><span class="version">1.7.7.1</span> 
+        <a href="#"><span class="version">1.7.7.1</span>
         <span class="diff">
         <img src="/images/icons/green-dot.png" />
         <img src="/images/icons/green-dot.png" />
@@ -143,7 +143,7 @@
       %li.no-change
         <span>1.7.6.5 no changes</span>
       %li
-        <a href="#"><span class="version">1.7.6.1</span> 
+        <a href="#"><span class="version">1.7.6.1</span>
         <span class="diff">
         <img src="/images/icons/green-dot.png" />
         <img src="/images/icons/green-dot.png" />
@@ -158,7 +158,7 @@
       %li.no-change
         <span>1.7.5.1 → 1.7.6.0 no changes</span>
       %li
-        <a href="#"><span class="version">1.7.5.0</span> 
+        <a href="#"><span class="version">1.7.5.0</span>
         <span class="diff">
         <img src="/images/icons/green-dot.png" />
         <img src="/images/icons/green-dot.png" />
@@ -175,6 +175,5 @@
 
     %footer
       <span class="light">Check your version of git by running<br></span>
-      <strong>$</strong> 
+      <strong>$</strong>
       <input type="text" class="copyable" value="git --version" />
-

app/views/downloads/installers/index.html.haml

@@ -4,7 +4,7 @@
 - content_for :sidebar do
   %div.callout
     %p
-      The entire <strong><a href="#">Pro Git book</a></strong> written by Scott Chacon is available to <a href="#">read online for free</a>. Dead tree versions are available on <a href="#">Amazon.com</a>.
+      The entire <strong><a href="#">Pro Git book</a></strong> written by Scott Chacon and Ben Straub is available to <a href="#">read online for free</a>. Dead tree versions are available on <a href="#">Amazon.com</a>.
 
 %div#main
   %h1 Git Installers
@@ -17,27 +17,27 @@
             %td
               %strong Debian
             %td
-              =link_to "Stable", "http://packages.debian.org/stable/devel/git" 
+              =link_to "Stable", "http://packages.debian.org/stable/devel/git"
               <span class="light">|</span>
-              =link_to "Testing", "http://packages.debian.org/testing/devel/git" 
+              =link_to "Testing", "http://packages.debian.org/testing/devel/git"
               <span class="light">|</span>
               =link_to "Unstable", "http://packages.debian.org/unstable/devel/git"
           %tr
-            %td 
+            %td
               %strong Windows
-            %td 
+            %td
               =link_to "Stable", "https://github.com/msysgit/msysgit/releases"
               <span class="light">|</span>
               =link_to "Cygwin", "http://www.cygwin.com/setup.exe"
           %tr
             %td
               %strong Mac
-            %td 
+            %td
               =link_to "Stable", "http://sourceforge.net/projects/git-osx-installer/files/"
           %tr
-            %td 
+            %td
               %strong Solaris
-            %td 
+            %td
               =link_to "v8-10", "http://sunfreeware.com"
               <span class="light">|</span>
               =link_to "v9-10", "http://opencsw.org/packages/git/"

app/views/shared/_book.html.erb

@@ -1,6 +1,6 @@
 <div class="callout">
   <p>The entire <strong><a href="/book">Pro Git book</a></strong> written
-  by Scott Chacon is available to <a href="/book">read online for free</a>.
-  Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>. 
+  by Scott Chacon and Ben Straub is available to <a href="/book">read online for free</a>.
+  Dead tree versions are available on <a href="http://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
   </p>
 </div>

app/views/site/index.html.erb

@@ -33,12 +33,12 @@
       </ul>
     </nav>
     <div id="front-book">
-      <img src="/images/[email protected]" width="56" height="74" />
+      <img src="/images/progit2.png" width="56" height="74" />
       <p>
         <strong><a href="/book">Pro Git</a></strong>
-        by Scott Chacon is available to
+        by Scott Chacon and Ben Straub is available to
         <a href="/book">read online for free</a>.
-        Dead tree versions are available on <a href="http://www.amazon.com/gp/product/1430218339?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
+        Dead tree versions are available on <a href="http://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
       </p>
     </div>
   </section>