Adding missing version_check in admin/index.php

skala
Julio Montoya 14 years ago
parent 394dac7fc4
commit 15b09c4af4
  1. 35
      main/admin/index.php
  2. 5
      main/css/base.css
  3. 8
      main/template/default/admin/settings_index.tpl

@ -63,9 +63,9 @@ $blocks['users']['icon'] = Display::return_icon('members.gif', get_lang('Users'
$blocks['users']['label'] = api_ucfirst(get_lang('Users')); $blocks['users']['label'] = api_ucfirst(get_lang('Users'));
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
$search_form = ' <form method="get" action="user_list.php"> $search_form = ' <form method="get" class="form-search" action="user_list.php">
<input class="span3" type="text" name="keyword" value=""> <input class="span3" type="text" name="keyword" value="">
<button class="search" type="submit">'.get_lang('Search').'</button> <button class="btn" type="submit">'.get_lang('Search').'</button>
</form>'; </form>';
$blocks['users']['search_form'] = $search_form; $blocks['users']['search_form'] = $search_form;
$items = array( $items = array(
@ -97,9 +97,9 @@ if (api_is_platform_admin()) {
$blocks['courses']['icon'] = Display::return_icon('course.gif', get_lang('Courses'), array(), ICON_SIZE_MEDIUM, false); $blocks['courses']['icon'] = Display::return_icon('course.gif', get_lang('Courses'), array(), ICON_SIZE_MEDIUM, false);
$blocks['courses']['label'] = api_ucfirst(get_lang('Courses')); $blocks['courses']['label'] = api_ucfirst(get_lang('Courses'));
$search_form = ' <form method="get" action="course_list.php"> $search_form = ' <form method="get" class="form-search" action="course_list.php">
<input class="span3" type="text" name="keyword" value=""> <input class="span3" type="text" name="keyword" value="">
<button class="search" type="submit">'.get_lang('Search').'</button> <button class="btn" type="submit">'.get_lang('Search').'</button>
</form>'; </form>';
$blocks['courses']['search_form'] = $search_form; $blocks['courses']['search_form'] = $search_form;
@ -135,7 +135,7 @@ if (api_is_platform_admin()) {
$search_form = ' <form method="get" action="settings.php" class="form-search"> $search_form = ' <form method="get" action="settings.php" class="form-search">
<input class="span3" type="text" name="search_field" value="" > <input class="span3" type="text" name="search_field" value="" >
<input type="hidden" value="search_setting" name="category"> <input type="hidden" value="search_setting" name="category">
<button class="search" type="submit">'.get_lang('Search').'</button> <button class="btn" type="submit">'.get_lang('Search').'</button>
</form>'; </form>';
$blocks['platform']['search_form'] = $search_form; $blocks['platform']['search_form'] = $search_form;
@ -172,9 +172,9 @@ if (api_get_setting('use_session_mode') == 'true') {
$blocks['sessions']['icon'] = Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL, false); $blocks['sessions']['icon'] = Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL, false);
$blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions')); $blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions'));
$search_form = ' <form method="GET" action="session_list.php"> $search_form = ' <form method="GET" class="form-search" action="session_list.php">
<input class="span3" type="text" name="keyword" value=""> <input class="span3" type="text" name="keyword" value="">
<button class="search" type="submit">'.get_lang('Search').'</button> <button class="btn" type="submit">'.get_lang('Search').'</button>
</form>'; </form>';
$blocks['sessions']['search_form'] = $search_form; $blocks['sessions']['search_form'] = $search_form;
$items = array(); $items = array();
@ -203,9 +203,9 @@ if (api_get_setting('use_session_mode') == 'true') {
$blocks['classes']['icon'] = Display::return_icon('group.gif', get_lang('AdminClasses'), array(), ICON_SIZE_SMALL, false); $blocks['classes']['icon'] = Display::return_icon('group.gif', get_lang('AdminClasses'), array(), ICON_SIZE_SMALL, false);
$blocks['classes']['label'] = api_ucfirst(get_lang('AdminClasses')); $blocks['classes']['label'] = api_ucfirst(get_lang('AdminClasses'));
$search_form = ' <form method="POST" action="class_list.php"> $search_form = ' <form method="POST" class="form-search" action="class_list.php">
<input class="span3" type="text" name="keyword" value=""> <input class="span3" type="text" name="keyword" value="">
<button class="search" type="submit">.'.get_lang('Search').'</button> <button class="btn" type="submit">.'.get_lang('Search').'</button>
</form>'; </form>';
$blocks['classes']['search_form'] = $search_form; $blocks['classes']['search_form'] = $search_form;
$items = array(); $items = array();
@ -292,7 +292,11 @@ if (api_is_platform_admin()) {
//session_write_close(); //close session to avoid blocking concurrent access //session_write_close(); //close session to avoid blocking concurrent access
//flush(); //send data to client as much as allowed by the web server //flush(); //send data to client as much as allowed by the web server
//ob_flush(); //ob_flush();
$blocks['chamilo']['extra'] = '<br />'.get_lang('VersionCheck').': '.version_check().'';
//Version check
$blocks['version_check']['icon'] = Display::return_icon('logo.gif', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
$blocks['version_check']['label'] = get_lang('VersionCheck');
$blocks['version_check']['extra'] = version_check();
} }
$tpl = new Template(); $tpl = new Template();
@ -319,14 +323,14 @@ function version_check() {
// The site has not been registered yet. // The site has not been registered yet.
$return = ''; $return = '';
if ($row['selected_value'] == 'false') { if ($row['selected_value'] == 'false') {
$return .= '<form action="'.api_get_self().'" id="VersionCheck" name="VersionCheck" method="post">';
$return .= get_lang('VersionCheckExplanation'); $return .= get_lang('VersionCheckExplanation');
$return .= '<input type="checkbox" name="donotlistcampus" value="1" id="checkbox" />'.get_lang('HideCampusFromPublicDokeosPlatformsList'); $return .= '<form class="well" action="'.api_get_self().'" id="VersionCheck" name="VersionCheck" method="post">';
$return .= '<button type="submit" class="save" name="Register" value="'.get_lang('EnableVersionCheck').'" id="register" />'.get_lang('EnableVersionCheck').'</button>'; $return .= '<label class="checkbox"><input type="checkbox" name="donotlistcampus" value="1" id="checkbox" />'.get_lang('HideCampusFromPublicDokeosPlatformsList');
$return .= '</label><button type="submit" class="btn btn-primary" name="Register" value="'.get_lang('EnableVersionCheck').'" id="register" />'.get_lang('EnableVersionCheck').'</button>';
$return .= '</form>'; $return .= '</form>';
} else { } else {
$return = 'site registered. '; //$return = 'site registered. ';
$return .= check_system_version(); $return .= check_system_version();
} }
return $return; return $return;
@ -350,7 +354,6 @@ function register_site() {
$sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'"; $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
$result = Database::query($sql); $result = Database::query($sql);
} }
// Reload the settings. // Reload the settings.
} }

@ -246,6 +246,11 @@ a.tag {
margin-bottom:10px; margin-bottom:10px;
} }
/* Admin index.php */
#settings .span6 {
min-height: 180px;
}
/* user_portal course status icon */ /* user_portal course status icon */
.coursestatusicons { .coursestatusicons {
border: 0px solid #000; border: 0px solid #000;

@ -31,7 +31,13 @@ $(function() {
<li><a href="{{url.url}}">{{ url.label }}</a></li> <li><a href="{{url.url}}">{{ url.label }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif%} {% endif %}
{% if block_item.extra is not null %}
<p>
{{ block_item.extra }}
</p>
{% endif %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

Loading…
Cancel
Save