From: samhemelryk Date: Thu, 2 Jul 2009 06:00:59 +0000 (+0000) Subject: chat ajax MDL-16706 Eliminated inline scripts to use PAGE methods X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ddbeb7a7ec1ac79dacb0c96e5cdacbf5b765869e;p=moodle.git chat ajax MDL-16706 Eliminated inline scripts to use PAGE methods --- diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php index e47281d4c6..88d30c1fbf 100644 --- a/mod/chat/gui_ajax/index.php +++ b/mod/chat/gui_ajax/index.php @@ -53,45 +53,39 @@ $str_sending = get_string('sending', 'chat'); $str_title = format_string($course->shortname) . ": ".format_string($chat->name,true).$groupname; $str_inputarea = get_string('inputarea', 'chat'); $str_userlist = get_string('userlist', 'chat'); -?> - - - - - - - - - - - - - - - - - - - - - - - - +$PAGE->set_generaltype('popup'); +$PAGE->set_title('Chat'); + +$PAGE->requires->yui_lib('dom'); +$PAGE->requires->yui_lib('element'); +$PAGE->requires->yui_lib('dragdrop'); +$PAGE->requires->yui_lib('resize'); +$PAGE->requires->yui_lib('layout'); +$PAGE->requires->yui_lib('container'); +$PAGE->requires->yui_lib('connection'); +$PAGE->requires->yui_lib('json'); +$PAGE->requires->yui_lib('button'); +$PAGE->requires->yui_lib('selector'); +$PAGE->requires->data_for_js('chat_cfg', array('home'=>$CFG->httpswwwroot.'/mod/chat/view.php?id='.$cm->id, 'userid'=>$USER->id, 'sid'=>$chat_sid,'timer'=>5000, 'chat_lasttime'=>0,'chat_lastrow'=>null,'header_title'=>$str_chat,'chatroom_name'=>$str_title)); +$PAGE->requires->data_for_js('chat_lang', array('send'=>$str_send, 'sending'=>$str_sending, 'inputarea'=>$str_inputarea, 'userlist'=>$str_userlist)); +$PAGE->requires->js('mod/chat/gui_ajax/script.js'); +$PAGE->add_body_class('yui-skin-sam'); + +$PAGE->requires->css('lib/yui/reset-fonts-grids/reset-fonts-grids.css'); +$PAGE->requires->css('lib/yui/resize/assets/skins/sam/resize.css'); +$PAGE->requires->css('lib/yui/layout/assets/skins/sam/layout.css'); +$PAGE->requires->css('lib/yui/button/assets/skins/sam/button.css'); + +echo $OUTPUT->header(); +echo ""; +echo $OUTPUT->heading($str_title,1); +echo << -

- +

@@ -105,5 +99,6 @@ var chat_lang = $str_send, 'sending'=>$str_

- - +DIVS; +echo $OUTPUT->footer(); +?> diff --git a/mod/chat/gui_ajax/update.php b/mod/chat/gui_ajax/update.php index 26442f9e92..8c1276847c 100755 --- a/mod/chat/gui_ajax/update.php +++ b/mod/chat/gui_ajax/update.php @@ -54,6 +54,8 @@ if (!$cm = get_coursemodule_from_instance('chat', $chatuser->chatid, $course->id // setup $PAGE so that format_text will work properly $PAGE->set_cm($cm, $course, $chat); +$OUTPUT->initialise_deprecated_cfg_pixpath(); + if($CFG->chat_use_cache){ $cache = new file_cache(); $users = $cache->get('user'); diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index fc694c9c3e..ff087549f1 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -3841,6 +3841,12 @@ body#user-index .rolesform { display:inline; } +body.mod-chat-gui_ajax .yui-layout-doc .yui-layout-unit .yui-layout-wrap .yui-layout-hd h2 { + font-size:100%; + padding:0px; + font-weight:normal; +} + /*** *** Modules: Choice ***/