Kaynağa Gözat

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

jmontoyaa 8 yıl önce
ebeveyn
işleme
4856c57ff8

+ 17 - 14
app/Resources/public/css/base.css

@@ -4339,13 +4339,11 @@ ul.exercise-draggable-answer .touch-items{
   background-image: -ms-linear-gradient(top, #ffffff, #cfcfcf);
   background-image: -o-linear-gradient(top, #ffffff, #cfcfcf);
   background-image: linear-gradient(to bottom, #ffffff, #cfcfcf);
-  -webkit-border-radius: 4;
-  -moz-border-radius: 4;
   border-radius: 4px;
   font-family: Arial;
   color: #2e2e2e;
   font-size: 13px;
-  padding: 10px 20px 10px 20px;
+  padding: 5px 10px;
   border: solid #b0b0b0 1px;
   text-decoration: none;
   z-index: 100;
@@ -4363,16 +4361,16 @@ ul.exercise-draggable-answer .touch-items:hover{
   padding: 10px 20px;
 }
 .question_options .droppable {
-  margin: 0 20px 20px 0;
-  padding: 10px;
+  padding: 5px;
   text-align: center;
   background-color: #ECF0F1;
-  border: dotted #dddddd 4px;
+  border: dotted #dddddd 2px;
   border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
   color:#666666;
 }
+.question_options .ui-helper-reset{
+    margin-top: -25px;
+}
 .question_options .droppable .gallery .btn-default {
   background: #D9534F;
   color: #ffffff;
@@ -4384,12 +4382,17 @@ ul.exercise-draggable-answer .touch-items:hover{
   border-color: #AC2925;
 }
 .question_options .droppable .gallery .exercise-draggable-answer-option {
-  margin-bottom: 15px;
-  background-color: #286090;
-  color: #ffffff;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  border-radius: 4px;
+  margin-bottom: 0;
+background: #feffff;
+background: -moz-linear-gradient(top, #feffff 0%, #d2ebf9 100%);
+background: -webkit-linear-gradient(top, #feffff 0%,#d2ebf9 100%);
+background: linear-gradient(to bottom, #feffff 0%,#d2ebf9 100%);
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feffff', endColorstr='#d2ebf9',GradientType=0 );
+  border: 1px solid #DDDDDD;
+  padding: 5px;
+  border-radius: 5px;
+  font-size: 12px;
+  cursor: pointer;
 }
 
 /***    Matching Draggable answer ***/

+ 11 - 7
main/inc/lib/exercise.lib.php

@@ -832,7 +832,7 @@ class ExerciseLib
                             $parsed_answer,
                             [
                                 'id' => "window_$windowId",
-                                'class' => "window{$questionId}_question_draggable exercise-draggable-answer-option btn btn-info"
+                                'class' => "window{$questionId}_question_draggable exercise-draggable-answer-option"
                             ]
                         );
                         $selectedValue = 0;
@@ -1058,12 +1058,16 @@ HTML;
 
                     if ($answerCorrect) {
                         $s .= Display::div(
-                            ' ',
-                            [
-                                'id' => "drop_$windowId",
-                                'class' => 'col-md-2 droppable'
-                            ]
-                        );
+                                Display::div(' ',
+                                        [
+                                            'id' => "drop_$windowId",
+                                            'class' => 'droppable'
+                                        ])
+                                ,
+                                [
+                                    'class' => 'col-md-3'
+                                ]
+                                );
 
                         $counterAnswer++;
                     }

+ 15 - 4
main/inc/lib/sessionmanager.lib.php

@@ -1474,6 +1474,7 @@ class SessionManager
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
         $tbl_url_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_item_properties = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $em = Database::getManager();
 
         $userId = api_get_user_id();
 
@@ -1486,10 +1487,16 @@ class SessionManager
         }
 
         if (SessionManager::allowed($id_checked) && !$from_ws) {
-            $sql = 'SELECT session_admin_id FROM ' . $tbl_session. '
-                    WHERE id IN (' . $id_checked.')';
-            $rs = Database::query($sql);
-            if (Database::result($rs, 0, 0) != $userId) {
+            $qb = $em
+                ->createQuery('
+                    SELECT s.sessionAdminId FROM ChamiloCoreBundle:Session s
+                    WHERE s.id = ?1
+                ')
+                ->setParameter(1, $id_checked);
+
+            $res = $qb->getSingleScalarResult();
+
+            if ($res != $userId && !api_is_platform_admin()) {
                 api_not_allowed(true);
             }
         }
@@ -3878,6 +3885,10 @@ class SessionManager
             return false;
         }
 
+        if (api_is_platform_admin()) {
+            return true;
+        }
+
         $userId = api_get_user_id();
 
         if (api_is_session_admin() &&

+ 2 - 0
main/lang/english/trad4all.inc.php

@@ -7645,4 +7645,6 @@ $MyLocation = "My location";
 $ShowCourseInUserLanguage = "Show course in user's language";
 $AccessData = "Access data";
 $InvalidImageDimensions = "Image dimensions do not match the requirements. Please check the suggestions next to the image field.";
+$CouldNotResetPasswordBecauseLDAP = "Could not reset password, contact your helpdesk.";
+$Quote = "Quote";
 ?>

+ 2 - 0
main/lang/french/trad4all.inc.php

@@ -7632,4 +7632,6 @@ $MyLocation = "Ma position";
 $ShowCourseInUserLanguage = "Afficher les cours dans la langue de l'utilisateur";
 $AccessData = "Données d'accès";
 $InvalidImageDimensions = "Dimensiones incorrectas de la imagen. Por favor, respete las sugerencias indicadas al lado del campo de imagen.";
+$CouldNotResetPasswordBecauseLDAP = "Impossible de réinitialiser le mot de passe. Contactez votre équipe de support.";
+$Quote = "Citer";
 ?>

+ 2 - 0
main/lang/spanish/trad4all.inc.php

@@ -7669,4 +7669,6 @@ $Map = "Mapa";
 $MyLocation = "Mi ubicación";
 $ShowCourseInUserLanguage = "Mostrar el curso en el idioma del usuario";
 $AccessData = "Datos de acceso";
+$InvalidImageDimensions = "Las dimensiones de la imagen no corresponden a los requerimientos. Por favor verifique las sugerencias cerca del campo de imagen.";
+$Quote = "Citar";
 ?>

+ 6 - 0
tests/scripts/packaging/gitlog.php

@@ -34,10 +34,16 @@ foreach ($logs as $log) {
     if ($showDate) {
       echo $log['date']->format('Y-m-d H:i:s').' '.substr($log['sha1'],0,8).PHP_EOL;
     }
+    // Check for messages to ignore...
     if (strncasecmp($log['message'], 'Minor', 5) === 0) {
         //Skip minor messages
         continue;
     }
+    if ($log['message'] == 'Update language terms') {
+        //Skip language update messages
+        continue;
+    }
+    // Look for tasks references
     $issueLink = '';
     $matches = array();
     if (preg_match_all('/((BT)?#(\d){2,5})/', $log['message'], $matches)) {