Просмотр исходного кода

added mimetypes icon to advanced file manager for odg,odp,ods, odt and ogg, ogv, oga and change category flv

Juan Carlos Raña 14 лет назад
Родитель
Сommit
c6bd258674

+ 13 - 8
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php

@@ -41,18 +41,23 @@ class manager
 			array(array("zip", "sit", "rar", "gz", "tar"), "fileZip", SEARCH_TYPE_ARCHIVE, 0),
 			array(array("htm", "html", "php", "jsp", "asp", 'js', 'css'), "fileCode", SEARCH_TYPE_HTML, 1),
 			array(array("mov", "ram", "rm", "asx", "dcr", "wmv"), "fileVideo", SEARCH_TYPE_VIDEO, 1),
-			array(array("mpg", "avi", "asf", "mpeg"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
-			array(array("aif", "aiff", "wav", "mp3", "wma","mid"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
-			array(array("swf", 'flv'), "fileFlash", SEARCH_TYPE_FLASH, 1),
-			array(array("ppt"), "filePPT", SEARCH_TYPE_PPT, 0),
+			array(array("mpg", "avi", "asf", "mpeg", "flv", "ogg", "ogv"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
+			array(array("aif", "aiff", "wav", "mp3", "wma","mid", "midi", "oga"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
+			array(array("swf", ), "fileFlash", SEARCH_TYPE_FLASH, 1),
+			array(array("ppt", "pps", "pptx"), "filePPT", SEARCH_TYPE_PPT, 0),
 			array(array("rtf"), "fileRTF", SEARCH_TYPE_DOC, 0),
-			array(array("doc"), "fileWord", SEARCH_TYPE_WORD, 0),
+			array(array("doc","docx"), "fileWord", SEARCH_TYPE_WORD, 0),
 			array(array("pdf"), "fileAcrobat", SEARCH_TYPE_PDF, 0),
-			array(array("xls", "csv"), "fileExcel", SEARCH_TYPE_EXCEL, 0),
+			array(array("xls", "xlsx", "csv"), "fileExcel", SEARCH_TYPE_EXCEL, 0),
 			array(array("txt"), "fileText", SEARCH_TYPE_TEXT, 1),
 			array(array("xml", "xsl", "dtd"), "fileXml", SEARCH_TYPE_XML, 1),
-			array(array("svg","svgz"), "fileSVG", SEARCH_TYPE_SVG, 1)
-	);// Added svg and svgz types to Chamilo
+			array(array("svg","svgz"), "fileSVG", SEARCH_TYPE_SVG, 1),			
+			array(array("odt"), "fileODT", SEARCH_TYPE_ODT, 1),			
+			array(array("odp"), "fileODP", SEARCH_TYPE_ODP, 1),
+			array(array("ods"), "fileODS", SEARCH_TYPE_ODS, 1),
+			array(array("odg"), "fileODG", SEARCH_TYPE_ODG, 1)
+			
+	);// Added svg, svgz, pps, docx, pptx, xlsx, midi, ogg, ogv, oga,odt,ods,odp,odg types to Chamilo, and change flv from flash to video
 	
 	/**
 		 * constructor

+ 3 - 3
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php

@@ -159,9 +159,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid. For Chamilo exclude original xml, js and css
 
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,bmp,tif,psd,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf, flv, mp4, aac, ppt,rtf,doc, pdf,xls,txt,flv,odt,ods,odp,odg,odc,odf,odb,odi,pps,docx,pptx,xlsx,accdb,xml,mid,svg');//For Chamilo updated
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,mp3,wav,wmv,wma,rm,rmvb,mov,swf,flv,mp4,aac,avi,mpg,mpeg,asf,mid,svg,pdf');//For Chamilo updated
-	define('CONFIG_UPLOAD_INVALID_EXTS', 'php,php3,php4,php5,php6,phps,phtml,asp,aspx,jsp,cfm,cfc,pl,jar,sh,cgi,js,exe,com,bat,pif,scr,msi,ws,wsc,wsf,vb,vbe,vbs,reg,dll'); //For Chamilo added.
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,bmp,tif,psd,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,ogg,ogv,oga, aif,aiff,wav,mp3,swf,flv, mp4, aac, ppt,rtf,doc, pdf,xls,txt,flv,odt,ods,odp,odg,odc,odf,odb,odi,pps,docx,pptx,xlsx,accdb,xml,mid, midi, svg, svgz');//For Chamilo updated
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,mp3,wav,wmv,wma,rm,rmvb,mov,swf,flv,mp4,aac,avi,mpg,mpeg,asf,mid,midi, svg,pdf');//For Chamilo updated
+	define('CONFIG_UPLOAD_INVALID_EXTS', 'php,php3,php4,php5,php6,phps,phtml,asp,aspx,jsp,cfm,cfc,pl,jar,sh,cgi,js,exe,com,bat,pif,scr,msi,ws,wsc,wsf,vb,vbe,vbs,reg,dll,ini'); //For Chamilo added.
 	//Preview
 	define('CONFIG_IMG_THUMBNAIL_MAX_X', 100);
 	define('CONFIG_IMG_THUMBNAIL_MAX_Y', 100);

+ 12 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/fckeditor.css

@@ -276,7 +276,8 @@ span.fileMusic, span.fileExe, span.fileAcrobat,
 span.fileRTF, span.fileXml, span.fileCode,
 span.fileZip, span.addMore, span.deleteFile,
 span.cancel,span.uploadProcessing,
-span.folderShared, span.unknownUser, span.fileSVG{
+span.folderShared, span.unknownUser, span.fileSVG,
+span.fileODT,span.fileODS,span.fileODP,span.fileODG{
 padding:2px 0 2px 16px;
 background-repeat:no-repeat;
 background-position:0 50%;
@@ -307,6 +308,10 @@ span.fileZip{background-image:url(../images/small_icon/fileZip.png);}
 span.folderShared{background-image:url(../images/small_icon/folderShared.png);}
 span.unknownUser{background-image:url(../images/small_icon/smallunknownUser.png);}
 span.fileSVG{background-image:url(../images/small_icon/fileSVG.png);}
+span.fileODT{background-image:url(../images/small_icon/fileODT.png);}
+span.fileODS{background-image:url(../images/small_icon/fileODS.png);}
+span.fileODP{background-image:url(../images/small_icon/fileODP.png);}
+span.fileODG{background-image:url(../images/small_icon/fileODG.png);}
 
 /* big icon */
 dt.folderEmpty, dt.folder, dt.folderParent,
@@ -316,7 +321,8 @@ dt.filePPT, dt.fileExcel, dt.filePhp,
 dt.fileMusic, dt.fileExe, dt.fileAcrobat,
 dt.fileRTF, dt.fileXml, dt.fileCode,
 dt.fileZip,
-dt.folderShared, dt.unknownUser,dt.fileSVG{
+dt.folderShared, dt.unknownUser, dt.fileSVG,
+dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG{
 margin: 0px;
 padding:0px;
 border:solid #ccc 1px;
@@ -352,6 +358,10 @@ dt.fileZip{background-image:url(../images/big_icon/fileZip.png);}
 dt.folderShared{background-image:url(../images/big_icon/bigfolderShared.png);}
 dt.unknownUser{background-image:url(../images/big_icon/biguserUnknown.png);}
 dt.fileSVG{background-image:url(../images/big_icon/fileSVG.png);}
+dt.fileODT{background-image:url(../images/big_icon/fileODT.png);}
+dt.fileODS{background-image:url(../images/big_icon/fileODS.png);}
+dt.fileODP{background-image:url(../images/big_icon/fileODP.png);}
+dt.fileODG{background-image:url(../images/big_icon/fileODG.png);}
 
 table.tableSummary{
 border-collapse:collapse;

+ 12 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/stand_alone.css

@@ -268,7 +268,8 @@ span.fileMusic, span.fileExe, span.fileAcrobat,
 span.fileRTF, span.fileXml, span.fileCode,
 span.fileZip, span.addMore, span.deleteFile,
 span.cancel,span.uploadProcessing,
-span.folderShared, span.unknownUser, span.fileSVG{
+span.folderShared, span.unknownUser, span.fileSVG,
+span.fileODT,span.fileODS,span.fileODP,span.fileODG{
 padding:2px 0 2px 16px;
 background-repeat:no-repeat;
 background-position:0 50%;
@@ -299,6 +300,10 @@ span.fileZip{background-image:url(../images/small_icon/fileZip.png);}
 span.folderShared{background-image:url(../images/small_icon/folderShared.png);}
 span.unknownUser{background-image:url(../images/small_icon/smallunknownUser.png);}
 span.fileSVG{background-image:url(../images/small_icon/fileSVG.png);}
+span.fileODT{background-image:url(../images/small_icon/fileODT.png);}
+span.fileODS{background-image:url(../images/small_icon/fileODS.png);}
+span.fileODP{background-image:url(../images/small_icon/fileODP.png);}
+span.fileODG{background-image:url(../images/small_icon/fileODG.png);}
 
 /* big icon */
 dt.folderEmpty, dt.folder, dt.folderParent,
@@ -308,7 +313,8 @@ dt.filePPT, dt.fileExcel, dt.filePhp,
 dt.fileMusic, dt.fileExe, dt.fileAcrobat,
 dt.fileRTF, dt.fileXml, dt.fileCode,
 dt.fileZip,
-dt.folderShared, dt.unknownUser, dt.fileSVG{
+dt.folderShared, dt.unknownUser, dt.fileSVG,
+dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG{
 margin: 0px;
 padding:0px;
 border:solid #ccc 1px;
@@ -344,6 +350,10 @@ dt.fileZip{background-image:url(../images/big_icon/fileZip.png);}
 dt.folderShared{background-image:url(../images/big_icon/bigfolderShared.png);}
 dt.unknownUser{background-image:url(../images/big_icon/biguserUnknown.png);}
 dt.fileSVG{background-image:url(../images/big_icon/fileSVG.png);}
+dt.fileODT{background-image:url(../images/big_icon/fileODT.png);}
+dt.fileODS{background-image:url(../images/big_icon/fileODS.png);}
+dt.fileODP{background-image:url(../images/big_icon/fileODP.png);}
+dt.fileODG{background-image:url(../images/big_icon/fileODG.png);}
 
 table.tableSummary{
 border-collapse:collapse;

BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/fileODG.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/fileODP.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/fileODS.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/fileODT.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/fileODG.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/fileODP.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/fileODS.png


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/fileODT.png