From fe32b4f6d7fbd6d75c41e436ffd232e2a5c964cf Mon Sep 17 00:00:00 2001 From: urs_hunkler Date: Wed, 19 Jan 2005 12:02:52 +0000 Subject: [PATCH] _ added the DIV framework for new CSS --- mod/glossary/edit.php | 22 ++++-- mod/glossary/export.php | 24 ++++--- mod/glossary/formats/faq/faq_format.php | 2 + mod/glossary/import.php | 44 +++++++----- mod/glossary/index.php | 6 +- mod/glossary/view.php | 89 +++++++++++++------------ 6 files changed, 108 insertions(+), 79 deletions(-) diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php index 8dd69c7971e43..a786cf401e67c 100644 --- a/mod/glossary/edit.php +++ b/mod/glossary/edit.php @@ -85,10 +85,14 @@ id\">$glossary->name -> $stredit", "form.text", "", true, "", navmenu($course, $cm)); + echo '
'; // glossary-edit wrapper start + print_heading($glossary->name); include("edit.html"); + echo '
'; // glossary-edit wrapper end + print_footer($course); die; } @@ -96,9 +100,9 @@ "id\">$strglossaries -> id\">$glossary->name -> $stredit", "form.text", "", true, "", navmenu($course, $cm)); - + print_heading($glossary->name); - + if ($e) { //We are updating an entry, so we compare current session user with //existing entry user to avoid some potential problems if secureforms=off @@ -107,11 +111,11 @@ $ineditperiod = ((time() - $old->timecreated < $CFG->maxeditingtime) || $glossary->editalways); if ( (!$ineditperiod || $USER->id != $old->userid) and !isteacher($course->id) and $e) { if ( $USER->id != $old->userid ) { - error("You can't edit other people's entries!"); + error("You can't edit other people's entries!"); } elseif (!$ineditperiod) { - error("You can't edit this. Time expired!"); - } - die; + error("You can't edit this. Time expired!"); + } + die; } $newentry->id = $e; @@ -148,7 +152,7 @@ error("Could not update this glossary entry because this concept already exist."); } } else { - + $newentry->userid = $USER->id; $newentry->timecreated = $timenow; $newentry->sourceglossaryid = 0; @@ -287,6 +291,8 @@ id\">$glossary->name -> $stredit", "", "", true, "", navmenu($course, $cm)); +echo '
'; // glossary-edit wrapper start + $ineditperiod = ((time() - $newentry->timecreated < $CFG->maxeditingtime) || $glossary->editalways); if ( (!$ineditperiod || $USER->id != $newentry->userid) and !isteacher($course->id) and $e) { if ( $USER->id != $newentry->userid ) { @@ -326,6 +332,8 @@ use_html_editor("text"); } +echo '
'; // glossary-edit wrapper end + print_footer($course); ?> diff --git a/mod/glossary/export.php b/mod/glossary/export.php index 6b904e0e9815d..c0332b4b95eb5 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -3,7 +3,7 @@ require_once("../../config.php"); require_once("lib.php"); global $CFG, $USER; - + require_variable($id); // Course Module ID optional_variable($l,""); @@ -11,20 +11,20 @@ if (! $cm = get_record("course_modules", "id", $id)) { error("Course Module ID was incorrect"); - } - + } + if (! $course = get_record("course", "id", $cm->course)) { error("Course is misconfigured"); - } - + } + if (! $glossary = get_record("glossary", "id", $cm->instance)) { error("Course module is incorrect"); - } - - require_login($course->id); + } + + require_login($course->id); if (!isteacher($course->id)) { error("You must be a teacher to use this page."); - } + } $strglossaries = get_string("modulenameplural", "glossary"); $strglossary = get_string("modulename", "glossary"); @@ -34,7 +34,7 @@ $strsearchconcept = get_string("searchconcept", "glossary"); $strsearchindefinition = get_string("searchindefinition", "glossary"); $strsearch = get_string("search"); - + $navigation = ""; if ($course->category) { $navigation = "id\">$course->shortname ->"; @@ -46,6 +46,8 @@ "", "", true, update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm)); + echo '
'; // glossary-export wrapper start + echo '

' . stripslashes_safe($glossary->name); echo '

