chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes when rendering the page in a 1024 px monitor

Browse Source
skala
Julio Montoya 14 years ago
parent fd439f67ba
commit dd83f1cc61
12 changed files with 41 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/course_description/add.php
  2. 2
      main/course_description/edit.php
  3. 1
      main/course_home/course_home.php
  4. 9
      main/css/base.css
  5. 5
      main/css/base_chamilo.css
  6. 2
      main/inc/lib/course.lib.php
  7. 2
      main/inc/lib/template.lib.php
  8. 9
      main/inc/lib/userportal.lib.php
  9. 31
      main/template/default/layout/layout_1_col.tpl
  10. 4
      main/template/default/layout/login_form.tpl
  11. 5
      main/template/default/layout/show_footer.tpl
  12. 7
      main/template/default/layout/show_header.tpl

2
main/course_description/add.php
Unescape View File

@ -50,7 +50,7 @@ if (!$error) {
$token = Security::get_token();
}
// display form
$form = new FormValidator('course_description','POST','index.php?action=add&'.api_get_cidreq(),'','style="width: 100%;"');
$form = new FormValidator('course_description','POST','index.php?action=add&'.api_get_cidreq());
$form->addElement('header', '', $header);
$form->addElement('hidden', 'description_type',$description_type);
$form->addElement('hidden', 'sec_token',$token);

2
main/course_description/edit.php
Unescape View File

@ -50,7 +50,7 @@ if ($description_type >= ADD_BLOCK) {
}
// display form
$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq(),'','style="width: 100%;"');
$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq());
$form->addElement('header','',$header);
$form->addElement('hidden', 'id', $original_id);

1
main/course_home/course_home.php
Unescape View File

@ -278,7 +278,6 @@ if (api_get_setting('homepage_view') == 'activity' || api_get_setting('homepage_
require 'vertical_activity.php';
}
$tpl = new Template($tool_name);
$tpl->assign('actions', $actions);
$tpl->assign('message', $show_message);

9
main/css/base.css
Unescape View File

@ -3301,11 +3301,6 @@ form .formw .freeze {
}
#formLogin {
margin-left:20px;
}
/*****************************************************
* LOGIN AND LANGUAGE FORM *
*****************************************************/
@ -3313,8 +3308,8 @@ form .formw .freeze {
#lang_form {
text-align: left;
font-size: 12px;
margin: 2px 0 10px 20px;
width: 50px !important;
margin: 2px 0 10px 0px;
width: 50px !important;
}
#lang_form input, #lang_form select {
font-size: 12px;

5
main/css/base_chamilo.css
Unescape View File

@ -2296,10 +2296,9 @@ span.form_required {
}
#header3 {
font-size: 14px;
font-size: 11px;
font-weight: bold;
margin:0px;
margin:0px;
}
/* Scroll effect */

2
main/inc/lib/course.lib.php
Unescape View File

@ -2829,7 +2829,7 @@ class CourseManager {
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
// We simply display the title of the category.
echo '<div class="userportal-catalog-item">';
echo '<div class="userportal-catalog-item span8">';
echo '<ul class="catalog_box">';
echo '<li>';
echo Display::return_icon('folder_yellow.png', get_lang('Category'), array('width' => '48px', 'align' => 'absmiddle'));

2
main/inc/lib/template.lib.php
Unescape View File

@ -46,7 +46,7 @@ class Template extends Smarty {
$this->set_user_parameters();
//header and footer are showed by default
$this->set_footer($show_footer);
$this->set_footer($show_footer);
$this->set_header($show_header);
//Creating a Smarty modifier - Now we can call the get_lang from a template!!! Just use {"MyString"|get_lang}

9
main/inc/lib/userportal.lib.php
Unescape View File

@ -718,12 +718,11 @@ class IndexManager {
$courses[$row['k']] = array('db' => $row['db'], 'code' => $row['k'], 'visual_code' => $row['vc'], 'title' => $row['i'], 'directory' => $row['dir'], 'status' => $row['status'], 'tutor' => $row['t'], 'subscribe' => $row['subscr'], 'unsubscribe' => $row['unsubscr'], 'sort' => $row['sort'], 'user_course_category' => $row['user_course_cat']);
}
return $courses;
}
}
function show_right_block($title, $content, $class = '') {
$html = '';
$html.= '<div id="menu" class="menu">';
$html.= '<div class="well">';
$html.= '<div class="menusection '.$class.' ">';
if (!empty($title)) {
$html.= '<span class="menusectioncaption">'.$title.'</span>';
@ -1217,7 +1216,7 @@ class IndexManager {
}
if ($count_courses_session > 0) {
echo '<div class="userportal-session-item"><ul class="session_box">';
echo '<div class="userportal-session-item span8"><ul class="session_box">';
echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >';
echo Display::return_icon('window_list.png', get_lang('Expand').'/'.get_lang('Hide'), array('width' => '48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
@ -1295,7 +1294,7 @@ class IndexManager {
if ($count_courses_session > 0) {
echo '<div class="userportal-session-category-item" id="session_category_'.$category['details']['id'].'">';
echo '<div class="userportal-session-category-item span8" id="session_category_'.$category['details']['id'].'">';
echo '<div class="session_category_title_box" id="session_category_title_box_'.$category['details']['id'].'" style="color: #555555;">';
echo Display::return_icon('folder_blue.png', get_lang('SessionCategory'), array('width'=>'48px', 'align' => 'absmiddle'));

31
main/template/default/layout/layout_1_col.tpl
Unescape View File

@ -1,28 +1,29 @@
{extends file="default/layout/main.tpl"}
{* Header *}
{block name="main_header"}
{if $show_header == 1}
{block name="header"}
{if $show_header}
{include file="default/layout/main_header.tpl"}
{/if}
{/block}
{* 1 column *}
{block name=body}
<div class="span12">
{* Actions *}
{if (!empty($actions) ) }
<div class="actions">
{$actions}
</div>
{/if}
{* Actions *}
{if (!empty($actions) ) }
<div class="actions">
{$actions}
</div>
{/if}
{* Notifications*}
{$message}
<section id="main_content">
{* Main content *}
{$content}
</section>
{* Notifications*}
{$message}
<section id="main_content">
{* Main content *}
{$content}
</section>
</div>
{/block}
{* Footer *}

4
main/template/default/layout/login_form.tpl
Unescape View File

@ -1,9 +1,9 @@
<div id="menu" class="menu">
<div id="menu" class="menu well">
<div class="menusection">
<span class="menusectioncaption">
{"Login"|get_lang}
</span>
</div>
</div>
{$login_language_form}
{$login_form}
{$login_failed}

5
main/template/default/layout/show_footer.tpl
Unescape View File

@ -1 +1,6 @@
{*
show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
for backward compatibility we suppose that the default layout is one column which means ausing a div with class span12
*}
</div>
{include file="default/layout/main_footer.tpl"}

7
main/template/default/layout/show_header.tpl
Unescape View File

@ -1 +1,6 @@
{include file="default/layout/main_header.tpl"}
{*
show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
for backward compatibility we suppose that the default layout is one column which means ausing a div with class span12
*}
{include file="default/layout/main_header.tpl"}
<div class="span12">
Write Preview
Loading…
Cancel
Save