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

do not take images from out/images anymore

Browse Source 
use views/bootstrap/images instead
This commit is contained in:
Uwe Steinmann 2018-10-11 10:51:04 +02:00
parent 4038503fe2
commit 950de8e293
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
views/bootstrap/class.Bootstrap.php
View File

@ -1464,7 +1464,7 @@ $(document).ready(function() {
if ( is_file($this->imgpath.$img) ) { if ( is_file($this->imgpath.$img) ) {
return $this->imgpath.$img; return $this->imgpath.$img;
} }
return "../out/images/$img"; return "";
} /* }}} */ } /* }}} */
function getCountryFlag($lang) { /* {{{ */ function getCountryFlag($lang) { /* {{{ */
@ -2265,7 +2265,6 @@ $(document).ready( function() {
$content = ''; $content = '';
$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; $content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
// $content .= "<td><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></td>";
$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.svg\" width=\"24\" height=\"24\" border=0></a></td>\n"; $content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.svg\" width=\"24\" height=\"24\" border=0></a></td>\n";
$content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>"; $content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>"; $content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>";

6
views/bootstrap/class.ObjectCheck.php
View File

@ -43,7 +43,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
array_shift($tmparr); array_shift($tmparr);
if(count($tmparr) != count(array_unique($tmparr))) { if(count($tmparr) != count(array_unique($tmparr))) {
print "<tr>\n"; print "<tr>\n";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->getImgPath("folder.svg")."\" width=18 height=18 border=0></a></td>";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
print htmlspecialchars($path); print htmlspecialchars($path);
print "</a></td>"; print "</a></td>";
@ -63,7 +63,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
if($folderList != $path) { if($folderList != $path) {
print "<tr>\n"; print "<tr>\n";
$this->needsrepair = true; $this->needsrepair = true;
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->getImgPath("folder.svg")."\" width=18 height=18 border=0></a></td>";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
$tmppath = $folder->getPath(); $tmppath = $folder->getPath();
for ($i = 1; $i < count($tmppath); $i++) { for ($i = 1; $i < count($tmppath); $i++) {
@ -97,7 +97,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
print "<tr>\n"; print "<tr>\n";
$this->needsrepair = true; $this->needsrepair = true;
$lc = $document->getLatestContent(); $lc = $document->getLatestContent();
print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".$this->getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>"; print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"".$this->getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>";
print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/"; print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
$folder = $document->getFolder(); $folder = $document->getFolder();
$tmppath = $folder->getPath(); $tmppath = $folder->getPath();

1
views/bootstrap/class.Search.php
View File

@ -487,7 +487,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
$comment = htmlspecialchars($document->getComment()); $comment = htmlspecialchars($document->getComment());
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
//print "<td><img src=\"../out/images/file.gif\" class=\"mimeicon\"></td>";
if (in_array(2, $searchin)) { if (in_array(2, $searchin)) {
$docName = $this->markQuery(htmlspecialchars($document->getName()), "i"); $docName = $this->markQuery(htmlspecialchars($document->getName()), "i");
} else { } else {

17
views/bootstrap/class.Statistic.php
View File

@ -164,14 +164,17 @@ class SeedDMS_View_Statistic extends SeedDMS_Bootstrap_Style {
$this->storage_size=0; $this->storage_size=0;
?> ?>
<style type="text/css"> <style type="text/css">
.folderClass { li.documentClass, li.folderClass {
list-style-image : url(<?php $this->printImgPath("folder_closed.gif");?>); margin: 0;
list-style : url(<?php $this->printImgPath("folder_closed.gif");?>); padding: 4px 0 4px 30px;
list-style: none;
background-image: url("<?php $this->printImgPath("text-x-preview.svg");?>");
background-repeat: no-repeat;
background-position: left top;
background-size: 24px;
} }
li.folderClass {
.documentClass { background-image: url("<?php $this->printImgPath("folder.svg");?>");
list-style-image : url(<?php $this->printImgPath("file.gif");?>);
list-style : url(<?php $this->printImgPath("file.gif");?>);
} }
</style> </style>