<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[GlotPress] [477] trunk: HTML validation fixes</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>477</dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-04-23 22:05:25 +0000 (Fri, 23 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTML validation fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludestemplatelinksphp">trunk/gp-includes/template-links.php</a></li>
<li><a href="#trunkgpincludestemplatephp">trunk/gp-includes/template.php</a></li>
<li><a href="#trunkgptemplatestranslationrowphp">trunk/gp-templates/translation-row.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludestemplatelinksphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/template-links.php (476 => 477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/template-links.php 2010-04-21 12:20:31 UTC (rev 476)
+++ trunk/gp-includes/template-links.php 2010-04-23 22:05:25 UTC (rev 477)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> $attributes = gp_html_attributes( $attrs );
</span><span class="cx"> $attributes = $attributes? " $attributes" : '';
</span><span class="cx"> // TODO: clean_url(), but make it allow [ and ]
</span><del>- return sprintf('%1$s<a href="%2$s"%3$s>%4$s</a>%5$s', $before, $url, $attributes, $text, $after );
</del><ins>+ return sprintf('%1$s<a href="%2$s"%3$s>%4$s</a>%5$s', $before, esc_url( $url ), $attributes, $text, $after );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function gp_link() {
</span></span></pre></div>
<a id="trunkgpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/template.php (476 => 477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/template.php 2010-04-21 12:20:31 UTC (rev 476)
+++ trunk/gp-includes/template.php 2010-04-23 22:05:25 UTC (rev 477)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> $prev_pages[] = gp_link_get( add_query_arg( array( 'page' => $prev_page ) ), $prev_page );
</span><span class="cx"> }
</span><span class="cx"> $prev_pages = implode( ' ', $prev_pages );
</span><del>- if ( $page - $surrounding > 1 ) $prev_dots = '<span class="dots">&hellip</span>';
</del><ins>+ if ( $page - $surrounding > 1 ) $prev_dots = '<span class="dots">&hellip;</span>';
</ins><span class="cx"> }
</span><span class="cx"> if ( $page < $pages ) {
</span><span class="cx"> $next_pages = array();
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> $next_pages[] = gp_link_get( add_query_arg( array( 'page' => $next_page ) ), $next_page );
</span><span class="cx"> }
</span><span class="cx"> $next_pages = implode( ' ', $next_pages );
</span><del>- if ( $page + $surrounding < $pages ) $next_dots = '<span class="dots">&hellip</span>';
</del><ins>+ if ( $page + $surrounding < $pages ) $next_dots = '<span class="dots">&hellip;</span>';
</ins><span class="cx"> }
</span><span class="cx"> if ( $prev_dots ) $first = gp_link_get( add_query_arg( array( 'page' => 1 ) ), 1 );
</span><span class="cx"> if ( $next_dots ) $last = gp_link_get( add_query_arg( array( 'page' => $pages ) ), $pages );
</span></span></pre></div>
<a id="trunkgptemplatestranslationrowphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translation-row.php (476 => 477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translation-row.php 2010-04-21 12:20:31 UTC (rev 476)
+++ trunk/gp-templates/translation-row.php 2010-04-23 22:05:25 UTC (rev 477)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> <dl>
</span><span class="cx"> <dt><?php _e('Priority of the original:'); ?></dt>
</span><span class="cx"> <?php if ( $can_write ): ?>
</span><del>- <?php echo gp_select( 'priority-'.$t->original_id, GP::$original->get_static( 'priorities' ), $t->priority, array('class' => 'priority') ); ?>
</del><ins>+ <dd><?php echo gp_select( 'priority-'.$t->original_id, GP::$original->get_static( 'priorities' ), $t->priority, array('class' => 'priority') ); ?></dd>
</ins><span class="cx"> <?php else: ?>
</span><span class="cx"> <dd><?php echo gp_array_get( GP::$original->get_static( 'priorities' ), $t->priority, 'unknown' ); ?></dd>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translations.php (476 => 477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translations.php 2010-04-21 12:20:31 UTC (rev 476)
+++ trunk/gp-templates/translations.php 2010-04-23 22:05:25 UTC (rev 477)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <!-- TODO: use another form for bulk actions -->
</span><span class="cx"> <form id="upper-filters-toolbar" class="filters-toolbar" action="" method="get" accept-charset="utf-8">
</span><ins>+ <div>
</ins><span class="cx"> <?php if ( $can_approve ): ?>
</span><span class="cx"> <a href="#" class="revealing bulk"><?php _e('Bulk &darr;'); ?></a> <strong class="separator">&bull;</strong>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -42,6 +43,7 @@
</span><span class="cx"> // TODO: saved searches
</span><span class="cx"> echo implode( '&nbsp;<span class="separator">&bull;</span>&nbsp;', $filter_links );
</span><span class="cx"> ?>
</span><ins>+ </div>
</ins><span class="cx"> <dl class="filters-expanded filters hidden clearfix">
</span><span class="cx"> <dt>
</span><span class="cx"> <p><label for="filters[term]"><?php _e('Term:'); ?></label></p>
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx"> <p><input type="text" value="<?php echo gp_esc_attr_with_entities( gp_array_get( $filters, 'term' ) ); ?>" name="filters[term]" id="filters[term]" /></p>
</span><span class="cx"> <p><input type="text" value="<?php echo gp_esc_attr_with_entities( gp_array_get( $filters, 'user_login' ) ); ?>" name="filters[user_login]" id="filters[user_login]" /></p>
</span><span class="cx"> </dd>
</span><del>- <dt><label for="filters[translated]"><?php _e('With translation:'); ?></label></dt>
</del><ins>+ <dt><label><?php _e('With translation:'); ?></label></dt>
</ins><span class="cx"> <dd>
</span><span class="cx"> <?php echo gp_radio_buttons('filters[translated]',
</span><span class="cx"> array(
</span><span class="lines">@@ -62,7 +64,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </dd>
</span><span class="cx">
</span><del>- <dt><label for="filters[status]"><?php _e('Status:'); ?></label></dt>
</del><ins>+ <dt><label><?php _e('Status:'); ?></label></dt>
</ins><span class="cx"> <dd>
</span><span class="cx"> <?php echo gp_radio_buttons('filters[status]', //TODO: show only these, which user is allowed to see afterwards
</span><span class="cx"> array(
</span><span class="lines">@@ -112,8 +114,8 @@
</span><span class="cx"> </dd>
</span><span class="cx"> <dd class="separator"></dd>
</span><span class="cx"> <dd>
</span><del>- <input type="hidden" name="bulk[redirect_to]" value="<?php echo esc_attr(gp_url_current()); ?>" id="bulk[redirect_to]">
- <input type="hidden" name="bulk[row-ids]" value="" id="bulk[row-ids]">
</del><ins>+ <input type="hidden" name="bulk[redirect_to]" value="<?php echo esc_attr(gp_url_current()); ?>" id="bulk[redirect_to]" />
+ <input type="hidden" name="bulk[row-ids]" value="" id="bulk[row-ids]" />
</ins><span class="cx"> <input type="submit" value="<?php echo esc_attr(__('Approve Selected')); ?>" name="approve" /><br />
</span><span class="cx"> <input type="submit" value="<?php echo esc_attr(__('Reject Selected')); ?>" name="reject" />
</span><span class="cx"> </dd>
</span></span></pre>
</div>
</div>
</body>
</html>