<!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][1132] trunk: Restyle the header which now is a top bar with title & navigation.</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="https://glotpress.trac.wordpress.org/changeset/1132">1132</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1132","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>markoheijnen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-24 15:00:06 +0000 (Thu, 24 Sep 2015)</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'>Restyle the header which now is a top bar with title & navigation.
Breadcrumbs got a redesign and is below the top bar.
Action `after_hello ` did got removed and is replaced with a new filter `gp_nav_menu_items `
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/255">#255</a>
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/496">#496</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcssstylecss">trunk/css/style.css</a></li>
<li><a href="#trunkgpincludesmetaphp">trunk/gp-includes/meta.php</a></li>
<li><a href="#trunkgpincludestemplatephp">trunk/gp-includes/template.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkcssstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/css/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/css/style.css 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/css/style.css 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,27 +8,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body, html {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 0.5em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> .gp-content input,
</span><span class="cx" style="display: block; padding: 0 10px"> .gp-content textarea {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1em;
</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 {
- font-size: 1.25em;
- font-weight: normal;
-}
-h1 a.logo {
- float: left;
-}
-h1 img {
- margin-right: 1em;
- vertical-align: middle;
-}
-h1 span.breadcrumb {
- float: left;
- margin-top: 19px;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* we take the liberty to make visited the same as link */
</span><span class="cx" style="display: block; padding: 0 10px"> a, a:link, a:visited {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #2F34B8;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,6 +60,106 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 2em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+
+
+/* GP BAR */
+.gp-bar {
+ background: #464646;
+ padding: 0 1em;
+}
+
+.gp-bar a {
+ color: #fff;
+ text-decoration: none;
+}
+
+.gp-bar h1 {
+ float: left;
+ font-size: 1.2857em;
+ line-height: 1.4em;
+ margin-right: 10px;
+}
+
+.gp-bar nav a {
+ display: inline-block;
+ padding: 1em;
+}
+
+.gp-bar nav a:hover {
+ background: rgba(0,0,0,0.5);
+}
+
+.gp-bar #main-navigation {
+ float: left;
+}
+
+.gp-bar #side-navigation {
+ float: right;
+}
+
+
+
+/* BREADCRUMBS */
+.breadcrumb {
+ background-color: #eee;
+ border: 1px solid #ddd;
+ margin: 20px 0;
+ padding: 7px 14px;
+}
+
+.breadcrumb li {
+ display: inline-block;
+ text-shadow: 0 1px 0 #ffffff;
+}
+
+.breadcrumb li:after {
+ color: #999;
+ content: '/';
+ padding: 0 7px;
+}
+
+.breadcrumb li:last-child:after {
+ content: '';
+ color: red;
+}
+
+.breadcrumb a {
+ color: #08c;
+ text-decoration: none;
+}
+
+.breadcrumb a:hover {
+ color: #005580;
+ text-decoration: underline;
+}
+
+.breadcrumb span.active {
+ -webkit-border-radius: 0.4em;
+ -moz-border-radius: 0.4em;
+ margin-left: .3em;
+}
+
+
+/* GP CONTENT */
+.gp-content {
+ margin: 0 1em;
+}
+
+
+
+/* FOOTER */
+#gp-footer {
+ text-align: center;
+ font-size: 85%;
+ background-color: #ddd;
+ margin: 1em;
+ padding: 0.5em;
+}
+
+
+/* REST */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .gp-content input.button {
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 12px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,18 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: linear-gradient(bottom, #ededed, #fff); /* proposed W3C Markup */
</span><span class="cx" style="display: block; padding: 0 10px"> text-shadow: #fff 0 1px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.breadcrumb a {
- color: #3A7399;
- text-decoration: none;
-}
-#hello {
- color: #333;
- font-weight: normal;
- float: right;
- font-size: 0.75em;
- letter-spacing: 0;
- margin-right: 1em;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> textarea {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0.5em;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,12 +298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-style: normal;
</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">-#gp-footer {
- text-align: center;
- font-size: 85%;
- background-color: #ddd;
- padding: 0.5em;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> .separator {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 80%;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0.25em;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,14 +406,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #555;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</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 span.active {
- font-size: 75%;
- float: left;
- -webkit-border-radius: 0.4em;
- -moz-border-radius: 0.4em;
- margin-top: 17px;
- margin-left: .5em;
-}
</del><span class="cx" style="display: block; padding: 0 10px"> ul a.edit, dt a.edit {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #777;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkgpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/meta.php 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/gp-includes/meta.php 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,6 +256,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $bb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $option ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'title':
+ $r = 'GlotPress';
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'language':
</span><span class="cx" style="display: block; padding: 0 10px"> $r = str_replace( '_', '-', get_locale() );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunkgpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/template.php 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/gp-includes/template.php 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,6 +50,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'gp_content' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function gp_nav_menu( $location = 'main' ) {
+ $html = '';
+ $items = gp_nav_menu_items( $location );
+
+ foreach ( $items as $link => $title ) {
+ $html .= '<a href="' . $link . '">' . $title . '</a>';
+ }
+
+ return $html;
+}
+
+function gp_nav_menu_items( $location = 'main' ) {
+ $items = array();
+
+ if ( 'main' === $location ) {
+ $items[ gp_url( '/projects' ) ] = __('Projects');
+ $items[ gp_url( '/languages' ) ] = __('Locales');
+ }
+ elseif ( 'side' === $location ) {
+ if ( GP::$user->logged_in() ) {
+ $user = GP::$user->current();
+
+ $items[ gp_url( '/profile' ) ] = __('Profile');
+ $items[ gp_url( '/logout' ) ] = __('Log out');
+ }
+ elseif ( ! GP_INSTALLING ) {
+ $items[ gp_url_login() ] = __('Log in');
+ }
+ }
+
+ return apply_filters( 'gp_nav_menu_items', $items, $location );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function gp_tmpl_filter_args( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $clean_args = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $args as $k => $v )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,24 +115,34 @@
</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 gp_breadcrumb( $breadcrumb = null, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $defaults = array(
- /* translators: separates links in the navigation breadcrumb */
- 'separator' => '<span class="separator">'._x('→', 'breadcrumb').'</span>',
- 'breadcrumb-template' => '<span class="breadcrumb">{separator}{breadcrumb}</span>',
- );
- $args = array_merge( $defaults, $args );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $breadcrumb ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $breadcrumb = gp_array_flatten( $breadcrumb );
- $breadcrumb_string = implode( $args['separator'], array_filter( $breadcrumb ) );
- $whole_breadcrumb = str_replace( '{separator}', $args['separator'], $args['breadcrumb-template'] );
- $whole_breadcrumb = str_replace( '{breadcrumb}', $breadcrumb_string, $whole_breadcrumb );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $breadcrumb = gp_array_flatten( $breadcrumb );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'gp_breadcrumb', function() use ( $whole_breadcrumb ) {
- return $whole_breadcrumb;
- }, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'gp_breadcrumb_items', function( $breadcrumbs ) use ( $breadcrumb ) {
+ return array_merge( $breadcrumbs, $breadcrumb );
+ }, 1 );
</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">- return apply_filters( 'gp_breadcrumb', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $breadcrumbs = apply_filters( 'gp_breadcrumb_items', array() );
+
+ if ( $breadcrumbs ) {
+ $defaults = array(
+ /* translators: separates links in the navigation breadcrumb */
+ 'before' => '<li>',
+ 'after' => '</li>',
+ 'breadcrumb-template' => '<ul class="breadcrumb">{breadcrumb}</ul>',
+ );
+ $args = array_merge( $defaults, $args );
+
+ $whole_breadcrumb = '';
+
+ foreach ( $breadcrumbs as $breadcrumb ) {
+ $whole_breadcrumb .= $args['before'] . $breadcrumb . $args['after'];
+ }
+
+ $whole_breadcrumb = str_replace( '{breadcrumb}', $whole_breadcrumb, $args['breadcrumb-template'] );
+
+ return apply_filters( 'gp_breadcrumb', $whole_breadcrumb );
+ }
</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="trunkgptemplatesheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/header.php 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/gp-templates/header.php 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,48 +1,46 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-wp_enqueue_style( 'base' );
-wp_enqueue_script( 'jquery' );
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <title><?php echo gp_title(); ?></title>
- <?php gp_head(); ?>
- </head>
- <body <?php body_class(); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+ <title><?php echo gp_title(); ?></title>
+
+ <?php gp_head(); ?>
+</head>
+
+<body <?php body_class(); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">document.body.className = document.body.className.replace('no-js','js');</script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="gp-content">
- <div id="gp-js-message"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <header class="gp-bar clearfix">
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="logo" href="<?php echo gp_url( '/' ); ?>" rel="home">
- <img alt="GlotPress" src="<?php echo gp_url_img( 'glotpress-logo.png' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo gp_url( '/' ); ?>" rel="home">
+ <?php echo gp_get_option('title'); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo gp_breadcrumb(); ?>
- <span id="hello">
- <?php
- if (GP::$user->logged_in()):
- $user = GP::$user->current();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __('Hi, %s.'), '<a href="'.gp_url( '/profile' ).'">'.$user->user_login.'</a>' );
- ?>
- <a href="<?php echo gp_url('/logout')?>"><?php _e('Log out'); ?></a>
- <?php elseif( ! GP_INSTALLING ): ?>
- <strong><a href="<?php echo gp_url_login(); ?>"><?php _e('Log in'); ?></a></strong>
- <?php endif; ?>
- <?php do_action( 'after_hello' ); ?>
- </span>
- <div class="clearfix"></div>
- </h1>
- <div class="clear after-h1"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <nav id="main-navigation" role="navigation">
+ <?php echo gp_nav_menu(); ?>
+ </nav>
+
+ <nav id="side-navigation">
+ <?php echo gp_nav_menu('side'); ?>
+ </nav>
+ </header>
+
+ <div class="gp-content">
+ <?php echo gp_breadcrumb(); ?>
+
+ <div id="gp-js-message"></div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if (gp_notice('error')): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="error">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo gp_notice( 'error' ); //TODO: run kses on notices ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if (gp_notice()): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo gp_notice(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'after_notices' ); ?>
</span></span></pre></div>
<a id="trunkgptemplateshelperfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/helper-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/helper-functions.php 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/gp-templates/helper-functions.php 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_style( 'base' );
+wp_enqueue_script( 'jquery' );
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function prepare_original( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = str_replace( array("\r", "\n"), "<span class='invisibles' title='".esc_attr(__('New line'))."'>↵</span>\n", $text);
</span><span class="cx" style="display: block; padding: 0 10px"> $text = str_replace( "\t", "<span class='invisibles' title='".esc_attr(__('Tab character'))."'>→</span>\t", $text);
</span></span></pre></div>
<a id="trunkgptemplatesprojectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/project.php 2015-09-24 11:36:22 UTC (rev 1131)
+++ trunk/gp-templates/project.php 2015-09-24 15:00:06 UTC (rev 1132)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_link = gp_link_project_edit_get( $project, __('(edit)') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $project->active ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'gp_breadcrumb', function( $s ) { return $s . '<span class="active bubble">' . __('Active') . '</span>'; } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'gp_breadcrumb_items', function( $items ) {
+ $items[ count($items) - 1 ] .= ' <span class="active bubble">' . __('Active') . '</span>';
+
+ return $items;
+ } );
</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"> gp_tmpl_header();
</span></span></pre>
</div>
</div>
</body>
</html>