Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MDL-8109 - removed comments and some changes to make merging easier

  • Loading branch information...
commit ab717a9c26354994fa4f58ec3c42b4c5251a5701 1 parent 9ffa619
urs_hunkler authored

Showing 1 changed file with 14 additions and 44 deletions. Show diff stats Hide diff stats

  1. +14 44 lib/adminlib.php
58 lib/adminlib.php
@@ -2653,6 +2653,10 @@ function admin_externalpage_print_header($adminroot) {
2653 2653
2654 2654 global $CFG, $PAGE, $SITE, $THEME;
2655 2655
  2656 + if (!empty($THEME->customcorners)) {
  2657 + require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
  2658 + }
  2659 +
2656 2660 if (!empty($SITE->fullname)) {
2657 2661 $pageblocks = blocks_setup($PAGE);
2658 2662
@@ -2660,7 +2664,6 @@ function admin_externalpage_print_header($adminroot) {
2660 2664 blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
2661 2665 BLOCK_L_MAX_WIDTH);
2662 2666 $PAGE->print_header();
2663   - echo "\n".'<!-- admin_externalpage_print_header start-->'."\n";
2664 2667 echo '<table id="layout-table" summary=""><tr>';
2665 2668
2666 2669 $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
@@ -2672,38 +2675,23 @@ function admin_externalpage_print_header($adminroot) {
2672 2675 switch ($column) {
2673 2676 case 'left':
2674 2677 echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
2675   - if (!empty($THEME->roundcorners)) {
2676   - echo '<div class="bt"><div></div></div>';
2677   - echo '<div class="i1"><div class="i2"><div class="i3">';
2678   - }
  2678 + if (!empty($THEME->customcorners)) print_custom_corners_start();
2679 2679 blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
2680   - if (!empty($THEME->roundcorners)) {
2681   - echo '</div></div></div>';
2682   - echo '<div class="bb"><div></div></div>';
2683   - }
  2680 + if (!empty($THEME->customcorners)) print_custom_corners_end();
2684 2681 echo '</td>';
2685 2682 break;
2686 2683
2687 2684 case 'middle':
2688 2685 echo '<td id="middle-column">';
2689   - if (!empty($THEME->roundcorners)) {
2690   - echo '<div class="bt"><div>.</div></div>';
2691   - echo '<div class="i1"><div class="i2"><div class="i3">';
2692   - }
  2686 + if (!empty($THEME->customcorners)) print_custom_corners_start();
2693 2687 break;
2694 2688
2695 2689 case 'right':
2696 2690 if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
2697 2691 echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
2698   - if (!empty($THEME->roundcorners)) {
2699   - echo '<div class="bt"><div>.</div></div>';
2700   - echo '<div class="i1"><div class="i2"><div class="i3">';
2701   - }
  2692 + if (!empty($THEME->customcorners)) print_custom_corners_start();
2702 2693 blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
2703   - if (!empty($THEME->roundcorners)) {
2704   - echo '</div></div></div>';
2705   - echo '<div class="bb"><div>.</div></div>';
2706   - }
  2694 + if (!empty($THEME->customcorners)) print_custom_corners_end();
2707 2695 echo '</td>';
2708 2696 }
2709 2697 break;
@@ -2712,14 +2700,12 @@ function admin_externalpage_print_header($adminroot) {
2712 2700 } else {
2713 2701 print_header();
2714 2702 }
2715   - echo "\n".'<!-- admin_externalpage_print_header end-->'."\n";
2716 2703 }
2717 2704
2718 2705 function admin_externalpage_print_footer($adminroot) {
2719 2706
2720 2707 global $CFG, $PAGE, $SITE, $THEME;
2721 2708
2722   - echo "\n".'<!-- admin_externalpage_print_footer start-->'."\n";
2723 2709 if (!empty($SITE->fullname)) {
2724 2710 $pageblocks = blocks_setup($PAGE);
2725 2711 $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
@@ -2738,38 +2724,23 @@ function admin_externalpage_print_footer($adminroot) {
2738 2724 switch ($column) {
2739 2725 case 'left':
2740 2726 echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
2741   - if (!empty($THEME->roundcorners)) {
2742   - echo '<div class="bt"><div></div></div>';
2743   - echo '<div class="i1"><div class="i2"><div class="i3">';
2744   - }
  2727 + if (!empty($THEME->customcorners)) print_custom_corners_start();
2745 2728 blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
2746   - if (!empty($THEME->roundcorners)) {
2747   - echo '</div></div></div>';
2748   - echo '<div class="bb"><div></div></div>';
2749   - }
  2729 + if (!empty($THEME->customcorners)) print_custom_corners_end();
2750 2730 echo '</td>';
2751 2731 break;
2752 2732
2753 2733 case 'middle':
2754   - if (!empty($THEME->roundcorners)) {
2755   - echo '</div></div></div>';
2756   - echo '<div class="bb"><div>.</div></div>';
2757   - }
  2734 + if (!empty($THEME->customcorners)) print_custom_corners_end();
2758 2735 echo '</td>';
2759 2736 break;
2760 2737
2761 2738 case 'right':
2762 2739 if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
2763 2740 echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
2764   - if (!empty($THEME->roundcorners)) {
2765   - echo '<div class="bt"><div>.</div></div>';
2766   - echo '<div class="i1"><div class="i2"><div class="i3">';
2767   - }
  2741 + if (!empty($THEME->customcorners)) print_custom_corners_start();
2768 2742 blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
2769   - if (!empty($THEME->roundcorners)) {
2770   - echo '</div></div></div>';
2771   - echo '<div class="bb"><div>.</div></div>';
2772   - }
  2743 + if (!empty($THEME->customcorners)) print_custom_corners_end();
2773 2744 echo '</td>';
2774 2745 }
2775 2746 break;
@@ -2778,7 +2749,6 @@ function admin_externalpage_print_footer($adminroot) {
2778 2749 echo '</tr></table>';
2779 2750 }
2780 2751 print_footer();
2781   - echo "\n".'<!-- admin_externalpage_print_footer end-->'."\n";
2782 2752 }
2783 2753
2784 2754 function admin_get_root() {

0 comments on commit ab717a9

Please sign in to comment.
Something went wrong with that request. Please try again.