Merge branch 'aragonc-C7409' into 1.9.x

main/css/base.css

@@ -386,9 +386,12 @@ header {
 
 .breadcrumb a, .breadcrumb li {
     text-shadow:none;
-    font-size: 13px;
 }
-
+.breadcrumb a.btn-mini{
+  line-height: 22px;
+  text-transform: none;
+  margin-top: -5px;
+}
 .breadcrumb li img {
   width: 0%;
  }
@@ -3242,9 +3245,7 @@ form .formw .freeze {
 .data_table th, .data_table td {
     border-top: 1px solid #DDDDDD;
     line-height: 18px;
-    padding: 6px;
+    padding-top: 6px;
-    text-align: left;
-    vertical-align: top;
 }
 
 .data_table th {
@@ -4575,9 +4576,27 @@ footer {
     margin:0;
 }
 
-
+.progress .bar {
-.progresstext {
+  font-weight: bold;
-    text-align: center;
+  text-shadow: 0px 1px 1px rgba(0,0,0,1);
+}
+.progress {
+  text-align:center;
+  position: relative;
+  background: #98bede; /* Old browsers */
+  background: -moz-linear-gradient(top, #98bede 1%, #deefff 98%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#98bede), color-stop(98%,#deefff)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #98bede 1%,#deefff 98%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #98bede 1%,#deefff 98%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #98bede 1%,#deefff 98%); /* IE10+ */
+  background: linear-gradient(to bottom, #98bede 1%,#deefff 98%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#98bede', endColorstr='#deefff',GradientType=0 ); /* IE6-9 */
+
+}
+.bar span {
+  position:absolute;
+  display: block;
+  width: 100%;
 }
 
 .ui-state-highlight_lp {

main/css/chamilo/default.css

@@ -125,10 +125,6 @@ a.thumbnail:hover{
 
     text-shadow: none;
 }
-.breadcrumb a.btn-mini{
-    line-height: 22px;
-    text-transform: none;
-}
 .breadcrumb a.btn-mini > .btn-success{
   color: #FFFFFF;
 }
@@ -424,20 +420,7 @@ a.thumbnail:hover{
 #settings .span6 .well_border {
   min-height: 300px;
 }
-.breadcrumb {
+
-  margin-bottom: 0;
-  background: rgb(255,255,255); /* Old browsers */
-  background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(192,219,234,1) 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(192,219,234,1))); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(192,219,234,1) 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(192,219,234,1) 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(192,219,234,1) 100%); /* IE10+ */
-  background: linear-gradient(to bottom, rgba(255,255,255,1) 0%,rgba(192,219,234,1) 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#c0dbea',GradientType=0 ); /* IE6-9 */
-  margin-top: 5px;
-  border: 1px solid #d4e6f0;
-  box-shadow: none;
-}
 .breadcrumb a{
   padding-top: 0;
   text-transform: none;

main/newscorm/learnpath.class.php

@@ -2429,10 +2429,9 @@ class learnpath
     public static function get_progress_bar($percentage = -1, $text_add = '')
     {
         $text = $percentage . $text_add;
-        $output = '<div class="progress progress-striped">
+        $output = '<div class="progress">
-                        <div id="progress_bar_value" class="bar" style="width: '.$text.';"></div>
+                        <div id="progress_bar_value" class="bar" style="width: '.$text.';"><span>'. $text .'</span></div>
-                    </div>
+                    </div>';
-                    <div class="progresstext" id="progress_text">' . $text . '</div>';
 
         return $output;
     }