Changeset 1639

Timestamp:

11/24/06 16:23:35 (2 years ago)

Author:

mdodoo

Message:

Attempted sync with trunk through "diff -r." Ignored the internationalized langugage files because i was afraid of messing something up.

It is 10:30 am. I should get some sleep.

Location:

branches/multiuser

Files:

• admin/channels.php (modified) (2 diffs)
• api.php (modified) (4 diffs)
• cls/items.php (modified) (8 diffs)
• cls/l10n.php (modified) (1 diff)
• cls/update.php (modified) (5 diffs)
• cls/wrappers/header.php (modified) (2 diffs)
• cls/wrappers/item.php (modified) (1 diff)
• constants.php (modified) (1 diff)
• extlib/rss_fetch.inc (modified) (2 diffs)
• index.php (modified) (1 diff)
• themes/default/mobile/feed.php (modified) (1 diff)
• themes/default/mobile/footer.php (modified) (1 diff)
• themes/default/mobile/header.php (modified) (1 diff)
• themes/default/mobile/index.php (modified) (2 diffs)
• themes/default/mobile/item.php (modified) (2 diffs)
• themes/default/mobile/itemlist.php (modified) (1 diff)
• themes/default/mobile/nav.php (modified) (2 diffs)
• themes/default/mobile/navitem.php (modified) (1 diff)
• themes/default/mobile/plugins.php (modified) (2 diffs)
• themes/default/mobile/style.css (modified) (1 diff)
• themes/default/web/item.php (modified) (1 diff)

branches/multiuser/admin/channels.php

@@ -281 +281 @@
 
         if ($label != 'http://' &&  substr($label, 0,4) == "http") {
-            $tags = $_REQUEST['channel_tags'];
+            $tags = @$_REQUEST['channel_tags'];
             $ret = add_channel($label,$fid,null,null,$tags);
             //var_dump($ret);
@@ -900 +900 @@
 
     // Description
-    $descr = strip_tags($descr);
+    $descr = trim(strip_tags($descr));
     echo "<p><label for=\"c_descr\">". __('Description:') ."</label>\n"
     ."<input type=\"text\" id=\"c_descr\" name=\"c_descr\" value=\"$descr\" /></p>\n";

branches/multiuser/api.php

@@ -52 +52 @@
         rss_require('extlib/JSON.php');
         $json = new Services_JSON();
-        $query = sanitize(@$_REQUEST['q'], RSS_SANITIZER_WORDS);
+        $query = preg_replace('#[^a-z0-9\s]#','',@$_REQUEST['q']);
         if ($query) {
             $res = osSearch($query);
         } else {
-            $res = array($query,array());
+            $res = array($query,array(),array(),array());
         }
-        header('Content-Type: application/json');
+        header('Content-Type: text/plain');
         die ($json->encode($res));
         break;
@@ -80 +80 @@
            ." c.id, c.title, c.url, c.siteurl, f.name "
            ." from ".getTable("channels")." c "
-           . " inner join " . getTable("folders")." f on f.id = c.parent";
+           ." inner join " . getTable("folders")." f "
+           ."  on f.id = c.parent";
 
     if (hidePrivate()) {
@@ -149 +150 @@
            ." unix_timestamp(ifnull(i.pubdate, i.added)) as idate ,i.id as iid"
            ." from ".getTable('item')." i "
-           . " inner join ".getTable('channels') ." c "
-           ." on i.cid=c.id where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
+            ." inner join " .getTable('channels') ." c "
+            ."  on c.id = i.cid "
+            ." where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
 
     if ($date) {
@@ -216 +218 @@
         }
     }
-    return array($q,$results);
+    return array($q,$results,array(),array());
 }
 ?>

branches/multiuser/cls/items.php

@@ -60 +60 @@
      * ctor
      */
