ソースを参照

Merge branch 'revibootstrap' of https://github.com/aragonc/chamilo-lms into aragonc-revibootstrap

Yannick Warnier 9 年 前
コミット
f11edc9a84

+ 315 - 178
app/Resources/public/css/base.css

@@ -2508,7 +2508,16 @@ div.admin_section h4 {
     float:left;
     padding:5px;
 }
-
+.exercise{
+  padding: 10px 20px;
+  box-sizing: border-box;
+  border: 1px solid #dddddd;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  box-shadow: 0px 1px 1px rgba(0,0,0,0.05);
+  margin-bottom: 35px;
+}
 
 .question_item {
     height:50px;
@@ -2590,6 +2599,7 @@ div.admin_section h4 {
 .question_options label {
     margin-bottom: 14px;
     display:block;
+    font-weight: normal;
 }
 
 .question_options .radio{
@@ -2597,25 +2607,41 @@ div.admin_section h4 {
     padding-left: 25px;
 }
 .question_options .checkbox{
-  margin-left: 35px;
+  margin-left: 65px;
 }
+
 .question_options .radio input[type="radio"], .question_options .checkbox input[type="checkbox"] {
     float: left;
     margin-left: -25px;
 }
 
-.question_options input {
-    /* margin-right:10px; */
-}
-
 .question_options input[type="text"] {
-    padding:0px;
+    padding: 6px 12px;
     margin:2px 2px 2px 0px;
+    vertical-align: middle;
+    display: inline-block;
+    height: 34px;
+    line-height: 1.42857;
+    border: 1px solid #CCCCCC;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  color: #555555;
+  font-weight: bold;
+  background-color: #FCF8D6;
+
+}
+.question_options input[type="text"]:focus{
+   border-color:#66AFE9;
+  background-color: #ffffff;
+   outline: 0px none;
+   box-shadow:0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px rgba(102, 175, 233, 0.6) ;
 }
 
 .exercise_description {
     padding:0px 0px 10px 0px;
-    border-bottom: 1px solid #CCCCCC;
+    border-bottom: 1px solid #dddddd;
+    margin-bottom: 10px;
 }
 .exercise_title {
     font-size: 1.6em;
@@ -5711,6 +5737,282 @@ ul.holder li.bit-box{
   width: 20%;
   display: inline-block;
 }
+#settings .form-inline{
+  margin-bottom: 15px;
+}
+#search_settings{
+  margin-bottom: 15px;
+}
+.src-image {
+  display: none;
+}
+/* thematic progress */
+#panel-thematic .title-topics{
+  font-size: 15px;
+  color:#00829C;
+  font-weight: bold;
+}
+#panel-thematic .current{
+  background-color: #E7F1F7;
+}
+#panel-thematic .separate{
+  margin-bottom: 10px;
+}
+#panel-thematic .date{
+  font-size: 11px;
+  color: #8A6D3B;
+  background: #FCF8E3;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  padding: 5px;
+}
+#panel-thematic .views ul li{
+  font-size: 12px;
+}
+/* end thematic progress*/
+.card {
+  overflow: hidden;
+  position: relative;
+  border: 1px solid #CCC;
+  border-radius: 8px;
+  text-align: center;
+  padding: 0;
+  /* background-color: #284c79; */
+  color: rgb(136, 172, 217);
+  margin-bottom: 20px;
+}
+.card .header-bg {
+  /* This stretches the canvas across the entire hero unit */
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 70px;
+  border-bottom: 1px #FFF solid;
+  /* This positions the canvas under the text */
+  z-index: 1;
+}
+
+.card .avatar {
+  position: relative;
+  margin-top: 15px;
+  z-index: 100;
+}
+
+.card .content {
+  margin-bottom: 15px;
+}
+
+.card .avatar img {
+  width: 100px;
+  height: 100px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  border: 5px solid rgba(0,0,30,0.8);
+}
+
+.question_options .exercise-unique-answer-image .radio{
+  padding-left: 10px;
+}
+
+.question_options label > input + div.thumbnail {
+  padding: 10px;
+  box-sizing: border-box;
+  border: 2px solid #eeeeee;
+  background: #ffffff; /* Old browsers */
+  background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 47%, #ededed 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */
+}
+
+.question_options label > input:checked + div.thumbnail {
+  border: 2px solid #337AB7;
+  -webkit-box-shadow: 0 4px 18px #C8C8C8;
+  -opera-box-shadow: 0 4px 18px #C8C8C8;
+  -moz-box-shadow: 0 4px 18px #C8C8C8;
+  box-shadow: 0 4px 18px #C8C8C8;
+  background: #ffffff; /* Old browsers */
+  background: -moz-linear-gradient(top, #ffffff 0%, #fffef2 47%, #ffffe2 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#fffef2), color-stop(100%,#ffffe2)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #ffffff 0%,#fffef2 47%,#ffffe2 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #ffffff 0%,#fffef2 47%,#ffffe2 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #ffffff 0%,#fffef2 47%,#ffffe2 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #ffffff 0%,#fffef2 47%,#ffffe2 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ffffe2',GradientType=0 ); /* IE6-9 */
+}
+
+.question_options div.thumbnail p {
+  margin: 0;
+}
+
+.question_options div.thumbnail img {
+  height: 150px !important;
+  width: 190px !important;
+  max-width: 100%;
+}
+.question_options .fill_blanks{
+  padding: 20px 30px;
+  box-sizing: border-box;
+}
+.question_options .fill_blanks img{
+  max-width: 100%;
+  display: block;
+  height: auto !important;
+}
+
+/***    Draggable answer    ***/
+.question_options ul.exercise-draggable-answer{
+  float: left;
+  margin-bottom: 20px;
+  min-height: 2em;
+  min-width: 100%;
+}
+ul.exercise-draggable-answer li {
+  cursor: move;
+  float: left;
+  margin: 0 20px 20px 0;
+  padding: 5px;
+  text-align: center;
+  width: 200px;
+}
+
+.question_options .droppable {
+  float: left;
+  margin: 0 20px 20px 0;
+  padding: 20px;
+  text-align: center;
+  width: 240px
+}
+.question_options .droppable .gallery .exercise-draggable-answer-option {
+  margin-bottom: 15px;
+}
+
+/***    Matching Draggable answer ***/
+.drag_question {
+  float: left;
+  min-height: 4em;
+  width: 100%;
+}
+.drag_question .indent{
+  text-indent: -15px;
+  padding-left: 30px;
+  padding-right: 15px;
+}
+.drag_question .separate{
+  background-color: #ffffff;
+  text-align: center;
+  vertical-align: middle;
+  border-top: #dddddd;
+  border-left: 1px solid #dddddd;
+  border-right: 1px solid #dddddd;
+  border-bottom: none !important;
+}
+.drag_question .text-right{
+  text-align: left;
+}
+.drag_question .select-matching {
+  display: inline-block;
+  position: relative;
+  overflow: hidden;
+  height: 28px;
+  width: 60px;
+  text-align: center;
+  border: 1px solid;
+  border-color: white #f7f7f7 #f5f5f5;
+  border-radius: 3px;
+  background: #444;
+  border-color: #111 #0a0a0a black;
+  background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: -moz-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: -o-linear-gradient(top, transparent, rgba(0, 0, 0, 0.4));
+  background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.4));
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 1px rgba(0, 0, 0, 0.2);
+}
+.drag_question .select-matching:before, .drag_question .select-matching:after {
+  content: '';
+  position: absolute;
+  z-index: 2;
+  top: 9px;
+  right: 10px;
+  width: 0;
+  height: 0;
+  border: 4px dashed;
+  border-color: #888 transparent;
+  pointer-events: none;
+}
+.drag_question .select-matching:before {
+  border-bottom-style: solid;
+  border-top: none;
+  border-bottom-color: #aaa;
+}
+.drag_question .select-matching:after {
+  margin-top: 7px;
+  border-top-style: solid;
+  border-bottom: none;
+  border-top-color: #aaa;
+}
+.drag_question .select-matching select{
+  position: relative;
+  width: 130%;
+  margin: 0;
+  padding: 6px 8px 6px 10px;
+  height: 28px;
+  line-height: 14px;
+  font-size: 14px;
+  color: #ffffff;
+  text-shadow: 0 1px white;
+  /* Fallback for IE 8 */
+  background: #f2f2f2;
+  /* "transparent" doesn't work with Opera */
+  background: rgba(0, 0, 0, 0) !important;
+  border: 0;
+  border-radius: 0;
+  -webkit-appearance: none;
+}
+.drag_question .select-matching select > option{
+  margin: 3px;
+  padding: 6px 8px;
+  text-shadow: none;
+  background: #444;
+  border-radius: 3px;
+  cursor: pointer;
+  color: #ffffff;
+}
+.drag_question .window{
+  box-shadow: 2px 2px 19px #AAA;
+  cursor: pointer;
+  min-height: 65px;
+  padding-top: 25px;
+
+}
+.window_left_question {
+  padding: 10px 25px 10px 10px;
+  text-align: right;
+}
+.window_right_question {
+  padding: 10px 10px 10px 25px;
+}
+
+._jsPlumb_endpoint {
+  z-index: 50;
+}
+
+/*** Video chat ***/
+video#chat-local-video,
+div#chat-remote-video video {
+  display: block;
+  height: auto;
+  width: 100%;
+}
+
+/* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
 .sidebar-scorm{
@@ -5781,6 +6083,11 @@ ul.holder li.bit-box{
     width: 100%;
     visibility: visible;
   }
+  .question_options div.thumbnail img {
+    height: 120px !important;
+    width: 190px !important;
+    max-width: 100%;
+  }
 }
 @media (min-width : 480px) and (max-width: 767px) {
   #learning_path_breadcrumb_zone {
@@ -5807,176 +6114,6 @@ ul.holder li.bit-box{
     width: 100%;
     display: block;
   }
-}
-#settings .form-inline{
-  margin-bottom: 15px;
-}
-#search_settings{
-  margin-bottom: 15px;
-}
-.src-image {
-    display: none;
-}
-/* thematic progress */
-#panel-thematic .title-topics{
-  font-size: 15px;
-  color:#00829C;
-  font-weight: bold;
-}
-#panel-thematic .current{
-  background-color: #E7F1F7;
-}
-#panel-thematic .separate{
-  margin-bottom: 10px;
-}
-#panel-thematic .date{
-  font-size: 11px;
-  color: #8A6D3B;
-  background: #FCF8E3;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  padding: 5px;
-}
-#panel-thematic .views ul li{
-  font-size: 12px;
-}
-/* end thematic progress*/
-.card {
-    overflow: hidden;
-    position: relative;
-    border: 1px solid #CCC;
-    border-radius: 8px;
-    text-align: center;
-    padding: 0;
-    /* background-color: #284c79; */
-    color: rgb(136, 172, 217);
-    margin-bottom: 20px;
-}
-.card .header-bg {
-    /* This stretches the canvas across the entire hero unit */
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 70px;
-    border-bottom: 1px #FFF solid;
-    /* This positions the canvas under the text */
-    z-index: 1;
-}
 
