gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-08-18 16:22:23 +02:00
commit 92c24739bf
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,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"]);
@ -217,7 +217,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 "<table class=\"table table-condensed\">";

27
views/bootstrap/class.Settings.php
View File

@ -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 '<textarea class="input-xlarge" name="'.$name.'">'.$value.'</textarea>';
elseif(strlen($value) > 40)
echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="input-xxlarge" name="'.$name.'" value="'.$value.'"/>';
elseif(strlen($value) > 30)
echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="input-xlarge" name="'.$name.'" value="'.$value.'"/>';
elseif(strlen($value) > 18)
echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="input-large" name="'.$name.'" value="'.$value.'"/>';
elseif(strlen($value) > 12)
echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="input-medium" name="'.$name.'" value="'.$value.'"/>';
else
echo '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="input-small" name="'.$name.'" value="'.$value.'"/>';
echo '<textarea class="input-xxlarge" name="'.$name.'">'.$value.'</textarea>';
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 '<input '.($type=='password' ? 'type="password"' : 'type="text"').'" class="'.$class.'" name="'.$name.'" value="'.$value.'" placeholder="'.$placeholder.'"/>';
}
} /* }}} */
function show() { /* {{{ */