'; @@ -76,7 +78,7 @@ $ffurl = "../../file.php?file=$ffurl"; } echo '

' . get_string("exportedfile","glossary") . '

'; - + echo ''; glossary_print_tabbed_table_end(); print_footer(); diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php index 4e0fc5d36bc18..dbbb4022e86b7 100644 --- a/mod/glossary/formats/faq/faq_format.php +++ b/mod/glossary/formats/faq/faq_format.php @@ -36,8 +36,10 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo $return = glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, $printicons, $ratings, $aliases); echo ''; + echo "
\n"; // end container div } else { + echo "
\n"; // glossary-edit container div echo '
'; print_string("noentry", "glossary"); echo '
'; diff --git a/mod/glossary/import.php b/mod/glossary/import.php index 261eceafe2f2b..a0bcc08802178 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -7,7 +7,7 @@ require_variable($id); // Course Module ID - optional_variable($step,0); + optional_variable($step,0); optional_variable($dest,"current"); // current | new optional_variable($file); // file to import optional_variable($catsincl,0); // Import Categories too? @@ -17,20 +17,20 @@ if (! $cm = get_record("course_modules", "id", $id)) { error("Course Module ID was incorrect"); - } - + } + if (! $course = get_record("course", "id", $cm->course)) { error("Course is misconfigured"); - } - + } + if (! $glossary = get_record("glossary", "id", $cm->instance)) { error("Course module is incorrect"); - } - - require_login($course->id); + } + + require_login($course->id); if (!isteacher($course->id)) { error("You must be a teacher to use this page."); - } + } if ($dest != 'new' and $dest != 'current') { $dest = 'current'; @@ -43,12 +43,14 @@ $strsearchconcept = get_string("searchconcept", "glossary"); $strsearchindefinition = get_string("searchindefinition", "glossary"); $strsearch = get_string("search"); - + print_header_simple(strip_tags("$glossary->name"), "", "id\">$strglossaries -> $glossary->name", "", "", true, update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm)); - + + echo '
'; // glossary-import wrapper start + echo '

' . stripslashes_safe($glossary->name); echo '

