Skip to content

Instantly share code, notes, and snippets.

@nataliepo
Created January 6, 2011 17:05
Show Gist options
  • Save nataliepo/768172 to your computer and use it in GitHub Desktop.
Save nataliepo/768172 to your computer and use it in GitHub Desktop.
diff for merged recipes file
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<mt:include module="Global Vars">
<html>
<head>
<title>Serious Eats: <$MTBlogName encode_html="1"$></title>
<meta name="description" content="Serious Eats is focused on sharing food enthusiasm through online conversation, blogs, and video. Our combination of community and content brings together compelling original and acquired food video and spirited, inclusive discussion about all things food-related." />
<!--#include virtual="/includes/headTags.txt" -->
<script src="/js/mobileRedirect.js" type="text/javascript"></script>
<link rel="alternate" type="application/atom+xml" title="Serious Eats: Recipes" href="http://feeds.feedburner.com/seriouseats/recipes" />
<script type="text/javascript">
federated_media_section = "recipes";
</script>
<$MTRecommendJavascript$>
<script type="text/javascript">
$(document).ready(function(){
init_carousel(6000); // change this value to adjust delay between slides
});
</script>
</head>
<body id="recipes" class="blogIndex">
<MTInclude module="adspaceTop" blog_id="31">
<div id="container">
<!--#include virtual="/recipes/includes/masthead.txt" -->
<div id="content" class="">
<div id="threeColumn1">
<div id="recipes-carousel" class="clearfix">
<div class="scrollable">
<div class="items">
<mt:SetVarBlock name="carousel_blogs"><$mt:Var name="blogid_se"$>,<$mt:Var name="blogid_recipes"$></mt:SetVarBlock>
<mt:Entries include_blogs="$carousel_blogs" tag="@recipescarousel" lastn="3">
<div id="carousel0<$mt:Var name="__counter__"$>" class="carousel-full">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetURL$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
<mt:If tag="EntryBlogID" eq="$blogid_recipes">
<div class="carousel-single-card carousel-card">
<p class="linksrc"><a href="<$mt:EntryLink archive_type="Category"$>"><$mt:EntryCategory$></a></p>
<div class="carousel-single-text">
<p class="post-title"><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></p>
<p>
<MTEntryIfCommentsOpen><MTIfNonZero tag="EntryCommentCount"><a href="<$MTEntryPermalink$>#comments" class="comment-count"><$MTEntryCommentCount$> comment<MTIfNotEqual a="[MTEntryCommentCount]" b="1">s</MTIfNotEqual></a><MTElse><a href="<$MTEntryPermalink$>#comments" class="comment-count">Post a comment</a></MTElse></MTIfNonZero><MTElse>Comments are closed.</MTElse></MTEntryIfCommentsOpen>,
<span class="rating"><$mt:EntryFieldValue field="average_rating"$></span>
<span class="entry-scoring">
<a href="javascript:void(0)" onclick="return mtScore(<$mt:EntryID$>)" id="scoring-id-<$mt:EntryID$>" class="scoring">
<span id="scoring-vote-<$mt:EntryID$>" class="scoring-vote">Favorite this!</span>
<span id="scoring-score-<$mt:EntryID$>" class="scoring-score"><$mt:EntryScore namespace="community_pack_recommend" singular="1" plural="#" none="0"$></span> <span id="scoring-score-label-<$mt:EntryID$>" class="scoring-score-label"><$mt:EntryScore namespace="community_pack_recommend" singular="&nbsp;Favorite" plural="&nbsp;Favorites" none="&nbsp;Favorites"$></span>
</a>
</span>
</p>
</div>
</div>
<mt:Else>
<mt:EntryFieldCount field="related_recipe" setvar="related_count">
<mt:If var="related_count" gt="1">
<div class="carousel-menu-card carousel-card">
<p class="linksrc"><a href="<$mt:EntryLink archive_type="Category"$>"><$mt:EntryCategory$></a></p>
<div class="carousel-menu-text">
<p class="post-title"><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></p>
<p class="menu-desc"><$mt:EntryExcerpt words="20"$></p>
<mt:EntryLinkedEntries field="related_recipe" sort_by="instance">
<div class="menu-item">
<p class="menu-item-title"><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></p>
<p><$mt:EntryFieldValue field="total_time"$> total, serves <$mt:EntryFieldValue field="number_serves"$>, <span class="rating"><$mt:EntryFieldValue field="average_rating"$></span></p>
</div>
</mt:EntryLinkedEntries>
</div>
</div>
<mt:Else>
<div class="carousel-single-card carousel-card">
<p class="linksrc"><a href="<$mt:EntryLink archive_type="Category"$>"><$mt:EntryCategory$></a></p>
<div class="carousel-single-text">
<p class="post-title"><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></p>
<mt:EntryLinkedEntries field="related_recipe" sort_by="instance">
<p>
<MTEntryIfCommentsOpen><MTIfNonZero tag="EntryCommentCount"><a href="<$MTEntryPermalink$>#comments" class="comment-count"><$MTEntryCommentCount$> comment<MTIfNotEqual a="[MTEntryCommentCount]" b="1">s</MTIfNotEqual></a><MTElse><a href="<$MTEntryPermalink$>#comments" class="comment-count">Post a comment</a></MTElse></MTIfNonZero><MTElse>Comments are closed.</MTElse></MTEntryIfCommentsOpen>,
<span class="rating"><$mt:EntryFieldValue field="average_rating"$></span>
<span class="entry-scoring">
<a href="javascript:void(0)" onclick="return mtScore(<$mt:EntryID$>)" id="scoring-id-<$mt:EntryID$>" class="scoring">
<span id="scoring-vote-<$mt:EntryID$>" class="scoring-vote">Favorite this!</span>
<span id="scoring-score-<$mt:EntryID$>" class="scoring-score"><$mt:EntryScore namespace="community_pack_recommend" singular="1" plural="#" none="0"$></span> <span id="scoring-score-label-<$mt:EntryID$>" class="scoring-score-label"><$mt:EntryScore namespace="community_pack_recommend" singular="&nbsp;Favorite" plural="&nbsp;Favorites" none="&nbsp;Favorites"$></span>
</a>
</span>
</p>
</mt:EntryLinkedEntries>
</div>
</div>
</mt:If>
</mt:If>
<div class="carousel-share">
<div class="carousel-share-list">
<ul class="hmenu">
<li class="first"><a title="Send to Reddit" href="http://reddit.com/submit?url=<$mt:EntryPermalink$>&title=<$mt:EntryTitle encode_html="1"$>">reddit</a></li>
<li><a title="Share on Twitter" href="http://twitter.com/?status=<$mt:EntryTitle encode_html="1"$>+<$mt:EntryPermalink$>">twitter</a></li>
<li><a title="Send to StumbleUpon" href="http://www.stumbleupon.com/submit?url=<$mt:EntryPermalink$>&title=<$mt:EntryTitle encode_html="1"$>">stumbleupon</a></li>
<li><a title="Send to Facebook" href="http://www.facebook.com/share.php?u=<$mt:EntryPermalink$>">facebook</a></li>
<li><a title="Send to del.icio.us" href="http://del.icio.us/post?url=<$mt:EntryPermalink$>&amp;title=<$mt:EntryTitle encode_html="1"$>">del.icio.us</a></li>
<li><a title="Send to digg" href="http://digg.com/submit?phase=2&url=<$mt:EntryPermalink$>&amp;title=<$mt:EntryTitle encode_html="1"$>">digg</a></li>
</ul>
</div>
<a href="#" class="carousel-share-link">Share This!</a>
</div>
</div><!--/#carousel0<$mt:Var name="__counter__"$>-->
</mt:Entries>
</div>
</div>
<ul id="recipes-carousel-thumbs" class="fmenu">
<mt:Entries include_blogs="$carousel_blogs" tag="@recipescarousel" lastn="3">
<li<mt:If name="__first__"> class="active"</mt:If>>
<a href="#carousel0<$mt:Var name="__counter__"$>">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetThumbnailURL width="60" square="1"$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
<mt:EntryIfTagged tag="@menu"><span>Menu</span></mt:EntryIfTagged>
<mt:SetVarBlock name="trim_to_value"><mt:EntryIfTagged tag="@menu">30<mt:Else>45</mt:EntryIfTagged></mt:SetVarBlock>
<$mt:EntryTitle encode_html="1" trim_to="$trim_to_value"$><$mt:EntryTitle count_characters="1" setvar="title_length"$><mt:If name="title_length" gt="$trim_to_value">&hellip;</mt:If>
</a>
</li>
</mt:Entries>
</ul>
</div>
<div id="recipe-home-tabs" class="tabset">
<ul class="fmenu tabset-tabs">
<li id="recipe-home-latest-tab" class="tabset-tab active"><a href="#recipe-home-latest">Latest Recipes</a></li>
<li id="recipe-home-shared-tab" class="tabset-tab"><a href="#recipe-home-shared">Most Shared</a></li>
</ul>
<div id="recipe-home-latest" class="tab-content active">
<mt:Entries lastn="10" include_blogs="$blogid_recipes">
<<<<<<< HEAD
=======
<div class="home-excerpt">
<div class="home-excerpt-thumb">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetThumbnailURL width="100" square="0"$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
</div>
>>>>>>> master
<mt:EntryCategories>
<mt:HasParentCategory>
<mt:ParentCategory>
<$mt:IfCategory label="Sponsor-Recipes">
<<<<<<< HEAD
<$mt:Var name="sponsor" value="1"$>
=======
<div class="home-sponsor-recipe">SPONSOR RECIPE</div>
>>>>>>> master
</mt:IfCategory>
</mt:ParentCategory>
</mt:HasParentCategory>
</mt:EntryCategories>
<<<<<<< HEAD
<div class="home-excerpt <mt:If name="sponsor">sponsor-post</mt:If>">
<div class="home-excerpt-thumb">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetThumbnailURL width="100" square="0"$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
</div>
<mt:If name="sponsor">
<div class="home-sponsor-recipe">SPONSOR RECIPE</div>
</mt:If>
=======
>>>>>>> master
<h3><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></h3>
<p><a href="<$mt:var name="global_url"$>/user/profile/<mt:EntryAuthor>"><$MTEntryAuthorDisplayName$></a>, <$mt:EntryDate format="%x"$></p>
<p><MTEntryIfCommentsOpen><MTIfNonZero tag="EntryCommentCount"><a href="<$MTEntryPermalink$>#comments" class="comment-count"><$MTEntryCommentCount$> comment<MTIfNotEqual a="[MTEntryCommentCount]" b="1">s</MTIfNotEqual></a><MTElse><a href="<$MTEntryPermalink$>#comments" class="comment-count">Post a comment</a></MTElse></MTIfNonZero><MTElse>Comments are closed.</MTElse></MTEntryIfCommentsOpen>,
<span class="entry-scoring">
<a href="javascript:void(0)" onclick="return mtScore(<$mt:EntryID$>)" id="scoring-id-<$mt:EntryID$>" class="scoring">
<span id="scoring-vote-<$mt:EntryID$>" class="scoring-vote">Favorite this!</span>
<span id="scoring-score-<$mt:EntryID$>" class="scoring-score"><$mt:EntryScore namespace="community_pack_recommend" singular="1" plural="#" none="0"$></span> <span id="scoring-score-label-<$mt:EntryID$>" class="scoring-score-label"><$mt:EntryScore namespace="community_pack_recommend" singular="&nbsp;Favorite" plural="&nbsp;Favorites" none="&nbsp;Favorites"$></span>
</a>
</span></p>
<<<<<<< HEAD
</div><!--/.home-excerpt-->
<$mt:Var name="sponsor" value="0"$>
=======
</div><!--/.home-excerpt-->
>>>>>>> master
</mt:Entries>
</div><!--/#recipe-home-latest-->
<div id="recipe-home-shared" class="tab-content">
<mt:MultiBlog include_blogs="$blog_id_recipes">
<mt:MostEmailed lastn="10">
<div class="home-excerpt">
<div class="home-excerpt-thumb">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetThumbnailURL width="100" square="0"$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
</div>
<mt:EntryCategories>
<mt:HasParentCategory>
<mt:ParentCategory>
<<<<<<< HEAD
<$mt:IfCategory label="Sponsor-Recipes">
<div class="home-sponsor-recipe">SPONSORED RECIPE</div>
</mt:IfCategory>
=======
<$mt:IfCategory label="Sponsor-Recipes">
<div class="home-sponsor-recipe">SPONSOR RECIPE</div>
</mt:IfCategory>
>>>>>>> master
</mt:ParentCategory>
</mt:HasParentCategory>
</mt:EntryCategories>
<h3><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></h3>
<p><a href="<$mt:var name="global_url"$>/user/profile/<mt:EntryAuthor>"><$MTEntryAuthorDisplayName$></a>, <$mt:EntryDate format="%x"$></p>
<p><MTEntryIfCommentsOpen><MTIfNonZero tag="EntryCommentCount"><a href="<$MTEntryPermalink$>#comments" class="comment-count"><$MTEntryCommentCount$> comment<MTIfNotEqual a="[MTEntryCommentCount]" b="1">s</MTIfNotEqual></a><MTElse><a href="<$MTEntryPermalink$>#comments" class="comment-count">Post a comment</a></MTElse></MTIfNonZero><MTElse>Comments are closed.</MTElse></MTEntryIfCommentsOpen>,
<span class="entry-scoring">
<a href="javascript:void(0)" onclick="return mtScore(<$mt:EntryID$>)" id="scoring-id-<$mt:EntryID$>" class="scoring">
<span id="scoring-vote-<$mt:EntryID$>" class="scoring-vote">Favorite this!</span>
<span id="scoring-score-<$mt:EntryID$>" class="scoring-score"><$mt:EntryScore namespace="community_pack_recommend" singular="1" plural="#" none="0"$></span> <span id="scoring-score-label-<$mt:EntryID$>" class="scoring-score-label"><$mt:EntryScore namespace="community_pack_recommend" singular="&nbsp;Favorite" plural="&nbsp;Favorites" none="&nbsp;Favorites"$></span>
</a>
</span></p>
</div><!--/.home-excerpt-->
</mt:MostEmailed>
</mt:MultiBlog>
</div>
<div id="pageNav">
<mt:ArchiveList archive_type="Weekly" lastn="1">
<h3 class="left"><a href="<$mt:ArchiveLink$>" title="<$mt:ArchiveTitle$>">&laquo; older</a></h3>
</mt:ArchiveList>
<form>
<label>Find recipes by category:</label>
<select>
<option selected="selected" value="null">Select</option>
<mt:SubCategories category="Topics">
<option value="<$mt:CategoryBasename$>"><$mt:CategoryLabel$></option>
</mt:SubCategories>
</select>
</form>
<!-- <h3 class="right"><a href="#">newer &raquo;</a></h3> -->
</div><!--/.home-pagination-->
</div>
<div id="recipe-home-by-column">
<a id="recipe-home-by-column-header" href="<$mt:Var name="global_url"$>/columns/">
Recipes by Column
</a>
<ul>
<mt:SubCategories category="Columns">
<li><a href="<$mt:CategoryArchiveLink$>"><$mt:CategoryLabel$></a></li>
</mt:SubCategories>
</ul>
</div>
</div><!--/#threeColumn1-->
<div id="threeColumn2">
<!--#include virtual="/recipes/includes/top_community_recipes.txt" -->
<!-- SQUARE AD SPACE -->
<mt:Include module="squareAdSpace" blog_id="$blogid_se_main">
<!-- /SQUARE AD SPACE -->
<div id="how-to-module" class="yellow-module">
<h2>How To</h2>
<mt:Entries include_blogs="30" category="How To" limit="3">
<div class="home-column-excerpt">
<div class="thumb-100x90">
<mt:AssetContainer limit="1" sort_order="descend">
<img src="<$mt:AssetThumbnailURL width="100" square="1"$>" alt="<$mt:EntryTitle encode_html="1"$>" />
</mt:AssetContainer>
</div>
<h3><a href="<$mt:EntryPermalink$>"><$mt:EntryTitle encode_html="1"$></a></h3>
<p><MTIfNonZero tag="EntryCommentCount"><a href="<$MTEntryPermalink$>#comments" class="comment-count"><$MTEntryCommentCount$> comment<MTIfNotEqual a="[MTEntryCommentCount]" b="1">s</MTIfNotEqual></a><MTElse><a href="<$MTEntryPermalink$>#comments" class="comment-count">Post a comment</a></MTElse></MTIfNonZero></p>
</div>
</mt:Entries>
</div><!--/close how-to-module-->
<!-- sidebar cooking.com module -->
<mt:Include module="sidebar-cooking-com-widget">
<!-- /sidebar cooking.com module -->
</div><!--/#threeColumn2-->
</div><!-- close content div -->
<!--#include virtual="/includes/bottomBuckets.txt" -->
<!--#include virtual="/includes/shortFooter.txt" -->
</div><!-- close container div -->
</body>
</html>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment