diff --git a/browse.php b/browse.php
index 6bb1b66..4179468 100644
--- a/browse.php
+++ b/browse.php
@@ -6,31 +6,31 @@
* Document Management Made Simple
* Copyright (C) 2008 KnowledgeTree Inc.
* Portions copyright The Jam Warehouse Software (Pty) Limited
- *
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License version 3 as published by the
* Free Software Foundation.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see %s ', $contenttype, $link);
+ if($aDataRow['folder']->isSymbolicLink()){
+ return sprintf('%s ', $contenttype, $link);
+ }else{
+ return sprintf('%s ', $contenttype, $link);
+ }
} else {
- $contenttype = $this->_mimeHelper($aDataRow["document"]->getMimeTypeId());
- $link = $this->renderDocumentLink($aDataRow);
- $size = $this->prettySize($aDataRow["document"]->getSize());
- return sprintf('%s (%s) ', $contenttype, $link, $size);
+ $contenttype = $this->_mimeHelper($aDataRow["document"]->getMimeTypeId());
+ $link = $this->renderDocumentLink($aDataRow);
+
+ //Render an image instead of the size in case of a shortcut
+ if($aDataRow['document']->isSymbolicLink()){
+ return sprintf('%s ', $contenttype, $link);
+ }else{
+ $size = $this->prettySize($aDataRow["document"]->getSize());
+ return sprintf('%s (%s) ', $contenttype, $link, $size);
+ }
}
}
@@ -359,6 +390,11 @@ class AdvancedSingleSelectionColumn extends AdvancedSelectionColumn {
}
function renderHeader() {
+ global $main;
+ //include some javascript to force real single selections
+ if($this->show_folders && $this->show_documents){
+ $main->requireJSResource("resources/js/singleselect.js");
+ }
return ' ';
}
@@ -380,7 +416,12 @@ class AdvancedSingleSelectionColumn extends AdvancedSelectionColumn {
return ' ';
}
- return '{$title} {$title}
{foreach from=$list.folders item=item}
- {$item.0|sanitize}
+ {$item.0|sanitize}
+ {if $item.2}
+ ({$item.2})
+ {/if}
{$item.1|sanitize}
{/foreach}
@@ -42,7 +45,10 @@
{foreach from=$list.documents item=item}
- {$item.0|sanitize}
+ {$item.0|sanitize}
+ {if $item.2}
+ ({$item.2})
+ {/if}
{$item.1|sanitize}
{/foreach}
@@ -50,4 +56,4 @@
{/if}
-{$form->render()}
+{$form->render()}
\ No newline at end of file
diff --git a/templates/ktcore/bulk_action_confirm.smarty b/templates/ktcore/bulk_action_confirm.smarty
new file mode 100755
index 0000000..950c0dd
--- /dev/null
+++ b/templates/ktcore/bulk_action_confirm.smarty
@@ -0,0 +1,3 @@
+{$context->getDisplayName()}
+
+{$form->render()}
diff --git a/templates/ktcore/bulk_action_listing.smarty b/templates/ktcore/bulk_action_listing.smarty
index 9270d3e..9014386 100644
--- a/templates/ktcore/bulk_action_listing.smarty
+++ b/templates/ktcore/bulk_action_listing.smarty
@@ -59,7 +59,11 @@
{i18n}Folders{/i18n}
{foreach from=$folders item=folder}
-{$folder|sanitize}
+{$folder.name|sanitize}
+{if $folder.notice}
+ ({$folder.notice})
+{/if}
+
{/foreach}
{/if}
@@ -68,7 +72,11 @@
{i18n}Documents{/i18n}
{foreach from=$documents item=document}
-{$document|sanitize}
+{$document.name|sanitize}
+{if $document.notice}
+ ({$document.notice})
+{/if}
+
{/foreach}
{/if}
@@ -86,4 +94,4 @@
{$failedform->render()}
{else}
{$form->render()}
-{/if}
+{/if}
\ No newline at end of file
diff --git a/templates/ktcore/folder/shortcut.smarty b/templates/ktcore/folder/shortcut.smarty
new file mode 100755
index 0000000..f979e4a
--- /dev/null
+++ b/templates/ktcore/folder/shortcut.smarty
@@ -0,0 +1,21 @@
+{i18n}Add Shortcut{/i18n}
+
+
+{i18n}Select a document or folder to make a shortcut to.{/i18n}
+
+
+{foreach from=$breadcrumbs item=breadcrumb name=bc}
+ {if !$smarty.foreach.bc.last}
+ {$breadcrumb.name|sanitize} »
+ {else}
+ {$breadcrumb.name|sanitize}
+ {/if}
+{/foreach}
+
+
diff --git a/view.php b/view.php
index d8b77ba..42d4de3 100644
--- a/view.php
+++ b/view.php
@@ -152,7 +152,20 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
);
$this->oDocument =& $oDocument;
- $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
+
+ //Figure out if we came here by navigating trough a shortcut.
+ //If we came here from a shortcut, the breadcrumbspath should be relative
+ //to the shortcut folder.
+ $iSymLinkFolderId = KTUtil::arrayGet($_REQUEST, 'fShortcutFolder', null);
+ if(is_numeric($iSymLinkFolderId)){
+ $oBreadcrumbsFolder = Folder::get($iSymLinkFolderId);
+ $aOptions['final'] = false;
+ $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForFolder($oBreadcrumbsFolder,$aOptions));
+ $this->aBreadcrumbs[] = array('name'=>$this->oDocument->getName());
+ }else{
+ $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions, $iSymLinkFolderId));
+ }
+
$this->oPage->setBreadcrumbDetails(_kt('document details'));
$this->addPortlets('Document Details');
