fix add select chosen javascripts CT#7539

1.10.x
aragonc 10 years ago
parent 0f198aa631
commit d5302d1b92
  1. 11
      app/Resources/public/css/base.css
  2. 4
      main/admin/user_list.php
  3. 15
      main/inc/lib/agenda.lib.php
  4. 4
      main/inc/lib/javascript/chosen/chosen.css
  5. 2
      main/inc/lib/pear/HTML/QuickForm/select.php

@ -341,9 +341,8 @@ ul#navigation .report a {
.muted {
color: #999999 !important;
}
.actions a {
display: inline-block;
margin-right: 10px;
.actions a img{
margin-right: 5px;
}
.actions .btn-toolbar {
margin : 0px;
@ -4991,7 +4990,8 @@ i.size-32.icon-new-work{
display: inline-block;
}
.actions .form-inline {
display:inline-block;
display:block;
width: 100%;
}
ul.holder{
list-style: none;
@ -6315,6 +6315,9 @@ a.sessionView {
width: 360px;
padding-left: 0;
}
.actions label{
display: none;
}
/* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {

@ -741,10 +741,10 @@ $form->addElement(
$actions = '';
if (api_is_platform_admin()) {
$actions .= '<span style="float:right;">'.
$actions .= '<div style="float:right;">'.
'<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
'</span>';
'</div>';
}
$actions .= $form->return_form();

@ -2460,8 +2460,10 @@ class Agenda
public function displayActions($view, $filter = 0)
{
$courseInfo = api_get_course_info();
$actions = "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php?type={$this->type}'>".
$actions = '<div class="row">';
$actions .= '<div class="col-md-3">';
$actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php?type={$this->type}'>".
Display::return_icon('calendar.png', get_lang('Calendar'), '', ICON_SIZE_MEDIUM)."</a>";
$courseCondition = '';
@ -2470,7 +2472,8 @@ class Agenda
}
$actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_list.php?type={$this->type}&".$courseCondition."'>".
Display::return_icon('week.png', get_lang('AgendaList'), '', ICON_SIZE_MEDIUM)."</a>";
$actions .= '</div>';
if (api_is_allowed_to_edit(false, true) ||
(api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()) && api_is_allowed_to_session_edit(false, true) ||
GroupManager::user_has_access(api_get_user_id(), api_get_group_id(), GroupManager::GROUP_TOOL_CALENDAR) &&
@ -2501,9 +2504,12 @@ class Agenda
$actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=importical&type=course'>".
Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM)."</a>";
if ($view == 'calendar') {
$actions .= '<div class="col-md-9">';
$actions .= $form;
$actions .= '</div>';
}
}
}
if (api_is_platform_admin() ||
@ -2543,10 +2549,13 @@ class Agenda
}
if ($view == 'calendar') {
$actions .= '<div class="col-md-9">';
$actions .= $form;
$actions .= '</div>';
}
}
}
$actions .= '</div>';
return $actions;
}

@ -162,8 +162,8 @@ This file is generated by `grunt build`, do not edit it by hand.
position: relative;
overflow-x: hidden;
overflow-y: auto;
margin: 0 4px 4px 0;
padding: 0 0 0 4px;
margin: 0;
padding: 0;
max-height: 240px;
-webkit-overflow-scrolling: touch;
}

@ -550,7 +550,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
$this->setName($myName);
}
$strHtml .= $tabs . '<select' . $attrString . ">\n";
$strHtml .= $tabs . '<select class="chzn-select"' . $attrString . ">\n";
$strValues = is_array($this->_values)? array_map('strval', $this->_values): array();

Loading…
Cancel
Save