Changeset 1897 for trunk

Timestamp:

03/21/2011 01:22:00 PM (14 months ago)

Author:

Xiping.Wang

Message:

[trunk]Fix article portlet's with style support

Location:

trunk

Files:

• common/skins/mike2/common.css (modified) (1 diff)
• home/portlets/PortletsClass.php (modified) (1 diff)

trunk/common/skins/mike2/common.css

@@ -281 +281 @@
 .portlet_ .portletContent p {margin: 0px;}
 
+#article>.portletContent ul { list-style-type: disc !important; list-style-position:inside; margin:5px;}
+#article>.portletContent li {list-style-position: inside; padding-left: 15px;}
+#article>.portletContent p {line-height:1.4em;margin: 10px 0;}
+
 .portlet2 {clear: both; margin-bottom:10px; z-index: 100; width: 191px; overflow: hidden;}
 .portlet2 .portletHeader {color:#FFF; overflow:hidden; height:34px; background-color: #40648F; background: url(images/portlet2-title.png) no-repeat;}

trunk/home/portlets/PortletsClass.php

@@ -32 +32 @@
         $this->title = $title;
         //Load Wiki Page
-        $this->content =strip_tags(loadWikiMainPage($title,$length), '<a><b><strong><big><i><br>');
+        $this->content =strip_tags(loadWikiMainPage($title,$length), '<a><b><strong><big><i><br><ul><li><p>');
         $this->introduction = $introduction; 
     }