<!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>[6375] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php: WP.tv: Better formatting in upload template.</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/6375">6375</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/6375","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-12 19:31:03 +0000 (Fri, 12 Jan 2018)</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'>WP.tv: Better formatting in upload template.
Eventually this theme should also undergo a PHPCS update.
Props lalitpendhare for initial patch.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3137">#3137</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2anonuploadtemplatephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2anonuploadtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php 2018-01-12 19:08:37 UTC (rev 6374)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php 2018-01-12 19:31:03 UTC (rev 6375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,163 +5,159 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A custom page template containing the "submit video" form
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> function anon_upload_css() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // theme structural css ?>
- html,
- body {
- width: 100%;
- height: 100%;
- margin: 0;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ html,
+ body {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-template-anon-upload-template-php #page {
- height: auto;
- min-height: 100%;
- position: relative;
- width: 100%;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page-template-anon-upload-template-php #page {
+ height: auto;
+ min-height: 100%;
+ position: relative;
+ width: 100%;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-template-anon-upload-template-php #header {
- margin: 0;
- padding-top: 10px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page-template-anon-upload-template-php #header {
+ margin: 0;
+ padding-top: 10px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-template-anon-upload-template-php #footer {
- position: absolute;
- bottom: 0;
- right: 0;
- left: 0;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page-template-anon-upload-template-php #footer {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ left: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload {
- padding-bottom: 70px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload {
+ padding-bottom: 70px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .noscript-show p {
- margin: 0 !important;
- }
- <?php // theme structural end ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .noscript-show p {
+ margin: 0 !important;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .container {
- overflow: hidden;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .container {
+ overflow: hidden;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left {
- max-width: 550px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left {
+ max-width: 550px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-right {
- float: right;
- width: 390px;
- margin: -25px 0 25px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-right {
+ float: right;
+ width: 390px;
+ margin: -25px 0 25px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload p {
- margin: 16px 0;
- overflow: auto;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload p {
+ margin: 16px 0;
+ overflow: auto;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload h3 {
- font-size: 22px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload h3 {
+ font-size: 22px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left p > label,
- .video-upload-left div > label {
- padding: 4px 0 0;
- display: block;
- width: 130px;
- float: left;
- font-weight: bold;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left p > label,
+ .video-upload-left div > label {
+ padding: 4px 0 0;
+ display: block;
+ width: 130px;
+ float: left;
+ font-weight: bold;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left p > label.wptv-video-wordcamp-cb {
- display: inline;
- float: none;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left p > label.wptv-video-wordcamp-cb {
+ display: inline;
+ float: none;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left p label .required {
- line-height: 15px;
- vertical-align: bottom;
- margin: 0 3px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left p label .required {
+ line-height: 15px;
+ vertical-align: bottom;
+ margin: 0 3px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left input[type="text"],
- .video-upload-left textarea,
- .video-upload-left ul.cats-checkboxes {
- border-radius: 3px;
- border: 1px solid #dfdfdf;
- color: #333;
- background-color: #fff;
- padding: 4px;
- width: 329px;
- max-width: 329px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left input[type="text"],
+ .video-upload-left textarea,
+ .video-upload-left ul.cats-checkboxes {
+ border-radius: 3px;
+ border: 1px solid #dfdfdf;
+ color: #333;
+ background-color: #fff;
+ padding: 4px;
+ width: 329px;
+ max-width: 329px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left ul.cats-checkboxes {
- margin-left: 130px;
- height: 150px;
- overflow: auto;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left ul.cats-checkboxes {
+ margin-left: 130px;
+ height: 150px;
+ overflow: auto;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left ul.cats-checkboxes ul.children {
- margin-left: 15px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left ul.cats-checkboxes ul.children {
+ margin-left: 15px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-left input[type="text"]:focus,
- .video-upload-left textarea:focus {
- border-color: #bbb;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-left input[type="text"]:focus,
+ .video-upload-left textarea:focus {
+ border-color: #bbb;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .video-upload-left #wptv_honey_container {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</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">- #video-upload-form p.last {
- margin: 5px 80px 25px;
- text-align: right;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #video-upload-form p.last {
+ margin: 5px 80px 25px;
+ text-align: right;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- #video-upload-form p .invalid {
- border: 1px solid red;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #video-upload-form p .invalid {
+ border: 1px solid red;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- #video-upload-form input[type="submit"] {
- font-size: 15px;
- padding: 4px 12px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ #video-upload-form input[type="submit"] {
+ font-size: 15px;
+ padding: 4px 12px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-template-anon-upload-template-php .wptv-hero {
- padding: 20px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page-template-anon-upload-template-php .wptv-hero {
+ padding: 20px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .page-template-anon-upload-template-php .wptv-hero h2 {
- font-size: 24px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .page-template-anon-upload-template-php .wptv-hero h2 {
+ font-size: 24px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-right .accepted-formats {
- margin-left: 16px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-right .accepted-formats {
+ margin-left: 16px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-right .accepted-formats li {
- list-style: square;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-right .accepted-formats li {
+ list-style: square;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload-right h3 {
- padding-bottom: 4px;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload-right h3 {
+ padding-bottom: 4px;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .video-upload .pass-form label {
- float: none;
- display: inline;
- width: auto;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .video-upload .pass-form label {
+ float: none;
+ display: inline;
+ width: auto;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'anon_upload_css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_header();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,186 +210,185 @@
</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">-<div class="wptv-hero">
- <div class="single container">
- <h2><?php esc_html_e( 'Submit a video' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="wptv-hero">
+ <div class="single container">
+ <h2><?php esc_html_e( 'Submit a video' ); ?></h2>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="container">
-<div class="video-upload">
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="container">
+ <div class="video-upload">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // temp pwd?
- if ( post_password_required() ) {
- echo '<div class="pass-form">';
- echo get_the_password_form();
- echo '</div></div></div>';
- get_footer();
- return;
- } else {
- echo $message;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // temp pwd?
+ if ( post_password_required() ) {
+ echo '<div class="pass-form">';
+ echo get_the_password_form();
+ echo '</div></div></div>';
+ get_footer();
+ return;
+ } else {
+ echo $message;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
-<noscript><div class="error"><p>This form requires JavaScript. Please enable it in your browser and reload the page.</p></div></noscript>
-<div class="video-upload-right">
- <h3>Guidelines</h3>
- <p>WordCamp videos: the audio is clear and easy to understand, the camera was on a tripod, the video shows the speaker and slides, divide the video by presentation if possible.</p>
- <p>Screencasts: keep it concise, keep it clear, keep on track (no chock-full of personal promotion please), keep it current.</p>
- <p>Vodcasts and other video-based content: if you have put together a video podcast or other WordPress focused, relevant video - let us <a href="http://wordpress.tv/contact/">know about it</a>.
- <p>If this is the first time you're submitting a video, please check all <a href="http://blog.wordpress.tv/submission-guidelines/">Submission Guidelines</a>.</p>
- <h3>Accepted formats</h3>
- <p>Maximum upload file size: 1GB. You can upload the following video formats:</p>
- <ul class="accepted-formats">
- <li>avi</li>
- <li>mov/qt</li>
- <li>mpeg/mpg</li>
- <li>mp4</li>
- <li>ogv</li>
- <li>wmv</li>
- <li>3gp/3g2</li>
- </ul>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <noscript><div class="error"><p>This form requires JavaScript. Please enable it in your browser and reload the page.</p></div></noscript>
+ <div class="video-upload-right">
+ <h3>Guidelines</h3>
+ <p>WordCamp videos: the audio is clear and easy to understand, the camera was on a tripod, the video shows the speaker and slides, divide the video by presentation if possible.</p>
+ <p>Screencasts: keep it concise, keep it clear, keep on track (no chock-full of personal promotion please), keep it current.</p>
+ <p>Vodcasts and other video-based content: if you have put together a video podcast or other WordPress focused, relevant video - let us <a href="http://wordpress.tv/contact/">know about it</a>.
+ <p>If this is the first time you're submitting a video, please check all <a href="http://blog.wordpress.tv/submission-guidelines/">Submission Guidelines</a>.</p>
+ <h3>Accepted formats</h3>
+ <p>Maximum upload file size: 1GB. You can upload the following video formats:</p>
+ <ul class="accepted-formats">
+ <li>avi</li>
+ <li>mov/qt</li>
+ <li>mpeg/mpg</li>
+ <li>mp4</li>
+ <li>ogv</li>
+ <li>wmv</li>
+ <li>3gp/3g2</li>
+ </ul>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="video-upload-left">
-<?php if ( !$message ) { ?>
- <p>Please review the guidelines listed on the right, then submit your video below:</p>
-<?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="video-upload-left">
+ <?php if ( !$message ) { ?>
+ <p>Please review the guidelines listed on the right, then submit your video below:</p>
+ <?php } ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form method="post" action="<?php echo admin_url('admin-post.php'); ?>" id="video-upload-form" enctype="multipart/form-data">
- <?php wp_nonce_field('wptv-upload-video', 'wptvvideon'); ?>
- <input type="hidden" name="action" value="wptv_video_upload" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form method="post" action="<?php echo admin_url('admin-post.php'); ?>" id="video-upload-form" enctype="multipart/form-data">
+ <?php wp_nonce_field('wptv-upload-video', 'wptvvideon'); ?>
+ <input type="hidden" name="action" value="wptv_video_upload" />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // This field only exists to trap spam bots that will automatically fill it in. It will be hidden from normal users. ?>
- <p id="wptv_honey_container">
- <label for="wptv_honey"><?php esc_html_e( 'Leave this empty' ); ?></label>
- <input type="text" id="wptv_honey" name="wptv_honey" value="" />
- </p>
- <p>
- <input type="checkbox" id="wptv_video_wordcamp" name="wptv_video_wordcamp" />
- <label for="wptv_video_wordcamp" class="wptv-video-wordcamp-cb"><?php esc_html_e( 'This is a WordCamp video' ); ?></label>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // This field only exists to trap spam bots that will automatically fill it in. It will be hidden from normal users. ?>
+ <p id="wptv_honey_container">
+ <label for="wptv_honey"><?php esc_html_e( 'Leave this empty' ); ?></label>
+ <input type="text" id="wptv_honey" name="wptv_honey" value="" />
+ </p>
+ <p>
+ <input type="checkbox" id="wptv_video_wordcamp" name="wptv_video_wordcamp" />
+ <label for="wptv_video_wordcamp" class="wptv-video-wordcamp-cb"><?php esc_html_e( 'This is a WordCamp video' ); ?></label>
+ </p>
</ins><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 ( ! is_user_logged_in() ) : ?>
- <p>
- <label for="wptv_uploaded_by"><?php esc_html_e( 'Uploaded by' ); ?><span class="required"> * </span></label>
- <input type="text" id="wptv_uploaded_by" name="wptv_uploaded_by" value="" />
- </p>
- <p>
- <label for="wptv_email"><?php esc_html_e( 'Email address' ); ?><span class="required"> * </span></label>
- <input type="text" id="wptv_email" name="wptv_email" value="" />
- </p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! is_user_logged_in() ) : ?>
+ <p>
+ <label for="wptv_uploaded_by"><?php esc_html_e( 'Uploaded by' ); ?><span class="required"> * </span></label>
+ <input type="text" id="wptv_uploaded_by" name="wptv_uploaded_by" value="" />
+ </p>
+ <p>
+ <label for="wptv_email"><?php esc_html_e( 'Email address' ); ?><span class="required"> * </span></label>
+ <input type="text" id="wptv_email" name="wptv_email" value="" />
+ </p>
+ <?php endif; ?>
</ins><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="wptv_video_title"><?php esc_html_e( 'Video title' ); ?></label>
- <input type="text" id="wptv_video_title" name="wptv_video_title" value="" />
- </p>
- <p>
- <label for="wptv_language"><?php esc_html_e( 'Language' ); ?></label>
- <input type="text" id="wptv_language" name="wptv_language" value="" />
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <label for="wptv_video_title"><?php esc_html_e( 'Video title' ); ?></label>
+ <input type="text" id="wptv_video_title" name="wptv_video_title" value="" />
+ </p>
+ <p>
+ <label for="wptv_language"><?php esc_html_e( 'Language' ); ?></label>
+ <input type="text" id="wptv_language" name="wptv_language" value="" />
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="cats">
- <label for="wptv_categories"><?php esc_html_e( 'Category' ); ?></label>
- <ul class="cats-checkboxes">
- <?php
- include_once( ABSPATH . '/wp-admin/includes/template.php' );
- wp_category_checklist();
- ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="cats">
+ <label for="wptv_categories"><?php esc_html_e( 'Category' ); ?></label>
+ <ul class="cats-checkboxes">
+ <?php
+ include_once( ABSPATH . '/wp-admin/includes/template.php' );
+ wp_category_checklist();
+ ?>
+ </ul>
+ </div>
+
+ <p>
+ <label for="wptv_producer_username"><?php esc_html_e( 'Producer WordPress.org Username' ); ?></label>
+ <input type="text" id="wptv_producer_username" name="wptv_producer_username" value="" />
+ </p>
+ <p>
+ <label for="wptv_speakers"><?php esc_html_e( 'Speakers' ); ?></label>
+ <input type="text" id="wptv_speakers" name="wptv_speakers" value="" />
+ </p>
+ <p>
+ <label for="wptv_event"><?php esc_html_e( 'Event' ); ?></label>
+ <input type="text" id="wptv_event" name="wptv_event" value="" />
+ </p>
+ <p>
+ <label for="wptv_video_description"><?php esc_html_e( 'Description' ); ?></label>
+ <textarea name="wptv_video_description" id="wptv_video_description" rows="8" cols="40"></textarea>
+ </p>
+ <p>
+ <label for="wptv_slides_url"><?php esc_html_e( 'Slides URL' ); ?></label>
+ <input type="text" name="wptv_slides_url" id="wptv_slides_url" value="" />
+ </p>
+ <p>
+ <label for="wptv_file"><?php esc_html_e( 'Video file' ); ?><span class="required"> * </span></label>
+ <input type="file" name="wptv_file" id="wptv_file" />
+ </p>
+ <p class="last">
+ <input type="submit" id="wptv_video_upload" style="display:none;" value="<?php esc_attr_e( 'Submit' ); ?>" />
+ </p>
+ </form>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</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="wptv_producer_username"><?php esc_html_e( 'Producer WordPress.org Username' ); ?></label>
- <input type="text" id="wptv_producer_username" name="wptv_producer_username" value="" />
- </p>
- <p>
- <label for="wptv_speakers"><?php esc_html_e( 'Speakers' ); ?></label>
- <input type="text" id="wptv_speakers" name="wptv_speakers" value="" />
- </p>
- <p>
- <label for="wptv_event"><?php esc_html_e( 'Event' ); ?></label>
- <input type="text" id="wptv_event" name="wptv_event" value="" />
- </p>
- <p>
- <label for="wptv_video_description"><?php esc_html_e( 'Description' ); ?></label>
- <textarea name="wptv_video_description" id="wptv_video_description" rows="8" cols="40"></textarea>
- </p>
- <p>
- <label for="wptv_slides_url"><?php esc_html_e( 'Slides URL' ); ?></label>
- <input type="text" name="wptv_slides_url" id="wptv_slides_url" value="" />
- </p>
- <p>
- <label for="wptv_file"><?php esc_html_e( 'Video file' ); ?><span class="required"> * </span></label>
- <input type="file" name="wptv_file" id="wptv_file" />
- </p>
- <p class="last">
- <input type="submit" id="wptv_video_upload" style="display:none;" value="<?php esc_attr_e( 'Submit' ); ?>" />
- </p>
- </form>
-</div>
-</div>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <script type="text/javascript">
+ jQuery( function($) {
+ var invalid,
+ val,
+ uploaded_by = $( '#wptv_uploaded_by' ),
+ email = $( '#wptv_email' ),
+ file = $( '#wptv_file' ),
+ honey = $( '#wptv_honey' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<script type="text/javascript">
-jQuery( function($) {
- var invalid,
- val,
- uploaded_by = $( '#wptv_uploaded_by' ),
- email = $( '#wptv_email' ),
- file = $( '#wptv_file' ),
- honey = $( '#wptv_honey' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ invalid = function( el, e ) {
+ el.addClass( 'invalid' );
+ el.one( 'click', function() {
+ $( this ).removeClass( 'invalid' );
+ } );
+ e.preventDefault();
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- invalid = function( el, e ) {
- el.addClass( 'invalid' );
- el.one( 'click', function() {
- $( this ).removeClass( 'invalid' );
- } );
- e.preventDefault();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#wptv_video_upload' ).show();
+ $( '#video-upload-form input[type="text"]' ).each( function() {
+ $( this ).attr( 'maxlength', '100' );
+ } );
+ $( 'ul.cats-checkboxes input' ).prop( 'disabled', false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#wptv_video_upload' ).show();
- $( '#video-upload-form input[type="text"]' ).each( function() {
- $( this ).attr( 'maxlength', '100' );
- } );
- $( 'ul.cats-checkboxes input' ).prop( 'disabled', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#video-upload-form' ).submit( function( e ) {
+ var scroll = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#video-upload-form' ).submit( function( e ) {
- var scroll = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( uploaded_by.length && ! uploaded_by.val() ) {
+ invalid( uploaded_by, e );
+ scroll = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( uploaded_by.length && ! uploaded_by.val() ) {
- invalid( uploaded_by, e );
- scroll = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( email.length ) {
+ val = email.val();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( email.length ) {
- val = email.val();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !val || !/\S+@\S+\.\S+/.test( val ) ) {
+ invalid(email, e);
+ scroll = true;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !val || !/\S+@\S+\.\S+/.test( val ) ) {
- invalid(email, e);
- scroll = true;
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Changes to this list must be synced with WPTV_Anon_Upload::save()
+ if ( ! file.val() || !/\.(avi|mov|qt|mpeg|mpg|mpe|mp4|m4v|asf|asx|wax|wmv|wmx|ogv|3gp|3g2)$/.test( file.val() ) ) {
+ invalid(file, e);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Changes to this list must be synced with WPTV_Anon_Upload::save()
- if ( ! file.val() || !/\.(avi|mov|qt|mpeg|mpg|mpe|mp4|m4v|asf|asx|wax|wmv|wmx|ogv|3gp|3g2)$/.test( file.val() ) ) {
- invalid(file, e);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's any input in the honeypot field, it was probably put there by a bot, so reject the submission
+ if ( honey.val().length > 0 ) {
+ invalid( honey, e );
+ scroll = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If there's any input in the honeypot field, it was probably put there by a bot, so reject the submission
- if ( honey.val().length > 0 ) {
- invalid( honey, e );
- scroll = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( scroll && uploaded_by.length ) {
+ uploaded_by.get( 0 ).scrollIntoView();
+ }
+ } );
+ } );
+ </script>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( scroll && uploaded_by.length ) {
- uploaded_by.get( 0 ).scrollIntoView();
- }
- } );
-} );
-</script>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php get_footer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre>
</div>
</div>
</body>
</html>