Index: branches/RC/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -r11538 -r11546
--- branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11546)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="600" height="500"/>
-<inp2:m_RequireLogin login_template="login"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="column_picker" module="in-portal"/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:root" title_preset="column_picker"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -42,49 +42,50 @@
 	</tr>
 </tbody>
 </table>
+
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" >
-	<tr>
-		<td>
-			<table style="width: 500px; margin: 5px auto;" >
-				<tr>
-					<td>
-						<strong><inp2:m_phrase label="la_PickedColumns"/></strong>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<strong><inp2:m_phrase label="la_AvailableColumns"/></strong>
-					</td>
-				</tr>
-				<tr>
-					<td style="text-align: left">
-						<inp2:m_DefineElement name="a_column">
-							<option value="<inp2:m_param name="_Id"/>"><inp2:m_param name="_Name"/></option>
-						</inp2:m_DefineElement>
+	<table width="100%" border="0" cellspacing="0" cellpadding="4">
+		<tr>
+			<td>
+				<table style="width: 500px; margin: 5px auto;" >
+					<tr>
+						<td>
+							<strong><inp2:m_phrase label="la_PickedColumns"/></strong>
+						</td>
+						<td>&nbsp;</td>
+						<td>
+							<strong><inp2:m_phrase label="la_AvailableColumns"/></strong>
+						</td>
+					</tr>
+					<tr>
+						<td style="text-align: left">
+							<inp2:m_DefineElement name="a_column">
+								<option value="<inp2:m_param name="_Id"/>"><inp2:m_param name="_Name"/></option>
+							</inp2:m_DefineElement>
 
-						<select id="picked_columns" multiple="multiple" size="20" style="width: 230px">
-							<inp2:adm_PrintColumns render_as="a_column"/>
-						</select>
-						<br/><br/>
-					</td>
-					<td style="text-align: center; width: 40px;">
-						<img style="cursor: pointer; border: 0px" src="img/icons/icon_left.gif" onclick="move_selected('available_columns', 'picked_columns');"/><br/>
-						<img style="cursor: pointer; border: 0px" src="img/icons/icon_right.gif" onclick="move_selected('picked_columns', 'available_columns'); select_sort('available_columns');"/><br/>
-					</td>
-					<td style="text-align: left">
-						<select id="available_columns" multiple="multiple" size="20" style="width: 230px">
-							<inp2:adm_PrintColumns hidden="1" render_as="a_column"/>
-						</select>
-						<br/><br/>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
+							<select id="picked_columns" multiple="multiple" size="20" style="width: 230px">
+								<inp2:adm_PrintColumns render_as="a_column"/>
+							</select>
+							<br/><br/>
+						</td>
+						<td style="text-align: center; width: 40px;">
+							<img style="cursor: pointer; border: 0px" src="img/icons/icon_left.gif" onclick="move_selected('available_columns', 'picked_columns');"/><br/>
+							<img style="cursor: pointer; border: 0px" src="img/icons/icon_right.gif" onclick="move_selected('picked_columns', 'available_columns'); select_sort('available_columns');"/><br/>
+						</td>
+						<td style="text-align: left">
+							<select id="available_columns" multiple="multiple" size="20" style="width: 230px">
+								<inp2:adm_PrintColumns hidden="1" render_as="a_column"/>
+							</select>
+							<br/><br/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td>&nbsp;</td>
+		</tr>
+	</table>
 </div>
+
 <input type="hidden" name="main_prefix" value="<inp2:m_get var='main_prefix'/>"/>
 
-
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file