<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3275] sites/trunk/wordcamp.org/public_html/wp-content/themes: WordCamp Base: Switch to standardized `wordcamporg` text domain.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3275">3275</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3275","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-31 17:21:00 +0000 (Tue, 31 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Base: Switch to standardized `wordcamporg` text domain.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbase404php">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/404.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasearchivephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/archive.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseattachmentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/attachment.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseauthorphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/author.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasecategoryphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/category.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasecommentsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcbbuttonoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-button-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcbgridoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-grid-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcboptionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-options.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessiontemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsororderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbwidgetsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbfooterphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbmenuphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-menu.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbstructurephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsclasswcbmetaboxphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/class-wcb-metabox.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsfunctionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilstwentytenfunctionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilstwentytenoverridesphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-overrides.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopattachmentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-attachment.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselooppagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopsinglephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-single.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasepagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesearchphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/search.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglewcb_sessionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_session.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglewcb_sponsorphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_sponsor.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetagphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/tag.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2404php">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/404.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2archivephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/archive.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2commentsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/comments.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentpagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentsinglephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-single.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2footerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2functionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2headerphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2imagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/image.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2inctemplatetagsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/template-tags.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incthemeoptionsthemeoptionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbbuttonoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbgridoptionphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessiontemplatephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsororderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbwidgetsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbfooterphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbmenuphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsclasswcbmetaboxphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/class-wcb-metabox.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsfunctionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsheaderphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilstwentytenfunctionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilstwentytenoverridesphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-overrides.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2noresultsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/no-results.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2searchphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/search.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2searchformphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/searchform.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2sidebarphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/sidebar.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/languages/</li>
<li>sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/languages/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbase404php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/404.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/404.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/404.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,9 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-0" class="post error404 not-found">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title"><?php _e( 'Not Found', 'wordcampbase' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><?php _e( 'Not Found', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'wordcampbase' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-0 -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasearchivephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/archive.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/archive.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/archive.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="page-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_day() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Daily Archives: <span>%s</span>', 'wordcampbase' ), get_the_date() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Daily Archives: <span>%s</span>', 'wordcamporg' ), get_the_date() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_month() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Monthly Archives: <span>%s</span>', 'wordcampbase' ), get_the_date('F Y') ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Monthly Archives: <span>%s</span>', 'wordcamporg' ), get_the_date('F Y') ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_year() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Yearly Archives: <span>%s</span>', 'wordcampbase' ), get_the_date('Y') ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Yearly Archives: <span>%s</span>', 'wordcamporg' ), get_the_date('Y') ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Blog Archives', 'wordcampbase' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Blog Archives', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/attachment.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/attachment.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $post->post_parent ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'wordcampbase' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'wordcamporg' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s - title of parent post */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="meta-nav">←</span> %s', 'wordcampbase' ), get_the_title( $post->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="meta-nav">←</span> %s', 'wordcamporg' ), get_the_title( $post->post_parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,18 +26,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(__('<span class="%1$s">By</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(__('<span class="%1$s">By</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-author',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __('<span class="%1$s">Published</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __('<span class="%1$s">Published</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-entry-date',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_time() ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,10 +51,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $metadata['width'] ) && ! empty( $metadata['height'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' <span class="meta-sep">|</span> ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Full size is %s pixels', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Full size is %s pixels', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s">%3$s × %4$s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_attachment_url(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( __('Link to full-size image', 'wordcampbase' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( __('Link to full-size image', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['height']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,16 +104,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="screen-reader-text">', '</span> ', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_in(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), ' <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), ' <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseauthorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/author.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/author.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'wordcampbase' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'wordcamporg' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // If a user has filled out their description, show a bio on their entries.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-avatar -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="author-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php printf( __( 'About %s', 'wordcampbase' ), get_the_author() ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php printf( __( 'About %s', 'wordcamporg' ), get_the_author() ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-description -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #entry-author-info -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasecategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/category.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/category.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="page-title"><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Category Archives: %s', 'wordcampbase' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Category Archives: %s', 'wordcamporg' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $category_description = category_description();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasecommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="comments">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( post_password_required() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'wordcampbase' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #comments -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* Stop the rest of comments.php from being processed,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,14 +32,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_comments() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 id="comments-title"><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'wordcampbase' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'wordcampbase' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- .navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // check for comment navigation ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'wordcampbase' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'wordcampbase' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">←</span> Older Comments', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // check for comment navigation ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="nocomments"><?php _e( 'Comments are closed.', 'wordcampbase' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="nocomments"><?php _e( 'Comments are closed.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end ! comments_open() ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end have_comments() ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcbbuttonoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-button-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-button-option.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-button-option.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,23 +26,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class .= " visible";
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Featured Button', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Featured Button', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="<?php echo $class; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description checkbox-field" for="<?php echo $ids['visible']; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="<?php echo $ids['visible']; ?>" <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->name('visible');
</span><span class="cx" style="display: block; padding: 0 10px"> checked( $this->get_option('visible') );
</span><span class="cx" style="display: block; padding: 0 10px"> ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html_e( 'Show a featured button in the menu.', 'wordcampbase' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html_e( 'Show a featured button in the menu.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description text-field" for="<?php echo $ids['text']; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span><?php esc_html_e( 'Text:', 'wordcampbase' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'Text:', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="<?php echo $ids['text']; ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->name('text'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $this->get_option('text') ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description text-field" for="<?php echo $ids['url']; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span><?php esc_html_e( 'URL:', 'wordcampbase' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'URL:', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="<?php echo $ids['url']; ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->name('url'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $this->get_option('url') ); ?>" />
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcbgridoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-grid-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-grid-option.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-grid-option.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="description row-name"><?php echo esc_html( $this->label ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="signature" type="hidden" <?php $this->name('layout'); ?> value="<?php echo esc_attr( serialize( $layout ) ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_row( $layout ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="edit"><a href="#"><?php echo esc_html_e( 'Edit' , 'wordcampbase'); ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="edit"><a href="#"><?php echo esc_html_e( 'Edit' , 'wordcamporg'); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $this->type != 'content' ):
</span><span class="cx" style="display: block; padding: 0 10px"> $front_page_id = esc_attr( "front-page-only-$this->key" );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,13 +117,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->name('front_only');
</span><span class="cx" style="display: block; padding: 0 10px"> checked( $this->get_option('front_only') );
</span><span class="cx" style="display: block; padding: 0 10px"> ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Front page only', 'wordcampbase' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Front page only', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="picker">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="directions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Choose a new row layout.', 'wordcampbase' ); ?>
- <a href="#" class="cancel"><?php esc_html_e( 'Cancel' , 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Choose a new row layout.', 'wordcamporg' ); ?>
+ <a href="#" class="cancel"><?php esc_html_e( 'Cancel' , 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $current_layout = $this->verbose_row( $this->get_option('layout') );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseliboptionsclasswcboptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-options.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/options/class-wcb-options.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,10 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['grid'] = new WCB_Radio_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'grid',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'grid960',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Grid Width', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Grid Width', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'values' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'grid960' => __( '960px wide', 'wordcampbase' ),
- 'grid720' => __( '720px wide', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'grid960' => __( '960px wide', 'wordcamporg' ),
+ 'grid720' => __( '720px wide', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 12 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('After Header', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('After Header', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['before_content'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 4,4,4 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Before Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Before Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['content'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'content',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 4,4,4 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('After Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('After Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['before_footer'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,14 +77,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 3,3,3,3 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Before Footer', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Before Footer', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['featured_button'] = new WCB_Button_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'featured_button',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'visible' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'text' => __('Register now!', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => __('Register now!', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,11 +92,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['typekit'] = new WCB_Typekit_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'typekit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'jnd4dds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Typekit', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Typekit', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'values' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'default' => __( 'Use the default Typekit fonts.', 'wordcampbase' ),
- 'custom' => __( 'Use a custom Typekit key:', 'wordcampbase' ),
- 'off' => __( 'Do not use any Typekit fonts.', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'default' => __( 'Use the default Typekit fonts.', 'wordcamporg' ),
+ 'custom' => __( 'Use a custom Typekit key:', 'wordcamporg' ),
+ 'off' => __( 'Do not use any Typekit fonts.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_menu() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = add_theme_page( __('Theme Options', 'wordcampbase'), __('Theme Options', 'wordcampbase'), 'edit_theme_options', 'wcb-theme-options', array( &$this, 'render' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = add_theme_page( __('Theme Options', 'wordcamporg'), __('Theme Options', 'wordcamporg'), 'edit_theme_options', 'wcb-theme-options', array( &$this, 'render' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action("wcb_enqueue_scripts_$page", array( &$this, 'enqueue_scripts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,15 +141,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php screen_icon(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php echo get_current_theme() . ' ' . __( 'Theme Options', 'wordcampbase' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1><?php echo get_current_theme() . ' ' . __( 'Theme Options', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== $_REQUEST['updated'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcampbase' ); ?></strong></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="options.php">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_fields( 'wcb_theme_options' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e('General Options', 'wordcampbase'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e('General Options', 'wordcamporg'); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['grid']->render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,13 +158,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e('Theme Layout', 'wordcampbase'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e('Theme Layout', 'wordcamporg'); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $rows = array( 'after_header', 'before_content', 'content', 'after_content', 'before_footer' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr id="visibility-row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Show Rows', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Show Rows', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $rows as $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options[ $row ]->render_visibility();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Row Layout', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Row Layout', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $rows as $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options[ $row ]->render_layout();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcampbase' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessiontemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-session-template.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,13 +95,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type() == WCB_SESSION_POST_TYPE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $track = wcb_get_session_track();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['speakers'] = sprintf( __('Presented by %s', 'wordcampbase'), wcb_get_session_speakers() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['speakers'] = sprintf( __('Presented by %s', 'wordcamporg'), wcb_get_session_speakers() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $track ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['order'] = array('speakers', 'edit');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['track'] = sprintf( __('%s Track', 'wordcampbase'), $track );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['track'] = sprintf( __('%s Track', 'wordcamporg'), $track );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_term_link( $track, WCB_TRACK_TAXONOMY );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $link ) ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsessionsclasswcbsessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sessions/class-wcb-sessions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,13 +23,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'speakers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'text',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Speakers', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Speakers', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $box = wcb_get_metabox( 'WCB_Post_Metabox' );
</span><span class="cx" style="display: block; padding: 0 10px"> $box->add_instance( WCB_SESSION_POST_TYPE, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __('Speakers', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __('Speakers', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_manager' => $this->meta_manager,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_fields' => $meta_fields,
</span><span class="cx" style="display: block; padding: 0 10px"> 'context' => 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,19 +41,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Session post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sessions', 'wordcampbase' ),
- 'singular_name' => __( 'Session', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Session', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Session', 'wordcampbase' ),
- 'new_item' => __( 'New Session', 'wordcampbase' ),
- 'view' => __( 'View Session', 'wordcampbase' ),
- 'view_item' => __( 'View Session', 'wordcampbase' ),
- 'search_items' => __( 'Search Sessions', 'wordcampbase' ),
- 'not_found' => __( 'No sessions found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No sessions found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Session:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sessions', 'wordcamporg' ),
+ 'singular_name' => __( 'Session', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Session', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Session', 'wordcamporg' ),
+ 'new_item' => __( 'New Session', 'wordcamporg' ),
+ 'view' => __( 'View Session', 'wordcamporg' ),
+ 'view_item' => __( 'View Session', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sessions', 'wordcamporg' ),
+ 'not_found' => __( 'No sessions found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sessions found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Session:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Session post type rewrite
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,15 +97,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Tracks', 'wordcampbase'),
- 'singular_name' => __( 'Track', 'wordcampbase'),
- 'search_items' => __( 'Search Tracks', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Tracks', 'wordcamporg'),
+ 'singular_name' => __( 'Track', 'wordcamporg'),
+ 'search_items' => __( 'Search Tracks', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'popular_items' => __( 'Popular Tracks','wordcampbase'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'all_items' => __( 'All Tracks', 'wordcampbase'),
- 'edit_item' => __( 'Edit Track', 'wordcampbase'),
- 'update_item' => __( 'Update Track', 'wordcampbase'),
- 'add_new_item' => __( 'Add Track', 'wordcampbase'),
- 'new_item_name' => __( 'New Track', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'all_items' => __( 'All Tracks', 'wordcamporg'),
+ 'edit_item' => __( 'Edit Track', 'wordcamporg'),
+ 'update_item' => __( 'Update Track', 'wordcamporg'),
+ 'add_new_item' => __( 'Add Track', 'wordcamporg'),
+ 'new_item_name' => __( 'New Track', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibspeakersclasswcbspeakersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/speakers/class-wcb-speakers.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'text',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Gravatar Email', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Gravatar Email', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $box = wcb_get_metabox( 'WCB_Post_Metabox' );
</span><span class="cx" style="display: block; padding: 0 10px"> $box->add_instance( WCB_SPEAKER_POST_TYPE, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __('Gravatar Email', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __('Gravatar Email', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_manager' => $this->meta_manager,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_fields' => $meta_fields,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,19 +38,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Speaker post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Speakers', 'wordcampbase' ),
- 'singular_name' => __( 'Speaker', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Speaker', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Speaker', 'wordcampbase' ),
- 'new_item' => __( 'New Speaker', 'wordcampbase' ),
- 'view' => __( 'View Speaker', 'wordcampbase' ),
- 'view_item' => __( 'View Speaker', 'wordcampbase' ),
- 'search_items' => __( 'Search Speakers', 'wordcampbase' ),
- 'not_found' => __( 'No speakers found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No speakers found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Speaker:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Speakers', 'wordcamporg' ),
+ 'singular_name' => __( 'Speaker', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Speaker', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Speaker', 'wordcamporg' ),
+ 'new_item' => __( 'New Speaker', 'wordcamporg' ),
+ 'view' => __( 'View Speaker', 'wordcamporg' ),
+ 'view_item' => __( 'View Speaker', 'wordcamporg' ),
+ 'search_items' => __( 'Search Speakers', 'wordcamporg' ),
+ 'not_found' => __( 'No speakers found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No speakers found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Speaker:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Speaker post type rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsororderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsor-order.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_menu() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page = add_submenu_page(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit.php?post_type=' . WCB_SPONSOR_POST_TYPE, // Page type
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __('Order Sponsor Levels', 'wordcampbase'), // Page title
- __('Order Sponsor Levels', 'wordcampbase'), // Menu title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __('Order Sponsor Levels', 'wordcamporg'), // Page title
+ __('Order Sponsor Levels', 'wordcamporg'), // Menu title
</ins><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts', // Capability
</span><span class="cx" style="display: block; padding: 0 10px"> 'sponsor_levels', // Menu slug
</span><span class="cx" style="display: block; padding: 0 10px"> array( &$this, 'render' ) // Callback
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,16 +56,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php screen_icon(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php _e( 'Order Sponsor Levels', 'wordcampbase' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1><?php _e( 'Order Sponsor Levels', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== $_REQUEST['updated'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcampbase' ); ?></strong></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="options.php">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_fields( 'wcb_sponsor_options' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="description sponsor-order-instructions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcampbase'); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcamporg'); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="sponsor-order">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach( $levels as $term ): ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcampbase' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbsponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,19 +24,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sponsor post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sponsors', 'wordcampbase' ),
- 'singular_name' => __( 'Sponsor', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Sponsor', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Sponsor', 'wordcampbase' ),
- 'new_item' => __( 'New Sponsor', 'wordcampbase' ),
- 'view' => __( 'View Sponsor', 'wordcampbase' ),
- 'view_item' => __( 'View Sponsor', 'wordcampbase' ),
- 'search_items' => __( 'Search Sponsors', 'wordcampbase' ),
- 'not_found' => __( 'No sponsors found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No sponsors found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Sponsor:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sponsors', 'wordcamporg' ),
+ 'singular_name' => __( 'Sponsor', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Sponsor', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Sponsor', 'wordcamporg' ),
+ 'new_item' => __( 'New Sponsor', 'wordcamporg' ),
+ 'view' => __( 'View Sponsor', 'wordcamporg' ),
+ 'view_item' => __( 'View Sponsor', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sponsors', 'wordcamporg' ),
+ 'not_found' => __( 'No sponsors found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sponsors found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Sponsor:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sponsor post type rewrite
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,15 +80,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sponsor Levels', 'wordcampbase'),
- 'singular_name' => __( 'Sponsor Level', 'wordcampbase'),
- 'search_items' => __( 'Search Sponsor Levels', 'wordcampbase'),
- 'popular_items' => __( 'Popular Sponsor Levels', 'wordcampbase'),
- 'all_items' => __( 'All Sponsor Levels', 'wordcampbase'),
- 'edit_item' => __( 'Edit Sponsor Level', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sponsor Levels', 'wordcamporg'),
+ 'singular_name' => __( 'Sponsor Level', 'wordcamporg'),
+ 'search_items' => __( 'Search Sponsor Levels', 'wordcamporg'),
+ 'popular_items' => __( 'Popular Sponsor Levels', 'wordcamporg'),
+ 'all_items' => __( 'All Sponsor Levels', 'wordcamporg'),
+ 'edit_item' => __( 'Edit Sponsor Level', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_item' => __( 'Update Sponsor Level','wordcampbase'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_new_item' => __( 'Add Sponsor Level', 'wordcampbase'),
- 'new_item_name' => __( 'New Sponsor Level', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_new_item' => __( 'Add Sponsor Level', 'wordcamporg'),
+ 'new_item_name' => __( 'New Sponsor Level', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibsponsorsclasswcbwidgetsponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/sponsors/class-wcb-widget-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function WCB_Widget_Sponsors() {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_ops = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'classname' => 'wcb_widget_sponsors',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Your WordCamp’s Sponsors', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Your WordCamp’s Sponsors', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Widget( 'wcb_sponsors', __('Sponsors', 'wordcampbase'), $widget_ops );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->WP_Widget( 'wcb_sponsors', __('Sponsors', 'wordcamporg'), $widget_ops );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function widget( $args, $instance ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( wcb_have_sponsors() ):
</span><span class="cx" style="display: block; padding: 0 10px"> wcb_the_sponsor();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $instance['title'];
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcampbase'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcamporg'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-footer.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-footer.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="site-generator">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'twentyten_credits' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'wordcampbase' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'wordcampbase' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'wordcampbase' ), 'WordPress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'wordcamporg' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'wordcamporg' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'wordcamporg' ), 'WordPress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #site-generator -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #colophon -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-header.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-header.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,9 +9,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $this->get_id(); ?>" class="grid_12">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="return-to-central">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== strpos($_SERVER['HTTP_HOST'], 'wordpress.org')) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Return to WordPress.org', 'wordcampbase' ); ?>"><?php _e('← WordPress.org', 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Return to WordPress.org', 'wordcamporg' ); ?>"><?php _e('← WordPress.org', 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcampbase' ); ?>"><?php _e('← WordCamp Central', 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcamporg' ); ?>"><?php _e('← WordCamp Central', 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-menu.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-menu.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,9 +9,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $this->get_id(); ?>" class="grid_12">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="access" role="navigation" class="clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Toggle element for responsive menus */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="menu-toggle"><?php _e( 'Menu', 'wordcampbase' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="menu-toggle"><?php _e( 'Menu', 'wordcamporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcampbase' ); ?>"><?php _e( 'Skip to content', 'wordcampbase' ); ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcamporg' ); ?>"><?php _e( 'Skip to content', 'wordcamporg' ); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbstructurephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,23 +70,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_header' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-header',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('After Header', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('After Header', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-content',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Before Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Before Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'content-row',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-content',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('After Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('After Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_footer' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-footer',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Before Footer', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Before Footer', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['grid'] = $option['layout'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $option['front_only'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['name'] = sprintf( __('Front Page: %s', 'wordcampbase'), $args['name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['name'] = sprintf( __('Front Page: %s', 'wordcamporg'), $args['name'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sidebars[ $id ] = new WCB_Sidebar_Row( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function full_width_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sidebars['content'] = new WCB_Sidebar_Row( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'content-row',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'grid' => array( array( 12, 'content' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsclasswcbmetaboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/class-wcb-metabox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/class-wcb-metabox.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/class-wcb-metabox.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _set_instance( $screen, $index, $args=array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 'id' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __( 'Untitled' , 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __( 'Untitled' , 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'context' => 'side',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/functions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/functions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-load_theme_textdomain( 'wordcampbase', TEMPLATEPATH . '/languages' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/twentyten-overrides.php";
</span><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/twentyten-functions.php";
</span><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/class-wcb-loader.php";
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilsheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/header.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/header.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $meta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['category'] = sprintf( __('Posted in %s', 'wordcampbase'), get_the_category_list( ', ' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['category'] = sprintf( __('Posted in %s', 'wordcamporg'), get_the_category_list( ', ' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object_in_taxonomy( get_post_type(), 'tag' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['tag'] = sprintf( __('Tagged %s', 'wordcampbase'), get_the_tag_list( '', ', ' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['tag'] = sprintf( __('Tagged %s', 'wordcamporg'), get_the_tag_list( '', ', ' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['order'][] = 'br';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a page number if necessary:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $paged >= 2 || $page >= 2 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' | ' . sprintf( __( 'Page %s', 'wordcampbase' ), max( $paged, $page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' | ' . sprintf( __( 'Page %s', 'wordcamporg' ), max( $paged, $page ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</title>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilstwentytenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-functions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-functions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses register_nav_menus() To add support for navigation menus.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_custom_background() To add support for a custom background.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_editor_style() To style the visual editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses load_theme_textdomain() For translation/localization support.
</del><span class="cx" style="display: block; padding: 0 10px"> * @uses add_custom_image_header() To add support for a custom header.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses register_default_headers() To register the default custom header images provided with the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,10 +82,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add default posts and comments RSS feed links to head
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make theme available for translation
- // Translations can be filed in the /languages/ directory
- // load_theme_textdomain( 'wordcampbase', TEMPLATEPATH . '/languages' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_file = TEMPLATEPATH . "/languages/$locale.php";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_readable( $locale_file ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme uses wp_nav_menu() in one location.
</span><span class="cx" style="display: block; padding: 0 10px"> register_nav_menus( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'primary' => __( 'Primary Navigation', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'primary' => __( 'Primary Navigation', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme allows users to set a custom background
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,49 +120,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/berries.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Berries', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Berries', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cherryblossom' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/cherryblossoms.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Cherry Blossoms', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Cherry Blossoms', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'concave' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/concave.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Concave', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Concave', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fern' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/fern.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Fern', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Fern', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'forestfloor' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/forestfloor.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Forest Floor', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Forest Floor', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'inkwell' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/inkwell.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Inkwell', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Inkwell', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/path.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Path', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Path', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sunset' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/sunset.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: header image description */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Sunset', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Sunset', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="screen-reader-text">%s</span> ', get_the_title() )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,17 +305,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( $comment, 40 ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '%s <span class="says">says:</span>', 'wordcampbase' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '%s <span class="says">says:</span>', 'wordcamporg' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $comment->comment_approved == '0' ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <em><?php _e( 'Your comment is awaiting moderation.', 'wordcampbase' ); ?></em>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <em><?php _e( 'Your comment is awaiting moderation.', 'wordcamporg' ); ?></em>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: date, 2: time */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '%1$s at %2$s', 'wordcampbase' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'wordcampbase' ), ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '%1$s at %2$s', 'wordcamporg' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'wordcamporg' ), ' ' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-meta .commentmetadata -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback' :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="post pingback">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Pingback:', 'wordcampbase' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'wordcampbase'), ' ' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Pingback:', 'wordcamporg' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'wordcamporg'), ' ' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> endswitch;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,9 +351,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_widgets_init() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 1, located at the top of the sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Primary Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Primary Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'primary-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The primary widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The primary widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,9 +362,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Secondary Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Secondary Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'secondary-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The secondary widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The secondary widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,9 +373,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 3, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'First Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'First Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'first-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The first footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The first footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,9 +384,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 4, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Second Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Second Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'second-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The second footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The second footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,9 +395,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 5, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Third Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Third Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'third-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The third footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The third footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,9 +406,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 6, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Fourth Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Fourth Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'fourth-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The fourth footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The fourth footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +439,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Ten 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_posted_on() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-author',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_permalink(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,11 +465,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Retrieves tag list of current post, separated by commas.
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_list = get_the_tag_list( '', ', ' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tag_list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Prints the string, replacing the placeholders.
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibutilstwentytenoverridesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-overrides.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-overrides.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/utils/twentyten-overrides.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_posted_on() {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['author'] = sprintf( __( '%1$s <span class="meta-sep">by</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['author'] = sprintf( __( '%1$s <span class="meta-sep">by</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_permalink(),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_time() ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,13 +19,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['comments'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'before' => '<span class="comments-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'zero' => __( 'Leave a comment', 'wordcampbase' ),
- 'one' => __( '1 Comment', 'wordcampbase' ),
- 'many' => __( '% Comments', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'zero' => __( 'Leave a comment', 'wordcamporg' ),
+ 'one' => __( '1 Comment', 'wordcamporg' ),
+ 'many' => __( '% Comments', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['edit'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __( 'Edit', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __( 'Edit', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before' => '<span class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-attachment.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-attachment.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,9 +18,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $post->post_parent ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'wordcampbase' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'wordcamporg' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s - title of parent post */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="meta-nav">←</span> %s', 'wordcampbase' ), get_the_title( $post->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="meta-nav">←</span> %s', 'wordcamporg' ), get_the_title( $post->post_parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,18 +29,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="%1$s">By</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="%1$s">By</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-author',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="%1$s">Published</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="%1$s">Published</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-entry-date',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_time() ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,17 +50,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_attachment_is_image() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' <span class="meta-sep">|</span> ';
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_get_attachment_metadata();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Full size is %s pixels', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Full size is %s pixels', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s">%3$s × %4$s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_attachment_url(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( __( 'Link to full-size image', 'wordcampbase' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( __( 'Link to full-size image', 'wordcamporg' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['height']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,16 +103,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="screen-reader-text">', '</span> ', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_in(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), ' <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), ' <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselooppagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-page.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-page.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,8 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopsinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-single.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop-single.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,8 +18,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-above" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcampbase' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcampbase' ) . '</span>' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-above -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,11 +40,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-avatar -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="author-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php printf( esc_attr__( 'About %s', 'wordcampbase' ), get_the_author() ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php printf( esc_attr__( 'About %s', 'wordcamporg' ), get_the_author() ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="author-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'wordcampbase' ), get_the_author() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'wordcamporg' ), get_the_author() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-link -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-description -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,13 +53,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_in(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-below" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcampbase' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcampbase' ) . '</span>' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-below -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comments_template( '', true ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaseloopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/loop.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,17 +22,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Display navigation to next/previous pages when applicable */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-above" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wordcampbase' ) ); ?></div>
- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wordcampbase' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-above -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* If there are no posts to display, such as an empty archive page */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! have_posts() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-0" class="post error404 not-found">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title"><?php _e( 'Not Found', 'wordcampbase' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><?php _e( 'Not Found', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'wordcampbase' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-0 -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,9 +57,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* How to display posts in the Gallery category. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_category( _x('gallery', 'gallery category slug', 'wordcampbase') ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_category( _x('gallery', 'gallery category slug', 'wordcamporg') ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_on(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,8 +79,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="gallery-thumb">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .gallery-thumb -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'wordcampbase' ),
- 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'wordcamporg' ),
+ 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
</ins><span class="cx" style="display: block; padding: 0 10px"> $total_images
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?></em></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,16 +89,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo get_term_link( _x('gallery', 'gallery category slug', 'wordcampbase'), 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'wordcampbase' ); ?>"><?php _e( 'More Galleries', 'wordcampbase' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo get_term_link( _x('gallery', 'gallery category slug', 'wordcamporg'), 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'wordcamporg' ); ?>"><?php _e( 'More Galleries', 'wordcamporg' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcampbase' ), __( '1 Comment', 'wordcampbase' ), __( '% Comments', 'wordcampbase' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* How to display posts in the asides category */ ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php elseif ( in_category( _x('asides', 'asides category slug', 'wordcampbase') ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( in_category( _x('asides', 'asides category slug', 'wordcamporg') ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,15 +107,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-summary -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'wordcampbase' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_on(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcampbase' ), __( '1 Comment', 'wordcampbase' ), __( '% Comments', 'wordcampbase' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_on(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,17 +137,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="screen-reader-text">', '</span> ', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( count( get_the_category() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'wordcampbase' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'wordcamporg' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,12 +156,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ):
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="tag-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'wordcampbase' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'wordcamporg' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcampbase' ), __( '1 Comment', 'wordcampbase' ), __( '% Comments', 'wordcampbase' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Display navigation to next/previous pages when applicable */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-below" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wordcampbase' ) ); ?></div>
- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wordcampbase' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-below -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasepagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/page.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/page.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/search.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/search.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'wordcampbase' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'wordcamporg' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* Run the loop for the search to output the results.
</span><span class="cx" style="display: block; padding: 0 10px"> * If you want to overload this in a child theme then include a file
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,9 +23,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-0" class="post no-results not-found">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="entry-title"><?php _e( 'Nothing Found', 'wordcampbase' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="entry-title"><?php _e( 'Nothing Found', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'wordcampbase' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-0 -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglewcb_sessionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_session.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_session.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_session.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglewcb_sponsorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_sponsor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_sponsor.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single-wcb_sponsor.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,12 +15,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-above" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcampbase' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcampbase' ) . '</span>' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-above -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,11 +29,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasesinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/single.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,8 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-above" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcampbase' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcampbase' ) . '</span>' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-above -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcampbase' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,11 +37,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-avatar -->
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="author-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php printf( esc_attr__( 'About %s', 'wordcampbase' ), get_the_author() ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php printf( esc_attr__( 'About %s', 'wordcamporg' ), get_the_author() ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="author-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'wordcampbase' ), get_the_author() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'wordcamporg' ), get_the_author() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-link -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #author-description -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,13 +50,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyten_posted_in(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wordcampbase' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-utility -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #post-## -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-below" class="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcampbase' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcampbase' ) . '</span>' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #nav-below -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comments_template( '', true ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetagphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/tag.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/tag.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/tag.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="page-title"><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Tag Archives: %s', 'wordcampbase' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Tag Archives: %s', 'wordcamporg' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sessions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class( 'session' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta session-speakers">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wcb_entry_meta(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasetemplatesponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/template-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wcb_the_sponsor();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class( 'sponsor' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2404php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/404.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/404.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/404.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,18 +13,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-0" class="post error404 not-found">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title"><?php _e( 'Oops! That page can’t be found.', 'wcbs' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><?php _e( 'Oops! That page can’t be found.', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'wcbs' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="widgettitle"><?php _e( 'Most Used Categories', 'wcbs' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="widgettitle"><?php _e( 'Most Used Categories', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: smilie */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'wcbs' ), convert_smilies( ':)' ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'wordcamporg' ), convert_smilies( ':)' ) ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2archivephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/archive.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/archive.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/archive.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,17 +19,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="page-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_category() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Category Archives: %s', 'wcbs' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Category Archives: %s', 'wordcamporg' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tag() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Tag Archives: %s', 'wcbs' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Tag Archives: %s', 'wordcamporg' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_author() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* Queue the first post, that way we know
</span><span class="cx" style="display: block; padding: 0 10px"> * what author we're dealing with (if that is the case).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Author Archives: %s', 'wcbs' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Author Archives: %s', 'wordcamporg' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Since we called the_post() above, we need to
</span><span class="cx" style="display: block; padding: 0 10px"> * rewind the loop back to the beginning that way
</span><span class="cx" style="display: block; padding: 0 10px"> * we can run the loop properly, in full.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,16 +37,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> rewind_posts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_day() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Daily Archives: %s', 'wcbs' ), '<span>' . get_the_date() . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Daily Archives: %s', 'wordcamporg' ), '<span>' . get_the_date() . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_month() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Monthly Archives: %s', 'wcbs' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Monthly Archives: %s', 'wordcamporg' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_year() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Yearly Archives: %s', 'wcbs' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Yearly Archives: %s', 'wordcamporg' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'Archives', 'wcbs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _e( 'Archives', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2commentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/comments.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/comments.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,16 +29,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_comments() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="comments-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( _n( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <nav role="navigation" id="comment-nav-above" class="site-navigation comment-navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="assistive-text"><?php _e( 'Comment navigation', 'wcbs' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'wcbs' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'wcbs' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="assistive-text"><?php _e( 'Comment navigation', 'wordcamporg' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // check for comment navigation ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,9 +56,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="assistive-text"><?php _e( 'Comment navigation', 'wcbs' ); ?></h1>
- <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'wcbs' ) ); ?></div>
- <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'wcbs' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="assistive-text"><?php _e( 'Comment navigation', 'wordcamporg' ); ?></h1>
+ <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'wordcamporg' ) ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // check for comment navigation ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed and there are no comments, let's leave a little note, shall we?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="nocomments"><?php _e( 'Comments are closed.', 'wcbs' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="nocomments"><?php _e( 'Comments are closed.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comment_form(); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-page.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-page.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wcbs' ), 'after' => '</div>' ) ); ?>
- <?php edit_post_link( __( 'Edit', 'wcbs' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentsinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-single.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content-single.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,13 +16,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wcbs' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used between list items, there is a space after the comma */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $category_list = get_the_category_list( __( ', ', 'wcbs' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $category_list = get_the_category_list( __( ', ', 'wordcamporg' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used between list items, there is a space after the comma */
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_list = get_the_tag_list( '', ', ' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,17 +30,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wcbs_categorized_blog() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This blog only has 1 category so we just need to worry about tags in the meta text
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $tag_list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wcbs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wcbs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // But this blog has loads of categories so we should probably display them here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $tag_list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wcbs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wcbs' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } // end check for categories on this blog
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wcbs' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2contentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/content.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wcbs' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'post' == get_post_type() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,10 +24,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="assistive-text">', '</span> ', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wcbs' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,31 +35,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used between list items, there is a space after the comma */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $categories_list = get_the_category_list( __( ', ', 'wcbs' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $categories_list = get_the_category_list( __( ', ', 'wordcamporg' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $categories_list && wcbs_categorized_blog() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Posted in %1$s', 'wcbs' ), $categories_list ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Posted in %1$s', 'wordcamporg' ), $categories_list ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if categories ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used between list items, there is a space after the comma */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags_list = get_the_tag_list( '', __( ', ', 'wcbs' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags_list = get_the_tag_list( '', __( ', ', 'wordcamporg' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $tags_list ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="sep"> | </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="tag-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Tagged %1$s', 'wcbs' ), $tags_list ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Tagged %1$s', 'wordcamporg' ), $tags_list ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if $tags_list ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // End if 'post' == get_post_type() ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="sep"> | </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wcbs' ), __( '1 Comment', 'wcbs' ), __( '% Comments', 'wcbs' ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'wordcamporg' ), __( '1 Comment', 'wordcamporg' ), __( '% Comments', 'wordcamporg' ) ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wcbs' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- #entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2footerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/footer.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/footer.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,9 +27,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'wcbs_credits' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="site-info-generator" href="http://wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', 'wcbs' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'wcbs' ), 'WordPress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="site-info-generator" href="http://wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', 'wordcamporg' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'wordcamporg' ), 'WordPress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="site-info-network" href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wcbs' ); ?>"><?php _e('Go to WordCamp Central', 'wcbs'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="site-info-network" href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcamporg' ); ?>"><?php _e('Go to WordCamp Central', 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-info -->
</span><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .site-footer .site-footer -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/functions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,14 +58,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //require( get_template_directory() . '/inc/wpcom.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Make theme available for translation
- * Translations can be filed in the /languages/ directory
- * If you're building a theme based on WCBS, use a find and replace
- * to change 'wcbs' to the name of your theme in all the template files
- */
- load_theme_textdomain( 'wcbs', get_template_directory() . '/languages' );
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Add default posts and comments RSS feed links to head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'automatic-feed-links' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This theme uses wp_nav_menu() in one location.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> register_nav_menus( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'primary' => __( 'Primary Menu', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'primary' => __( 'Primary Menu', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +91,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Generic main Sidebar Widget Area - Will show in all pages. Will load default content.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Primary Sidebar', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Primary Sidebar', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Main Widgets Sidebar. Shows up in all pages.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Main Widgets Sidebar. Shows up in all pages.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,9 +101,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Generic main Sidebar Widget Area - Will show in all pages. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Secondary Sidebar', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Secondary Sidebar', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Secondary Widgets Sidebar - shows up in all pages after the Primary Sidebar block.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Secondary Widgets Sidebar - shows up in all pages after the Primary Sidebar block.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,9 +112,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // After Header Widget Area - located after the #masthead header block. Will show in all pages except the homepage. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'After Header', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'After Header', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-header',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will show a widgets area, after the #masthead header, in all pages except the homepage.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will show a widgets area, after the #masthead header, in all pages except the homepage.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,9 +122,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // After Header Widget Area for the Homepage - located after the #masthead header block. Will show only on the homepage. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'After Header (Homepage)', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'After Header (Homepage)', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-header-homepage',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will show a widgets area, after the #masthead header, only on the homepage.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will show a widgets area, after the #masthead header, only on the homepage.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,9 +133,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Before Content Widget Area - located inside the #main block, before any other content. Will show in all pages except the homepage. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Before Content', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Before Content', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-content',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will show a widgets area, inside the #main block, before all the content, in all pages except the homepage.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will show a widgets area, inside the #main block, before all the content, in all pages except the homepage.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,9 +143,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Before Content Widget Area for the Homepage - located inside the #main block, before any other content. Will show only on the homepage. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Before Content (Homepage)', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Before Content (Homepage)', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-content-homepage',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will show a widgets area, inside the #main block, before all the content, only on the homepage.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will show a widgets area, inside the #main block, before all the content, only on the homepage.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,9 +156,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Footer Widget Area 1
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Footer Widget Area 1', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Footer Widget Area 1', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'footer-1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,9 +166,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Footer Widget Area 2
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Footer Widget Area 2', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Footer Widget Area 2', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'footer-2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,9 +176,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Footer Widget Area 3
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Footer Widget Area 3', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Footer Widget Area 3', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'footer-3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,9 +186,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Footer Widget Area 4
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Footer Widget Area 4', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Footer Widget Area 4', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'footer-4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,9 +196,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Footer Widget Area 5
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Footer Widget Area 5', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Footer Widget Area 5', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'footer-5',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Will Show a widgets area on the footer - can be combined with other Footer Widget Area blocks.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => "</aside>",
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h1 class="widget-title">',
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2headerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/header.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/header.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a page number if necessary:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $paged >= 2 || $page >= 2 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' | ' . sprintf( __( 'Page %s', 'wcbs' ), max( $paged, $page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' | ' . sprintf( __( 'Page %s', 'wordcamporg' ), max( $paged, $page ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,8 +59,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </hgroup>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav role="navigation" class="site-navigation main-navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="assistive-text"><?php _e( 'Menu', 'wcbs' ); ?></h1>
- <div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wcbs' ); ?>"><?php _e( 'Skip to content', 'wcbs' ); ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="assistive-text"><?php _e( 'Menu', 'wordcamporg' ); ?></h1>
+ <div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcamporg' ); ?>"><?php _e( 'Skip to content', 'wordcamporg' ); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2imagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/image.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/image.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = wp_get_attachment_metadata();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s" pubdate>%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s × %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%7$s</a>', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s" pubdate>%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s × %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%7$s</a>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_date( 'c' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( get_the_date() ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_attachment_url(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,12 +31,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_title( $post->post_parent )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wcbs' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav id="image-navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="previous-image"><?php previous_image_link( false, __( '← Previous', 'wcbs' ) ); ?></span>
- <span class="next-image"><?php next_image_link( false, __( 'Next →', 'wcbs' ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="previous-image"><?php previous_image_link( false, __( '← Previous', 'wordcamporg' ) ); ?></span>
+ <span class="next-image"><?php next_image_link( false, __( 'Next →', 'wordcamporg' ) ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #image-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,21 +83,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-attachment -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wcbs' ), 'after' => '</div>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'wordcamporg' ), 'after' => '</div>' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'wcbs' ), get_trackback_url() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'wordcamporg' ), get_trackback_url() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'wcbs' ), get_trackback_url() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'wordcamporg' ), get_trackback_url() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'wcbs' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Both comments and trackbacks are currently closed.', 'wcbs' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'Both comments and trackbacks are currently closed.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( __( 'Edit', 'wcbs' ), ' <span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'wordcamporg' ), ' <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2inctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/template-tags.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/template-tags.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,21 +25,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_single() ) : // navigation links for single posts ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav role="navigation" id="<?php echo $nav_id; ?>" class="<?php echo $nav_class; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="assistive-text"><?php _e( 'Post navigation', 'wcbs' ); ?></h1>
- <?php previous_post_link( '<div class="nav-previous">%link</div>', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wcbs' ) . '</span> %title' ); ?>
- <?php next_post_link( '<div class="nav-next">%link</div>', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wcbs' ) . '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="assistive-text"><?php _e( 'Post navigation', 'wordcamporg' ); ?></h1>
+ <?php previous_post_link( '<div class="nav-previous">%link</div>', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'wordcamporg' ) . '</span> %title' ); ?>
+ <?php next_post_link( '<div class="nav-next">%link</div>', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'wordcamporg' ) . '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #<?php echo $nav_id; ?> -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $wp_query->max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav role="navigation" id="<?php echo $nav_id; ?>" class="<?php echo $nav_class; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="assistive-text"><?php _e( 'Post navigation', 'wcbs' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="assistive-text"><?php _e( 'Post navigation', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_next_posts_link() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wcbs' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_previous_posts_link() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wcbs' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'wordcamporg' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #<?php echo $nav_id; ?> -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback' :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="post pingback">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Pingback:', 'wcbs' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'wcbs' ), ' ' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Pingback:', 'wordcamporg' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'wordcamporg' ), ' ' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,10 +75,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <footer>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( $comment, 40 ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '%s <span class="says">says:</span>', 'wcbs' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '%s <span class="says">says:</span>', 'wordcamporg' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $comment->comment_approved == '0' ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <em><?php _e( 'Your comment is awaiting moderation.', 'wcbs' ); ?></em>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <em><?php _e( 'Your comment is awaiting moderation.', 'wordcamporg' ); ?></em>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,9 +86,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><time pubdate datetime="<?php comment_time( 'c' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: date, 2: time */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '%1$s at %2$s', 'wcbs' ), get_comment_date(), get_comment_time() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '%1$s at %2$s', 'wordcamporg' ), get_comment_date(), get_comment_time() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </time></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_comment_link( __( '(Edit)', 'wcbs' ), ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_comment_link( __( '(Edit)', 'wordcamporg' ), ' ' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-meta .commentmetadata -->
</span><span class="cx" style="display: block; padding: 0 10px"> </footer>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,13 +113,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since WCBS 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wcbs_posted_on() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Posted on <a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s" pubdate>%4$s</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'wcbs' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Posted on <a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s" pubdate>%4$s</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_time() ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_date( 'c' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( get_the_date() ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'View all posts by %s', 'wcbs' ), get_the_author() ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( __( 'View all posts by %s', 'wordcamporg' ), get_the_author() ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( get_the_author() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2incthemeoptionsthemeoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/inc/theme-options/theme-options.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,16 +35,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Register our individual settings fields
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sample_checkbox', // Unique identifier for the field for this section
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Sample Checkbox', 'wcbs' ), // Setting field label
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Sample Checkbox', 'wordcamporg' ), // Setting field label
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcbs_settings_field_sample_checkbox', // Function that renders the settings field
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_options', // Menu slug, used to uniquely identify the page; see wcbs_theme_options_add_page()
</span><span class="cx" style="display: block; padding: 0 10px"> 'general' // Settings section. Same as the first argument in the add_settings_section() above
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_settings_field( 'sample_text_input', __( 'Sample Text Input', 'wcbs' ), 'wcbs_settings_field_sample_text_input', 'theme_options', 'general' );
- add_settings_field( 'sample_select_options', __( 'Sample Select Options', 'wcbs' ), 'wcbs_settings_field_sample_select_options', 'theme_options', 'general' );
- add_settings_field( 'sample_radio_buttons', __( 'Sample Radio Buttons', 'wcbs' ), 'wcbs_settings_field_sample_radio_buttons', 'theme_options', 'general' );
- add_settings_field( 'sample_textarea', __( 'Sample Textarea', 'wcbs' ), 'wcbs_settings_field_sample_textarea', 'theme_options', 'general' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_settings_field( 'sample_text_input', __( 'Sample Text Input', 'wordcamporg' ), 'wcbs_settings_field_sample_text_input', 'theme_options', 'general' );
+ add_settings_field( 'sample_select_options', __( 'Sample Select Options', 'wordcamporg' ), 'wcbs_settings_field_sample_select_options', 'theme_options', 'general' );
+ add_settings_field( 'sample_radio_buttons', __( 'Sample Radio Buttons', 'wordcamporg' ), 'wcbs_settings_field_sample_radio_buttons', 'theme_options', 'general' );
+ add_settings_field( 'sample_textarea', __( 'Sample Textarea', 'wordcamporg' ), 'wcbs_settings_field_sample_textarea', 'theme_options', 'general' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', 'wcbs_theme_options_init' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +71,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wcbs_theme_options_add_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_page = add_theme_page(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Theme Options', 'wcbs' ), // Name of page
- __( 'Theme Options', 'wcbs' ), // Label in menu
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Theme Options', 'wordcamporg' ), // Name of page
+ __( 'Theme Options', 'wordcamporg' ), // Label in menu
</ins><span class="cx" style="display: block; padding: 0 10px"> 'edit_theme_options', // Capability required
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_options', // Menu slug, used to uniquely identify the page
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbs_theme_options_render_page' // Function that renders the options page
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,27 +89,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sample_select_options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '0' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Zero', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Zero', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '1' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'One', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'One', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '2' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Two', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Two', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '3' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Three', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Three', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '4' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Four', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Four', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '5' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Five', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Five', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,15 +125,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sample_radio_buttons = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'yes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'yes',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Yes', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Yes', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'no' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'no',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'No', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'No', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'maybe' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 'maybe',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Maybe', 'wcbs' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Maybe', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for"sample-checkbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="wcbs_theme_options[sample_checkbox]" id="sample-checkbox" <?php checked( 'on', $options['sample_checkbox'] ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'A sample checkbox.', 'wcbs' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'A sample checkbox.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wcbs_get_theme_options();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="wcbs_theme_options[sample_text_input]" id="sample-text-input" value="<?php echo esc_attr( $options['sample_text_input'] ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="description" for="sample-text-input"><?php _e( 'Sample text input', 'wcbs' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="description" for="sample-text-input"><?php _e( 'Sample text input', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $p . $r;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="description" for="sample_theme_options[selectinput]"><?php _e( 'Sample select input', 'wcbs' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="description" for="sample_theme_options[selectinput]"><?php _e( 'Sample select input', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wcbs_get_theme_options();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="large-text" type="text" name="wcbs_theme_options[sample_textarea]" id="sample-textarea" cols="50" rows="10" /><?php echo esc_textarea( $options['sample_textarea'] ); ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label class="description" for="sample-textarea"><?php _e( 'Sample textarea', 'wcbs' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="description" for="sample-textarea"><?php _e( 'Sample textarea', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php screen_icon(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php printf( __( '%s Theme Options', 'wcbs' ), get_current_theme() ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php printf( __( '%s Theme Options', 'wordcamporg' ), get_current_theme() ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php settings_errors(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="options.php">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbbuttonoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-button-option.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,23 +26,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class .= " visible";
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Featured Button', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Featured Button', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="<?php echo $class; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description checkbox-field" for="<?php echo $ids['visible']; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="<?php echo $ids['visible']; ?>" <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->name('visible');
</span><span class="cx" style="display: block; padding: 0 10px"> checked( $this->get_option('visible') );
</span><span class="cx" style="display: block; padding: 0 10px"> ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html_e( 'Show a featured button in the menu.', 'wordcampbase' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html_e( 'Show a featured button in the menu.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description text-field" for="<?php echo $ids['text']; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span><?php esc_html_e( 'Text:', 'wordcampbase' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'Text:', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="<?php echo $ids['text']; ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->name('text'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $this->get_option('text') ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="description text-field" for="<?php echo $ids['url']; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span><?php esc_html_e( 'URL:', 'wordcampbase' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'URL:', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="<?php echo $ids['url']; ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->name('url'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $this->get_option('url') ); ?>" />
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcbgridoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-grid-option.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="description row-name"><?php echo esc_html( $this->label ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="signature" type="hidden" <?php $this->name('layout'); ?> value="<?php echo esc_attr( serialize( $layout ) ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_row( $layout ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="edit"><a href="#"><?php echo esc_html_e( 'Edit' , 'wordcampbase'); ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="edit"><a href="#"><?php echo esc_html_e( 'Edit' , 'wordcamporg'); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $this->type != 'content' ):
</span><span class="cx" style="display: block; padding: 0 10px"> $front_page_id = esc_attr( "front-page-only-$this->key" );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,13 +117,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->name('front_only');
</span><span class="cx" style="display: block; padding: 0 10px"> checked( $this->get_option('front_only') );
</span><span class="cx" style="display: block; padding: 0 10px"> ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Front page only', 'wordcampbase' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Front page only', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="picker">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="directions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php esc_html_e( 'Choose a new row layout.', 'wordcampbase' ); ?>
- <a href="#" class="cancel"><?php esc_html_e( 'Cancel' , 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Choose a new row layout.', 'wordcamporg' ); ?>
+ <a href="#" class="cancel"><?php esc_html_e( 'Cancel' , 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $current_layout = $this->verbose_row( $this->get_option('layout') );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2liboptionsclasswcboptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/options/class-wcb-options.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,10 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['grid'] = new WCB_Radio_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'grid',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'grid960',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Grid Width', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Grid Width', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'values' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'grid960' => __( '960px wide', 'wordcampbase' ),
- 'grid720' => __( '720px wide', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'grid960' => __( '960px wide', 'wordcamporg' ),
+ 'grid720' => __( '720px wide', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 12 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('After Header', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('After Header', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['before_content'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 4,4,4 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Before Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Before Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['content'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'content',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 4,4,4 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('After Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('After Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['before_footer'] = new WCB_Grid_Option( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,14 +77,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'layout' => array( 3,3,3,3 ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_only' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Before Footer', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Before Footer', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['featured_button'] = new WCB_Button_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'featured_button',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'visible' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'text' => __('Register now!', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => __('Register now!', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,11 +92,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['typekit'] = new WCB_Typekit_Option( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => 'typekit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => 'jnd4dds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Typekit', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Typekit', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'values' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'default' => __( 'Use the default Typekit fonts.', 'wordcampbase' ),
- 'custom' => __( 'Use a custom Typekit key:', 'wordcampbase' ),
- 'off' => __( 'Do not use any Typekit fonts.', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'default' => __( 'Use the default Typekit fonts.', 'wordcamporg' ),
+ 'custom' => __( 'Use a custom Typekit key:', 'wordcamporg' ),
+ 'off' => __( 'Do not use any Typekit fonts.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_menu() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = add_theme_page( __('Theme Options', 'wordcampbase'), __('Theme Options', 'wordcampbase'), 'edit_theme_options', 'wcb-theme-options', array( &$this, 'render' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = add_theme_page( __('Theme Options', 'wordcamporg'), __('Theme Options', 'wordcamporg'), 'edit_theme_options', 'wcb-theme-options', array( &$this, 'render' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action("wcb_enqueue_scripts_$page", array( &$this, 'enqueue_scripts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,15 +141,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php screen_icon(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php echo get_current_theme() . ' ' . __( 'Theme Options', 'wordcampbase' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php echo get_current_theme() . ' ' . __( 'Theme Options', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== $_REQUEST['updated'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcampbase' ); ?></strong></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="options.php">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_fields( 'wcb_theme_options' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e('General Options', 'wordcampbase'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e('General Options', 'wordcamporg'); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['grid']->render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,13 +158,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e('Theme Layout', 'wordcampbase'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e('Theme Layout', 'wordcamporg'); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $rows = array( 'after_header', 'before_content', 'content', 'after_content', 'before_footer' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr id="visibility-row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Show Rows', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Show Rows', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $rows as $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options[ $row ]->render_visibility();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php esc_html_e( 'Row Layout', 'wordcampbase' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php esc_html_e( 'Row Layout', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $rows as $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options[ $row ]->render_layout();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcampbase' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessiontemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-session-template.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,13 +95,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type() == WCB_SESSION_POST_TYPE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $track = wcb_get_session_track();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['speakers'] = sprintf( __('Presented by %s', 'wordcampbase'), wcb_get_session_speakers() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['speakers'] = sprintf( __('Presented by %s', 'wordcamporg'), wcb_get_session_speakers() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $track ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['order'] = array('speakers', 'edit');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['track'] = sprintf( __('%s Track', 'wordcampbase'), $track );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['track'] = sprintf( __('%s Track', 'wordcamporg'), $track );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_term_link( $track, WCB_TRACK_TAXONOMY );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $link ) ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsessionsclasswcbsessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sessions/class-wcb-sessions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,13 +23,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'speakers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'text',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Speakers', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Speakers', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $box = wcb_get_metabox( 'WCB_Post_Metabox' );
</span><span class="cx" style="display: block; padding: 0 10px"> $box->add_instance( WCB_SESSION_POST_TYPE, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __('Speakers', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __('Speakers', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_manager' => $this->meta_manager,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_fields' => $meta_fields,
</span><span class="cx" style="display: block; padding: 0 10px"> 'context' => 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,19 +41,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Session post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sessions', 'wordcampbase' ),
- 'singular_name' => __( 'Session', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Session', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Session', 'wordcampbase' ),
- 'new_item' => __( 'New Session', 'wordcampbase' ),
- 'view' => __( 'View Session', 'wordcampbase' ),
- 'view_item' => __( 'View Session', 'wordcampbase' ),
- 'search_items' => __( 'Search Sessions', 'wordcampbase' ),
- 'not_found' => __( 'No sessions found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No sessions found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Session:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sessions', 'wordcamporg' ),
+ 'singular_name' => __( 'Session', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Session', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Session', 'wordcamporg' ),
+ 'new_item' => __( 'New Session', 'wordcamporg' ),
+ 'view' => __( 'View Session', 'wordcamporg' ),
+ 'view_item' => __( 'View Session', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sessions', 'wordcamporg' ),
+ 'not_found' => __( 'No sessions found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sessions found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Session:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Session post type rewrite
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,15 +97,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Tracks', 'wordcampbase'),
- 'singular_name' => __( 'Track', 'wordcampbase'),
- 'search_items' => __( 'Search Tracks', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Tracks', 'wordcamporg'),
+ 'singular_name' => __( 'Track', 'wordcamporg'),
+ 'search_items' => __( 'Search Tracks', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'popular_items' => __( 'Popular Tracks','wordcampbase'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'all_items' => __( 'All Tracks', 'wordcampbase'),
- 'edit_item' => __( 'Edit Track', 'wordcampbase'),
- 'update_item' => __( 'Update Track', 'wordcampbase'),
- 'add_new_item' => __( 'Add Track', 'wordcampbase'),
- 'new_item_name' => __( 'New Track', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'all_items' => __( 'All Tracks', 'wordcamporg'),
+ 'edit_item' => __( 'Edit Track', 'wordcamporg'),
+ 'update_item' => __( 'Update Track', 'wordcamporg'),
+ 'add_new_item' => __( 'Add Track', 'wordcamporg'),
+ 'new_item_name' => __( 'New Track', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libspeakersclasswcbspeakersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/speakers/class-wcb-speakers.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,13 +22,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'text',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __('Gravatar Email', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __('Gravatar Email', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $box = wcb_get_metabox( 'WCB_Post_Metabox' );
</span><span class="cx" style="display: block; padding: 0 10px"> $box->add_instance( WCB_SPEAKER_POST_TYPE, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __('Gravatar Email', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __('Gravatar Email', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_manager' => $this->meta_manager,
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_fields' => $meta_fields,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,19 +38,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Speaker post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Speakers', 'wordcampbase' ),
- 'singular_name' => __( 'Speaker', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Speaker', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Speaker', 'wordcampbase' ),
- 'new_item' => __( 'New Speaker', 'wordcampbase' ),
- 'view' => __( 'View Speaker', 'wordcampbase' ),
- 'view_item' => __( 'View Speaker', 'wordcampbase' ),
- 'search_items' => __( 'Search Speakers', 'wordcampbase' ),
- 'not_found' => __( 'No speakers found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No speakers found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Speaker:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Speakers', 'wordcamporg' ),
+ 'singular_name' => __( 'Speaker', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Speaker', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Speaker', 'wordcamporg' ),
+ 'new_item' => __( 'New Speaker', 'wordcamporg' ),
+ 'view' => __( 'View Speaker', 'wordcamporg' ),
+ 'view_item' => __( 'View Speaker', 'wordcamporg' ),
+ 'search_items' => __( 'Search Speakers', 'wordcamporg' ),
+ 'not_found' => __( 'No speakers found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No speakers found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Speaker:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Speaker post type rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsororderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsor-order.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_menu() {
</span><span class="cx" style="display: block; padding: 0 10px"> $page = add_submenu_page(
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit.php?post_type=' . WCB_SPONSOR_POST_TYPE, // Page type
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __('Order Sponsor Levels', 'wordcampbase'), // Page title
- __('Order Sponsor Levels', 'wordcampbase'), // Menu title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __('Order Sponsor Levels', 'wordcamporg'), // Page title
+ __('Order Sponsor Levels', 'wordcamporg'), // Menu title
</ins><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts', // Capability
</span><span class="cx" style="display: block; padding: 0 10px"> 'sponsor_levels', // Menu slug
</span><span class="cx" style="display: block; padding: 0 10px"> array( &$this, 'render' ) // Callback
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,16 +56,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php screen_icon(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php _e( 'Order Sponsor Levels', 'wordcampbase' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php _e( 'Order Sponsor Levels', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== $_REQUEST['updated'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcampbase' ); ?></strong></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="options.php">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_fields( 'wcb_sponsor_options' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="description sponsor-order-instructions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcampbase'); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e('Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcamporg'); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="sponsor-order">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach( $levels as $term ): ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcampbase' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbsponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,19 +24,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sponsor post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sponsors', 'wordcampbase' ),
- 'singular_name' => __( 'Sponsor', 'wordcampbase' ),
- 'add_new' => __( 'Add New', 'wordcampbase' ),
- 'add_new_item' => __( 'Create New Sponsor', 'wordcampbase' ),
- 'edit' => __( 'Edit', 'wordcampbase' ),
- 'edit_item' => __( 'Edit Sponsor', 'wordcampbase' ),
- 'new_item' => __( 'New Sponsor', 'wordcampbase' ),
- 'view' => __( 'View Sponsor', 'wordcampbase' ),
- 'view_item' => __( 'View Sponsor', 'wordcampbase' ),
- 'search_items' => __( 'Search Sponsors', 'wordcampbase' ),
- 'not_found' => __( 'No sponsors found', 'wordcampbase' ),
- 'not_found_in_trash' => __( 'No sponsors found in Trash', 'wordcampbase' ),
- 'parent_item_colon' => __( 'Parent Sponsor:', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sponsors', 'wordcamporg' ),
+ 'singular_name' => __( 'Sponsor', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Sponsor', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Sponsor', 'wordcamporg' ),
+ 'new_item' => __( 'New Sponsor', 'wordcamporg' ),
+ 'view' => __( 'View Sponsor', 'wordcamporg' ),
+ 'view_item' => __( 'View Sponsor', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sponsors', 'wordcamporg' ),
+ 'not_found' => __( 'No sponsors found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sponsors found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Sponsor:', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sponsor post type rewrite
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,15 +80,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Labels
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Sponsor Levels', 'wordcampbase'),
- 'singular_name' => __( 'Sponsor Level', 'wordcampbase'),
- 'search_items' => __( 'Search Sponsor Levels', 'wordcampbase'),
- 'popular_items' => __( 'Popular Sponsor Levels', 'wordcampbase'),
- 'all_items' => __( 'All Sponsor Levels', 'wordcampbase'),
- 'edit_item' => __( 'Edit Sponsor Level', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Sponsor Levels', 'wordcamporg'),
+ 'singular_name' => __( 'Sponsor Level', 'wordcamporg'),
+ 'search_items' => __( 'Search Sponsor Levels', 'wordcamporg'),
+ 'popular_items' => __( 'Popular Sponsor Levels', 'wordcamporg'),
+ 'all_items' => __( 'All Sponsor Levels', 'wordcamporg'),
+ 'edit_item' => __( 'Edit Sponsor Level', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_item' => __( 'Update Sponsor Level','wordcampbase'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_new_item' => __( 'Add Sponsor Level', 'wordcampbase'),
- 'new_item_name' => __( 'New Sponsor Level', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_new_item' => __( 'Add Sponsor Level', 'wordcamporg'),
+ 'new_item_name' => __( 'New Sponsor Level', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Rewrite
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libsponsorsclasswcbwidgetsponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/sponsors/class-wcb-widget-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function WCB_Widget_Sponsors() {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_ops = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'classname' => 'wcb_widget_sponsors',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Your WordCamp’s Sponsors', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Your WordCamp’s Sponsors', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->WP_Widget( 'wcb_sponsors', __('Sponsors', 'wordcampbase'), $widget_ops );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->WP_Widget( 'wcb_sponsors', __('Sponsors', 'wordcamporg'), $widget_ops );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function widget( $args, $instance ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( wcb_have_sponsors() ):
</span><span class="cx" style="display: block; padding: 0 10px"> wcb_the_sponsor();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?><a class="sponsor-logo" href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $instance['title'];
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcampbase'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'wordcamporg'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-footer.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="site-generator">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'twentyten_credits' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'wordcampbase' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'wordcampbase' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'wordcampbase' ), 'WordPress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'wordcamporg' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'wordcamporg' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'wordcamporg' ), 'WordPress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #site-generator -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #colophon -->
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-header.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,9 +9,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $this->get_id(); ?>" class="grid_12">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="return-to-central">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( false !== strpos($_SERVER['HTTP_HOST'], 'wordpress.org')) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Return to WordPress.org', 'wordcampbase' ); ?>"><?php _e('← WordPress.org', 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Return to WordPress.org', 'wordcamporg' ); ?>"><?php _e('← WordPress.org', 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcampbase' ); ?>"><?php _e('← WordCamp Central', 'wordcampbase'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="http://central.wordcamp.org/" title="<?php esc_attr_e( 'Return to WordCamp Central', 'wordcamporg' ); ?>"><?php _e('← WordCamp Central', 'wordcamporg'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-menu.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $this->get_id(); ?>" class="grid_12">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="access" role="navigation" class="clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcampbase' ); ?>"><?php _e( 'Skip to content', 'wordcampbase' ); ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'wordcamporg' ); ?>"><?php _e( 'Skip to content', 'wordcamporg' ); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,23 +70,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_header' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-header',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('After Header', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('After Header', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-content',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Before Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Before Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'content-row',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_content' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'after-content',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('After Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('After Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_footer' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'before-footer',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Before Footer', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Before Footer', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['grid'] = $option['layout'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $option['front_only'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['name'] = sprintf( __('Front Page: %s', 'wordcampbase'), $args['name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['name'] = sprintf( __('Front Page: %s', 'wordcamporg'), $args['name'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sidebars[ $id ] = new WCB_Sidebar_Row( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function full_width_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sidebars['content'] = new WCB_Sidebar_Row( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'content-row',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __('Content', 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __('Content', 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'grid' => array( array( 12, 'content' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsclasswcbmetaboxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/class-wcb-metabox.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/class-wcb-metabox.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/class-wcb-metabox.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _set_instance( $screen, $index, $args=array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // 'id' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __( 'Untitled' , 'wordcampbase'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __( 'Untitled' , 'wordcamporg'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'context' => 'side',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 'default',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/functions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/functions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-load_theme_textdomain( 'wordcampbase', TEMPLATEPATH . '/languages' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/twentyten-overrides.php";
</span><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/twentyten-functions.php";
</span><span class="cx" style="display: block; padding: 0 10px"> require_once TEMPLATEPATH . "/lib/utils/class-wcb-loader.php";
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilsheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/header.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $meta;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['category'] = sprintf( __('Posted in %s', 'wordcampbase'), get_the_category_list( ', ' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['category'] = sprintf( __('Posted in %s', 'wordcamporg'), get_the_category_list( ', ' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object_in_taxonomy( get_post_type(), 'tag' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['tag'] = sprintf( __('Tagged %s', 'wordcampbase'), get_the_tag_list( '', ', ' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['tag'] = sprintf( __('Tagged %s', 'wordcamporg'), get_the_tag_list( '', ', ' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['order'][] = 'br';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a page number if necessary:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $paged >= 2 || $page >= 2 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' | ' . sprintf( __( 'Page %s', 'wordcampbase' ), max( $paged, $page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ' | ' . sprintf( __( 'Page %s', 'wordcamporg' ), max( $paged, $page ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</title>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilstwentytenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-functions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-functions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses register_nav_menus() To add support for navigation menus.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_custom_background() To add support for a custom background.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_editor_style() To style the visual editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses load_theme_textdomain() For translation/localization support.
</del><span class="cx" style="display: block; padding: 0 10px"> * @uses add_custom_image_header() To add support for a custom header.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses register_default_headers() To register the default custom header images provided with the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,10 +82,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add default posts and comments RSS feed links to head
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'automatic-feed-links' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make theme available for translation
- // Translations can be filed in the /languages/ directory
- // load_theme_textdomain( 'wordcampbase', TEMPLATEPATH . '/languages' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_file = TEMPLATEPATH . "/languages/$locale.php";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_readable( $locale_file ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme uses wp_nav_menu() in one location.
</span><span class="cx" style="display: block; padding: 0 10px"> register_nav_menus( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'primary' => __( 'Primary Navigation', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'primary' => __( 'Primary Navigation', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This theme allows users to set a custom background
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,42 +125,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'berries' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/berries.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Berries', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Berries', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cherryblossom' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/cherryblossoms.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Cherry Blossoms', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Cherry Blossoms', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'concave' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/concave.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Concave', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Concave', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fern' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/fern.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Fern', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Fern', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'forestfloor' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/forestfloor.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Forest Floor', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Forest Floor', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'inkwell' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/inkwell.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Inkwell', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Inkwell', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/path.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Path', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Path', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sunset' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => '%s/images/headers/sunset.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Sunset', 'wordcampbase' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Sunset', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );*/
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> // translators: The title of the post to continue reading
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s <span class="meta-nav">→</span>', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="assistive-text">%s</span> ', get_the_title() )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,17 +303,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="comment-<?php comment_ID(); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo get_avatar( $comment, 40 ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '%s <span class="says">says:</span>', 'wordcampbase' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( __( '%s <span class="says">says:</span>', 'wordcamporg' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $comment->comment_approved == '0' ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <em><?php _e( 'Your comment is awaiting moderation.', 'wordcampbase' ); ?></em>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <em><?php _e( 'Your comment is awaiting moderation.', 'wordcamporg' ); ?></em>
</ins><span class="cx" style="display: block; padding: 0 10px"> <br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: date, 2: time */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '%1$s at %2$s', 'wordcampbase' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'wordcampbase' ), ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '%1$s at %2$s', 'wordcamporg' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'wordcamporg' ), ' ' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-meta .commentmetadata -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback' :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="post pingback">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Pingback:', 'wordcampbase' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'wordcampbase'), ' ' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Pingback:', 'wordcamporg' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'wordcamporg'), ' ' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> endswitch;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,9 +349,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_widgets_init() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 1, located at the top of the sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Primary Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Primary Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'primary-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The primary widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The primary widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,9 +360,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Secondary Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Secondary Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'secondary-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The secondary widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The secondary widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,9 +371,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 3, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'First Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'First Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'first-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The first footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The first footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,9 +382,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 4, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Second Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Second Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'second-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The second footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The second footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,9 +393,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 5, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Third Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Third Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'third-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The third footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The third footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,9 +404,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Area 6, located in the footer. Empty by default.
</span><span class="cx" style="display: block; padding: 0 10px"> register_sidebar( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Fourth Footer Widget Area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Fourth Footer Widget Area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'fourth-footer-widget-area',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'The fourth footer widget area', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'The fourth footer widget area', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_widget' => '</li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Ten 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_posted_on() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta-prep meta-prep-author',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_permalink(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,11 +463,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Retrieves tag list of current post, separated by commas.
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_list = get_the_tag_list( '', ', ' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tag_list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcampbase' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Prints the string, replacing the placeholders.
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libutilstwentytenoverridesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-overrides.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-overrides.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/utils/twentyten-overrides.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyten_posted_on() {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['author'] = sprintf( __( '%1$s <span class="meta-sep">by</span> %2$s', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['author'] = sprintf( __( '%1$s <span class="meta-sep">by</span> %2$s', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_permalink(),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_time() ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_attr__( 'View all posts by %s', 'wordcampbase' ), get_the_author() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( esc_attr__( 'View all posts by %s', 'wordcamporg' ), get_the_author() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_the_author()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,13 +19,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['comments'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'before' => '<span class="comments-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'zero' => __( 'Leave a comment', 'wordcampbase' ),
- 'one' => __( '1 Comment', 'wordcampbase' ),
- 'many' => __( '% Comments', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'zero' => __( 'Leave a comment', 'wordcamporg' ),
+ 'one' => __( '1 Comment', 'wordcamporg' ),
+ 'many' => __( '% Comments', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['edit'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => __( 'Edit', 'wordcampbase' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => __( 'Edit', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before' => '<span class="edit-link">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2noresultsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/no-results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/no-results.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/no-results.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,22 +11,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-0" class="post no-results not-found">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title"><?php _e( 'Nothing Found', 'wcbs' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><?php _e( 'Nothing Found', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_home() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'wcbs' ), admin_url( 'post-new.php' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'wordcamporg' ), admin_url( 'post-new.php' ) ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } elseif ( is_search() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'wcbs' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'wcbs' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2searchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/search.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/search.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'wcbs' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'wordcamporg' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wcbs_content_nav( 'nav-above' ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2searchformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/searchform.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/searchform.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/searchform.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="s" class="assistive-text"><?php _e( 'Search', 'wcbs' ); ?></label>
- <input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search …', 'wcbs' ); ?>" />
- <input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'wcbs' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="s" class="assistive-text"><?php _e( 'Search', 'wordcamporg' ); ?></label>
+ <input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search …', 'wordcamporg' ); ?>" />
+ <input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2sidebarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/sidebar.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/sidebar.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,14 +17,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </aside>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <aside id="archives" class="widget">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="widget-title"><?php _e( 'Archives', 'wcbs' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="widget-title"><?php _e( 'Archives', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </aside>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <aside id="meta" class="widget">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="widget-title"><?php _e( 'Meta', 'wcbs' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="widget-title"><?php _e( 'Meta', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_register(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php wp_loginout(); ?></li>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sessions.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wcb_the_session();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class( 'session' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="entry-title session-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta session-speakers">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wcb_entry_meta(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2templatesponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php 2016-05-31 16:39:47 UTC (rev 3274)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/template-sponsors.php 2016-05-31 17:21:00 UTC (rev 3275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wcb_the_sponsor();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class( 'sponsor' ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcampbase' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="entry-title sponsor-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'wordcamporg' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() )
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre>
</div>
</div>
</body>
</html>