From 3a4930d28d2499ea542a290ae8c5d011ccf0865f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 13 Jun 2013 14:57:16 +0200 Subject: [PATCH] use full with of browser if tree and clipboard are turned off --- views/bootstrap/class.ViewFolder.php | 35 ++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 6eaf1a5f4..7ea3117c6 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -93,11 +93,21 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder); echo "
\n"; - echo "
\n"; - if ($enableFolderTree) { - if ($showtree==1){ - $this->contentHeading("", true); - $this->contentContainerStart(); + + // dynamic columns - left column removed if no content and right column then fills span12. + if (!($enableFolderTree || $enableClipboard)) { + $LeftColumnSpan = 0; + $RightColumnSpan = 12; + } else { + $LeftColumnSpan = 4; + $RightColumnSpan = 8; + } + if ($LeftColumnSpan > 0) { + echo "
\n"; + if ($enableFolderTree) { + if ($showtree==1){ + $this->contentHeading("", true); + $this->contentContainerStart(); ?> printNewTreeNavigation($folderid, M_READ, 0, ''); - $this->contentContainerEnd(); - } else { - $this->contentHeading("", true); + $this->printNewTreeNavigation($folderid, M_READ, 0, ''); + $this->contentContainerEnd(); + } else { + $this->contentHeading("", true); + } + if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard()); + echo "
\n"; } } - if (1 || $enableClipboard) $this->printClipboard($this->params['session']->getClipboard()); - echo "
\n"; - echo "
\n"; + echo "
\n"; $this->contentHeading(getMLText("folder_infos"));