Merge pull request #848 from aragonc/bootstrap

Cambios Bootstrap 23

app/Resources/public/css/base.css

@@ -108,6 +108,10 @@ a.thumbnail:hover{
     max-width: 100%;
     height: auto;
 }
+#carousel-announcement .carousel-control.right, #carousel-announcement .carousel-control.left{
+    background-image: none;
+}
+/*
 #carousel-announcement .left, #carousel-announcement .right{
   position: absolute;
   top: 50%;
@@ -139,7 +143,7 @@ a.thumbnail:hover{
 #carousel-announcement .carousel-indicators .active{
   background: #C52D2F;
 }
-
+*/
 #notice_block p, #notice-block p{
     color: #666;
     font-size: 12px;

app/Resources/public/css/themes/chamilo_electric_blue/default.css

@@ -46,18 +46,17 @@ a:hover{
   color: #3F9BC7;
 }
 header{
-  background: url("images/bg-blue.png") repeat-x center -50px;
+  background: url("images/bg-blue.png") repeat-x center -25px;
 }
 .navbar-default {
-  background: #0099c0; /* Old browsers */
-  background: -moz-linear-gradient(top, #0099c0 0%, #006a84 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0099c0), color-stop(100%,#006a84)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #0099c0 0%,#006a84 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #0099c0 0%,#006a84 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top, #0099c0 0%,#006a84 100%); /* IE10+ */        
-  background: linear-gradient(to bottom, #0099c0 0%,#006a84 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0099c0', endColorstr='#006a84',GradientType=0 ); /* IE6-9 */
-  border-color: #0099c0;
+background: -moz-linear-gradient(top, rgba(0,152,191,0.29) 0%, rgba(0,107,133,0.85) 86%, rgba(0,107,133,0.94) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,152,191,0.29)), color-stop(86%,rgba(0,107,133,0.85)), color-stop(100%,rgba(0,107,133,0.94))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(0,152,191,0.29) 0%,rgba(0,107,133,0.85) 86%,rgba(0,107,133,0.94) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(0,152,191,0.29) 0%,rgba(0,107,133,0.85) 86%,rgba(0,107,133,0.94) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(0,152,191,0.29) 0%,rgba(0,107,133,0.85) 86%,rgba(0,107,133,0.94) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(0,152,191,0.29) 0%,rgba(0,107,133,0.85) 86%,rgba(0,107,133,0.94) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4a0098bf', endColorstr='#f0006b85',GradientType=0 ); /* IE6-9 */
+border-color: #0099c0;
 }
 .navbar-default .navbar-brand {
   color: #ffffff;

app/Resources/public/css/themes/chamilo_green/default.css

@@ -44,31 +44,18 @@ a{
 a:hover{
   color: #418A00;
 }
-.navbar-default .navbar-nav li a{
-  color: #ffffff;
-}
-.navbar-default .navbar-nav li a:hover{
-  color: #ffd555;
-}
-.navbar-default .navbar-nav .active a,
-.navbar-default .navbar-nav .active a:focus,
-.navbar-default .navbar-nav .active > a:hover{
-  background: #F15000;
-  color: #ffffff;
-}
 header{
-  background: url("images/bg-green.png") repeat-x center -50px;
+  background: url("images/bg-green.png") repeat-x center -25px;
 }
 .navbar-default {
-  background: #8cbf00; /* Old browsers */
-  background: -moz-linear-gradient(top, #8cbf00 0%, #398500 99%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#8cbf00), color-stop(99%,#398500)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #8cbf00 0%,#398500 99%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #8cbf00 0%,#398500 99%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top, #8cbf00 0%,#398500 99%); /* IE10+ */
-  background: linear-gradient(to bottom, #8cbf00 0%,#398500 99%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8cbf00', endColorstr='#398500',GradientType=0 ); /* IE6-9 */
-  border-color: #8cbf00;
+background: -moz-linear-gradient(top, rgba(139,190,0,0.29) 0%, rgba(107,168,0,0.84) 84%, rgba(58,134,0,0.94) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(139,190,0,0.29)), color-stop(84%,rgba(107,168,0,0.84)), color-stop(100%,rgba(58,134,0,0.94))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(139,190,0,0.29) 0%,rgba(107,168,0,0.84) 84%,rgba(58,134,0,0.94) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(139,190,0,0.29) 0%,rgba(107,168,0,0.84) 84%,rgba(58,134,0,0.94) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(139,190,0,0.29) 0%,rgba(107,168,0,0.84) 84%,rgba(58,134,0,0.94) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(139,190,0,0.29) 0%,rgba(107,168,0,0.84) 84%,rgba(58,134,0,0.94) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4a8bbe00', endColorstr='#f03a8600',GradientType=0 ); /* IE6-9 */
+border-color: #8cbf00;
 }
 .navbar-default .navbar-brand {
   color: #ffffff;

app/Resources/public/css/themes/chamilo_red/default.css

@@ -46,18 +46,19 @@ a:hover{
   color: #333333;
 }
 header{
-  background: url("images/bg-red.png") repeat-x center -50px;
+  background: url("images/bg-red.png") repeat-x center -25px;
 }
 .navbar-default {
-  background: #db0000; /* Old browsers */
-  background: -moz-linear-gradient(top, #db0000 0%, #870000 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#db0000), color-stop(100%,#870000)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #db0000 0%,#870000 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #db0000 0%,#870000 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top, #db0000 0%,#870000 100%); /* IE10+ */
-  background: linear-gradient(to bottom, #db0000 0%,#870000 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#db0000', endColorstr='#870000',GradientType=0 ); /* IE6-9 */
-  border-color: #C20000;
+  /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#da0000+0,ae0000+84,890000+100&0.29+0,0.94+100 */
+background: -moz-linear-gradient(top, rgba(218,0,0,0.29) 0%, rgba(174,0,0,0.84) 84%, rgba(137,0,0,0.94) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(218,0,0,0.29)), color-stop(84%,rgba(174,0,0,0.84)), color-stop(100%,rgba(137,0,0,0.94))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(218,0,0,0.29) 0%,rgba(174,0,0,0.84) 84%,rgba(137,0,0,0.94) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(218,0,0,0.29) 0%,rgba(174,0,0,0.84) 84%,rgba(137,0,0,0.94) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(218,0,0,0.29) 0%,rgba(174,0,0,0.84) 84%,rgba(137,0,0,0.94) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(218,0,0,0.29) 0%,rgba(174,0,0,0.84) 84%,rgba(137,0,0,0.94) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4ada0000', endColorstr='#f0890000',GradientType=0 ); /* IE6-9 */
+  border:none;
+  border-radius: 0;
 }
 .navbar-default .navbar-brand {
   color: #ecf0f1;
@@ -160,4 +161,7 @@ footer a{
 }
 footer a:hover{
   color: #CCC;
+}
+#carousel-announcement .left, #carousel-announcement .right{
+    background: #AE0000;
 }

app/Resources/public/css/themes/kiddy/default.css

@@ -0,0 +1,170 @@
+/*!
+ * CSS Kiddy - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Roboto Condensed Light'), local('RobotoCondensed-Light'), url(fonts/RobotoCondensed-Light.woff2) format('woff2');
+}
+@font-face {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), url(fonts/RobotoCondensed-Regular.woff2) format('woff2');
+}
+@font-face {
+  font-family: 'Roboto Condensed';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url(fonts/RobotoCondensed-Bold.woff2) format('woff2');
+}
+
+
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Roboto Condensed', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #111111;
+}
+a:hover{
+  color: #34495E;
+  text-decoration: none;
+}
+.nav li a {
+padding: 15px 10px;
+}
+.navbar-default {
+background: #FBD232;
+border: none;
+}
+header{
+    background: #D3D3D3;
+}
+.navbar{
+    margin-bottom: 0;
+}
+#breadcrumb-bar{
+    padding-top: 10px;
+    background-color: #fff;
+}
+.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: #111;
+  text-transform: uppercase;
+  font-weight: bold;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+color: #FFFFFF;
+background: #111111;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background: #FBD232;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #111111;
+  padding: 5px;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li{
+    border: none;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+.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: #FFFFFF;
+background: #111111;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+color: #FFFFFF;
+background: #111111;
+}
+.navbar-default .navbar-toggle {
+  border-color: #111;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #111111;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #666;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #111;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+.badge{
+    background-color: #222222;
+}
+@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;
+    background-color: #6D0019;
+  }
+  .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: #F9F9F9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.panel-default .panel-heading{
+    background-color: #EBECF2;
+}
+.panel-default{
+    border-color: #F3F3F4;
+}
+footer{
+background: #111111;
+color: #FBD232;
+border-top: 5px solid #FBD232;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}
+.menu-column .panel-heading{
+    text-transform: uppercase;
+    background-color: #FBD232;
+}
+.menu-column .panel-heading a{
+    font-weight: bold;
+}

app/Resources/public/css/themes/medical/default.css

@@ -0,0 +1,196 @@
+/*!
+ * CSS Medical - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Lato Light'), local('Lato-Light'), url(fonts/Lato-Light.woff2) format('woff2');
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lato Regular'), local('Lato-Regular'), url(fonts/Lato-Regular.woff2) format('woff2');
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lato Bold'), local('Lato-Bold'), url(fonts/Lato-Bold.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: 'DIN Next Rounded LT Pro';
+    src: url('fonts/DINNextRoundedLTPro-Regular.otf');
+}
+
+@font-face {
+    font-family: 'DIN Next Rounded LT Pro';
+    src: url('fonts/DINNextRoundedLTPro-Medium.otf');
+    font-weight: bold;
+}
+
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Lato', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #2D9DB5;
+}
+a:hover{
+  color: #34495E;
+  text-decoration: none;
+}
+.nav li a {
+padding: 15px 10px;
+}
+.navbar-default {
+background: #2C9BB6;
+border: none;
+font-family: 'DIN Next Rounded LT Pro', sans-serif;
+}
+header{
+    background: url(images/background.png);
+}
+.navbar{
+    margin-bottom: 0;
+}
+#breadcrumb-bar{
+    padding-top: 10px;
+    background-color: #fff;
+}
+.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: #FFF;
+  /* text-transform: uppercase; */
+  font-weight: bold;
+  font-size: 1.25em;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+color: #FFFFFF;
+background: #F38A1E;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background: #2C9BB6;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #fff;
+  padding: 5px;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li{
+    border: none;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ffffff;
+  background-color: #F38A1E;
+}
+.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: #FFFFFF;
+background: rgb(243,138,30); /* Old browsers */
+background: -moz-linear-gradient(top, rgba(243,138,30,1) 0%, rgba(241,119,0,1) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(243,138,30,1)), color-stop(100%,rgba(241,119,0,1))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(243,138,30,1) 0%,rgba(241,119,0,1) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(243,138,30,1) 0%,rgba(241,119,0,1) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(243,138,30,1) 0%,rgba(241,119,0,1) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(243,138,30,1) 0%,rgba(241,119,0,1) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f38a1e', endColorstr='#f17700',GradientType=0 ); /* IE6-9 */
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+color: #FFFFFF;
+background: #F38A1E;
+}
+.navbar-default .navbar-toggle {
+  border-color: #fff;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #111111;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #fff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #111;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+.badge{
+    background-color: #F28414;
+}
+@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;
+    background-color: #6D0019;
+  }
+  .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: #F9F9F9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.panel-default .panel-heading{
+    background-color: #EDEDED;
+}
+.panel-default{
+    border-color: #F3F3F4;
+}
+footer{
+background: #2C9BB6;
+color: #FFF;
+border-top: 10px solid #EFEFEF;
+}
+footer a{
+  color: #FFFF00;
+  font-weight: bold;
+}
+footer a:hover{
+  color: #CCC;
+}
+.menu-column .panel-body{
+    font-family: 'DIN Next Rounded LT Pro', sans-serif;
+}
+.menu-column .nav li a{
+    font-size: 14px;
+}
+.menu-column .panel-heading{
+    text-transform: uppercase;
+    background-color: #EDEDED;
+}
+.menu-column .panel-heading a{
+    font-weight: bold;
+}

app/Resources/public/css/themes/simplex/default.css

@@ -4,7 +4,6 @@
  * Licensed GPL
  * Based on Bootstrap
 */
-
 @font-face {
   font-family: 'Lato';
   font-style: normal;
@@ -48,7 +47,7 @@ background: #FBD232;
 border: none;
 }
 header{
-    background: #D3D3D3;
+    background: url(images/background.png) #D3D3D3;
 }
 .navbar{
     margin-bottom: 0;

main/user/subscribe_user.php

@@ -223,7 +223,6 @@ if (!empty($_POST['keyword'])) {
 Display :: display_header($tool_name, "User");
 
 // Build search-form
-echo '<div class="actions">';
 
 switch ($type) {
     case STUDENT:
@@ -233,18 +232,18 @@ switch ($type) {
         $url = api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'&type='.COURSEMANAGER;
         break;
 }
-
-echo Display::url(
+$actionsLeft = '';
+$actionsLeft = Display::url(
     Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM),
     $url
 );
-$actions = '';
+
 if (isset($keyword)) {
-    $actions .= '<a href="subscribe_user.php?type='.$type.'&">'.
+    $actionsLeft .= '<a href="subscribe_user.php?type='.$type.'&">'.
         Display::return_icon('clean_group.gif').' '.get_lang('ClearSearchResults').'</a>';
 }
 if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])) {
-    $actions .= '<a href="subscribe_user.php?type='.$type.'">'.
+    $actionsLeft .= '<a href="subscribe_user.php?type='.$type.'">'.
         Display::return_icon('clean_group.gif').' '.get_lang('ClearFilterResults').'</a>';
 }
 if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
@@ -257,8 +256,10 @@ $form->addText('keyword', '', false);
 $form->addElement('hidden', 'type', $type);
 $form->addButtonSearch(get_lang('Search'));
 $form->addElement('static', 'additionalactions', null, $actions);
-$form->display();
-echo '</div>';
+
+
+
+echo Display::toolbarAction('toolbar-subscriber', array(0 => $actionsLeft, 1 => $form->returnForm()));
 
 $option = $type == COURSEMANAGER ? 2 : 1;
 echo UserManager::getUserSubscriptionTab($option);

main/work/work_list.php

@@ -54,7 +54,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_in
     
     $actionsRight = Display::toolbarButton(get_lang('UploadMyAssignment'), $url, 'upload', 'success');
 }
-echo Display::toolbarAction('toolbar-work', array(0 => $actionsLeft, 1 => $actionsRight));
+echo Display::toolbarAction('toolbar-work', array(0 => $actionsLeft . $actionsRight));
 
 if (!empty($my_folder_data['title'])) {
     echo Display::page_subheader($my_folder_data['title']);

main/work/work_list_all.php

@@ -150,25 +150,22 @@ echo $message;
 
 $documentsAddedInWork = getAllDocumentsFromWorkToString($workId, $courseInfo);
 
-echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
+$actionsLeft = '';
+$actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
     Display::return_icon('back.png', get_lang('BackToWorksList'), '', ICON_SIZE_MEDIUM).'</a>';
 
 if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfCourse) {
     /*echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload.php?'.api_get_cidreq().'&id='.$workId.'">';
     echo Display::return_icon('upload_file.png', get_lang('UploadADocument'), '', ICON_SIZE_MEDIUM).'</a>';*/
+    
+    $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_document.php?'.api_get_cidreq().'&id='.$workId.'">';
+    $actionsLeft .= Display::return_icon('new_document.png', get_lang('AddDocument'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload_corrections.php?'.api_get_cidreq().'&id='.$workId.'">';
-    echo Display::return_icon('upload_file.png', get_lang('UploadCorrections'), '', ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .=  '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_user.php?'.api_get_cidreq().'&id='.$workId.'">';
+    $actionsLeft .= Display::return_icon('addworkuser.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_document.php?'.api_get_cidreq().'&id='.$workId.'">';
-    echo Display::return_icon('new_document.png', get_lang('AddDocument'), '', ICON_SIZE_MEDIUM).'</a>';
-
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/add_user.php?'.api_get_cidreq().'&id='.$workId.'">';
-    echo Display::return_icon('addworkuser.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>';
-
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=export_pdf">';
-    echo Display::return_icon('pdf.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=export_pdf">';
+    $actionsLeft .= Display::return_icon('pdf.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
 
     $display_output = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_missing.php?'.api_get_cidreq().'&amp;id='.$workId.'&amp;list=without">'.
     Display::return_icon('exercice_uncheck.png', get_lang('ViewUsersWithoutTask'), '', ICON_SIZE_MEDIUM)."</a>";
@@ -177,12 +174,17 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
         $display_output .= '<a href="downloadfolder.inc.php?id='.$workId.'&'.api_get_cidreq().'">'.
             Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_MEDIUM).'</a>';
     }
-    echo $display_output;
+    $actionsLeft .= $display_output;
 
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/edit_work.php?'.api_get_cidreq().'&id='.$workId.'">';
-    echo Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'work/edit_work.php?'.api_get_cidreq().'&id='.$workId.'">';
+    $actionsLeft .= Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
+    
+    $url = api_get_path(WEB_CODE_PATH).'work/upload_corrections.php?'.api_get_cidreq().'&id='.$workId;    
+    $actionsLeft .= Display::toolbarButton(get_lang('UploadCorrections'), $url, 'upload', 'success');
 }
-echo '</div>';
+
+
+echo Display::toolbarAction('toolbar-worklist', array( 0 => $actionsLeft));
 
 if (!empty($my_folder_data['title'])) {
     echo Display::page_subheader($my_folder_data['title']);