Changeset 1784 for trunk

Timestamp:

08/15/2010 11:13:22 AM (22 months ago)

Author:

Xiping.Wang

Message:

[trunk]merge Zz's code

Location:

trunk

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• blogs (modified) (1 prop)
• blogs/wp-content/themes/mike2 (modified) (1 prop)
• bookmarks/manage.php (modified) (1 diff)
• common/skins/mike2/common.css (modified) (4 diffs)
• home (modified) (1 prop)
• home/mylinks.php (modified) (1 prop)
• home/portlets/PortletsClass.php (modified) (3 diffs)
• w (modified) (1 prop)

trunk/bookmarks/manage.php

@@ -27 +27 @@
 
 // Sidebar
-$aTemplateVariables['sidebar_blocks'] = array( 'profile', 'common', 'partners' );
-
+$aTemplateVariables['sidebar_blocks'] = array( 'profile', 'subscribe', 'common', 'partners' ); // Changed by zhongzhen on 2010-08-15. Added "subscribe" into sidebar
+$aTemplateVariables['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated'); // Added by zhongzhen on 2010-08-15
 $oTemplateService->loadTemplate('managebookmark.tpl', $aTemplateVariables);
-
 ?>

trunk/common/skins/mike2/common.css

@@ -37 +37 @@
 .top-link-wrapper ul li span {display: block; padding: 0px 10px; color: white; text-decoration: none;}
 .top-link-wrapper a {color: white; text-decoration: none;}
+.top-link-wrapper a:hover {text-decoration: underline;}
 .login { width: 60px; text-align: center; background-color: #c28d4c; font-weight: bold; }
 .linkover {background-color: #2d5779;}
@@ -82 +83 @@
 .home-wrapper-left {float: left; width: 775px;}
 .home-wrapper-right {float: right; width: 191px; margin-top: 5px;}
-.banner-wrapper {float: left; padding-top: 7px; padding-left: 4px; width: 594px; position: relative;}
+.banner-wrapper {float: left; padding-top: 7px; padding-left: 4px; width: 590px; position: relative;}
 .banner-wrapper .button-wrapper {position: relative; height: 40px; z-index: 101;}
 .banner-wrapper .arrow {position: absolute; width: 26px; height: 10px; background: url(images/arrow.png); top: 49px; left: 50px; z-index: 101; overflow: hidden;}
@@ -258 +259 @@
 .contributor-about {color: #999999; line-height: 14px;}
 .top-contributors-td {line-height: 14px; font-size: 10px; text-align: center;}
-.top-contributors-td a {color: #666666 !important;}
+.top-contributors-td a {color: #666666 !important; display: block; width: 50px; word-wrap: break-word;}
 
 .portlet1 {clear: both; margin-bottom:10px; z-index: 100; position: relative; width: 178px;}
@@ -312 +313 @@
 .skill-portlet .middle {background: url(images/skill-portlet-middle.png) repeat-y; width: 191px;}
 .skill-portlet .middle .content {background: url(images/skill-portlet-content.jpg) no-repeat; background-position: left bottom; margin: 0px 4px; overflow: hidden;}
-.skill-portlet .middle .content .title {color: #66acdc; font-size: 16px; font-weight: bold; text-align: center;}
+.skill-portlet .middle .content .title {color: #66acdc; font-size: 16px; font-weight: bold; text-align: center; padding: 0px 5px;}
 .skill-portlet .middle .content .skills {margin: 0px 6px;}
 .skill-portlet .middle .content .skills .button {text-align: center; margin-top: 20px;}

trunk/home/portlets/PortletsClass.php

@@ -63 +63 @@
         $sql = "SELECT DISTINCT page_title AS title, page_namespace AS namespace, rc_user_text AS user, rc_timestamp AS timestamp FROM " . $sPageTable . " INNER JOIN " . $sRecentChangesTable . " ON page_id=rc_cur_id WHERE rc_new=1 AND rc_namespace=0 AND page_is_redirect=0 AND page_id!=1 ORDER by rc_id DESC LIMIT " . $count;
         $result = $this->oDb->GetRows( $sql ); 
-        
         $html = "";
         if( ! empty( $result ) ){
@@ -77 +76 @@
         $d = substr($strTime, 6, 2);
         $y = substr($strTime, 0, 4);
-        return date("F j, Y", mktime(0, 0, 0, $m, $d, $year)); 
+        return date("F j, Y", mktime(0, 0, 0, $m, $d, $y)); 
     }
 }
@@ -1355 +1354 @@
                 $sResultHtml .= '</tr><tr>';
             if ($contributors[$i]['rev_user_text'] != '' && $contributors[$i]['rev_user'] != '0')
-                $sResultHtml .= '<td width="33%" valign="top" class="top-contributors-td"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php/User:' . $contributors[$i]['rev_user_text'] . '"><img src="' . GetAvatar( $contributors[$i]['rev_user'], 'ml' ) . '"/></a><br><a href="' . OMWIKI_SCRIPT_PATH . '/index.php/User:' . $contributors[$i]['rev_user_text'] . '">' . $contributors[$i]['rev_user_text'] . '</a></td>';
+                $sResultHtml .= '<td width="33%" valign="top" class="top-contributors-td"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php/User:' . $contributors[$i]['rev_user_text'] . '"><img src="' . GetAvatar( $contributors[$i]['rev_user'], 'ml' ) . '"/></a><a href="' . OMWIKI_SCRIPT_PATH . '/index.php/User:' . $contributors[$i]['rev_user_text'] . '">' . $contributors[$i]['rev_user_text'] . '</a></td>';
             else
                 $sResultHtml .= '<td width="33%"></td>';