From 4f7f8f878476a6a7aef270aedc32b887c1c0c030 Mon Sep 17 00:00:00 2001
From: steinm <steinm@577cc39b-cfd1-4aa2-8bc3-eda205cea05a>
Date: Thu, 24 Jan 2013 09:14:05 +0000
Subject: [PATCH] put buttons below input fields set multiple value checkbox
 propperly removed several <br />

---
 views/bootstrap/class.AttributeMgr.php | 31 +++++++++++---------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 72f725326..bff3bfb8b 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -143,30 +143,25 @@ function showAttributeDefinitions(selectObj) {
 ?>
 				<table class="table-condensed">
 					<tr>
-						<td colspan="2">
+						<td></td><td>
 <?php
-			if(!$attrdef->isUsed()) {
+					if(!$attrdef->isUsed()) {
 ?>
 							<form style="display: inline-block;" method="post" action="../op/op.AttributeMgr.php" >
 							<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
-							<input type="Hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
-							<input type="Hidden" name="action" value="removeattrdef">
-							<input value="<?php echo getMLText("rm_attrdef")?>" type="submit" class="btn">
+							<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
+							<input type="hidden" name="action" value="removeattrdef">
+							<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 							</form>
 <?php
-			} else {
+					} else {
 ?>
 							<p><?php echo getMLText('attrdef_in_use') ?></p>
 <?php
-			}
+					}
 ?>
 						</td>
 					</tr>
-					<tr>
-						<td colspan="2">
-							<?php $this->contentSubHeading("");?>
-						</td>
-					</tr>				
 					<form action="../op/op.AttributeMgr.php" method="post">
 					<tr>
 						<td>
@@ -184,7 +179,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_type");?>:
 						</td>
 						<td>
-							<select name="type"><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select><br />
+							<select name="type"><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == LetoDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select>
 						</td>
 					</tr>
 					<tr>
@@ -192,7 +187,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_objtype");?>:
 						</td>
 						<td>
-							<select name="objtype"><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select><br />
+							<select name="objtype"><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo LetoDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == LetoDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
 						</td>
 					</tr>
 					<tr>
@@ -200,7 +195,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_multiple");?>:
 						</td>
 						<td>
-							<input type="checkbox" value="1" name="multiple" /><br />
+							<input type="checkbox" value="1" name="multiple" <?php echo $attrdef->getMultipleValues() ? "checked" : "" ?>/>
 						</td>
 					</tr>
 					<tr>
@@ -208,7 +203,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_minvalues");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" /><br />
+							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" />
 						</td>
 					</tr>
 					<tr>
@@ -216,7 +211,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_maxvalues");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" /><br />
+							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" />
 						</td>
 					</tr>
 					<tr>
@@ -224,7 +219,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_valueset");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" /><br />
+							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" />
 						</td>
 					</tr>
 					<tr>