Merge branch 'develop' into hooks

This commit is contained in:
Uwe Steinmann 2013-04-30 19:27:33 +02:00
commit 8adb1ad5f6

View File

@ -128,32 +128,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$approvalStatus = $latestContent->getApprovalStatus();
?>
<ul class="nav nav-tabs" id="docinfotab">
<li class="active"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('document_infos'); ?> / <?php printMLText('current_version'); ?></a></li>
<?php if (count($versions)>1) { ?>
<li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
<?php
}
if($workflowmode == 'traditional') {
if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) {
?>
<li><a data-target="#revapp" data-toggle="tab"><?php echo getMLText('reviewers')."/".getMLText('approvers'); ?></a></li>
<?php
}
} else {
if($workflow) {
?>
<li><a data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
<?php
}
}
?>
<li><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
<li><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="docinfo">
<div class="row-fluid">
<div class="span3">
@ -274,6 +248,32 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
</div>
<div class="span9">
<ul class="nav nav-tabs" id="docinfotab">
<li class="active"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
<?php if (count($versions)>1) { ?>
<li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
<?php
}
if($workflowmode == 'traditional') {
if((is_array($reviewStatus) && count($reviewStatus)>0) ||
(is_array($approvalStatus) && count($approvalStatus)>0)) {
?>
<li><a data-target="#revapp" data-toggle="tab"><?php echo getMLText('reviewers')."/".getMLText('approvers'); ?></a></li>
<?php
}
} else {
if($workflow) {
?>
<li><a data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
<?php
}
}
?>
<li><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
<li><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="docinfo">
<?php
if(!$latestContent) {
$this->contentContainerStart();
@ -286,7 +286,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
// verify if file exists
$file_exists=file_exists($dms->contentDir . $latestContent->getPath());
$this->contentHeading(getMLText("current_version"));
$this->contentContainerStart();
print "<table class=\"table\">";
print "<thead>\n<tr>\n";
@ -443,8 +442,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
}
?>
</div>
</div>
</div>
<?php
if($workflowmode == 'traditional') {
@ -1017,6 +1014,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
?>
</div>
</div>
</div>
</div>
<?php
$this->htmlEndPage();