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

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-09 13:49:06 +02:00
commit 6d817b333c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SeedDMS_Preview/Preview/Previewer.php
View File

@ -89,7 +89,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
* @param string $target optional name of preview image (without extension) * @param string $target optional name of preview image (without extension)
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
public function createRawPreview($infile, $dir, $mimetype, $width=0, $target='') { /* {{{ */ public function createRawPreview($infile, $dir, $mimetype, $width=0, $target='', &$new=false) { /* {{{ */
if($width == 0) if($width == 0)
$width = $this->width; $width = $this->width;
else else
@ -120,6 +120,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
if($cmd) { if($cmd) {
try { try {
self::execWithTimeout($cmd, $this->timeout); self::execWithTimeout($cmd, $this->timeout);
$new = true;
} catch(Exception $e) { } catch(Exception $e) {
$this->lastpreviewfile = ''; $this->lastpreviewfile = '';
return false; return false;
@ -144,7 +145,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
* @param integer $width desired width of preview image * @param integer $width desired width of preview image
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
public function createPreview($object, $width=0) { /* {{{ */ public function createPreview($object, $width=0, &$new=false) { /* {{{ */
if(!$object) if(!$object)
return false; return false;
@ -155,7 +156,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
$document = $object->getDocument(); $document = $object->getDocument();
$file = $document->_dms->contentDir.$object->getPath(); $file = $document->_dms->contentDir.$object->getPath();
$target = $this->getFileName($object, $width); $target = $this->getFileName($object, $width);
return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $width, $target); return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $width, $target, $new);
} /* }}} */ } /* }}} */
/** /**

2
views/bootstrap4/class.Bootstrap4.php
View File

@ -1373,7 +1373,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
'; ';
if($config['buttons']) { if($config['buttons']) {
foreach($config['buttons'] as $button) foreach($config['buttons'] as $button)
$content .= '<button class="btn'.(!empty($button['id']) ? ' btn-primary" id="'.$button['id'].'"': ' btn-secondary" ').'data-dismiss="modal" aria-hidden="true">'.$button['title'].'</button>'; $content .= '<button class="btn'.(!empty($button['id']) ? ' btn-primary" id="'.$button['id'].'"': ' btn-secondary" ').' data-dismiss="modal" aria-hidden="true">'.$button['title'].'</button>';
} }
$content .= ' $content .= '
</div> </div>