From 117ff2b3d6d0e7112e11880ffe8f390e8beccd1e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 16 Aug 2009 17:07:19 -0600 Subject: [PATCH] Bug #8464: Print view now handled entirely by HTML/CSS --- nag/config/conf.xml | 4 ---- nag/lib/Nag.php | 7 +----- nag/list.php | 42 +++++++++++++----------------------- nag/tasks/index.php | 1 - nag/templates/list.html.php | 5 ++++- nag/templates/list/header.inc | 2 -- nag/templates/list/task_footers.inc | 2 -- nag/templates/view/task.inc | 2 +- nag/themes/screen.css | 6 ++++++ nag/view.php | 43 +++++++++++++------------------------ 10 files changed, 42 insertions(+), 72 deletions(-) diff --git a/nag/config/conf.xml b/nag/config/conf.xml index 5098eddec..67cf3fc08 100644 --- a/nag/config/conf.xml +++ b/nag/config/conf.xml @@ -3,7 +3,6 @@ Storage System Settings - sql @@ -18,9 +17,6 @@ Menu settings - - true true add(Horde::applicationUrl('data.php'), _("_Import/Export"), 'data.png', $registry->getImageDir('horde')); } - /* Print. */ - if ($conf['menu']['print'] && isset($print_link)) { - $menu->add($print_link, _("_Print"), 'print.png', $registry->getImageDir('horde'), '_blank', Horde::popupJs($print_link, array('urlencode' => true)) . 'return false;', '__noselection'); - } - return $menu; } diff --git a/nag/list.php b/nag/list.php index a9298614f..c5df2a1f9 100644 --- a/nag/list.php +++ b/nag/list.php @@ -84,36 +84,24 @@ default: break; } -$print_view = (bool)$vars->print; -if (!$print_view) { - Horde::addScriptFile('tooltips.js', 'horde', true); - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('QuickFinder.js', 'horde', true); - $print_link = Horde::applicationUrl(Horde_Util::addParameter('list.php', array('print' => 1))); -} +Horde::addScriptFile('tooltips.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde', true); +Horde::addScriptFile('QuickFinder.js', 'horde', true); require NAG_TEMPLATES . '/common-header.inc'; - -if ($print_view) { - require_once $registry->get('templates', 'horde') . '/javascript/print.js'; -} else { - require NAG_TEMPLATES . '/menu.inc'; - echo '
'; - - if (!$prefs->isLocked('show_completed')) { - $listurl = Horde::applicationUrl('list.php'); - $tabs = new Horde_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); - $tabs->addTab(_("_Completed tasks"), $listurl, Nag::VIEW_COMPLETE); - echo $tabs->render($vars->get('show_completed')); - } +require NAG_TEMPLATES . '/menu.inc'; +echo '
'; + +if (!$prefs->isLocked('show_completed')) { + $listurl = Horde::applicationUrl('list.php'); + $tabs = new Horde_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); + $tabs->addTab(_("_Completed tasks"), $listurl, Nag::VIEW_COMPLETE); + echo $tabs->render($vars->get('show_completed')); } require NAG_TEMPLATES . '/list.html.php'; - -if (!$print_view) { - require NAG_TEMPLATES . '/panel.inc'; -} +require NAG_TEMPLATES . '/panel.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/nag/tasks/index.php b/nag/tasks/index.php index 78c3c299f..6eee7c9bf 100644 --- a/nag/tasks/index.php +++ b/nag/tasks/index.php @@ -42,7 +42,6 @@ if ($search_results->count() == 1) { $tasks = $search_results; $title = sprintf(_("Search: Results for \"%s\""), $search); -$print_view = null; $actionID = null; Horde::addScriptFile('tooltips.js', 'horde', true); diff --git a/nag/templates/list.html.php b/nag/templates/list.html.php index 167e61369..fe7d0a8a1 100644 --- a/nag/templates/list.html.php +++ b/nag/templates/list.html.php @@ -7,6 +7,9 @@ if ($tasks->hasTasks()) { $sortdir = $prefs->getValue('sortdir'); $dateFormat = $prefs->getValue('date_format'); $columns = @unserialize($prefs->getValue('tasklist_columns')); + if (empty($columns)) { + $columns = array(); + } $dynamic_sort = true; $baseurl = 'list.php'; @@ -49,7 +52,7 @@ if ($tasks->hasTasks()) { require NAG_TEMPLATES . '/list/task_footers.inc'; - if (!$print_view && $dynamic_sort) { + if ($dynamic_sort) { Horde::addScriptFile('tables.js', 'horde', true); } } else { diff --git a/nag/templates/list/header.inc b/nag/templates/list/header.inc index 8bee89928..469f4f837 100644 --- a/nag/templates/list/header.inc +++ b/nag/templates/list/header.inc @@ -1,6 +1,5 @@
count() . ')' ?> - " onclick="$('quicksearchL').hide(); $('quicksearch').show(); $('quicksearchT').focus(); return false;">getImageDir('horde')) ?> -
diff --git a/nag/templates/list/task_footers.inc b/nag/templates/list/task_footers.inc index e0981db6e..032905e27 100644 --- a/nag/templates/list/task_footers.inc +++ b/nag/templates/list/task_footers.inc @@ -1,8 +1,6 @@ -
-
diff --git a/nag/templates/view/task.inc b/nag/templates/view/task.inc index 23bd6a7d6..d23319c5a 100644 --- a/nag/templates/view/task.inc +++ b/nag/templates/view/task.inc @@ -41,7 +41,7 @@ - hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { if (empty($task->completed)) { echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete Task"), 'widget') . Horde::img('unchecked.png', _("Complete Task")) . ''; } else { diff --git a/nag/themes/screen.css b/nag/themes/screen.css index 8e6854e8d..e1332c5fa 100644 --- a/nag/themes/screen.css +++ b/nag/themes/screen.css @@ -252,3 +252,9 @@ table#tasklist-list th.sortdown { #RB_info input { margin: .2em; } + +@media print { + .header .smallheader, .tabset, .notices, #pageControls, #quicksearchL, #quicksearch { + display: none; + } +} diff --git a/nag/view.php b/nag/view.php index ddfc56356..e895bed11 100644 --- a/nag/view.php +++ b/nag/view.php @@ -93,42 +93,29 @@ if (!empty($task->uid)) { } $title = $task->name; -$print_view = (bool)Horde_Util::getFormData('print'); $links = array(); -if (!$print_view) { - Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde', true); - $taskurl = Horde_Util::addParameter('task.php', - array('task' => $task_id, - 'tasklist' => $tasklist_id)); - $share = $GLOBALS['nag_shares']->getShare($tasklist_id); +$taskurl = Horde_Util::addParameter('task.php', + array('task' => $task_id, + 'tasklist' => $tasklist_id)); +$share = $GLOBALS['nag_shares']->getShare($tasklist_id); - if (!is_a($share, 'PEAR_Error')) { - if ($share->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { - if (!$task->completed) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete"), 'smallheader', '', '', _("_Complete")); - } - if (!$task->private || $task->owner == Horde_Auth::getAuth()) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task')), _("Edit"), 'smallheader', '', '', _("_Edit")); - } +if (!is_a($share, 'PEAR_Error')) { + if ($share->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$task->completed) { + $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'complete_task')), _("Complete"), 'smallheader', '', '', _("_Complete")); } - if ($share->hasPermission(Horde_Auth::getAuth(), PERMS_DELETE)) { - $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'delete_tasks')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this task?")) . '\');' : '', _("_Delete")); + if (!$task->private || $task->owner == Horde_Auth::getAuth()) { + $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'modify_task')), _("Edit"), 'smallheader', '', '', _("_Edit")); } } + if ($share->hasPermission(Horde_Auth::getAuth(), PERMS_DELETE)) { + $links[] = Horde::widget(Horde::applicationUrl(Horde_Util::addParameter($taskurl, 'actionID', 'delete_tasks')), _("Delete"), 'smallheader', '', $prefs->getValue('delete_opt') ? 'return window.confirm(\'' . addslashes(_("Really delete this task?")) . '\');' : '', _("_Delete")); + } } require NAG_TEMPLATES . '/common-header.inc'; - -if ($print_view) { - require_once $registry->get('templates', 'horde') . '/javascript/print.js'; -} else { - $print_link = Horde_Util::addParameter('view.php', - array('task' => $task_id, - 'tasklist' => $tasklist_id, - 'print' => 1)); - $print_link = Horde::url($print_link); - require NAG_TEMPLATES . '/menu.inc'; -} +require NAG_TEMPLATES . '/menu.inc'; /* Set up alarm units and value. */ $task_alarm = $task->alarm; -- 2.11.0