Browse Source

Merge pull request #824 from aragonc/bootstrap

Bootstrap cambios 16
Julio 9 years ago
parent
commit
ceeb962a31
51 changed files with 2732 additions and 123 deletions
  1. 17 41
      app/Resources/public/css/base.css
  2. 141 0
      app/Resources/public/css/themes/Academica/default.css
  3. BIN
      app/Resources/public/css/themes/Academica/images/background.png
  4. BIN
      app/Resources/public/css/themes/Academica/images/header-logo.png
  5. 746 0
      app/Resources/public/css/themes/Academica/svg/background.svg
  6. 1 1
      app/Resources/public/css/themes/beach/default.css
  7. 141 0
      app/Resources/public/css/themes/blue_lagoon/default.css
  8. BIN
      app/Resources/public/css/themes/blue_lagoon/images/bg-blue.png
  9. BIN
      app/Resources/public/css/themes/blue_lagoon/images/header-logo.png
  10. 746 0
      app/Resources/public/css/themes/blue_lagoon/svg/background.svg
  11. 3 3
      app/Resources/public/css/themes/chamilo_blue/default.css
  12. 1 1
      app/Resources/public/css/themes/chamilo_green/default.css
  13. 1 1
      app/Resources/public/css/themes/chamilo_orange/default.css
  14. 1 1
      app/Resources/public/css/themes/chamilo_red/default.css
  15. 8 7
      main/admin/course_list.php
  16. 1 1
      main/admin/index.php
  17. 2 2
      main/admin/settings.php
  18. 19 10
      main/attendance/attendance_calendar.php
  19. 17 16
      main/attendance/attendance_sheet.php
  20. 2 2
      main/attendance/index.php
  21. 16 12
      main/auth/my_progress.php
  22. BIN
      main/img/icons/128/crons.png
  23. BIN
      main/img/icons/128/lp_calendar_event.png
  24. BIN
      main/img/icons/128/skill-badges.png
  25. BIN
      main/img/icons/16/lock-closed.png
  26. BIN
      main/img/icons/22/lock-closed.png
  27. BIN
      main/img/icons/22/lock-open.png
  28. BIN
      main/img/icons/22/lp_calendar_event.png
  29. BIN
      main/img/icons/32/cas.png
  30. BIN
      main/img/icons/32/crons.png
  31. BIN
      main/img/icons/32/lock-closed.png
  32. BIN
      main/img/icons/32/lock-open.png
  33. BIN
      main/img/icons/32/lp_calendar_event.png
  34. BIN
      main/img/icons/32/next.png
  35. BIN
      main/img/icons/32/previous.png
  36. BIN
      main/img/icons/32/skill-badges.png
  37. BIN
      main/img/icons/48/crons.png
  38. BIN
      main/img/icons/48/lp_calendar_event.png
  39. BIN
      main/img/icons/48/skill-badges.png
  40. BIN
      main/img/icons/64/crons.png
  41. BIN
      main/img/icons/64/lp_calendar_event.png
  42. BIN
      main/img/icons/64/skill-badges.png
  43. 205 0
      main/img/icons/svg/crons.svg
  44. 105 0
      main/img/icons/svg/lock-closed.svg
  45. 114 0
      main/img/icons/svg/lock-open.svg
  46. 8 8
      main/img/icons/svg/lock.svg
  47. 413 0
      main/img/icons/svg/skill-badges.svg
  48. 4 4
      main/inc/lib/dashboard.lib.php
  49. 3 0
      main/install/index.php
  50. 5 5
      main/install/install.lib.php
  51. 12 8
      main/survey/survey.php

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

@@ -1039,9 +1039,7 @@ button.next.disabled {
     padding-top: 10px;
     text-shadow: gray 3px 3px 2px;
 }
-
 /* ATTENDANCE */