-.card .avatar {
-    position: relative;
-    margin-top: 15px;
-    z-index: 100;
 }
 
-.card .content {
-    margin-bottom: 15px;
-}
-
-.card .avatar img {
-    width: 100px;
-    height: 100px;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    border: 5px solid rgba(0,0,30,0.8);
-}
-
-.question_options .exercise-unique-answer-image {
-
-}
-
-@media (min-width: 768px) {
-    .question_options .exercise-unique-answer-image:nth-child(2n-1) {
-        clear: both;
-    }
-}
-
-@media (min-width: 992px) {
-    .question_options .exercise-unique-answer-image:nth-child(2n-1) {
-        clear: none;
-    }
-
-    .question_options .exercise-unique-answer-image:nth-child(3n-2) {
-        clear: both;
-    }
-}
-
-.question_options label > input + div.thumbnail {
-    border-color: transparent;
-    border-width: 5px;
-}
-
-.question_options label > input:checked + div.thumbnail {
-    border: 5px solid red;
-}
-
-.question_options div.thumbnail p {
-    margin: 0;
-}
-
-.question_options div.thumbnail img {
-    height: auto !important;
-    max-width: 100%;
-}
-
-/***    Draggable answer    ***/
-.question_options ul.exercise-draggable-answer{
-    float: left;
-    margin-bottom: 20px;
-    min-height: 2em;
-    min-width: 100%;
-}
-ul.exercise-draggable-answer li {
-    cursor: move;
-    float: left;
-    margin: 0 20px 20px 0;
-    padding: 5px;
-    text-align: center;
-    width: 200px;
-}
-
-.question_options .droppable {
-    float: left;
-    margin: 0 20px 20px 0;
-    padding: 20px;
-    text-align: center;
-    width: 240px
-}
-.question_options .droppable .gallery .exercise-draggable-answer-option {
-    margin-bottom: 15px;
-}
-
-/***    Matching Draggable answer ***/
-.drag_question {
-    float: left;
-    min-height: 4em;
-    width: 100%;
-}
-.drag_question .window{
-    box-shadow: 2px 2px 19px #AAA;
-    cursor: pointer;
-    min-height: 65px;
-    padding-top: 25px;
-}
-.window_left_question {
-    padding: 10px 25px 10px 10px;
-    text-align: right;
-}
-.window_right_question {
-    padding: 10px 10px 10px 25px;
-}
-
-._jsPlumb_endpoint {
-    z-index: 50;
-}
-
-/*** Video chat ***/
-video#chat-local-video,
-div#chat-remote-video video {
-    display: block;
-    height: auto;
-    width: 100%;
-}

