Fixing session view see BT#4981

skala
Julio Montoya 13 years ago
parent d65b67a265
commit 896d004cec
  1. 9
      main/css/academica/default.css
  2. 14
      main/css/baby_orange/default.css
  3. 42
      main/css/base.css
  4. 41
      main/css/blue_lagoon/default.css
  5. 30
      main/css/cool_blue/default.css
  6. 12
      main/css/corporate/default.css
  7. 13
      main/css/cosmic_campus/default.css
  8. 29
      main/css/delicious_bordeaux/default.css
  9. 36
      main/css/dokeos_blue/default.css
  10. 42
      main/css/dokeos_classic/default.css
  11. 38
      main/css/dokeos_classic_2D/default.css
  12. 2
      main/inc/lib/userportal.lib.php
  13. 28
      main/session/index.php

@ -229,15 +229,6 @@ ul#navigation .student-connect a {
list-style-type: none;
margin-bottom: 5px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
}
.courses a {
text-decoration:underline;

@ -1067,20 +1067,8 @@ div.system_announcement {
margin-bottom: 10px;
background-color:#F9F9F9;
}
.session_course_item {
margin: 0px;
margin-bottom:20px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
/*NAVIGATION MENU BAR*/
/*NAVIGATION MENU BAR*/
.menucaption {
font-size: 12px;

@ -482,16 +482,11 @@ a.tag {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
margin-bottom:15px;
font-size:135%;
/* Fixes course items with bootstrap 2.1.1*/
.course_item h3{
margin:0px 0px 5px 0px;
line-height: 28px;
}
.userportal-course-item {
@ -507,9 +502,6 @@ a.tag {
margin-bottom: 7px;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
#maincontent .courseslist li {
margin-bottom:8px;
}
@ -2011,6 +2003,17 @@ input.maininput:focus {
margin-bottom: 20px;
}
/* session.php */
#session_course_list .big_icon {
padding:10px;
text-align:center;
}
#session_course_list .content {
text-align:center;
margin-bottom: 20px;
}
.big_icon img {
padding:5px;
-moz-border-radius:10px;
@ -2060,18 +2063,7 @@ input.maininput:focus {
padding: 18px;
}
/* Makes the course elements more readable */
.userportal-course-item {
}
.session_course_item {
padding: 6px 0px 6px 5px ;
}
/* LP tool*/
#lp_overview .thumbnail {
text-align: center;
}
@ -3810,7 +3802,7 @@ a.forum_group_link {
}
#main_content .course_item {
padding: 5px 0px 5px 0px;
padding: 0px 0px 16px 0px;
}
/* actions */

@ -7,7 +7,7 @@
/* Redefining html styles */
body {
/* hack ignored by non-IE to enable ie to support :hover on button */
behavior:url("/main/css/csshover3.htc");
behavior:url("/main/css/csshover3.htc");
font-family: arial, verdana, helvetica, sans-serif;
font-size: 12px;
color: #000;
@ -20,7 +20,7 @@ body {
#main {
float: left;
margin: 0px auto;
margin-top: 5x;
margin-top: 5px;
width: 96%;
padding: 0px 10px 10px 10px;
min-height: 320px;
@ -56,7 +56,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -217,7 +217,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -310,49 +310,20 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
padding-right: 5px;
width: auto;
}
/* user_portal course list */
.courses {
list-style-type: none;
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
/*****************************************************
* HEADER STYLES *
*****************************************************/
#header {
width: 100%;
padding: 0;
margin: 0;
}
/********************************************************
* HEADER 1: Title, portal, organisation, course title *
********************************************************/
#header1 {
padding: 4px;
color: #8e975b;
}
#header1 a {
color: #636363;
text-decoration: none;
}
#header1 a:hover {
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;

@ -45,7 +45,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -276,19 +276,6 @@ a:active {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
/*****************************************************
* HEADER STYLES *
@ -298,20 +285,7 @@ a:active {
padding: 0;
margin: 0;
}
/********************************************************
* HEADER 1: Title, portal, organisation, course title *
********************************************************/
#header1 {
padding: 4px;
color: #2ea2c5;
}
#header1 a {
color: #636363;
text-decoration: none;
}
#header1 a:hover {
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;

@ -140,7 +140,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -277,16 +277,6 @@ ul#navigation .student-connect a {
padding: 5px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.menu {
float: right;
width: 200px;

@ -274,19 +274,6 @@ ul#navigation .student-connect a {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
.user_course_category {
background-color: #efefef;
border: 1px solid #666;

@ -304,20 +304,6 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
/*****************************************************
* HEADER STYLES *
*****************************************************/
@ -326,20 +312,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
padding: 0;
margin: 0;
}
/********************************************************
* HEADER 1: Title, portal, organisation, course title *
********************************************************/
#header1 {
padding: 4px;
color: #975b5b;
}
#header1 a {
color: #636363;
text-decoration: none;
}
#header1 a:hover {
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;

