Make browse/view actions a little more explicit.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5814 c91229c3-7414-0410-bfa2-8a42b809f60b

Make browse/view actions a little more explicit.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5814 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 33ce6308
Showing 8 changed files with 70 additions and 12 deletions
browse.php
lib/actions/folderaction.inc.php
lib/templating/kt3template.inc.php
lib/widgets/portlet.inc.php
plugins/ktcore/KTFolderActions.php
templates/kt3/portlets/actions_portlet.smarty
templates/kt3/portlets/browsemodes_portlet.smarty
templates/kt3/standard_page.smarty
@@ -89,6 +89,8 @@ $sectionName = &quot;browse&quot;;
  
 class BrowseDispatcher extends KTStandardDispatcher {
  
+    var $sName = 'ktcore.actions.folder.view';
+
     var $oFolder = null;
     var $sSection = "browse";
     var $browse_mode = null;
@@ -174,7 +176,12 @@ class BrowseDispatcher extends KTStandardDispatcher {
             $this->aBreadcrumbs = array_merge($this->aBreadcrumbs,
                 KTBrowseUtil::breadcrumbsForFolder($oFolder));
  
-            $portlet = new KTActionPortlet(_kt("Folder Actions"));
+            $portlet = new KTActionPortlet(sprintf(_kt('Info about "%s"'), $this->oFolder->getName()));
+            $aActions = KTFolderActionUtil::getFolderInfoActionsForFolder($this->oFolder, $this->oUser);        
+            $portlet->setActions($aActions,$this->sName);
+            $this->oPage->addPortlet($portlet);                            
+                
+            $portlet = new KTActionPortlet(sprintf(_kt('Actions on "%s"'), $this->oFolder->getName()));
             $aActions = KTFolderActionUtil::getFolderActionsForFolder($oFolder, $this->oUser);        
             $portlet->setActions($aActions,null);
             $this->oPage->addPortlet($portlet);
@@ -98,6 +98,7 @@ class KTFolderAction extends KTStandardDispatcher {
         $aInfo = array(
             'description' => $this->sDescription,
             'name' => $this->getDisplayName(),
+            'ns' => $this->sName,
             'url' => $this->getURL(),
         );
         return $this->customiseInfo($aInfo);
@@ -134,9 +135,14 @@ class KTFolderAction extends KTStandardDispatcher {
         $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs,
             KTBrowseUtil::breadcrumbsForFolder($this->oFolder, $aOptions));
  
-        $portlet = new KTActionPortlet(_kt("Folder Actions"));
+        $portlet = new KTActionPortlet(sprintf(_kt('Info about "%s"'), $this->oFolder->getName()));
+        $aActions = KTFolderActionUtil::getFolderInfoActionsForFolder($this->oFolder, $this->oUser);        
+        $portlet->setActions($aActions,$this->sName);
+        $this->oPage->addPortlet($portlet);            
+
+        $portlet = new KTActionPortlet(sprintf(_kt('Actions on "%s"'), $this->oFolder->getName()));
         $aActions = KTFolderActionUtil::getFolderActionsForFolder($this->oFolder, $this->oUser);        
-        $portlet->setActions($aActions,null);
+        $portlet->setActions($aActions,$this->sName);
         $this->oPage->addPortlet($portlet);            
  
         if (KTPermissionUtil::userHasPermissionOnItem($this->oUser, 'ktcore.permissions.folder_details', $this->oFolder)) {
@@ -163,6 +169,10 @@ class KTFolderActionUtil {
         $oRegistry =& KTActionRegistry::getSingleton();
         return $oRegistry->getActions('folderaction');
     }
+    function getFolderInfoActions() {
+        $oRegistry =& KTActionRegistry::getSingleton();
+        return $oRegistry->getActions('folderinfo');
+    }   
     function &getFolderActionsForFolder($oFolder, $oUser) {
         $aObjects = array();
         foreach (KTFolderActionUtil::getFolderActions() as $aAction) {
@@ -176,6 +186,19 @@ class KTFolderActionUtil {
         }
         return $aObjects;
     }
+    function &getFolderInfoActionsForFolder($oFolder, $oUser) {
+        $aObjects = array();
+        foreach (KTFolderActionUtil::getFolderInfoActions() as $aAction) {
+            list($sClassName, $sPath, $sPlugin) = $aAction;
+            $oRegistry =& KTPluginRegistry::getSingleton();
+            $oPlugin =& $oRegistry->getPlugin($sPlugin);
+            if (!empty($sPath)) {
+                require_once($sPath);
+            }
+            $aObjects[] =& new $sClassName($oFolder, $oUser, $oPlugin);
+        }
+        return $aObjects;
+    }    
 }
  
 ?>
@@ -39,7 +39,6 @@ require_once(KT_LIB_DIR . &quot;/templating/templating.inc.php&quot;);
 require_once(KT_LIB_DIR . "/session/control.inc");
  
 class KTPage {
-
     var $hide_section = false;
 	var $secondary_title = null;
  
@@ -79,6 +78,8 @@ class KTPage {
     var $contentType = 'text/html';
     var $charset = 'UTF-8';
  
+    var $content_class;
+    
     /* further initialisation */
     function KTPage() {
         /* default css files initialisation */
@@ -212,6 +213,8 @@ class KTPage {
     function setBreadcrumbDetails($sBreadcrumbDetails) { $this->breadcrumbDetails = $sBreadcrumbDetails; }
 	function setUser($oUser) { $this->user = $oUser; }
  
+    function setContentClass($sClass) { $this->content_class = $sClass; }    
+    
     // FIXME refactor setSection to be generic, not an if-else.
     // assume this is admin for now.
     function setSection($sSection) {
@@ -38,6 +38,7 @@ require_once(KT_LIB_DIR . &quot;/templating/templating.inc.php&quot;);
 class KTPortlet {
     var $sTitle;
     var $oPlugin;
+    var $bActive = false;
  
     function KTPortlet($title='') {
         $this->sTitle = $title;
@@ -59,6 +60,10 @@ class KTPortlet {
     function setDispatcher(&$oDispatcher) {
         $this->oDispatcher =& $oDispatcher; 
     }
+    
+    function getActive() {
+        return $this->bActive;
+    }
 }
  
  
@@ -98,15 +103,18 @@ class KTNavPortlet extends KTPortlet {
  
 class KTActionPortlet extends KTPortlet {
     var $actions = array();
+    
+    var $bActive = true;
  
     // current action is the one we are currently on.
     function setActions($actions, $currentaction) {
         foreach ($actions as $action) {
             $aInfo = $action->getInfo();
-            
+
             if ($aInfo !== null) {
-                if ($aInfo["name"] == $currentaction) {
+                if ($aInfo["ns"] == $currentaction) {
                     unset($aInfo["url"]);
+                    $aInfo['active'] = true;
                 }
                 $this->actions[] = $aInfo;
             }
@@ -38,6 +38,21 @@ require_once(KT_LIB_DIR . &#39;/plugins/pluginregistry.inc.php&#39;);
  
 require_once(KT_LIB_DIR . '/roles/Role.inc');
  
+// {{{ KTDocumentDetailsAction 
+class KTFolderViewAction extends KTFolderAction {
+    var $sName = 'ktcore.actions.folder.view';
+
+    function do_main() {
+        redirect(KTBrowseUtil::getUrlForFolder($this->oFolder));
+        exit(0);
+    }
+
+    function getDisplayName() {
+        return _kt('Display Details');
+    }
+}
+// }}}
+
 class KTFolderAddFolderAction extends KTFolderAction {
     var $sName = 'ktcore.actions.folder.addFolder';
  
 <ul class="actionlist">
 {foreach item=action from=$context->actions }
-<li>{if ($action.url)}<a href="{$action.url}"
+<li {if $action.active}class="active"{/if}>{if ($action.url)}<a href="{$action.url}"
 {if $action.description}title="{$action.description}"{/if}
      >{$action.name}</a>{else}{$action.name}{/if}</li>
 {/foreach}
-</ul>
 \ No newline at end of file
+</ul>
-<ul>
+<ul class="actionlist">
 {foreach item=sModeName key=sModeKey from=$modes}
    <li>{if ($sModeKey == $current_action)}
       <strong>{$sModeName.name}</strong>
@@ -127,16 +127,18 @@
 {foreach item=oPortlet from=$page->portlets}
 {assign var=portlet_output value=$oPortlet->render() }
 {if $portlet_output}
-<div class="portlet">
-<h4>{$oPortlet->getTitle()}</h4>
+<div class="portlet {if $oPortlet->getActive()}expanded{/if}">
+<h4 onclick="toggleElementClass('expanded',this.parentNode)">{$oPortlet->getTitle()}</h4>
+<div class="portletbody">
 {$portlet_output}
 </div>
+</div>
 {/if}
 {/foreach}
  
  
 </div>
-<div id="content">
+<div id="content" {if $page->content_class}class="{$page->content_class}"{/if}>
 {if (!$page->hide_section)}
 <h1 class="{$page->componentClass}"><span class="fahrner">{$page->componentLabel}</span>
 {if ($page->getHelpURL() != null)} <a class="ktHelp" href="{$page->getHelpURL()}">Help</a> {/if}