<!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>[GlotPress][770] trunk: Style and markup updates so GlotPress can be embedded inside of another design a bit more easily.</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">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/770">770</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-05-31 19:20:01 +0000 (Fri, 31 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Style and markup updates so GlotPress can be embedded inside of another design a bit more easily. see <a href="http://glotpress.trac.wordpress.org/ticket/244">#244</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcssstylecss">trunk/css/style.css</a></li>
<li><a href="#trunkgptemplatesfooterphp">trunk/gp-templates/footer.php</a></li>
<li><a href="#trunkgptemplatesheaderphp">trunk/gp-templates/header.php</a></li>
<li><a href="#trunkgptemplateshelperfunctionsphp">trunk/gp-templates/helper-functions.php</a></li>
<li><a href="#trunkgptemplatesprojectphp">trunk/gp-templates/project.php</a></li>
<li><a href="#trunkgptemplatesprojectsphp">trunk/gp-templates/projects.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkcssstylecss"></a>
<div class="modfile"><h4>Modified: trunk/css/style.css (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/css/style.css 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/css/style.css 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -1,11 +1,17 @@
</span><del>-html, body, textarea, input {
</del><ins>+body, html,
+.gp-content,
+.gp-content textarea,
+.gp-content input {
</ins><span class="cx"> font-family: "Helvetica", "Arial", sans-serif;
</span><span class="cx"> color: #333;
</span><span class="cx"> line-height: 1.5em;
</span><span class="cx"> font-size: 14px;
</span><del>- margin: 0 .5em 0 .5em;
</del><span class="cx"> }
</span><del>-input, textarea {
</del><ins>+body, html {
+ margin: 0 0.5em;
+}
+.gp-content input,
+.gp-content textarea {
</ins><span class="cx"> font-size: 1em;
</span><span class="cx"> }
</span><span class="cx"> h1 {
</span><span class="lines">@@ -37,11 +43,11 @@
</span><span class="cx"> color: #aaa;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><del>-h2 {
</del><ins>+.gp-content h2 {
</ins><span class="cx"> background-color: #ddd;
</span><span class="cx"> padding: 0.5em;
</span><span class="cx"> }
</span><del>-h2 a.edit {
</del><ins>+.gp-content h2 a.edit {
</ins><span class="cx"> font-size: 0.75em;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="lines">@@ -62,7 +68,7 @@
</span><span class="cx"> padding: 2px;
</span><span class="cx"> height: 2em;
</span><span class="cx"> }
</span><del>-input.button {
</del><ins>+.gp-content input.button {
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> font-size: 12px;
</span><span class="cx"> line-height: 14px;
</span><span class="lines">@@ -201,7 +207,7 @@
</span><span class="cx"> font-size: 100%;
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><del>-#footer {
</del><ins>+#gp-footer {
</ins><span class="cx"> text-align: center;
</span><span class="cx"> font-size: 85%;
</span><span class="cx"> background-color: #ddd;
</span><span class="lines">@@ -232,7 +238,7 @@
</span><span class="cx"> .editor .original {
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> white-space: pre-wrap;
</span><del>- width: 50em;
</del><ins>+ max-width: 50em;
</ins><span class="cx"> }
</span><span class="cx"> .editor .strings {
</span><span class="cx"> float: left;
</span><span class="lines">@@ -519,7 +525,7 @@
</span><span class="cx"> height: 1.5em;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><del>-.text {
</del><ins>+.gp-content .text {
</ins><span class="cx"> width: 45em;
</span><span class="cx"> margin-left: 6em;
</span><span class="cx"> }
</span><span class="lines">@@ -631,4 +637,4 @@
</span><span class="cx"> #translation-sets.with-sub-projects {
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkgptemplatesfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/footer.php (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/footer.php 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/gp-templates/footer.php 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+ </div><!-- .gp-content -->
</ins><span class="cx"> <p id="footer" class="secondary">
</span><span class="cx"> <?php printf( __('Proudly powered by <a href="%s" title="Found in translation">GlotPress</a>.'), 'http://glotpress.org/' ); ?>
</span><span class="cx"> <?php gp_footer(); ?>
</span><span class="lines">@@ -3,3 +4,3 @@
</span><span class="cx"> </p>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkgptemplatesheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/header.php (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/header.php 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/gp-templates/header.php 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body <?php body_class(); ?>>
</span><span class="cx"> <script type="text/javascript">document.body.className = document.body.className.replace('no-js','js');</script>
</span><ins>+ <div class="gp-content">
</ins><span class="cx"> <div id="gp-js-message"></div>
</span><span class="cx"> <h1>
</span><span class="cx"> <a class="logo" href="<?php echo gp_url( '/' ); ?>" rel="home">
</span><span class="lines">@@ -44,4 +45,4 @@
</span><span class="cx"> <?php echo gp_notice(); ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><del>- <?php do_action( 'after_notices' ); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+ <?php do_action( 'after_notices' ); ?>
</ins></span></pre></div>
<a id="trunkgptemplateshelperfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/helper-functions.php (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/helper-functions.php 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/gp-templates/helper-functions.php 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> function references( $project, $entry ) {
</span><span class="cx"> if ( ! $entry->references ) return;
</span><span class="cx"> ?>
</span><ins>+ <dl><dt>
</ins><span class="cx"> <?php _e('References:'); ?>
</span><span class="cx"> <ul class="refs">
</span><span class="cx"> <?php
</span><span class="lines">@@ -70,6 +71,6 @@
</span><span class="cx"> endif;
</span><span class="cx"> endforeach;
</span><span class="cx"> ?>
</span><del>- </ul>
</del><ins>+ </ul></dt></dl>
</ins><span class="cx"> <?php
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkgptemplatesprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project.php (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project.php 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/gp-templates/project.php 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -63,7 +63,9 @@
</span><span class="cx"> <th><?php _e( 'Translated' ); ?></th>
</span><span class="cx"> <th><?php _e( 'Untranslated' ); ?></th>
</span><span class="cx"> <th><?php _e( 'Waiting' ); ?></th>
</span><del>- <th><?php _e( 'Extra' ); ?></th>
</del><ins>+ <?php if ( has_action( 'project_template_translation_set_extra' ) ) : ?>
+ <th class="extra"><?php _e( 'Extra' ); ?></th>
+ <?php endif; ?>
</ins><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><span class="lines">@@ -84,9 +86,11 @@
</span><span class="cx"> array('filters[status]' => 'untranslated' ) ), $set->untranslated_count ); ?></td>
</span><span class="cx"> <td class="stats waiting"><?php gp_link( gp_url_project( $project, gp_url_join( $set->locale, $set->slug ),
</span><span class="cx"> array('filters[translated]' => 'yes', 'filters[status]' => 'waiting') ), $set->waiting_count ); ?></td>
</span><del>- <td>
</del><ins>+ <?php if ( has_action( 'project_template_translation_set_extra' ) ) : ?>
+ <td class="extra">
</ins><span class="cx"> <?php do_action( 'project_template_translation_set_extra', $set, $project ); ?>
</span><span class="cx"> </td>
</span><ins>+ <?php endif; ?>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx"> </tbody>
</span></span></pre></div>
<a id="trunkgptemplatesprojectsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/projects.php (769 => 770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/projects.php 2013-05-29 11:29:58 UTC (rev 769)
+++ trunk/gp-templates/projects.php 2013-05-31 19:20:01 UTC (rev 770)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> <?php
</span><span class="cx"> gp_title( __('Projects < GlotPress') );
</span><del>-gp_breadcrumb(array( __('Projects') ));
</del><span class="cx"> gp_tmpl_header();
</span><span class="cx"> ?>
</span><span class="cx"> <h2>Projects</h2>
</span><span class="lines">@@ -12,4 +11,4 @@
</span><span class="cx"> <?php if ( GP::$user->current()->can( 'write', 'project' ) ): ?>
</span><span class="cx"> <p class="actionlist secondary"><?php gp_link( gp_url_project( '-new' ), __('Create a New Project') ); ?></p>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php gp_tmpl_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php gp_tmpl_footer(); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>