<!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>[BuddyPress][11835] trunk/src: Templates: move common assets from bp-legacy and bp-nouveau into a shared folder.</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://buddypress.trac.wordpress.org/changeset/11835">11835</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11835","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-29 20:50:43 +0000 (Mon, 29 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'>Templates: move common assets from bp-legacy and bp-nouveau into a shared folder.
In the Nouveau and Legacy packs, these templates were identical. As they used for very specific parts of a BuddyPress theme,
and all to support features that were added since bp-legacy was created, we can utilise this new shared folder to avoid duplication.
The shared folder is added to the template hierarchy, with a lower priority than the WordPress theme, any WordPress parent theme,
and the active template pack. Any site that has customised any of the moved templates will continue to load those version.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7672">#7672</a>
Props r-a-y for the initial patch, and hnla.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorethemecompatibilityphp">trunk/src/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunksrcclassbuddypressphp">trunk/src/class-buddypress.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/bp-templates/shared/</li>
<li>trunk/src/bp-templates/shared/buddypress/</li>
<li>trunk/src/bp-templates/shared/buddypress/assets/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressassets_attachmentsuploaderphp">trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php</a></li>
<li>trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/</li>
<li>trunk/src/bp-templates/bp-legacy/buddypress/assets/embeds/</li>
<li>trunk/src/bp-templates/bp-nouveau/buddypress/assets/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-theme-compatibility.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-theme-compatibility.php 2018-01-28 17:03:59 UTC (rev 11834)
+++ trunk/src/bp-core/bp-core-theme-compatibility.php 2018-01-29 20:50:43 UTC (rev 11835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -987,3 +987,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $bp->theme_compat->is_page_toggled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'loop_end', 'bp_theme_compat_loop_end' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Get the absolute path to the shared theme assets folder.
+ *
+ * @since 3.0.0
+ *
+ * @return string The absolute path to the shared theme assets folder.
+ */
+function bp_get_shared_theme_assets_dir() {
+
+ /**
+ * Filters the absolute path to the shared theme assets folder.
+ *
+ * @since 3.0.0
+ *
+ * @param string $dir The absolute path to the shared theme assets folder.
+ */
+ return apply_filters( 'bp_get_theme_compat_dir', buddypress()->themes_dir . '/shared' );
+}
</ins></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressassets_attachmentsuploaderphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php 2018-01-28 17:03:59 UTC (rev 11834)
+++ trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php 2018-01-29 20:50:43 UTC (rev 11835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,42 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * BuddyPress Uploader templates.
- *
- * This template is used to create the BuddyPress Uploader Backbone views.
- *
- * @since 2.3.0
- *
- * @package BuddyPress
- * @subpackage bp-attachments
- */
-
-?>
-<script type="text/html" id="tmpl-upload-window">
- <?php if ( ! _device_can_upload() ) : ?>
- <h3 class="upload-instructions"><?php esc_html_e( 'The web browser on your device cannot be used to upload files.', 'buddypress' ); ?></h3>
- <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
- <h3 class="upload-instructions"><?php esc_html_e( 'Upload Limit Exceeded', 'buddypress' ); ?></h3>
- <?php else : ?>
- <div id="{{data.container}}">
- <div id="{{data.drop_element}}">
- <div class="drag-drop-inside">
- <p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
- <p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
- <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
- /* translators: accessibility text */
- esc_html_e( 'Select your File', 'buddypress' );
- ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
- </div>
- </div>
- </div>
- <?php endif; ?>
-</script>
-
-<script type="text/html" id="tmpl-progress-window">
- <div id="{{data.id}}">
- <div class="bp-progress">
- <div class="bp-bar"></div>
- </div>
- <div class="filename">{{data.filename}}</div>
- </div>
-</script>
</del></span></pre></div>
<a id="trunksrcclassbuddypressphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/class-buddypress.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/class-buddypress.php 2018-01-28 17:03:59 UTC (rev 11834)
+++ trunk/src/class-buddypress.php 2018-01-29 20:50:43 UTC (rev 11835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,8 +732,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register the basic theme stack. This is really dope.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_register_template_stack( 'get_stylesheet_directory', 10 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_register_template_stack( 'get_template_directory', 12 );
- bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_register_template_stack( 'get_template_directory', 12 );
+ bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
+ bp_register_template_stack( 'bp_get_shared_theme_assets_dir', 16 );
</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>
</div>
</body>
</html>