-
 div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.row div.formw  {
     float: left;
     display:inline;
@@ -1059,23 +1057,26 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
 .attendance-calendar-row {
     padding:5px;
 }
-.attendance-faults-bar {
-    width:90%;
-    background-color:none;
-    padding:2px;
-    font-size:120%;
-    font-weight: bold;
-    padding:5px;
+.attendance-calendar-table .check{
+    text-align: center;
 }
-
-.attendance-users-table td {
-    height:66px;
+.date-attendance{
+    color: #666;
+    text-align: center;
+    font-size: 12px;
+    width: 150px;
+    margin: auto;
 }
-
-.attendance-calendar-table td {
-    height:66px;
+.date-attendance .blue{
+    color: #2E75A3;
+}
+.date-attendance .grey{
+    color: #666;
+}
+.tableFloatingHeaderOriginal{
+    font-size: 12px;
+    height: 60px;
 }
-
 /**********************************************
  *  MESSAGE TOOL                           *
  **********************************************/
@@ -2924,17 +2925,6 @@ form .formw .freeze {
     color:#999;
     font-size: 11px;
 }
-
-/* Stick table header */
-
-.tableWithFloatingHeader th {
-    padding: 5px 5px 0px 5px;
-}
-.tableFloatingHeaderOriginal th, .tableWithFloatingHeader th{
-    height:80px;
-}
-
-/* jsPlumb */
 /* ****************************************************
                      CSS SKILL
  **************************************************** */
@@ -3684,20 +3674,6 @@ a:active{
     width: 800px;
 }
 
-#my_timeline #next {
-    background: url("../../main/img/action_next.png") no-repeat transparent;
-    height: 32px;
-    width: 32px;
-    float:right;
-}
-
-#my_timeline #prev {
-    background: url("../../main/img/action_prev.png") no-repeat transparent;
-    height: 32px;
-    width: 32px;
-    float:left;
-}
-
 #dates .selected {
     font-size: 22px;
     font-weight: bold;

+ 141 - 0
app/Resources/public/css/themes/Academica/default.css

@@ -0,0 +1,141 @@
+/*!
+ * CSS ACADEMICA - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * OpenClipArt ilustration (https://openclipart.org/detail/220955/pirate-ship-silhouette)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../../chamilo/fonts/OpenSans.woff2) format('woff2'), url(fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #185B8E;
+}
+a:hover{
+  color: #3F9BC7;
+}
+header{
+  background: url("images/background.png") repeat-x center -50px;
+}
+.navbar-default {
+  background: #2e75a3;
+  border-color: #0099c0;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+  color: #9DD0F1;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #2E75A3;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+  color: #ededed;
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+  color: #ededed;
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle {
+  border-color: #0099c0;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #ffffff;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #afdde9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+footer{
+  background: #2E75A3;
+  color: #9DD0F1;
+  border-top: 2px solid #0099C0;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}

BIN
app/Resources/public/css/themes/Academica/images/background.png


BIN
app/Resources/public/css/themes/Academica/images/header-logo.png


File diff suppressed because it is too large
+ 746 - 0
app/Resources/public/css/themes/Academica/svg/background.svg


+ 1 - 1
app/Resources/public/css/themes/beach/default.css

@@ -1,6 +1,6 @@
 /*!
  * CSS BEACH - Default v. 1.0
- * Copyright 2015 Alex Aragón (aragonc@beeznest.com)
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
  * Licensed GPL
  * Based on Bootstrap
 */

+ 141 - 0
app/Resources/public/css/themes/blue_lagoon/default.css

@@ -0,0 +1,141 @@
+/*!
+ * CSS BLUE LAGOON - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * OpenClipArt ilustration (https://openclipart.org/detail/220955/pirate-ship-silhouette)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../../chamilo/fonts/OpenSans.woff2) format('woff2'), url(fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #185B8E;
+}
+a:hover{
+  color: #3F9BC7;
+}
+header{
+  background: url("images/bg-blue.png") repeat-x center -50px;
+}
+.navbar-default {
+  background: #2e75a3;
+  border-color: #0099c0;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+  color: #9DD0F1;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #2E75A3;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+  color: #ededed;
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+  color: #ededed;
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle {
+  border-color: #0099c0;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #ffffff;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #afdde9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+footer{
+  background: #2E75A3;
+  color: #9DD0F1;
+  border-top: 2px solid #0099C0;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}

BIN
app/Resources/public/css/themes/blue_lagoon/images/bg-blue.png


BIN
app/Resources/public/css/themes/blue_lagoon/images/header-logo.png


File diff suppressed because it is too large
+ 746 - 0
app/Resources/public/css/themes/blue_lagoon/svg/background.svg


+ 3 - 3
app/Resources/public/css/themes/chamilo_blue/default.css

@@ -1,7 +1,7 @@
 /*!
- * CSS RED - v. 2.0
- * Copyright 2015 Alex Aragón (aragonc@beeznest.com)
- * OpenClipArt ilustration (https://openclipart.org/detail/163771/little-red-riding-hood)
+ * CSS BLUE - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * OpenClipArt ilustration (https://openclipart.org/detail/181538/old-fashioned-fishing-boat)
  * Licensed GPL
  * Based on Bootstrap
 */

+ 1 - 1
app/Resources/public/css/themes/chamilo_green/default.css

@@ -1,6 +1,6 @@
 /*!
  * CSS GREEN - v. 2.0
- * Copyright 2015 Alex Aragón (aragonc@beeznest.com)
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
  * Licensed GPL
  * Based on Bootstrap
 */

+ 1 - 1
app/Resources/public/css/themes/chamilo_orange/default.css

@@ -1,6 +1,6 @@
 /*!
  * CSS ORANGE - v. 2.0
- * Copyright 2015 Alex Aragón (aragonc@beeznest.com)
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
  * Licensed GPL
  * Based on Bootstrap
 */

+ 1 - 1
app/Resources/public/css/themes/chamilo_red/default.css

@@ -1,6 +1,6 @@
 /*!
  * CSS RED - v. 2.0
- * Copyright 2015 Alex Aragón (aragonc@beeznest.com)
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
  * OpenClipArt ilustration (https://openclipart.org/detail/163771/little-red-riding-hood)
  * Licensed GPL
  * Based on Bootstrap

+ 8 - 7
main/admin/course_list.php

@@ -391,20 +391,21 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     );
     $courseListUrl = api_get_self();
     $actions .= '<div class="row">';
+    $actions .= '<div class="col-md-2">';
+    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+    if (api_get_setting('course_validation') == 'true') {
+        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
+    }
+    $actions .= '</div>';
     $actions .= '<div class="col-md-4">';
     $actions .= $form->return_form();
     $actions .= '</div>';
     $actions .= '<div class="col-md-4">';
     $actions .= $sessionFilter->return_form();
     $actions .= '</div>';
-    $actions .= '<div class="col-md-4">';
-
-    $actions .= $advanced;
+    $actions .= '<div class="col-md-2">';
     $actions .= '<div class="pull-right">';
-    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
-    if (api_get_setting('course_validation') == 'true') {
-        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
-    }
+    $actions .= $advanced;
     $actions .= '</div>';
     $actions .= '</div>';
     $actions .= '</div>';

+ 1 - 1
main/admin/index.php

@@ -364,7 +364,7 @@ if (api_is_platform_admin()) {
     // Skills
     if (api_get_setting('allow_skills_tool') == 'true') {
         $blocks['skills']['icon'] = Display::return_icon(
-            'logo.png',
+            'skill-badges.png',
             get_lang('Skills'),
             array(),
             ICON_SIZE_MEDIUM,

+ 2 - 2
main/admin/settings.php

@@ -398,7 +398,7 @@ $action_images['tools'] = 'tools.png';
 $action_images['user'] = 'user.png';
 $action_images['gradebook'] = 'gradebook.png';
 $action_images['ldap'] = 'ldap.png';
-$action_images['cas'] = 'user_access.png';
+$action_images['cas'] = 'cas.png';
 $action_images['security'] = 'security.png';
 $action_images['languages'] = 'languages.png';
 $action_images['tuning'] = 'tuning.png';
@@ -415,7 +415,7 @@ $action_images['templates'] = 'template.png';
 $action_images['plugins'] = 'plugins.png';
 $action_images['shibboleth'] = 'shibboleth.png';
 $action_images['facebook'] = 'facebook.png';
-$action_images['crons'] = 'platform_event.png';
+$action_images['crons'] = 'crons.png';
 
 $action_array = array();
 $resultcategories = array();

+ 19 - 10
main/attendance/attendance_calendar.php

@@ -63,7 +63,14 @@ if (isset($action) && $action == 'calendar_add') {
         ''
     );
     $form->addElement('header', get_lang('AddADateTime'));
-    $form->addElement('date_time_picker', 'date_time');
+    //$form->addElement('date_time_picker', 'date_time');
+    
+    $form->addDateTimePicker(
+            'date_time',
+            array(get_lang('StartDate')),
+            array('id' => 'date_time')
+        );
+    
     $defaults['date_time'] = date('Y-m-d H:i', api_strtotime(api_get_local_time()));
 
     $form->addElement(
@@ -112,11 +119,11 @@ if (isset($action) && $action == 'calendar_add') {
     }
 
     echo Display::page_subheader(get_lang('CalendarList'));
-    echo '<div class="attendance-calendar-list">';
+    echo '<ul class="list-group">';
     if (!empty($attendance_calendar)) {
         foreach ($attendance_calendar as $calendar) {
 
-            echo '<div class="attendance-calendar-row">';
+            echo '<li class="list-group-item">';
             if ((isset($action) && $action == 'calendar_edit') &&
                 (isset($calendar_id) && $calendar_id == $calendar['id'])
             ) {
@@ -128,8 +135,8 @@ if (isset($action) && $action == 'calendar_add') {
                     'index.php?action=calendar_edit&attendance_id=' . $attendance_id . '&calendar_id=' . $calendar_id . '&' . api_get_cidreq() . $param_gradebook,
                     ''
                 );
-
-                $form->addElement('date_time_picker', 'date_time', '', array('form_name'=>'attendance_calendar_edit'), 5);
+                $form->addDateTimePicker('date_time', array(get_lang('Date')), array('form_name'=>'attendance_calendar_edit'), 5);
+                //$form->addElement('date_time_picker', 'date_time', '', array('form_name'=>'attendance_calendar_edit'), 5);
                 $defaults['date_time'] = $calendar['date_time'];
                 $form->addButtonSave(get_lang('Save'));
                 $form->addButtonCancel(get_lang('Cancel'), 'cancel');
@@ -139,7 +146,9 @@ if (isset($action) && $action == 'calendar_add') {
             } else {
                 echo Display::return_icon(
                     'lp_calendar_event.png',
-                    get_lang('DateTime')
+                    get_lang('DateTime'),
+                        null,
+                        ICON_SIZE_MEDIUM
                 ).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time'])- 3) .'&nbsp;';
 
                 if (isset($calendar['groups']) && !empty($calendar['groups'])) {
@@ -150,19 +159,19 @@ if (isset($action) && $action == 'calendar_add') {
 
                 if (!$is_locked_attendance || api_is_platform_admin()) {
                     if (api_is_allowed_to_edit()) {
-                        echo '<span style="margin-left:20px;">';
+                        echo '<div class="pull-right">';
                         echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_edit&calendar_id='.intval($calendar['id']).'&attendance_id='.$attendance_id.$param_gradebook.'">'.
                             Display::return_icon('edit.png', get_lang('Edit'), array('style'=>'vertical-align:middle'), ICON_SIZE_SMALL).'</a>&nbsp;';
                         echo '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().$param_gradebook.'&action=calendar_delete&calendar_id='.intval($calendar['id']).'&attendance_id='.$attendance_id.'">'.
                             Display::return_icon('delete.png', get_lang('Delete'), array('style'=>'vertical-align:middle'), ICON_SIZE_SMALL).'</a>';
-                        echo '</span>';
+                        echo '</div>';
                     }
                 }
             }
-            echo '</div>';
+            echo '</li>';
         }
     } else {
         echo Display::return_message(get_lang('ThereAreNoRegisteredDatetimeYet'), 'warning');
     }
-    echo '</div>';
+    echo '</ul>';
 }

+ 17 - 16
main/attendance/attendance_sheet.php

@@ -194,7 +194,7 @@ if (api_is_allowed_to_edit(null, true) ||
                         floatingHeaderRow.css("width", $(this).css("width"));
                         floatingHeaderRow.css("visibility", "visible");
                         floatingHeaderRow.css("z-index", "1000");
-                        originalHeaderRow.css("height", "80px");
+                        originalHeaderRow.css("height", "64px");
                     } else {
                         floatingHeaderRow.css("visibility", "hidden");
                         floatingHeaderRow.css("top", "0px");
@@ -239,7 +239,7 @@ if (api_is_allowed_to_edit(null, true) ||
                             <th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
                         </tr>
                         <tr class="tableFloatingHeaderOriginal" >
-                            <th height="65px" width="10px"><?php echo '#';?></th>
+                            <th width="10px"><?php echo '#';?></th>
                             <th width="10px"><?php echo get_lang('Photo')?></th>
                             <th width="150px"><?php echo get_lang('LastName')?></th>
                             <th width="140px"><?php echo get_lang('FirstName')?></th>
@@ -287,23 +287,23 @@ if (api_is_allowed_to_edit(null, true) ||
                     foreach ($attendant_calendar as $calendar) {
                         $date = $calendar['date'];
                         $time = $calendar['time'];
-                        $datetime = $date.'<br />'.$time;
+                        $datetime = '<div class="grey">'. $date . ' - ' . $time . '</div>';
 
-                        $img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));
+                        $img_lock = Display::return_icon('lock-closed.png',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));
 
                         if (!empty($calendar['done_attendance'])){
-                            $datetime = '<font color="blue">'.$date.'<br />'.$time.'</font>';
+                            $datetime = '<div class="blue">' . $date . ' - ' . $time . '</div>';
                         }
                         $disabled_check = 'disabled = "true"';
                         $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
                         if ($next_attendance_calendar_id == $calendar['id']) {
                             $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
                             $disabled_check = '';
-                            $img_lock = Display::return_icon('unlock.gif',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
+                            $img_lock = Display::return_icon('lock-closed.png',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
                         }
 
-                        $result .= '<th width="800px">';
-                        $result .= '<center><div style="font-size:10px;width:125px;">'.$datetime.'&nbsp;';
+                        $result .= '<th>';
+                        $result .= '<div class="date-attendance">'.$datetime.'&nbsp;';
 
                         if (api_is_allowed_to_edit(null, true)) {
                             $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
@@ -311,7 +311,7 @@ if (api_is_allowed_to_edit(null, true) ||
 
                         if ($is_locked_attendance == false) {
                             if (api_is_allowed_to_edit(null, true)) {
-                                $result .= '<br /><input type="checkbox" class="checkbox_head_'.$calendar['id'].'" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked="checked" />'.$input_hidden.'</div></center></th>';
+                                $result .= '<input type="checkbox" class="checkbox_head_'.$calendar['id'].'" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked="checked" />'.$input_hidden.'</div></th>';
                             }
                         }
                     }
@@ -370,8 +370,8 @@ if (api_is_allowed_to_edit(null, true) ||
                             }
 
                             echo '<td style="'.$style_td.'" class="checkboxes_col_'.$calendar['id'].'">';
-                            echo '<div style="height:20px">';
-                            echo '<center>';
+                            echo '<div class="check">';
+                           
                             if (api_is_allowed_to_edit(null, true)) {
                                 if (!$is_locked_attendance || api_is_platform_admin()) {
                                     echo '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value="'.$user['user_id'].'" '.$disabled.' '.$checked.' />';
@@ -392,7 +392,7 @@ if (api_is_allowed_to_edit(null, true) ||
                                         break;
                                 }
                             }
-                            echo '</center>';
+                            
                             echo '</div>';
                             echo '</td>';
                         }
@@ -402,7 +402,7 @@ if (api_is_allowed_to_edit(null, true) ||
                             $calendarClass = "checkboxes_col_".$calendar['id'];
                         }
                         echo '<td class="'.$calendarClass.'">';
-                        echo '<div style="height:20px">';
+                        echo '<div>';
                         echo '<center>&nbsp;</center>
                         </div>
                         </td>';
@@ -413,15 +413,16 @@ if (api_is_allowed_to_edit(null, true) ||
                 echo '</tbody></table>';
                 echo '</div></div>';
                 ?>
-                <div class="clear"></div>
-                <div style="margin-top:20px;">
+               
+                <div class="row">
+                    <div class="col-md-12">
                 <?php if (!$is_locked_attendance || api_is_platform_admin()) {
                     if (api_is_allowed_to_edit(null, true)) {
                         ?>
                         <button type="submit" class="btn btn-primary"><?php echo get_lang('Save') ?></button>
                     <?php }
                 }
-                ?>
+                ?>  </div>
                 </div>
         </form>
     <?php

+ 2 - 2
main/attendance/index.php

@@ -106,7 +106,7 @@ $(function() {
 			$(".row_odd  td.checkboxes_col_"+calendar_id).css({"opacity":"1","background-color":"#F9F9F9",   "border-left":"none","border-right":"none"});
 			$(".row_even td.checkboxes_col_"+calendar_id).css({"opacity":"1","background-color":"#FFF", 	 "border-left":"none","border-right":"none"});
 			$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",true);
-			$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/lock.gif");
+			$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/icons/22/lock-closed.png");
 			$(this).attr("title","'.get_lang('DateUnLock').'");
 			$(this).attr("alt","'.get_lang('DateUnLock').'");
 			$(this).attr("class","img_lock");
@@ -134,7 +134,7 @@ $(function() {
 			});
 
 			$(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",false);
-			$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/unlock.gif");
+			$(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/icons/22/lock-open.png");
 			$(this).attr("title","'.get_lang('DateLock').'");
 			$(this).attr("alt","'.get_lang('DateLock').'");
 			$(this).attr("class","img_unlock");

+ 16 - 12
main/auth/my_progress.php

@@ -16,12 +16,15 @@ $nameTools = get_lang('MyProgress');
 api_block_anonymous_users();
 
 $htmlHeadXtra[] = api_get_js('jquery.timelinr-0.9.5.js');
-$htmlHeadXtra[] = '
-<script language="javascript">
+$htmlHeadXtra[] = "
+<script language='javascript'>
 $(function() {
-    $().timelinr();
+    $().timelinr({
+        containerDiv: '#my_timeline',
+        autoPlayPause: 2000
+    })
 });
-</script>';
+</script>";
 
 $user_id = api_get_user_id();
 $course_user_list = CourseManager::get_courses_list_by_user_id($user_id);
@@ -70,15 +73,16 @@ $content .= Tracking::show_course_detail(api_get_user_id(), $courseCode, $sessio
 
 if (!empty($dates)) {
     if (!empty($content)) {
-        $content .= '<br /><br />';
+        $content .= '';
     }
-    $content .= '<div class="row"><div class="col-md-12">'.Display::page_subheader(get_lang('Timeline')).'</div>';
-    $content .= '<div id="my_timeline">
-        <div class="actions">
-            <a href="#" id="prev"></a> <!-- optional -->
-            <a href="#" id="next"></a> <!-- optional -->
-        </div>
-    <ul id="dates">
+    $content .= '<div class="row"><div class="col-md-12">'.Display::page_subheader(get_lang('Timeline'));
+    $content .= '<div id="my_timeline">';
+    
+    $actionsLeft = '<a href="#" id="prev">' . Display::return_icon('previous.png',  get_lang('Previous'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsRight = '<a href="#" id="next">' . Display::return_icon('next.png',  get_lang('Next'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $content .= Display::toolbarAction('toolbar-linetime',array(0 => $actionsLeft, 1 => $actionsRight), 2, true);
+    
+    $content .= '<ul id="dates">
         '.$dates.'
     </ul>
     <ul id="issues">

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


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


BIN
main/img/icons/128/skill-badges.png


BIN
main/img/icons/16/lock-closed.png


BIN
main/img/icons/22/lock-closed.png


BIN
main/img/icons/22/lock-open.png


BIN
main/img/icons/22/lp_calendar_event.png


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


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


BIN
main/img/icons/32/lock-closed.png


BIN
main/img/icons/32/lock-open.png


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


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


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


BIN
main/img/icons/32/skill-badges.png


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


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


BIN
main/img/icons/48/skill-badges.png


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


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


BIN
main/img/icons/64/skill-badges.png


+ 205 - 0
main/img/icons/svg/crons.svg

@@ -0,0 +1,205 @@
+<?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="svg32939"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="crons.svg">
+  <defs
+     id="defs32941">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32781"
+       id="linearGradient32787"
+       x1="597.99707"
+       y1="693.13281"
+       x2="606.61993"
+       y2="675.46735"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32781">
+      <stop
+         style="stop-color:#1abc9c;stop-opacity:1;"
+         offset="0"
+         id="stop32783" />
+      <stop
+         style="stop-color:#aad400;stop-opacity:1"
+         offset="1"
+         id="stop32785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32789"
+       id="linearGradient32795"
+       x1="593.31183"
+       y1="688.82825"
+       x2="597.50305"
+       y2="690.36322"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32789">
+      <stop
+         style="stop-color:#34495e;stop-opacity:1;"
+         offset="0"
+         id="stop32791" />
+      <stop
+         style="stop-color:#003265;stop-opacity:1"
+         offset="1"
+         id="stop32793" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="62.394598"
+     inkscape:cy="39.232876"
+     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="metadata32944">
+    <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
+       transform="matrix(4,0,0,4,-2312.813,-1772.4474)"
+       id="g32890">
+      <rect
+         y="674.20239"
+         x="578.20325"
+         height="32"
+         width="32"
+         id="rect31979"
+         style="opacity:0;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         transform="matrix(1.0727838,0,0,1.0727838,-44.114099,-50.367571)"
+         id="g32875">
+        <path
+           style="fill:url(#linearGradient32787);fill-opacity:1"
+           inkscape:connector-curvature="0"
+           d="m 607.57911,684.82343 a 13.705569,13.705569 0 0 1 -25.13774,10.92998 13.705569,13.705569 0 0 1 25.13774,-10.92998 z"
+           id="path9672" />
+        <path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 606.2265,690.2822 a 11.216391,11.216391 0 0 1 -22.43278,0 11.216391,11.216391 0 1 1 22.43278,0 z"
+           id="path9674" />
+        <rect
+           style="fill:#999999;fill-opacity:1;stroke:none"
+           id="rect32813"
+           width="1.1676779"
+           height="1.3044418"
+           x="594.3205"
+           y="679.96271"
+           ry="0" />
+        <rect
+           ry="0"
+           y="683.09607"
+           x="601.14423"
+           height="1.3044418"
+           width="1.1676779"
+           id="rect32815"
+           style="fill:#999999;fill-opacity:1;stroke:none" />
+        <rect
+           ry="0"
+           y="695.82935"
+           x="601.6452"
+           height="1.3044418"
+           width="1.1676779"
+           id="rect32819"
+           style="fill:#999999;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#999999;fill-opacity:1;stroke:none"
+           id="rect32821"
+           width="1.1676779"
+           height="1.3044418"
+           x="594.3205"
+           y="698.57056"
+           ry="0" />
+        <rect
+           style="fill:#999999;fill-opacity:1;stroke:none"
+           id="rect32853"
+           width="1.1676779"
+           height="1.3044418"
+           x="587.5025"
+           y="683.09607"
+           ry="0" />
+        <rect
+           ry="0"
+           y="689.84772"
+           x="584.93158"
+           height="1.3044418"
+           width="1.1676779"
+           id="rect32855"
+           style="fill:#999999;fill-opacity:1;stroke:none" />
+        <path
+           style="fill:#008080"
+           inkscape:connector-curvature="0"
+           d="m 581.34351,689.61543 c -0.10313,2.1187 0.21934,4.11276 1.09053,6.10684 3.01814,6.97923 11.09087,10.21961 18.03259,7.22849 5.34658,-2.36795 8.44737,-7.727 8.2168,-13.21069 -0.25298,4.98515 -3.27899,9.72107 -8.2168,11.9644 -6.94186,2.9911 -15.01408,-0.24926 -18.03259,-7.2285 -0.69358,-1.49555 -1.02209,-3.24037 -1.09066,-4.86054 z"
+           id="path9676" />
+        <path
+           style="fill:#3498db"
+           inkscape:connector-curvature="0"
+           d="m 604.98082,690.36322 c 0,0.62313 -0.55833,1.24628 -1.24629,1.24628 l -7.47775,0 0,-2.49258 7.47775,0 c 0.68796,0 1.24629,0.49851 1.24629,1.2463 z"
+           id="path9678" />
+        <path
+           style="fill:#2c3e50"
+           inkscape:connector-curvature="0"
+           d="m 595.01049,681.63916 c -0.68796,0 -1.2463,0.55797 -1.2463,1.24628 l 0,4.98518 0,1.2463 2.49259,0 0,-1.2463 0,-4.98518 c 0,-0.68831 -0.55833,-1.24628 -1.24629,-1.24628 z"
+           id="path9680" />
+        <rect
+           style="fill:#c0392b"
+           height="1.2462924"
+           transform="matrix(0.7949345,-0.60669526,0.60669526,0.7949345,0,0)"
+           width="8.7240448"
+           x="44.209652"
+           y="909.17224"
+           id="rect9682"
+           inkscape:transform-center-x="4.5222803"
+           inkscape:transform-center-y="3.4514511" />
+        <path
+           style="fill:url(#linearGradient32795);fill-opacity:1"
+           inkscape:connector-curvature="0"
+           d="m 595.01049,687.87062 c -1.37717,0 -2.4926,1.12167 -2.4926,2.4926 0,1.37091 1.11543,2.49257 2.4926,2.49257 1.37715,0 2.49258,-1.12166 2.49258,-2.49257 0,-1.37093 -1.11543,-2.4926 -2.49258,-2.4926 z m 0,1.2463 c 0.68796,0 1.24629,0.49851 1.24629,1.2463 0,0.62313 -0.55833,1.24628 -1.24629,1.24628 -0.68796,0 -1.2463,-0.62315 -1.2463,-1.24628 0,-0.74779 0.55834,-1.2463 1.2463,-1.2463 z"
+           id="path9684" />
+      </g>
+    </g>
+  </g>
+</svg>

+ 105 - 0
main/img/icons/svg/lock-closed.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="128"
+   version="1.1"
+   width="128"
+   id="svg2"
+   inkscape:version="0.91 r"
+   sodipodi:docname="lock-closed.svg">
+  <metadata
+     id="metadata24">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="2.4583333"
+     inkscape:cx="51.94532"
+     inkscape:cy="55.244273"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g3354"
+     transform="matrix(5.3333333,0,0,5.3333333,0,-0.38351889)"
+     inkscape:export-filename="/var/www/chamilo/main/img/icons/16/lock-closed.png"
+     inkscape:export-xdpi="11.25"
+     inkscape:export-ydpi="11.25">
+    <g
+       id="g4"
+       transform="translate(0,-1028.8281)">
+      <path
+         style="fill:#f1c40f"
+         inkscape:connector-curvature="0"
+         id="path6"
+         d="m 5,1037.4 c -1.1046,0 -2,0.9 -2,2 l 0,1 0,6 0,1 c 0,1.1 0.8954,2 2,2 l 2,0 10,0 2,0 c 1.105,0 2,-0.9 2,-2 l 0,-7 0,-1 c 0,-1.1 -0.895,-2 -2,-2 l -2,0 -12,0 z" />
+      <path
+         style="fill:#f39c12"
+         inkscape:connector-curvature="0"
+         id="path8"
+         d="m 5,1040.4 c -1.1046,0 -2,0.9 -2,2 l 0,1 0,6 0,1 c 0,1.1 0.8954,2 2,2 l 2,0 10,0 2,0 c 1.105,0 2,-0.9 2,-2 l 0,-7 0,-1 c 0,-1.1 -0.895,-2 -2,-2 l -2,0 -12,0 z" />
+      <path
+         style="fill:#bdc3c7"
+         inkscape:connector-curvature="0"
+         id="path10"
+         d="m 12,1029.4 c -3.866,0 -7,3.1 -7,7 l 3,0 c 0,-2.2 1.7909,-4 4,-4 2.209,0 4,1.8 4,4 l 3,0 c 0,-3.9 -3.134,-7 -7,-7 z" />
+      <path
+         style="fill:#e67e22"
+         inkscape:connector-curvature="0"
+         id="path12"
+         transform="translate(0,1028.4)"
+         d="m 5,14 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z" />
+      <path
+         style="fill:#7f8c8d"
+         inkscape:connector-curvature="0"
+         id="path14"
+         d="m 5,1037.4 0,1 c 0,0.5 0.6716,1 1.5,1 0.8284,0 1.5,-0.5 1.5,-1 l 0,-1 c 0,0.5 -0.6716,1 -1.5,1 -0.8284,0 -1.5,-0.5 -1.5,-1 z" />
+      <path
+         style="fill:#7f8c8d"
+         inkscape:connector-curvature="0"
+         id="path16"
+         d="m 16,1037.4 0,1 c 0,0.5 0.672,1 1.5,1 0.828,0 1.5,-0.5 1.5,-1 l 0,-1 c 0,0.5 -0.672,1 -1.5,1 -0.828,0 -1.5,-0.5 -1.5,-1 z" />
+      <path
+         style="fill:#95a5a6"
+         inkscape:connector-curvature="0"
+         id="path18"
+         transform="translate(0,1028.4)"
+         d="m 12,2.4375 c -0.351,0 -0.699,0.0338 -1.031,0.0937 C 10.722,2.5758 10.482,2.6441 10.25,2.7188 10.033,2.7886 9.8271,2.8749 9.625,2.9688 9.519,3.018 9.4141,3.0696 9.3125,3.125 9.1806,3.1969 9.0612,3.2932 8.9375,3.375 8.8217,3.4515 8.7019,3.5092 8.5938,3.5938 8.4531,3.7035 8.3139,3.8149 8.1875,3.9375 8.1506,3.9737 8.1294,4.0253 8.0938,4.0625 7.9254,4.2369 7.7625,4.3981 7.625,4.5938 7.4848,4.7931 7.3546,5.0003 7.25,5.2188 7.246,5.2272 7.254,5.2415 7.25,5.25 7.1389,5.4859 7.0341,5.7459 6.9688,6 6.7158,6.5844 6.0264,7 5.2188,7 5.1588,7 5.1356,7.0018 5.0938,7 5.0833,6.9996 5.077,7.0014 5.0625,7 L 5,8 5,9 5,10 8,10 8,9 8,8 C 8,7.7239 8.0405,7.4479 8.0938,7.1875 8.4667,5.3648 10.067,4 12,4 c 2.209,0 4,1.7909 4,4 l 0,1 0,1 3,0 0,-1 0,-1 -0.062,-1 c -0.015,0.0014 -0.021,-4e-4 -0.032,0 L 18.781,7 C 17.974,7 17.284,6.5844 17.031,6 16.966,5.7459 16.861,5.4859 16.75,5.25 16.746,5.2415 16.754,5.2272 16.75,5.2188 16.645,5.0003 16.515,4.7931 16.375,4.5938 16.237,4.3981 16.075,4.2369 15.906,4.0625 15.87,4.0245 15.851,3.9744 15.812,3.9375 15.686,3.8149 15.547,3.7035 15.406,3.5938 15.302,3.5121 15.174,3.449 15.062,3.375 14.94,3.2941 14.818,3.1962 14.688,3.125 14.587,3.07 14.48,3.0176 14.375,2.9688 14.173,2.8749 13.967,2.7886 13.75,2.7188 13.518,2.6441 13.278,2.5758 13.031,2.5312 12.699,2.4713 12.351,2.4375 12,2.4375 Z" />
+    </g>
+    <rect
+       y="0.071909942"
+       x="0"
+       height="24"
+       width="24"
+       id="rect3352"
+       style="opacity:0;fill:#ffccaa;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

+ 114 - 0
main/img/icons/svg/lock-open.svg

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="128"
+   version="1.1"
+   width="128"
+   id="svg2"
+   inkscape:version="0.91 r"
+   sodipodi:docname="lock-open.svg">
+  <metadata
+     id="metadata24">
+    <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>
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="3.4766083"
+     inkscape:cx="121.05188"
+     inkscape:cy="52.903736"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g4178"
+     transform="scale(5.3333333,5.3333333)"
+     inkscape:export-filename="/var/www/chamilo/main/img/icons/22/lock-open.png"
+     inkscape:export-xdpi="15.46875"
+     inkscape:export-ydpi="15.46875">
+    <rect
+       y="-3.4724426e-08"
+       x="3.1274987e-09"
+       height="24"
+       width="24"
+       id="rect3354"
+       style="opacity:0.54160055;fill:#ffccaa;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g4"
+       transform="translate(0,-1028.9)">
+      <path
+         style="fill:#f1c40f"
+         inkscape:connector-curvature="0"
+         id="path6"
+         d="m 5,1037.4 c -1.1046,0 -2,0.9 -2,2 l 0,1 0,6 0,1 c 0,1.1 0.8954,2 2,2 l 2,0 10,0 2,0 c 1.105,0 2,-0.9 2,-2 l 0,-7 0,-1 c 0,-1.1 -0.895,-2 -2,-2 l -2,0 -12,0 z" />
+      <path
+         style="fill:#f39c12"
+         inkscape:connector-curvature="0"
+         id="path8"
+         d="m 5,1040.4 c -1.1046,0 -2,0.9 -2,2 l 0,1 0,6 0,1 c 0,1.1 0.8954,2 2,2 l 2,0 10,0 2,0 c 1.105,0 2,-0.9 2,-2 l 0,-7 0,-1 c 0,-1.1 -0.895,-2 -2,-2 l -2,0 -12,0 z" />
+      <path
+         style="fill:#bdc3c7"
+         inkscape:connector-curvature="0"
+         id="path10"
+         transform="translate(0,1028.4)"
+         d="M 12,1 C 8.134,1 5,4.134 5,8 l 3,0 c 0,-2.2091 1.7909,-4 4,-4 1.863,0 3.399,1.2757 3.844,3 l 3.062,0 C 18.419,3.61 15.525,1 12,1 Z" />
+      <path
+         style="fill:#e67e22"
+         inkscape:connector-curvature="0"
+         id="path12"
+         transform="translate(0,1028.4)"
+         d="m 5,14 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z m 0,2 0,1 14,0 0,-1 -14,0 z" />
+      <path
+         style="fill:#7f8c8d"
+         inkscape:connector-curvature="0"
+         id="path14"
+         d="m 5,1037.4 0,1 c 0,0.5 0.6716,1 1.5,1 0.8284,0 1.5,-0.5 1.5,-1 l 0,-1 c 0,0.5 -0.6716,1 -1.5,1 -0.8284,0 -1.5,-0.5 -1.5,-1 z" />
+      <path
+         style="fill:#95a5a6"
+         inkscape:connector-curvature="0"
+         id="path16"
+         transform="translate(0,1028.4)"
+         d="m 12,2.4375 c -0.351,0 -0.699,0.0338 -1.031,0.0937 C 10.722,2.5758 10.482,2.6441 10.25,2.7188 10.033,2.7886 9.8271,2.8749 9.625,2.9688 9.519,3.018 9.4141,3.0696 9.3125,3.125 9.1806,3.1969 9.0612,3.2932 8.9375,3.375 8.8217,3.4515 8.7019,3.5092 8.5938,3.5938 8.4531,3.7035 8.3139,3.8149 8.1875,3.9375 8.1506,3.9737 8.1294,4.0253 8.0938,4.0625 7.9254,4.2369 7.7625,4.3981 7.625,4.5938 7.4848,4.7931 7.3546,5.0003 7.25,5.2188 7.246,5.2272 7.254,5.2415 7.25,5.25 7.1389,5.4859 7.0341,5.7459 6.9688,6 6.7158,6.5844 6.0264,7 5.2188,7 5.1588,7 5.1356,7.0018 5.0938,7 5.0833,6.9996 5.077,7.0014 5.0625,7 L 5,8 5,9 5,10 8,10 8,9 8,8 C 8,7.7239 8.0405,7.4479 8.0938,7.1875 8.4667,5.3648 10.067,4 12,4 c 1.863,0 3.399,1.2757 3.844,3 l 2.937,0 C 17.974,7 17.284,6.5844 17.031,6 16.966,5.7459 16.861,5.4859 16.75,5.25 16.746,5.2415 16.754,5.2272 16.75,5.2188 16.645,5.0003 16.515,4.7931 16.375,4.5938 16.237,4.3981 16.075,4.2369 15.906,4.0625 15.87,4.0245 15.851,3.9744 15.812,3.9375 15.686,3.8149 15.547,3.7035 15.406,3.5938 15.302,3.5121 15.174,3.449 15.062,3.375 14.94,3.2941 14.818,3.1962 14.688,3.125 14.587,3.07 14.48,3.0176 14.375,2.9688 14.173,2.8749 13.967,2.7886 13.75,2.7188 13.518,2.6441 13.278,2.5758 13.031,2.5312 12.699,2.4713 12.351,2.4375 12,2.4375 Z" />
+      <path
+         style="fill:#e67e22"
+         inkscape:connector-curvature="0"
+         id="path18"
+         transform="translate(0,1028.4)"
+         d="m 16,10 c 0,0.552 0.672,1 1.5,1 0.828,0 1.5,-0.448 1.5,-1 l -3,0 z" />
+    </g>
+    <rect
+       y="-3.4724426e-08"
+       x="3.1274987e-09"
+       height="24"
+       width="24"
+       id="rect3352"
+       style="opacity:0;fill:#ffccaa;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

+ 8 - 8
main/img/icons/svg/lock.svg

@@ -19,10 +19,10 @@
    sodipodi:version="0.32"
    sodipodi:docname="lock.svg"
    version="1.1"
-   inkscape:version="0.91 r13725"><metadata
+   inkscape:version="0.91 r"><metadata
      id="metadata71"><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><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs856"><linearGradient
        id="XMLID_3_"
        gradientUnits="userSpaceOnUse"
@@ -315,15 +315,15 @@
      units="px"
      inkscape:zoom="3.4839193"
      inkscape:cx="58.152826"
-     inkscape:cy="4.2441603"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
+     inkscape:cy="61.650771"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg742" /><g
      id="g4199"
-     transform="matrix(2.2198904,0,0,2.2198904,-11.079322,-655.14352)"><path
+     transform="matrix(2.1333332,0,0,2.1333332,0,-618.95107)"><path
        inkscape:connector-curvature="0"
        id="path763"
        d="m 256,546.13333 -256,0 0,-256 256,0 0,256 z"

+ 413 - 0
main/img/icons/svg/skill-badges.svg

@@ -0,0 +1,413 @@
+<?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="svg32939"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="skill-badges.svg">
+  <defs
+     id="defs32941">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath9750">
+      <g
+         id="g9752"
+         transform="matrix(0.67877845,0,-0.43891498,0.67877845,798.30404,345.95012)"
+         style="fill:#265165;fill-opacity:1;stroke:none">
+        <path
+           inkscape:connector-curvature="0"
+           id="path9754"
+           d="m 1444.5578,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1450.8361,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9756"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9758"
+           d="m 1457.1144,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1463.3926,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9760"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9762"
+           d="m 1469.671,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1475.9492,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9764"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9766"
+           d="m 1482.2275,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1488.5059,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9768"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9770"
+           d="m 1494.7841,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1501.0624,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9772"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9774"
+           d="m 1507.3408,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1513.619,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9776"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9778"
+           d="m 1519.8973,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1526.1756,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9780"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9782"
+           d="m 1532.4539,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1538.7322,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9784"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9786"
+           d="m 1545.0105,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1551.2888,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9788"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9790"
+           d="m 1557.5671,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1563.8454,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9792"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9794"
+           d="m 1570.1237,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1576.4019,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9796"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9798"
+           d="m 1582.6803,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1588.9586,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9800"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9802"
+           d="m 1595.2368,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1601.5152,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9804"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9806"
+           d="m 1607.7935,1117.3546 3.9952,0 0,98.7642 -3.9952,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1614.0717,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9808"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9810"
+           d="m 1620.35,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1626.6283,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9812"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9814"
+           d="m 1632.9066,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1639.1849,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9816"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9818"
+           d="m 1645.4632,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1651.7415,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9820"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9822"
+           d="m 1658.0197,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 1664.2981,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           id="path9824"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path9826"
+           d="m 1670.5764,1117.3546 3.9953,0 0,98.7642 -3.9953,0 z"
+           style="opacity:1;fill:#265165;fill-opacity:1;stroke:none;stroke-width:0.07723933;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter14456">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.35991578"
+         id="feGaussianBlur14458" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14440"
+       id="linearGradient25573"
+       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.979899"
+     inkscape:cx="72.915487"
+     inkscape:cy="8.4843864"
+     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="metadata32944">
+    <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="g25612"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/22/skill-badges.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="matrix(5.8181818,0,0,5.8181818,-2528.6914,-1469.8186)">
+      <rect
+         ry="0.0091597512"
+         y="411.49982"
+         x="434.61884"
+         height="22"
+         width="22"
+         id="rect25021"
+         style="opacity:1;fill:#719cd0;fill-opacity:0;stroke:none;stroke-width:0.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="matrix(1.1118666,0,0,1.0494743,-50.048883,-20.725436)"
+         d="m 454.77228,427.51215 c -0.0259,0.0449 -8.92264,5.18141 -8.97446,5.18141 -0.0518,0 -8.94855,-5.13653 -8.97445,-5.18141 -0.0259,-0.0449 -0.0259,-10.31793 0,-10.3628 0.0259,-0.0449 8.92264,-5.18141 8.97445,-5.18141 0.0518,0 8.94855,5.13653 8.97446,5.18141 0.0259,0.0449 0.0259,10.31793 0,10.3628 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0.005"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0.52359878"
+         sodipodi:r2="8.9744549"
+         sodipodi:r1="10.362807"
+         sodipodi:cy="422.33075"
+         sodipodi:cx="445.79782"
+         sodipodi:sides="6"
+         id="path19815"
+         style="opacity:1;fill:#608dcc;fill-opacity:0.99215686;stroke:none;stroke-width:6.45499992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="star" />
+      <path
+         sodipodi:type="star"
+         style="opacity:1;fill:#ffffff;fill-opacity:0.99215686;stroke:none;stroke-width:6.45499992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path25594"
+         sodipodi:sides="6"
+         sodipodi:cx="445.79782"
+         sodipodi:cy="422.33075"
+         sodipodi:r1="10.362807"
+         sodipodi:r2="8.9744549"
+         sodipodi:arg1="0.52359878"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="true"
+         inkscape:rounded="0.005"
+         inkscape:randomized="0"
+         d="m 454.77228,427.51215 c -0.0259,0.0449 -8.92264,5.18141 -8.97446,5.18141 -0.0518,0 -8.94855,-5.13653 -8.97445,-5.18141 -0.0259,-0.0449 -0.0259,-10.31793 0,-10.3628 0.0259,-0.0449 8.92264,-5.18141 8.97445,-5.18141 0.0518,0 8.94855,5.13653 8.97446,5.18141 0.0259,0.0449 0.0259,10.31793 0,10.3628 z"
+         transform="matrix(1.0096307,0,0,0.95297535,-4.4723417,20.029038)" />
+      <g
+         transform="translate(-0.17899618,0.16908196)"
+         id="g25606">
+        <path
+           sodipodi:type="star"
+           style="opacity:1;fill:#58a3fe;fill-opacity:1;stroke:#ffffff;stroke-width:0.02232209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path19823"
+           sodipodi:sides="6"
+           sodipodi:cx="445.79782"
+           sodipodi:cy="422.33075"
+           sodipodi:r1="8.381381"
+           sodipodi:r2="7.258492"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.0471976"
+           inkscape:flatsided="true"
+           inkscape:rounded="0.005"
+           inkscape:randomized="0"
+           d="m 453.05631,426.52144 c -0.0209,0.0363 -7.21658,4.19069 -7.25849,4.19069 -0.0419,0 -7.23753,-4.1544 -7.25849,-4.19069 -0.021,-0.0363 -0.021,-8.34509 0,-8.38138 0.021,-0.0363 7.21658,-4.19069 7.25849,-4.19069 0.0419,0 7.23754,4.1544 7.25849,4.19069 0.021,0.0363 0.021,8.34509 0,8.38138 z"
+           transform="matrix(1.1118666,0,0,1.0494743,-49.869887,-20.894518)" />
+        <path
+           sodipodi:nodetypes="csccccc"
+           inkscape:connector-curvature="0"
+           id="path19825"
+           d="m 453.86831,426.72877 c 0,0 -8.02386,4.39804 -8.07045,4.39804 -0.0466,0 -8.07048,-4.39804 -8.07048,-4.39804 l 0.0101,-8.78812 8.1612,4.03889 7.96035,-4.03819 z"
+           style="opacity:1;fill:#2e75a3;fill-opacity:1;stroke:none;stroke-width:0.16542321;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           style="opacity:1;fill:#3a7dce;fill-opacity:1;stroke:none;stroke-width:0.16542321;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 453.86831,426.72877 c -0.0232,0.0381 -8.02386,4.39804 -8.07045,4.39804 -0.0466,0 -8.04718,-4.35994 -8.07048,-4.39804 l -0.008,-4.82041 8.16512,4.03861 7.98683,-3.90278 z"
+           id="path19827"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csccccc" />
+        <path
+           sodipodi:nodetypes="csccccc"
+           inkscape:connector-curvature="0"
+           id="path19829"
+           d="m 1406.2141,1139.338 c -0.1553,0.2689 -53.4802,31.0561 -53.7908,31.0561 -0.3105,0 -53.6355,-30.7872 -53.7907,-31.0561 l -0.053,-34.0388 54.4216,28.5182 53.2333,-27.5591 z"
+           style="opacity:1;fill:#2e75a3;fill-opacity:1;stroke:none;stroke-width:0.16542321;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           clip-path="url(#clipPath9750)"
+           transform="matrix(0.15003448,0,0,0.1416153,242.88779,265.38109)" />
+      </g>
+      <g
+         id="g25551"
+         transform="matrix(0.58973149,0,0,0.58973149,136.59857,170.14256)">
+        <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="path25553"
+           style="opacity:0.82824426;fill:#999999;fill-opacity:1;stroke:none;filter:url(#filter14456)"
+           sodipodi:type="star" />
+        <path
+           sodipodi:type="star"
+           style="fill:url(#linearGradient25573);fill-opacity:1;stroke:#f4a800;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path25555"
+           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>

+ 4 - 4
main/inc/lib/dashboard.lib.php

@@ -386,7 +386,7 @@ class DashboardManager
 					echo '<td>'.$block['name'].'</td>';
 					echo '<td>'.$block['description'].'</td>';
 					echo '<td>
-                            <select name="columns['.$block['id'].']">
+                            <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
                             <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
                             <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
                             </select>
@@ -398,10 +398,10 @@ class DashboardManager
 			}
 
 			echo '</table>';
-			echo '<br />';
-			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'">'.
+			echo '<div class="row"><div class="col-md-12">';
+			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><i class="fa fa-check-square"></i> '.
                 get_lang('EnableDashboardBlock').'</button></form>';
-			echo '</div>';
+			echo '</div></div>';
 		} else {
 			echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
 			if (api_is_platform_admin()) {

+ 3 - 0
main/install/index.php

@@ -303,11 +303,14 @@ if ($encryptPassForm == '1') {
     <title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
     <style type="text/css" media="screen, projection">
         @import "../../web/assets/bootstrap/dist/css/bootstrap.min.css";
+        @import "<?php echo api_get_path(WEB_CSS_PATH)?>bootstrap-select.css";
         @import "../../web/assets/fontawesome/css/font-awesome.min.css";
         @import "../../web/css/base.css";
         @import "../../web/css/themes/chamilo/default.css";
     </style>
     <script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script>
+    <script type="text/javascript" src="../../web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="<?php echo api_get_path(WEB_LIBRARY_PATH)?>javascript/bootstrap-select.min.js"></script>
     <script type="text/javascript">
         $(document).ready( function() {
             $("#button_please_wait").hide();

+ 5 - 5
main/install/install.lib.php

@@ -610,7 +610,7 @@ function display_language_selection_box($name = 'language_list', $default_langua
 
     // Displaying the box.
     $html = '';
-    $html .= "\t\t<select class='form-control' name=\"$name\">\n";
+    $html .= "\t\t<select class='selectpicker show-tick' name=\"$name\">\n";
     foreach ($language_list as $key => $value) {
         if ($key == $default_language) {
             $option_end = ' selected="selected">';
@@ -1157,7 +1157,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('CompanyActivity').'</label>
             <div class="col-sm-9">
-                    <select name="company_activity" id="company_activity" >
+                    <select class="selectpicker show-tick" name="company_activity" id="company_activity" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Advertising/Marketing/PR">Advertising/Marketing/PR</Option><Option value="Agriculture/Forestry">Agriculture/Forestry</Option>
                             <Option value="Architecture">Architecture</Option><Option value="Banking/Finance">Banking/Finance</Option>
@@ -1181,7 +1181,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3"><span class="form_required">*</span>'.get_lang('PersonRole').'</label>
             <div class="col-sm-9">
-                    <select name="person_role" id="person_role" >
+                    <select class="selectpicker show-tick" name="person_role" id="person_role" >
                             <option value="">--- '.get_lang('SelectOne').' ---</option>
                             <Option value="Administration">Administration</Option><Option value="CEO/President/ Owner">CEO/President/ Owner</Option>
                             <Option value="CFO">CFO</Option><Option value="CIO/CTO">CIO/CTO</Option>
@@ -1211,7 +1211,7 @@ function get_contact_registration_form()
     <div class="form-group">
             <label class="col-sm-3">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</label>
             <div class="col-sm-9">
-                    <select id="language" name="language">
+                    <select class="selectpicker show-tick" id="language" name="language">
                             <option value="bulgarian">Bulgarian</option>
                             <option value="indonesian">Bahasa Indonesia</option>
                             <option value="bosnian">Bosanski</option>
@@ -1765,7 +1765,7 @@ function get_countries_list_from_array($combo = false)
 
     $country_select = '';
     if ($combo) {
-        $country_select = '<select id="country" name="country">';
+        $country_select = '<select class="selectpicker show-tick" id="country" name="country">';
         $country_select .= '<option value="">--- '.get_lang('SelectOne').' ---</option>';
         foreach ($a_countries as $country) {
             $country_select .= '<option value="'.$country.'">'.$country.'</option>';

+ 12 - 8
main/survey/survey.php

@@ -146,21 +146,25 @@ $survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
-	echo '<div class="well actions">';
-	echo '<a style="padding-left:0px;" href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'<br /></a>';
+	echo '<div class="panel panel-default">';
+        echo '<div class="panel-body">';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
 	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'<br /></a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'<br /></a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'<br /></a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
 	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
 	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
 	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
 	echo '</div>';
+        echo '</div>';
 } else {
-	echo '<div class="well actions">';
-	echo '<a style="padding-left:0px;" href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/yesno.gif" /></a></div>';
+	echo '<div class="panel panel-default">';
+        echo '<div class="panel-body">';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/yesno.gif" /></a></div>';
 	echo '</div>';
+        echo '</div>';
 }
 
 // Displaying the table header with all the questions

Some files were not shown because too many files changed in this diff