Changeset 1405 for trunk

Timestamp:

03/05/2010 10:50:31 AM (2 years ago)

Author:

Xiping.Wang

Message:

[trunk] merged from omcollab_zhongzhen2

Location:

trunk

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• blogs (modified) (1 prop)
• wiki (modified) (1 prop)
• wiki/extensions/FCKeditor/FCKeditor.body.php (modified) (3 diffs)
• wiki/extensions/Help/HelpExtention.css (modified) (3 diffs)
• wiki/extensions/Help/Help_Guide.php (modified) (2 diffs)
• wiki/extensions/Help/help extention article.txt (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/help extention article.txt)
• wiki/extensions/Help/images/button_background.gif (deleted)
• wiki/extensions/Help/images/button_close.gif (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/images/button_close.gif)
• wiki/extensions/Help/images/button_hide.gif (deleted)

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

@@ -475 +475 @@
                 // Create the editor instance and replace the textarea.
                 oFCKeditor.Height = height ;
+                // Added by zhongzhen - For help extention
+                oFCKeditor.Width = document.getElementById('wpTextbox1').style.width;
                 oFCKeditor.ReplaceTextarea() ;
 
@@ -730 +732 @@
                 showFCKEditor -= RTE_VISIBLE;
                 oEditorIframe.style.display = 'none';
-                FCKtoolbar.style.display = '';
-                SRCtextarea.style.display = '';
+                FCKtoolbar.style.display = 'block'; // fixed by zhongzhen. It must not be ''. It must be 'block'
+                SRCtextarea.style.display = 'block'; // fixed by zhongzhen. It must not be ''. It must be 'block'
         }
         //FCKeditor hidden -> visible
@@ -741 +743 @@
                 oEditorIns.EditingArea.Textarea.value = SRCtextarea.value
                 FCKtoolbar.style.display = 'none';
-                oEditorIframe.style.display = '';
+                oEditorIframe.style.display = 'block'; // fixed by zhongzhen. It must not be ''. It must be 'block'
+                
                 if ( !bIsWysiwyg ) oEditorIns.SwitchEditMode();         //switch to WYSIWYG
                 showFCKEditor += RTE_VISIBLE; // showFCKEditor+=RTE_VISIBLE

trunk/wiki/extensions/Help/HelpExtention.css

@@ -7 +7 @@
 
 #wpTextbox1 {
-    width: 60%;
         float: left;
         clear: none;
+    display: none;
 }
 
@@ -22 +22 @@
 }
 
+#closeButton {
+    width: 15px;
+    height: 15px; 
+    position: absolute;
+    top: -7px;
+    right: -7px;
+    font-size: 11px;
+}
+
 #shadow {
     background-color: #EFEFEF;
     float: right; 
     margin: 5px;
-    width: 30%;
+    width: 280px;
 }
 
@@ -38 +47 @@
 .tab_normal {color: #FFF; cursor: pointer; background-color: #AEAEAE;}
 
-.button_class {float: right; text-align: center; width: 7%;}
+.button_class {float: right; text-align: center; padding-right: 2px; display: none;}
 .help_content {padding: 10px; display: none; color:#444;}
 

trunk/wiki/extensions/Help/Help_Guide.php

@@ -30 +30 @@
         // Add javascript to Edit page
         $wgOut->addHTML("<script>
-                        function changeIcon(obj) {
-                                var source = obj.src;
-                                if (source.search('button_help') > -1) {
-                                        obj.src = 'extensions/Help/images/button_hide.gif';
-                                        $('#shadow').css('display', 'block');
-                                        $('#wpTextbox1').css('width', '60%');
-                                }
-                                else {
-                                        obj.src = 'extensions/Help/images/button_help.gif';
-                                        $('#shadow').css('display', 'none');
-                                        $('#wpTextbox1').css('width', '92%');
-                                }
+            var textwidth = new Number();
+                        function showHelp() {
+                textwidth = $('#editform').width() - $('#shadow').width() - 30;
+                $('.button_class').css('display', 'none');
+                                $('#shadow').css('display', 'block');
+                                $('#wpTextbox1').css('width', textwidth.toString() + 'px');
+                $('#wpTextbox1___Frame').css('width', textwidth.toString() + 'px');
                         }
+            
+            function hideHelp() {
+                textwidth = $('#editform').width() - $('.button_class').width() - 30;
+                $('.button_class').css('display', 'block');
+                $('#shadow').css('display', 'none');
+                $('#wpTextbox1').css('width', textwidth.toString() + 'px');
+                $('#wpTextbox1___Frame').css('width', textwidth.toString() + 'px');
+            }
+            
+            $(window).resize(function() {
+                if ($('#shadow').css('display') == 'block')
+                    textwidth = $('#editform').width() - $('#shadow').width() - 30;
+                else
+                    textwidth = $('#editform').width() - $('.button_class').width() - 30;
+                $('#wpTextbox1').css('width', textwidth.toString() + 'px');
+                $('#wpTextbox1___Frame').css('width', textwidth.toString() + 'px');
+            });
+            
+            $(function() {
+                textwidth = $('#editform').width() - $('#shadow').width() - 30;
+                $('#wpTextbox1').css('display', 'block');
+                $('#wpTextbox1').css('width', textwidth.toString() + 'px');
+                $('#wpTextbox1___Frame').css('width', textwidth.toString() + 'px');
+            });
+
         </script>");
         
@@ -78 +98 @@
         
         //Help content area
-        $editPage->editFormTextBeforeContent .= '<div id="shadow"><div id="helpArea">' . $html . '</div></div>'; 
+        $editPage->editFormTextBeforeContent .= '<div id="shadow"><div id="helpArea">
+        <div id="closeButton"><img src="extensions/Help/images/button_close.gif" style="cursor: pointer; border: 0;" onclick="hideHelp()"/></div>' . $html . '</div></div>'; 
         // Help button
-        $editPage->editFormTextBeforeContent .= '<div class="button_class"><img src="extensions/Help/images/button_hide.gif" style="cursor: pointer;" onclick="changeIcon(this)"/></div>'; 
-
+        $editPage->editFormTextBeforeContent .= '<div class="button_class"><img src="extensions/Help/images/button_help.gif" style="cursor: pointer;" onclick="showHelp()"/></div>'; 
         return true;
 }