From 9ca8cc0847549098735efdbb93373f2a34a3178d Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 1 Feb 2007 06:54:15 +0000 Subject: [PATCH] Basic fixing of tabs for glossary --- mod/glossary/edit.php | 5 +- mod/glossary/export.php | 3 +- mod/glossary/import.php | 2 +- mod/glossary/lib.php | 55 +----------- mod/glossary/tabs.html | 110 ------------------------ mod/glossary/tabs.php | 143 +++++++++++++++++++++++++++++++ mod/glossary/view.php | 3 +- theme/standard/styles_layout.css | 5 +- 8 files changed, 153 insertions(+), 173 deletions(-) delete mode 100644 mod/glossary/tabs.html create mode 100644 mod/glossary/tabs.php diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php index 28bfb4c542..66054d158b 100644 --- a/mod/glossary/edit.php +++ b/mod/glossary/edit.php @@ -204,7 +204,7 @@ echo '
'; /// Tabbed browsing sections $tab = GLOSSARY_ADDENTRY_VIEW; -include("tabs.html"); +include("tabs.php"); if (!$e) { require_capability('mod/glossary:write', $context); @@ -212,10 +212,9 @@ if (!$e) { $mform->display(); -echo ''; //TODO remove center tag from here and tabs.html glossary_print_tabbed_table_end(); print_footer($course); -?> \ No newline at end of file +?> diff --git a/mod/glossary/export.php b/mod/glossary/export.php index 4497f5d154..e27b601cf0 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -59,7 +59,7 @@ /// Tabbed browsing sections $tab = GLOSSARY_EXPORT_VIEW; - include("tabs.html"); + include("tabs.php"); ?>
@@ -73,7 +73,6 @@
'; glossary_print_tabbed_table_end(); print_footer(); ?> diff --git a/mod/glossary/import.php b/mod/glossary/import.php index cbedf0b4d3..371e96037a 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -60,7 +60,7 @@ /// Tabbed browsing sections $tab = GLOSSARY_IMPORT_VIEW; - include("tabs.html"); + include("tabs.php"); if ( !$step ) { include("import.html"); diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index c1c699281e..1f3bb88093 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1205,61 +1205,8 @@ function glossary_print_attachments($entry, $return=NULL, $align="left") { return $imagereturn; } -function glossary_print_tabbed_table_start($data, $currenttab, $tabsperrow=4) { - -$tabs = count($data); -$tabwidth = (int) (100 / $tabsperrow); - -$currentrow = ( $currenttab - ( $currenttab % $tabsperrow) ) / $tabsperrow; - -$numrows = (int) ( $tabs / $tabsperrow ) + 1; - - -/// Following lines are to create a tab object so that -/// we can use the new tab objects and functions -$tabrows = array(); -$tabnumber = 0; -$row = array(); -$inactive = array(); -foreach ($data as $tab) { - $row[] = new tabobject($tabnumber, $tab->link, $tab->caption); - if (empty($tab->link)) { - $inactive[] = $tabnumber; - } - $tabnumber++; - if (($tabnumber % $tabsperrow) == 0) { - $tabrows[] = $row; - unset($row); - $row = array(); - } -} -//Add the last row! if it contains anything! -if (!empty($row)) { - $tabrows[] = $row; -} - - -?> - - - - - - - - -
- - -
-
-
"; + echo ""; } function glossary_print_approval_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') { diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html deleted file mode 100644 index e2383166de..0000000000 --- a/mod/glossary/tabs.html +++ /dev/null @@ -1,110 +0,0 @@ -'; - - $data[GLOSSARY_STANDARD_VIEW]->caption = get_string("standardview", "glossary"); - $data[GLOSSARY_CATEGORY_VIEW]->caption = get_string("categoryview", "glossary"); - $data[GLOSSARY_DATE_VIEW]->caption = get_string("dateview", "glossary"); - $data[GLOSSARY_AUTHOR_VIEW]->caption = get_string("authorview","glossary"); - - if (has_capability('mod/glossary:write', $context)) { - $data[GLOSSARY_ADDENTRY_VIEW]->caption = get_string("addentry", "glossary"); - $data[GLOSSARY_ADDENTRY_VIEW]->link = "edit.php?id=$cm->id"; - } - if (has_capability('mod/glossary:import', $context)) { - $data[GLOSSARY_IMPORT_VIEW]->caption = get_string("importentries", "glossary"); - $data[GLOSSARY_IMPORT_VIEW]->link = "import.php?id=$cm->id"; - } - - if (has_capability('mod/glossary:export', $context)) { - $data[GLOSSARY_EXPORT_VIEW]->caption = get_string("exportentries", "glossary"); - $data[GLOSSARY_EXPORT_VIEW]->link = "export.php?id=$cm->id&mode=$mode&hook=$hook"; - } - -// $data[GLOSSARY_DATE_VIEW]->link = "view.php?id=$id&tab=".GLOSSARY_DATE_VIEW; - - $data[GLOSSARY_DATE_VIEW]->link = "view.php?id=$id&mode=date"; - - $data[GLOSSARY_STANDARD_VIEW]->link = "view.php?id=$id&mode=letter"; - $data[GLOSSARY_CATEGORY_VIEW]->link = "view.php?id=$id&mode=cat"; - $data[GLOSSARY_AUTHOR_VIEW]->link = "view.php?id=$id&mode=author"; - - if (has_capability('mod/glossary:approve', $context)) { - $data[GLOSSARY_APPROVAL_VIEW]->caption = get_string("waitingapproval", "glossary"); - $data[GLOSSARY_APPROVAL_VIEW]->link = ""; - - $hiddenentries = get_records_select("glossary_entries","glossaryid = $glossary->id and approved = 0"); - if ($hiddenentries) { - $data[GLOSSARY_APPROVAL_VIEW]->caption .= " (" . count($hiddenentries) . " " . get_string("entries","glossary") . ")"; - $data[GLOSSARY_APPROVAL_VIEW]->link = "view.php?id=$id&mode=approval"; - - } elseif ( $tab == GLOSSARY_APPROVAL_VIEW ) { //Teachers going to approval view and without entries->go to defaulttab - $tab = $defaulttab; - } - } elseif ( $tab == GLOSSARY_APPROVAL_VIEW ) { //Non-teachers going to approval view go to defaulttab - $tab = $defaulttab; - } - -/// printing header of the current tab - glossary_print_tabbed_table_start($data, $tab, 4); - - if (!isset($category)) { - $category = ""; - } - - - switch ($tab) { - case GLOSSARY_CATEGORY_VIEW: - glossary_print_categories_menu($cm, $glossary, $hook, $category); - break; - case GLOSSARY_APPROVAL_VIEW: - glossary_print_approval_menu($cm, $glossary, $mode, $hook, $sortkey, $sortorder); - break; - case GLOSSARY_ADDENTRY_VIEW: - $search = ""; - $l = ""; - glossary_print_addentry_menu($cm, $glossary, $mode, $hook, $sortkey, $sortorder); - break; - case GLOSSARY_AUTHOR_VIEW: - $search = ""; - glossary_print_author_menu($cm, $glossary, "author", $hook, $sortkey, $sortorder, 'print'); - break; - case GLOSSARY_IMPORT_VIEW: - $search = ""; - $l = ""; - glossary_print_import_menu($cm, $glossary, 'import', $hook, $sortkey, $sortorder); - break; - case GLOSSARY_EXPORT_VIEW: - $search = ""; - $l = ""; - glossary_print_export_menu($cm, $glossary, 'export', $hook, $sortkey, $sortorder); - break; - case GLOSSARY_DATE_VIEW: - if (!$sortkey) { - $sortkey = 'UPDATE'; - } - if (!$sortorder) { - $sortorder = 'desc'; - } - glossary_print_alphabet_menu($cm, $glossary, "date", $hook, $sortkey, $sortorder); - break; - case GLOSSARY_STANDARD_VIEW: - default: - glossary_print_alphabet_menu($cm, $glossary, "letter", $hook, $sortkey, $sortorder); - if ($mode == 'search' and $hook) { - echo "

