diff --git a/WebContent/birt/ajax/ui/dialog/BirtSimpleExportDataDialog.js b/WebContent/birt/ajax/ui/dialog/BirtSimpleExportDataDialog.js
index 5395499..ccc97d1 100644
--- a/WebContent/birt/ajax/ui/dialog/BirtSimpleExportDataDialog.js
+++ b/WebContent/birt/ajax/ui/dialog/BirtSimpleExportDataDialog.js
@@ -1,13 +1,3 @@
-/******************************************************************************
- *	Copyright (c) 2004 Actuate Corporation and others.
- *	All rights reserved. This program and the accompanying materials 
- *	are made available under the terms of the Eclipse Public License v1.0
- *	which accompanies this distribution, and is available at
- *		http://www.eclipse.org/legal/epl-v10.html
- *	
- *	Contributors:
- *		Actuate Corporation - Initial implementation.
- *****************************************************************************/
  
 /**
  *	Birt export data dialog.
@@ -55,11 +45,15 @@ BirtSimpleExportDataDialog.prototype = Object.extend( new AbstractBaseDialog( ),
 		
 		// Initialize exchange buttons
 		var oInputs = this.__instance.getElementsByTagName( 'input' );
-		for ( var i = 0; i < oInputs.length ; i++ )
-		{
+		for ( var i = 0; i < oInputs.length ; i++ ) {
 			Event.observe( oInputs[i], 'click', this.__neh_click_exchange_closure, false );
 		}
 		
+		var oButtons = this.__instance.getElementsByTagName('button');
+		for(var i = 0; i < oButtons.length; i ++) {
+			Event.observe(oButtons[i], 'click', this.__neh_click_exchange_closure, false );
+		}
+		
 		// Initialize exchange selects
 		var oSelects = this.__instance.getElementsByTagName( 'select' );
 		if( oSelects.length > 2 )
@@ -76,23 +70,21 @@ BirtSimpleExportDataDialog.prototype = Object.extend( new AbstractBaseDialog( ),
 	 */
 	__neh_click_exchange : function( event )
 	{	
-		var oSC = Event.element( event );
-		if( oSC.id == 'exportDataEncoding_other' )
-		{
+		var oSC = Event.element(event);
+		if(oSC.id == 'exportDataEncoding_other' ) {
 			this.__updateButtons( );
-			$( 'exportDataOtherEncoding_input' ).focus( );
+			$('exportDataOtherEncoding_input').focus( );
 		}
-		else
-		{	
+		else {	
 			var oInputs = this.__instance.getElementsByTagName( 'input' );
 			var oSelects = this.__instance.getElementsByTagName( 'select' );
-			
-			switch ( Event.element( event ).name )
-			{
-				case 'Addall':
-				{
-					if ( oSelects[1].options.length  > 0 )
-					{
+			//	如果是子节点
+			if(oSC.hasClassName('glyphicon')) {
+				oSC = oSC.parentElement;
+			}
+			switch (oSC.name) {
+				case 'Addall': {
+					if ( oSelects[1].options.length  > 0 ) {
 						this.moveAllItems( oSelects[1], oSelects[2] );
 					}
 					break;
@@ -195,52 +187,13 @@ BirtSimpleExportDataDialog.prototype = Object.extend( new AbstractBaseDialog( ),
 		var srcSelectedIndex = oSelects[1].selectedIndex;
 		var destSelectedIndex = oSelects[2].selectedIndex;
 
-		var oInputs = this.__instance.getElementsByTagName( 'input' );
+		var oInputs = this.__instance.getElementsByTagName('button');
 		
-		if( !rtl )
-		{
-			oInputs[0].src = canAdd ? "birt/images/AddAll.gif" : "birt/images/AddAll_disabled.gif";
-		}
-		else
-		{
-			oInputs[0].src = canAdd ? "birt/images/AddAll_rtl.gif" : "birt/images/AddAll_disabled_rtl.gif";
-		}
 		oInputs[0].style.cursor = canAdd ? "pointer" : "default";
-		
-		if( !rtl )
-		{
-			oInputs[1].src = canAdd && srcSelectedIndex >= 0 ? "birt/images/Add.gif" : "birt/images/Add_disabled.gif";
-		}
-		else
-		{
-			oInputs[1].src = canAdd && srcSelectedIndex >= 0 ? "birt/images/Add_rtl.gif" : "birt/images/Add_disabled_rtl.gif";
-		}	
 		oInputs[1].style.cursor = canAdd ? "pointer" : "default";
-		
-		if( !rtl )
-		{ 
-			oInputs[2].src = canRemove && destSelectedIndex >= 0 ? "birt/images/Remove.gif" : "birt/images/Remove_disabled.gif";
-		}
-		else
-		{
-			oInputs[2].src = canRemove && destSelectedIndex >= 0 ? "birt/images/Remove_rtl.gif" : "birt/images/Remove_disabled_rtl.gif";
-		}	
 		oInputs[2].style.cursor = canRemove ? "pointer" : "default";
-
-		if( !rtl )
-		{
-			oInputs[3].src = canRemove ? "birt/images/RemoveAll.gif" : "birt/images/RemoveAll_disabled.gif";
-		}
-		else
-		{
-			oInputs[3].src = canRemove ? "birt/images/RemoveAll_rtl.gif" : "birt/images/RemoveAll_disabled_rtl.gif";
-		}
 		oInputs[3].style.cursor = canRemove ? "pointer" : "default";
-
-		oInputs[4].src = canRemove && destSelectedIndex >= 0 ? "birt/images/Up.gif" : "birt/images/Up_disabled.gif";
 		oInputs[4].style.cursor = canRemove ? "pointer" : "default";
-
-		oInputs[5].src = canRemove && destSelectedIndex >= 0 ? "birt/images/Down.gif" : "birt/images/Down_disabled.gif";
 		oInputs[5].style.cursor = canRemove ? "pointer" : "default";
 		
 		if( canExport )
@@ -261,7 +214,7 @@ BirtSimpleExportDataDialog.prototype = Object.extend( new AbstractBaseDialog( ),
 		}
 		else
 		{
-			this.__setDisabled( 'exportDataEncodingSetting', true );
+			this.__setDisabled('exportDataEncodingSetting', true );
 			$( 'exportDataCSVSeparator' ).disabled = true;
 		}
 	},
diff --git a/WebContent/birt/pages/dialog/ExportDataDialogFragment.jsp b/WebContent/birt/pages/dialog/ExportDataDialogFragment.jsp
index 889d7cd..b71108a 100644
--- a/WebContent/birt/pages/dialog/ExportDataDialogFragment.jsp
+++ b/WebContent/birt/pages/dialog/ExportDataDialogFragment.jsp
@@ -1,116 +1,15 @@
-<%-----------------------------------------------------------------------------
-	Copyright (c) 2004 Actuate Corporation and others.
-	All rights reserved. This program and the accompanying materials 
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-		Actuate Corporation - Initial implementation.
------------------------------------------------------------------------------%>
 <%@ page contentType="text/html; charset=utf-8" %>
 <%@ page session="false" buffer="none" %>
 <%@ page import="org.eclipse.birt.report.presentation.aggregation.IFragment,
 				 org.eclipse.birt.report.resource.BirtResources" %>
-
-<%-----------------------------------------------------------------------------
-	Expected java beans
------------------------------------------------------------------------------%>
 <jsp:useBean id="fragment" type="org.eclipse.birt.report.presentation.aggregation.IFragment" scope="request" />
-
-<%-----------------------------------------------------------------------------
-	Export data dialog fragment
------------------------------------------------------------------------------%>
-<DIV ID="dialog_content">
-	<TABLE CELLSPACING="0" CELLPADDING="0" STYLE="width:100%">
-		<TR>
-			<TD>
-				<TABLE ID="tabs" CELLSPACING="0" CELLPADDING="2">
-					<TR HEIGHT="20px">
-						<TD CLASS="birtviewer_dialog_tab_selected" NOWRAP>
-							<%= 
-								BirtResources.getMessage( "birt.viewer.dialog.exportdata.tab.field" )
-							%>
-						</TD>
-						<TD CLASS="birtviewer_dialog_tab_normal">
-							<%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.tab.filter" )%>
-						</TD>
-					</TR>
-				</TABLE>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-				<DIV ID="aaacontent">
-					<DIV >
-						<TABLE CELLSPACING="2" CELLPADDING="2" CLASS="birtviewer_dialog_body">
-							<TR HEIGHT="5px"><TD></TD></TR>
-							<TR>
-								<TD>
-									<%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.availablecolumn" )%>
-								</TD>
-								<TD></TD>
-								<TD>
-									<%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.selectedcolumn" )%>
-								</TD>
-							</TR>
-							<TR>
-								<TD VALIGN="top">
-									<TABLE>
-										<TR><TD>
-											<SELECT ID="availableColumnSelect" SIZE="10" CLASS="birtviewer_exportdata_dialog_select">
-											</SELECT>
-										</TD></TR>
-									</TABLE>
-								</TD>
-								<TD VALIGN="top">
-									<TABLE HEIGHT="100%">
-										<TR><TD>&nbsp;</TD></TR>
-										<TR><TD>
-											<TABLE VALIGN="top">
-												<TR><TD>
-													<INPUT TYPE="button" VALUE=">>" CLASS="birtviewer_exportdata_dialog_button">
-												</TD></TR>
-												<TR><TD>
-													<INPUT TYPE="button" VALUE=">" CLASS="birtviewer_exportdata_dialog_button">
-												</TD></TR>
-												<TR><TD>
-													<INPUT TYPE="button" VALUE="<" CLASS="birtviewer_exportdata_dialog_button">
-												</TD></TR>
-												<TR><TD>
-													<INPUT TYPE="button" VALUE="<<" CLASS="birtviewer_exportdata_dialog_button">
-												</TD></TR>
-											</TABLE>
-										</TD></TR>
-									</TABLE>
-								</TD>
-								<TD>
-									<TABLE>
-										<TR><TD>
-											<SELECT ID="selectedColumnSelect" SIZE="10" CLASS="birtviewer_exportdata_dialog_select">
-											</SELECT>
-										</TD></TR>
-									</TABLE>
-								</TD>
-							</TR>
-							<TR HEIGHT="5px"><TD></TD></TR>
-							<TR>
-								<TD COLSPAN="3" STYLE="font-size:7pt">
-									<%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.format" )%>
-								</TD>
-							</TR>
-							<TR HEIGHT="5px"><TD></TD></TR>
-						</TABLE>
-					</DIV>
-					<DIV STYLE="display:none">
-						<IMG NAME="add" SRC="birt/images/AddFilter.gif" TITLE="add" CLASS="birtviewer_clickable">
-						<TABLE ID="ExportCriteriaTable" CELLSPACING="2" CELLPADDING="2" CLASS="birtviewer_dialog_body">
-							<TBODY ID="ExportCriteriaTBODY">
-							</TBODY> 
-						</TABLE>
-					</DIV>
-				</DIV>
-			</TD>
-		</TR>
-	</TABLE>
-</DIV>
\ No newline at end of file
+<div class="row">
+	<div class="col-sm-10 col-sm-offset-1" id="dialog_content">
+		<div class="form-horizontal">
+			
+			
+			
+		
+		</div>
+	</div>
+</div>	
\ No newline at end of file
diff --git a/WebContent/birt/pages/dialog/ExportReportDialogFragment.jsp b/WebContent/birt/pages/dialog/ExportReportDialogFragment.jsp
index 67d409d..a079099 100644
--- a/WebContent/birt/pages/dialog/ExportReportDialogFragment.jsp
+++ b/WebContent/birt/pages/dialog/ExportReportDialogFragment.jsp
@@ -31,16 +31,16 @@
 		  	<div class="form-group">
 		  		<label for="exportFormat" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.page")%></label>
 			    <div class="col-sm-8" id="exportPageSetting">
-					<label class="checkbox-inline">
-						<input type="checkbox" id="exportPageAll" name="exportPages" checked>
+					<label class="radio-inline">
+						<input type="radio" id="exportPageAll" name="exportPages" checked>
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.page.all")%>
 					</label>
-					<label class="checkbox-inline">
-						<input type="checkbox" id="exportPageCurrent" name="exportPages">
+					<label class="radio-inline">
+						<input type="radio" id="exportPageCurrent" name="exportPages">
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.page.current")%>
 					</label>
-					<label class="checkbox-inline" style="display:none;">
-						<input type="checkbox" id="exportPageRange" name="exportPages">
+					<label class="radio-inline" style="display:none;">
+						<input type="radio" id="exportPageRange" name="exportPages">
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.page.range")%>
 						<input type="text" id="exportPageRange_input" class="form-control" style="display:inline-block;width:150px;" name="exportPages" disabled="disabled">
 					</label>
@@ -50,16 +50,16 @@
 		  	<div class="form-group" id="exportFitSetting">
 		  		<label for="exportFormat" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.export.pdf.fitto")%></label>
 			    <div class="col-sm-8">
-					<label class="checkbox-inline">
-						<input type="checkbox" id="exportFitToAuto" name="exportFit" checked>
+					<label class="radio-inline">
+						<input type="radio" id="exportFitToAuto" name="exportFit" checked>
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.export.pdf.fittoauto")%>
 					</label>
-					<label class="checkbox-inline">
-						<input type="checkbox" id="exportFitToActual" name="exportFit">
+					<label class="radio-inline">
+						<input type="radio" id="exportFitToActual" name="exportFit">
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.export.pdf.fittoactual")%>
 					</label>
-					<label class="checkbox-inline">
-						<input type="checkbox" id="exportFitToWhole" name="exportFit">
+					<label class="radio-inline">
+						<input type="radio" id="exportFitToWhole" name="exportFit">
 						<%=BirtResources.getHtmlMessage("birt.viewer.dialog.export.pdf.fittowhole")%>
 					</label>
 				</div>
diff --git a/WebContent/birt/pages/dialog/PrintReportDialogFragment.jsp b/WebContent/birt/pages/dialog/PrintReportDialogFragment.jsp
index 0401ab4..e95ffcb 100644
--- a/WebContent/birt/pages/dialog/PrintReportDialogFragment.jsp
+++ b/WebContent/birt/pages/dialog/PrintReportDialogFragment.jsp
@@ -2,70 +2,49 @@
 <%@ page session="false" buffer="none"%>
 <%@ page import="org.eclipse.birt.report.presentation.aggregation.IFragment,
 				 org.eclipse.birt.report.resource.BirtResources"%>
-
-<%-----------------------------------------------------------------------------
-	Expected java beans
------------------------------------------------------------------------------%>
 <jsp:useBean id="fragment" type="org.eclipse.birt.report.presentation.aggregation.IFragment" scope="request" />
 
-<%-----------------------------------------------------------------------------
-	Print report dialog fragment
------------------------------------------------------------------------------%>
-<TABLE CELLSPACING="2" CELLPADDING="2" CLASS="birtviewer_dialog_body">
-	<TR HEIGHT="5px"><TD></TD></TR>
-	<TR>
-		<TD>
-			<DIV ID="printFormatSetting">
-				<DIV><label for="printAsHTML"><%=BirtResources.getMessage( "birt.viewer.dialog.print.format" )%></label></DIV>
-				<br/>
-				<DIV>
-					<INPUT TYPE="radio" ID="printAsHTML" name="printFormat" CHECKED />
-					<label for="printAsHTML"><%=BirtResources.getMessage( "birt.viewer.dialog.print.format.html" )%></label>
-				</DIV>
-				<DIV>
-					<INPUT TYPE="radio" ID="printAsPDF" name="printFormat" />
-					<label for="printAsPDF"><%=BirtResources.getMessage( "birt.viewer.dialog.print.format.pdf" )%></label>
-				&nbsp;&nbsp;
-				<SELECT	ID="printFitSetting" CLASS="birtviewer_printreport_dialog_select" DISABLED="true">
-					<option value="0" selected><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittoauto" )%></option>
-					<option value="1"><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittoactual" )%></option>
-					<option value="2"><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittowhole" )%></option>
-				</SELECT>
-				</DIV>
-			</DIV>
-		</TD>
-	</TR>
-	<TR HEIGHT="5px"><TD><HR/></TD></TR>
-	<TR>
-		<TD>
-			<DIV ID="printPageSetting">
-				<TABLE>
-					<TR>
-						<TD>
-						<label for="exportPages"><%=BirtResources.getMessage( "birt.viewer.dialog.page" )%></label>
-						</TD>
-					</TR>
-					<TR>
-						<TD>
-							<INPUT TYPE="radio" ID="printPageAll" NAME="printPages" CHECKED/>
-							<label for="printPageAll"><%=BirtResources.getMessage( "birt.viewer.dialog.page.all" )%></label>
-						</TD>
-						<TD STYLE="padding-left:5px">	
-							<INPUT TYPE="radio" ID="printPageCurrent" NAME="printPages"/>
-							<label for="printPageCurrent"><%=BirtResources.getMessage( "birt.viewer.dialog.page.current" )%></label>
-						</TD>	
-						<TD STYLE="padding-left:5px">
-							<INPUT TYPE="radio" ID="printPageRange" NAME="printPages"/>
-							<label for="printPageRange"><%=BirtResources.getMessage( "birt.viewer.dialog.page.range" )%></label>
-							<INPUT TYPE="text" CLASS="birtviewer_printreport_dialog_input" ID="printPageRange_input" DISABLED="true"/>
-						</TD>
-					</TR>		
-				</TABLE>
-			</DIV>
-		</TD>
-	</TR>
-	<TR>
-		<TD>&nbsp;&nbsp;<%=BirtResources.getMessage( "birt.viewer.dialog.page.range.description" )%></TD>
-	</TR>
-	<TR HEIGHT="5px"><TD></TD></TR>
-</TABLE>
+
+<div class="row">
+	<div class="col-sm-10 col-sm-offset-1">
+		<div class="form-horizontal">
+				<div class="form-group" id="printFormatSetting">
+					<label for="printAsHTML" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.print.format")%></label>
+				    <div class="col-sm-8">
+						<div class="radio">
+							<label> 
+								<input type="radio" name="printFormat" id="printAsHTML" checked>
+								<%=BirtResources.getMessage("birt.viewer.dialog.print.format.html")%>
+							</label>
+						</div>
+						<div>
+							<label> 
+								<input type="radio" name="printFormat" id="printAsPDF">
+								<%=BirtResources.getMessage("birt.viewer.dialog.print.format.pdf")%>
+							</label>
+							<SELECT	ID="printFitSetting" CLASS="form-control" DISABLED="true" style="display:inline-block;width:auto;">
+								<option value="0" selected><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittoauto" )%></option>
+								<option value="1"><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittoactual" )%></option>
+								<option value="2"><%=BirtResources.getMessage( "birt.viewer.dialog.export.pdf.fittowhole" )%></option>
+							</SELECT>
+						</div>
+					</div>
+				</div>
+			
+				<div class="form-group" id="printPageSetting">
+					<label for="exportPages" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.page")%></label>
+				    <div class="col-sm-8">
+				    	<label class="radio-inline">
+							<input type="radio" name="printPages" id="printPageAll" checked>
+							<%=BirtResources.getMessage("birt.viewer.dialog.page.all")%>
+						</label>
+						<label class="radio-inline">
+							<input type="radio" name="printPages" id="printPageCurrent">
+							<%=BirtResources.getMessage("birt.viewer.dialog.page.current")%>
+						</label>
+						<INPUT TYPE="hidden" CLASS="birtviewer_printreport_dialog_input" ID="printPageRange_input" DISABLED="true"/>
+					</div>
+				</div>				
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebContent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp b/WebContent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp
index 41047f1..044357b 100644
--- a/WebContent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp
+++ b/WebContent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp
@@ -1,13 +1,3 @@
-<%-----------------------------------------------------------------------------
-	Copyright (c) 2004 Actuate Corporation and others.
-	All rights reserved. This program and the accompanying materials 
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-		Actuate Corporation - Initial implementation.
------------------------------------------------------------------------------%>
 <%@ page contentType="text/html; charset=utf-8" %>
 <%@ page session="false" buffer="none" %>
 <%@ page import="org.eclipse.birt.report.presentation.aggregation.IFragment,
@@ -15,259 +5,156 @@
 				 org.eclipse.birt.report.context.BaseAttributeBean,
 				 org.eclipse.birt.report.engine.api.DataExtractionFormatInfo,
 				 org.eclipse.birt.report.resource.BirtResources" %>
-
-<%-----------------------------------------------------------------------------
-	Expected java beans
------------------------------------------------------------------------------%>
 <jsp:useBean id="fragment" type="org.eclipse.birt.report.presentation.aggregation.IFragment" scope="request" />
 <jsp:useBean id="attributeBean" type="org.eclipse.birt.report.context.BaseAttributeBean" scope="request" />
 
 <%
 	DataExtractionFormatInfo[] dataExtractInfos = ParameterAccessor.supportedDataExtractions;
 %>
-<%-----------------------------------------------------------------------------
-	Export data dialog fragment
------------------------------------------------------------------------------%>
-<TABLE ID="simpleExportDialogBody" CELLSPACING="2" CELLPADDING="2" CLASS="birtviewer_dialog_body">
-	<TR HEIGHT="5px"><TD></TD></TR>
-	<TR>
-		<TD>
-			<LABEL FOR="resultsets"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.resultsets" )%>
-			</LABEL>
-		</TD>
-	</TR>
-	<TR>
-		<TD COLSPAN="4">
-			<SELECT ID="resultsets" CLASS="birtviewer_exportdata_dialog_single_select">
-			</SELECT>
-		</TD>
-	</TR>
-	<TR HEIGHT="5px"><TD></TD></TR>
-	<TR>
-		<TD VALIGN="top">
-			<TABLE STYLE="font-size:8pt;">
-				<TR><TD>
-					<LABEL FOR="availableColumnSelect"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.availablecolumn" )%></LABEL>
-				</TD></TR>
-				<TR><TD>
-					<SELECT ID="availableColumnSelect" MULTIPLE="true" SIZE="10" CLASS="birtviewer_exportdata_dialog_select">
-					</SELECT>
-				</TD></TR>
-			</TABLE>
-		</TD>
-		<TD VALIGN="middle">
-			<TABLE HEIGHT="100%">
-				<TR>
-					<TD>
-						<TABLE VALIGN="middle">
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Addall" 
-									<%
-									if( !attributeBean.isRtl())
-									{
-									%>
-									SRC="birt/images/AddAll.gif"
-									<%
-									}
-									else
-									{
-									%>
-									SRC="birt/images/AddAll_rtl.gif"
-									<%
-									}
-									%>		
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.addall" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.addall" )%>" 
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>
-							<TR height="2px"><TD></TD></TR>
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Add"
-									<%
-									if( !attributeBean.isRtl())
-									{
-									%>
-									SRC="birt/images/Add.gif"
-									<%
-									}
-									else
-									{
-									%>
-									SRC="birt/images/Add_rtl.gif"
-									<%
-									}
-									%>									 
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.add" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.add" )%>" 								
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>
-							<TR height="2px"><TD></TD></TR>
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Remove"
-									<%
-									if( !attributeBean.isRtl())
-									{
-									%>
-									SRC="birt/images/Remove_disabled.gif"
-									<%
-									}
-									else
-									{
-									%>
-									SRC="birt/images/Remove_disabled_rtl.gif"
-									<%
-									}
-									%>									  
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.remove" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.remove" )%>" 								
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>
-							<TR height="2px"><TD></TD></TR>
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Removeall" 
-									<%
-									if( !attributeBean.isRtl())
-									{
-									%>
-									SRC="birt/images/RemoveAll_disabled.gif"
-									<%
-									}
-									else
-									{
-									%>
-									SRC="birt/images/RemoveAll_disabled_rtl.gif"
-									<%
-									}
-									%>									  
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.removeall" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.removeall" )%>" 								
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>
-						</TABLE>
-					</TD>
-				</TR>
-			</TABLE>
-		</TD>
-		<TD VALIGN="middle">
-			<TABLE HEIGHT="100%">
-				<TR>
-					<TD>
-						<TABLE VALIGN="middle">
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Up" SRC="birt/images/Up_disabled.gif" 
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.up" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.up" )%>" 
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>
-							<TR height="2px"><TD></TD></TR>
-							<TR><TD>
-								<INPUT TYPE="image" NAME="Down" SRC="birt/images/Down_disabled.gif" 
-									ALT="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.down" )%>" 
-									TITLE="<%= BirtResources.getHtmlMessage( "birt.viewer.dialog.exportdata.down" )%>" 								
-									CLASS="birtviewer_exportdata_dialog_button">
-							</TD></TR>							
-						</TABLE>
-					</TD>
-				</TR>
-			</TABLE>
-		</TD>
-		<TD >
-			<TABLE STYLE="font-size:8pt;">
-				<TR><TD>
-					<LABEL FOR="selectedColumnSelect"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.selectedcolumn" )%></LABEL>
-				</TD></TR>
-				<TR><TD>
-					<SELECT ID="selectedColumnSelect" MULTIPLE="true" SIZE="10" CLASS="birtviewer_exportdata_dialog_select">
+
+<div class="row">
+	<div class="col-sm-10 col-sm-offset-1">
+		<div class="form-horizontal" id="simpleExportDialogBody">
+			<div class="form-group">
+		    	<label for="resultsets" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.exportdata.resultsets")%></label>
+			    <div class="col-sm-8">
+			    	<select class="form-control" id="resultsets">
+			    	</select>
+			    </div>
+		  	</div>			
+			<div class="form-group">
+				<table class="table table-bordered">
+					<tr>
+						<td style="width:45%;">
+							<LABEL for="availableColumnSelect"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.availablecolumn" )%></LABEL>
+						</td>
+						<td></td>
+						<td style="width:45%;">
+							<LABEL FOR="selectedColumnSelect"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.selectedcolumn" )%></LABEL>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<SELECT ID="availableColumnSelect" MULTIPLE="true" SIZE="10" CLASS="form-control">
+							</SELECT>
+						</td>
+						<td style="text-align:center;" id="action-buttons">
+							<button class="btn btn-default btn-xs" name="Addall">
+								<span class="glyphicon glyphicon-forward"></span>
+							</button>
+							<button class="btn btn-default btn-xs" name="Add">
+								<span class="glyphicon glyphicon-triangle-right"></span>
+							</button>
+							<button class="btn btn-default btn-xs" name="Remove">
+								<span class="glyphicon glyphicon-triangle-left"></span>
+							</button>
+							<button class="btn btn-default btn-xs" name="Removeall">
+								<span class="glyphicon glyphicon-backward"></span>
+							</button>
+							<button class="btn btn-default btn-xs" name="Up">
+								<span class="glyphicon glyphicon-triangle-top"></span>
+							</button>
+							<button class="btn btn-default btn-xs" name="Down">
+								<span class="glyphicon glyphicon-triangle-bottom"></span>
+							</button>
+						</td>
+						<td>
+							<SELECT ID="selectedColumnSelect" MULTIPLE="true" SIZE="10" CLASS="form-control">
+							</SELECT>
+						</td>
+					</tr>
+				</table>
+			</div>
+			
+			<div class="form-group">
+		    	<label for="exportDataExtension" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.exportdata.extension")%></label>
+			    <div class="col-sm-8">
+			    	<SELECT ID="exportDataExtension" CLASS="form-control">
+						<%
+							for ( int i = 0; i < dataExtractInfos.length; i++ )
+							{
+								DataExtractionFormatInfo extensionInfo  = dataExtractInfos[i];
+								if( extensionInfo.getId() == null 
+									|| extensionInfo.getFormat() == null 
+									|| ( extensionInfo.isHidden() != null && extensionInfo.isHidden().booleanValue() ) )
+									continue;
+								
+								String extensionName = extensionInfo.getName( );
+								if( extensionName == null )
+									extensionName = "";
+						%>
+								<OPTION VALUE="<%= extensionInfo.getId() %>"><%= extensionName %>(*.<%= extensionInfo.getFormat() %>)</OPTION>
+						<%
+							}
+						%>
+						</SELECT>
+			    </div>
+		  	</div>	
+		  	
+		  		
+			<div class="form-group" id="exportDataEncodingSetting" style="display:none;">
+		    	<label for="exportDataEncoding_UTF8" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.exportdata.encoding")%></label>
+			    <div class="col-sm-8">
+			    	<label class="radio-inline">
+						<input type="radio" name="exportDataEncoding" id="exportDataEncoding_UTF8" checked value="UTF-8">
+						UTF-8
+					</label>
+					<label class="radio-inline" style="display:none;">
+						<input type="radio" name="exportDataEncoding" id="exportDataEncoding_other">
+						<%=BirtResources.getMessage("birt.viewer.dialog.exportdata.encoding.other")%>
+						<INPUT TYPE="text" NAME="exportDataOtherEncoding" ID="exportDataOtherEncoding_input" CLASS="birtviewer_exportdata_dialog_input" DISABLED="true">
+					</label>
+			    </div>
+		  	</div>	
+		  	
+		  	<div class="form-group">
+		    	<label for="exportDataCSVSeparator" class="col-sm-4 control-label"><%=BirtResources.getMessage("birt.viewer.dialog.exportdata.separator")%></label>
+			    <div class="col-sm-8">
+			    	<SELECT ID="exportDataCSVSeparator" CLASS="form-control">
+						<OPTION VALUE="0" SELECTED><%= BirtResources.getMessage( "birt.viewer.sep.0" )%></OPTION>
+						<OPTION VALUE="1"><%= BirtResources.getMessage( "birt.viewer.sep.1" )%></OPTION>
+						<OPTION VALUE="2"><%= BirtResources.getMessage( "birt.viewer.sep.2" )%></OPTION>
+						<OPTION VALUE="3"><%= BirtResources.getMessage( "birt.viewer.sep.3" )%></OPTION>
+						<OPTION VALUE="4"><%= BirtResources.getMessage( "birt.viewer.sep.4" )%></OPTION>
 					</SELECT>
-				</TD></TR>
-			</TABLE>
-		</TD>
-	</TR>
-	<TR HEIGHT="5px"><TD></TD></TR>
-	<TR>
-		<TD COLSPAN="4">			
-			<DIV>
-				<label for="exportDataExtension"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.extension" )%></label>
-				<SELECT ID="exportDataExtension" CLASS="birtviewer_exportdata_dialog_select">
-				<%
-					for ( int i = 0; i < dataExtractInfos.length; i++ )
-					{
-						DataExtractionFormatInfo extensionInfo  = dataExtractInfos[i];
-						if( extensionInfo.getId() == null 
-							|| extensionInfo.getFormat() == null 
-							|| ( extensionInfo.isHidden() != null && extensionInfo.isHidden().booleanValue() ) )
-							continue;
-						
-						String extensionName = extensionInfo.getName( );
-						if( extensionName == null )
-							extensionName = "";
-				%>
-						<OPTION VALUE="<%= extensionInfo.getId() %>"><%= extensionName %>(*.<%= extensionInfo.getFormat() %>)</OPTION>
-				<%
-					}
-				%>
-				</SELECT>
-			</DIV>
-			<BR/>
-			<DIV ID="exportDataEncodingSetting">
-				<TABLE>
-					<TR>
-						<TD><label for="exportDataEncoding_UTF8"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.encoding" )%></label></TD>
-						<TD>
-							<INPUT TYPE="radio" NAME="exportDataEncoding" ID="exportDataEncoding_UTF8" CHECKED value="UTF-8">
-							<label for="exportDataEncoding_UTF8">UTF-8</label>
-						</TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD>
-							<TABLE cellpadding="0" cellspacing="0"><TR>
-							<TD valign="TOP">
-								<INPUT TYPE="radio" NAME="exportDataEncoding" ID="exportDataEncoding_other">
-							</TD>
-							<TD>
-								<label for="exportDataEncoding_other"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.encoding.other" )%></label>
-								<INPUT TYPE="text" NAME="exportDataOtherEncoding" ID="exportDataOtherEncoding_input" CLASS="birtviewer_exportdata_dialog_input" DISABLED="true">
-								<%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.encoding.comment" )%>
-							</TD>
-							</TR></TABLE>
-						</TD>
-					</TR>
-				</TABLE>				
-			</DIV>
-			<BR/>
-			<DIV>
-				<label for="exportDataCSVSeparator"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.separator" )%></label>
-				<SELECT ID="exportDataCSVSeparator" CLASS="birtviewer_exportdata_dialog_select">
-					<OPTION VALUE="0" SELECTED><%= BirtResources.getMessage( "birt.viewer.sep.0" )%></OPTION>
-					<OPTION VALUE="1"><%= BirtResources.getMessage( "birt.viewer.sep.1" )%></OPTION>
-					<OPTION VALUE="2"><%= BirtResources.getMessage( "birt.viewer.sep.2" )%></OPTION>
-					<OPTION VALUE="3"><%= BirtResources.getMessage( "birt.viewer.sep.3" )%></OPTION>
-					<OPTION VALUE="4"><%= BirtResources.getMessage( "birt.viewer.sep.4" )%></OPTION>
-				</SELECT>
-			</DIV>
-			<BR/>
-			<DIV>
-				<TABLE cellpadding="0" cellspacing="0">
-					<TR >
-						<TD><INPUT TYPE="checkbox" ID="exportColumnDataType"></TD>
-						<TD>
-							<label for="exportColumnDataType"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.datatype" )%></label>
-						</TD>
-						<TD style="padding-left:20px;" ><INPUT TYPE="checkbox" ID="exportColumnLocaleNeutral"></TD>
-						<TD rowspan="2" valign="top" style="padding-top:3px;">
-							<label for="exportColumnLocaleNeutral"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.localeneutral" )%></label>
-						</TD>
-					</TR>
-					<TR>
-						<TD><INPUT TYPE="checkbox" ID="exportDataWithCR"></TD>
-						<TD nowrap="nowrap">
-							<label for="exportDataWithCR"><%= BirtResources.getMessage( "birt.viewer.dialog.exportdata.carriage_return" )%></label>
-						</TD>
-					</TR>
-				</TABLE>
-			</DIV>
-		</TD>
-	</TR>
-	<TR HEIGHT="5px"><TD></TD></TR>
-</TABLE>
\ No newline at end of file
+			    </div>
+		  	</div>
+		  	
+		  	<div class="form-group" style="display:none;">
+			    <div class="col-sm-offset-4 col-sm-8">
+			    	<div class="checkbox">
+					  <label>
+					    <input type="checkbox" id="exportColumnDataType">
+					    <%= BirtResources.getMessage("birt.viewer.dialog.exportdata.datatype")%>
+					  </label>
+					</div>
+					<div class="checkbox">
+					  <label>
+					    <input type="checkbox" id="exportColumnLocaleNeutral">
+					    <%= BirtResources.getMessage("birt.viewer.dialog.exportdata.localeneutral")%>
+					  </label>
+					</div>
+					<div class="checkbox">
+					  <label>
+					    <input type="checkbox" id="exportDataWithCR">
+					    <%= BirtResources.getMessage("birt.viewer.dialog.exportdata.carriage_return")%>
+					  </label>
+					</div>
+			    </div>
+		  	</div>	
+		</div>
+	</div>
+</div>
+<style>
+	#action-buttons > .btn {
+		margin-bottom: 5px;
+	}
+	
+	#action-buttons > .btn:last-child {
+		margin-bottom: 0px;
+	}
+	
+	#availableColumnSelect,  #selectedColumnSelect {
+		height: 165px;
+	}
+</style>	
\ No newline at end of file
diff --git a/WebContent/birt/pages/layout/FramesetFragment.jsp b/WebContent/birt/pages/layout/FramesetFragment.jsp
index 33272c4..59495e5 100644
--- a/WebContent/birt/pages/layout/FramesetFragment.jsp
+++ b/WebContent/birt/pages/layout/FramesetFragment.jsp
@@ -116,7 +116,7 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</button>
-					<a class="navbar-brand" href="#">报表预览</a>
+					<a class="navbar-brand" href="<c:url value='/'/>">报表预览</a>
 				</div>
 				<%
 					if (fragment != null) {