- add darker backgrounds to folders in collecti...

- make breadcrumbs not fail on certain sub-ac... - change menu item to "Browse Documents" to i... - show move items on final page. - add missing html CSS ref. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4888 c91229c3-7414-0410-bfa2-8a42b809f60b

- add darker backgrounds to folders in collecti...
- make breadcrumbs not fail on certain sub-ac... - change menu item to "Browse Documents" to i... - show move items on final page. - add missing html CSS ref. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4888 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 5f05afaf
Showing 8 changed files with 85 additions and 12 deletions
browse.php
lib/templating/kt3template.inc.php
resources/css/kt-contenttypes.css
resources/css/kt-framing.css
resources/css/kt-ie-icons.css
templates/kt3/document_collection.smarty
templates/ktcore/action/finalise_mass_move.smarty
view.php
@@ -503,6 +503,33 @@ class BrowseDispatcher extends KTStandardDispatcher {
         $aFields[] = new KTStringWidget(_('Reason'), _('The reason for moving these documents and folders, for historical purposes.'), 'sReason', "", $this->oPage, true); 
+        // now show the items...
+        $moveSet = $_SESSION['moves'][$move_code];
+        $moveItems = array();
+        $moveItems['folders'] = array();
+        $moveItems['documents'] = array();
+        
+        $folderStr = '';
+        $documentStr = '';
+        
+        if (!empty($moveSet['folders'])) {
+            $folderStr = '<strong>' . _('Folders: ') . '</strong>';
+            foreach ($moveSet['folders'] as $iFolderId) {
+                $oF = Folder::get($iFolderId);
+                $moveItems['folders'][] = $oF->getName();
+            }
+            $folderStr .= implode(', ', $moveItems['folders']);
+        }
+        
+        if (!empty($moveSet['documents'])) {
+            $documentStr = '<strong>' . _('Documents: ') . '</strong>';
+            foreach ($moveSet['documents'] as $iDocId) {
+                $oD = Document::get($iDocId);
+                $moveItems['documents'][] = $oD->getName();
+            }
+            $documentStr .= implode(', ', $moveItems['documents']);
+        }
+        
         $oTemplating = new KTTemplating;
         $oTemplate = $oTemplating->loadTemplate("ktcore/action/finalise_mass_move");
         $aTemplateData = array(
@@ -510,6 +537,8 @@ class BrowseDispatcher extends KTStandardDispatcher {
               'form_fields' => $aFields,
               'folder' => $target_folder,
               'move_code' => $move_code,
+              'folders' => $folderStr,
+              'documents' => $documentStr,              
         );
         return $oTemplate->render($aTemplateData);        
     }
@@ -40,7 +40,7 @@ class KTPage {
 	var $helpPage = null;
     /** the "component".  Used to set the page header (see documentation for explanation). */
-    var $componentLabel = 'Browse Collections';
+    var $componentLabel = 'Browse Documents';
     var $componentClass = 'browse_collections';
     /** $contents is the center of the page.  In KT < 3, this was CentralPayload. */
@@ -86,7 +86,7 @@ class KTPage {
 		// note that key == action. this is _important_, since we crossmatch the breadcrumbs against this for "active"
 		$this->menu = array(
 		    "dashboard" => $this->_actionHelper(array("name" => _("Dashboard"), "action" => "dashboard", "active" => 0)),
-			"browse" => $this->_actionHelper(array("name" => _("Browse Collections"), "action" => "browse", "active" => 0)),
+			"browse" => $this->_actionHelper(array("name" => _("Browse Documents"), "action" => "browse", "active" => 0)),
 			"administration" => $this->_actionHelper(array("name" => _("DMS Administration"), "action" => "administration", "active" => 0)),
 		);
@@ -22,6 +22,7 @@
 .contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.png); }
 .contenttype.image { background-image: url(../../resources/mimetypes/image.png); }
 .contenttype.compressed { background-image: url(../../resources/mimetypes/compressed.png); }
+.contenttype.html { background-image: url(../../resources/mimetypes/html.png); }
 .contenttype.txt,
 .contenttype.text,
@@ -577,6 +577,23 @@ a.main_nav_item {
     background-color: #fafafa;
 }
+.kt_collection .folder_row.odd td {
+    background-color: #ededed;
+}
+
+.kt_collection .folder_row td {
+    background-color: #e5e5e5;
+}
+
+.kt_collection .folder_row td.sort_on {
+    background-color: #dbdbdb;
+}
+
+.kt_collection .folder_row.odd td.sort_on {
+    background-color: #e8e8e8;
+}
+
+
 .kt_collection .odd td 
 {
     background-color: #fafafa;
@@ -2,11 +2,12 @@
 .ktError p {     background: transparent  url(../../thirdparty/icon-theme/16x16/status/dialog-warning.gif) center left no-repeat; }
 .ktHelp { background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.gif) top left no-repeat; }
-.ktAction.ktDelete { background: transparent url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-trash.gif) top left no-repeat; }
-.ktAction.ktEdit { background: transparent url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif) top left no-repeat; }
-.ktAction.ktAddUser { background: transparent url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif) top left no-repeat; }
-.ktAction.ktAddGroup { background: transparent url(../../thirdparty/icon-theme/16x16/actions/group-new.gif) top left no-repeat; }
-.ktAction.ktAdd { background: transparent url(../../thirdparty/icon-theme/16x16/actions/add.gif) top left no-repeat; }
+.ktActionLink.ktDelete, .ktAction.ktDelete { background: transparent url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-trash.gif) top left no-repeat; }
+.ktActionLink.ktEdit, .ktAction.ktEdit { background: transparent url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif) top left no-repeat; }
+.ktActionLink.ktAddUser, .ktAction.ktAddUser { background: transparent url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif) top left no-repeat; }
+.ktActionLink.ktAddGroup, .ktAction.ktAddGroup { background: transparent url(../../thirdparty/icon-theme/16x16/actions/group-new.gif) top left no-repeat; }
+.ktActionLink.ktAdd, .ktAction.ktAdd { background: transparent url(../../thirdparty/icon-theme/16x16/actions/add.gif) top left no-repeat; }
+.ktActionLink.ktDownload, .ktAction.ktDownload { background: transparent url(../../resources/graphics/download.gif) top left no-repeat; }
 .contenttype.office { background-image: url(../../resources/mimetypes/office.gif); }
 .contenttype.word { background-image: url(../../resources/mimetypes/word.gif); }
