Height adjusting input search results in table exercises - refs BT#76830

pull/2487/head
Alex Aragon 10 years ago
parent ef23e1d28f
commit 5fab733a5f
  1. 16
      app/Resources/public/css/base.css
  2. 2
      main/exercise/exercise_report.php
  3. 9
      main/inc/lib/api.lib.php
  4. 6
      main/inc/lib/exercise.lib.php

@ -1670,7 +1670,9 @@ div.admin_section h4 {
height:38px !important;
white-space: inherit;
}
.ui-search-table .ui-search-input input{
height: 25px;
}
.exercise_overview_options {
background-color: #F9F9F9;
-webkit-border-radius: 10px;
@ -5101,7 +5103,7 @@ div#chat-remote-video video {
.ui-jqgrid-view .ui-state-default,
.ui-jqgrid-view .ui-widget-content .ui-state-default,
.ui-jqgrid-view .ui-widget-header .ui-state-default{
background: #EEEEEE;
background: transparent;
color: #666666;
border: none;
}
@ -5117,10 +5119,6 @@ div#chat-remote-video video {
.ui-jqgrid-view .ui-jqgrid .ui-jqgrid-htable th div{
height: auto;
}
.ui-jqgrid-view .ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr{
padding-bottom: 5px;
padding-top: 5px;
}
.ui-jqgrid tr.ui-row-ltr td{
border: none;
}
@ -5129,7 +5127,7 @@ div#chat-remote-video video {
font-size: 13px;
}
.ui-jqgrid .ui-jqgrid-labels .ui-state-hover{
background-color: #E7E7E7;
background-color: transparent;
}
.ui-jqgrid .ui-pg-selbox{
font-size: 12px;
@ -5876,6 +5874,10 @@ footer{
.block-invitation .title-profile{
font-weight: bold;
}
.view-options{
padding-top: 7px;
margin-right: 10px;
}
/* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {

@ -464,7 +464,7 @@ if ($is_allowedToEdit || $is_tutor) {
array('name' => 'duration', 'index' => 'exe_duration', 'width' => '30', 'align' => 'left', 'search' => 'true'),
array('name' => 'start_date', 'index' => 'start_date', 'width' => '60', 'align' => 'left', 'search' => 'true'),
array('name' => 'exe_date', 'index' => 'exe_date', 'width' => '60', 'align' => 'left', 'search' => 'true'),
array('name' => 'score', 'index' => 'exe_result', 'width' => '50', 'align' => 'left', 'search' => 'true'),
array('name' => 'score', 'index' => 'exe_result', 'width' => '50', 'align' => 'center', 'search' => 'true'),
array('name' => 'ip', 'index' => 'user_ip', 'width' => '40', 'align' => 'center', 'search' => 'true'),
array('name' => 'status', 'index' => 'revised', 'width' => '40', 'align' => 'left', 'search' => 'true', 'stype' => 'select',
//for the bottom bar

@ -2840,17 +2840,18 @@ 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-success btn-xs" href="'.$sourceurl.'&isStudentView=false" target="_self">'.get_lang('SwitchToTeacherView').'</a>';
$output_string .= '<a class="btn btn-primary btn-sm" href="'.$sourceurl.'&isStudentView=false" target="_self">'.Display::returnFontAwesomeIcon('eye').' '.get_lang('SwitchToTeacherView').'</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-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('SwitchToStudentView').'</a>';
$output_string .= '<a class="btn btn-default btn-sm" href="'.$sourceurl.'&isStudentView=true" target="_self">'.Display::returnFontAwesomeIcon('eye').' '.get_lang('SwitchToStudentView').'</a>';
}
} else {
$output_string .= '<a class="btn btn-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('SwitchToStudentView').'</a>';
$output_string .= '<a class="btn btn-default btn-sm" href="'.$sourceurl.'&isStudentView=true" target="_self">'.Display::returnFontAwesomeIcon('eye').' '.get_lang('SwitchToStudentView').'</a>';
}
return $output_string;
$html = Display::tag('div', $output_string, array('class'=>'view-options'));
return $html;
}
// TODO: This is for the permission section.

@ -1922,7 +1922,7 @@ HOTSPOT;
$teacher_id_list
)) {
$actions .= Display::return_icon(
'teachers.gif',
'teacher.png',
get_lang('Teacher')
);
}
@ -1939,7 +1939,7 @@ HOTSPOT;
} else {
$actions .= "<a href='exercise_show.php?" . api_get_cidreq() . "&action=qualify&id=$id'>" .
Display:: return_icon(
'quiz.gif',
'quiz.png',
get_lang('Qualify')
);
$actions .= '&nbsp;';
@ -1949,7 +1949,7 @@ HOTSPOT;
if ($filter == 2) {
$actions .= ' <a href="exercise_history.php?' . api_get_cidreq() . '&exe_id=' . $id . '">' .
Display:: return_icon(
'history.gif',
'history.png',
get_lang('ViewHistoryChange')
) . '</a>';
}

Loading…
Cancel
Save