merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -0,0 +1,11 @@
<!--%import("mcontent.css")-->
<!--%unload("../../../../common/css/default.css")-->
<!--%unload("../../../../common/css/button.css")-->
<!--@if($widget_info->list_type == "image_title")-->
<!--#include("./image_title.html")-->
<!--@elseif($widget_info->list_type == "image_title_content")-->
<!--#include("./image_title_content.html")-->
<!--@else-->
<!--#include("./normal.html")-->
<!--@end-->