Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2016-04-12 08:30:35 +02:00
commit 992dc4faa0

View File

@ -52,9 +52,12 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->globalNavigation($folder); $this->globalNavigation($folder);
$this->contentStart(); $this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
?>
<div class="row-fluid">
<div class="span3">
<?php
$this->contentHeading(getMLText("document_infos")); $this->contentHeading(getMLText("document_infos"));
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<table class="table-condensed"> <table class="table-condensed">
<tr> <tr>
@ -130,6 +133,10 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
</table> </table>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();
?>
</div>
<div class="span9">
<?php
// verify if file exists // verify if file exists
$file_exists=file_exists($dms->contentDir . $version->getPath()); $file_exists=file_exists($dms->contentDir . $version->getPath());
@ -346,6 +353,9 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
</div> </div>
<?php <?php
} }
?>
</div>
<?php
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */