From 6fb6926b2a115f3410d0a924bc6e8eb008ee3cf9 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 14 Jul 2010 16:02:24 -0600 Subject: [PATCH] Merge horde/Ui with horde/Core. --- agora/forums.php | 2 +- agora/lib/Comments.php | 2 +- agora/messages/index.php | 2 +- agora/moderate.php | 2 +- agora/search.php | 2 +- agora/threads.php | 2 +- ansel/faces/gallery.php | 2 +- ansel/faces/search/all.php | 2 +- ansel/faces/search/image_search.php | 2 +- ansel/faces/search/name.php | 2 +- ansel/faces/search/named.php | 2 +- ansel/faces/search/owner.php | 2 +- ansel/faces/search/tabs.php | 2 +- ansel/group.php | 2 +- ansel/lib/Block/cloud.php | 2 +- ansel/lib/View/GalleryRenderer/Gallery.php | 2 +- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 2 +- ansel/lib/View/List.php | 2 +- ansel/lib/View/Results.php | 2 +- babel/view.php | 2 +- beatnik/listzones.php | 2 +- fima/lib/UI/VarRenderer/fima.php | 8 +- fima/postings.php | 2 +- folks/account/tabs.php | 2 +- folks/activity.php | 2 +- folks/birthday.php | 2 +- folks/edit/tabs.php | 2 +- folks/list.php | 2 +- folks/new.php | 2 +- folks/online.php | 2 +- folks/popularity.php | 2 +- folks/search.php | 2 +- .../Horde => Core/lib/Horde/Core}/Ui/FlagImage.php | 6 +- .../lib/Horde/Core}/Ui/JsCalendar.php | 13 ++- .../Horde => Core/lib/Horde/Core}/Ui/Language.php | 10 +- .../lib/Horde => Core/lib/Horde/Core}/Ui/Pager.php | 29 +++-- .../lib/Horde => Core/lib/Horde/Core}/Ui/Tabs.php | 10 +- .../Horde => Core/lib/Horde/Core}/Ui/TagCloud.php | 8 +- .../lib/Horde/Core}/Ui/VarRenderer.php | 14 ++- .../lib/Horde/Core}/Ui/VarRenderer/Html.php | 12 +- .../Horde/Core}/Ui/VarRenderer/TablesetHtml.php | 6 +- .../Horde => Core/lib/Horde/Core}/Ui/Widget.php | 12 +- framework/Core/package.xml | 27 ++++- framework/Form/Form/Renderer.php | 4 +- framework/Ui/package.xml | 122 --------------------- gollem/manager.php | 2 +- hermes/lib/Hermes.php | 2 +- hermes/lib/Table.php | 8 +- hermes/search.php | 2 +- hermes/time.php | 2 +- horde/admin/sessions.php | 2 +- horde/lib/Block/cloud.php | 2 +- horde/services/help/index.php | 2 +- horde/templates/admin/user/list.inc | 2 +- imp/message.php | 4 +- imp/search.php | 4 +- ingo/lib/Ui/VarRenderer/Ingo.php | 2 +- ingo/spam.php | 2 +- jonah/lib/Block/cloud.php | 2 +- jonah/stories/view.php | 2 +- koward/lib/Koward/Controller/ObjectController.php | 2 +- kronolith/attendees.php | 2 +- kronolith/lib/Event.php | 4 +- kronolith/lib/Kronolith.php | 6 +- nag/lib/Ui/VarRenderer/Nag.php | 8 +- nag/list.php | 2 +- news/admin/tabs.php | 2 +- news/lib/Forms/Search.php | 2 +- news/lib/Search.php | 2 +- news/lib/TagCloud.php | 2 +- operator/search.php | 2 +- shout/lib/Shout.php | 2 +- skoli/entry.php | 2 +- turba/contact.php | 2 +- turba/lib/View/List.php | 6 +- turba/search.php | 2 +- vilma/lib/Vilma.php | 4 +- vilma/users/index.php | 2 +- whups/admin/index.php | 2 +- whups/lib/Forms/VarRenderer.php | 12 +- whups/lib/Query.php | 2 +- whups/lib/Renderer/Query.php | 2 +- whups/lib/Whups.php | 2 +- whups/query/index.php | 2 +- 84 files changed, 188 insertions(+), 271 deletions(-) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/FlagImage.php (90%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/JsCalendar.php (87%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/Language.php (85%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/Pager.php (87%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/Tabs.php (92%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/TagCloud.php (97%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/VarRenderer.php (88%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/VarRenderer/Html.php (99%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/VarRenderer/TablesetHtml.php (95%) rename framework/{Ui/lib/Horde => Core/lib/Horde/Core}/Ui/Widget.php (91%) delete mode 100644 framework/Ui/package.xml diff --git a/agora/forums.php b/agora/forums.php index 23702f273..187a40529 100644 --- a/agora/forums.php +++ b/agora/forums.php @@ -67,7 +67,7 @@ $view->actions = empty($actions) ? null : $actions; /* Set up pager. */ $vars = Horde_Variables::getDefaultVariables(); -$pager_ob = new Horde_Ui_Pager('forum_page', $vars, array('num' => $forums_count, 'url' => 'forums.php', 'perpage' => $forums_per_page)); +$pager_ob = new Horde_Core_Ui_Pager('forum_page', $vars, array('num' => $forums_count, 'url' => 'forums.php', 'perpage' => $forums_per_page)); $pager_ob->preserve('scope', $scope); $view->pager_link = $pager_ob->render(); diff --git a/agora/lib/Comments.php b/agora/lib/Comments.php index 5f2fac45c..656947847 100644 --- a/agora/lib/Comments.php +++ b/agora/lib/Comments.php @@ -99,7 +99,7 @@ class Agora_ViewComments { if ($messages->_forum['message_count'] > $thread_per_page && $view_bodies == 2) { $vars = new Horde_Variables(array('comments_page' => $thread_page)); - $pager_ob = new Horde_Ui_Pager('comments_page', $vars, + $pager_ob = new Horde_Core_Ui_Pager('comments_page', $vars, array('num' => $messages->_forum['message_count'], 'url' => $base_url, 'perpage' => $thread_per_page)); diff --git a/agora/messages/index.php b/agora/messages/index.php index b3494e80b..60959d029 100644 --- a/agora/messages/index.php +++ b/agora/messages/index.php @@ -134,7 +134,7 @@ if ($threads_list instanceof PEAR_Error) { /* Set up pager. */ if ($thread_count > $thread_per_page && $view_bodies == 2) { $vars = new Horde_Variables(array('thread_page' => $thread_page)); - $pager_ob = new Horde_Ui_Pager('thread_page', $vars, array('num' => $thread_count, 'url' => 'messages/index.php', 'perpage' => $thread_per_page)); + $pager_ob = new Horde_Core_Ui_Pager('thread_page', $vars, array('num' => $thread_count, 'url' => 'messages/index.php', 'perpage' => $thread_per_page)); $pager_ob->preserve('agora', Horde_Util::getFormData('agora')); $view->pager_link = $pager_ob->render(); } diff --git a/agora/moderate.php b/agora/moderate.php index 4d2f27589..abec4396b 100644 --- a/agora/moderate.php +++ b/agora/moderate.php @@ -71,7 +71,7 @@ $view->notify = Horde::endBuffer(); /* Set up pager. */ $vars = Horde_Variables::getDefaultVariables(); -$pager_ob = new Horde_Ui_Pager('moderate_page', $vars, array('num' => $messages_count, 'url' => Horde::selfUrl(true), 'perpage' => $messages_per_page)); +$pager_ob = new Horde_Core_Ui_Pager('moderate_page', $vars, array('num' => $messages_count, 'url' => Horde::selfUrl(true), 'perpage' => $messages_per_page)); $pager_ob->preserve('agora', Horde_Util::getFormData('agora')); $view->pager = $pager_ob->render(); diff --git a/agora/search.php b/agora/search.php index 9cce5d7d1..e03be900e 100644 --- a/agora/search.php +++ b/agora/search.php @@ -45,7 +45,7 @@ if ($form->isSubmitted() || $thread_page != null) { } if ($searchResults['total'] > count($searchResults['results'])) { - $pager_ob = new Horde_Ui_Pager('thread_page', $vars, array('num' => $searchResults['total'], 'url' => 'search.php', 'perpage' => $thread_per_page)); + $pager_ob = new Horde_Core_Ui_Pager('thread_page', $vars, array('num' => $searchResults['total'], 'url' => 'search.php', 'perpage' => $thread_per_page)); foreach ($info as $key => $val) { if ($val) { if ($key == 'keywords') { diff --git a/agora/threads.php b/agora/threads.php index acdbe2880..e300818c5 100644 --- a/agora/threads.php +++ b/agora/threads.php @@ -73,7 +73,7 @@ $view->rss = Horde_Util::addParameter(Horde::applicationUrl('rss/threads.php', t /* Set up pager. */ $vars = Horde_Variables::getDefaultVariables(); -$pager_ob = new Horde_Ui_Pager('thread_page', $vars, array('num' => $threads_count, 'url' => 'threads.php', 'perpage' => $threads_per_page)); +$pager_ob = new Horde_Core_Ui_Pager('thread_page', $vars, array('num' => $threads_count, 'url' => 'threads.php', 'perpage' => $threads_per_page)); $pager_ob->preserve('agora', Horde_Util::getFormData('agora')); $view->pager_link = $pager_ob->render(); diff --git a/ansel/faces/gallery.php b/ansel/faces/gallery.php index b30ddb821..7ff5e2f5e 100644 --- a/ansel/faces/gallery.php +++ b/ansel/faces/gallery.php @@ -45,7 +45,7 @@ $face = $injector->getInstance('Ansel_Faces'); $autogenerate = $face->canAutogenerate(); $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array( diff --git a/ansel/faces/search/all.php b/ansel/faces/search/all.php index 88f1f61f6..4bc49be40 100644 --- a/ansel/faces/search/all.php +++ b/ansel/faces/search/all.php @@ -24,7 +24,7 @@ try { $results = array(); } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array( 'num' => $count, diff --git a/ansel/faces/search/image_search.php b/ansel/faces/search/image_search.php index ae8b75f2a..99114bbe3 100644 --- a/ansel/faces/search/image_search.php +++ b/ansel/faces/search/image_search.php @@ -41,7 +41,7 @@ if (($face_id = Horde_Util::getGet('face_id')) !== null) { $title = _("Photo search"); $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array( diff --git a/ansel/faces/search/name.php b/ansel/faces/search/name.php index d042a90b2..817659542 100644 --- a/ansel/faces/search/name.php +++ b/ansel/faces/search/name.php @@ -34,7 +34,7 @@ if (!empty($name)) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array('num' => $count, 'url' => 'faces/search/name.php', diff --git a/ansel/faces/search/named.php b/ansel/faces/search/named.php index 65116af49..c2b25289b 100644 --- a/ansel/faces/search/named.php +++ b/ansel/faces/search/named.php @@ -24,7 +24,7 @@ try { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array( 'num' => $count, diff --git a/ansel/faces/search/owner.php b/ansel/faces/search/owner.php index 806423796..ba4c4c1ce 100644 --- a/ansel/faces/search/owner.php +++ b/ansel/faces/search/owner.php @@ -32,7 +32,7 @@ try { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager( +$pager = new Horde_Core_Ui_Pager( 'page', $vars, array( diff --git a/ansel/faces/search/tabs.php b/ansel/faces/search/tabs.php index c76d66565..a4a57960b 100644 --- a/ansel/faces/search/tabs.php +++ b/ansel/faces/search/tabs.php @@ -17,7 +17,7 @@ $faces = $GLOBALS['injector']->getInstance('Ansel_Faces'); /* Show tabs */ $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs('search_faces', $vars); +$tabs = new Horde_Core_Ui_Tabs('search_faces', $vars); $tabs->addTab(_("All faces"), Horde::applicationUrl('faces/search/all.php'), 'all'); $tabs->addTab(_("From my galleries"), Horde::applicationUrl('faces/search/owner.php'), 'owner'); $tabs->addTab(_("Named faces"), Horde::applicationUrl('faces/search/named.php'), 'named'); diff --git a/ansel/group.php b/ansel/group.php index 15ca18da0..93b7a7933 100644 --- a/ansel/group.php +++ b/ansel/group.php @@ -75,7 +75,7 @@ default: // Set up pager. $vars = Horde_Variables::getDefaultVariables(); -$group_pager = new Horde_Ui_Pager('gbpage', +$group_pager = new Horde_Core_Ui_Pager('gbpage', $vars, array( 'num' => $num_groups, diff --git a/ansel/lib/Block/cloud.php b/ansel/lib/Block/cloud.php index 676bf3af3..d2a2be409 100644 --- a/ansel/lib/Block/cloud.php +++ b/ansel/lib/Block/cloud.php @@ -55,7 +55,7 @@ class Horde_Block_ansel_cloud extends Horde_Block /* Get the tags */ $tags = Ansel_Tags::listTagInfo(null, $this->_params['count']); if (count($tags)) { - $cloud = new Horde_Ui_TagCloud(); + $cloud = new Horde_Core_Ui_TagCloud(); foreach ($tags as $id => $tag) { $link = Ansel::getUrlFor('view', array('view' => 'Results', 'tag' => $tag['tag_name'])); diff --git a/ansel/lib/View/GalleryRenderer/Gallery.php b/ansel/lib/View/GalleryRenderer/Gallery.php index 44465f962..42775d28c 100644 --- a/ansel/lib/View/GalleryRenderer/Gallery.php +++ b/ansel/lib/View/GalleryRenderer/Gallery.php @@ -89,7 +89,7 @@ class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer_Base 'perpage' => $this->perpage, 'url_callback' => $callback); - $pager = new Horde_Ui_Pager('page', $vars, $params); + $pager = new Horde_Core_Ui_Pager('page', $vars, $params); // Note that we can't use Horde_Util::bufferOutput() here since the // include file would be included inside that method's scope, and not diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php index af5d565db..89cb213b7 100644 --- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php +++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php @@ -114,7 +114,7 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende 'perpage' => $this->perpage, 'url_callback' => $callback); - $pager = new Horde_Ui_Pager('page', $vars, $params); + $pager = new Horde_Core_Ui_Pager('page', $vars, $params); Horde::startBuffer(); /* Create the js variables to pass to the lightbox script */ $jsvars = array('graphics_dir' => Horde::applicationUrl(Horde_Themes::img(), true, -1), diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php index 1faad199b..076023d00 100644 --- a/ansel/lib/View/List.php +++ b/ansel/lib/View/List.php @@ -219,7 +219,7 @@ class Ansel_View_List extends Ansel_View_Base if ($override) { $p_params['url_callback'] = null; } - $this->_pager = new Horde_Ui_Pager('page', $vars, $p_params); + $this->_pager = new Horde_Core_Ui_Pager('page', $vars, $p_params); $preserve = array('sort_dir' => $this->_sortDir); if (!empty($this->_sortBy)) { $preserve['sort'] = $this->_sortBy; diff --git a/ansel/lib/View/Results.php b/ansel/lib/View/Results.php index 18dc4e836..ea1391731 100644 --- a/ansel/lib/View/Results.php +++ b/ansel/lib/View/Results.php @@ -251,7 +251,7 @@ class Ansel_View_Results extends Ansel_View_Base $this->_pagestart = ($this->_page * $this->_perPage) + 1; $this->_pageend = min($this->_pagestart + $numimages - 1, $this->_pagestart + $this->_perPage - 1); - $this->_pager = new Horde_Ui_Pager('page', $vars, array('num' => $total, + $this->_pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $total, 'url' => $viewurl, 'perpage' => $this->_perPage)); Horde::startBuffer(); diff --git a/babel/view.php b/babel/view.php index dd40c8f1f..c0125b31b 100644 --- a/babel/view.php +++ b/babel/view.php @@ -490,7 +490,7 @@ $viewurl = Horde_Util::addParameter($viewurl, array('editmode' => $editmode, 'module' => $app, 'filter' => $filter, 'search' => $search)); - $pager = new Horde_Ui_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); echo $pager->render($page, $numitem, $viewurl); ?> diff --git a/beatnik/listzones.php b/beatnik/listzones.php index 5d8051da2..d43fde6f8 100644 --- a/beatnik/listzones.php +++ b/beatnik/listzones.php @@ -27,7 +27,7 @@ $_SESSION['beatnik']['curpage'] = $page; $pager_vars = Horde_Variables::getDefaultVariables(); $pager_vars->set('page', $page); $perpage = $prefs->getValue('domains_perpage'); -$pager = new Horde_Ui_Pager('page', $pager_vars, +$pager = new Horde_Core_Ui_Pager('page', $pager_vars, array('num' => count($beatnik->domains), 'url' => 'listzones.php', 'page_count' => 10, diff --git a/fima/lib/UI/VarRenderer/fima.php b/fima/lib/UI/VarRenderer/fima.php index 58187355e..4d9b57277 100644 --- a/fima/lib/UI/VarRenderer/fima.php +++ b/fima/lib/UI/VarRenderer/fima.php @@ -1,7 +1,7 @@ * @package Fima */ -class Horde_Ui_VarRenderer_Fima extends Horde_Ui_VarRenderer_Html { +class Horde_Core_Ui_VarRenderer_Fima extends Horde_Core_Ui_VarRenderer_Html { protected function _renderVarInput_fima_dspostings($form, &$var, &$vars) { diff --git a/fima/postings.php b/fima/postings.php index 4fc043456..690ee52d4 100644 --- a/fima/postings.php +++ b/fima/postings.php @@ -696,7 +696,7 @@ if ($pageOb['mode'] == 'edit') { /* Generate tabs. */ if ($pageOb['mode'] != 'transfer' && !$print_view) { - $tabs = new Horde_Ui_Tabs('postingtype', $vars); + $tabs = new Horde_Core_Ui_Tabs('postingtype', $vars); $postingtypes = Fima::getPostingTypes(); foreach ($postingtypes as $typeValue => $typeLabel) { $tabs->addTab($typeLabel, $pageOb['url'], $typeValue); diff --git a/folks/account/tabs.php b/folks/account/tabs.php index 14cd20b95..cd57efd4c 100644 --- a/folks/account/tabs.php +++ b/folks/account/tabs.php @@ -16,7 +16,7 @@ require_once dirname(__FILE__) . '/../lib/base.php'; $auth = $injector->getInstance('Horde_Auth')->getAuth(); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs('what', $vars); +$tabs = new Horde_Core_Ui_Tabs('what', $vars); $tabs->addTab(_("Login"), Horde::applicationUrl('login.php'), 'login'); if ($conf['signup']['allow'] === true && $auth->hasCapability('add')) { diff --git a/folks/activity.php b/folks/activity.php index 5085afb35..d9aa49d75 100644 --- a/folks/activity.php +++ b/folks/activity.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'activity.php', 'perpage' => $perpage)); diff --git a/folks/birthday.php b/folks/birthday.php index 89bad2771..8dd092284 100644 --- a/folks/birthday.php +++ b/folks/birthday.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'birthday.php', 'perpage' => $perpage)); diff --git a/folks/edit/tabs.php b/folks/edit/tabs.php index e4632a34f..2ec6f015b 100644 --- a/folks/edit/tabs.php +++ b/folks/edit/tabs.php @@ -16,7 +16,7 @@ if (!$registry->isAuthenticated()) { } $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs('what', $vars); +$tabs = new Horde_Core_Ui_Tabs('what', $vars); $tabs->addTab(_("Edit my profile"), Horde::applicationUrl('edit/edit.php'), 'edit'); $tabs->addTab(_("Privacy"), Horde::applicationUrl('edit/privacy.php'), 'privacy'); $tabs->addTab(_("Blacklist"), Horde::applicationUrl('edit/friends/blacklist.php'), 'blacklist'); diff --git a/folks/list.php b/folks/list.php index 1c055fffa..3b07e0ca3 100644 --- a/folks/list.php +++ b/folks/list.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'list.php', 'perpage' => $perpage)); diff --git a/folks/new.php b/folks/new.php index 5996834f8..bec0f7121 100644 --- a/folks/new.php +++ b/folks/new.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'new.php', 'perpage' => $perpage)); diff --git a/folks/online.php b/folks/online.php index b761dc385..dd85be3e5 100644 --- a/folks/online.php +++ b/folks/online.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'online.php', 'perpage' => $perpage)); diff --git a/folks/popularity.php b/folks/popularity.php index 8faec7537..e4936596b 100644 --- a/folks/popularity.php +++ b/folks/popularity.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'popularity.php', 'perpage' => $perpage)); diff --git a/folks/search.php b/folks/search.php index 6bd39f5e7..00d09c2e6 100644 --- a/folks/search.php +++ b/folks/search.php @@ -60,7 +60,7 @@ if (!empty($criteria)) { } $vars = Horde_Variables::getDefaultVariables(); - $pager = new Horde_Ui_Pager('page', + $pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'search.php', 'perpage' => $perpage)); diff --git a/framework/Ui/lib/Horde/Ui/FlagImage.php b/framework/Core/lib/Horde/Core/Ui/FlagImage.php similarity index 90% rename from framework/Ui/lib/Horde/Ui/FlagImage.php rename to framework/Core/lib/Horde/Core/Ui/FlagImage.php index 13b55873c..17f8bef24 100644 --- a/framework/Ui/lib/Horde/Ui/FlagImage.php +++ b/framework/Core/lib/Horde/Core/Ui/FlagImage.php @@ -1,6 +1,6 @@ * @category Horde * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @package Ui + * @package Core */ -class Horde_Ui_FlagImage +class Horde_Core_Ui_FlagImage { /** * Render the language selection. diff --git a/framework/Ui/lib/Horde/Ui/JsCalendar.php b/framework/Core/lib/Horde/Core/Ui/JsCalendar.php similarity index 87% rename from framework/Ui/lib/Horde/Ui/JsCalendar.php rename to framework/Core/lib/Horde/Core/Ui/JsCalendar.php index ff7ff2062..47afb1592 100644 --- a/framework/Ui/lib/Horde/Ui/JsCalendar.php +++ b/framework/Core/lib/Horde/Core/Ui/JsCalendar.php @@ -1,17 +1,19 @@ - * @package Horde_Ui + * @author Michael Slusarz + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_JsCalendar +class Horde_Core_Ui_JsCalendar { /** * Output the necessary javascript code to allow display of the calendar @@ -30,6 +32,7 @@ class Horde_Ui_JsCalendar $day = substr($day, 0, 1); } } + Horde::addScriptFile('calendar.js', 'horde'); Horde::addInlineScript(array( 'Horde_Calendar.firstDayOfWeek = ' . (isset($GLOBALS['prefs']) ? intval($GLOBALS['prefs']->getValue('first_week_day')) : 1), diff --git a/framework/Ui/lib/Horde/Ui/Language.php b/framework/Core/lib/Horde/Core/Ui/Language.php similarity index 85% rename from framework/Ui/lib/Horde/Ui/Language.php rename to framework/Core/lib/Horde/Core/Ui/Language.php index e75a2114a..1467f7018 100644 --- a/framework/Ui/lib/Horde/Ui/Language.php +++ b/framework/Core/lib/Horde/Core/Ui/Language.php @@ -1,6 +1,6 @@ - * @package Horde_Ui + * @author Jason M. Felice + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_Language { +class Horde_Core_Ui_Language { /** * Render the language selection. diff --git a/framework/Ui/lib/Horde/Ui/Pager.php b/framework/Core/lib/Horde/Core/Ui/Pager.php similarity index 87% rename from framework/Ui/lib/Horde/Ui/Pager.php rename to framework/Core/lib/Horde/Core/Ui/Pager.php index e5cebde58..7dab22f6e 100644 --- a/framework/Ui/lib/Horde/Ui/Pager.php +++ b/framework/Core/lib/Horde/Core/Ui/Pager.php @@ -1,33 +1,32 @@ - * @author Joel Vandal - * @author Chuck Hagenbuch - * @package Horde_Ui + * @author Ben Chavet + * @author Joel Vandal + * @author Chuck Hagenbuch + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_Pager extends Horde_Ui_Widget +class Horde_Core_Ui_Pager extends Horde_Core_Ui_Widget { /** - * Constructor + * Constructor. * * TODO */ - public function __construct($name, &$vars, $config) + public function __construct($name, $vars, $config) { - if (!isset($config['page_limit'])) { - $config['page_limit'] = 10; - } - - if (!isset($config['perpage'])) { - $config['perpage'] = 100; - } + $config = array_merge(array( + 'page_limit' => 10, + 'perpage' => 100 + ), $config); parent::__construct($name, $vars, $config); } diff --git a/framework/Ui/lib/Horde/Ui/Tabs.php b/framework/Core/lib/Horde/Core/Ui/Tabs.php similarity index 92% rename from framework/Ui/lib/Horde/Ui/Tabs.php rename to framework/Core/lib/Horde/Core/Ui/Tabs.php index 18977bc39..bdc878318 100644 --- a/framework/Ui/lib/Horde/Ui/Tabs.php +++ b/framework/Core/lib/Horde/Core/Ui/Tabs.php @@ -1,6 +1,6 @@ * Copyright 2003-2010 The Horde Project (http://www.horde.org/) @@ -8,10 +8,12 @@ * See the enclosed file COPYING for license information (LGPL). If you * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * - * @author Jason M. Felice - * @package Horde_Ui + * @author Jason M. Felice + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_Tabs extends Horde_Ui_Widget +class Horde_Core_Ui_Tabs extends Horde_Core_Ui_Widget { /** * The array of tabs. diff --git a/framework/Ui/lib/Horde/Ui/TagCloud.php b/framework/Core/lib/Horde/Core/Ui/TagCloud.php similarity index 97% rename from framework/Ui/lib/Horde/Ui/TagCloud.php rename to framework/Core/lib/Horde/Core/Ui/TagCloud.php index ea8ca58ac..364620271 100644 --- a/framework/Ui/lib/Horde/Ui/TagCloud.php +++ b/framework/Core/lib/Horde/Core/Ui/TagCloud.php @@ -1,6 +1,6 @@ - * @package Horde_Ui + * @author Jason M. Felice + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_VarRenderer +class Horde_Core_Ui_VarRenderer { /** * Parameters which change this renderer's behavior. @@ -48,7 +50,7 @@ class Horde_Ui_VarRenderer * name. * @param array $params Parameters specific to the subclass. * - * @return Horde_Ui_VarRenderer A subclass instance. + * @return Horde_Core_Ui_VarRenderer A subclass instance. * @throws Horde_Exception */ static public function factory($driver, $params = array()) @@ -63,7 +65,7 @@ class Horde_Ui_VarRenderer include $GLOBALS['registry']->get('fileroot', $app) . '/lib/Ui/VarRenderer/' . $driver . '.php'; } - $class = 'Horde_Ui_VarRenderer_' . $driver; + $class = __CLASS__ . '_' . $driver; if (!class_exists($class)) { throw new Horde_Exception('Class definition of ' . $class . ' not found.'); } diff --git a/framework/Ui/lib/Horde/Ui/VarRenderer/Html.php b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php similarity index 99% rename from framework/Ui/lib/Horde/Ui/VarRenderer/Html.php rename to framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php index 2a7b4fe63..4552635a0 100644 --- a/framework/Ui/lib/Horde/Ui/VarRenderer/Html.php +++ b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php @@ -1,16 +1,18 @@ - * @package Horde_Ui + * @author Jason M. Felice + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_VarRenderer_Html extends Horde_Ui_VarRenderer +class Horde_Core_Ui_VarRenderer_Html extends Horde_Core_Ui_VarRenderer { protected $_onLoadJS = array(); @@ -499,7 +501,7 @@ class Horde_Ui_VarRenderer_Html extends Horde_Ui_VarRenderer if ($var->type->getProperty('picker') && $GLOBALS['browser']->hasFeature('javascript')) { - Horde_Ui_JsCalendar::init(); + Horde_Core_Ui_JsCalendar::init(); $imgId = $this->_genID($var->getVarName(), false) . 'goto'; $html .= Horde::link('#', _("Select a date"), '', '', 'Horde_Calendar.open(\'' . $imgId . '\', null)') . Horde::img('calendar.png', _("Calendar"), 'id="' . $imgId . '"') . "\n"; } diff --git a/framework/Ui/lib/Horde/Ui/VarRenderer/TablesetHtml.php b/framework/Core/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php similarity index 95% rename from framework/Ui/lib/Horde/Ui/VarRenderer/TablesetHtml.php rename to framework/Core/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php index 057888c1a..7adc10d2d 100644 --- a/framework/Ui/lib/Horde/Ui/VarRenderer/TablesetHtml.php +++ b/framework/Core/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php @@ -5,9 +5,11 @@ * See the enclosed file COPYING for license information (LGPL). If you * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * - * @package Horde_Ui + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -class Horde_Ui_VarRenderer_TablesetHtml extends Horde_Ui_VarRenderer_Html +class Horde_Core_Ui_VarRenderer_TablesetHtml extends Horde_Core_Ui_VarRenderer_Html { protected function _renderVarInput_tableset($form, &$var, &$vars) { diff --git a/framework/Ui/lib/Horde/Ui/Widget.php b/framework/Core/lib/Horde/Core/Ui/Widget.php similarity index 91% rename from framework/Ui/lib/Horde/Ui/Widget.php rename to framework/Core/lib/Horde/Core/Ui/Widget.php index feeafc133..89feffae2 100644 --- a/framework/Ui/lib/Horde/Ui/Widget.php +++ b/framework/Core/lib/Horde/Core/Ui/Widget.php @@ -1,17 +1,19 @@ - * @package Horde_Ui + * @author Jason M. Felice + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core */ -abstract class Horde_Ui_Widget +abstract class Horde_Core_Ui_Widget { /** * Any variables that should be preserved in all of the widget's diff --git a/framework/Core/package.xml b/framework/Core/package.xml index 67ad707d1..7838361fb 100644 --- a/framework/Core/package.xml +++ b/framework/Core/package.xml @@ -34,7 +34,8 @@ Application Framework. beta LGPL - * Absorb horde/Ajax package. + * Absorb horde/Ui package. + * Absorb horde/Ajax package. * Import application auth driver from horde/Auth. * Import signup code from horde/Auth. * Import Horde backend driver from horde/LoginTasks. @@ -187,6 +188,20 @@ Application Framework. + + + + + + + + + + + + + + @@ -428,6 +443,16 @@ Application Framework. + + + + + + + + + + diff --git a/framework/Form/Form/Renderer.php b/framework/Form/Form/Renderer.php index ca166890e..8984417d7 100644 --- a/framework/Form/Form/Renderer.php +++ b/framework/Form/Form/Renderer.php @@ -46,7 +46,7 @@ class Horde_Form_Renderer { * @param array $params This is a hash of renderer-specific parameters. * Possible keys: * 'varrenderer_driver': specifies the driver - * parameter to Horde_Ui_VarRenderer::factory(). + * parameter to Horde_Core_Ui_VarRenderer::factory(). * 'encode_title': @see $_encodeTitle */ function Horde_Form_Renderer($params = array()) @@ -68,7 +68,7 @@ class Horde_Form_Renderer { if (isset($params['varrenderer_driver'])) { $driver = $params['varrenderer_driver']; } - $this->_varRenderer = Horde_Ui_VarRenderer::factory($driver, $params); + $this->_varRenderer = Horde_Core_Ui_VarRenderer::factory($driver, $params); } function showHeader($bool) diff --git a/framework/Ui/package.xml b/framework/Ui/package.xml deleted file mode 100644 index bcd189e53..000000000 --- a/framework/Ui/package.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - Ui - pear.horde.org - Horde's User Interface Classes - The Horde_Ui package provides several classes for handling UI elements in Horde. - - - Chuck Hagenbuch - chuck - chuck@horde.org - yes - - - Jay Felice - eraserhd - jason.m.felice@gmail.com - yes - - 2009-11-19 - - 0.1.0 - 0.1.0 - - - beta - beta - - LGPL - * Added Horde_Ui_FlagImage::. - * Initial Horde 4 package. - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.0 - - - 1.7.0 - - - Core - pear.horde.org - - - Nls - pear.horde.org - - - - - - - - - - - - - - - - - - - - - 0.0.2 - 0.0.2 - - - alpha - alpha - - 2006-05-08 - - LGPL - * Added Horde_UI_JsCalendar::. - * Converted to package.xml 2.0 for pear.horde.org - - - - - 0.0.1 - 0.0.1 - - - alpha - alpha - - 2003-11-14 - LGPL - Initial release as a PEAR package - - - - diff --git a/gollem/manager.php b/gollem/manager.php index 00df09ac8..a03075c6b 100644 --- a/gollem/manager.php +++ b/gollem/manager.php @@ -455,7 +455,7 @@ if (is_array($list) && $numitem && $read_perms) { $vars = Horde_Variables::getDefaultVariables(); $vars->set('page', $page); - $pager = new Horde_Ui_Pager('page', $vars, array('num' => $total, 'url' => $refresh_url, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $total, 'url' => $refresh_url, 'page_count' => 10, 'perpage' => $perpage)); $page_caption = $pager->render(); } diff --git a/hermes/lib/Hermes.php b/hermes/lib/Hermes.php index c42f94471..af454411b 100644 --- a/hermes/lib/Hermes.php +++ b/hermes/lib/Hermes.php @@ -218,7 +218,7 @@ class Hermes { { /* Build search mode tabs. */ $sUrl = Horde::selfUrl(); - $tabs = new Horde_Ui_Tabs('search_mode', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Core_Ui_Tabs('search_mode', Horde_Variables::getDefaultVariables()); $tabs->addTab(_("Summary"), $sUrl, 'summary'); $tabs->addTab(_("By Date"), $sUrl, 'date'); $tabs->addTab(_("By Employee"), $sUrl, 'employee'); diff --git a/hermes/lib/Table.php b/hermes/lib/Table.php index 7286290f9..1e3eb7842 100644 --- a/hermes/lib/Table.php +++ b/hermes/lib/Table.php @@ -7,10 +7,8 @@ * * See the enclosed file LICENSE for license information (BSD). If you * did not receive this file, see http://www.horde.org/licenses/bsdl.php. - * - * @package Horde_Ui */ -class Horde_Ui_Table extends Horde_Ui_Widget { +class Horde_Core_Ui_Table extends Horde_Core_Ui_Widget { /** * Data loaded from the getTableMetaData API. @@ -120,7 +118,7 @@ class Horde_Ui_Table extends Horde_Ui_Widget { return false; } - $varRenderer = new Horde_Ui_VarRenderer_Html(); + $varRenderer = new Horde_Core_Ui_VarRenderer_Html(); $html = '

'; @@ -180,7 +178,7 @@ class Horde_Ui_Table extends Horde_Ui_Widget { $html .= ($secname == 'footer') ? '' : ''; /* This Horde_Variables object is populated for each table row - * so that we can use the Horde_Ui_VarRenderer. */ + * so that we can use the Horde_Core_Ui_VarRenderer. */ $vars = new Horde_Variables(); $form = null; foreach ($data[$secname] as $row) { diff --git a/hermes/search.php b/hermes/search.php index dc0bde0d9..33d3e890a 100644 --- a/hermes/search.php +++ b/hermes/search.php @@ -110,7 +110,7 @@ if (isset($_SESSION['hermes_search_criteria'])) { $criteria = $form->getSearchCriteria($searchVars); } - $table = new Horde_Ui_Table('results', $vars, + $table = new Horde_Core_Ui_Table('results', $vars, array('title' => _("Search Results"), 'name' => 'hermes/hours', 'params' => $criteria)); diff --git a/hermes/time.php b/hermes/time.php index 415125ba8..2e389c910 100644 --- a/hermes/time.php +++ b/hermes/time.php @@ -57,7 +57,7 @@ $tabs = Hermes::tabs(); $criteria = array('employee' => $GLOBALS['registry']->getAuth(), 'submitted' => false, 'link_page' => 'time.php'); -$table = new Horde_Ui_Table('week', $vars, +$table = new Horde_Core_Ui_Table('week', $vars, array('title' => _("My Unsubmitted Time"), 'name' => 'hermes/hours', 'params' => $criteria)); diff --git a/horde/admin/sessions.php b/horde/admin/sessions.php index d64b752cc..111674414 100644 --- a/horde/admin/sessions.php +++ b/horde/admin/sessions.php @@ -47,7 +47,7 @@ try { } else { $host = @gethostbyaddr($data['remoteAddr']); } - $entry[_("Remote Host:")] = $host . ' [' . $data['remoteAddr'] . '] ' . Horde_Ui_FlagImage::generateFlagImageByHost($host); + $entry[_("Remote Host:")] = $host . ' [' . $data['remoteAddr'] . '] ' . Horde_Core_Ui_FlagImage::generateFlagImageByHost($host); } echo '
  • ' . $plus . $minus . htmlspecialchars($data['userid']) . ' [' . htmlspecialchars($id) . ']' diff --git a/horde/lib/Block/cloud.php b/horde/lib/Block/cloud.php index d99156035..fab6d045c 100644 --- a/horde/lib/Block/cloud.php +++ b/horde/lib/Block/cloud.php @@ -32,7 +32,7 @@ class Horde_Block_Horde_cloud extends Horde_Block { Horde::addScriptFile('prototype.js', 'horde'); - $cloud = new Horde_Ui_TagCloud(); + $cloud = new Horde_Core_Ui_TagCloud(); foreach ($this->_getTags() as $tag) { $cloud->addElement($tag['tag_name'], '#', $tag['total'], null, diff --git a/horde/services/help/index.php b/horde/services/help/index.php index d1a362c12..b3bdbdc96 100644 --- a/horde/services/help/index.php +++ b/horde/services/help/index.php @@ -66,7 +66,7 @@ case 'sidebar': } /* Generate Tabs */ - $tabs = new Horde_Ui_Tabs('side_show', $vars); + $tabs = new Horde_Core_Ui_Tabs('side_show', $vars); $tabs->addTab(_("Help _Topics"), $sidebar_url, 'index'); $tabs->addTab(_("Sea_rch"), $sidebar_url, 'search'); diff --git a/horde/templates/admin/user/list.inc b/horde/templates/admin/user/list.inc index de858d084..a503f0331 100644 --- a/horde/templates/admin/user/list.inc +++ b/horde/templates/admin/user/list.inc @@ -38,7 +38,7 @@ foreach ($users as $user): $total, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $total, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); echo $pager->render($page, $total, $viewurl); } ?> diff --git a/imp/message.php b/imp/message.php index 0dc768226..750c83141 100644 --- a/imp/message.php +++ b/imp/message.php @@ -249,14 +249,14 @@ if ($origin_host) { $origin_host = array($origin_host); } foreach ($origin_host as $host) { - $from_img .= Horde_Ui_FlagImage::generateFlagImageByHost($host) . ' '; + $from_img .= Horde_Core_Ui_FlagImage::generateFlagImageByHost($host) . ' '; } trim($from_img); } if (empty($from_img) && !empty($envelope['from'])) { $from_ob = reset($envelope['from']); - $from_img .= Horde_Ui_FlagImage::generateFlagImageByHost($from_ob['host']) . ' '; + $from_img .= Horde_Core_Ui_FlagImage::generateFlagImageByHost($from_ob['host']) . ' '; } if (!empty($from_img)) { diff --git a/imp/search.php b/imp/search.php index 69e747cd0..eb7763b66 100644 --- a/imp/search.php +++ b/imp/search.php @@ -179,7 +179,7 @@ foreach ($imp_search->flagFields() as $key => $val) { } $t->set('f_fields', $f_fields); -Horde_Ui_JsCalendar::init(); +Horde_Core_Ui_JsCalendar::init(); /* Gettext strings for this page. */ $gettext_strings = array( @@ -198,7 +198,7 @@ $gettext_strings = array( /* Javascript data for this page. */ $js_data = array( - 'months' => Horde_Ui_JsCalendar::months(), + 'months' => Horde_Core_Ui_JsCalendar::months(), 'searchmbox' => $search_mailbox, 'types' => $types ); diff --git a/ingo/lib/Ui/VarRenderer/Ingo.php b/ingo/lib/Ui/VarRenderer/Ingo.php index f553e61b6..3635d0d06 100644 --- a/ingo/lib/Ui/VarRenderer/Ingo.php +++ b/ingo/lib/Ui/VarRenderer/Ingo.php @@ -11,7 +11,7 @@ * @author Jan Schneider * @package Ingo */ -class Horde_Ui_VarRenderer_Ingo extends Horde_Ui_VarRenderer_Html +class Horde_Core_Ui_VarRenderer_Ingo extends Horde_Core_Ui_VarRenderer_Html { protected function _renderVarInput_ingo_folders(&$form, &$var, &$vars) { diff --git a/ingo/spam.php b/ingo/spam.php index 3d682e9d3..999404ea6 100644 --- a/ingo/spam.php +++ b/ingo/spam.php @@ -17,7 +17,7 @@ Horde_Registry::appInit('ingo'); /** * Dummy class to hold the select box created by {@link Ingo::flistSelect()}. * - * @see Horde_Ui_VarRenderer_Ingo + * @see Horde_Core_Ui_VarRenderer_Ingo * @see Ingo::flistSelect() */ class Horde_Form_Type_ingo_folders extends Horde_Form_Type { diff --git a/jonah/lib/Block/cloud.php b/jonah/lib/Block/cloud.php index 2cf1c1a22..e0fe33b3f 100644 --- a/jonah/lib/Block/cloud.php +++ b/jonah/lib/Block/cloud.php @@ -40,7 +40,7 @@ class Horde_Block_jonah_cloud extends Horde_Block { /* Get the tags */ $tags = $news->listTagInfo(); if (count($tags)) { - $cloud = new Horde_Ui_TagCloud(); + $cloud = new Horde_Core_Ui_TagCloud(); foreach ($tags as $id => $tag) { $cloud->addElement($tag['tag_name'], str_replace(array('@id@', '@tag@'), array($id, $tag['tag_name']), $this->_params['results_url']), $tag['total']); } diff --git a/jonah/stories/view.php b/jonah/stories/view.php index 62e20618e..994d42f76 100644 --- a/jonah/stories/view.php +++ b/jonah/stories/view.php @@ -41,7 +41,7 @@ if (is_a($story, 'PEAR_Error')) { } /* Grab tag related content for entire channel */ -$cloud = new Horde_Ui_TagCloud(); +$cloud = new Horde_Core_Ui_TagCloud(); $allTags = $news->listTagInfo(array(), $channel_id); foreach ($allTags as $tag_id => $taginfo) { $cloud->addElement($taginfo['tag_name'], Horde_Util::addParameter('results.php', array('tag_id' => $tag_id, 'channel_id' => $channel_id)), $taginfo['total']); diff --git a/koward/lib/Koward/Controller/ObjectController.php b/koward/lib/Koward/Controller/ObjectController.php index cd73b431d..a22cf2b66 100644 --- a/koward/lib/Koward/Controller/ObjectController.php +++ b/koward/lib/Koward/Controller/ObjectController.php @@ -65,7 +65,7 @@ class ObjectController extends Koward_Controller_Application } } - $this->tabs = new Horde_Ui_Tabs(null, Horde_Variables::getDefaultVariables()); + $this->tabs = new Horde_Core_Ui_Tabs(null, Horde_Variables::getDefaultVariables()); foreach ($this->koward->objects as $key => $configuration) { if (!$this->koward->hasAccess($this->getPermissionId() . '/' . $key)) { continue; diff --git a/kronolith/attendees.php b/kronolith/attendees.php index 6ba870a3b..be23be6d2 100644 --- a/kronolith/attendees.php +++ b/kronolith/attendees.php @@ -182,7 +182,7 @@ $delimg = Horde::img('delete.png', _("Remove Attendee")); $ident = $injector->getInstance('Horde_Prefs_Identity')->getIdentity(); $identities = $ident->getAll('id'); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs(null, $vars); +$tabs = new Horde_Core_Ui_Tabs(null, $vars); $tabs->addTab(_("Day"), new Horde_Url('javascript:switchView(\'Day\')'), 'Day'); $tabs->addTab(_("Work Week"), new Horde_Url('javascript:switchView(\'Workweek\')'), 'Workweek'); $tabs->addTab(_("Week"), new Horde_Url('javascript:switchView(\'Week\')'), 'Week'); diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php index 19cb5a1a0..9d53774c0 100644 --- a/kronolith/lib/Event.php +++ b/kronolith/lib/Event.php @@ -230,7 +230,7 @@ abstract class Kronolith_Event /** * The VarRenderer class to use for printing select elements. * - * @var Horde_Ui_VarRenderer + * @var Horde_Core_Ui_VarRenderer */ private $_varRenderer; @@ -2531,7 +2531,7 @@ abstract class Kronolith_Event } if (!$this->_varRenderer) { - $this->_varRenderer = Horde_Ui_VarRenderer::factory('Html'); + $this->_varRenderer = Horde_Core_Ui_VarRenderer::factory('Html'); } return '' . diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 410161126..16172df1f 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -76,7 +76,7 @@ class Kronolith Horde::addScriptFile('date/' . $datejs, 'horde'); Horde::addScriptFile('date/date.js', 'horde'); Horde::addScriptFile('kronolith.js', 'kronolith'); - Horde_Ui_JsCalendar::init(array('short_weekdays' => true)); + Horde_Core_Ui_JsCalendar::init(array('short_weekdays' => true)); if (isset($GLOBALS['language'])) { header('Content-type: text/html; charset=' . $GLOBALS['registry']->getCharset()); @@ -2527,7 +2527,7 @@ class Kronolith $date = self::currentDate(); $date_stamp = $date->dateString(); - $tabs = new Horde_Ui_Tabs('view', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Core_Ui_Tabs('view', Horde_Variables::getDefaultVariables()); $tabs->preserve('date', $date_stamp); $tabs->addTab(_("Day"), Horde::applicationUrl('day.php'), @@ -2557,7 +2557,7 @@ class Kronolith return; } - $tabs = new Horde_Ui_Tabs('event', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Core_Ui_Tabs('event', Horde_Variables::getDefaultVariables()); $date = self::currentDate(); $tabs->preserve('datetime', $date->dateString()); diff --git a/nag/lib/Ui/VarRenderer/Nag.php b/nag/lib/Ui/VarRenderer/Nag.php index 8d2247741..016e61645 100644 --- a/nag/lib/Ui/VarRenderer/Nag.php +++ b/nag/lib/Ui/VarRenderer/Nag.php @@ -1,7 +1,7 @@ * @package Nag */ -class Horde_Ui_VarRenderer_Nag extends Horde_Ui_VarRenderer_Html +class Horde_Core_Ui_VarRenderer_Nag extends Horde_Core_Ui_VarRenderer_Html { protected function _renderVarInput_nag_method($form, $var, $vars) { diff --git a/nag/list.php b/nag/list.php index d0df3a8f1..763667bb6 100644 --- a/nag/list.php +++ b/nag/list.php @@ -95,7 +95,7 @@ echo '
    '; if (!$prefs->isLocked('show_completed')) { $listurl = Horde::applicationUrl('list.php'); - $tabs = new Horde_Ui_Tabs('show_completed', $vars); + $tabs = new Horde_Core_Ui_Tabs('show_completed', $vars); $tabs->addTab(_("_All tasks"), $listurl, Nag::VIEW_ALL); $tabs->addTab(_("Incom_plete tasks"), $listurl, Nag::VIEW_INCOMPLETE); $tabs->addTab(_("_Future tasks"), $listurl, Nag::VIEW_FUTURE); diff --git a/news/admin/tabs.php b/news/admin/tabs.php index bda8b0da9..f5d715d0b 100644 --- a/news/admin/tabs.php +++ b/news/admin/tabs.php @@ -17,7 +17,7 @@ if (!$registry->isAdmin(array('permission' => 'news:admin'))) { } $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs('admin', $vars); +$tabs = new Horde_Core_Ui_Tabs('admin', $vars); $tabs->addTab(_("Sources"), Horde::applicationUrl('admin/sources/index.php'), 'sources'); $tabs->addTab(_("Categories"), Horde::applicationUrl('admin/categories/index.php'), 'categories'); diff --git a/news/lib/Forms/Search.php b/news/lib/Forms/Search.php index 85059a137..97cb035a6 100644 --- a/news/lib/Forms/Search.php +++ b/news/lib/Forms/Search.php @@ -60,7 +60,7 @@ class News_Search extends Horde_Form { */ public function getPager($info, $count, $url) { - $pager = new Horde_Ui_Pager('news_page', + $pager = new Horde_Core_Ui_Pager('news_page', Horde_Variables::getDefaultVariables(), array('num' => $count, 'url' => $url, diff --git a/news/lib/Search.php b/news/lib/Search.php index 969d2474c..2d4e76131 100644 --- a/news/lib/Search.php +++ b/news/lib/Search.php @@ -62,7 +62,7 @@ class News_Search extends Horde_Form { */ static public function getPager($info, $count, $url) { - $pager = new Horde_Ui_Pager('news_page', + $pager = new Horde_Core_Ui_Pager('news_page', Horde_Variables::getDefaultVariables(), array('num' => $count, 'url' => $url, diff --git a/news/lib/TagCloud.php b/news/lib/TagCloud.php index 5c540e4b9..2bb165211 100644 --- a/news/lib/TagCloud.php +++ b/news/lib/TagCloud.php @@ -12,7 +12,7 @@ * @author Duck * @package News */ -class News_TagCloud extends Horde_Ui_TagCloud { +class News_TagCloud extends Horde_Core_Ui_TagCloud { /** * create a Element of HTML part diff --git a/operator/search.php b/operator/search.php index 3b3f648b5..ca944b41b 100644 --- a/operator/search.php +++ b/operator/search.php @@ -70,7 +70,7 @@ $page = Horde_Util::getGet('page', 0); $pager_vars = Horde_Variables::getDefaultVariables(); $pager_vars->set('page', $page); $perpage = $prefs->getValue('rowsperpage'); -$pager = new Horde_Ui_Pager('page', $pager_vars, +$pager = new Horde_Core_Ui_Pager('page', $pager_vars, array('num' => count($data), 'url' => 'search.php', 'page_count' => 10, diff --git a/shout/lib/Shout.php b/shout/lib/Shout.php index 8701a7b9a..334b62125 100644 --- a/shout/lib/Shout.php +++ b/shout/lib/Shout.php @@ -245,7 +245,7 @@ class Shout static public function getAdminTabs() { $tabname = Horde_Util::getFormData('view'); - $tabs = new Horde_Ui_Tabs('view', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Core_Ui_Tabs('view', Horde_Variables::getDefaultVariables()); $tabs->addTab(_("Telephone Numbers"), Horde::applicationUrl('admin/numbers.php'), array('view' => 'numbers', id => 'tabnumbers')); diff --git a/skoli/entry.php b/skoli/entry.php index 6f4a1868e..b10ee2ae2 100644 --- a/skoli/entry.php +++ b/skoli/entry.php @@ -81,7 +81,7 @@ if ($actionID == 'delete') { // Get tabs. $url = Horde_Util::addParameter(Horde::applicationUrl('entry.php'), 'entry', $entry['object_id']); -$tabs = new Horde_Ui_Tabs('view', $vars); +$tabs = new Horde_Core_Ui_Tabs('view', $vars); $tabs->addTab(_("View"), $url, array('tabname' => 'Entry', 'id' => 'tabEntry')); if ($share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) { $tabs->addTab(_("Edit"), $url, array('tabname' => 'EditEntry', 'id' => 'tabEditEntry')); diff --git a/turba/contact.php b/turba/contact.php index df928ed68..2948bd516 100644 --- a/turba/contact.php +++ b/turba/contact.php @@ -74,7 +74,7 @@ case 'DeleteContact': // Get tabs. $url = $contact->url(); -$tabs = new Horde_Ui_Tabs('view', $vars); +$tabs = new Horde_Core_Ui_Tabs('view', $vars); $tabs->addTab(_("_View"), $url, array('tabname' => 'Contact', 'id' => 'tabContact', 'onclick' => 'return ShowTab(\'Contact\');')); if ($contact->hasPermission(Horde_Perms::EDIT)) { diff --git a/turba/lib/View/List.php b/turba/lib/View/List.php index 4aec8646e..1ac2c8f35 100644 --- a/turba/lib/View/List.php +++ b/turba/lib/View/List.php @@ -61,7 +61,7 @@ class Turba_View_List { /** * The HTML renderer. * - * @var Horde_Ui_VarRenderer_Html + * @var Horde_Core_Ui_VarRenderer_Html */ var $renderer; @@ -114,7 +114,7 @@ class Turba_View_List { $this->list = &$list; $this->setControls($controls); - $this->renderer = Horde_Ui_VarRenderer::factory('Html'); + $this->renderer = Horde_Core_Ui_VarRenderer::factory('Html'); $this->vars = new Horde_Variables(); } @@ -217,7 +217,7 @@ class Turba_View_List { $viewurl = urldecode(Horde_Util::addParameter('search.php', $params)); $vars = Horde_Variables::getDefaultVariables(); - $pager = new Horde_Ui_Pager('page', $vars, + $pager = new Horde_Core_Ui_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_limit' => $maxpage, diff --git a/turba/search.php b/turba/search.php index fd924036c..122ef3430 100644 --- a/turba/search.php +++ b/turba/search.php @@ -212,7 +212,7 @@ foreach ($addressBooks as $key => $entry) { /* Build search mode tabs. */ $sUrl = Horde::applicationUrl('search.php'); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_Ui_Tabs('search_mode', $vars); +$tabs = new Horde_Core_Ui_Tabs('search_mode', $vars); $tabs->addTab(_("Basic Search"), $sUrl, 'basic'); $tabs->addTab(_("Advanced Search"), $sUrl, 'advanced'); if (count($editableAddressBooks)) { diff --git a/vilma/lib/Vilma.php b/vilma/lib/Vilma.php index ed2e8f16c..2705c8c45 100644 --- a/vilma/lib/Vilma.php +++ b/vilma/lib/Vilma.php @@ -72,12 +72,12 @@ class Vilma { /** * Create tabs to navigate the user manager area * - * return object Horde_Ui_Tabs object + * return object Horde_Core_Ui_Tabs object */ function getUserMgrTabs(&$vars) { $url = Horde::applicationUrl('users/index.php'); - $tabs = new Horde_Ui_Tabs('section', $vars); + $tabs = new Horde_Core_Ui_Tabs('section', $vars); foreach (Vilma::getUserMgrTypes() as $section => $desc) { $tabs->addTab($desc['plural'], $url, $section); } diff --git a/vilma/users/index.php b/vilma/users/index.php index b3d32576d..0affc5d1d 100644 --- a/vilma/users/index.php +++ b/vilma/users/index.php @@ -39,7 +39,7 @@ $page = Horde_Util::getGet('page', 0); $perpage = $prefs->getValue('addresses_perpage'); $url = 'users/index.php'; $url = Horde_Util::addParameter($url, 'section', $section); -$pager = new Horde_Ui_Pager('page', +$pager = new Horde_Core_Ui_Pager('page', Horde_Variables::getDefaultVariables(), array('num' => count($addresses), 'url' => $url, diff --git a/whups/admin/index.php b/whups/admin/index.php index aa7856fe2..3c6413bdc 100644 --- a/whups/admin/index.php +++ b/whups/admin/index.php @@ -26,7 +26,7 @@ if (!$vars->exists('action')) { // Admin actions. $adminurl = Horde::selfUrl(false, false); -$tabs = new Horde_Ui_Tabs('action', $vars); +$tabs = new Horde_Core_Ui_Tabs('action', $vars); $tabs->addTab(_("_Edit Queues"), $adminurl, 'queue'); $tabs->addTab(_("Edit _Types"), $adminurl, 'type'); $tabs->addTab(_("Queue/Type Matri_x"), $adminurl, 'mtmatrix'); diff --git a/whups/lib/Forms/VarRenderer.php b/whups/lib/Forms/VarRenderer.php index 725c36a0c..2b218d557 100644 --- a/whups/lib/Forms/VarRenderer.php +++ b/whups/lib/Forms/VarRenderer.php @@ -1,7 +1,7 @@ - * @package Horde_UI + * @package Whups */ /** - * The Horde_UI_VarRenderer_whups class provides additional methods for + * The Horde_Core_Ui_VarRenderer_whups class provides additional methods for * rendering Horde_Form_Type_whups_email fields. * * @author Jan Schneider - * @package Horde_UI + * @package Whups */ -class Horde_Ui_VarRenderer_whups extends Horde_Ui_VarRenderer_Html { +class Horde_Core_Ui_VarRenderer_whups extends Horde_Core_Ui_VarRenderer_Html { function _renderVarInput_whups_email($form, &$var, &$vars) { diff --git a/whups/lib/Query.php b/whups/lib/Query.php index 200832abe..5ddf99a7e 100644 --- a/whups/lib/Query.php +++ b/whups/lib/Query.php @@ -207,7 +207,7 @@ class Whups_Query { $edit = $this->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT); $delete = $this->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE); - $tabs = new Horde_Ui_Tabs('action', $vars); + $tabs = new Horde_Core_Ui_Tabs('action', $vars); $tabs->addTab(_("Ne_w Query"), $queryurl, 'new'); if (!$this->id || $edit) { $tabs->addTab(_("_Edit Query"), $queryurl, 'edit'); diff --git a/whups/lib/Renderer/Query.php b/whups/lib/Renderer/Query.php index f8ad7ebc2..f7e50f671 100644 --- a/whups/lib/Renderer/Query.php +++ b/whups/lib/Renderer/Query.php @@ -17,7 +17,7 @@ { global $whups_driver; - $droptext = Horde_UI_VarRenderer_html::selectOptions($whups_driver->getAllTypes()); + $droptext = Horde_Core_Ui_VarRenderer_html::selectOptions($whups_driver->getAllTypes()); include WHUPS_TEMPLATES . '/renderer/querysetcurrenttype.inc'; } diff --git a/whups/lib/Whups.php b/whups/lib/Whups.php index 9bf8b01f8..d3724707a 100644 --- a/whups/lib/Whups.php +++ b/whups/lib/Whups.php @@ -288,7 +288,7 @@ class Whups { */ function getTicketTabs(&$vars, $id) { - $tabs = new Horde_Ui_Tabs(null, $vars); + $tabs = new Horde_Core_Ui_Tabs(null, $vars); $queue = $vars->get('queue'); $tabs->addTab(_("_History"), Whups::urlFor('ticket', $id), 'history'); diff --git a/whups/query/index.php b/whups/query/index.php index bc6e96e4f..1ef651a52 100644 --- a/whups/query/index.php +++ b/whups/query/index.php @@ -148,7 +148,7 @@ $queryTabs = $whups_query->getTabs($vars); // Criterion form types. $queryurl = Horde::applicationUrl('query/index.php'); $vars->set('action', $_SESSION['whups']['query_form']); -$criteriaTabs = new Horde_Ui_Tabs('action', $vars); +$criteriaTabs = new Horde_Core_Ui_Tabs('action', $vars); $criteriaTabs->preserve('path', $vars->get('path')); $criteriaTabs->addTab(_("_Property Criteria"), $queryurl, 'props'); $criteriaTabs->addTab(_("_User Criteria"), $queryurl, 'user'); -- 2.11.0