@ -303,42 +303,6 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
/*****************************************************
* HEADER STYLES *
*****************************************************/
#header {
width: 100%;
padding: 0;
margin: 0;
}
/********************************************************
* HEADER 1: Title, portal, organisation, course title *
********************************************************/
#header1 {
padding: 4px;
color: #8e975b;
}
#header1 a {
color: #636363;
text-decoration: none;
}
#header1 a:hover {
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;

@ -223,7 +223,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -309,46 +309,6 @@ input[text] {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
/*****************************************************
* HEADER STYLES *
*****************************************************/
#header {
width: 100%;
padding: 0;
margin: 0;
}
/********************************************************
* HEADER 1: Title, portal, organisation, course title *
********************************************************/
#header1 {
font-size: 12px;
padding: 4px;
background-color: #264269;
color: #fff;
border-bottom: 1px solid white;
}
#header1 a {
color: #fff;
text-decoration: none;
}
#header1 a:hover {
background-color: #264269;
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;

@ -103,7 +103,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -162,7 +162,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -298,47 +298,13 @@ ul#navigation .student-connect a {
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
font-size:135%;
}
/*
HEADER STYLES
*/
#header {
margin: 0;
padding: 0;
width: 100%;
}
/*
------------------------------------------------------------------------------
HEADER 1: Title, portal, organisation, course title
------------------------------------------------------------------------------
*/
#header1 {
background-color: #264269;
border-bottom: 1px solid white;
color: #fff;
font-size: 12px;
padding: 4px;
}
#header1 a {
color: #fff;
text-decoration: none;
}
#header1 a:hover {
background-color: #264269;
text-decoration: underline;
}
#sitename {
font-weight: bold;
margin: 0;

@ -976,7 +976,7 @@ class IndexManager {
$params = array();
if ($count > 0) {
$params['icon'] = Display::return_icon('window_list.png', $session['session_name'], array('width' => '48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session_id)) . ' ';
$params['icon'] = Display::return_icon('window_list.png', $session['session_name'], array('id' => 'session_img_'.$session_id), ICON_SIZE_LARGE);
if (api_is_drh()) {
$session_link = $session['session_name'];

@ -98,6 +98,8 @@ if (!empty($new_session_list)) {
if (!empty($course_list)) {
foreach ($course_list as $course_data) {
if (in_array($course_data['code'], $user_course_list)) {
$course_data['only_title'] = $course_data['title'];
$course_data['link'] = api_get_course_url($course_data['code'], $session_id);
$course_data['title'] = Display::url($course_data['title'], api_get_course_url($course_data['code'], $session_id));
} else {
continue;
@ -141,10 +143,14 @@ if (!empty($course_list)) {
// 'recent_lps' => $icons,
//'max_mutation_date' => substr(api_get_local_time($max_mutation_date),0,10),
'exercise_count' => $exercise_count,
'lp_count' => $lp_count);
'lp_count' => $lp_count,
'only_title' => $course_data['only_title'],
'link' => $course_data['link']
);
}
}
//If the requested session does not exist in my list we stop the script
if (!api_is_platform_admin()) {
if (!in_array($session_id, $my_session_list)) {
@ -181,7 +187,8 @@ if (empty($session_id)) {
}
//Final data to be show
$my_real_array = $new_exercises = array();
$my_real_array = array();
$new_exercises = array();
$now = time();
foreach($final_array as $session_data) {
$my_course_list = isset($session_data['data']) ? $session_data['data']: array();
@ -275,6 +282,23 @@ if (!empty($course_id)) {
$dates = SessionManager::parse_session_dates($session_info);
echo Display::page_header($back_url.' '.$session_info['name']." <small>$dates<small>");
if (!empty($new_course_list)) {
echo '<div id="session_course_list" class="row">';
foreach ($new_course_list as $course_item) {
echo '<div class="span3">';
echo '<div class="big_icon">';
echo Display::url(Display::return_icon('course.png', $course_item['only_title'], array(), ICON_SIZE_BIG), $course_item['link']);
echo '</div>';
echo '<div class="content">';
echo $course_item['title'];
echo '</div>';
echo '</div>';
}
echo '</div>';
}
//All Learnpaths grid settings (First tab, first subtab)
$columns_courses = array(get_lang('Title'), get_lang('NumberOfPublishedExercises'), get_lang('NumberOfPublishedLps'));

Loading…
Cancel
Save