Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

AngelFQC · AngelFQC · commit 4c596ce36c2f · 2018-01-18T17:59:55.000-05:00
diff --git a/app/Resources/public/css/chat.css b/app/Resources/public/css/chat.css
@@ -97,8 +97,9 @@
 	-moz-border-radius: 10px;
 	border-radius: 10px;
 	color: #666;
-	margin-bottom: -1px;
+	margin-bottom: 5px;
 	padding: 10px;
+        cursor: pointer;
 }
 .chat-user .user-image-chat {
 	-webkit-border-radius: 10px;
diff --git a/app/Resources/public/css/themes/cool_blue/default.css b/app/Resources/public/css/themes/cool_blue/default.css
@@ -81,14 +81,7 @@ a:hover{
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-background: #fe9700; /* Old browsers */
-background: -moz-linear-gradient(top, #fe9700 0%, #fd6800 100%); /* FF3.6+ */
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fe9700), color-stop(100%,#fd6800)); /* Chrome,Safari4+ */
-background: -webkit-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Chrome10+,Safari5.1+ */
-background: -o-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Opera 11.10+ */
-background: -ms-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* IE10+ */
-background: linear-gradient(to bottom, #fe9700 0%,#fd6800 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
+    background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/corporate/default.css b/app/Resources/public/css/themes/corporate/default.css
@@ -74,7 +74,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2eaebb', end
   background: #3A4751;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #FE9A2E; ;
+  background-color: #FFF; ;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/cosmic_campus/default.css b/app/Resources/public/css/themes/cosmic_campus/default.css
@@ -78,7 +78,7 @@ header{
   color: #9DD0F1;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #E48A1D;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/delicious_bordeaux/default.css b/app/Resources/public/css/themes/delicious_bordeaux/default.css
@@ -74,7 +74,7 @@ color: #FFFFFF;
 background: #800020;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #800020;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/fruity_orange/default.css b/app/Resources/public/css/themes/fruity_orange/default.css
@@ -78,14 +78,7 @@ color: #FFFFFF;
 background: #FF650D;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background: #ff670f; 
-background: -moz-linear-gradient(top, #ff670f 0%, #fc3200 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff670f), color-stop(100%,#fc3200));
-background: -webkit-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: -o-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: -ms-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: linear-gradient(to bottom, #ff670f 0%,#fc3200 100%);
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff670f', endColorstr='#fc3200',GradientType=0 );
+  background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/medical/default.css b/app/Resources/public/css/themes/medical/default.css
@@ -89,7 +89,7 @@ color: #FFFFFF;
 background: #F38A1E;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background: #2C9BB6;
+  background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #fff;
diff --git a/app/Resources/public/css/themes/royal_purple/default.css b/app/Resources/public/css/themes/royal_purple/default.css
@@ -81,7 +81,7 @@ background: linear-gradient(to bottom, #f7a400 0%,#ff7400 100%); /* W3C */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7a400', endColorstr='#ff7400',GradientType=0 ); /* IE6-9 */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #FB8B00;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/sober_brown/default.css b/app/Resources/public/css/themes/sober_brown/default.css
@@ -66,7 +66,7 @@ color: #FFFFFF;
 background: #6B1F05; /* Old browsers */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #B83609;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/steel_grey/default.css b/app/Resources/public/css/themes/steel_grey/default.css
@@ -66,7 +66,7 @@ color: #FFFFFF;
 background: #677877; /* Old browsers */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #B83609;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/main/template/default/chat/chat.tpl b/main/template/default/chat/chat.tpl
@@ -109,8 +109,8 @@
                     var buttonStatus = user.isConnected ? 'success' : 'muted',
                         buttonTitle = user.isConnected ? '{{ 'StartAChat'|get_lang }}' : '{{ 'LeaveAMessage'|get_lang }}';
 
-                    html += '<li class="col-xs-12 chat-user">' +
-                        '   <div>' +
+                    html += '<li class="col-xs-12">' +
+                        '   <div class="chat-user" data-name="' + user.complete_name + '" data-user="' + user.id + '">' +
                         '       <img src="' + user.image_url + '" alt="' + user.complete_name + '" class="img-circle user-image-chat"/>' +
                         '       <ul class="list-unstyled">' +
                         '           <li>' + user.complete_name;
@@ -261,7 +261,7 @@
         }], {});
 
         $('button#chat-send-message').on('click', ChChat.onSendMessageListener);
-        $('#chat-users').on('click', 'button.btn', function (e) {
+        $('#chat-users').on('click', 'div.chat-user', function (e) {
             e.preventDefault();
             var jSelf = $(this),
                 userId = parseInt(jSelf.data('user')) || 0;
diff --git a/main/work/view.php b/main/work/view.php
@@ -171,6 +171,15 @@
         if (isset($work['contains_file']) && !empty($work['contains_file'])) {
             if (isset($work['download_url']) && !empty($work['download_url'])) {
                 $actions = Display::url(
+                    Display::return_icon(
+                        'back.png',
+                        get_lang('BackToWorksList'),
+                        null,
+                        ICON_SIZE_MEDIUM
+                    ),
+                    api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq()
+                );
+                $actions .= Display::url(
                     Display::return_icon(
                         'save.png',
                         get_lang('Download'),

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2eaebb', end`
`74`	`74`	`background: #3A4751;`
`75`	`75`	`}`
`76`	`76`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`77`		`- background-color: #FE9A2E; ;`
	`77`	`+ background-color: #FFF; ;`
`78`	`78`	`}`
`79`	`79`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`80`	`80`	`color: #ffffff;`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ header{`
`78`	`78`	`color: #9DD0F1;`
`79`	`79`	`}`
`80`	`80`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`81`		`- background-color: #E48A1D;`
	`81`	`+ background-color: #FFFFFF;`
`82`	`82`	`}`
`83`	`83`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`84`	`84`	`color: #ffffff;`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ color: #FFFFFF;`
`74`	`74`	`background: #800020;`
`75`	`75`	`}`
`76`	`76`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`77`		`- background-color: #800020;`
	`77`	`+ background-color: #FFFFFF;`
`78`	`78`	`}`
`79`	`79`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`80`	`80`	`color: #ffffff;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ color: #FFFFFF;`
`89`	`89`	`background: #F38A1E;`
`90`	`90`	`}`
`91`	`91`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`92`		`- background: #2C9BB6;`
	`92`	`+ background: #FFFFFF;`
`93`	`93`	`}`
`94`	`94`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`95`	`95`	`color: #fff;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ background: linear-gradient(to bottom, #f7a400 0%,#ff7400 100%); /* W3C */`
`81`	`81`	`filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7a400', endColorstr='#ff7400',GradientType=0 ); /* IE6-9 */`
`82`	`82`	`}`
`83`	`83`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`84`		`- background-color: #FB8B00;`
	`84`	`+ background-color: #FFFFFF;`
`85`	`85`	`}`
`86`	`86`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`87`	`87`	`color: #ffffff;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ color: #FFFFFF;`
`66`	`66`	`background: #6B1F05; /* Old browsers */`
`67`	`67`	`}`
`68`	`68`	`.navbar-default .navbar-nav > li > .dropdown-menu {`
`69`		`- background-color: #B83609;`
	`69`	`+ background-color: #FFFFFF;`
`70`	`70`	`}`
`71`	`71`	`.navbar-default .navbar-nav > li > .dropdown-menu > li > a {`
`72`	`72`	`color: #ffffff;`