Browse Source

Update from ofaj_dev branch

Julio Montoya 6 years ago
parent
commit
a3feb1d773

+ 7 - 16
main/inc/lib/javascript/chat/js/chat.js

@@ -168,7 +168,6 @@ function startChatSession()
 
 								if (item.s == 2) {
 									// info message
-									//$("#chatbox_"+my_user_id+" .chatboxcontent").append('<div class="'+messageLogMe+'"><span class="chatboxinfo">'+item.m+'</span></div>');
 								} else {
 									var chatBubble = createChatBubble(my_user_id, item);
 									$("#chatbox_"+my_user_id+" .chatboxcontent").append(chatBubble);
@@ -311,7 +310,6 @@ function chatHeartbeat()
 					chatHeartbeatTime = maxChatHeartbeat;
 				}
 			}
-			//timer = setTimeout('chatHeartbeat();',chatHeartbeatTime);
 		}
 	}); //ajax
 }
@@ -425,6 +423,7 @@ function createMyContactsWindow()
 		});
 
 		$("#chatbox_"+user_id+" .chatboxtextarea").focus();
+
 		return;
 	}
 
@@ -439,14 +438,9 @@ function createMyContactsWindow()
 		.addClass('chatboxhead')
 		.append('');
 
-	/*$('<div>')
-		.addClass('chatimage')
-		.append('image?')
-		.appendTo(chatboxHead);*/
-
 	$('<div>')
 		.addClass('chatboxtitle')
-		.append('My contacts')
+		.append(chatLang)
 		.appendTo(chatboxHead);
 
 	var chatboxoptions = $('<div>')
@@ -484,13 +478,6 @@ function createMyContactsWindow()
 		$('<div>').html(data).appendTo(chatboxContent);
 	});
 
-	/*$('<textarea>')
-		.addClass('chatboxtextarea')
-		.on('keydown', function(e) {
-			return checkChatBoxInputKey(e.originalEvent, this, user_id);
-		})
-		.appendTo(chatboxInput);*/
-
 	chatbox
 		.append(chatboxHead)
 		.append(chatboxContent)
@@ -529,6 +516,7 @@ function createMyContactsWindow()
 			$("#chatbox_"+user_id+" .chatboxtextarea").focus();
 		}
 	});
+
 	$("#chatbox_"+user_id).show();
 
 	$("#chatbox_"+user_id+" .chatboxcontent").scroll(function () {
@@ -553,10 +541,11 @@ function createChatBox(user_id, chatboxtitle, minimizeChatBox, online, userImage
 		}
 
 		$("#chatbox_"+user_id+" .chatboxtextarea").focus();
+
 		return;
 	}
 
-	user_is_online = return_online_user(user_id, online, userImage);
+	var user_is_online = return_online_user(user_id, online, userImage);
 
 	var chatbox = $('<div>')
 		.attr({
@@ -767,6 +756,7 @@ function return_online_user(user_id, status, userImage)
 		new_div.html(offline_button);
 	}
 	div_wrapper.append(new_div);
+
 	return div_wrapper.html();
 }
 
@@ -878,6 +868,7 @@ function checkChatBoxInputKey(event, chatboxtextarea, user_id)
 					intervals[messageId] = setInterval(checkMessageStatus, chatHeartbeatTime, messageId);
 				} else {
 					$("#chatbox_" + user_id + " .chatboxcontent").append('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i><br />');
+					append('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i><br />');
 				}
 			});
 		}

+ 2 - 0
main/inc/lib/pear/HTML/Common.php

@@ -69,6 +69,7 @@ class HTML_Common
      * @access    private
      */
     var $_comment = '';
+    public $freezeSeeOnlySelected;
 
     /**
      * Class constructor
@@ -79,6 +80,7 @@ class HTML_Common
      */
     public function __construct($attributes = null, $tabOffset = 0)
     {
+        $this->freezeSeeOnlySelected = false;
         $this->setAttributes($attributes);
         $this->setTabOffset($tabOffset);
     } // end constructor

+ 10 - 1
main/inc/lib/pear/HTML/QuickForm/button.php