+ 5 - 4
main/exercice/UniqueAnswerImage.php

@@ -26,7 +26,7 @@ class UniqueAnswerImage extends UniqueAnswer
         $objExercise = $_SESSION['objExercise'];
 
         $editorConfig = array(
-            'ToolbarSet' => 'UniqueAnswerImage',
+            'ToolbarSet' => 'TestFreeAnswer',
             'Width' => '100%',
             'Height' => '125'
         );
@@ -46,7 +46,8 @@ class UniqueAnswerImage extends UniqueAnswer
             $commentTitle = '<th >' . get_lang('Comment') . '</th>';
         }
 
-        $html = '<table class="table table-striped table-hover">
+        $html = '<div class="alert alert-success" role="alert">'.get_lang('UniqueAnswerImagePreferredSize200x150').'</div>';
+        $html .= '<table class="table table-striped table-hover">
             <thead>
                 <tr style="text-align: center;">
                     <th width="10">' . get_lang('Number') . '</th>
@@ -278,8 +279,8 @@ class UniqueAnswerImage extends UniqueAnswer
         $numberAnswers = $form->getSubmitValue('nb_answers');
 
         for ($i = 1; $i <= $numberAnswers; $i++) {
-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));
-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));
+            $answer = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('answer[' . $i . ']')));
+            $comment = trim(str_replace(['<p>', '</p>'], '', $form->getSubmitValue('comment[' . $i . ']')));
             $weighting = trim($form->getSubmitValue('weighting[' . $i . ']'));
 
             $scenario = $form->getSubmitValue('scenario');

