Merged in from STABLE trunk...

KTC-594 "When a shortcut is made to an XML, RTF, TXT or CSS file there is no indication that it is a shortcut after the process has completed." Fixed. Added the folder mime icon and the generic icon. The shortcut css class are now .folder_shortcut not .folder.shortcut - IE gets confused sometimes. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9392 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTC-594 "When a shortcut is made to an XML, RTF, TXT or CSS file there is no indication that it is a shortcut after the process has completed." Fixed. Added the folder mime icon and the generic icon. The shortcut css class are now .folder_shortcut not .folder.shortcut - IE gets confused sometimes. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9392 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 11a9c696
Showing 22 changed files with 74 additions and 35 deletions
lib/mime.inc.php
plugins/ktcore/KTColumns.inc.php
resources/css/kt-contenttypes.css
resources/css/kt-ie-icons.css
resources/mimetypes/shortcuts/access.gif
resources/mimetypes/shortcuts/code.gif
resources/mimetypes/shortcuts/database.gif
resources/mimetypes/shortcuts/excel.gif
resources/mimetypes/shortcuts/flash.gif
resources/mimetypes/shortcuts/html.gif
resources/mimetypes/shortcuts/image.gif
resources/mimetypes/shortcuts/openoffice.gif
resources/mimetypes/shortcuts/pdf.gif
resources/mimetypes/shortcuts/php.gif
resources/mimetypes/shortcuts/run.gif
resources/mimetypes/shortcuts/text-x-generic.gif
resources/mimetypes/shortcuts/text-x-generic.png
resources/mimetypes/shortcuts/vector-image.gif
resources/mimetypes/shortcuts/word.gif
resources/mimetypes/shortcuts/x-directory-normal.gif
@@ -183,13 +183,17 @@ class KTMime {
         return null;
     }