-    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread,$private, $sticky, $flagged) {
+    function Item($id, $title, $url, $enclosure, $parent, $author, $description, $date, $isPubDate, $unread, $rating) {
         $this->rss = &$GLOBALS['rss'];
         $this->id = $id;
-        //$this->flags = $unread;
+        $this->flags = $unread;
         if ($title) {
             $this->title = $title;
@@ -87 +87 @@
         $this -> tags=array();
         $this -> rating = $rating;
-        $this ->isUnread    = $unread;
-        $this ->isPrivate   = $private;
-        $this ->isDeleted   = $deleted;
-        $this ->isSticky    = $sticky;
-        $this ->isFlag      = $flagged;
+        $this ->isUnread    = $unread & RSS_MODE_UNREAD_STATE;
+        $this ->isPrivate   = $unread & RSS_MODE_PRIVATE_STATE;
+        $this ->isDeleted   = $unread & RSS_MODE_DELETED_STATE;
+        $this ->isSticky    = $unread & RSS_MODE_STICKY_STATE;
+        $this ->isFlag    = $unread & RSS_MODE_FLAG_STATE;
         //$this -> key = md5(rand(0,10000));
         
@@ -193 +193 @@
         $this->items[] = $item;
         
-        if ((!$this -> hasUnreadItems) && $item->isUnread) {
+        if ((!$this -> hasUnreadItems) && $item->flags & RSS_MODE_UNREAD_STATE) {
             $this -> hasUnreadItems = true;
         }
@@ -260 +260 @@
         
         // Predefined alternate ordering
-        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread desc, ";
+        $this -> ORDER_BY_UNREAD_FIRST = " order by i2u.flgunread & " . RSS_MODE_UNREAD_STATE . " desc, ";
         if (getConfig('rss.config.absoluteordering')) {
             $this -> ORDER_BY_UNREAD_FIRST .= " f.position asc, c2u.position asc";
         } else {
-            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c.title asc";
+            $this -> ORDER_BY_UNREAD_FIRST .= " f.name asc, c2u.title asc";
         }
         $this -> ORDER_BY_UNREAD_FIRST .= ", i.added desc, i.id asc";
@@ -271 +271 @@
 
     /**
-     * Populates a an ItemList with items from the Database. Note that this methdo
+     * Populates a an ItemList with items from the Database. Note that this method
      * can be invoked several times on the same ItemList object instance: upon each
      * call the new items will be aggregated to the existing ones.
@@ -283 +283 @@
 
       _pf('ItemList::populate()');
-        $this -> _sqlActualWhat = " i.title,  c.title, c.id, "
-        ."i2u.flgunread, i2u.flgprivate, i2u.flgsticky, i2u.flgdeleted, "
-        ." i2u.flgflagged,"
+        $this -> _sqlActualWhat = " i.title,  c.title, c.id, i2u.flgunread, "
             ."i.url, i.enclosure, i.author, i.description, c2u.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
@@ -360 +358 @@
         $this -> _sqlActualLimit = " $startItem, $itemCount";
 
-        $sql = "\nselect\n\t "
+        $sql = "select "
             .$this -> _sqlActualWhat
-            . " \nfrom\n\t "
+            . " from "
             .$this -> _sqlActualFrom
-            . " \nwhere\n\t "
+            . " where "
             . $this -> _sqlActualWhere
-            . " \norder by\n\t "
+            . " order by "
             . $this -> _sqlActualOrder
-            . " \nlimit "
+            . " limit "
             . $this -> _sqlActualLimit;
             
-        //die( $sql );
+        //echo $sql;
         $this -> iids = array();
-        $res = rss_query($sql);
+        $res = $GLOBALS['rss_db']->rss_query($sql);
         $this -> rowCount = $GLOBALS['rss_db']->rss_num_rows($res);
         $prevCid = -1;
         $curIdx = 0;
         $f=null;
-        while (list ($ititle_, $ctitle_, $cid_, $iunread_, $iprivate_, $isticky_, $ideleted_, $iflagged_, $iurl_, $ienclosure_, $iauthor_, $idescr_, $cicon_, $its_, $iispubdate_, $iid_) = $GLOBALS['rss_db']->rss_fetch_row($res)) {
+        while (list ($ititle_, $ctitle_, $cid_, $iunread_, $iurl_, $ienclosure_, $iauthor_, $idescr_, $cicon_, $its_, $iispubdate_, $iid_) = $GLOBALS['rss_db']->rss_fetch_row($res)) {
             
             // Built a new Item
-            $i = new Item($iid_, $ititle_, $iurl_, $ienclosure_, $cid_, $iauthor_, $idescr_, $its_, $iispubdate_, $iunread_, $iprivate_, $isticky_, $iflagged_);
+            $i = new Item($iid_, $ititle_, $iurl_, $ienclosure_, $cid_, $iauthor_, $idescr_, $its_, $iispubdate_, $iunread_);
             
             // no dupes, please
@@ -413 +411 @@
             // Some stats...
             $this -> itemCount++;           
-            if ($iunread_) {
+            if ($iunread_ & RSS_MODE_UNREAD_STATE) {
                 $this -> unreadCount++; 
                 $this -> unreadIids[] = $iid_;

branches/multiuser/cls/l10n.php

@@ -75 +75 @@
     }
     /**
-     * Detect users preferred language. Losely based on http://grep.be/data/accept-to-gettext.inc
+     * Detect user's preferred language. 
+     * Loosely based on http://grep.be/data/accept-to-gettext.inc
      */
     function __detectUserLang() {
-       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
+        // Language overridden?
+        if (defined('RSS_LANGUAGE_OVERRIDE')) {
+            return constant('RSS_LANGUAGE_OVERRIDE');
+        // Language defined in the request (?lang=)
+        } elseif (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
             $this -> __setLocaleCookie($_REQUEST['lang']);
             rss_invalidate_cache();

branches/multiuser/cls/update.php

@@ -99 +99 @@
         if (!hidePrivate() || $ignorePrivate) {
             if (count($newIds) > 0 && getConfig('rss.config.markreadonupdate')) {
-                rss_query("update ".getTable("item2user")." i2u set i2u.flgunread=0 where i2u.flgunread=1"
+                rss_query("update ".getTable("item2user")." i2u set i2u.flgunread = unread & "
+                          .SET_MODE_READ_STATE." where unread & ".RSS_MODE_UNREAD_STATE
                           ." and i2u.fkiid not in (".implode(",", $newIds).")");
             }
@@ -113 +114 @@
 
     function magpieError($error) {
-        if ($error & MAGPIE_FEED_ORIGIN_CACHE) {
+        if (is_numeric($error) && ($error & MAGPIE_FEED_ORIGIN_CACHE)) {
             if ($error & MAGPIE_FEED_ORIGIN_HTTP_304) {
                 $label = __('OK (304 Not modified)');
@@ -120 +121 @@
             elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_TIMEOUT) {
                 $label = __('HTTP Timeout (Local cache)');
-                $cls = ERROR_WARNING;
+                $cls = ERROR_ERROR;
             }
             elseif ($error & MAGPIE_FEED_ORIGIN_NOT_FETCHED) {
@@ -129 +130 @@
                 $label = __('404 Not Found (Local cache)');
                 $cls = ERROR_ERROR;
+            } elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_403) {
+                $label = __('403 Forbidden (Local cache)');
+                $cls = ERROR_ERROR;
             }
             else {
@@ -141 +145 @@
         else {
             if (is_numeric($error)) {
-                $label = __('ERROR');
+                $label = __('ERROR') ." $error";
                 $cls = ERROR_ERROR;
             } else {

branches/multiuser/cls/wrappers/header.php

@@ -135 +135 @@
 }
 
-function rss_header_logininfo() {
+function rss_header_logininfo($showLoginBox = true) {
 
     $ret = "<div id=\"loginfo\">\n";
@@ -142 +142 @@
         $ret .= sprintf(__('Logged in as <strong>%s</strong>'), rss_user_name())
                 ."&nbsp;|&nbsp;<a href=\"".getPath()."?logout\">".__('Logout')."</a>\n";
-    } else {
+    } else if(true == $showLoginBox) {
         $ret .= __('Not logged in')
                 ."&nbsp;|&nbsp;<a href=\"#\" onclick=\"miniloginform(); return false;\">".__('Login')."</a>";

branches/multiuser/cls/wrappers/item.php

@@ -47 +47 @@
     if (getConfig('rss.output.usepermalinks')) {
         list ($ply, $plm, $pld) = explode(":", rss_date("Y:m:d", $GLOBALS['rss'] -> currentItem -> date, false));
-        $ptitle = ($label."'".$GLOBALS['rss'] -> currentItem -> parent -> escapedTitle
-            ."/$ply/$plm/$pld/".$GLOBALS['rss'] -> currentItem -> escapedTitle."'");
-    }
-    return $ptitle;
+        $ptitle = ($label."'". htmlentities($GLOBALS['rss'] -> currentItem -> title,ENT_QUOTES  ,'UTF-8') ."'");
+    }
+    return @$ptitle;
 }
 

branches/multiuser/constants.php

@@ -177 +177 @@
 // Profiling 
 //  - The profiling information is "html commented out" at the end of every html page
-define('PROFILING', 1);
-define('PROFILING_DB', 1);
+//define('PROFILING', 1);
+//define('PROFILING_DB', 1);
 
 ?>

branches/multiuser/extlib/rss_fetch.inc

@@ -50 +50 @@
 // Not fetched because age < MAGPIE_CACHE_AGE
 define ('MAGPIE_FEED_ORIGIN_NOT_FETCHED', 64);
+// 403 Forbidden
+define ('MAGPIE_FEED_ORIGIN_HTTP_403', 128);
 
 /*
@@ -236 +238 @@
             if (is_object($resp) && isset($resp->status)) {
                 switch ($resp->status) {
+        case '403':
+            $rss -> rss_origin |= MAGPIE_FEED_ORIGIN_HTTP_403;
+            break;
                 case '404':
                         $rss -> rss_origin |= MAGPIE_FEED_ORIGIN_HTTP_404;

branches/multiuser/index.php

@@ -122 +122 @@
     $unreadItems = new ItemList();
     $numItems = getConfig('rss.output.frontpage.numitems');
-    
-    
-    $unreadItems -> populate(" i2u.flgunread=1 ", "", 0, $numItems,ITEM_SORT_HINT_UNREAD);
+    /*
+    $hiddenIds = getHiddenChannelIds();
+    if (count($hiddenIds)) {
+        $sqlWhereHidden = " and c.id not in (" . implode(',',$hiddenIds) . ") ";
+    } else {
+        $sqlWhereHidden = "";
+    }
+    */
+    $sqlWhereHidden = "";
+    
+    $unreadItems -> populate("i2u.flgunread=1 & " . RSS_MODE_UNREAD_STATE . $sqlWhereHidden, "", 0, $numItems,ITEM_SORT_HINT_UNREAD);
     //var_dump($unreadItems);
     _pf('end populate unread items');

branches/multiuser/themes/default/mobile/feed.php

@@ -1 +1 @@
 <?php if(rss_feed_do_title()) { ?>
-<h3><a href="<?php echo rss_feed_url(); ?>"><?php echo rss_feed_title(); ?></a></h3>
+<h3>
+<?php if (rss_feed_favicon_url()) { ?>
+<img src="<?php echo rss_feed_favicon_url(); ?>" class="favicon" width="16" height="16" alt="" />
+<?php } ?>
+<a href="<?php echo rss_feed_url(); ?>"><?php echo rss_feed_title(); ?></a></h3>
 <?php } 
 rss_feed_items();

branches/multiuser/themes/default/mobile/footer.php

@@ -1 @@
-<span><a href="#top">TOP</a></span>
-<span><a href="http://gregarius.net/">Gregarius</a> <?php echo _VERSION_; ?><?php echo rss_svn_rev('.'); ?></span>
-<span><a href="http://validator.w3.org/check/referer">XHTML1.0-MP</a></span>
-<span>Last update: <?php echo rss_footer_last_modif(); ?></span>
+<div id="footer">
+<?php echo rss_nav() ?>
+</div>

branches/multiuser/themes/default/mobile/header.php

@@ -1 +1 @@
 <title><?php echo rss_header_title() ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo getExternalThemeFile( 'style.css' ) ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo getExternalThemeFile( 'style.css' ) ?>">

branches/multiuser/themes/default/mobile/index.php

@@ -4 +4 @@
 <?php rss_main_header(); ?>
 </head>
-<body>
-<a name="top"></a>
+<body id="top">
 <?php 
 if( array_key_exists('feeds',$_REQUEST) ) {
@@ -20 +19 @@
 </div>
 <?php } ?>
-<?php echo rss_nav() ?>
-<div id="ftr">
-    <?php rss_main_footer(); ?>
-</div>
+<?php rss_main_footer(); ?>
 </body>
 </html>

branches/multiuser/themes/default/mobile/item.php

@@ -1 @@
-<br /><br /><h4><a href="<?php
+<?php
+if (!isset($GLOBALS['__item__idx__'])) {
+    $GLOBALS['__item__idx__']=0;
+}
+$cls = $GLOBALS['__item__idx__']++ % 2 ? 'e':'o';
+?>
+<div class="item <?php echo $cls; ?>">
+<h4><a href="<?php
   $url = rss_item_url();
   if (substr($url,0,4) == 'http') {
@@ -8 +15 @@
 ?>"><?php echo rss_item_title(); 
 ?></a></h4>
-<h5><?php echo rss_item_date(); ?><?php echo rss_item_author(); ?></h5>
+<h5><?php echo rss_item_date(); ?> <?php echo rss_item_author(); ?></h5>
 <?php if (rss_item_has_enclosure()) { ?>
 <h5><?php echo __('Enclosure:'); ?>&nbsp;[<a href="<?php echo rss_item_enclosure(); ?>"><?php echo __('download'); ?></a>]</h5>
 <?php } ?>
 <?php   if (rss_item_display_tags() && count($GLOBALS['rss']->currentItem->tags)) { ?>
-<h5><a href="<?php echo rss_item_tagslink(); ?>"><?php echo __('Tags'); ?></a>:&nbsp;<span><?php echo rss_item_tags(); ?></h5>
+<h5><a href="<?php echo rss_item_tagslink(); ?>"><?php echo __('Tags'); ?></a>:&nbsp;<span><?php echo rss_item_tags(); ?></span></h5>
 <?php } ?>
-<br />
 <div class="content">
 <?php echo rss_item_content(); ?>
 
 <?php if(!hidePrivate()) { ?>
-    <br />
-    <div class="mobileform">
-    <input type="radio" value="mobile_read" name="<?= rss_item_id(); ?>" <?php
-      if( !$GLOBALS['rss'] -> currentItem -> isUnread && !$GLOBALS['rss'] -> currentItem -> isSticky ) {
-        echo "checked";
-      }
-    ?> >read
-    <input type="radio" name="<?= rss_item_id(); ?>" <?php
-      if( $GLOBALS['rss'] -> currentItem -> isUnread ) {
-        echo "checked"; 
-      }
-    ?> >unread
-    <input type="radio" value="mobile_sticky" name="<?= rss_item_id(); ?>" <?php
-      if( $GLOBALS['rss'] -> currentItem -> isSticky ) {
-        echo "checked";
-      }
-    ?> >sticky
-    </div>
+<div class="mobileform">
+<label for="it_<?= rss_item_id(); ?>">State:</label>
+<select id="it_<?= rss_item_id(); ?>" name="<?= rss_item_id(); ?>">
+    <option value="mobile_read" <?php 
+        if(!$GLOBALS['rss'] -> currentItem -> isSticky ) { 
+            echo "selected=\"selected\""; 
+        } ?>><?= __('Read'); ?></option>
+    <option value="mobile_unread"><?= __('Unread'); ?></option>
+    <option value="mobile_sticky"   <?php
+          if( $GLOBALS['rss'] -> currentItem -> isSticky ) {
+            echo "selected=\"selected\""; 
+          }
+        ?>><?= __('Sticky'); ?></option>
+</select>
+</div>
 <?php } ?>
 

branches/multiuser/themes/default/mobile/itemlist.php

@@ +1 @@
+<?php if ($title = rss_itemlist_title()) { ?>
+< <h2><?php echo $title; ?></h2>
 <?php if(hidePrivate()) { ?>
-    <p>(<a href="<?php echo getPath(); ?>?mobilelogin&media=mobile">Login</a> to mark items read)</p>
+    <p>(<a href="<?php echo getPath(); ?>?mobilelogin&amp;media=mobile">Login</a> to mark items read)</p>
 <?php } ?>
-<?php if ($title = rss_itemlist_title()) { ?>
-<h2><?php echo $title; ?></h2>
-<form method="POST" style="display: inline;">
+<form method="post" action="<?= getPath(); ?>">
 <?php } rss_itemlist_feeds(); ?>
 <?php if( !isMobileDevice() ) { ?>
-<input type='hidden' name='mobile'>
+<input type='hidden' name='mobile' />
 <?php } ?>
-<input type='submit' value='next'>
+<p id="nextitems"><input type='submit' value='Next  &raquo;&raquo;' /></p>
 </form>
+<?php rss_plugin_hook('rss.plugins.bodyend.media', getThemeMedia()); ?>

branches/multiuser/themes/default/mobile/nav.php

@@ -1 @@
-<div class="navlist">
 <?php 
 $GLOBALS['rss']->nav->appendNavItem(getPath()."?feeds",__('Feeds'));
 $GLOBALS['rss']->nav->appendNavItem(getPath()."?cats",__('Categories'));
-$GLOBALS['rss']->nav->appendNavItem(getPath()."update.php?mobile", __('<span>R</span>efresh'));
+$GLOBALS['rss']->nav->appendNavItem(getPath()."update.php?mobile", __('Refresh'));
+$GLOBALS['rss']->nav->appendNavItem("#top",'TOP of Page');
 
 foreach ($GLOBALS['rss']->nav->items as $item) {
@@ -12 +12 @@
 
 ?>
-</div>

branches/multiuser/themes/default/mobile/navitem.php

@@ -1 @@
-<span<?php echo rss_nav_item_class(); ?>><a href="<?php echo rss_nav_item_href(); ?>"><?php echo rss_nav_item_label(); ?></a></span>
+<?php 
+if (!isset($GLOBALS['__ak__'])) {
+    $GLOBALS['__ak__']=0;
+}
+$ak = ++$GLOBALS['__ak__'];
+?>
+<p><span>[<?= $ak; ?>] </span><a accesskey="<?= $ak; ?>" href="<?php echo rss_nav_item_href(); ?>"><?php echo rss_nav_item_label(); ?></a></p>

branches/multiuser/themes/default/mobile/plugins.php

@@ -18 +18 @@
 function __mobile_truncate_content($i) {
     $ml = rss_theme_config_override_option('rss.output.maxlength',DEFAULT_MOBILE_OUTPUT_MAXLENGTH);
-    $i -> description =  html_substr($i -> description, $ml) ;
+    if ($ml) {
+        $i -> description =  html_substr($i -> description, $ml) ;
+    }
     return $i;
 }
@@ -29 +31 @@
     rss_set_hook('rss.plugins.items.beforerender','__mobile_truncate_content');
 }
-
-
-/*else {
-setProperty('rss.prop.theme.default.mobile','rss.content.strip.images','theme',true) ;
-}*/
 
 function mobileLoginForm() {

branches/multiuser/themes/default/mobile/style.css

@@ -1 @@
-img {  border: 0px; }
-h4,h5 { display:block;margin:0;padding:0 }
-div.mobileform {
-  border: 1px dashed black; 
-  margin: 0 13px 13px 0;
-  display:block;
-}
+body {
+background-color:white;
+padding: 0;
+margin:0;
+font: normal x-small Verdana, Arial, "MS Trebuchet", sans-serif;
+color: #333;
+< input,select,option{font-size:xx-small;}
+< div,p,h4,h5,ul {margin:0;padding:0;}
+< div.item { border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; margin:0.3em 0; padding: 0 ;}
+< div.item.e { background-color: #efefef;}
+< div.item.o { background-color: #f6f6f6;}
+< div.item .content { padding: 1em 4px; }
+< a {color:#d54; text-decoration:none;}
+< img {border: 0px;}
+< h2 {font-size:120%;}