+
+
getID() : "") ."\">";
print "
\n";
?>
@@ -746,7 +757,9 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
@@ -928,136 +941,109 @@ function folderSelectedCallback(id, name) {
exit;
} /* }}} */
- // navigation flag is used for items links (navigation or selection)
- function printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) { /* {{{ */
- if ($this->params['expandfoldertree']==2){
-
- // folder completely open
- $is_open=true;
-
- }else if ($this->params['expandfoldertree']==1 && $folderID==$this->params['rootfolderid'] ){
-
- $is_open=true;
-
- }else{
- // open the tree until the current folder
- $is_open=false;
-
- if ($currentFolderID!=-1){
-
- $currentFolder=$this->params['dms']->getFolder($currentFolderID);
-
- if (is_object($currentFolder)){
-
- $parent=$currentFolder->getParent();
-
- while (is_object($parent)){
- if ($parent->getID()==$folderID){
- $is_open=true;
- break;
+ /**
+ * Create a tree of folders using jqtree.
+ *
+ * The tree can contain folders only or include documents.
+ *
+ * @params integer $folderid current folderid. If set the tree will be
+ * folded out and the all folders in the path will be visible
+ * @params integer $accessmode use this access mode when retrieving folders
+ * and documents shown in the tree
+ * @params boolean $showdocs set to true if tree shall contain documents
+ * as well.
+ */
+ function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0) { /* {{{ */
+ function jqtree($path, $folder, $user, $showdocs=1) {
+ if($path) {
+ $pathfolder = array_shift($path);
+ $subfolders = $folder->getSubFolders();
+ $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
+ $children = array();
+ foreach($subfolders as $subfolder) {
+ $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$subfolder->hasSubFolders() ? true : false, 'is_folder'=>true);
+ if($pathfolder->getID() == $subfolder->getID()) {
+ if($showdocs) {
+ $documents = $folder->getDocuments();
+ $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
+ foreach($documents as $document) {
+ $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
+ $children[] = $node2;
+ }
}
- $parent=$parent->getParent();
+ $node['children'] = jqtree($path, $subfolder, $user, $showdocs);
}
+ $children[] = $node;
}
+ return $children;
+ } else
+ return array();
+ }
+
+ if($folderid) {
+ $folder = $this->params['dms']->getFolder($folderid);
+ $path = $folder->getPath();
+ $folder = array_shift($path);
+ $node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>true, 'is_folder'=>true);
+ if(!$folder->hasSubFolders()) {
+ $node['load_on_demand'] = false;
+ $node['children'] = array();
+ } else {
+ $node['children'] = jqtree($path, $folder, $this->params['user'], $showdocs);
}
- }
-
- $folder = $this->params['dms']->getFolder($folderID);
- if (!is_object($folder)) return;
-
- $subFolders = $folder->getSubFolders();
- $subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $this->params['user'], M_READ);
-
- if ($folderID == $this->params['rootfolderid']) print "
\n";
-
- print "- \n";
-
- if (count($subFolders) > 0){
- print "";
- print "";
- print "\n";
- }
- else{
- print "\n";
- }
- if ($folder->getAccessMode($this->params['user']) >= $accessMode) {
-
- if ($is_open) print "";
- else print "";
-// print "";
-
- if ($folderID != $currentFolderID){
+ $tree[] = $node;
- if ($navigation) print "getName())) . "')\"";
- print " rel=\"folder_".$folder->getID()."\" ondragover=\"allowDrop(event)\" ondrop=\"onDrop(event)\"";
- print ">";
-
- } else print "";
-
- print htmlspecialchars($folder->getName());
-
- if ($folderID != $currentFolderID) print "\n";
- else print "";
-
- }
- else print "".htmlspecialchars($folder->getName())."\n";
-
- if ($is_open) print "
\n";
- else print "\n";
-
- for ($i = 0; $i < count($subFolders); $i++) {
-
- if ($subFolders[$i]->getID() == $exclude) continue;
-
- $this->printFoldersTree( $accessMode, $exclude, $subFolders[$i]->getID(),$currentFolderID,$navigation);
+ } else {
+ $root = $this->params['dms']->getFolder($this->params['rootfolderid']);
+ $tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true));
}
- print "
\n";
-
- if ($folderID == $this->params['rootfolderid']) print "
\n";
+ echo "\n";
+?>
+
+
-
-contentHeading("", true);
$this->contentContainerStart();
- $this->printFoldersTree(M_READ, -1, $this->params['rootfolderid'], $folderid, true);
+?>
+
+printNewTreeNavigation($folderid, M_READ, 0);
$this->contentContainerEnd();
-
- }else{
-
+ } else {
$this->contentHeading("", true);
}
-
} /* }}} */
function printClipboard($clipboard){ /* {{{ */
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index dad935ba0..63a59291a 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -204,9 +204,9 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
echo "";
@@ -223,53 +223,63 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
echo "";
- $this->contentContainerStart();
+// $this->contentContainerStart();
$days=$this->getDaysInMonth($month, $year);
$today = getdate(time());
$events = getEventsInInterval(mktime(0,0,0, $month, 1, $year), mktime(23,59,59, $month, $days, $year));
-
- echo "\n";
+
+ echo "";
+ echo "
";
+ echo "
";
+ echo "
";
+ $fd = getdate(mktime(12, 0, 0, $month, 1, $year));
+ for($i=0; $i<$fd['wday']-1; $i++)
+ echo "
| |
";
for ($i=1; $i<=$days; $i++){
// separate weeks
$date = getdate(mktime(12, 0, 0, $month, $i, $year));
- if (($date["wday"]==$this->firstdayofweek) && ($i!=1))
- echo "| |
\n";
+ if (($date["wday"]==$this->firstdayofweek) && ($i!=1)) {
+ echo "";
+ echo "
";
+ echo "
";
+ echo "
";
+ echo "
";
+ }
// highlight today
$class = ($year == $today["year"] && $month == $today["mon"] && $i == $today["mday"]) ? "todayHeader" : "header";
- echo "
";
- echo "| ".$i." | ";
- echo "".$this->dayNamesLong[$date["wday"]]." | ";
+ echo "".$i.". - ".$this->dayNamesLong[$date["wday"]]."
";
if ($class=="todayHeader") $class="today";
else $class="";
$xdate=mktime(0, 0, 0, $month, $i, $year);
foreach ($events as $event){
+ echo "";
}
- echo "
\n";
}
- echo "
\n";
+ echo "
getImgPath("m.png")."\" border=0>
";
- print "