Changeset 1418

Timestamp:

03/11/2010 07:28:48 AM (2 years ago)

Author:

Xiping.Wang

Message:

[trunk] merged omcollab_zhongzhen2 to r1417, fix #235,#259,#265

Location:

trunk

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• _InstallationResources/omwiki.sql (modified) (1 diff)
• blogs (modified) (1 prop)
• bookmarks/api/posts_public.php (modified) (1 diff)
• wiki (modified) (1 prop)
• wiki/extensions/FCKeditor/FCKeditor.body.php (modified) (1 diff)
• wiki/extensions/Help/HelpExtention.css (modified) (1 diff)
• wiki/extensions/Help/Help_Guide.php (modified) (1 diff)

trunk/_InstallationResources/omwiki.sql

@@ -2099 +2099 @@
    WHERE `user_id` in (0,1) and `portlet_name`='team';
 
+-- Change portlet title by Zhongzhen
+UPDATE `{omcollab_db_table_prefix}omcollab_portlets`
+   SET `title` = 'Featured Contributor'
+  WHERE `name`='contributor';

trunk/bookmarks/api/posts_public.php

@@ -172 +172 @@
                 $rating         = $ratingservice->GetBookmarkRating( md5($row['bAddress']) );
                 $ratedstarwidth = 10 * $rating;
+                
+                // Fixed by zhongzhen - 'margin-top: -10px' must be removed in below code line.
                 $ratingstars    = '<span style="background:transparent url(' . RR_COMMON_SKIN_DIRECTORY . '/images/stars-10x10.gif) repeat scroll left top;'
-                                .              'width:50px; float:right; height:10px; position:relative; margin-top:-10px; margin-right:13px;">'
+                                .              'width:50px; float:right; height:10px; position:relative; margin-right:13px;">'
                                 . '<div  style="background:transparent url(' . RR_COMMON_SKIN_DIRECTORY . '/images/stars-10x10.gif) repeat scroll left bottom; '
                                 .              'overflow:hidden; width: ' . $ratedstarwidth . 'px;">'

trunk/wiki/extensions/FCKeditor/FCKeditor.body.php

@@ -703 +703 @@
                                 oFCKeditor.ready = true;
                         }
+                        
+                        // Added by zhongzhen - 2010.3.11
+                        document.getElementById("wpTextbox1___Frame").style.display = "block";
                 });
                 return true;

trunk/wiki/extensions/Help/HelpExtention.css

@@ -21 +21 @@
     font-size: 11px;
 }
+
+#wpTextbox1___Frame {display: none;}
 
 #closeButton {

trunk/wiki/extensions/Help/Help_Guide.php

@@ -58 +58 @@
             $(function() {
                 textwidth = $('#editform').width() - $('#shadow').width() - 30;
-                $('#wpTextbox1').css('display', 'block');
                 $('#wpTextbox1').css('width', textwidth.toString() + 'px');
                 $('#wpTextbox1___Frame').css('width', textwidth.toString() + 'px');
+                var linktext = $('#toggle_wpTextbox1').html(); 
+                if (linktext.search('Disable') > -1)
+                    $('#wpTextbox1___Frame').css('display', 'block');
+                else
+                    $('#wpTextbox1').css('display', 'block');
             });