+ 1 - 0
main/exercice/exercise.class.php

@@ -2487,6 +2487,7 @@ class Exercise
                     // [A] B [C] D [E] F::10,10,10@ or  [A] B [C] D [E] F::10,10,10
                     // means that is a normal fill blank question
                     // first we explode the "::"
+
                     $pre_array = explode('::', $answer);
                     // is switchable fill blank or not
                     $last = count($pre_array) - 1;

+ 1 - 1
main/exercice/exercise_submit.php

@@ -201,7 +201,7 @@ if ($objExercise->selectAttempts() > 0) {
 
                             $question_info = Question::read($question_id);
                             $attempt_html .= Display::div($question_info->question, array('class'=>'question_title'));
-                            $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_score'));
+                            $attempt_html .= Display::div(get_lang('Score').' '.$marks, array('id'=>'question_question_titlescore'));
                         }
                     }
 					$score =  ExerciseLib::show_score($last_attempt_info['exe_result'], $last_attempt_info['exe_weighting']);

+ 3 - 3
main/exercice/multiple_answer.class.php

@@ -132,7 +132,7 @@ class MultipleAnswer extends Question
 
             $form->addHtmlEditor("comment[$i]", null, null, true, $editorConfig);
 
-            $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "span1", 'value' => '0'));
+            $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "col-md-1", 'value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -178,8 +178,8 @@ class MultipleAnswer extends Question
 		$nb_answers = $form->getSubmitValue('nb_answers');
 
 		for($i=1 ; $i <= $nb_answers ; $i++) {
-        	$answer = trim($form -> getSubmitValue('answer['.$i.']'));
-            $comment = trim($form -> getSubmitValue('comment['.$i.']'));
+        	$answer = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('answer['.$i.']')));
+            $comment = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('comment['.$i.']')));
             $weighting = trim($form -> getSubmitValue('weighting['.$i.']'));
             $goodAnswer = trim($form -> getSubmitValue('correct['.$i.']'));
 

+ 6 - 6
main/exercice/overview.php

@@ -67,7 +67,7 @@ if ($origin != 'learnpath') {
 
 $html = '';
 $message = '';
-
+$html.= '<div class="exercise">';
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 $edit_link = '';
 if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
@@ -76,9 +76,9 @@ if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
         api_get_path(WEB_CODE_PATH).'exercice/admin.php?'.api_get_cidreq().'&id_session='.api_get_session_id().'&exerciseId='.$objExercise->id
     );
 }
-
+$iconExercise=Display::return_icon('test-quiz.png',null,array(),ICON_SIZE_MEDIUM);
 // Exercise name.
