From 2ff94b5c8388ca7eaee6d2686e8394c86e602ba2 Mon Sep 17 00:00:00 2001
From: Brian (bex) Exelbierd <bex@pobox.com>
Date: Aug 10 2017 08:51:22 +0000
Subject: Moving template footer into page.html.erb


_footer.html.erb could not access images_path

This breaks logos everywhere :(

See: https://github.com/redhataccess/ascii_binder/issues/95

---

diff --git a/_templates/_footer.html.erb b/_templates/_footer.html.erb
deleted file mode 100644
index 88142fa..0000000
--- a/_templates/_footer.html.erb
+++ /dev/null
@@ -1,88 +0,0 @@
-    <div id="bottom" class="text-muted py-3" >
-        <div class="foot">
-            <div class="container">
-                <div class="row footerlinks">
-                    <div class="col-sm-3 col-xs-6 widget">
-                        <h3 class="widget-title">About</h3>
-                        <div class="widget-body">
-                            <dl>
-                                <dd><a href="https://fedoraproject.org/wiki/Overview">About Fedora</a></dd>
-                                <dd><a href="https://getfedora.org/en/sponsors">Sponsors</a></dd>
-                                <dd><a href="https://fedoramagazine.org">Fedora Magazine</a></dd>
-				<dd><a href="https:https://fedoraproject.org/wiki/Legal:Main#Legal">Legal</a></dd>
-                            </dl>
-                            <ul class="list-inline">
-                            <li>
-                                <a href="https:https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
-                            </li>
-                            <li>
-                                <a href="https:https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
-                            </li>
-                            <li>
-                                <a href="https:https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
-                            </li>
-                        </ul>
-                        </div>
-                    </div>
-
-                    <div class="col-sm-3 col-xs-6 widget">
-                        <h3 class="widget-title uppercase">Download</h3>
-                        <div class="widget-body">
-                          <dl>
-                            <dd><a href="https://getfedora.org/en/workstation/download">Get Fedora Workstation</a></dd>
-                            <dd><a href="https://getfedora.org/en/server/download">Get Fedora Server</a></dd>
-                            <dd><a href="https://getfedora.org/en/atomic/download">Get Fedora Atomic</a></dd>
-                            <dd><a href="https://spins.fedoraproject.org">Fedora Spins</a></dd>
-                            <dd><a href="https://labs.fedoraproject.org">Fedora Labs</a></dd>
-                            <dd><a href="https://arm.fedoraproject.org">Fedora ARM<span class="sup">&reg;</span></a></dd>
-                            <dd><a href="https://alt.fedoraproject.org/">Alternative Downloads</a></dd>
-
-                        </dl>
-                        </div>
-                    </div>
-
-                    <div class="col-sm-3 col-xs-6 widget">
-                        <h3 class="widget-title">Support</h3>
-                        <div class="widget-body">
-                            <dl>
-                                <dd><a href="https://fedoraproject.org/wiki/Communicating_and_getting_help">Get Help</a></dd>
-                                <dd><a href="https://ask.fedoraproject.org/">Ask Fedora</a></dd>
-                                <dd><a href="https://fedoraproject.org/wiki/Common_F${global_variables.release['curr_id']}_bugs">Common Bugs</a></dd>
-                                <dd><a href="https://developer.fedoraproject.org/">Fedora Developer Portal</a></dd>
-                                <dd><a href="https://docs.fedoraproject.org/en-US/Fedora/${global_variables.release['curr_id']}/html/Installation_Guide">Installation Guide</a></dd>
-                            </dl>
-                        </div>
-                    </div>
-
-                    <div class="col-sm-3 col-xs-6 widget">
-                        <h3 class="widget-title">Join</h3>
-                        <div class="widget-body">
-                            <dl>
-                                <dd><a href="https://fedoraproject.org/wiki/Join">Join Fedora</a></dd>
-                                <dd><a href="http://fedoraplanet.org">Planet Fedora</a></dd>
-                                <dd><a href="https://fedoraproject.org/wiki/SIGs">Fedora SIGs</a></dd>
-                                <dd><a href="https://admin.fedoraproject.org/accounts/">Fedora Account System</a></dd>
-                                <dd><a href="http://fedoracommunity.org/">Fedora Community</a></dd>
-                            </dl>
-                        </div>
-                    </div>
-                </div> <!-- /row of widgets -->
-
-                <div class="row">
-                    <div class="col-md-2">
-                        <div class="widget-body">
-                            <a href="http://www.redhat.com/"><img class="rh-logo" src="../_images/redhat-logo.png" alt="Red Hat Logo" /></a>
-                        </div>
-                    </div>
-                    <div class="col-md-7">
-                        <div class="widget-body">
-                            <p class="sponsor">Fedora is sponsored by Red Hat.</p>
-                            <p class="sponsor"><a href="https://www.redhat.com/en/technologies/linux-platforms/articles/relationship-between-fedora-and-rhel">Learn more about the relationship between Red Hat and Fedora &raquo;</a></p>
-                            <p class="copy">&copy; 2017 Red Hat, Inc. and others. Please send any comments or corrections to the <a href="https://fedorahosted.org/fedora-websites/">websites team</a></p>
-                        </div>
-                    </div>
-                </div> <!-- /row of widgets -->
-
-            </div>
-        </div>
-    </div>
diff --git a/_templates/page.html.erb b/_templates/page.html.erb
index bb50253..b9a30ac 100644
--- a/_templates/page.html.erb
+++ b/_templates/page.html.erb
@@ -62,7 +62,94 @@
       </div>
     </div>
   </div>
-  <%= render("_templates/_footer.html.erb") %>
+  <div id="bottom" class="text-muted py-3" >
+      <div class="foot">
+          <div class="container">
+              <div class="row footerlinks">
+                  <div class="col-sm-3 col-xs-6 widget">
+                      <h3 class="widget-title">About</h3>
+                      <div class="widget-body">
+                          <dl>
+                              <dd><a href="https://fedoraproject.org/wiki/Overview">About Fedora</a></dd>
+                              <dd><a href="https://getfedora.org/en/sponsors">Sponsors</a></dd>
+                              <dd><a href="https://fedoramagazine.org">Fedora Magazine</a></dd>
+		<dd><a href="https:https://fedoraproject.org/wiki/Legal:Main#Legal">Legal</a></dd>
+                          </dl>
+                          <ul class="list-inline">
+                          <li>
+                              <a href="https:https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
+                          </li>
+                          <li>
+                              <a href="https:https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
+                          </li>
+                          <li>
+                              <a href="https:https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
+                          </li>
+                      </ul>
+                      </div>
+                  </div>
+
+                  <div class="col-sm-3 col-xs-6 widget">
+                      <h3 class="widget-title uppercase">Download</h3>
+                      <div class="widget-body">
+                        <dl>
+                          <dd><a href="https://getfedora.org/en/workstation/download">Get Fedora Workstation</a></dd>
+                          <dd><a href="https://getfedora.org/en/server/download">Get Fedora Server</a></dd>
+                          <dd><a href="https://getfedora.org/en/atomic/download">Get Fedora Atomic</a></dd>
+                          <dd><a href="https://spins.fedoraproject.org">Fedora Spins</a></dd>
+                          <dd><a href="https://labs.fedoraproject.org">Fedora Labs</a></dd>
+                          <dd><a href="https://arm.fedoraproject.org">Fedora ARM<span class="sup">&reg;</span></a></dd>
+                          <dd><a href="https://alt.fedoraproject.org/">Alternative Downloads</a></dd>
+
+                      </dl>
+                      </div>
+                  </div>
+
+                  <div class="col-sm-3 col-xs-6 widget">
+                      <h3 class="widget-title">Support</h3>
+                      <div class="widget-body">
+                          <dl>
+                              <dd><a href="https://fedoraproject.org/wiki/Communicating_and_getting_help">Get Help</a></dd>
+                              <dd><a href="https://ask.fedoraproject.org/">Ask Fedora</a></dd>
+                              <dd><a href="https://fedoraproject.org/wiki/Common_F${global_variables.release['curr_id']}_bugs">Common Bugs</a></dd>
+                              <dd><a href="https://developer.fedoraproject.org/">Fedora Developer Portal</a></dd>
+                              <dd><a href="https://docs.fedoraproject.org/en-US/Fedora/${global_variables.release['curr_id']}/html/Installation_Guide">Installation Guide</a></dd>
+                          </dl>
+                      </div>
+                  </div>
+
+                  <div class="col-sm-3 col-xs-6 widget">
+                      <h3 class="widget-title">Join</h3>
+                      <div class="widget-body">
+                          <dl>
+                              <dd><a href="https://fedoraproject.org/wiki/Join">Join Fedora</a></dd>
+                              <dd><a href="http://fedoraplanet.org">Planet Fedora</a></dd>
+                              <dd><a href="https://fedoraproject.org/wiki/SIGs">Fedora SIGs</a></dd>
+                              <dd><a href="https://admin.fedoraproject.org/accounts/">Fedora Account System</a></dd>
+                              <dd><a href="http://fedoracommunity.org/">Fedora Community</a></dd>
+                          </dl>
+                      </div>
+                  </div>
+              </div> <!-- /row of widgets -->
+
+              <div class="row">
+                  <div class="col-md-2">
+                      <div class="widget-body">
+                          <a href="http://www.redhat.com/"><img class="rh-logo" src="<%= File.join(images_path, "redhat-logo.png") %>" alt="Red Hat Logo" /></a>
+                      </div>
+                  </div>
+                  <div class="col-md-7">
+                      <div class="widget-body">
+                          <p class="sponsor">Fedora is sponsored by Red Hat.</p>
+                          <p class="sponsor"><a href="https://www.redhat.com/en/technologies/linux-platforms/articles/relationship-between-fedora-and-rhel">Learn more about the relationship between Red Hat and Fedora &raquo;</a></p>
+                          <p class="copy">&copy; 2017 Red Hat, Inc. and others. Please send any comments or corrections to the <a href="https://fedorahosted.org/fedora-websites/">websites team</a></p>
+                      </div>
+                  </div>
+                </div> <!-- /row of widgets -->
+
+            </div>
+        </div>
+    </div>
    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
    <!-- Latest compiled and minified JavaScript -->