]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commitdiff
Merge branch 'marketing' of github.com:zurb/ink into marketing
authorEric Morris <eric@zurb.com>
Thu, 7 Nov 2013 04:48:29 +0000 (20:48 -0800)
committerEric Morris <eric@zurb.com>
Thu, 7 Nov 2013 04:48:29 +0000 (20:48 -0800)
Conflicts:
templates.php

1  2 
download.php
includes/_footer.php
includes/_header.php
sass/app.scss
stylesheets/app.css
templates.php

diff --cc download.php
index f59c342b43f78a3848387a02b3ba4c4315988372,fb7eba18cf4dc22715551087ed04816a0cafd04e..9dcfca859a1e28ede2e6a7d2b2ebeb1732674454
@@@ -1,12 -1,8 +1,12 @@@
  <?php include 'downloads/latest.php' ?>
  
- <?php include 'includes/_header.php' ?>
+ <?php $title = "Ink: Download Ink"; include 'includes/_header.php' ?>
  <?php include 'includes/_top-bar.php' ?>
  
 +<script>
 +  _gaq.push(['_trackEvent', 'Ink', 'Download', '<?php echo $download_file; ?>']);
 +</script>
 +
  <section class="top-area main downloading">
    <div class="row">
      <div class="large-12 columns">
Simple merge
index e35ede886c7538bcf6952b7f57a4443554ae1e8d,fc774cd77a0101efc5ec32693ed3dd2b85b5c7f9..f621d6d754956dc84577e22a7df6b401cf3294d8
        echo "<meta http-equiv=\"Refresh\" content=\"0.5; url=downloads/$download_file\" />";
      }
    ?>
-   <title>Ink</title>
+   <title><?php if (isset($title)) {echo $title;}
+     else {echo "Ink: A Responsive Email Framework from ZURB";} ?></title>
    <link rel="stylesheet" href="stylesheets/app.css">
    <script src="javascripts/vendor/custom.modernizr.js"></script>
 +  <script>
 +    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 +    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 +    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 +    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 +
 +    ga('create', 'UA-2195009-47', 'zurb.com');
 +    ga('send', 'pageview');
 +  </script>
  </head>
  
  <body class="off-canvas hide-extras"> 
diff --cc sass/app.scss
Simple merge
Simple merge
diff --cc templates.php
index dd507d74526f0390d98cc151ef52cee0c045e1a4,744a8f5874f5ec9ea7c0afedf8f2df106cbb2f05..72d3b9e4ff9ef86d9b09217928be327c39a4726e
        <li>
          <a href="downloads/templates/basic.html" target="_blank">
            <img src="images/templates/basic.jpg">
-           <span class="name">Basic</span>
-           <span class="description">This template is perfect for sending a basic but nice looking email to your readers.</span>
          </a>
 -          <h6 class="name"><span>Basic</span> <a href="">View Tests</a></h6>
 -          <span class="description">This template is perfect for sending a basic but nice looking email to your readers.</span>
 -        <a href="downloads/templates/basic.html.zip" class="button primary">Download</a>
++        <h6 class="name"><span>Basic</span> <a href="">View Tests</a></h6>
++        <span class="description">This template is perfect for sending a basic but nice looking email to your readers.</span>
 +        <a href="downloads/templates/basic.html.zip" class="button primary" onClick="_gaq.push(['_trackEvent', 'Ink', 'Download', 'templates/basic.html.zip']);">Download</a>
          <a href="downloads/templates/basic.html" class="button secondary" target="_blank">Preview</a>
        </li>
        <li>
          <a href="downloads/templates/hero.html" target="_blank">
            <img src="images/templates/hero.jpg">
-           <span class="name">Hero</span>
-           <span class="description">Want to include a snazzy hero image in your email? This template is for you!</span>
          </a>
 -          <h6 class="name"><span>Hero</span> <a href="">View Tests</a></h6>
 -          <span class="description">Want to include a snazzy hero image in your email? This template is for you!</span>
 -        
 -        <a href="downloads/templates/hero.html.zip" class="button primary">Download</a>
