'; } } +$destinationid = null; + if ($answerType != HOT_SPOT_DELINEATION) { if (!empty($destination)) { $item_list = explode('@@',$destination); @@ -477,9 +487,8 @@ if ($answerType != HOT_SPOT_DELINEATION) { } } - // the link to retry the question -if ($try==1) { +if (isset($try) && $try==1) { $num_value_array= (array_keys($questionList, $questionid)); $links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).''.get_lang('TryAgain').'
'; } @@ -512,23 +521,22 @@ if ($destinationid==-1) { } echo ''; +function SendEx(num) { + if (num == -1) { + self.parent.window.location.href = "exercise_result.php?take_session=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'"; + self.parent.tb_remove(); + } else { + num -= 1; + self.parent.window.location.href = "exercise_submit.php?tryagain=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'"; + self.parent.tb_remove(); + } +} +'; if ($links!='') { - echo '
- '.api_ucfirst(get_lang('Close')).'
-
';
+ /*echo '
'.get_lang('Feedback').'
';
+ /*echo '
+ '.api_ucfirst(get_lang('Close')).'';*/
+ echo '
';
if ($answerType == HOT_SPOT_DELINEATION) {
if ($organs_at_risk_hit > 0) {
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index 00545b8029..80db07f948 100755
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -647,7 +647,7 @@ class Attendance
$user_profile = UserManager::get_picture_user($uid, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
if (!empty($image_path['file'])) {
- $photo = '
+ $photo = '
!['.api_get_person_name($user_data['firstname'], $user_data['lastname']).']('.$user_profile['file'].' "'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'")
';
} else {
$photo = '![]("+imgLoader.src+")
");//add loader to the page
- $('#TB_load').show();//show loader
-
- var baseURL;
- if(url.indexOf("?")!==-1){ //ff there is a query string involved
- baseURL = url.substr(0, url.indexOf("?"));
- }else{
- baseURL = url;
- }
-
- var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
- var urlType = baseURL.toLowerCase().match(urlString);
-
- if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-
- TB_PrevCaption = "";
- TB_PrevURL = "";
- TB_PrevHTML = "";
- TB_NextCaption = "";
- TB_NextURL = "";
- TB_NextHTML = "";
- TB_imageCount = "";
- TB_FoundURL = false;
- if(imageGroup){
- TB_TempArray = $("a[@rel="+imageGroup+"]").get();
- for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) {
- var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString);
- if (!(TB_TempArray[TB_Counter].href == url)) {
- if (TB_FoundURL) {
- TB_NextCaption = TB_TempArray[TB_Counter].title;
- TB_NextURL = TB_TempArray[TB_Counter].href;
- TB_NextHTML = " Next >";
- } else {
- TB_PrevCaption = TB_TempArray[TB_Counter].title;
- TB_PrevURL = TB_TempArray[TB_Counter].href;
- TB_PrevHTML = " < Prev";
- }
- } else {
- TB_FoundURL = true;
- TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length);
- }
- }
- }
-
- imgPreloader = new Image();
- imgPreloader.onload = function(){
- imgPreloader.onload = null;
-
- // Resizing large images - orginal by Christian Montoya edited by me.
- var pagesize = tb_getPageSize();
- var x = pagesize[0] - 150;
- var y = pagesize[1] - 150;
- var imageWidth = imgPreloader.width;
- var imageHeight = imgPreloader.height;
- if (imageWidth > x) {
- imageHeight = imageHeight * (x / imageWidth);
- imageWidth = x;
- if (imageHeight > y) {
- imageWidth = imageWidth * (y / imageHeight);
- imageHeight = y;
- }
- } else if (imageHeight > y) {
- imageWidth = imageWidth * (y / imageHeight);
- imageHeight = y;
- if (imageWidth > x) {
- imageHeight = imageHeight * (x / imageWidth);
- imageWidth = x;
- }
- }
- // End Resizing
-
- TB_WIDTH = imageWidth + 30;
- TB_HEIGHT = imageHeight + 60;
- $("#TB_window").append("![]("+close_image+")
");
-
- $("#TB_window").append("!["+caption+"]("+url+")
");
- $("#TB_window").append("");
- }else{//iframe modal
- $("#TB_overlay").unbind();
- $("#TB_window").append("");
- }
- } else {// not an iframe, ajax
- if($("#TB_window").css("display") != "block"){
- if(params['modal'] != "true"){//ajax no modal
- $("#TB_window").append("");
- }else{//ajax modal
- $("#TB_overlay").unbind();
- $("#TB_window").append("");
- }
- }else{//this means the window is already up, we are just loading new content via ajax
- $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px";
- $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px";
- $("#TB_ajaxContent")[0].scrollTop = 0;
- $("#TB_ajaxWindowTitle").html(caption);
- }
- }
-
- $("#TB_closeWindowButton").click(tb_remove);
-
- if(url.indexOf('TB_inline') != -1){
- $("#TB_ajaxContent").append($('#' + params['inlineId']).children());
- $("#TB_window").unload(function () {
- $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished
- });
- tb_position();
- $("#TB_load").remove();
- $("#TB_window").css({display:"block"});
- }else if(url.indexOf('TB_iframe') != -1){
- tb_position();
- if($.browser.safari){//safari needs help because it will not fire iframe onload
- $("#TB_load").remove();
- $("#TB_window").css({display:"block"});
- }
- }else{
- $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
- tb_position();
- $("#TB_load").remove();
- tb_init("#TB_ajaxContent a.thickbox");
- $("#TB_window").css({display:"block"});
- });
- }
-
- }
-
- if(!params['modal']){
- document.onkeyup = function(e){
- if (e == null) { // ie
- keycode = event.keyCode;
- } else { // mozilla
- keycode = e.which;
- }
- if(keycode == 27){ // close
- tb_remove();
- }
- };
- }
-
- } catch(e) {
- //nothing here
- }
-}
-
-//helper functions below
-function tb_showIframe(){
- $("#TB_load").remove();
- $("#TB_window").css({display:"block"});
-}
-
-function tb_remove() {
- $("#TB_imageOff").unbind("click");
- $("#TB_closeWindowButton").unbind("click");
- $("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
- $("#TB_load").remove();
- if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
- $("body","html").css({height: "auto", width: "auto"});
- $("html").css("overflow","");
- }
- document.onkeydown = "";
- document.onkeyup = "";
- return false;
-}
-
-function tb_position() {
-$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});
- if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6
- $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});
- }
-}
-
-function tb_parseQuery ( query ) {
- var Params = {};
- if ( ! query ) {return Params;}// return empty object
- var Pairs = query.split(/[;&]/);
- for ( var i = 0; i < Pairs.length; i++ ) {
- var KeyVal = Pairs[i].split('=');
- if ( ! KeyVal || KeyVal.length != 2 ) {continue;}
- var key = unescape( KeyVal[0] );
- var val = unescape( KeyVal[1] );
- val = val.replace(/\+/g, ' ');
- Params[key] = val;
- }
- return Params;
-}
-
-function tb_getPageSize(){
- var de = document.documentElement;
- var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
- var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
- arrayPageSize = [w,h];
- return arrayPageSize;
-}
-
-function tb_detectMacXFF() {
- var userAgent = navigator.userAgent.toLowerCase();
- if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) {
- return true;
- }
-}
-
-function TB_special(pi_href){
- // get caption: either title or name attribute
- var caption = this.title || this.name || "";
-
- // get rel attribute for image groups
- var group = this.rel || false;
-
- // display the box for the elements href
- TB_show(caption, pi_href, group);
-}
-
-
-
diff --git a/main/inc/lib/nanogong.lib.php b/main/inc/lib/nanogong.lib.php
index be9c8ba41b..297d018df9 100755
--- a/main/inc/lib/nanogong.lib.php
+++ b/main/inc/lib/nanogong.lib.php
@@ -664,7 +664,7 @@ class Nanogong
api_get_path(
WEB_AJAX_PATH
).'nanogong.ajax.php?a=show_form&'.$params_string.'&TB_iframe=true&height=400&width=500',
- array('class' => 'btn thickbox')
+ array('class' => 'btn btn-default ajax')
);
$html .= '
'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments')); return $html; diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 3727b10f44..e5ade7042b 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -618,7 +618,7 @@ class SocialManager extends UserManager //--- User image if ($img_array['file'] != 'unknown.jpg') { - $html .= '
';
+ $html .= ' ';
} else {
$html .= '';
}
@@ -1400,7 +1400,7 @@ class SocialManager extends UserManager
$pathImg = $pathUserInfo['dir'] . 'message_attachments';
$imageBig = $pathImg .self::getImagePath($message['path'], IMAGE_WALL_BIG);
$imageSmall = $pathImg. self::getImagePath($message['path'], IMAGE_WALL_SMALL);
- $wallImage = '
';
+ $wallImage = '';
}
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 60603ec6bb..62e9f46f7d 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -623,14 +623,13 @@ class Template
}
foreach ($bowerJsFiles as $file) {
- $js_file_to_string .= '';
+ $js_file_to_string .= ''."\n";
}
foreach ($js_files as $file) {
$js_file_to_string .= api_get_js($file);
}
-
// Loading email_editor js
if (!api_is_anonymous() && api_get_setting('allow_email_editor') == 'true') {
$js_file_to_string .= $this->fetch('default/mail_editor/email_link.js.tpl');
diff --git a/main/social/profile.php b/main/social/profile.php
index 0656169032..7925d3bedc 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -656,7 +656,7 @@ if ($show_full_profile) {
$my_groups .= '';
}
@@ -723,7 +723,7 @@ if ($show_full_profile) {
}
//BLock Social Skill
- if (api_get_setting('allow_skills_tool') == 'true') {
+ if (api_get_setting('allow_skills_tool') == 'true') {
$skill = new Skill();
$ranking = $skill->get_user_skill_ranking($my_user_id);
@@ -943,7 +943,7 @@ function listMyFriends($user_id, $link_shared, $show_full_profile)
$friendHtml.= ' : '
.''.get_lang('SeeAll').'';
+ .'class="ajax" title="'.get_lang('SeeAll').'" >'.get_lang('SeeAll').'';
}
}
diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php
index f7ab0d02ff..6333ace7df 100755
--- a/main/template/default/auth/courses_categories.php
+++ b/main/template/default/auth/courses_categories.php
@@ -439,7 +439,7 @@ function display_title($course)
function display_description_button($course, $icon_title)
{
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
- echo ''.get_lang('Description').'';
+ echo ''.get_lang('Description').'';
}
}
diff --git a/main/template/default/auth/courses_list.php b/main/template/default/auth/courses_list.php
index c87a69e66d..7671c6f44a 100755
--- a/main/template/default/auth/courses_list.php
+++ b/main/template/default/auth/courses_list.php
@@ -124,7 +124,8 @@ if (!empty($user_course_categories)) {
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
$icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
?>
-
+
+
@@ -222,7 +223,7 @@ if (!empty($courses_without_category)) {
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
$icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
?>
-
+
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 923a5a45e8..feaa097b56 100755
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -367,7 +367,7 @@ $(function() {
// Global popup
$('.ajax').on('click', function() {
- var url = this.href;
+ var url = this.href;
var dialog = $("#dialog");
if ($("#dialog").length == 0) {
dialog = $('').appendTo('body');
'.get_lang('Feedback').'
';
if ($answerType == HOT_SPOT_DELINEATION) {
if ($organs_at_risk_hit > 0) {
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index 00545b8029..80db07f948 100755
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -647,7 +647,7 @@ class Attendance
$user_profile = UserManager::get_picture_user($uid, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
if (!empty($image_path['file'])) {
- $photo = '"+caption+"
")
-
-
- $("#TB_closeWindowButton").click(tb_remove);
-
- if (!(TB_PrevHTML === "")) {
- function goPrev(){
- if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);}
- $("#TB_window").remove();
- $("body").append("");
- tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
- return false;
- }
- $("#TB_prev").click(goPrev);
- }
-
- if (!(TB_NextHTML === "")) {
- function goNext(){
- $("#TB_window").remove();
- $("body").append("");
- tb_show(TB_NextCaption, TB_NextURL, imageGroup);
- return false;
- }
- $("#TB_next").click(goNext);
-
- }
-
- document.onkeydown = function(e){
- if (e == null) { // ie
- keycode = event.keyCode;
- } else { // mozilla
- keycode = e.which;
- }
- if(keycode == 27){ // close
- tb_remove();
- } else if(keycode == 190){ // display previous image
- if(!(TB_NextHTML == "")){
- document.onkeydown = "";
- goNext();
- }
- } else if(keycode == 188){ // display next image
- if(!(TB_PrevHTML == "")){
- document.onkeydown = "";
- goPrev();
- }
- }
- };
-
- tb_position();
- $("#TB_load").remove();
- $("#TB_ImageOff").click(tb_remove);
- $("#TB_window").css({display:"block"}); //for safari using css instead of show
- };
-
- imgPreloader.src = url;
- }else{//code to show html
-
- var queryString = url.replace(/^[^\?]+\??/,'');
- var params = tb_parseQuery( queryString );
-
- TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
- TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
- ajaxContentW = TB_WIDTH - 30;
- ajaxContentH = TB_HEIGHT - 45;
-
- if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window
- urlNoQuery = url.split('TB_');
- $("#TB_iframeContent").remove();
- if(params['modal'] != "true"){//iframe no modal
- $("#TB_window").append("" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
"+caption+"
"+caption+"
'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments')); return $html; diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 3727b10f44..e5ade7042b 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -618,7 +618,7 @@ class SocialManager extends UserManager //--- User image if ($img_array['file'] != 'unknown.jpg') { - $html .= '