'; @@ -67,13 +69,14 @@ include("tabs.html"); if ( !$step ) { - include("import.html"); + include("import.html"); echo ''; glossary_print_tabbed_table_end(); print_footer($course); + echo '
'; // glossary-import wrapper end exit; - } + } $form = data_submitted(); $file = $_FILES["file"]; @@ -98,7 +101,7 @@ if ($dest == 'new') { // If the user chose to create a new glossary $xmlglossary = $xml['GLOSSARY']['#']['INFO'][0]['#']; - + if ( $xmlglossary['NAME'][0]['#'] ) { unset($glossary); $glossary->name = addslashes(utf8_decode($xmlglossary['NAME'][0]['#'])); @@ -154,6 +157,7 @@ echo ''; glossary_print_tabbed_table_end(); print_footer($course); + echo '
'; // glossary-import wrapper end exit; } else { //The instance has been created, so lets do course_modules @@ -205,6 +209,7 @@ echo ''; glossary_print_tabbed_table_end(); print_footer($course); + echo ''; // glossary-import wrapper end exit; } } @@ -225,7 +230,7 @@ $permissiongranted = 1; if ( $newentry->concept and $newentry->definition ) { if ( !$glossary->allowduplicatedentries ) { - // checking if the entry is valid (checking if it is duplicated when should not be) + // checking if the entry is valid (checking if it is duplicated when should not be) if ( $newentry->casesensitive ) { $dupentry = get_record("glossary_entries","concept",$newentry->concept,"glossaryid",$glossary->id); } else { @@ -251,7 +256,7 @@ $newentry->format = $xmlentry['#']['FORMAT'][0]['#']; $newentry->timecreated = time(); $newentry->timemodified = time(); - + // Setting the default values if no values were passed if ( isset($xmlentry['#']['USEDYNALINK'][0]['#']) ) { $newentry->usedynalink = $xmlentry['#']['USEDYNALINK'][0]['#']; @@ -287,7 +292,7 @@ for($k = 0; $k < sizeof($xmlcats); $k++) { $xmlcat = $xmlcats[$k]; unset($newcat); - + $newcat->name = addslashes(utf8_decode($xmlcat['#']['NAME'][0]['#'])); $newcat->usedynalink = $xmlcat['#']['USEDYNALINK'][0]['#']; if ( !$category = get_record("glossary_categories","glossaryid",$glossary->id,"name",$newcat->name) ) { @@ -368,7 +373,7 @@ } echo '
'; - // rejected entries + // rejected entries if ($rejections) { echo '
'; echo ''; @@ -382,6 +387,9 @@ glossary_print_tabbed_table_end(); /// Finish the page + + echo ''; // glossary-import wrapper end + print_footer($course); ?> diff --git a/mod/glossary/index.php b/mod/glossary/index.php index ab61d3756da1b..dbe1e62e7319c 100644 --- a/mod/glossary/index.php +++ b/mod/glossary/index.php @@ -29,6 +29,8 @@ print_header_simple("$strglossarys", "", "$strglossarys", "", "", true, "", navmenu($course)); + echo '
'; // glossary-index wrapper start + /// Get all the appropriate data if (! $glossarys = get_all_instances_in_course("glossary", $course)) { @@ -57,7 +59,7 @@ $can_subscribe = (isstudent($course->id) or isteacher($course->id) or isadmin()); - if ($show_rss = (($can_subscribe || $course->id == SITEID) && + if ($show_rss = (($can_subscribe || $course->id == SITEID) && isset($CFG->enablerssfeeds) && isset($CFG->glossary_enablerssfeeds) && $CFG->enablerssfeeds && $CFG->glossary_enablerssfeeds)) { $table->head[] = $strrss; @@ -122,6 +124,8 @@ /// Finish the page + echo '
'; // glossary-index wrapper end + print_footer($course); ?> diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 4b3c2e307134b..70c4ece655606 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -6,8 +6,8 @@ global $CFG, $THEME, $USER; $debug = 0; - $CFG->startpagetime = microtime(); - + $CFG->startpagetime = microtime(); + optional_variable($id); // Course Module ID optional_variable($g); // Glossary ID @@ -27,20 +27,20 @@ if (!empty($id)) { if (! $cm = get_record("course_modules", "id", $id)) { error("Course Module ID was incorrect"); - } + } if (! $course = get_record("course", "id", $cm->course)) { error("Course is misconfigured"); - } + } if (! $glossary = get_record("glossary", "id", $cm->instance)) { error("Course module is incorrect"); - } + } } else if (!empty($g)) { if (! $glossary = get_record("glossary", "id", $g)) { error("Course module is incorrect"); - } + } if (! $course = get_record("course", "id", $glossary->course)) { error("Could not determine which course this belonged to!"); - } + } if (!$cm = get_coursemodule_from_instance("glossary", $glossary->id, $course->id)) { error("Could not determine which course module this belonged to!"); } @@ -52,14 +52,14 @@ if ($CFG->forcelogin) { require_login(); } - + /// redirecting if adding a new entry if ($tab == GLOSSARY_ADDENTRY_VIEW ) { redirect("edit.php?id=$cm->id&mode=$mode"); } /// setting the defaut number of entries per page if not set - + if ( !$entriesbypage = $glossary->entbypage ) { $entriesbypage = $CFG->glossary_entbypage; } @@ -77,7 +77,7 @@ $mode = $dp->defaultmode; $hook = $dp->defaulthook; $sortkey = $dp->sortkey; - $sortorder = $dp->sortorder; + $sortorder = $dp->sortorder; } } else { $printpivot = 1; @@ -89,7 +89,7 @@ if ( $displayformat == -1 ) { $displayformat = $glossary->displayformat; - } + } if ( $show ) { $mode = 'term'; @@ -105,7 +105,7 @@ if (!$cm->visible and !isteacher($course->id)) { print_header(); notice(get_string("activityiscurrentlyhidden")); - } + } add_to_log($course->id, "glossary", "view", "view.php?id=$cm->id&tab=$tab", $glossary->id, $cm->id); /// stablishing flag variables @@ -115,9 +115,9 @@ } } if ( $sortkey = strtoupper($sortkey) ) { - if ($sortkey != 'CREATION' and - $sortkey != 'UPDATE' and - $sortkey != 'FIRSTNAME' and + if ($sortkey != 'CREATION' and + $sortkey != 'UPDATE' and + $sortkey != 'FIRSTNAME' and $sortkey != 'LASTNAME' ) { $sortkey = ''; @@ -132,18 +132,18 @@ foreach ($searchterms as $key => $searchterm) { if (strlen($searchterm) < 2) { unset($searchterms[$key]); - } - } + } + } $hook = trim(implode(' ', $searchterms)); break; - + case 'entry': /// Looking for a certain entry id $tab = GLOSSARY_STANDARD_VIEW; if ( $dp = get_record("glossary_formats","name", $glossary->displayformat) ) { $displayformat = $dp->popupformatname; } break; - + case 'cat': /// Looking for a certain cat $tab = GLOSSARY_CATEGORY_VIEW; if ( $hook > 0 ) { @@ -166,20 +166,20 @@ $tab = GLOSSARY_DATE_VIEW; if ( !$sortkey ) { $sortkey = 'UPDATE'; - } + } if ( !$sortorder ) { $sortorder = 'desc'; } break; - + case 'author': /// Looking for entries, browsed by author $tab = GLOSSARY_AUTHOR_VIEW; if ( !$hook ) { $hook = 'ALL'; - } + } if ( !$sortkey ) { $sortkey = 'FIRSTNAME'; - } + } if ( !$sortorder ) { $sortorder = 'asc'; } @@ -189,18 +189,18 @@ default: $tab = GLOSSARY_STANDARD_VIEW; if ( !$hook ) { - $hook = 'ALL'; - } + $hook = 'ALL'; + } break; - } + } switch ( $tab ) { - case GLOSSARY_IMPORT_VIEW: - case GLOSSARY_EXPORT_VIEW: + case GLOSSARY_IMPORT_VIEW: + case GLOSSARY_EXPORT_VIEW: case GLOSSARY_APPROVAL_VIEW: $isuserframe = 0; break; - + default: $isuserframe = 1; break; @@ -215,12 +215,14 @@ $strsearchconcept = get_string("searchconcept", "glossary"); $strsearchindefinition = get_string("searchindefinition", "glossary"); $strsearch = get_string("search"); - + print_header(strip_tags("$course->shortname: $glossary->name"), "$course->fullname", "$navigation id\">$strglossaries -> $glossary->name", "", "", true, update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm)); + echo '
'; // glossary-view wrapper start + //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) { @@ -234,7 +236,7 @@ rss_print_link($course->id, $userid, "glossary", $glossary->id, $tooltiptext); echo '
' . get_string("rejectionrpt","glossary") . '
'; } - + echo '

