Changeset 1400 for trunk

Timestamp:

03/04/2010 07:35:43 PM (2 years ago)

Author:

Xiping.Wang

Message:

[trunk] #153, merge help extension from zhongzhen's branch

Location:

trunk

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• _InstallationResources/common-blue.css (modified) (1 diff)
• _InstallationResources/common-green.css (modified) (1 diff)
• blogs (modified) (1 prop)
• wiki (modified) (1 prop)
• wiki/LocalSettings.php (modified) (1 diff)
• wiki/extensions/Help (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help)
• wiki/extensions/Help/HelpExtention.css (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/HelpExtention.css)
• wiki/extensions/Help/Help_Guide.php (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/Help_Guide.php)
• wiki/extensions/Help/Installation.txt (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/Installation.txt)
• wiki/extensions/Help/images (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/images)
• wiki/extensions/Help/images/button_background.gif (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/images/button_background.gif)
• wiki/extensions/Help/images/button_help.gif (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/images/button_help.gif)
• wiki/extensions/Help/images/button_hide.gif (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/images/button_hide.gif)
• wiki/extensions/Help/jquery.js (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/jquery.js)
• wiki/extensions/Help/tabmenu.js (copied) (copied from branches/omcollab_zhongzhen2/wiki/extensions/Help/tabmenu.js)
• wiki/extensions/SelectCategoryTagCloud/SelectCategoryTagCloud.css (modified) (2 diffs)

trunk/_InstallationResources/common-blue.css

@@ -88 +88 @@
 input, textarea, select {
     background: white;
-    border: 1px solid #385D8A;
+    border: 1px solid #888888;
 }
 
 textarea {
-    padding: 5px;
+    padding: 5px 0px 5px 5px;
 }
 

trunk/_InstallationResources/common-green.css

@@ -87 +87 @@
 input, textarea, select {
     background: white;
-    border: 1px solid #666666;
+    border: 1px solid #888888;
 }
 
 textarea {
-    padding: 5px;
+    padding: 5px 0px 5px 5px;
 }
 

trunk/wiki/LocalSettings.php

@@ -315 +315 @@
 // Replace svg convert from ImageMagick to librsvg
 // $wgSVGConverter = 'rsvg';
+
+// Zhongzhen 2010-03-04
+// Add help extention in edit page
+require_once("$IP/extensions/Help/Help_Guide.php");
+$wgHelpExtentionTitle = "Contribution_Guide"; // this is used in Help Extention

trunk/wiki/extensions/SelectCategoryTagCloud/SelectCategoryTagCloud.css

@@ -19 +19 @@
         float : none;
         visibility: hidden;
-        position: absolute;
         color: #17375E;
         background-color: white;
@@ -42 +41 @@
         /*Category Select Master DIV*/
         #categoryselectmaster {
-        border: 1px solid #17375E;
+        border: 1px solid #888888;
         background-color: #e9e9e9;
         max-height: 550px;