Merged in from STABLE trunk...

KTC-586 "Improve the mime icons for shortcuts" Fixed. Added new mime types. Committed by: Megan Watson Reviewed by: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9194 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTC-586 "Improve the mime icons for shortcuts" Fixed. Added new mime types. Committed by: Megan Watson Reviewed by: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9194 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 8c363458
Showing 20 changed files with 67 additions and 42 deletions
plugins/ktcore/KTColumns.inc.php
resources/css/kt-contenttypes.css
resources/css/kt-framing.css
resources/mimetypes/shortcuts/access.png
resources/mimetypes/shortcuts/code.png
resources/mimetypes/shortcuts/database.png
resources/mimetypes/shortcuts/excel.png
resources/mimetypes/shortcuts/flash.png
resources/mimetypes/shortcuts/html.png
resources/mimetypes/shortcuts/image.png
resources/mimetypes/shortcuts/office.png
resources/mimetypes/shortcuts/openoffice.png
resources/mimetypes/shortcuts/pdf.png
resources/mimetypes/shortcuts/php.png
resources/mimetypes/shortcuts/run.png
resources/mimetypes/shortcuts/vector-image.png
resources/mimetypes/shortcuts/word.png
resources/mimetypes/shortcuts/zip.png
rss.php
templates/ktcore/configsettings.smarty
@@ -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 <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  */
@@ -117,7 +117,7 @@ class AdvancedTitleColumn extends AdvancedColumn {
     	}else{
     		$iDocId = $aDataRow["document"]->getId();
     	}
-		
+
         $url = KTBrowseUtil::getUrlForDocument($iDocId);
         if($aDataRow['document']->isSymbolicLink()){
         	$aDataRow['document']->switchToRealCore();
@@ -171,10 +171,10 @@ class AdvancedTitleColumn extends AdvancedColumn {
         } else {
         	$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('<span class="contenttype %s">%s <img src="resources/tango-icons/shortcut.png" /></span>', $contenttype, $link);
+           if($aDataRow['document']->isSymbolicLink()){
+               return sprintf('<span class="contenttype %s shortcut">%s</span>', $contenttype, $link);
            }else{
           		 $size = $this->prettySize($aDataRow["document"]->getSize());
            		return sprintf('<span class="contenttype %s">%s (%s)</span>', $contenttype, $link, $size);
@@ -416,7 +416,7 @@ class AdvancedSingleSelectionColumn extends AdvancedSelectionColumn {
             return '&nbsp;';
         }
-        $return =  '<input type="radio" name="' . $localname . '" value="' . $v . '" ';  
+        $return =  '<input type="radio" name="' . $localname . '" value="' . $v . '" ';
         if($this->show_folders && $this->show_documents){
         	$return .= 'onClick="forceSingleSelect(this)" ';
         }
-/* 
+/*
     Getting Mime-type CSS right is a bit tricky here.
     the idea is that you apply these to a span, as follows:
-    
+
     <span class="contenttype presentation">My Filename</span>
 */
 .contenttype {
@@ -17,15 +17,25 @@
 }
 .contenttype.office { background-image: url(../../resources/mimetypes/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.database { background-image: url(../../resources/mimetypes/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.openoffice { background-image: url(../../resources/mimetypes/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.pdf { background-image: url(../../resources/mimetypes/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.compressed { background-image: url(../../resources/mimetypes/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.txt,
 .contenttype.text,
@@ -2019,6 +2019,21 @@ hr {
     display: block;
 }
+.collapse
+{
+    padding-left: 20px;
+    border: 0px;
+    background: url(../graphics/plus.gif) no-repeat;
+}
+
+
+.expand
+{
+    padding-left: 20px;
+    border: 0px;
+    background: url(../graphics/minus.gif) no-repeat;
+}
+
 /* -------------------------- iframe browse ------------------------ */
@@ -6,48 +6,39 @@
  * 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 <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  */
 require_once('config/dmsDefaults.php');
 require_once(KT_LIB_DIR .'/authentication/DBAuthenticator.inc');
+require_once(KT_LIB_DIR .'/authentication/authenticationutil.inc.php');
 require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
-require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
-
-// widget includes.
-require_once(KT_LIB_DIR . "/widgets/portlet.inc.php");
-require_once(KT_LIB_DIR . "/widgets/fieldsetDisplay.inc.php");
-require_once(KT_LIB_DIR . "/widgets/FieldsetDisplayRegistry.inc.php");
-require_once(KT_LIB_DIR . "/actions/documentaction.inc.php");
-require_once(KT_LIB_DIR . "/browse/browseutil.inc.php");
-
-require_once(KT_LIB_DIR . '/mime.inc.php');
 // workaround to get http authentication working in cgi mode
 $altinfo = KTUtil::arrayGet( $_SERVER, 'kt_auth', KTUtil::arrayGet( $_SERVER, 'REDIRECT_kt_auth'));
@@ -146,6 +137,12 @@ if (!validateUser($_SERVER[&#39;PHP_AUTH_USER&#39;], $_SERVER[&#39;PHP_AUTH_PW&#39;])) {
 // Validate user credentials
 function validateUser($username, $password){
-    return DBAuthenticator::checkPassword($username, $password);
+    //return DBAuthenticator::checkPassword($username, $password);
+    $oUser =& User::getByUsername($username);
+    if(PEAR::isError($oUser) || is_a($oUser, 'KTEntityNoObjects')){
+        return false;
+    }
+
+    return KTAuthenticationUtil::checkPassword($oUser, $password);
 }
 ?>
 \ No newline at end of file
@@ -3,14 +3,16 @@
     function toggleSettingsDisplay(id)
     {
         var el = document.getElementById(id);
-        var visible = el.style.visibility;
+        var head = document.getElementById(id+'_head');
-        if(visible == 'visible'){
+        if(el.style.visibility == 'visible'){
             el.style.visibility = 'hidden';
             el.style.display = 'none';
+            head.className = 'collapse';
         }else{
             el.style.visibility = 'visible';
             el.style.display = 'block';
+            head.className = 'expand';
         }
     }
 {/literal}
@@ -26,10 +28,12 @@
     {foreach from=$groupList item=groupItem}
         {assign var=group value=$groupItem.name}
-        <h3><span onclick='javascript: toggleSettingsDisplay("{$groupItem.id}");' style='cursor: hand;'>{$group}</span></h3>
+        <h4 style='margin-top: 20px;'><span class="expand" id='{$groupItem.id}_head' onclick='javascript: toggleSettingsDisplay("{$groupItem.id}");' style='cursor: pointer;'>
+            {$group}
+        </span></h3>
         <span class='descriptiveText'>{$groupItem.description}</span>
-        <div id='{$groupItem.id}' style='visibility: visible'>
+        <div id='{$groupItem.id}' style='visibility: visible;'>
             <fieldset>
             {* <!-- Display the settings, render the input according to the setting type (dropdown / radio / etc) --> *}
@@ -47,13 +51,12 @@
             </fieldset>
         </div>
-        <br>
     {/foreach}
 {/if}
-
+<br><hr>
 <input type="submit" name="AlterConfig" value="{i18n}Save Config Settings{/i18n}" />
 </form>
 \ No newline at end of file