Output more <span>, for Carl. :)

diff --git a/docs/NEWS b/docs/NEWS
index 4c1d61f7c328db8e83f022dcd7219d27f414bde4..a39de9bc6b5ac87a706e8a4a3e0107135a70ffdc 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.0-beta2 ()
 ------------------------------------------------------------------------
 
+   * Change karma plugin and search results to output more HTML span
+     classes for better styling (garvinhicking)
+
    * Modified plugin API to allow deactivating the output of plugin
      sidebars (garvinhicking)
 

diff --git a/include/genpage.inc.php b/include/genpage.inc.php
index 43cc60b88f322d689920ac7f66177cc58a1fd49d..b71ed688943321f3eaf83decee448d083346f02b 100644 (file)
--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@@ -69,7 +69,7 @@ if ($serendipity['smarty_raw_mode']) {
             } elseif ($r === true) {
                 $serendipity['smarty']->assign(
                     array(
-                        'content_message'        => sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']),
+                        'content_message'        => sprintf(NO_ENTRIES_BLAHBLAH, '<span class="searchterm">' . $serendipity['GET']['searchTerm'] . '</span>'),
                         'searchresult_noEntries' => true
                     )
                 );
@@ -78,7 +78,7 @@ if ($serendipity['smarty_raw_mode']) {
 
             $serendipity['smarty']->assign(
                 array(
-                    'content_message'      => sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], serendipity_getTotalEntries()),
+                    'content_message'      => sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, '<span class="searchterm">' . $serendipity['GET']['searchTerm'] . '</span>', '<span class="searchresults">' . serendipity_getTotalEntries() . '</span>'),
                     'searchresult_results' => true
                 )
             );
@@ -101,4 +101,3 @@ if ($serendipity['smarty_raw_mode']) {
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>

diff --git a/plugins/serendipity_event_karma/serendipity_event_karma.php b/plugins/serendipity_event_karma/serendipity_event_karma.php
index 6a47e78b60d572c17f1439e4328166a73dac1d4a..946f25f963185d444aeae8850302b4517cbbcaa0 100644 (file)
--- a/plugins/serendipity_event_karma/serendipity_event_karma.php
+++ b/plugins/serendipity_event_karma/serendipity_event_karma.php
@@ -188,7 +188,7 @@ class serendipity_event_karma extends serendipity_event
         static $karma_exits = null;
         
         if ($karma_exits === null) {
-            $karma_exits = ' | ' . TOP_EXITS . ' (%d)';
+            $karma_exits = ' <span class="serendipity_karmaVoting_exits_sep">|</span> <span class="serendipity_karmaVoting_exits">' . TOP_EXITS . '</span> <span class="serendipity_karmaVoting_exits_num">(%d)</span>';
         }
 
         if ($get_prepared) {
@@ -507,16 +507,16 @@ class serendipity_event_karma extends serendipity_event
                             }
 
                             $karma_voting = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
-                                  . ($karma_active ? PLUGIN_KARMA_VOTETEXT . ' ' . $link_1 . ' | ' . $link_2 . ' | ' . $link_3 . ' | ' . $link_4 . ' | ' . $link_5 . '<br />'
-                                  . PLUGIN_KARMA_CURRENT : '') . ($track_clicks ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
+                                  . ($karma_active ? '<span class="serendipity_karmaVoting_text">' . PLUGIN_KARMA_VOTETEXT . '</span> <span class="serendipity_karmaVoting_links">' . $link_1 . ' | ' . $link_2 . ' | ' . $link_3 . ' | ' . $link_4 . ' | ' . $link_5 . '</span><br />'
+                                  . '<span class="serendipity_karmaVoting_current">' . PLUGIN_KARMA_CURRENT . '</span>' : '') . ($track_clicks ? '<span class="serendipity_karmaVoting_visits">' . PLUGIN_KARMA_VISITSCOUNT . '</span>': '') . '</div>';
 
                             $karma_current = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
                                 . ($karma_active ? '<div class="serendipity_karmaSuccess">' . PLUGIN_KARMA_VOTED . '</div>'
-                                . PLUGIN_KARMA_CURRENT : '') . ($track_clicks ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
+                                  . '<span class="serendipity_karmaVoting_current">' . PLUGIN_KARMA_CURRENT . '</span>' : '') . ($track_clicks ? '<span class="serendipity_karmaVoting_visits">' . PLUGIN_KARMA_VISITSCOUNT . '</span>': '') . '</div>';
 
                             $karma_timeout = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
                                 . ($track_karma ? '<div>' . sprintf(PLUGIN_KARMA_CLOSED, $karmatime) . '</div>'
-                                . PLUGIN_KARMA_CURRENT : '') . ($track_clicks ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
+                                  . '<span class="serendipity_karmaVoting_current">' . PLUGIN_KARMA_CURRENT . '</span>' : '') . ($track_clicks ? '<span class="serendipity_karmaVoting_visits">' . PLUGIN_KARMA_VISITSCOUNT . '</span>': '') . '</div>';
 
                             if ($addData['extended'] || $addData['preview']) {
                                 $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
@@ -612,4 +612,3 @@ class serendipity_event_karma extends serendipity_event
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>