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

Changing layout of the settings page

Browse Source
skala
Julio Montoya 13 years ago
parent 670628a66e
commit 6b41096def
3 changed files with 39 additions and 16 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. 28
      main/admin/settings.php
  2. 12
      main/css/base.css
  3. 15
      main/inc/lib/formvalidator/FormValidator.class.php

28
main/admin/settings.php
Unescape View File

@ -67,8 +67,12 @@ if (isset($_GET['delete_watermark'])) {
if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', 'stylesheets', 'Search'))) { if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', 'stylesheets', 'Search'))) {
$form = new FormValidator('settings', 'post', 'settings.php?category='.$_GET['category']); $form = new FormValidator('settings', 'post', 'settings.php?category='.$_GET['category']);
$renderer = & $form->defaultRenderer(); $renderer = & $form->defaultRenderer();
$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>'."\n"); /*$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>');
$renderer->setElementTemplate('<div class="sectioncomment">{label}</div>'."\n".'<div class="sectionvalue">{element}</div>'."\n"); $renderer->setElementTemplate('<div class="sectionvalue">{element}</div><div class="sectioncomment">{label}</div>'."\n");*/
//$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>');
$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}<!-- BEGIN label_2 --><span class="help-block">{label_2}</span><!-- END label_2 --></div></div>');
$my_category = Database::escape_string($_GET['category']); $my_category = Database::escape_string($_GET['category']);
$sqlcountsettings = "SELECT COUNT(*) FROM $table_settings_current WHERE category='".$my_category."' AND type<>'checkbox'"; $sqlcountsettings = "SELECT COUNT(*) FROM $table_settings_current WHERE category='".$my_category."' AND type<>'checkbox'";
@ -121,7 +125,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$i++; $i++;
$form->addElement('header', null, get_lang($row['title'])); //$form->addElement('header', null, get_lang($row['title']));
if ($row['access_url_changeable'] == '1' && $_configuration['multiple_access_urls']) { if ($row['access_url_changeable'] == '1' && $_configuration['multiple_access_urls']) {
$form->addElement('html', '<div style="float: right;">'.Display::return_icon('shared_setting.png', get_lang('SharedSettingIconComment')).'</div>'); $form->addElement('html', '<div style="float: right;">'.Display::return_icon('shared_setting.png', get_lang('SharedSettingIconComment')).'</div>');
@ -155,7 +159,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
switch ($row['type']) { switch ($row['type']) {
case 'textfield': case 'textfield':
if ($row['variable'] == 'account_valid_duration') { if ($row['variable'] == 'account_valid_duration') {
$form->addElement('text', $row['variable'], get_lang($row['comment']), array('maxlength' => '5')); $form->addElement('text', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('maxlength' => '5'));
$form->applyFilter($row['variable'], 'html_filter'); $form->applyFilter($row['variable'], 'html_filter');
$default_values[$row['variable']] = $row['selected_value']; $default_values[$row['variable']] = $row['selected_value'];
@ -184,10 +188,10 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
unset($valid_encodings[$key]); unset($valid_encodings[$key]);
} }
} }
$form->addElement('select', $row['variable'], get_lang($row['comment']), $valid_encodings); $form->addElement('select', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), $valid_encodings);
$default_values[$row['variable']] = $current_system_encoding; $default_values[$row['variable']] = $current_system_encoding;
} else { } else {
$form->addElement('text', $row['variable'], get_lang($row['comment']), $hideme); $form->addElement('text', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), $hideme);
$form->applyFilter($row['variable'],'html_filter'); $form->applyFilter($row['variable'],'html_filter');
$default_values[$row['variable']] = $row['selected_value']; $default_values[$row['variable']] = $row['selected_value'];
} }
@ -199,10 +203,10 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
if (file_exists($file)) { if (file_exists($file)) {
$value = file_get_contents($file); $value = file_get_contents($file);
} }
$form->addElement('textarea', $row['variable'], get_lang($row['comment']) , array('rows'=>'10','cols'=>'50'), $hideme); $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10','cols'=>'50'), $hideme);
$default_values[$row['variable']] = $value; $default_values[$row['variable']] = $value;
} else { } else {
$form->addElement('textarea', $row['variable'], get_lang($row['comment']) , array('rows'=>'10','cols'=>'50'), $hideme); $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10','cols'=>'50'), $hideme);
$default_values[$row['variable']] = $row['selected_value']; $default_values[$row['variable']] = $row['selected_value'];
} }
break; break;
@ -218,7 +222,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$group[] = $element; $group[] = $element;
} }
} }
$form->addGroup($group, $row['variable'], get_lang($row['comment']), '<br />', false); $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), '<div></div>', false); //julio
$default_values[$row['variable']] = $row['selected_value']; $default_values[$row['variable']] = $row['selected_value'];
break; break;
case 'checkbox'; case 'checkbox';
@ -259,17 +263,17 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
} }
$group[] = $element; $group[] = $element;
} }
$form->addGroup($group, $row['variable'], get_lang($row['comment']), '<br />'."\n"); $form->addGroup($group, $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])),'<div></div>');
break; break;
case 'link': case 'link':
$form->addElement('static', null, get_lang($row['comment']), get_lang('CurrentValue').' : '.$row['selected_value'], $hideme); $form->addElement('static', null, array(get_lang($row['title']), get_lang($row['comment'])), get_lang('CurrentValue').' : '.$row['selected_value'], $hideme);
break; break;
/* /*
* To populate its list of options, the select type dynamically calls a function that must be called select_ + the name of the variable being displayed. * To populate its list of options, the select type dynamically calls a function that must be called select_ + the name of the variable being displayed.
* The functions being called must be added to the file settings.lib.php. * The functions being called must be added to the file settings.lib.php.
*/ */
case 'select': case 'select':
$form->addElement('select', $row['variable'], get_lang($row['comment']), call_user_func('select_'.$row['variable']), $hideme); $form->addElement('select', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), call_user_func('select_'.$row['variable']), $hideme);
$default_values[$row['variable']] = $row['selected_value']; $default_values[$row['variable']] = $row['selected_value'];
break; break;
/* /*

12
main/css/base.css
Unescape View File

@ -3555,6 +3555,18 @@ fieldset legend {
color: red; color: red;
} }
.help-block{
display:block;
max-width:640px;
margin:5px 0 0!important;
line-height:18px;
}
.help-inline, .help-block {
color: #777777;
font-size: 12px;
}
form div.error > .label, form div.error > .label,
form div.error > label, form div.error > label,
form div.error span.help-inline, form div.error span.help-inline,

15
main/inc/lib/formvalidator/FormValidator.class.php
Unescape View File

@ -71,20 +71,27 @@ EOT;
<div class="row {error_class}"> <div class="row {error_class}">
<div class="label"> <div class="label">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label} <!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
{label}
</div> </div>
<div class="formw"> <div class="formw">
{element}<!-- BEGIN error --><span class="help-inline">{error}</span><!-- END error --> {element}
<!-- BEGIN label_2 -->
<span class="help-block">{label_2}</span>
<!-- END label_2 -->
<!-- BEGIN error -->
<span class="help-inline">{error}</span>
<!-- END error -->
</div> </div>
</div> </div>
EOT; EOT;
$renderer->setElementTemplate($element_template); $renderer->setElementTemplate($element_template);
$header_template = <<<EOT $header_template = <<<EOT
<legend>{header}</legend> <legend>{header}</legend>
EOT; EOT;
$renderer->setHeaderTemplate($header_template); $renderer->setHeaderTemplate($header_template);
HTML_QuickForm :: setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>'); HTML_QuickForm::setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
$required_note_template = <<<EOT $required_note_template = <<<EOT
<div class="row"> <div class="row">
<div class="label"></div> <div class="label"></div>

Write Preview
Loading…
Cancel
Save