update home course thematic home description

1.10.x
aragonc 10 years ago
parent 72e3853403
commit 1150c65d04
  1. 7
      main/course_description/listing.php
  2. 75
      main/css/base.css
  3. 31
      main/inc/introductionSection.inc.php
  4. 6
      main/inc/lib/api.lib.php
  5. 4
      main/inc/lib/banner.lib.php

@ -53,7 +53,8 @@ $user_info = api_get_user_info();
if (isset($descriptions) && count($descriptions) > 0) {
foreach ($descriptions as $id => $description) {
if (!empty($description)) {
echo '<div class="sectiontitle">';
echo '<div class="panel panel-info">';
echo '<div class="panel-heading">';
if (api_is_allowed_to_edit(null,true) && !$history) {
if (api_get_session_id() == $description['session_id']) {
@ -75,9 +76,9 @@ if (isset($descriptions) && count($descriptions) > 0) {
echo $description['title'];
echo '</div>';
echo '<div class="sectioncomment">';
echo '<div class="panel-body">';
echo $description['content'];
echo '</div>';
echo '</div></div>';
}
}
} else {

@ -29,6 +29,49 @@ select {
.title-header-tools{
text-align: center;
}
ul#navigation {
position: fixed;
margin: 0px;
padding: 0px;
top: 200px;
right: -10px;
list-style: none;
z-index:9999;
}
ul#navigation li {
width: 73px;
}
ul#navigation li a {
display: block;
margin-left: 1px;
width: 65px;
opacity: 0.6;
filter:progid:DXImageTransform.Microsoft.Alpha(opacity=60);
-webkit-box-shadow: 0px 4px 3px #000;
}
ul#navigation .help a {
background-color:#879DAA;
border:1px solid #FFFFFF;
display:block;
margin-left:50px;
opacity:0.6;
width:65px;
padding: 6px 0 8px 6px;
}
ul#navigation .report a {
background-color:#8fd400;
border:1px solid #FFFFFF;
display:block;
margin-left:50px;
opacity:0.6;
width:65px;
padding: 6px 0 8px 6px;
}
/* END CSS BASE */
.button-load{
@ -410,18 +453,18 @@ footer {
}
.actions {
background:#efefef;
border:1px solid #ccc;
margin-bottom: 11px;
height:32px;
padding: 2px 2px 2px 14px;
vertical-align:middle;
background:#ffffff;
border:1px solid #dddddd;
padding: 15px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
box-shadow: 0 1px 1px rgba(0,0,0,0.05);
}
[dir=rtl] .actions {
background:#efefef;
border:1px solid #ccc;
margin-bottom: 11px;
height:32px;
padding: 2px 2px 2px 14px;
vertical-align:middle;
float: right;
@ -445,12 +488,6 @@ footer {
margin-bottom: 0px;
}
.actions a img {
padding:0px;
margin:0px;
float:left;
}
.actions fieldset {
margin-top:0px;
}
@ -460,17 +497,10 @@ footer {
color: #999999 !important;
}
.actions img {
padding-right:10px;
border: none;
text-decoration: none;
vertical-align:middle;
}
.actions a {
display: block;
float: left;
display: inline-block;
margin-right: 10px;
vertical-align:middle;
}
.actions .btn-toolbar {
@ -478,6 +508,7 @@ footer {
}
.actions span {
display: inline-block;
margin-right: 10px;
vertical-align:middle;
}

@ -222,28 +222,26 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_description_html =
'<div class="thematic-postit">
<div class="row-fluid"><div class="span12">
<div class="row"><div class="col-md-12">
<div class="accordion" id="progress-bar-course">
<div class="accordion-group">
<div class="accordion-heading">
<div class="title-accordion">
<div class="row-fluid score-thematic">
<div class="span8">';
$thematic_description_html .=
'<div class="span6 name-student">
<div class="row score-thematic">
<div class="col-md-12">';
$thematic_description_html .= '<div class="col-md-3 name-student">
<h2>' . $userInfo['firstName'] . '</h2>
<h3>' . $userInfo['lastName'] . '</h3>
</div>
<div class="span2 score">
<div class="col-md-3 score">
<h1>' . $thematicScore . '</h1>
</div>
<div class="span4">
<div class="col-md-3">
<h3>' . $thematic_advance . '</h3>
<p>' . $courseInfo['name'] . '</p>
</div>
</div>';
$thematic_description_html .=
'<div class="span4">
';
$thematic_description_html .= '<div class="col-md-3">
<a id="thematic-show" class="btn btn-small btn-primary accordion-toggle btn-hide-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course">
' . get_lang('SeeDetail') . '
</a>
@ -251,21 +249,22 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
' . get_lang('Hide') . '
</a>
</div>
</div>
</div>
</div>
</div>';
$thematic_description_html .=
'<div class="accordion-body collapse in" id="pross" style="height: auto !important;">
<div class="accordion-inner">
<div class="row-fluid">
<div class="span4">
<div class="row-fluid">
<div class="span4">
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-4">
<div class="thumbnail">
<img src="' . $userInfo['avatar'] . '" class="img-polaroid">
</div>
</div>
<div class="span8">
<div class="col-md-8">
<div class="info-progress">
<div class="tittle-score">' . $thematic_advance . '&nbsp;' . $thematicScore .'
</div>
@ -317,7 +316,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
}
}
$introduction_section .= '<div class="row course-tools-intro"><div class="span12">';
$introduction_section .= '<div class="row"><div class="col-md-12">';
$introduction_section .= $thematic_description_html;
$introduction_section .= '</div>';

@ -2916,15 +2916,15 @@ function api_display_tool_view_option() {
// We have to remove the isStudentView=true from the $sourceurl
$sourceurl = str_replace('&isStudentView=true', '', $sourceurl);
$sourceurl = str_replace('&isStudentView=false', '', $sourceurl);
$output_string .= '<a class="btn btn-mini btn-success" href="'.$sourceurl.'&isStudentView=false" target="_self">'.get_lang('CourseManagerview').'</a>';
$output_string .= '<a class="btn btn-success btn-xs" href="'.$sourceurl.'&isStudentView=false" target="_self">'.get_lang('CourseManagerview').'</a>';
} elseif ($_SESSION['studentview'] == 'teacherview') {
// Switching to teacherview
$sourceurl = str_replace('&isStudentView=true', '', $sourceurl);
$sourceurl = str_replace('&isStudentView=false', '', $sourceurl);
$output_string .= '<a class="btn btn-mini" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
$output_string .= '<a class="btn btn-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
}
} else {
$output_string .= '<a class="btn btn-mini" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
$output_string .= '<a class="btn btn-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
}
return $output_string;
}

@ -666,8 +666,9 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
}
// View as student/teacher link
$view = null;
if (!empty($view_as_student_link)) {
$lis.= Display::tag('span', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
$view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
}
if (!empty($navigation_right)) {
@ -678,6 +679,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
}
if (!empty($lis)) {
$html .= $view;
$html .= Display::tag('ul', $lis, array('class'=>'breadcrumb'));
}
}

Loading…
Cancel
Save