diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index a371f2137..38a103611 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -746,74 +746,74 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function getMimeIcon($fileType) { /* {{{ */ // for extension use LOWER CASE only $icons = array(); - $icons["txt"] = "txt.png"; - $icons["text"] = "txt.png"; - $icons["doc"] = "word.png"; - $icons["dot"] = "word.png"; - $icons["docx"] = "word.png"; - $icons["dotx"] = "word.png"; - $icons["rtf"] = "document.png"; - $icons["xls"] = "excel.png"; - $icons["xlt"] = "excel.png"; - $icons["xlsx"] = "excel.png"; - $icons["xltx"] = "excel.png"; - $icons["ppt"] = "powerpoint.png"; - $icons["pot"] = "powerpoint.png"; - $icons["pptx"] = "powerpoint.png"; - $icons["potx"] = "powerpoint.png"; - $icons["exe"] = "binary.png"; - $icons["html"] = "html.png"; - $icons["htm"] = "html.png"; - $icons["gif"] = "image.png"; - $icons["jpg"] = "image.png"; - $icons["jpeg"] = "image.png"; - $icons["bmp"] = "image.png"; - $icons["png"] = "image.png"; - $icons["tif"] = "image.png"; - $icons["tiff"] = "image.png"; + $icons["txt"] = "text-x-preview.svg"; + $icons["text"] = "text-x-preview.svg"; + $icons["doc"] = "office-document.svg"; + $icons["dot"] = "office-document.svg"; + $icons["docx"] = "office-document.svg"; + $icons["dotx"] = "office-document.svg"; + $icons["rtf"] = "office-document.svg"; + $icons["xls"] = "office-spreadsheet.svg"; + $icons["xlt"] = "office-spreadsheet.svg"; + $icons["xlsx"] = "office-spreadsheet.svg"; + $icons["xltx"] = "office-spreadsheet.svg"; + $icons["ppt"] = "office-presentation.svg"; + $icons["pot"] = "office-presentation.svg"; + $icons["pptx"] = "office-presentation.svg"; + $icons["potx"] = "office-presentation.svg"; + $icons["exe"] = "executable.svg"; + $icons["html"] = "web.svg"; + $icons["htm"] = "web.svg"; + $icons["gif"] = "image.svg"; + $icons["jpg"] = "image.svg"; + $icons["jpeg"] = "image.svg"; + $icons["bmp"] = "image.svg"; + $icons["png"] = "image.svg"; + $icons["tif"] = "image.svg"; + $icons["tiff"] = "image.svg"; $icons["log"] = "log.png"; - $icons["midi"] = "midi.png"; + $icons["midi"] = "audio.svg"; $icons["pdf"] = "pdf.png"; - $icons["wav"] = "sound.png"; - $icons["mp3"] = "sound.png"; + $icons["wav"] = "audio.svg"; + $icons["mp3"] = "audio.svg"; $icons["c"] = "source_c.png"; $icons["cpp"] = "source_cpp.png"; $icons["h"] = "source_h.png"; $icons["java"] = "source_java.png"; $icons["py"] = "source_py.png"; - $icons["tar"] = "tar.png"; + $icons["tar"] = "package.svg"; $icons["gz"] = "gz.png"; $icons["7z"] = "gz.png"; $icons["bz"] = "gz.png"; $icons["bz2"] = "gz.png"; $icons["tgz"] = "gz.png"; - $icons["zip"] = "gz.png"; + $icons["zip"] = "package.svg"; $icons["rar"] = "gz.png"; - $icons["mpg"] = "video.png"; - $icons["avi"] = "video.png"; + $icons["mpg"] = "video.svg"; + $icons["avi"] = "video.svg"; $icons["tex"] = "tex.png"; - $icons["ods"] = "x-office-spreadsheet.png"; - $icons["ots"] = "x-office-spreadsheet.png"; - $icons["sxc"] = "x-office-spreadsheet.png"; - $icons["stc"] = "x-office-spreadsheet.png"; - $icons["odt"] = "x-office-document.png"; - $icons["ott"] = "x-office-document.png"; - $icons["sxw"] = "x-office-document.png"; - $icons["stw"] = "x-office-document.png"; - $icons["odp"] = "ooo_presentation.png"; - $icons["otp"] = "ooo_presentation.png"; - $icons["sxi"] = "ooo_presentation.png"; - $icons["sti"] = "ooo_presentation.png"; - $icons["odg"] = "ooo_drawing.png"; - $icons["otg"] = "ooo_drawing.png"; - $icons["sxd"] = "ooo_drawing.png"; - $icons["std"] = "ooo_drawing.png"; + $icons["ods"] = "office-spreadsheet.svg"; + $icons["ots"] = "office-spreadsheet.svg"; + $icons["sxc"] = "office-spreadsheet.svg"; + $icons["stc"] = "office-spreadsheet.svg"; + $icons["odt"] = "office-document.svg"; + $icons["ott"] = "office-document.svg"; + $icons["sxw"] = "office-document.svg"; + $icons["stw"] = "office-document.svg"; + $icons["odp"] = "office-presentation.svg"; + $icons["otp"] = "office-presentation.svg"; + $icons["sxi"] = "office-presentation.svg"; + $icons["sti"] = "office-presentation.svg"; + $icons["odg"] = "office-drawing.png"; + $icons["otg"] = "office-drawing.png"; + $icons["sxd"] = "office-drawing.png"; + $icons["std"] = "office-drawing.png"; $icons["odf"] = "ooo_formula.png"; $icons["sxm"] = "ooo_formula.png"; $icons["smf"] = "ooo_formula.png"; $icons["mml"] = "ooo_formula.png"; - $icons["default"] = "default.png"; + $icons["default"] = "text-x-preview.svg"; //"default.png"; $ext = strtolower(substr($fileType, 1)); if (isset($icons[$ext])) { @@ -1406,7 +1406,7 @@ $(function() { $comment = $folder->getComment(); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.svg\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; if($comment) { $content .= "
".htmlspecialchars($comment).""; @@ -1829,11 +1829,11 @@ $(document).ready( function() { if($previewer->hasPreview($latestContent)) { $content .= "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } $content .= ""; } else - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= "" . htmlspecialchars($document->getName()) . ""; $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate())."".($document->expires() ? ", ".getMLText('expires').": ".getReadableDate($document->getExpires())."" : "").""; @@ -1907,7 +1907,7 @@ $(document).ready( function() { $content = ''; $content .= "getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; // $content .= ""; - $content .= "getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">imgpath."folder.svg\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; if($comment) { @@ -2268,6 +2268,71 @@ mayscript> +
+
+
+
+
+
+ +
+ +
+ + + + + +
+
+ +
+ + + +
+
+ + +
+ + + +
+ +
+ + +
+ +
+ +'; + } /* }}} */ + /** * Output HTML Code for jumploader * @@ -2278,58 +2343,6 @@ mayscript> */ function printFineUploaderHtml() { /* {{{ */ ?> -
@@ -2344,22 +2357,31 @@ mayscript> * @param integer $maxfiles maximum number of files allowed to upload * @param array $fields list of post fields */ - function printFineUploaderJs($uploadurl, $partsize=0, $multiple=true) { /* {{{ */ + function printFineUploaderJs($uploadurl, $partsize=0, $maxuploadsize=0, $multiple=true) { /* {{{ */ ?> $(document).ready(function() { manualuploader = new qq.FineUploader({ - debug: true, + debug: false, autoUpload: false, multiple: , element: $('#manual-fine-uploader')[0], + template: 'qq-template', request: { endpoint: '' }, + 0 ? ' + validation: { + sizeLimit: '.$maxuploadsize.' + }, +' : ''); ?> chunking: { enabled: true, mandatory: true }, + messages: { + sizeError: '{file} is too large, maximum file size is {sizeLimit}.' + }, callbacks: { onComplete: function(id, name, json, xhr) { },