@@ -16,6 +17,7 @@
 .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/compressed.gif); }
+.contenttype.html { background-image: url(../../resources/mimetypes/html.gif); }
 .contenttype.txt,
 .contenttype.text,
@@ -16,7 +16,7 @@
         <tbody>
           {if ($context->itemCount != 0)}
             {foreach item=folder_row_id from=$context->activeset.folders name=rowiter}
-            <tr class="{cycle name=rows values=",odd"}">
+            <tr class="{cycle name=rows values=",odd"} folder_row">
               {foreach item=oColumn from=$context->columns name=coliter}
                 <td class="browse_column {$oColumn->name} {if $oColumn->getSortedOn()}sort_on{/if}">
                    {$oColumn->renderData($context->getFolderInfo($folder_row_id.id))} 
@@ -7,6 +7,17 @@
 <input type="hidden" name="fMoveCode" value="{$move_code}" />
 <input type="hidden" name="fFolderId" value="{$folder}" />
+
+
+<div class="field">
+<label>Items to move</label>
+<p class="descriptiveText">{i18n}The items that you selected to move.{/i18n}</p>
+{if ($folders)}{$folders}<br />{/if}
+{if ($documents)}{$documents}{/if}
+</div>
+
+
+
 <p class="descriptiveText">{i18n}Please give these final details.{/i18n}</p>
 {foreach item=oWidget from=$form_fields}
@@ -168,7 +168,10 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		$this->oPage->setSecondaryTitle($oDocument->getName());
-        $aOptions = array("final" => false);
+        $aOptions = array(
+            "documentaction" => "viewDocument",
+            "folderaction" => "browse",
+        );
         $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
 		$this->oPage->setBreadcrumbDetails(_("history"));
 		$this->addPortlets("History");
@@ -224,7 +227,11 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		// fixme check perms
 		$this->oPage->setSecondaryTitle($oDocument->getName());
 		$this->oDocument =& $oDocument;
-        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument));
+		$aOptions = array(
+            "documentaction" => "viewDocument",
+            "folderaction" => "browse",
+        );
+        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
 		$this->oPage->setBreadcrumbDetails(_("history"));
 		$this->addPortlets("History");
@@ -283,7 +290,10 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		}
 		$this->oDocument =& $oDocument;
 		$this->oPage->setSecondaryTitle($oDocument->getName());
-        $aOptions = array("final" => false);
+		$aOptions = array(
+            "documentaction" => "viewDocument",
+            "folderaction" => "browse",
+        );
         $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
 		$this->oPage->setBreadcrumbDetails(_("compare versions"));
@@ -417,7 +427,10 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
 		}
 		$this->oDocument =& $oDocument;
 		$this->oPage->setSecondaryTitle($oDocument->getName());
-        $aOptions = array("final" => false);
+		$aOptions = array(
+            "documentaction" => "viewDocument",
+            "folderaction" => "browse",
+        );
         $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
 		$this->oPage->setBreadcrumbDetails(_("Select Document Version to compare against"));