Index: branches/5.1.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r12657 -r13613
--- branches/5.1.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 13613)
@@ -8,72 +8,85 @@
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
-  	<td>
-  		<script type="text/javascript">
+	  	<td>
+	  		<script type="text/javascript">
+	  			function ValidatePassFld(fieldId) {
+	  				var passFld=document.getElementById(fieldId);
+	  				var passVerifyFld=document.getElementById('verify_'+fieldId);
+	  				if (passFld && passVerifyFld && passFld.value == passVerifyFld.value) {
+	  					return true;
+	  				}
+	  				else {
+	  					var passErrorCell=document.getElementById('error_'+fieldId);
+	  					if (passErrorCell){
+	  						passErrorCell.innerHTML='<inp2:m_phrase name="la_error_PasswordMatch" />';
+	  					}
+	  					return false;
+	  				}
+	  			}
 
-  			function ValidatePassFld(fieldId){
-  				var passFld=document.getElementById(fieldId);
-  				var passVerifyFld=document.getElementById('verify_'+fieldId);
-  				if (passFld && passVerifyFld && passFld.value == passVerifyFld.value) {
-  					return true;
-  				}
-  				else {
-  					var passErrorCell=document.getElementById('error_'+fieldId);
-  					if (passErrorCell){
-  						passErrorCell.innerHTML='<inp2:m_phrase name="la_error_PasswordMatch" />';
-  					}
-  					return false;
-  				}
-  			}
+	  			function ValidatePassFields() {
+	  				var el=false;
+	  				var validated=true;
+	  				for (var i=0; i<document.forms.kernel_form.elements.length; i++){
+	  					el=document.forms.kernel_form.elements[i];
+	  					if (el.getAttribute('primarytype')=='password'){
+	  						if (!ValidatePassFld(el.id)){
+	  							validated=false;
+	  						}
+	  					}
+	  				}
+	  				return validated;
+	  			}
 
-  			function ValidatePassFields(){
-  				var el=false;
-  				var validated=true;
-  				for (var i=0; i<document.forms.kernel_form.elements.length; i++){
-  					el=document.forms.kernel_form.elements[i];
-  					if (el.getAttribute('primarytype')=='password'){
-  						if (!ValidatePassFld(el.id)){
-  							validated=false;
-  						}
-  					}
-  				}
-  				return validated;
-  			}
+	  			function toggle_section($label) {
+	  				var $table = document.getElementById('config_table');
+	  				var $row = null;
+	  				var $is_visible = false;
 
-  			function toggle_section($label) {
-  				var $table = document.getElementById('config_table');
-  				var $row = null;
-  				var $is_visible = false;
+	  				for (var $i = 0; $i < $table.rows.length; $i++) {
+	  					$row = $table.rows[$i];
+	  					if ($row.getAttribute('header_label') != $label) {
+	  						continue;
+	  					}
 
-  				for (var $i = 0; $i < $table.rows.length; $i++) {
-  					$row = $table.rows[$i];
-  					if ($row.getAttribute('header_label') != $label) {
-  						continue;
-  					}
+	  					if (!$row.style.display) {
+	  						$row.style.display = document.all ? 'block' : 'table-row';
+	  					}
 
-  					if (!$row.style.display) {
-  						$row.style.display = document.all ? 'block' : 'table-row';
-  					}
+	  					$is_visible = !($row.style.display == 'none');
+	  					$row.style.display = $is_visible ?  'none' : (document.all ? 'block' : 'table-row');
 
-  					$is_visible = !($row.style.display == 'none');
-  					$row.style.display = $is_visible ?  'none' : (document.all ? 'block' : 'table-row');
+	  					document.getElementById('toggle_mark['+$label+']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
+	  				}
+	  			}
 
-  					document.getElementById('toggle_mark['+$label+']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
-  				}
-  			}
+	  			var a_toolbar = new ToolBar();
 
-  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							if (ValidatePassFields()){
-								submit_event('conf','<inp2:conf_SaveEvent/>');
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select',
+						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+						function() {
+							if (ValidatePassFields()) {
+								submit_event('conf', '<inp2:conf_SaveEvent/>');
 							}
 						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('conf','OnCancel');
+					)
+				);
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							submit_event('conf', 'OnCancel');
 						}
-				 ) );
+					)
+				);
 
+				<inp2:m_ModuleInclude template="config/custom_toolbar"/>
+
 				a_toolbar.Render();
 			</script>
 		</td>
@@ -85,7 +98,7 @@
 
 <inp2:conf_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
-	<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2"/>
+	<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2" value_render_as="cf_default_value"/>
 </table>
 
 <script type="text/javascript">