$strsearch: $hook

"; - } - break; - } - echo '
'; -?> diff --git a/mod/glossary/tabs.php b/mod/glossary/tabs.php new file mode 100644 index 0000000000..23fb047365 --- /dev/null +++ b/mod/glossary/tabs.php @@ -0,0 +1,143 @@ +wwwroot.'/mod/glossary/edit.php?id='.$cm->id, + get_string('addentry', 'glossary')); + } + if (has_capability('mod/glossary:import', $context)) { + $toolsrow[] = new tabobject(GLOSSARY_IMPORT_VIEW, + $CFG->wwwroot.'/mod/glossary/import.php?id='.$cm->id, + get_string('importentries', 'glossary')); + } + if (has_capability('mod/glossary:export', $context)) { + $toolsrow[] = new tabobject(GLOSSARY_EXPORT_VIEW, + $CFG->wwwroot.'/mod/glossary/export.php?id='.$cm->id. + '&mode='.$mode.'&hook='.$hook, + get_string('exportentries', 'glossary')); + } + + if (has_capability('mod/glossary:approve', $context)) { + if ($hiddenentries = count_records_select('glossary_entries',"glossaryid = $glossary->id and approved = 0")) { + $toolsrow[] = new tabobject(GLOSSARY_APPROVAL_VIEW, + $CFG->wwwroot.'/mod/glossary/view.php?id='.$id.'&mode=approval', + get_string("waitingapproval", "glossary"). ' ('.$hiddenentries.')'); + + } else if ($tab == GLOSSARY_APPROVAL_VIEW) { + // Teachers going to approval view and without entries->go to defaulttab + $tab = $defaulttab; + } + } else if ($tab == GLOSSARY_APPROVAL_VIEW) { + // Non-teachers going to approval view go to defaulttab + $tab = $defaulttab; + } + + + $browserow[] = new tabobject(GLOSSARY_STANDARD_VIEW, + $CFG->wwwroot.'/mod/glossary/view.php?id='.$id.'&mode=letter', + get_string('standardview', 'glossary')); + + $browserow[] = new tabobject(GLOSSARY_CATEGORY_VIEW, + $CFG->wwwroot.'/mod/glossary/view.php?id='.$id.'&mode=cat', + get_string('categoryview', 'glossary')); + + $browserow[] = new tabobject(GLOSSARY_DATE_VIEW, + $CFG->wwwroot.'/mod/glossary/view.php?id='.$id.'&mode=date', + get_string('dateview', 'glossary')); + + $browserow[] = new tabobject(GLOSSARY_AUTHOR_VIEW, + $CFG->wwwroot.'/mod/glossary/view.php?id='.$id.'&mode=author', + get_string('authorview', 'glossary')); + + if ($tab < GLOSSARY_STANDARD_VIEW || $tab > GLOSSARY_AUTHOR_VIEW) { // We are on second row + $inactive = array('edit'); + $activated = array('edit'); + + $browserow[] = new tabobject('edit', '#', get_string('edit')); + } + +/// Put all this info together + + $tabrows = array(); + $tabrows[] = $browserow; // Always put these at the top + if ($toolsrow) { + $tabrows[] = $toolsrow; + } + + +?> +
+ + + + +
+ +$strsearch: $hook"; + } + break; + } + echo '
'; +?> diff --git a/mod/glossary/view.php b/mod/glossary/view.php index d5f27abe5f..01ace7c3d5 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -290,7 +290,7 @@ echo ''; echo '
'; - include("tabs.html"); + include("tabs.php"); include_once("sql.php"); @@ -426,7 +426,6 @@ echo '
'; } echo '
'; - echo ''; glossary_print_tabbed_table_end(); /// Finish the page diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index d352f302c9..530636f796 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -2646,7 +2646,10 @@ body#mod-forum-search .introcontent { } .glossarydisplay { - width: 70%; + width: 80%; + margin-left:auto; + margin-right:auto; + text-align:center; } .glossarydisplay .tabs { -- 2.39.5