++        <h6 class="name"><span>Hero</span> <a href="">View Tests</a></h6>
++        <span class="description">Want to include a snazzy hero image in your email? This template is for you!</span>
 +        <a href="downloads/templates/hero.html.zip" class="button primary" onClick="_gaq.push(['_trackEvent', 'Ink', 'Download', 'templates/hero.html.zip']);">Download</a>
          <a href="downloads/templates/hero.html" class="button secondary" target="_blank">Preview</a>
        </li>
        <li>
          <a href="downloads/templates/sidebar.html" target="_blank">
            <img src="images/templates/sidebar.jpg">
-           <span class="name">Sidebar</span>
-           <span class="description">This template includes a sidebar area for a list of links, perfect for linking to additional content.</span>
          </a>
 -          <h6 class="name"><span>Sidebar</span> <a href="">View Tests</a></h6>
 -          <span class="description">This template includes a sidebar area for a list of links, perfect for linking to additional content.</span>
 -        
 -        <a href="downloads/templates/sidebar.html.zip" class="button primary">Download</a>
++        <h6 class="name"><span>Sidebar</span> <a href="">View Tests</a></h6>
++        <span class="description">This template includes a sidebar area for a list of links, perfect for linking to additional content.</span>
 +        <a href="downloads/templates/sidebar.html.zip" class="button primary" onClick="_gaq.push(['_trackEvent', 'Ink', 'Download', 'templates/sidebar.html.zip']);">Download</a>
          <a href="downloads/templates/sidebar.html" class="button secondary" target="_blank">Preview</a>
        </li>
        <li>
          <a href="downloads/templates/sidebar-hero.html" target="_blank">
            <img src="images/templates/sidebar-hero.jpg">
-           <span class="name">Sidebar Hero</span>
-           <span class="description">Want a sidebar and a hero image? Let's go crazy! This template combines the Sidebar and Hero templates.</span>
          </a>
 -          <h6 class="name"><span>Sidebar Hero</span> <a href="">View Tests</a></h6>
 -          <span class="description">Want a sidebar and a hero image? Let's go crazy! This template combines the Sidebar and Hero templates.</span>
 -        
 -        <a href="downloads/templates/sidebar-hero.html.zip" class="button primary">Download</a>
++        <h6 class="name"><span>Sidebar Hero</span> <a href="">View Tests</a></h6>
++        <span class="description">Want a sidebar and a hero image? Let's go crazy! This template combines the Sidebar and Hero templates.</span>
 +        <a href="downloads/templates/sidebar-hero.html.zip" class="button primary" onClick="_gaq.push(['_trackEvent', 'Ink', 'Download', 'templates/sidebar-hero.html.zip']);">Download</a>
          <a href="downloads/templates/sidebar-hero.html" class="button secondary" target="_blank">Preview</a>
        </li>
        <li>
          <a href="downloads/templates/newsletter.html" target="_blank">
            <img src="images/templates/newsletter.jpg">
-           <span class="name">Newsletter</span>
-           <span class="description">This template is perfect for a point-by-point newsletter. For good measure, we've thrown in a hero image, too.</span>
          </a>
 -          <h6 class="name"><span>Newsletter</span> <a href="">View Tests</a></h6>
 -          <span class="description">This template is perfect for a point-by-point newsletter. For good measure, we've thrown in a hero image, too.</span>
 -        <a href="downloads/templates/newsletter.html.zip" class="button primary">Download</a>
++        <h6 class="name"><span>Newsletter</span> <a href="">View Tests</a></h6>
++        <span class="description">This template is perfect for a point-by-point newsletter. For good measure, we've thrown in a hero image, too.</span>
 +        <a href="downloads/templates/newsletter.html.zip" class="button primary" onClick="_gaq.push(['_trackEvent', 'Ink', 'Download', 'templates/newsletter.html.zip']);">Download</a>
          <a href="downloads/templates/newsletter.html" class="button secondary" target="_blank">Preview</a>
        </li>
      </ul>