diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php index ff54da928..7811e15d5 100644 --- a/views/bootstrap/class.AddFile.php +++ b/views/bootstrap/class.AddFile.php @@ -98,30 +98,37 @@ $(document).ready( function() { $this->contentContainerStart(); ?> -<form action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload"> +<form class="form-horizontal" action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload"> <input type="hidden" name="documentid" value="<?php print $document->getId(); ?>"> -<table class="table-condensed"> -<tr> - <td><?php printMLText("local_file");?>:</td> - <td><!-- <input type="File" name="userfile" size="60"> --> -<?php - $this->printFileChooser('userfile', false); -?> - </td> -</tr> -<tr> - <td><?php printMLText("name");?>:</td> - <td><input type="text" name="name" id="name" size="60"></td> -</tr> -<tr> - <td><?php printMLText("comment");?>:</td> - <td><textarea name="comment" id="comment" rows="4" cols="80"></textarea></td> -</tr> -<tr> - <td></td> - <td><input class="btn" type="submit" value="<?php printMLText("add");?>"></td> -</tr> -</table> + +<div class="control-group"> + <label class="control-label"><?php printMLText("local_file");?>:</label> + <div class="controls"> + <?php $this->printFileChooser('userfile', false); ?> + </div> +</div> + + +<div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"> + <input type="text" name="name" id="name" size="60"> + </div> +</div> + + +<div class="control-group"> + <label class="control-label"><?php printMLText("comment");?>:</label> + <div class="controls"> + <textarea name="comment" id="comment" rows="4" cols="80"></textarea> + </div> +</div> + + +<div class="controls"> + <input class="btn" type="submit" value="<?php printMLText("add");?>"> +</div> + </form> <?php $this->contentContainerEnd(); diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php index 6f5e74b55..105a1145c 100644 --- a/views/bootstrap/class.AddSubFolder.php +++ b/views/bootstrap/class.AddSubFolder.php @@ -103,40 +103,43 @@ $(document).ready( function() { $this->contentContainerStart(); ?> -<form action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post"> +<form class="form-horizontal" action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post"> <?php echo createHiddenFieldWithKey('addsubfolder'); ?> - <input type="Hidden" name="folderid" value="<?php print $folder->getId();?>"> - <input type="Hidden" name="showtree" value="<?php echo showtree();?>"> - <table class="table-condensed"> - <tr> - <td class="inputDescription"><?php printMLText("name");?>:</td> - <td><input type="text" name="name" size="60" required></td> - </tr> - <tr> - <td class="inputDescription"><?php printMLText("comment");?>:</td> - <td><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea></td> - </tr> - <tr> - <td class="inputDescription"><?php printMLText("sequence");?>:</td> - <td><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></td> - </tr> + <input type="hidden" name="folderid" value="<?php print $folder->getId();?>"> + <input type="hidden" name="showtree" value="<?php echo showtree();?>"> + + <div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"><input type="text" name="name" size="60" required></div> + </div> + + <div class="control-group"> + <label class="control-label"><?php printMLText("comment");?>:</label> + <div class="controls"><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea></div> + </div> + + <div class="control-group"> + <label class="control-label"><?php printMLText("sequence");?>:</label> + <div class="controls"><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></div> + </div> <?php $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { ?> -<tr> - <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td> - <td><?php $this->printAttributeEditField($attrdef, '') ?></td> -</tr> +<div class="control-group"> + <label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label> + <div class="controls"><?php $this->printAttributeEditField($attrdef, '') ?></div> +</div> <?php } } ?> - <tr> - <td></td><td><input type="submit" class="btn" value="<?php printMLText("add_subfolder");?>"></td> - </tr> - </table> + +<div class="controls"> + <input type="submit" class="btn" value="<?php printMLText("add_subfolder");?>"> +</div> + </form> <?php $this->contentContainerEnd(); diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index 7589be545..f85fed7d2 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -163,7 +163,7 @@ $(document).ready( function() { <?php } ?> - <form action="../op/op.AttributeMgr.php" method="post"> + <form class="form-horizontal" action="../op/op.AttributeMgr.php" method="post"> <?php if($attrdef) { echo createHiddenFieldWithKey('editattrdef'); @@ -178,82 +178,89 @@ $(document).ready( function() { <?php } ?> - <table class="table-condensed"> - <tr> - <td> + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_name");?>: - </td> - <td> + </label> + <div class="controls"> <input type="text" name="name" value="<?php echo $attrdef ? htmlspecialchars($attrdef->getName()) : '' ?>"> - </td> - </tr> - <tr> - <td> + </div> + </div> + + + + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_objtype");?>: - </td> - <td> - <select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select> - </td> - </tr> - <tr> - <td> - <?php printMLText("attrdef_type");?>: - </td> - <td> + </label> + <div class="controls"> + <select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('version'); ?></option></select> + </div> + </div> + + + <div class="control-group"> + <label class="control-label"><?php printMLText("attrdef_type");?>:</label> + <div class="controls"> <select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option></select> - </td> - </tr> - <tr> - <td> + </div> + </div> + + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_multiple");?>: - </td> - <td> + </label> + <div class="controls"> <input type="checkbox" value="1" name="multiple" <?php echo ($attrdef && $attrdef->getMultipleValues()) ? "checked" : "" ?>/> - </td> - </tr> - <tr> - <td> - <?php printMLText("attrdef_minvalues");?>: - </td> - <td> + </div> + </div> + + + <div class="control-group"> + <label class="control-label"><?php printMLText("attrdef_minvalues");?>:</label> + <div class="controls"> <input type="text" value="<?php echo $attrdef ? $attrdef->getMinValues() : '' ?>" name="minvalues" /> - </td> - </tr> - <tr> - <td> + </div> + </div> + + + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_maxvalues");?>: - </td> - <td> + </label> + <div class="controls"> <input type="text" value="<?php echo $attrdef ? $attrdef->getMaxValues() : '' ?>" name="maxvalues" /> - </td> - </tr> - <tr> - <td> + </div> + </div> + + + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_valueset");?>: - </td> - <td> + </label> + + <div class="controls"> <?php if($attrdef && strlen($attrdef->getValueSet()) > 30) { ?> <textarea name="valueset" rows="5"><?php echo ($attrdef && $attrdef->getValueSet()) ? $attrdef->getValueSetSeparator().implode("\n".$attrdef->getValueSetSeparator(), $attrdef->getValueSetAsArray()) : '' ?></textarea> <?php } else { ?> <input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" /> <?php } ?> - </td> - </tr> - <tr> - <td> + </div> + </div> + + + <div class="control-group"> + <label class="control-label"> <?php printMLText("attrdef_regex");?>: - </td> - <td> + </label> + <div class="controls"> <input type="text" value="<?php echo $attrdef ? $attrdef->getRegex() : '' ?>" name="regex" /> - </td> - </tr> - <tr> - <td></td> - <td> - <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button> - </td> - </tr> - </table> + </div> + </div> + + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button> + </div> </form> <?php } /* }}} */ diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 996f16706..1aa76c907 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1137,8 +1137,8 @@ $('#acceptkeywords').click(function(ev) { case SeedDMS_Core_AttributeDefinition::type_date: $objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : ''; ?> - <span class="input-append date datepicker" style="_display: inline;" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>"> - <input id="<?php echo $fieldname."_".$attrdef->getId();?>" class="span4" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>"> + <span class="input-append date datepicker" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>"> + <input id="<?php echo $fieldname."_".$attrdef->getId();?>" class="span9" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>"> <span class="add-on"><i class="icon-calendar"></i></span> </span> <?php diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php index 47f68baa4..201d4e8c3 100644 --- a/views/bootstrap/class.Categories.php +++ b/views/bootstrap/class.Categories.php @@ -58,16 +58,17 @@ $(document).ready( function() { function showCategoryForm($category) { /* {{{ */ ?> - <table class="table-condensed"> - <tr> - <td></td><td> + <div class="control-group"> + <label class="control-label"></label> + + <div class="controls"> <?php if($category) { - if($category && $category->isUsed()) { + if($category->isUsed()) { ?> <p><?php echo getMLText('category_in_use') ?></p> <?php - } else { + } else { ?> <form style="display: inline-block;" method="post" action="../op/op.Categories.php" > <?php echo createHiddenFieldWithKey('removecategory'); ?> @@ -76,30 +77,35 @@ $(document).ready( function() { <button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button> </form> <?php - } + } } ?> - </td> - </tr> - <tr> - <td><?php echo getMLText("name")?>:</td> - <td> - <form class="form-inline" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post"> - <?php if(!$category) { ?> - <?php echo createHiddenFieldWithKey('addcategory'); ?> - <input type="Hidden" name="action" value="addcategory"> - <?php } else { ?> - <?php echo createHiddenFieldWithKey('editcategory'); ?> - <input type="Hidden" name="action" value="editcategory"> - <input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>"> - <?php } ?> + </div> + </div> + + + <form class="form-horizontal" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post"> + <?php if(!$category) { ?> + <?php echo createHiddenFieldWithKey('addcategory'); ?> + <input type="hidden" name="action" value="addcategory"> + <?php } else { ?> + <?php echo createHiddenFieldWithKey('editcategory'); ?> + <input type="hidden" name="action" value="editcategory"> + <input type="hidden" name="categoryid" value="<?php echo $category->getID()?>"> + <?php } ?> + <div class="control-group"> + <label class="control-label"><?php echo getMLText("name")?>:</label> + <div class="controls"> <input name="name" type="text" value="<?php echo $category ? htmlspecialchars($category->getName()) : '' ?>"> - <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button> - </form> - </td> - </tr> - - </table> + </div> + </div> + <div class="control-group"> + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button> + </div> + </div> + </form> + <?php } /* }}} */ diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index edb215f21..993ff6168 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -104,27 +104,30 @@ $(document).ready(function() { $this->contentHeading(getMLText("edit_folder_props")); $this->contentContainerStart(); ?> -<form action="../op/op.EditFolder.php" id="form1" name="form1" method="post"> -<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>"> -<input type="Hidden" name="showtree" value="<?php echo showtree();?>"> -<table class="table-condensed"> -<tr> -<td><?php printMLText("name");?>:</td> -<td><input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60" required></td> -</tr> -<tr> -<td><?php printMLText("comment");?>:</td> -<td><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php print htmlspecialchars($folder->getComment());?></textarea></td> -</tr> +<form class="form-horizontal" action="../op/op.EditFolder.php" id="form1" name="form1" method="post"> + <input type="hidden" name="folderid" value="<?php print $folder->getID();?>"> + <input type="hidden" name="showtree" value="<?php echo showtree();?>"> + <div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"> + <input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60" required> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("comment");?>:</label> + <div class="controls"> + <textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php print htmlspecialchars($folder->getComment());?></textarea> + </div> + </div> <?php $parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent(); if ($parent && $parent->getAccessMode($user) > M_READ) { - print "<tr>"; - print "<td>" . getMLText("sequence") . ":</td>"; - print "<td>"; + print "<div class=\"control-group\">"; + print "<label class=\"control-label\">" . getMLText("sequence") . ":</label>"; + print "<div class=\"controls\">"; $this->printSequenceChooser($parent->getSubFolders('s'), $folder->getID()); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off'); - print "</td></tr>\n"; + print "</div></div>\n"; } if($attrdefs) { @@ -138,20 +141,19 @@ $(document).ready(function() { echo "</tr>"; } else { ?> -<tr> - <td><?php echo htmlspecialchars($attrdef->getName()); ?></td> - <td><?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?></td> -</tr> -<?php - } + <div class="control-group"> + <label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label> + <div class="controls"> + <?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?> + </div> + </div> + <?php } } ?> -<tr> - <td></td> - <td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button></td> -</tr> -</table> + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button> + </div> </form> <?php $this->contentContainerEnd(); diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php index 632d4ec58..af6ccd32a 100644 --- a/views/bootstrap/class.EditUserData.php +++ b/views/bootstrap/class.EditUserData.php @@ -118,73 +118,84 @@ $(document).ready( function() { $this->contentHeading(getMLText("edit_user_details")); $this->contentContainerStart(); ?> -<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form"> -<table class="table-condensed"> - <tr> - <td><?php printMLText("current_password");?>:</td> - <td><input id="currentpwd" type="password" name="currentpwd" size="30"></td> - </tr> - <tr> - <td><?php printMLText("new_password");?>:</td> - <td><input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30"></td> - </tr> +<form class="form-horizontal" action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form"> + <div class="control-group"> + <label class="control-label"><?php printMLText("current_password");?>:</label> + <div class="controls"> + <input id="currentpwd" type="password" name="currentpwd" size="30"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("new_password");?>:</label> + <div class="controls"> + <input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30"> + </div> + </div> <?php if($passwordstrength) { ?> - <tr> - <td><?php printMLText("password_strength");?>:</td> - <td> + <div class="control-group"> + <label class="control-label"><?php printMLText("password_strength");?>:</label> + <div class="controls"> <div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div> - </td> - </tr> + </div> + </div> <?php } ?> - <tr> - <td><?php printMLText("confirm_pwd");?>:</td> - <td><input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30"></td> - </tr> - <tr> - <td><?php printMLText("name");?>:</td> - <td><input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td> - </tr> - <tr> - <td><?php printMLText("email");?>:</td> - <td><input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td> - </tr> - <tr> - <td><?php printMLText("comment");?>:</td> - <td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea></td> - </tr> + <div class="control-group"> + <label class="control-label"><?php printMLText("confirm_pwd");?>:</label> + <div class="controls"> + <input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"> + <input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("email");?>:</label> + <div class="controls"> + <input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("comment");?>:</label> + <div class="controls"> + <textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea> + </div> + </div> <?php if ($enableuserimage){ ?> - <tr> - <td><?php printMLText("user_image");?>:</td> - <td> + <div class="control-group"> + <label class="control-label"><?php printMLText("user_image");?>:</label> + <div class="controls"> <?php if ($user->hasImage()) print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">"; else printMLText("no_user_image"); ?> - </td> - </tr> - <tr> - <td><?php printMLText("new_user_image");?>:</td> - <td> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("new_user_image");?>:</label> + <div class="controls"> <?php $this->printFileChooser('userfile', false, "image/jpeg"); ?> - </td> - </tr> + </div> + </div> <?php } if ($enablelanguageselector){ ?> - <tr> - <td><?php printMLText("language");?>:</td> - <td> + <div class="control-group"> + <label class="control-label"><?php printMLText("language");?>:</label> + <div class="controls"> <select name="language"> <?php $languages = getLanguages(); @@ -193,15 +204,15 @@ $(document).ready( function() { } ?> </select> - </td> - </tr> + </div> + </div> <?php } if ($enablethemeselector){ ?> - <tr> - <td><?php printMLText("theme");?>:</td> - <td> + <div class="control-group"> + <label class="control-label"><?php printMLText("theme");?>:</label> + <div class="controls"> <select name="theme"> <?php $themes = UI::getStyles(); @@ -210,16 +221,14 @@ $(document).ready( function() { } ?> </select> - </td> - </tr> + </div> + </div> <?php } ?> - <tr> - <td></td> - <td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button></td> - </tr> -</table> + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button> + </div> </form> <?php diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php index 51cd13585..6b039eb55 100644 --- a/views/bootstrap/class.GroupMgr.php +++ b/views/bootstrap/class.GroupMgr.php @@ -153,7 +153,7 @@ $(document).ready( function() { $allUsers = $this->params['allusers']; $groups = $this->params['allgroups']; ?> - <form action="../op/op.GroupMgr.php" name="form_1" id="form_1" method="post"> + <form class="form-horizontal" action="../op/op.GroupMgr.php" name="form_1" id="form_1" method="post"> <?php if($group) { echo createHiddenFieldWithKey('editgroup'); @@ -168,30 +168,34 @@ $(document).ready( function() { <?php } ?> - <table class="table-condensed"> + <?php if($group) { ?> - <tr> - <td></td> - <td><a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></a></td> - </tr> + <div class="control-group"> + <div class="controls"> + <a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></a> + </div> + </div> <?php } ?> - <tr> - <td><?php printMLText("name");?>:</td> - <td><input type="text" name="name" id="name" value="<?php print $group ? htmlspecialchars($group->getName()) : '';?>"></td> - </tr> - <tr> - <td><?php printMLText("comment");?>:</td> - <td><textarea name="comment" id="comment" rows="4" cols="50"><?php print $group ? htmlspecialchars($group->getComment()) : '';?></textarea></td> - </tr> - <tr> - <td></td> - <td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td> - </tr> - </table> + <div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"> + <input type="text" name="name" id="name" value="<?php print $group ? htmlspecialchars($group->getName()) : '';?>"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("comment");?>:</label> + <div class="controls"> + <textarea name="comment" id="comment" rows="4" cols="50"><?php print $group ? htmlspecialchars($group->getComment()) : '';?></textarea> + </div> + </div> + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button> + </div> + </form> <?php if($group) { diff --git a/views/bootstrap/class.SetWorkflow.php b/views/bootstrap/class.SetWorkflow.php index 3569f80ba..2c213facd 100644 --- a/views/bootstrap/class.SetWorkflow.php +++ b/views/bootstrap/class.SetWorkflow.php @@ -76,17 +76,17 @@ $(document).ready( function() { $workflows = $dms->getAllWorkflows(); if($workflows) { ?> - <form action="../op/op.SetWorkflow.php" method="post" name="form1"> + <form class="form-horizontal" action="../op/op.SetWorkflow.php" method="post" name="form1"> <?php echo createHiddenFieldWithKey('setworkflow'); ?> <input type="hidden" name="documentid" value="<?php print $document->getID(); ?>"> <input type="hidden" name="version" value="<?php print $latestContent->getVersion(); ?>"> <input type="hidden" name="showtree" value="<?php echo showtree();?>"> - <table class="table-condensed"> - <tr> - <td> - <div class="cbSelectTitle"><?php printMLText("workflow");?>:</div> - </td> - <td> + + <div class="control-group"> + <label class="control-label"> + <div class="cbSelectTitle"><?php printMLText("workflow");?>:</div> + </label> + <div class="controls"> <?php echo "<select id=\"selector\" class=\"_chzn-select-deselect\" name=\"workflow\" data-placeholder=\"".getMLText('select_workflow')."\">"; $mandatoryworkflow = $user->getMandatoryWorkflow(); @@ -99,14 +99,13 @@ $(document).ready( function() { } echo "</select>"; ?> - </td> - </tr> - <tr> - <td> - </td> - <td><input type="submit" class="btn" value="<?php printMLText("set_workflow");?>"></td> - </tr> - </table> + </div> + </div> + + <div class="controls"> + <input type="submit" class="btn" value="<?php printMLText("set_workflow");?>"> + </div> + </form> <?php } else { diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php index 13aeef5e1..9c3083aab 100644 --- a/views/bootstrap/class.UserDefaultKeywords.php +++ b/views/bootstrap/class.UserDefaultKeywords.php @@ -76,12 +76,15 @@ $(document).ready(function() { $this->contentHeading(getMLText("edit_default_keywords")); ?> <div class="row-fluid"> -<div class="span4"> -<div class="well"> -<?php echo getMLText("selection")?>: - <select id="selector"> - <option value="-1"><?php echo getMLText("choose_category")?> - <option value="0"><?php echo getMLText("new_default_keyword_category")?> + <div class="span4"> + <div class="well"> + <form class="form-horizontal"> + <div class="control-group"> + <label class="control-label" for="login"><?php printMLText("selection");?>:</label> + <div class="controls"> + <select id="selector"> + <option value="-1"><?php echo getMLText("choose_category")?> + <option value="0"><?php echo getMLText("new_default_keyword_category")?> <?php $selected=0; @@ -96,62 +99,62 @@ $(document).ready(function() { $count++; } ?> - </select> -</div> -</div> + </select> + </div> + </div> + </form> + </div> + </div> -<div class="span8"> -<div class="well"> + <div class="span8"> + <div class="well"> -<table class="table-condensed"><tr> - <td id="keywords0" style="display : none;"> - <form action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory"> - <input type="hidden" name="action" value="addcategory"> - <table class="table-condensed"> - <tr> - <td><?php printMLText("name");?>:</td> - <td><input type="text" name="name"></td> - </tr> - <tr> - <td></td><td><input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>"></td> - </tr> - </table> - </form> - </td> + <div id="keywords0" style="display : none;"> + <form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory"> + <input type="hidden" name="action" value="addcategory"> + + <div class="control-group"> + <label class="control-label"><?php printMLText("name");?>:</label> + <div class="controls"> + <input type="text" name="name"> + </div> + </div> + <div class="controls"> + <input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>"> + </div> + </form> + </div> <?php foreach ($categories as $category) { $owner = $category->getOwner(); if ($owner->getID() != $user->getID()) continue; - print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">"; + print "<div id=\"keywords".$category->getID()."\" style=\"display : none;\">"; ?> - <table class="table-condensed"> - <tr> - <td></td> - <td> - <form action="../op/op.UserDefaultKeywords.php" method="post"> - <?php echo createHiddenFieldWithKey('removecategory'); ?> - <input type="hidden" name="action" value="removecategory"> - <input type="hidden" name="categoryid" value="<?php echo $category->getID()?>"> - <button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button> - </form> - </td> - </tr> - <tr> - <td><?php echo getMLText("name")?>:</td> - <td> - <form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>"> + <div class="controls"> + <form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post"> + <?php echo createHiddenFieldWithKey('removecategory'); ?> + <input type="hidden" name="action" value="removecategory"> + <input type="hidden" name="categoryid" value="<?php echo $category->getID()?>"> + <button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button> + </form> + </div> + + <form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>"> + <div class="control-group"> + <label class="control-label"><?php echo getMLText("name")?>:</label> + <div class="controls"> <?php echo createHiddenFieldWithKey('editcategory'); ?> <input type="hidden" name="action" value="editcategory"> <input type="hidden" name="categoryid" value="<?php echo $category->getID()?>"> <input name="name" type="text" value="<?php echo htmlspecialchars($category->getName())?>"> <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button> - </form> - </td> - </tr> - <tr> - <td><?php echo getMLText("default_keywords")?>:</td> - <td> + </div> + </div> + </form> + <div class="control-group"> + <label class="control-label"><?php echo getMLText("default_keywords")?>:</label> + <div class="controls"> <?php $lists = $category->getKeywordLists(); if (count($lists) == 0) @@ -175,11 +178,9 @@ $(document).ready(function() { </form> <br> <?php } ?> - </td> - </tr> - <tr> - <td></td> - <td> + </div> + </div> + <div class="controls"> <form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo $category->getID().".add"?>"> <?php echo createHiddenFieldWithKey('newkeywords'); ?> <input type="hidden" name="action" value="newkeywords"> @@ -187,13 +188,10 @@ $(document).ready(function() { <input type="text" name="keywords"> <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>"> </form> - </td> - </tr> + </div> - </table> - </td> + </div> <?php } ?> - </tr></table> </div> </div> </div> diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php index fe02ab698..6844cd1ce 100644 --- a/views/bootstrap/class.WorkflowMgr.php +++ b/views/bootstrap/class.WorkflowMgr.php @@ -135,13 +135,13 @@ $(document).ready(function() { } ?> <div class="well"> - <form action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data"> + <form class="form-horizontal" action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data"> <?php if($workflow) { echo createHiddenFieldWithKey('editworkflow'); ?> - <input type="Hidden" name="workflowid" value="<?php print $workflow->getID();?>"> - <input type="Hidden" name="action" value="editworkflow"> + <input type="hidden" name="workflowid" value="<?php print $workflow->getID();?>"> + <input type="hidden" name="action" value="editworkflow"> <?php } else { echo createHiddenFieldWithKey('addworkflow'); @@ -150,21 +150,26 @@ $(document).ready(function() { <?php } ?> - <table class="table-condensed"> + <?php if($workflow && !$workflow->isUsed()) { ?> - <tr><td></td><td><a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a></td></tr> + <div class="controls"> + <a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a> + </div> <?php } ?> - <tr> - <td><?php printMLText("workflow_name");?>:</td> - <td><input type="text" name="name" value="<?php print ($workflow ? htmlspecialchars($workflow->getName()) : "");?>"></td> - </tr> - <tr> - <td><?php printMLText("workflow_initstate");?>:</td> - <td><select name="initstate"> + <div class="control-group"> + <label class="control-label"><?php printMLText("workflow_name");?>:</label> + <div class="controls"> + <input type="text" name="name" value="<?php print ($workflow ? htmlspecialchars($workflow->getName()) : "");?>"> + </div> + </div> + <div class="control-group"> + <label class="control-label"><?php printMLText("workflow_initstate");?>:</label> + <div class="controls"> + <select name="initstate"> <?php foreach($workflowstates as $workflowstate) { echo "<option value=\"".$workflowstate->getID()."\""; @@ -173,14 +178,14 @@ $(document).ready(function() { echo ">".htmlspecialchars($workflowstate->getName())."</option>\n"; } ?> - </select></td> - </tr> + </select> + </div> + </div> + + <div class="controls"> + <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button> + </div> - <tr> - <td></td> - <td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td> - </tr> - </table> </form> </div> <?php