' . stripslashes_safe($glossary->name); if ( $isuserframe and $mode != 'search') { /// the "Print" icon @@ -260,7 +262,7 @@ echo ''; echo '
'; - + echo ' '; if ($mode == 'search') { echo ' '; @@ -276,15 +278,15 @@ echo ''; echo ''; echo $strsearchindefinition; - print_simple_box_end(); - + print_simple_box_end(); + echo ''; echo '
'; include("tabs.html"); include_once("sql.php"); - + /// printing the entries $entriesshown = 0; $currentpivot = ''; @@ -322,10 +324,10 @@ $pivot = $entry->pivot; if ( !$fullpivot ) { $pivot = $pivot[0]; - } - + } + /// if there's a group break - if ( $currentpivot != strtoupper($pivot) ) { + if ( $currentpivot != strtoupper($pivot) ) { // print the group break if apply if ( $printpivot ) { @@ -339,7 +341,7 @@ if ( isset($entry->uid) ) { // printing the user icon if defined (only when browsing authors) echo '		'; - + $user = get_record("user","id",$entry->uid); print_user_picture($user->id, $course->id, $user->picture); $pivottoshow = fullname($user, isteacher($course->id));; @@ -352,17 +354,17 @@ } } - + $concept = $entry->concept; $definition = $entry->definition; /// highlight the term if necessary if ($mode == 'search') { $entry->highlight = $hook; - } + } /// and finally print the entry. - + if ( glossary_print_entry($course, $cm, $glossary, $entry, $mode, $hook,1,$displayformat,$ratings) ) { $ratingsmenuused = true; } @@ -405,6 +407,9 @@ } /// Finish the page + + echo ''; // glossary-view wrapper end + print_footer($course); ?>