Author: nick
Date: 2008-05-02 23:22:39 -0400 (Fri, 02 May 2008)
New Revision: 16485
Modified:
streetsblog/trunk/wp-content/plugins/email/email-css.css
streetsblog/trunk/wp-content/plugins/email/wp-email-popup.php
streetsblog/trunk/wp-content/themes/woonerf/functions.php
streetsblog/trunk/wp-content/themes/woonerf/header.php
streetsblog/trunk/wp-content/themes/woonerf/post.php
Log:
* updated "Email this post" link with proper function
* moved script tags for Ext and oc-behaviors into functions.php, to be hooked
into the wp_head action, rather than be hardcoded into header.php. The avoids
JS errors on email popup.
* updated markup and style on the email popup to niceify the layout.
Modified: streetsblog/trunk/wp-content/plugins/email/email-css.css
===================================================================
--- streetsblog/trunk/wp-content/plugins/email/email-css.css 2008-05-03
01:05:21 UTC (rev 16484)
+++ streetsblog/trunk/wp-content/plugins/email/email-css.css 2008-05-03
03:22:39 UTC (rev 16485)
@@ -15,7 +15,9 @@
+----------------------------------------------------------------+
*/
-
+.wp-email {
+ padding: 20px;
+}
.wp-email P {
text-align: left;
}
\ No newline at end of file
Modified: streetsblog/trunk/wp-content/plugins/email/wp-email-popup.php
===================================================================
--- streetsblog/trunk/wp-content/plugins/email/wp-email-popup.php
2008-05-03 01:05:21 UTC (rev 16484)
+++ streetsblog/trunk/wp-content/plugins/email/wp-email-popup.php
2008-05-03 03:22:39 UTC (rev 16485)
@@ -53,15 +53,14 @@
<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> » Blog
Archive <?php } ?> <?php wp_title(); ?></title>
<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />
<!-- leave this for stats -->
-<link rel="stylesheet" href="blueprint/print.css" type="text/css"
media="print"/>
-<link rel="stylesheet" href="<?php bloginfo('stylesheet_url');
?>?refresh=2-9-08" type="text/css" media="screen" />
+
+<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>"
type="text/css" media="screen" />
<!--[if IE]>
<style type="text/css">
.clearAfter, .boxyContent { height: 1%; }
</style>
<![endif]-->
-
<link rel="alternate" type="application/rss+xml" title="<?php
bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
@@ -70,12 +69,14 @@
</head>
<body>
+<!--
<div id="header" style="width:100%;">
<h1 id="title" class="bottom">
<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
</h1>
<div id="tagline" class="metaText">Livable Streets Network</div>
</div>
+-->
<div id="email-container">
<?php email_form(true); ?>
</div><!-- end #email-container -->
Modified: streetsblog/trunk/wp-content/themes/woonerf/functions.php
===================================================================
--- streetsblog/trunk/wp-content/themes/woonerf/functions.php 2008-05-03
01:05:21 UTC (rev 16484)
+++ streetsblog/trunk/wp-content/themes/woonerf/functions.php 2008-05-03
03:22:39 UTC (rev 16485)
@@ -1,5 +1,4 @@
<?php
-
/* Register Sidebar */
if ( function_exists('register_sidebar') )
register_sidebar(array('name'=>'Sidebar',
@@ -177,6 +176,14 @@
echo get_sb_option($option);
}
+// sink function to add Ext and oc-js to head. Hooks into wp_head
+function sb_oc_js() {
+?>
+ <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/yui-ext/yahoo-dom-event.js"></script>
+ <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/yui-ext/ext.js"></script>
+ <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/oc-behaviors.js"></script>
+<?php
+}
// sink function for the 'admin_menu' hook
function sb_add_pages() {
@@ -317,6 +324,7 @@
add_filter('mce_buttons', 'sb_mce_buttons');
add_filter('mce_css', 'sb_mce_css');
add_action('admin_head', 'sb_admin_css');
+add_action('wp_head', 'sb_oc_js', 1);
//add_action('edit_form_advanced', 'sb_resizr_form', 1);
function popup_head() {
Modified: streetsblog/trunk/wp-content/themes/woonerf/header.php
===================================================================
--- streetsblog/trunk/wp-content/themes/woonerf/header.php 2008-05-03
01:05:21 UTC (rev 16484)
+++ streetsblog/trunk/wp-content/themes/woonerf/header.php 2008-05-03
03:22:39 UTC (rev 16485)
@@ -14,9 +14,6 @@
<link rel="stylesheet" type="text/css" href="<?php
bloginfo('template_directory') ?>/fixes-old-ie.css" />
<![endif]>
<![endif]-->
- <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/yui-ext/yahoo-dom-event.js"></script>
- <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/yui-ext/ext.js"></script>
- <script type="text/javascript" src="<?php bloginfo('siteurl');
?>/wp-content/js/oc-behaviors.js"></script>
<?php wp_head(); ?>
</head>
<body id="<?php sb_the_site(); ?>">
Modified: streetsblog/trunk/wp-content/themes/woonerf/post.php
===================================================================
--- streetsblog/trunk/wp-content/themes/woonerf/post.php 2008-05-03
01:05:21 UTC (rev 16484)
+++ streetsblog/trunk/wp-content/themes/woonerf/post.php 2008-05-03
03:22:39 UTC (rev 16485)
@@ -29,32 +29,29 @@
<?php } ?>
<?php ($use_full_post) ? the_content("Continue reading »") :
the_excerpt($excerpt_length=120,
$allowedtags='<p><ul><li><img><span><div><a><br><br />', $filter_type='none',
$use_more_link=true, $more_link_text="(more...)", $force_more=true, $fakeit=1,
$fix_tags=true, $no_more=false, $more_tag='div', $more_link_title='Continue
reading this entry', $showdots=true); ?>
</div><!-- /.post-entry -->
+
<?php if (get_post_custom_values('Actions')) : ?>
<div class="post-engage">
<h3>Take Action:</h3>
<?php echo get_post_meta($post->ID, 'Actions', true); ?>
</div><!-- /.post-engage -->
<?php endif; ?>
+
<?php if (is_single() && in_category(2)) : ?>
<?php if (function_exists('wca_event_details') ) {wca_event_details(); }
?>
<?php endif; ?>
+
</div><!-- /.post-content -->
<?php if (!is_single()) : ?>
<div class="post-footer">
<div class="selfclear">
- <!--
- [FIXME] this function check (taken from woonerf) is failing
- most likely a config issue on my local, but need to resolve.
- uncomment and remove the dummy version once that's fixed
- <?php if(function_exists('email_share_url')) :?>
+ <?php if(function_exists('email_link')) :?>
+
<div class="post-email">
- <a href="<?php email_share_url();?>">Email</a>
+ <?php email_link(); ?>
</div>
<?php endif; ?>
- -->
- <div class="post-email">
- <a href="#dummy-email-link-to-be-fixed>">Email</a>
- </div>
+
<?php comments_popup_link(__('No Comments'), __('1 Comment'), __('%
Comments'), __('post-comment-count')); ?><?php
the_last_commenter('', '<em class="last-comment-author">Last comment by
', '</em>');
# [FIXME] if we want to have "last comment" be the link
--
Archive:
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2008/05/1209784969095
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]
Please contact [EMAIL PROTECTED] for questions.
