From e533cabfe68e92a8e4777070fce91c5481be2932 Mon Sep 17 00:00:00 2001 From: bshuttle Date: Tue, 24 Jan 2006 16:25:40 +0000 Subject: [PATCH] fixes for: --- lib/widgets/fieldsetDisplay.inc.php | 5 +++++ plugins/ktcore/admin/groupManagement.php | 7 +++++++ plugins/ktcore/admin/userManagement.php | 9 +++++++++ templates/kt3/document/metadata_history.smarty | 8 +++++++- templates/kt3/document/view.smarty | 4 +++- templates/kt3/fieldsets/generic.smarty | 5 ++++- templates/kt3/fieldsets/generic_versioned.smarty | 10 ++++++++-- templates/kt3/standard_page.smarty | 4 ++++ templates/kt3/view_document.smarty | 9 ++++++++- templates/ktcore/principals/groupadmin.smarty | 19 +++++++++++-------- templates/ktcore/principals/useradmin.smarty | 30 +++++++++++++----------------- view.php | 11 +++++++++++ 12 files changed, 90 insertions(+), 31 deletions(-) diff --git a/lib/widgets/fieldsetDisplay.inc.php b/lib/widgets/fieldsetDisplay.inc.php index a4639e7..99b34b0 100644 --- a/lib/widgets/fieldsetDisplay.inc.php +++ b/lib/widgets/fieldsetDisplay.inc.php @@ -185,6 +185,8 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay { "document_data" => $aDocumentData, "document" => $aDocumentData["document"], + "filename" => $document->getFileName(), + "creator" => $creator, "creation_date" => $creation_date, @@ -249,6 +251,9 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay { "document_data" => $aDocumentData, "document" => $aDocumentData["document"], + "filename" => $document->getFileName(), + "comparison_filename" => $comparison_document->getFileName(), + "creator" => $creator, "creation_date" => $creation_date, diff --git a/plugins/ktcore/admin/groupManagement.php b/plugins/ktcore/admin/groupManagement.php index 6c2553d..73cf751 100755 --- a/plugins/ktcore/admin/groupManagement.php +++ b/plugins/ktcore/admin/groupManagement.php @@ -21,6 +21,11 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { $show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false); $group_id = KTUtil::arrayGet($_REQUEST, 'group_id'); + $no_search = true; + + if (KTUtil::arrayGet($_REQUEST, 'do_search', false) != false) { + $no_search = false; + } $search_fields = array(); $search_fields[] = new KTStringWidget(_('Group Name'),_("Enter part of the group's name. e.g. ad will match administrators."), 'name', $name, $this->oPage, true); @@ -29,6 +34,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { $search_results =& Group::getList('WHERE name LIKE "%' . DBUtil::escapeSimple($name) . '%"'); } else if ($show_all !== false) { $search_results =& Group::getList(); + $no_search = false; } @@ -38,6 +44,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher { "context" => $this, "search_fields" => $search_fields, "search_results" => $search_results, + 'no_search' => $no_search, ); return $oTemplate->render($aTemplateData); } diff --git a/plugins/ktcore/admin/userManagement.php b/plugins/ktcore/admin/userManagement.php index 17bd660..4e9cccf 100755 --- a/plugins/ktcore/admin/userManagement.php +++ b/plugins/ktcore/admin/userManagement.php @@ -25,6 +25,13 @@ class KTUserAdminDispatcher extends KTAdminDispatcher { $show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false); $user_id = KTUtil::arrayGet($_REQUEST, 'user_id'); + $no_search = true; + + if (KTUtil::arrayGet($_REQUEST, 'do_search', false) != false) { + $no_search = false; + } + + $search_fields = array(); $search_fields[] = new KTStringWidget(_('Username'),_("Enter part of the person's username. e.g. ra will match brad."), 'name', $name, $this->oPage, true); @@ -35,6 +42,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher { $search_results =& User::getList('WHERE username LIKE "%' . DBUtil::escapeSimple($name) . '%"'); } else if ($show_all !== false) { $search_results =& User::getList(); + $no_search = false; } $oTemplating = new KTTemplating; @@ -43,6 +51,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher { "context" => $this, "search_fields" => $search_fields, "search_results" => $search_results, + 'no_search' => $no_search, ); return $oTemplate->render($aTemplateData); } diff --git a/templates/kt3/document/metadata_history.smarty b/templates/kt3/document/metadata_history.smarty index b9ad551..31704e2 100644 --- a/templates/kt3/document/metadata_history.smarty +++ b/templates/kt3/document/metadata_history.smarty @@ -22,7 +22,13 @@ {capture assign=version}{$oVersion->getMajorVersionNumber()}.{$oVersion->getMinorVersionNumber()}{/capture} {capture assign=versionid}{$oVersion->getContentVersionId()}{/capture} {$version} - {i18n}compare with current{/i18n} + + {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())} + {i18n}current version{/i18n} + {else} + {i18n}compare with current{/i18n} + {/if} + {/foreach} diff --git a/templates/kt3/document/view.smarty b/templates/kt3/document/view.smarty index 878ff16..39d321a 100644 --- a/templates/kt3/document/view.smarty +++ b/templates/kt3/document/view.smarty @@ -1,9 +1,11 @@

{$document->getName()}

+ + {capture assign=version} {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()} {/capture}

{i18n arg_version=$version}showing information for version #version#{/i18n}

- + {foreach item=oFieldset from=$fieldsets} {$oFieldset->render($document_data)} {/foreach} diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty index 21f302a..4bbca71 100644 --- a/templates/kt3/fieldsets/generic.smarty +++ b/templates/kt3/fieldsets/generic.smarty @@ -5,8 +5,11 @@ document.{/i18n}

+
{i18n}Document Filename{/i18n}
+
{$filename} ({$context->_sizeHelper($document->getSize())})
+
{i18n}File is a{/i18n}
-
{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})
+
{$context->_mimeHelper($document->getMimeTypeID())}
{i18n}Created by{/i18n}
{$creator} ({$creation_date})
diff --git a/templates/kt3/fieldsets/generic_versioned.smarty b/templates/kt3/fieldsets/generic_versioned.smarty index ff06d53..7c8e9b3 100644 --- a/templates/kt3/fieldsets/generic_versioned.smarty +++ b/templates/kt3/fieldsets/generic_versioned.smarty @@ -5,10 +5,16 @@ document.{/i18n}

+
{i18n}Document Filename{/i18n}
+
+
{$filename} ({$context->_sizeHelper($document->getSize())})
+ +
+
{i18n}File is a{/i18n}
-
{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})
- +
{$context->_mimeHelper($document->getMimeTypeID())}
+
{i18n}Created by{/i18n}
diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index cf29388..703aff5 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -5,10 +5,14 @@ {$page->title} | {$page->systemName} + {foreach item=sResourceURL from=$page->getCSSResources()} {/foreach} + + {foreach item=sCSS from=$page->getCSSStandalone()}