gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-01 19:27:51 +01:00
commit a9a51adbb5
17 changed files with 279 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassUI_Default.php
View File

@ -359,7 +359,7 @@ class UI_Default {
} }
} }
else { else {
$resultsURI .= ($first ? "?" : "&").$key."=".$value; $resultsURI .= ($first ? "?" : "&").$key."=".$value;
} }
$first = false; $first = false;
} }

2
out/out.ChangePassword.php
View File

@ -33,7 +33,7 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
$hash = $_REQUEST["hash"]; $hash = $_REQUEST["hash"];
} else { } else {
header("Location: ../out/out.Login.php"); header("Location: ../out/out.Login.php");
exit; exit;
} }
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));

1
out/out.DocumentVersionDetail.php
View File

@ -58,6 +58,7 @@ if (!is_object($version)) {
$latestContent = $document->getLatestContent(); $latestContent = $document->getLatestContent();
if ($latestContent->getVersion()==$version->getVersion()) { if ($latestContent->getVersion()==$version->getVersion()) {
header("Location:../out/out.ViewDocument.php?documentid=".$document->getID()); header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
exit;
} }
$folder = $document->getFolder(); $folder = $document->getFolder();

1
out/out.ViewDocument.php
View File

@ -58,6 +58,7 @@ if ($document->getAccessMode($user) < M_READ) {
*/ */
if ($document->verifyLastestContentExpriry()){ if ($document->verifyLastestContentExpriry()){
header("Location:../out/out.ViewDocument.php?documentid=".$document->getID()); header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
exit;
} }
if($view) { if($view) {

54
views/bootstrap/class.AddEvent.php
View File

@ -82,38 +82,44 @@ $(document).ready(function() {
$expdate = date('Y-m-d'); $expdate = date('Y-m-d');
?> ?>
<form action="../op/op.AddEvent.php" id="form1" name="form1" method="post"> <form class="form-horizontal" action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
<table class="table-condensed">
<tr> <div class="control-group">
<td><?php printMLText("from");?>:</td> <label class="control-label"><?php printMLText("from");?>:</label>
<td><?php //$this->printDateChooser(-1, "from");?> <div class="controls"><?php //$this->printDateChooser(-1, "from");?>
<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd"> <span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>"> <input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span> </span>
</td> </div>
</tr> </div>
<tr>
<td><?php printMLText("to");?>:</td> <div class="control-group">
<td><?php //$this->printDateChooser(-1, "to");?> <label class="control-label"><?php printMLText("to");?>:</label>
<div class="controls"><?php //$this->printDateChooser(-1, "to");?>
<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd"> <span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>"> <input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i></span>
</span> </span>
</td> </div>
</tr> </div>
<tr>
<td class="inputDescription"><?php printMLText("name");?>:</td>
<td><input type="text" name="name" size="60"></td> <div class="control-group">
</tr> <label class="control-label"><?php printMLText("name");?>:</label>
<tr> <div class="controls"><input type="text" name="name" size="60"></div>
<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td> </div>
<td><textarea name="comment" rows="4" cols="80"></textarea></td>
</tr>
<tr> <div class="control-group">
<td></td><td><input class="btn" type="submit" value="<?php printMLText("add_event");?>"></td> <label class="control-label"><?php printMLText("comment");?>:</label>
</tr> <div class="controls"><textarea name="comment" rows="4" cols="80"></textarea></div>
</table> </div>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("add_event");?>">
</div>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

4
views/bootstrap/class.Categories.php
View File

@ -71,8 +71,8 @@ $(document).ready( function() {
?> ?>
<form style="display: inline-block;" method="post" action="../op/op.Categories.php" > <form style="display: inline-block;" method="post" action="../op/op.Categories.php" >
<?php echo createHiddenFieldWithKey('removecategory'); ?> <?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>"> <input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="Hidden" name="action" value="removecategory"> <input type="hidden" name="action" value="removecategory">
<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button> <button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
</form> </form>
<?php <?php

40
views/bootstrap/class.ChangePassword.php
View File

@ -50,7 +50,7 @@ document.form1.newpassword.focus();
$this->pageNavigation(getMLText("change_password")); $this->pageNavigation(getMLText("change_password"));
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form action="../op/op.ChangePassword.php" method="post" name="form1"> <form class="form-horizontal" action="../op/op.ChangePassword.php" method="post" name="form1">
<?php <?php
if ($referuri) { if ($referuri) {
echo "<input type='hidden' name='referuri' value='".$referuri."'/>"; echo "<input type='hidden' name='referuri' value='".$referuri."'/>";
@ -59,32 +59,32 @@ document.form1.newpassword.focus();
echo "<input type='hidden' name='hash' value='".$hash."'/>"; echo "<input type='hidden' name='hash' value='".$hash."'/>";
} }
?> ?>
<table class="table-condensed">
<tr> <div class="control-group">
<td><?php printMLText("password");?>:</td> <label class="control-label"><?php printMLText("password");?>:</label>
<td><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></td> <div class="controls"><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></div>
</tr> </div>
<?php <?php
if($passwordstrength > 0) { if($passwordstrength > 0) {
?> ?>
<tr> <div class="control-group">
<td><?php printMLText("password_strength");?>:</td> <label class="control-label"><?php printMLText("password_strength");?>:</label>
<td> <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> <div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
</td> </div>
</tr> </div>
<?php <?php
} }
?> ?>
<tr> <div class="control-group">
<td><?php printMLText("confirm_pwd");?>:</td> <label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
<td><input type="password" name="newpasswordrepeat" id="passwordrepeat"></td> <div class="controls"><input type="password" name="newpasswordrepeat" id="passwordrepeat"></div>
</tr> </div>
<tr> <div class="control-group">
<td></td> <label class="control-label"></label>
<td><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></td> <div class="controls"><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></div>
</tr> </div>
</table>
</form> </form>
<?php $this->contentContainerEnd(); ?> <?php $this->contentContainerEnd(); ?>
<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p> <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>

49
views/bootstrap/class.DefaultKeywords.php
View File

@ -140,21 +140,22 @@ $(document).ready( function() {
$owner = $category->getOwner(); $owner = $category->getOwner();
if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return; if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
?> ?>
<table class="table-condensed">
<tr> <div class="control-group">
<td></td> <label class="control-label"></label>
<td> <div class="controls">
<form action="../op/op.DefaultKeywords.php" method="post"> <form action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('removecategory'); ?> <?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="Hidden" name="action" value="removecategory"> <input type="Hidden" name="action" value="removecategory">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>"> <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> <button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
</form> </form>
</td> </div>
</tr> </div>
<tr>
<td><?php echo getMLText("name")?>:</td> <div class="control-group">
<td> <label class="control-label"><?php echo getMLText("name")?>:</label>
<div class="controls">
<form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post"> <form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('editcategory'); ?> <?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory"> <input type="hidden" name="action" value="editcategory">
@ -162,11 +163,12 @@ $(document).ready( function() {
<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>"> <input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button> <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</form> </form>
</td> </div>
</tr> </div>
<tr>
<td><?php echo getMLText("default_keywords")?>:</td> <div class="control-group">
<td> <label class="control-label"><?php echo getMLText("default_keywords")?>:</label>
<div class="controls">
<?php <?php
$lists = $category->getKeywordLists(); $lists = $category->getKeywordLists();
if (count($lists) == 0) if (count($lists) == 0)
@ -192,23 +194,22 @@ $(document).ready( function() {
</form> </form>
<br> <br>
<?php } ?> <?php } ?>
</td> </div>
</tr> </div>
<tr>
<td></td> <div class="control-group">
<td> <label class="control-label"></label>
<div class="controls">
<form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post"> <form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('newkeywords'); ?> <?php echo createHiddenFieldWithKey('newkeywords'); ?>
<input type="Hidden" name="action" value="newkeywords"> <input type="Hidden" name="action" value="newkeywords">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>"> <input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="text" class="keywords" name="keywords"> <input type="text" class="keywords" name="keywords">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
</form> </form>
</td> </div>
</tr> </div>
</table>
<?php <?php
} }
} /* }}} */ } /* }}} */

37
views/bootstrap/class.DocumentNotify.php
View File

@ -115,13 +115,13 @@ $(document).ready( function() {
?> ?>
<br> <br>
<form action="../op/op.DocumentNotify.php" name="form1" id="form1"> <form class=form-horizontal" action="../op/op.DocumentNotify.php" name="form1" id="form1">
<input type="hidden" name="documentid" value="<?php print $document->getID()?>"> <input type="hidden" name="documentid" value="<?php print $document->getID()?>">
<input type="hidden" name="action" value="addnotify"> <input type="hidden" name="action" value="addnotify">
<table class="table-condensed">
<tr> <div class="control-group">
<td><?php printMLText("user");?>:</td> <label class="control-label"><?php printMLText("user");?>:</label>
<td> <div class="controls">
<select name="userid"> <select name="userid">
<option value="-1"><?php printMLText("select_one");?> <option value="-1"><?php printMLText("select_one");?>
<?php <?php
@ -137,11 +137,14 @@ $(document).ready( function() {
} }
?> ?>
</select> </select>
</td> </div>
</tr> </div>
<tr>
<td><?php printMLText("group");?>:</td>
<td> <div class="control-group">
<label class="control-label"><?php printMLText("group");?>:</label>
<div class="controls">
<select name="groupid"> <select name="groupid">
<option value="-1"><?php printMLText("select_one");?> <option value="-1"><?php printMLText("select_one");?>
<?php <?php
@ -153,13 +156,13 @@ $(document).ready( function() {
} }
?> ?>
</select> </select>
</td> </div>
</tr> </div>
<tr>
<td></td> <div class="controls">
<td><input type="submit" class="btn" value="<?php printMLText("add") ?>"></td> <input type="submit" class="btn" value="<?php printMLText("add") ?>">
</tr> </div>
</table>
</form> </form>
<?php <?php

25
views/bootstrap/class.EditAttributes.php
View File

@ -47,27 +47,28 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("edit_attributes")); $this->contentHeading(getMLText("edit_attributes"));
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form action="../op/op.EditAttributes.php" name="form1" method="POST"> <form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
<?php echo createHiddenFieldWithKey('editattributes'); ?> <?php echo createHiddenFieldWithKey('editattributes'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getID();?>"> <input type="hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="Hidden" name="version" value="<?php print $version->getVersion();?>"> <input type="hidden" name="version" value="<?php print $version->getVersion();?>">
<table class="table-condensed">
<?php <?php
if($attrdefs) { if($attrdefs) {
foreach($attrdefs as $attrdef) { foreach($attrdefs as $attrdef) {
?> ?>
<tr> <div class="control-group">
<td><?php echo htmlspecialchars($attrdef->getName()); ?></td> <label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
<td><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></td> <div class="controls">
</tr> <?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?>
</div>
</div>
<?php <?php
} }
} }
?> ?>
<tr> <div class="controls">
<td colspan="2"><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td> <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
</tr> </div>
</table>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

21
views/bootstrap/class.EditComment.php
View File

@ -84,20 +84,19 @@ $(document).ready(function() {
$this->contentHeading(getMLText("edit_comment")); $this->contentHeading(getMLText("edit_comment"));
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form action="../op/op.EditComment.php" id="form1" name="form1" method="post"> <form class="form-horizontal" action="../op/op.EditComment.php" id="form1" name="form1" method="post">
<?php echo createHiddenFieldWithKey('editcomment'); ?> <?php echo createHiddenFieldWithKey('editcomment'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getID();?>"> <input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="Hidden" name="version" value="<?php print $version->getVersion();?>"> <input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
<table class="table-condensed"> <div class="control-group">
<tr> <label class="control-label"><?php printMLText("comment");?>:</label>
<td class="inputDescription"><?php printMLText("comment");?>:</td> <div class="controls">
<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea></td> <textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea>
</tr> </div>
<tr> </div>
<td></td> <div class="controls">
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td> <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
</tr> </div>
</table>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

71
views/bootstrap/class.EditEvent.php
View File

@ -84,43 +84,46 @@ $(document).ready(function() {
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form action="../op/op.EditEvent.php" id="form1" name="form1" method="POST"> <form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
<?php echo createHiddenFieldWithKey('editevent'); ?> <?php echo createHiddenFieldWithKey('editevent'); ?>
<input type="Hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>"> <input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
<table class="table-condensed"> <div class="control-group">
<tr> <label class="control-label"><?php printMLText("from");?>:</label>
<td><?php printMLText("from");?>:</td> <div class="controls">
<td><?php //$this->printDateChooser($event["start"], "from");?> <?php //$this->printDateChooser($event["start"], "from");?>
<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd"> <span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>"> <input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
<span class="add-on"><i class="icon-calendar"></i></span> <span class="add-on"><i class="icon-calendar"></i>
</span> </span>
</td> </div>
</tr> </div>
<tr> <div class="control-group">
<td><?php printMLText("to");?>:</td> <label class="control-label"><?php printMLText("to");?>:</label>
<td><?php //$this->printDateChooser($event["stop"], "to");?> <div class="controls">
<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd"> <?php //$this->printDateChooser($event["stop"], "to");?>
<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>"> <span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
<span class="add-on"><i class="icon-calendar"></i></span> <input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
</span> <span class="add-on"><i class="icon-calendar"></i></span>
</td> </span>
</tr> </div>
<tr> </div>
<td class="inputDescription"><?php printMLText("name");?>:</td> <div class="control-group">
<td><input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60"></td> <label class="control-label"><?php printMLText("name");?>:</label>
</tr> <div class="controls">
<tr> <input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60">
<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td> </div>
<td><textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea></td> </div>
</tr> <div class="control-group">
<tr> <label class="control-label"><?php printMLText("comment");?>:</label>
<td></td> <div class="controls">
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td> <textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea>
</tr> </div>
</table> </div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</div>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

32
views/bootstrap/class.FolderAccess.php
View File

@ -158,8 +158,8 @@ $(document).ready(function() {
?> ?>
<form class="form-inline" action="../op/op.FolderAccess.php"> <form class="form-inline" action="../op/op.FolderAccess.php">
<?php echo createHiddenFieldWithKey('folderaccess'); ?> <?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>"> <input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="Hidden" name="action" value="setdefault"> <input type="hidden" name="action" value="setdefault">
<?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?> <?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?>
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button> <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</form> </form>
@ -179,9 +179,9 @@ $(document).ready(function() {
print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n"; print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
print "<form action=\"../op/op.FolderAccess.php\">\n"; print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n"; echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n"; print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">\n"; print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n"; print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<td>\n"; print "<td>\n";
$this->printAccessModeSelection($userAccess->getMode()); $this->printAccessModeSelection($userAccess->getMode());
print "</td>\n"; print "</td>\n";
@ -191,9 +191,9 @@ $(document).ready(function() {
print "</form>\n"; print "</form>\n";
print "<form action=\"../op/op.FolderAccess.php\">\n"; print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n"; echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n"; print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n"; print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n"; print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<td>\n"; print "<td>\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>"; print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n"; print "</td>\n";
@ -209,9 +209,9 @@ $(document).ready(function() {
print "<td>". htmlspecialchars($groupObj->getName()) . "</td>"; print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
print "<form action=\"../op/op.FolderAccess.php\">"; print "<form action=\"../op/op.FolderAccess.php\">";
echo createHiddenFieldWithKey('folderaccess')."\n"; echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">"; print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">"; print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">"; print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
print "<td>"; print "<td>";
$this->printAccessModeSelection($groupAccess->getMode()); $this->printAccessModeSelection($groupAccess->getMode());
print "</td>\n"; print "</td>\n";
@ -221,9 +221,9 @@ $(document).ready(function() {
print "</form>"; print "</form>";
print "<form action=\"../op/op.FolderAccess.php\">\n"; print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n"; echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n"; print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n"; print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n"; print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
print "<td>"; print "<td>";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>"; print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n"; print "</td>\n";
@ -236,8 +236,8 @@ $(document).ready(function() {
?> ?>
<form action="../op/op.FolderAccess.php" id="form1" name="form1"> <form action="../op/op.FolderAccess.php" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('folderaccess'); ?> <?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>"> <input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
<input type="Hidden" name="action" value="addaccess"> <input type="hidden" name="action" value="addaccess">
<table class="table-condensed"> <table class="table-condensed">
<tr> <tr>
<td><?php printMLText("user");?>:</td> <td><?php printMLText("user");?>:</td>

4
views/bootstrap/class.Login.php
View File

@ -125,13 +125,13 @@ $(document).ready( function() {
<div class="control-group"> <div class="control-group">
<label class="control-label" for="login"><?php printMLText("user_login");?>:</label> <label class="control-label" for="login"><?php printMLText("user_login");?>:</label>
<div class="controls"> <div class="controls">
<input type="text" id="login" name="login" placeholder="login" required> <input type="text" id="login" name="login" placeholder="login" autocomplete="off" required>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="pwd"><?php printMLText("password");?>:</label> <label class="control-label" for="pwd"><?php printMLText("password");?>:</label>
<div class="controls"> <div class="controls">
<input type="Password" id="pwd" name="pwd" required> <input type="Password" id="pwd" name="pwd" autocomplete="off" required>
</div> </div>
</div> </div>
<?php if($enableLanguageSelector) { ?> <?php if($enableLanguageSelector) { ?>

23
views/bootstrap/class.MoveFolder.php
View File

@ -51,20 +51,19 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form action="../op/op.MoveFolder.php" name="form1"> <form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>"> <input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>"> <input type="hidden" name="showtree" value="<?php echo showtree();?>">
<table class="table-condensed"> <div class="control-group">
<tr> <label class="control-label"><?php printMLText("choose_target_folder");?>:</label>
<td><?php printMLText("choose_target_folder");?>:</td> <div class="controls">
<td><?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?></td> <?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?>
</tr> </div>
<tr> </div>
<td></td> <div class="controls">
<td><input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>"></td> <input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>">
</tr> </div>
</table> </form>
</form>
<?php <?php

41
views/bootstrap/class.OverrideContentStatus.php
View File

@ -84,26 +84,31 @@ $(document).ready(function() {
// Display the Review form. // Display the Review form.
?> ?>
<form method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1"> <form class="form-horizontal" method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
<table class="table-condensed"> <div class="control-group">
<tr><td><?php echo(printMLText("comment")); ?>:</td> <label class="control-label"><?php echo(printMLText("comment"));?>:</label>
<td><textarea name="comment" cols="40" rows="4"></textarea> <div class="controls">
</td></tr> <textarea name="comment" cols="40" rows="4"></textarea>
<tr><td><?php echo(printMLText("status")); ?>:</td> </div>
<td><select name="overrideStatus"> </div>
<option value=''></option> <div class="control-group">
<?php <label class="control-label"><?php echo(printMLText("status")); ?>:</label>
<div class="controls">
<select name="overrideStatus">
<option value=''></option>
<?php
if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>"; if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>"; if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
?> ?>
</select> </select>
</td></tr><tr><td></td><td> </div></div>
<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/> <div class="controls">
<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/> <input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/> <input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
</td></tr></table> <input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
</div>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

34
views/bootstrap/class.PasswordForgotten.php
View File

@ -73,27 +73,31 @@ document.form1.email.focus();
?> ?>
<?php $this->contentContainerStart(); ?> <?php $this->contentContainerStart(); ?>
<form action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1"> <form class="form-horizontal" action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
<?php <?php
if ($referrer) { if ($referrer) {
echo "<input type='hidden' name='referuri' value='".$referrer."'/>"; echo "<input type='hidden' name='referuri' value='".$referrer."'/>";
} }
?> ?>
<p><?php printMLText("password_forgotten_text"); ?></p> <p><?php printMLText("password_forgotten_text"); ?></p>
<table class="table-condensed">
<tr> <div class="control-group">
<td><?php printMLText("login");?>:</td> <label class="control-label"><?php printMLText("login");?>:</label>
<td><input type="text" name="login" id="login"></td> <div class="controls">
</tr> <input type="text" name="login" id="login">
<tr> </div>
<td><?php printMLText("email");?>:</td> </div>
<td><input type="text" name="email" id="email"></td> <div class="control-group">
</tr> <label class="control-label"><?php printMLText("email");?>:</label>
<tr> <div class="controls">
<td></td> <input type="text" name="email" id="email">
<td><input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>"></td> </div>
</tr> </div>
</table>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>">
</div>
</form> </form>
<?php $this->contentContainerEnd(); ?> <?php $this->contentContainerEnd(); ?>
<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p> <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>