-    function getIconPath($iMimeTypeId) {
-        $cached = KTUtil::arrayGet($GLOBALS['_KT_icon_path_cache'], $iMimeTypeId);
-        if (!empty($cached)) {
-            return $cached;
+    function getIconPath($iMimeTypeId, $type = null) {
+        $icon = KTUtil::arrayGet($GLOBALS['_KT_icon_path_cache'], $iMimeTypeId);
+        if (empty($icon)) {
+            $GLOBALS['_KT_icon_path_cache'][$iMimeTypeId] = KTMime::_getIconPath($iMimeTypeId);
+            $icon = $GLOBALS['_KT_icon_path_cache'][$iMimeTypeId];
         }
-        $GLOBALS['_KT_icon_path_cache'][$iMimeTypeId] = KTMime::_getIconPath($iMimeTypeId);
-        return $GLOBALS['_KT_icon_path_cache'][$iMimeTypeId];
+
+        if(!empty($type)){
+            $icon .= '_'.$type;
+        }
+        return $icon;
     }
     function _getIconPath($iMimeTypeId) {
@@ -166,25 +166,33 @@ class AdvancedTitleColumn extends AdvancedColumn {
     // use inline, since its just too heavy to even _think_ about using smarty.
     function renderData($aDataRow) {
-       if ($aDataRow["type"] == "folder") {
-           $contenttype = 'folder';
-           $link = $this->renderFolderLink($aDataRow);
-           if($aDataRow['folder']->isSymbolicLink()){
-           		return "<div style='float: left' class='contenttype $contenttype'>&nbsp;</div><div style='float: left'>$link</div>&nbsp;<img src='resources/tango-icons/shortcut.png' />";
-           }else{
-           		return "<div style='float: left' class='contenttype $contenttype'>&nbsp;</div>$link";
-           }
+        if ($aDataRow["type"] == "folder") {
+            $contenttype = 'folder';
+            $link = $this->renderFolderLink($aDataRow);
+
+            // If folder is a shortcut display the shortcut mime icon
+            if($aDataRow['folder']->isSymbolicLink()){
+                $contenttype .= '_shortcut';
+            }
+            // Separate the link from the mime icon to allow for right-to-left languages
+            return "<div style='float: left' class='contenttype $contenttype'>&nbsp;</div>$link";
         } else {
-        	$contenttype = $this->_mimeHelper($aDataRow["document"]->getMimeTypeId());
-           	$link = $this->renderDocumentLink($aDataRow);
+            $type = '';
+            $size = '';
+            if($aDataRow['document']->isSymbolicLink()){
+                // If document is a shortcut - display the shortcut mime type
+                $type = 'shortcut';
+            }else{
+                // Display the document size if it is not a shortcut
+                $size = $this->prettySize($aDataRow["document"]->getSize());
+                $size = "&nbsp;($size)";
+            }
-           	//Render an image instead of the size in case of a shortcut
-           if($aDataRow['document']->isSymbolicLink()){
-               return "<div style='float: left' class='contenttype $contenttype shortcut'>&nbsp;</div>$link";
-           }else{
-          		 $size = $this->prettySize($aDataRow["document"]->getSize());
-           		return "<div style='float: left' class='contenttype $contenttype'>&nbsp;</div><div style='float: left'>$link</div>&nbsp;($size)";
-           }
+            $link = $this->renderDocumentLink($aDataRow);
+            $contenttype = $this->_mimeHelper($aDataRow["document"]->getMimeTypeId(), $type);
+
+            // Separate the link from the mime icon and the size to allow for right-to-left languages
+            return "<div style='float: left' class='contenttype $contenttype'>&nbsp;</div><div style='float: left'>$link</div>$size";
         }
     }
@@ -197,9 +205,9 @@ class AdvancedTitleColumn extends AdvancedColumn {
         return $finalSize . $label;
     }
-    function _mimeHelper($iMimeTypeId) {
+    function _mimeHelper($iMimeTypeId, $type = null) {
         require_once(KT_LIB_DIR . '/mime.inc.php');
-        return KTMime::getIconPath($iMimeTypeId);
+        return KTMime::getIconPath($iMimeTypeId, $type);
     }
 }
@@ -17,27 +17,32 @@
 }
 .contenttype.office { background-image: url(../../resources/mimetypes/office.png); }
-.contenttype.office.shortcut { background-image: url(../../resources/mimetypes/shortcuts/office.png); }
+.contenttype.office_shortcut { background-image: url(../../resources/mimetypes/shortcuts/office.png); }
 .contenttype.word { background-image: url(../../resources/mimetypes/word.png); }
-.contenttype.word.shortcut { background-image: url(../../resources/mimetypes/shortcuts/word.png); }
+.contenttype.word_shortcut { background-image: url(../../resources/mimetypes/shortcuts/word.png); }
 .contenttype.database { background-image: url(../../resources/mimetypes/database.png); }
-.contenttype.database.shortcut { background-image: url(../../resources/mimetypes/shortcuts/database.png); }
+.contenttype.database_shortcut { background-image: url(../../resources/mimetypes/shortcuts/database.png); }
 .contenttype.excel { background-image: url(../../resources/mimetypes/excel.png); }
-.contenttype.excel.shortcut { background-image: url(../../resources/mimetypes/shortcuts/excel.png); }
+.contenttype.excel_shortcut { background-image: url(../../resources/mimetypes/shortcuts/excel.png); }
 .contenttype.openoffice { background-image: url(../../resources/mimetypes/openoffice.png); }
-.contenttype.openoffice.shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.png); }
+.contenttype.openoffice_shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.png); }
 .contenttype.opendocument { background-image: url(../../resources/mimetypes/openoffice.png); }
-.contenttype.opendocument.shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.png); }
+.contenttype.opendocument_shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.png); }
 .contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.png); }
-.contenttype.pdf.shortcut { background-image: url(../../resources/mimetypes/shortcuts/pdf.png); }
+.contenttype.pdf_shortcut { background-image: url(../../resources/mimetypes/shortcuts/pdf.png); }
 .contenttype.image { background-image: url(../../resources/mimetypes/image.png); }
