From 360b1be1593bcf327349673dd02711044dd02a7a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Aug 2015 11:56:48 +0200 Subject: [PATCH 1/3] make textarea wider --- views/bootstrap/class.Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9b9f6b46c..ff70b53dd 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -33,7 +33,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { protected function showTextField($name, $value, $type='') { /* {{{ */ if($type != 'password' && strlen($value) > 80) - echo ''; + echo ''; elseif(strlen($value) > 40) echo ''; elseif(strlen($value) > 30) From 0c9a95aa44a96deec58d72173299b34967a41465 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Aug 2015 22:21:47 +0200 Subject: [PATCH 2/3] input fields can have a placeholder --- views/bootstrap/class.Settings.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index ff70b53dd..1479d4012 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 ''; + 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() { /* {{{ */ From 5a1c4768af0945b848686849a73591c9cc4eb067 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 18 Aug 2015 16:10:33 +0200 Subject: [PATCH 3/3] show also documents that needs to be reviewed/approved by the owner hiding it here makes no sense, as review/approval can be done anyway --- views/bootstrap/class.MyDocuments.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 "";