From: stronk7 Date: Thu, 29 Mar 2007 22:19:29 +0000 (+0000) Subject: Moving options from 2nd tab to main area. Step1. MDL-8793 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=136ce8dee242597c6bcc4c05e37cd8e97bdf93b8;p=moodle.git Moving options from 2nd tab to main area. Step1. MDL-8793 Merged from MOODLE_18_STABLE --- diff --git a/mod/glossary/tabs.php b/mod/glossary/tabs.php index e0afbe59b7..2edb871b8e 100644 --- a/mod/glossary/tabs.php +++ b/mod/glossary/tabs.php @@ -15,30 +15,8 @@ $inactive = array(); $activated = array(); - 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='.urlencode($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 + if (!has_capability('mod/glossary:approve', $context) && $tab == GLOSSARY_APPROVAL_VIEW) { + /// Non-teachers going to approval view go to defaulttab $tab = $defaulttab; } @@ -81,7 +59,7 @@ -
+
name), "", "$navigation ".format_string($glossary->name), "", "", true, update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm)); - //If rss are activated at site and glossary level and this glossary has rss defined, show link - if (isset($CFG->enablerssfeeds) && isset($CFG->glossary_enablerssfeeds) && - $CFG->enablerssfeeds && $CFG->glossary_enablerssfeeds && $glossary->rsstype && $glossary->rssarticles) { - echo '
'; - $tooltiptext = get_string("rsssubscriberss","glossary",format_string($glossary->name,true)); - if (empty($USER->id)) { - $userid = 0; - } else { - $userid = $USER->id; +/// To calculate available options + $availableoptions = ''; + +/// Decide about to print the import link + if (has_capability('mod/glossary:import', $context)) { + $availableoptions = '' . + '' . + get_string('importentries', 'glossary') . '' . + ''; + } +/// Decide about to print the export link + if (has_capability('mod/glossary:export', $context)) { + if ($availableoptions) { + $availableoptions .= ' / '; + } + $availableoptions .='' . + '' . + get_string('exportentries', 'glossary') . '' . + ''; + } + +/// Decide about to print the approval link + if (has_capability('mod/glossary:approve', $context)) { + /// Check we have pending entries + if ($hiddenentries = count_records_select('glossary_entries',"glossaryid = $glossary->id and approved = 0")) { + if ($availableoptions) { + $availableoptions .= '
'; } - rss_print_link($course->id, $userid, "glossary", $glossary->id, $tooltiptext); - echo '
'; + $availableoptions .='' . + '' . + get_string('waitingapproval', 'glossary') . ' ('.$hiddenentries.')' . + ''; } + } + +/// Start to print glossary controls + print_box_start('glossarycontrol'); + echo $availableoptions; +/// If rss are activated at site and glossary level and this glossary has rss defined, show link + if (isset($CFG->enablerssfeeds) && isset($CFG->glossary_enablerssfeeds) && + $CFG->enablerssfeeds && $CFG->glossary_enablerssfeeds && $glossary->rsstype && $glossary->rssarticles) { - /// the "Print" icon - $printicon = ''; + $tooltiptext = get_string("rsssubscriberss","glossary",format_string($glossary->name,true)); + if (empty($USER->id)) { + $userid = 0; + } else { + $userid = $USER->id; + } + print_box_start('rsslink'); + rss_print_link($course->id, $userid, "glossary", $glossary->id, $tooltiptext); + print_box_end(); + } +/// The print icon if ( $isuserframe and $mode != 'search') { if (has_capability('mod/glossary:manageentries', $context) or $glossary->allowprintview) { - $printicon = " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">\""."; + print_box_start('printicon'); + echo " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">\""."; + print_box_end(); } } - print_heading(format_string($glossary->name).$printicon); +/// End glossary controls + print_box_end(); /// glossarycontrol + print_box(' ', 'clearer'); /// Info box if ( $glossary->intro ) { diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index e2ad949e25..7e2bef5b5f 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -2848,10 +2848,16 @@ body#mod-forum-search .introcontent { } .entrybox { + width: 100%; border-width: 0px 1px 1px 1px; border-style: solid; } +.entrybox hr { + border-left:none; + border-right:none; +} + .glossarypost { width: 95%; border-width:1px; @@ -2969,6 +2975,15 @@ body#mod-forum-search .introcontent { text-align: center; } +.mod-glossary .tabrow0 { + padding-bottom: 5px; +} + +#mod-glossary-view .glossarycontrol { + float: right; + text-align:right; + white-space: nowrap; +} /*** *** Modules: Journal