-.contenttype.image.shortcut { background-image: url(../../resources/mimetypes/shortcuts/image.png); }
+.contenttype.image_shortcut { background-image: url(../../resources/mimetypes/shortcuts/image.png); }
 .contenttype.compressed { background-image: url(../../resources/mimetypes/zip.png); }
-.contenttype.compressed.shortcut { background-image: url(../../resources/mimetypes/shortcuts/zip.png); }
+.contenttype.compressed_shortcut { background-image: url(../../resources/mimetypes/shortcuts/zip.png); }
 .contenttype.html { background-image: url(../../resources/mimetypes/html.png); }
-.contenttype.html.shortcut { background-image: url(../../resources/mimetypes/shortcuts/html.png); }
+.contenttype.html_shortcut { background-image: url(../../resources/mimetypes/shortcuts/html.png); }
 .contenttype.txt,
 .contenttype.text,
 .contenttype.unspecified_type { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.png); }
+.contenttype.txt_shortcut,
+.contenttype.text_shortcut,
+.contenttype.unspecified_type_shortcut { background-image: url(../../resources/mimetypes/shortcuts/text-x-generic.png); }
+
 .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.png); }
+.contenttype.folder_shortcut { background-image: url(../../resources/mimetypes/shortcuts/x-directory-normal.png); }
@@ -34,11 +34,14 @@
 .ktActionLink.ktMoveUp, .ktAction.ktMoveUp { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.gif); }
 .ktActionLink.ktMoveDown, .ktAction.ktMoveDown { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.gif); }
 .ktBlock {margin: 0.5em 0;}
+
+/* Mime type icons */
 .contenttype.office { background-image: url(../../resources/mimetypes/office.gif); }
 .contenttype.word { background-image: url(../../resources/mimetypes/word.gif); }
 .contenttype.database { background-image: url(../../resources/mimetypes/database.gif); }
 .contenttype.excel { background-image: url(../../resources/mimetypes/excel.gif); }
 .contenttype.openoffice { background-image: url(../../resources/mimetypes/openoffice.gif); }
+.contenttype.opendocument { background-image: url(../../resources/mimetypes/openoffice.gif); }
 .contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.gif); }
 .contenttype.image { background-image: url(../../resources/mimetypes/image.gif); }
 .contenttype.compressed { background-image: url(../../resources/mimetypes/zip.gif); }
@@ -49,6 +52,25 @@
 .contenttype.unspecified_type { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.gif); }
 .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif); }
+/* Mime type short cut icons - IE gets confused if the last class is the same for multiple selection so we append _shortcut instead of
+using .shortcut */
+.contenttype.txt_shortcut,
+.contenttype.text_shortcut,
+.contenttype.unspecified_type_shortcut { background-image: url(../../resources/mimetypes/shortcuts/text-x-generic.gif); }
+.contenttype.folder_shortcut { background-image: url(../../resources/mimetypes/shortcuts/x-directory-normal.gif); }
+
+.contenttype.html_shortcut { background-image: url(../../resources/mimetypes/shortcuts/html.gif); }
+.contenttype.office_shortcut { background-image: url(../../resources/mimetypes/shortcuts/office.gif); }
+.contenttype.word_shortcut { background-image: url(../../resources/mimetypes/shortcuts/word.gif); }
+.contenttype.database_shortcut { background-image: url(../../resources/mimetypes/shortcuts/database.gif); }
+.contenttype.excel_shortcut { background-image: url(../../resources/mimetypes/shortcuts/excel.gif); }
+.contenttype.openoffice_shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.gif); }
+.contenttype.opendocument_shortcut { background-image: url(../../resources/mimetypes/shortcuts/openoffice.gif); }
+.contenttype.pdf_shortcut { background-image: url(../../resources/mimetypes/shortcuts/pdf.gif); }
+.contenttype.image_shortcut { background-image: url(../../resources/mimetypes/shortcuts/image.gif); }
+.contenttype.compressed_shortcut { background-image: url(../../resources/mimetypes/shortcuts/zip.gif); }
+
+
 /* IE is woefully unable to */
 #portletbar {
 	width: 200px;