@@ -211,6 +211,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
     public function getTemplate($layout)
     {
         $size = $this->getColumnsSize();
+        $attributes = $this->getAttributes();
 
         if (empty($size)) {
             $size = array(2, 8, 2);
@@ -234,7 +235,13 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
                 ';
                 break;
             case FormValidator::LAYOUT_HORIZONTAL:
-                return '
+                if (isset($attributes['custom']) && $attributes['custom'] == true) {
+                    $template = '
+                        {icon}
+                        {element}
+                    ';
+                } else {
+                    $template = '
                 <div class="form-group {error_class}">
                     <label {label-for} class="col-sm-'.$size[0].' control-label" >
                         <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
@@ -258,6 +265,8 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
                         <!-- END label_3 -->
                     </div>
                 </div>';
+                }
+                return $template;
                 break;
             case FormValidator::LAYOUT_BOX:
             case FormValidator::LAYOUT_BOX_NO_LABEL:

+ 1 - 0
main/inc/lib/pear/HTML/QuickForm/group.php

@@ -508,6 +508,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
     {
         parent::freeze();
         foreach (array_keys($this->_elements) as $key) {
+            $this->_elements[$key]->freezeSeeOnlySelected = $this->freezeSeeOnlySelected;
             $this->_elements[$key]->freeze();
         }
     }

+ 5 - 1
main/inc/lib/pear/HTML/QuickForm/radio.php

@@ -126,8 +126,12 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
     {
         if (0 == strlen($this->_text)) {
             $label = '';
-        } elseif ($this->_flagFrozen) {
+        } elseif ($this->isFrozen()) {
             $label = $this->_text;
+            if ($this->freezeSeeOnlySelected) {
+                $invisible = $this->getChecked() ? '' : ' style="display:none"';
+                return "<div $invisible>".HTML_QuickForm_input::toHtml().$this->_text."</div>";
+            }
         } else {
             $labelClass = $this->labelClass;
             $radioClass = $this->radioClass;

+ 20 - 2
main/inc/lib/pear/HTML/QuickForm/text.php

@@ -102,6 +102,7 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
     public function getTemplate($layout)
     {
         $size = $this->getColumnsSize();
+        $attributes = $this->getAttributes();
 
         if (empty($size)) {
             $sizeTemp = $this->getInputSize();
@@ -162,13 +163,30 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
                 </div>';
                 break;
             case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
+                if (isset($attributes['custom']) && $attributes['custom'] == true) {
+                    $template = '
+                        <label {label-for}>{label}</label>
+                        <div class="input-group">
+                            {icon}
+                            {element}
+                            <div class="input-group-btn">
+                                <button class="btn btn-default" type="submit">
+                                    <em class="fa fa-search"></em>
+                                </button>
+                            </div>
+                        </div>  
+                    ';
+                } else {
+                    $template = '
                         <label {label-for}>{label}</label>
                         <div class="input-group">
-                            
                             {icon}
                             {element}
                         </div>';
+                }
+
+
+                return $template;
                 break;
         }
     }

+ 46 - 42
main/social/search.php

@@ -139,27 +139,29 @@ if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2
     $results .= '</div>';
 
     $visibility = [true, true, true, true, true];
-    $results .= Display::return_sortable_grid(
-        'users',
-        null,
-        null,
-        ['hide_navigation' => false, 'per_page' => $itemPerPage],
-        $query_vars,
-        false,
-        $visibility,
-        true,
-        [],
-        $totalUsers
-    );
-
-    $block_search .= Display::panelCollapse(
-        get_lang('Users'),
-        $results,
-        'search-friends',
-        null,
-        'friends-accordion',
-        'friends-collapse'
-    );
+
+    if (!empty($users)) {
+        $results .= Display::return_sortable_grid(
+            'users',
+            null,
+            null,
+            ['hide_navigation' => false, 'per_page' => $itemPerPage],
+            $query_vars,
+            false,
+            $visibility,
+            true,
+            [],
+            $totalUsers
+        );
+        $block_search .= Display::panelCollapse(
+            get_lang('Users'),
+            $results,
+            'search-friends',
+            null,
+            'friends-accordion',
+            'friends-collapse'
+        );
+    }
 
     $grid_groups = [];
     $block_groups = '<div id="whoisonline">';
@@ -211,27 +213,29 @@ if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2
     $block_groups .= '</div>';
 
     $visibility = [true, true, true, true, true];
-    $block_groups .= Display::return_sortable_grid(
-        'groups',
-        null,
-        $grid_groups,
-        ['hide_navigation' => false, 'per_page' => $itemPerPage],
-        $query_vars,
-        false,
-        $visibility,
-        true,
-        [],
-        $totalGroups
-    );
-
-    $block_search .= Display:: panelCollapse(
-        get_lang('Groups'),
-        $block_groups,
-        'search-groups',
-        null,
-        'groups-accordion',
-        'groups-collapse'
-    );
+
+    if (!empty($groups)) {
+        $block_groups .= Display::return_sortable_grid(
+            'groups',
+            null,
+            $grid_groups,
+            ['hide_navigation' => false, 'per_page' => $itemPerPage],
+            $query_vars,
+            false,
+            $visibility,
+            true,
+            [],
+            $totalGroups
+        );
+        $block_search .= Display:: panelCollapse(
+            get_lang('Groups'),
+            $block_groups,
+            'search-groups',
+            null,
+            'groups-accordion',
+            'groups-collapse'
+        );
+    }
 }
 
 $tpl = new Template($tool_name);

+ 5 - 0
main/template/default/layout/main.js.tpl

@@ -4,6 +4,7 @@ var online_button = '<img src="' + _p.web_img + 'statusonline.png">';
 var offline_button = '<img src="' + _p.web_img + 'statusoffline.png">';
 var connect_lang = '{{ "ChatConnected"|get_lang | escape('js')}}';
 var disconnect_lang = '{{ "ChatDisconnected"|get_lang | escape('js')}}';
+var chatLang = '{{ "GlobalChat"|get_lang | escape('js')}}';
 
 {% if 'hide_chat_video'|api_get_configuration_value %}
     var hide_chat_video = true;
@@ -320,6 +321,10 @@ $(function() {
     });
 
     $("#notifications").load(_p.web_ajax + "online.ajax.php?a=get_users_online");
+
+    $(document).ready(function () {
+        $('video:not(.skip)').attr('preload', 'metadata');
+    })
 });
 
 $(window).resize(function() {

+ 0 - 1
main/work/add_document.php

@@ -60,7 +60,6 @@ if (empty($docId)) {
     if (!empty($documents)) {
         echo Display::page_subheader(get_lang('DocumentsAdded'));
         echo '<div class="well">';
-        $urlDocument = api_get_path(WEB_CODE_PATH).'work/add_document.php';
         foreach ($documents as $doc) {
             $documentId = $doc['document_id'];
             $docData = DocumentManager::get_document_data_by_id($documentId, $courseInfo['code']);