diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 2abfbac7c..0be5f097d 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -182,7 +182,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } foreach ($reviewStatus["grpstatus"] as $st) { - if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { + if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); @@ -268,7 +268,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } foreach ($approvalStatus["grpstatus"] as $st) { - if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { + if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) { $document = $dms->getDocument($st["documentID"]); if ($printheader){ print ""; diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 24e4416f9..cf1869653 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -31,19 +31,22 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { - protected function showTextField($name, $value, $type='') { /* {{{ */ + protected function showTextField($name, $value, $type='', $placeholder) { /* {{{ */ if($type != 'password' && strlen($value) > 80) - echo ''; - elseif(strlen($value) > 40) - echo ''; - elseif(strlen($value) > 30) - echo ''; - elseif(strlen($value) > 18) - echo ''; - elseif(strlen($value) > 12) - echo ''; - else - echo ''; + echo ''; + else { + if(strlen($value) > 40) + $class = 'input-xxlarge'; + elseif(strlen($value) > 30) + $class = 'input-xlarge'; + elseif(strlen($value) > 18) + $class = 'input-large'; + elseif(strlen($value) > 12) + $class = 'input-medium'; + else + $class = 'input-small'; + echo ''; + } } /* }}} */ function show() { /* {{{ */