-$html .= Display::page_header($objExercise->name.' '.$edit_link);
+$html .= Display::page_header($iconExercise.$objExercise->name.' '.$edit_link);
 
 //Exercise description
 if (!empty($objExercise->description)) {
@@ -109,7 +109,7 @@ if (!empty($attempt_list)) {
 // 2. Exercise button
 // Notice we not add there the lp_item_view_id because is not already generated
 $exercise_url = api_get_path(WEB_CODE_PATH).'exercice/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.$extra_params;
-$exercise_url_button = Display::url($label, $exercise_url, array('class'=>'btn btn-primary btn-large'));
+$exercise_url_button = Display::url($label, $exercise_url, array('class'=>'btn btn-success btn-large'));
 
 //3. Checking visibility of the exercise (overwrites the exercise button)
 $visible_return = $objExercise->is_visible(
@@ -276,14 +276,14 @@ if (!empty($exercise_url_button)) {
     $html .= Display::div(
         Display::div(
             $exercise_url_button,
-            array('class' => 'exercise_overview_options span12')
+            array('class' => 'exercise_overview_options col-md-12')
         ),
         array('class' => ' row')
     );
 }
 
 $html .= $table_content;
-
+$html.= '</div>';
 echo $html;
 
 if ($origin != 'learnpath') {

BIN
main/img/icons/128/graduation.png


BIN
main/img/icons/128/search_graduation.png


BIN
main/img/icons/16/search_graduation.png


BIN
main/img/icons/32/graduation.png


BIN
main/img/icons/32/search_graduation.png


BIN
main/img/icons/32/test-quiz.png


BIN
main/img/icons/48/graduation.png


BIN
main/img/icons/48/search_graduation.png


BIN
main/img/icons/64/graduation.png


BIN
main/img/icons/64/search_graduation.png


+ 303 - 0
main/img/icons/svg/graduation.svg

@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg7262"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="graduation.svg">
+  <defs
+     id="defs7264">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10900"
+       id="linearGradient10995"
+       gradientUnits="userSpaceOnUse"
+       x1="531.47705"
+       y1="501.22318"
+       x2="531.93408"
+       y2="483.23868"
+       gradientTransform="matrix(5.8181818,0,0,5.8181818,-3022.2069,-1860.7333)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10900">
+      <stop
+         style="stop-color:#ececec;stop-opacity:1"
+         offset="0"
+         id="stop10902" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop10904" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10714"
+       id="linearGradient10997"
+       gradientUnits="userSpaceOnUse"
+       x1="614.15558"
+       y1="679.23553"
+       x2="608.3526"
+       y2="669.37897" />
+    <linearGradient
+       id="linearGradient10714">
+      <stop
+         id="stop10716"
+         offset="0"
+         style="stop-color:#ff6600;stop-opacity:1;" />
+      <stop
+         id="stop10718"
+         offset="1"
+         style="stop-color:#ffcc00;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter14456">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.35991578"
+         id="feGaussianBlur14458" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14440"
+       id="linearGradient10999"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1060776,0,0,1.1060776,-17.332073,184.60948)"
+       x1="481.19531"
+       y1="215.96338"
+       x2="495.85181"
+       y2="224.939" />
+    <linearGradient
+       id="linearGradient14440">
+      <stop
+         id="stop14442"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.37668341"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop14444" />
+      <stop
+         id="stop14446"
+         style="stop-color:#ff6600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.9953669"
+     inkscape:cx="48.731514"
+     inkscape:cy="35.585045"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7267">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36219)">
+    <g
+       id="g7974">
+      <rect
+         style="opacity:0;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect10964"
+         width="128"
+         height="128"
+         x="4.9412945e-05"
+         y="924.36218"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <rect
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none"
+         id="rect10966"
+         width="116.26165"
+         height="126.28612"
+         x="8.5728474"
+         y="925.21906"
+         ry="6.7500777"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <rect
+         ry="6.3000722"
+         y="929.42859"
+         x="15.179027"
+         height="117.86704"
+         width="105.13106"
+         id="rect10968"
+         style="opacity:1;fill:url(#linearGradient10995);fill-opacity:1;stroke:none"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <rect
+         style="opacity:1;fill:#37abc8;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect10970"
+         width="20.205778"
+         height="68.916138"
+         x="5.0515409"
+         y="955.93073"
+         ry="2.3310788"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <g
+         id="g10972"
+         style="opacity:1;fill:#006680;fill-opacity:1"
+         transform="matrix(0.8972544,0,0,0.9094539,-214.63323,732.44904)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           ry="2.606221"
+           y="252.67268"
+           x="241.59181"
+           height="10.061275"
+           width="20.849871"
+           id="rect10974"
+           style="fill:#006680;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#006680;fill-opacity:1;stroke:none"
+           id="rect10976"
+           width="20.849871"
+           height="10.061275"
+           x="241.59181"
+           y="277.88647"
+           ry="2.606221" />
+        <rect
+           ry="2.606221"
+           y="302.85785"
+           x="241.22815"
+           height="10.061275"
+           width="20.849871"
+           id="rect10978"
+           style="fill:#006680;fill-opacity:1;stroke:none" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path10980"
+         d="m 50.928838,982.73587 24.113978,6.40024 -21.989585,57.15429 -7.906793,-14.5449 -16.204683,8.138 z"
+         style="opacity:1;fill:#0088aa;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <path
+         style="opacity:1;fill:#006680;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 56.754642,987.54984 24.180887,-7.77472 27.515341,55.73358 -17.722119,-7.0623 -6.461847,14.8306 z"
+         id="path10982"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <path
+         sodipodi:type="star"
+         style="opacity:1;fill:url(#linearGradient10997);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10984"
+         sodipodi:sides="10"
+         sodipodi:cx="611.72095"
+         sodipodi:cy="675.80402"
+         sodipodi:r1="4.6886344"
+         sodipodi:r2="3.8672132"
+         sodipodi:arg1="0.9167136"
+         sodipodi:arg2="1.1980476"
+         inkscape:flatsided="false"
+         inkscape:rounded="3.22517e-09"
+         inkscape:randomized="0"
+         d="m 614.57366,679.52495 -1.44436,-0.11928 -1.28757,1.08542 -1.0984,-0.94547 -1.67966,0.12132 -0.33289,-1.41053 -1.43018,-0.88913 0.55977,-1.33682 -0.63442,-1.55996 1.23862,-0.75247 0.40366,-1.63494 1.44437,0.11928 1.28756,-1.08543 1.09841,0.94547 1.67966,-0.12132 0.33289,1.41053 1.43018,0.88914 -0.55978,1.33681 0.63443,1.55996 -1.23863,0.75248 z"
+         transform="matrix(8.3710714,0.03264,-0.0322432,8.4740934,-5031.9147,-4773.6794)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <ellipse
+         style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="ellipse10986"
+         cx="70.757469"
+         cy="972.8446"
+         transform="matrix(0.9999924,0.00389911,-0.00380488,0.99999276,0,0)"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         rx="28.024828"
+         ry="28.369715" />
+      <g
+         transform="matrix(2.3890956,0,0,2.4184979,-1184.0457,-62.509097)"
+         id="g10989"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/graduation.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <path
+           sodipodi:type="star"
+           style="opacity:0.82824426;fill:#999999;fill-opacity:1;stroke:none;filter:url(#filter14456)"
+           id="path10991"
+           sodipodi:sides="5"
+           sodipodi:cx="489.24722"
+           sodipodi:cy="220.33833"
+           sodipodi:r1="8.5600176"
+           sodipodi:r2="4.7080097"
+           sodipodi:arg1="0.97459719"
+           sodipodi:arg2="1.6029157"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 494.05368,227.42154 -4.95765,-2.37763 -5.10006,2.05447 0.72926,-5.44973 -3.52992,-4.21558 5.40836,-0.9905 2.91845,-4.65984 2.61329,4.83758 5.33362,1.33564 -3.79325,3.98028 z"
+           inkscape:transform-center-x="-0.095698614"
+           inkscape:transform-center-y="-0.83514744"
+           transform="matrix(1.1264964,0,0,1.1344032,-27.229312,178.80157)" />
+        <path
+           inkscape:transform-center-y="-0.81428571"
+           inkscape:transform-center-x="-0.093971212"
+           d="m 529.12961,436.15535 -5.48355,-2.62984 -5.64106,2.2724 0.80662,-6.02783 -3.90437,-4.66276 5.98207,-1.09557 3.22803,-5.15414 2.8905,5.35073 5.8994,1.47733 -4.19563,4.4025 z"
+           inkscape:randomized="0"
+           inkscape:rounded="0"
+           inkscape:flatsided="false"
+           sodipodi:arg2="1.6029157"
+           sodipodi:arg1="0.97459719"
+           sodipodi:r2="5.2074242"
+           sodipodi:r1="9.4680433"
+           sodipodi:cy="428.32077"
+           sodipodi:cx="523.81329"
+           sodipodi:sides="5"
+           id="path10993"
+           style="fill:url(#linearGradient10999);fill-opacity:1;stroke:#f4a800;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:type="star" />
+      </g>
+    </g>
+  </g>
+</svg>

+ 291 - 0
main/img/icons/svg/search_graduation.svg

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   id="svg8030"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="search_graduation.svg">
+  <defs
+     id="defs8032">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12278"
+       id="linearGradient11339"
+       gradientUnits="userSpaceOnUse"
+       x1="-127.06706"
+       y1="420.66183"
+       x2="-121.2757"
+       y2="420.66183"
+       gradientTransform="matrix(0.52682361,-0.51935165,0.51393868,0.53210552,384.63568,206.11248)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient12278">
+      <stop
+         style="stop-color:#241c1c;stop-opacity:1;"
+         offset="0"
+         id="stop12280" />
+      <stop
+         style="stop-color:#803300;stop-opacity:1"
+         offset="1"
+         id="stop12282" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11368"
+       id="linearGradient11374"
+       x1="520.02179"
+       y1="488.14825"
+       x2="541.09741"
+       y2="488.45523"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0417013,0,0,1.0417013,-21.720254,-20.871757)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11368">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop11370" />
+      <stop
+         style="stop-color:#afdde9;stop-opacity:1"
+         offset="1"
+         id="stop11372" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10714"
+       id="linearGradient10890"
+       x1="614.15558"
+       y1="679.23553"
+       x2="608.3526"
+       y2="669.37897"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient10714">
+      <stop
+         id="stop10716"
+         offset="0"
+         style="stop-color:#ff6600;stop-opacity:1;" />
+      <stop
+         id="stop10718"
+         offset="1"
+         style="stop-color:#ffcc00;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter14456">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.35991578"
+         id="feGaussianBlur14458" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14440"
+       id="linearGradient10322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1060776,0,0,1.1060776,-17.332073,184.60948)"
+       x1="481.19531"
+       y1="215.96338"
+       x2="495.85181"
+       y2="224.939" />
+    <linearGradient
+       id="linearGradient14440">
+      <stop
+         id="stop14442"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.37668341"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop14444" />
+      <stop
+         id="stop14446"
+         style="stop-color:#ff6600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70546875"
+     inkscape:cx="18.499446"
+     inkscape:cy="236.50055"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8035">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.3622)">
+    <g
+       id="g11377"
+       transform="matrix(5.8181818,0,0,5.8181818,-3024.2482,-1860.9883)"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/16/search_graduation.png"
+       inkscape:export-xdpi="65.454544"
+       inkscape:export-ydpi="65.454544">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         y="478.73212"
+         x="519.79266"
+         height="22"
+         width="22"
+         id="rect10263"
+         style="opacity:0;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         sodipodi:nodetypes="sssssssss"
+         inkscape:connector-curvature="0"
+         id="rect11333"
+         d="m 533.70401,494.69336 1.20032,-1.26843 c 0.57681,-0.60959 0.87088,-1.15941 1.48515,-0.58759 l 4.52537,4.21258 c 0.61426,0.57181 0.57125,1.5639 -0.0263,2.15305 l -0.89348,0.88082 c -0.59764,0.58917 -1.51689,0.54569 -2.13115,-0.0262 l -4.52537,-4.21259 c -0.61427,-0.5718 -0.21129,-0.54219 0.36554,-1.15173 z"
+         style="opacity:0.95999995;fill:url(#linearGradient11339);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         id="circle11335"
+         d="m 529.56962,479.16317 a 8.7164178,8.8060145 0 0 0 -8.7161,8.80562 8.7164178,8.8060145 0 0 0 8.7161,8.80564 8.7164178,8.8060145 0 0 0 8.71814,-8.80564 8.7164178,8.8060145 0 0 0 -8.71814,-8.80562 z m 0,1.52593 a 7.2053313,7.2793955 0 0 1 7.20646,7.27969 7.2053313,7.2793955 0 0 1 -7.20646,7.2797 7.2053313,7.2793955 0 0 1 -7.20442,-7.2797 7.2053313,7.2793955 0 0 1 7.20442,-7.27969 z"
+         style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
+      <circle
+         r="7.299984"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         cy="487.95267"
+         cx="529.52545"
+         id="path11366"
+         style="opacity:1;fill:url(#linearGradient11374);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 527.47684,489.68557 2.7821,0.73841 -2.53702,6.59408 -0.91221,-1.67809 -1.86959,0.93889 z"
+         id="path10749"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="rect10621"
+         d="m 528.14897,490.24098 2.78982,-0.89701 3.17455,6.43016 -2.04466,-0.81479 -0.74553,1.71105 z"
+         style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         transform="matrix(1.3326199,0.00519607,-0.0051329,1.3490205,-282.3276,-427.99479)"
+         d="m 614.57366,679.52495 -1.44436,-0.11928 -1.28757,1.08542 -1.0984,-0.94547 -1.67966,0.12132 -0.33289,-1.41053 -1.43018,-0.88913 0.55977,-1.33682 -0.63442,-1.55996 1.23862,-0.75247 0.40366,-1.63494 1.44437,0.11928 1.28756,-1.08543 1.09841,0.94547 1.67966,-0.12132 0.33289,1.41053 1.43018,0.88914 -0.55978,1.33681 0.63443,1.55996 -1.23863,0.75248 z"
+         inkscape:randomized="0"
+         inkscape:rounded="3.22517e-09"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.1980476"
+         sodipodi:arg1="0.9167136"
+         sodipodi:r2="3.8672132"
+         sodipodi:r1="4.6886344"
+         sodipodi:cy="675.80402"
+         sodipodi:cx="611.72095"
+         sodipodi:sides="10"
+         id="path10624"
+         style="opacity:1;fill:url(#linearGradient10890);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="star" />
+      <ellipse
+         ry="4.516274"
+         rx="4.4613695"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         transform="matrix(0.9999924,0.00389911,-0.00380488,0.99999276,0,0)"
+         cy="484.78928"
+         cx="531.24377"
+         id="path10626"
+         style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         style="opacity:1"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/var/www/chamilo/main/img/icons/22/search_graduation.png"
+         id="g10316"
+         transform="matrix(0.38032844,0,0,0.38500908,330.22803,321.99277)">
+        <path
+           transform="matrix(1.1264964,0,0,1.1344032,-27.229312,178.80157)"
+           inkscape:transform-center-y="-0.83514744"
+           inkscape:transform-center-x="-0.095698614"
+           d="m 494.05368,227.42154 -4.95765,-2.37763 -5.10006,2.05447 0.72926,-5.44973 -3.52992,-4.21558 5.40836,-0.9905 2.91845,-4.65984 2.61329,4.83758 5.33362,1.33564 -3.79325,3.98028 z"
+           inkscape:randomized="0"
+           inkscape:rounded="0"
+           inkscape:flatsided="false"
+           sodipodi:arg2="1.6029157"
+           sodipodi:arg1="0.97459719"
+           sodipodi:r2="4.7080097"
+           sodipodi:r1="8.5600176"
+           sodipodi:cy="220.33833"
+           sodipodi:cx="489.24722"
+           sodipodi:sides="5"
+           id="path10318"
+           style="opacity:0.82824426;fill:#999999;fill-opacity:1;stroke:none;filter:url(#filter14456)"
+           sodipodi:type="star" />
+        <path
+           sodipodi:type="star"
+           style="fill:url(#linearGradient10322);fill-opacity:1;stroke:#f4a800;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path10320"
+           sodipodi:sides="5"
+           sodipodi:cx="523.81329"
+           sodipodi:cy="428.32077"
+           sodipodi:r1="9.4680433"
+           sodipodi:r2="5.2074242"
+           sodipodi:arg1="0.97459719"
+           sodipodi:arg2="1.6029157"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 529.12961,436.15535 -5.48355,-2.62984 -5.64106,2.2724 0.80662,-6.02783 -3.90437,-4.66276 5.98207,-1.09557 3.22803,-5.15414 2.8905,5.35073 5.8994,1.47733 -4.19563,4.4025 z"
+           inkscape:transform-center-x="-0.093971212"
+           inkscape:transform-center-y="-0.81428571" />
+      </g>
+    </g>
+  </g>
+</svg>

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

@@ -302,14 +302,14 @@ HTML;
                         if ($show_comment) {
                             if (empty($comment)) {
                                 $s .= '<div id="answer' . $questionId . $numAnswer . '" '
-                                    . 'class="exercise-unique-answer-image col-xs-6" style="text-align: center">';
+                                    . 'class="exercise-unique-answer-image" style="text-align: center">';
                             } else {
                                 $s .= '<div id="answer' . $questionId . $numAnswer . '" '
                                     . 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">';
                             }
                         } else {
                             $s .= '<div id="answer' . $questionId . $numAnswer . '" '
-                                . 'class="exercise-unique-answer-image col-xs-6 col-md-4" style="text-align: center">';
+                                . 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">';
                         }
                     }
 
@@ -654,6 +654,7 @@ HTML;
 
                     if (!empty($correct_answer_list) && !empty($student_answer_list)) {
                         $answer = "";
+
                         $i = 0;
                         foreach ($student_answer_list as $student_item) {
                             // remove surronding brackets
@@ -709,7 +710,8 @@ HTML;
                                 $attributes
                             ), $answer);*/
                     }
