Bladeren bron

Merge pull request #1324 from aragonc/1.11.x

1.11.x
Alex Aragon Calixto 8 jaren geleden
bovenliggende
commit
e094404836
3 gewijzigde bestanden met toevoegingen van 4 en 10 verwijderingen
  1. 0 6
      app/Resources/public/css/base.css
  2. 2 2
      main/inc/lib/course.lib.php
  3. 2 2
      main/inc/lib/userportal.lib.php

+ 0 - 6
app/Resources/public/css/base.css

@@ -5461,12 +5461,6 @@ a.sessionView {
   overflow-y: auto;
   max-height:50px;
 }
-.view-by-session-right-actions {
-  float : right;
-}
-.view-by-session-right-actions img {
-  width : 12px;
-}
 .session-view-session-go-to-course-in-session {
   font-size : 12px;
 }

+ 2 - 2
main/inc/lib/course.lib.php

@@ -5954,7 +5954,7 @@ class CourseManager
                 $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
                 $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
             } else {
-                $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'].= '<a class="btn btn-default btn-sm" title="'.get_lang('Edit').'" href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::returnFontAwesomeIcon('pencil').'</a>';
             }
 
             if ($course_info['status'] == COURSEMANAGER) {
@@ -5967,7 +5967,7 @@ class CourseManager
                     $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
                 } else {
                     if ($course_info['status'] == COURSEMANAGER) {
-                        $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                        $params['right_actions'].= '<a class="btn btn-default btn-sm" title="'.get_lang('Edit').'" href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::returnFontAwesomeIcon('pencil').'</a>';
                     }
                 }
             }

+ 2 - 2
main/inc/lib/userportal.lib.php

@@ -1773,7 +1773,7 @@ class IndexManager
 
         $button = '';
         if ($displayButton) {
-            $button = '<input id="session-view-button-'.intval($id).'" class="session-view-button btn btn-default" type="button" onclick="hideUnhide(\'courseblock-'.intval($id).'\', \'session-view-button-'.intval($id).'\', \'+\', \'-\')" value="+" />';
+            $button = '<input id="session-view-button-'.intval($id).'" class="btn btn-default btn-sm" type="button" onclick="hideUnhide(\'courseblock-'.intval($id).'\', \'session-view-button-'.intval($id).'\', \'+\', \'-\')" value="+" />';
         }
 
         $icon = Display::return_icon(
@@ -1795,7 +1795,7 @@ class IndexManager
 
         // notification
         if (!empty($tabParams['right_actions'])) {
-            $rightActions = '<div class="view-by-session-right-actions">'.$tabParams['right_actions'].'</div>';
+            $rightActions = '<div class="pull-right">'.$tabParams['right_actions'].'</div>';
         }
 
         return "<div>