diff --git a/main/css/base.css b/main/css/base.css index a98ddac384..cdb6c3358d 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -419,10 +419,16 @@ footer .container .row { vertical-align:middle; } .actions a { - display:inline-block; + display: block; + float: left; margin-right: 10px; vertical-align:middle; } + +.actions .btn-toolbar { + margin : 0px; +} + .actions span { margin-right: 10px; vertical-align:middle; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index ca6ee76194..005f3a0288 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -27,7 +27,7 @@ define('ICON_SIZE_HUGE', 128); define('SHOW_TEXT_NEAR_ICONS', false); - + /** * Display class * contains several public functions dealing with the display of @@ -37,27 +37,27 @@ define('SHOW_TEXT_NEAR_ICONS', false); */ class Display { - + /* The main template*/ static $global_template; static $preview_style = null; - + private function __construct() { } - + /** * Displays the page header * @param string The name of the page (will be showed in the page title) * @param string Optional help file name */ - public static function display_header($tool_name ='', $help = null, $page_header = null) { - self::$global_template = new Template($tool_name); + public static function display_header($tool_name ='', $help = null, $page_header = null) { + self::$global_template = new Template($tool_name); self::$global_template->set_help($help); - if (!empty(self::$preview_style)) { + if (!empty(self::$preview_style)) { self::$global_template->preview_theme = self::$preview_style; self::$global_template->set_css_files(); self::$global_template->set_js_files(); - + } if (!empty($page_header)) { self::$global_template->assign('header', $page_header); @@ -68,34 +68,34 @@ class Display { /** * Displays the reduced page header (without banner) */ - public static function display_reduced_header() { + public static function display_reduced_header() { global $show_learnpath, $tool_name; - self::$global_template = new Template($tool_name, false, false, $show_learnpath); - echo self::$global_template ->show_header_template(); + self::$global_template = new Template($tool_name, false, false, $show_learnpath); + echo self::$global_template ->show_header_template(); } - - public static function display_no_header() { + + public static function display_no_header() { global $tool_name; $disable_js_and_css_files = true; - self::$global_template = new Template($tool_name, false, false, $show_learnpath); - //echo self::$global_template->show_header_template(); + self::$global_template = new Template($tool_name, false, false, $show_learnpath); + //echo self::$global_template->show_header_template(); } - + /** * Displays the reduced page header (without banner) */ - public static function set_header() { + public static function set_header() { global $show_learnpath; - self::$global_template = new Template($tool_name, false, false, $show_learnpath); + self::$global_template = new Template($tool_name, false, false, $show_learnpath); } /** * Display the page footer */ - public static function display_footer() { - echo self::$global_template ->show_footer_template(); + public static function display_footer() { + echo self::$global_template ->show_footer_template(); } - + public static function page() { return new Page(); @@ -113,7 +113,7 @@ class Display { public static function display_introduction_section($tool, $editor_config = null) { echo self::return_introduction_section($tool, $editor_config); } - + public static function return_introduction_section($tool, $editor_config = null) { $is_allowed_to_edit = api_is_allowed_to_edit(); $moduleId = $tool; @@ -231,7 +231,7 @@ class Display { global $origin; $column = 0; $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20; - $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name); + $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name); if (is_array($query_vars)) { $table->set_additional_parameters($query_vars); } @@ -304,7 +304,7 @@ class Display { /** * Displays an warning message. Use this if you want to draw attention to something * This can also be used for instance with the hint in the exercises - * + * */ public static function display_warning_message($message, $filter = true) { echo self::return_message($message, 'warning', $filter); @@ -329,11 +329,11 @@ class Display { public static function display_error_message ($message, $filter = true) { echo self::return_message($message, 'error', $filter); } - + public static function return_message_and_translate($message, $type='normal', $filter = true) { $message = get_lang($message); echo self::return_message($message, $type, $filter); - } + } /** * Returns a div html string with @@ -344,7 +344,7 @@ class Display { */ public static function return_message($message, $type='normal', $filter = true) { if ($filter) { - $message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()); + $message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()); //$message = Security::remove_XSS($message); } $class = ""; @@ -406,7 +406,7 @@ class Display { // Return encrypted mailto hyperlink return ''.$hclickable_text.''; } - + /** * Returns an mailto icon hyperlink * @@ -449,7 +449,7 @@ class Display { return ''.$name.''; } - + /** * Prints an