From 8a9099bbcb82bb538d8a67dfaabaf2dc46178b22 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 23 Apr 2013 19:03:56 +0200 Subject: [PATCH] various ui improvements --- styles/bootstrap/application.css | 11 +++ views/bootstrap/class.ViewDocument.php | 113 ++++++++++++++++--------- 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index f9675e25e..fcbd6ba52 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -16,6 +16,17 @@ img.mimeicon { min-height: 100px; } +ul.actions li a:hover > i { + text-decoration: none; +} +ul.actions li a > i { + color: #000; + margin-right: 5px; +} +ul.actions li a.btn > i { + font-size: 200%; +} + @media (max-width: 480px) { .nav-tabs > li { float:none; diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index a9dee42e6..dcbea99fa 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -278,35 +278,44 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; print "\n\n"; print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; - print "\n"; - print "\n"; - print ""; @@ -565,9 +581,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $this->contentContainerStart(); if($user->isAdmin()) { if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) { - print "".createHiddenFieldWithKey('removeworkflowfromdocument')."getVersion()."\" />"; + print "".createHiddenFieldWithKey('removeworkflowfromdocument')."getVersion()."\" />"; } else { - print "".createHiddenFieldWithKey('rewindworkflow')."getVersion()."\" />"; + print "".createHiddenFieldWithKey('rewindworkflow')."getVersion()."\" />"; } } @@ -746,8 +762,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
".getMLText("version")."".getMLText("file")."".getMLText("file")."".getMLText("comment")."".getMLText("status")."
    "; + print "
"; + /* + print ""; + */ $previewer = new SeedDMS_Preview_Previewer($cachedir, 100); $previewer->createPreview($latestContent); + if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) + print "getVersion()."\">"; + else + print "getVersion()."\">"; if($previewer->hasPreview($latestContent)) { print("getID()."&version=".$latestContent->getVersion()."&width=100\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"); + } else { + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } + print ""; print "".$latestContent->getVersion()."
    \n"; + print "
    \n"; print "
  • ".$latestContent->getOriginalFileName() ."
    • \n"; + print "
  • ".getMLText('version').": ".$latestContent->getVersion()."
    • \n"; if ($file_exists) - print "
  • ". SeedDMS_Core_File::format_filesize($latestContent->getFileSize()) ." ".htmlspecialchars($latestContent->getMimeType())."
    • "; + print "
  • ". SeedDMS_Core_File::format_filesize($latestContent->getFileSize()) .", ".htmlspecialchars($latestContent->getMimeType())."
    • "; else print "
  • ".getMLText("document_deleted")."
    • "; $updatingUser = $latestContent->getUser(); @@ -314,7 +323,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
  • ".getLongReadableDate($latestContent->getDate())."
    • "; print "
\n"; - print "
    \n"; + print "
      \n"; $attributes = $latestContent->getAttributes(); if($attributes) { foreach($attributes as $attribute) { @@ -335,15 +344,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
"; - print "
"; print "\n\n"; print "\n"; - print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; print "\n"; @@ -763,23 +778,33 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $file_exists=file_exists($dms->contentDir . $version->getPath()); print "\n"; - print "\n"; - print "\n"; print ""; print ""; print "\n\n"; } @@ -843,18 +875,19 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $responsibleUser = $file->getUser(); print ""; - print ""; print "\n"; print "\n"; print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n\n\n"; @@ -909,9 +942,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; print ""; print ""; - print ""; print "
".getMLText("version")."".getMLText("file")."".getMLText("file")."".getMLText("comment")."".getMLText("status")."
    "; + print "
"; + /* + print ""; + */ + if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes)) + print "getVersion()."\">"; + else + print "getVersion()."\">"; $previewer->createPreview($version); if($previewer->hasPreview($version)) { print("getID()."&version=".$version->getVersion()."&width=100\" title=\"".htmlspecialchars($version->getMimeType())."\">"); + } else { + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } + print "\n"; print "".$version->getVersion()."
    \n"; print "
  • ".$version->getOriginalFileName()."
    • \n"; - if ($file_exists) print "
  • ". SeedDMS_Core_File::format_filesize($version->getFileSize()) ." ".htmlspecialchars($version->getMimeType())."
    • "; + print "
  • ".getMLText('version').": ".$version->getVersion()."
    • \n"; + if ($file_exists) print "
  • ". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."
    • "; else print "
  • ".getMLText("document_deleted")."
    • "; $updatingUser = $version->getUser(); print "
  • ".getMLText("uploaded_by")." getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."
    • "; @@ -797,20 +822,27 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
".htmlspecialchars($version->getComment())."".getOverallStatusText($vstat["status"]).""; - print "
    "; + print "
    \n"; - print "
  • ".$file->getOriginalFileName() ."
    • \n"; + print "
  • ".htmlspecialchars($file->getName())."
    • \n"; + print "
  • ".htmlspecialchars($file->getOriginalFileName())."
    • \n"; if ($file_exists) - print "
  • ". filesize($dms->contentDir . $file->getPath()) ." bytes ".htmlspecialchars($file->getMimeType())."
    • "; + print "
  • ".SeedDMS_Core_File::format_filesize(filesize($dms->contentDir . $file->getPath())) ." bytes, ".htmlspecialchars($file->getMimeType())."
    • "; else print "
  • ".htmlspecialchars($file->getMimeType())." - ".getMLText("document_deleted")."
    • "; print "
  • ".getMLText("uploaded_by")." getEmail()."\">".htmlspecialchars($responsibleUser->getFullName())."
    • "; @@ -890,7 +923,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
".getMLText("comment")."".getMLText("document_link_by")."
getID()."\" class=\"linklist\">".htmlspecialchars($targetDoc->getName())."".htmlspecialchars($targetDoc->getComment())."".htmlspecialchars($responsibleUser->getFullName()); + print "".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName()); if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL )) - print ", ".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no")); + print "
".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no")); print "		"; if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))