-                    $s .= $answer;
+                    $html = '<div class="fill_blanks col-md-12">'.$answer.'</div>';
+                    $s .= $html ;
 
                 } elseif ($answerType == CALCULATED_ANSWER) {
                     /*
@@ -862,11 +864,11 @@ HTML;
                         $s .= '<tr><td width="45%" valign="top">';
                         $parsed_answer = $answer;
                         //left part questions
-                        $s .= ' <span style="float:left; width:8%;"><b>' . $lines_count . '</b>.&nbsp;</span>
-                                <span style="float:left; width:92%;">' . $parsed_answer . '</span></td>';
+                        $s .= '<p class="indent">' . $lines_count . '.&nbsp;' . $parsed_answer . '</p></td>';
                         //middle part (matches selects)
 
-                        $s .= '<td width="10%" valign="top" align="center">&nbsp;&nbsp;
+                        $s .= '<td width="10%" valign="top" align="center" >
+                                <div class="select-matching">
                                 <select name="choice[' . $questionId . '][' . $numAnswer . ']">';
 
                         // fills the list-box
@@ -890,11 +892,10 @@ HTML;
 
                         }  // end foreach()
 
-                        $s .= '</select></td>';
-                        $s .= '<td width="45%" valign="top" >';
+                        $s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>';
+                        $s .= '<td width="40%" valign="top" >';
                         if (isset($select_items[$lines_count])) {
-                            $s .= '<span style="float:left; width:5%;"><b>' . $select_items[$lines_count]['letter'] . '.</b></span>' .
-                                '<span style="float:left; width:95%;">' . $select_items[$lines_count]['answer'] . '</span>';
+                            $s .= '<div class="text-right"><p class="indent">' . $select_items[$lines_count]['letter'].'.&nbsp; '. $select_items[$lines_count]['answer'].'</p></div>';
                         } else {
                             $s .= '&nbsp;';
                         }