moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverting MDL-12974 and MDL-12941 (Urs simple wrapper changes)

Browse source
This commit is contained in:
nicolasconnault 2008-01-16 07:54:27 +00:00
parent f0067a7836
commit 353a89619f
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tag/index.php
View file

@ -36,18 +36,16 @@ if (($edit != -1) and $PAGE->user_allowed_editing()) {
$PAGE->print_header(); $PAGE->print_header();
echo '<table id="layout-table" summary="layout">'; echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
echo '<tr>'; echo '<tr valign="top">';
//----------------- left column ----------------- //----------------- left column -----------------
$blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), 210); $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), 210);
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
print_container_end();
echo '</td>'; echo '</td>';
} }
@ -57,8 +55,6 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()
echo '<td valign="top" id="middle-column">'; echo '<td valign="top" id="middle-column">';
print_container_start(true, 'middle-column-wrap');
$tagname = tag_display_name($tag); $tagname = tag_display_name($tag);
$systemcontext = get_context_instance(CONTEXT_SYSTEM); $systemcontext = get_context_instance(CONTEXT_SYSTEM);
@ -78,7 +74,7 @@ $usercount = count_items_tagged_with($tag->id,'user');
if ($usercount > 0) { if ($usercount > 0) {
//user table box //user table box
print_simplewrapper_start('clearfix generalbox', 'tag-user-table'); print_box_start('generalbox', 'tag-user-table');
$heading = get_string('userstaggedwith', 'tag', $tagname) . ': ' . $usercount; $heading = get_string('userstaggedwith', 'tag', $tagname) . ': ' . $usercount;
print_heading($heading, '', 3); print_heading($heading, '', 3);
@ -89,7 +85,7 @@ if ($usercount > 0) {
print_tagged_users_table($tag, $userpage * $perpage, $perpage); print_tagged_users_table($tag, $userpage * $perpage, $perpage);
print_simplewrapper_end(); print_box_end();
} }
@ -127,12 +123,11 @@ if ($blogs = blog_fetch_entries('', 10, 0, 'site', '', $tag->id)) {
} }
echo '</ul>'; echo '</ul>';
echo '<p class="moreblogs"><a href="'.$CFG->wwwroot.'/blog/index.php?filtertype=site&amp;filterselect=0&amp;tagid='.$tag->id.'">'.get_string('seeallblogs', 'tag').'</a>...</p>'; echo '<p class="moreblogs"><a href="'.$CFG->wwwroot.'/blog/index.php?filtertype=site&filterselect=0&tagid='.$tag->id.'">'.get_string('seeallblogs', 'tag').'</a>...</p>';
print_box_end(); print_box_end();
} }
print_container_end();
echo '</td>'; echo '</td>';
@ -142,10 +137,8 @@ echo '</td>';
$blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210); $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">'; echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="right-column">';
print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
print_container_end();
echo '</td>'; echo '</td>';
} }

12
tag/lib.php
View file

@ -1158,7 +1158,7 @@ function print_tag_management_box($tag_object, $return=false) {
if (!isguestuser()) { if (!isguestuser()) {
$output .= print_simplewrapper_start('box','tag-management-box', true); $output .= print_box_start('box','tag-management-box', true);
$systemcontext = get_context_instance(CONTEXT_SYSTEM); $systemcontext = get_context_instance(CONTEXT_SYSTEM);
@ -1184,7 +1184,7 @@ function print_tag_management_box($tag_object, $return=false) {
$output .= implode(' | ', $links); $output .= implode(' | ', $links);
$output .= print_simplewrapper_end(true); $output .= print_box_end(true);
} }
@ -1215,7 +1215,7 @@ function print_tag_description_box($tag_object, $return=false) {
$output = ''; $output = '';
if ($content) { if ($content) {
$output .= print_simplewrapper_start('generalbox', 'tag-description',true); $output .= print_box_start('generalbox', 'tag-description',true);
} }
if (!empty($tag_object->description)) { if (!empty($tag_object->description)) {
@ -1229,7 +1229,7 @@ function print_tag_description_box($tag_object, $return=false) {
} }
if ($content) { if ($content) {
$output .= print_simplewrapper_end(true); $output .= print_box_end(true);
} }
if ($return) { if ($return) {
@ -1315,7 +1315,7 @@ function print_user_box($user, $return=false) {
$output = ''; $output = '';
$output .= print_simplewrapper_start('user-box', 'user'.$user->id, true); $output .= print_box_start('user-box', 'user'.$user->id, true);
$fullname = fullname($user); $fullname = fullname($user);
$alt = ''; $alt = '';
@ -1342,7 +1342,7 @@ function print_user_box($user, $return=false) {
$output .= '<strong>' . $fullname . '</strong>'; $output .= '<strong>' . $fullname . '</strong>';
$output .= print_simplewrapper_end(true); $output .= print_box_end(true);
if ($return) { if ($return) {
return $output; return $output;