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

Fixing menus

Browse Source
skala
Julio Montoya 13 years ago
parent 8852936f18
commit 72757ead16
6 changed files with 50 additions and 39 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
      index.php
  2. 11
      main/admin/configure_homepage.php
  3. 32
      main/css/base.css
  4. 2
      main/inc/lib/group_portal_manager.lib.php
  5. 22
      main/inc/lib/social.lib.php
  6. 20
      main/inc/lib/userportal.lib.php

2
index.php
Unescape View File

@ -165,6 +165,8 @@ $controller->tpl->assign('hot_courses', $hot_courses);
$controller->tpl->assign('announcements_block', $announcements_block);
$controller->tpl->assign('home_page_block', $controller->return_home_page());
$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
$controller->tpl->assign('notice_block', $controller->return_notice());
$controller->tpl->assign('main_navigation_block', $controller->return_navigation_links());
$controller->tpl->assign('help_block', $controller->return_help());

11
main/admin/configure_homepage.php
Unescape View File

@ -910,7 +910,7 @@ switch ($action) {
<td width="10%" valign="top"></td>
<td width="20%" rowspan="3" valign="top">
<div class="well sidebar-nav">
<div id="login_block" class="well sidebar-nav">
<?php echo api_display_language_form(); ?>
<form id="formLogin">
<div><label><?php echo get_lang('LoginName'); ?></label></div>
@ -919,18 +919,17 @@ switch ($action) {
<div><input type="password" id="password" size="15" value="" disabled="disabled" /></div>
<div><button class="btn" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
</form>
</div>
</div>
<div class="well sidebar-nav">
<div id="profile_block" class="well sidebar-nav">
<h4><?php echo get_lang('MenuUser'); ?></h4>
<ul class="menulist">
<ul class="nav nav-list">
<li><span style="color: #9D9DA1; font-weight: bold;"><?php echo api_ucfirst(get_lang('Registration')); ?></span></li>
<li><span style="color: #9D9DA1; font-weight: bold;"><?php echo api_ucfirst(get_lang('LostPassword')); ?></span></li>
</ul>
</div>
<div class="well sidebar-nav">
<div id="notice_block" class="well sidebar-nav">
<h4><?php echo get_lang('Notice'); ?>
<a href="<?php echo api_get_self(); ?>?action=edit_notice"><?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?></a>
</h4>

32
main/css/base.css
Unescape View File

@ -146,10 +146,27 @@ form .formw input {
/* New changes Chamilo 1.9 */
.well h4 {
padding: 3px 15px;
}
#login_block #formLogin,
#login_block #lang_form,
#notice_block .homepage_notice {
padding: 3px 15px;
}
.nav-list > .active > a,
.nav-list > .active > a:hover {
background-color: #999999;
}
.sidebar-nav {
padding: 20px 20px 10px 20px
padding: 8px 0px;
}
.well_border {
/* border: 1px solid rgba(0, 0, 0, 0.05);*/
border: 1px solid #E1E1E0;
@ -765,25 +782,18 @@ a.personal_agenda:hover, a.personal_agenda:hover {
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
/* width: 200px; */
/* height: 150px; */
}
.social-home-users-online {
width: 200px;
margin: -28px 0 0 -50px;
/* height: 150px; */
margin: -28px 0 0 -50px;
}
.social-home-anonymous-online {
width: 200px;
/* height: 150px; */
width: 200px;
}
.menulist {
margin: 0px;
list-style: none;
padding: 0;
padding: 3px 15px;
list-style-image:none;
list-style-position:outside;
list-style-type:none;

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

@ -1088,7 +1088,7 @@ class GroupPortalManager {
}
if (!empty($links)) {
$html .= '<div class="well social_menu_items"><ul class="nav nav-list">';
$html .= '<div class="well sidebar-nav"><ul class="nav nav-list">';
if (!empty($group_info['description'])) {
$html .= Display::tag('li', Security::remove_XSS($group_info['description'], STUDENT, true), array('class'=>'group_description'));
}

22
main/inc/lib/social.lib.php
Unescape View File

@ -582,31 +582,31 @@ class SocialManager extends UserManager {
if (!in_array($show, array('shared_profile', 'groups', 'group_edit', 'member_list','waiting_list','invite_friends'))) {
$html .= '<div class="well social_menu_items"><ul class="nav nav-list">';
$html .= '<div class="well sidebar-nav"><ul class="nav nav-list">';
$active = $show=='home' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array()).' '.get_lang('Home').'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array()).get_lang('Home').'</a></li>';
$active = $show=='messages' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array()).' '.get_lang('Messages').$count_unread_message.'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array()).get_lang('Messages').$count_unread_message.'</a></li>';
//Invitations
$active = $show=='invitations' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('Invitations'),array()).' '.get_lang('Invitations').$total_invitations.'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitation.png',get_lang('Invitations'),array()).get_lang('Invitations').$total_invitations.'</a></li>';
//Shared profile and groups
$active = $show=='shared_profile' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array()).' '.get_lang('ViewMySharedProfile').'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array()).get_lang('ViewMySharedProfile').'</a></li>';
$active = $show=='friends' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('friend.png',get_lang('Friends'),array()).' '.get_lang('Friends').'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('friend.png',get_lang('Friends'),array()).get_lang('Friends').'</a></li>';
$active = $show=='browse_groups' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group_s.png',get_lang('SocialGroups'),array()).' '.get_lang('SocialGroups').'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group_s.png',get_lang('SocialGroups'),array()).get_lang('SocialGroups').'</a></li>';
//Search users
$active = $show=='search' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'), array()).' '.get_lang('Search').'</a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'), array()).get_lang('Search').'</a></li>';
//My files
$active = $show=='myfiles' ? 'active' : null;
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array(), 16).' '.get_lang('MyFiles').'</span></a></li>';
$html .= '<li class="'.$active.'"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array(), 16).get_lang('MyFiles').'</span></a></li>';
$html .='</ul>
</div>';
}
@ -617,7 +617,7 @@ class SocialManager extends UserManager {
if ($show == 'shared_profile') {
//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
$html .= '<div class="well social_menu_items">
$html .= '<div class="well sidebar-nav">
<ul class="nav nav-list">';
// My own profile
@ -712,7 +712,7 @@ class SocialManager extends UserManager {
}
if ($show_delete_account_button) {
$html .= '<div class="social_menu_items"><ul><li>';
$html .= '<div class="sidebar-nav"><ul><li>';
$url = api_get_path(WEB_CODE_PATH).'auth/unsubscribe_account.php';
$html .= Display::url(Display::return_icon('delete.png',get_lang('Unsubscribe'), array(), ICON_SIZE_TINY).get_lang('Unsubscribe'), $url);
$html .= '</li></ul></div>';

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

@ -9,7 +9,7 @@ class IndexManager {
var $name = '';
var $home = '';
var $default_home = 'home/';
var $default_home = 'home/';
function __construct($title) {
$this->tpl = new Template($title);
@ -38,7 +38,7 @@ class IndexManager {
}
if (api_get_setting('allow_lostpassword') == 'true' || api_get_setting('allow_registration') == 'true') {
$login_form .= '<ul class="menulist">';
$login_form .= '<ul class="nav nav-list">';
if (api_get_setting('allow_registration') != 'false') {
$login_form .= '<li><a href="main/auth/inscription.php">'.get_lang('Reg').'</a></li>';
}
@ -182,7 +182,7 @@ class IndexManager {
// My Account section
if ($show_menu) {
$html .= '<ul class="menulist">';
$html .= '<ul class="nav nav-list">';
if ($show_create_link) {
$html .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
@ -277,7 +277,7 @@ class IndexManager {
$html = null;
$home_menu = @(string)file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
if (!empty($home_menu)) {
$home_menu_content .= '<ul class="menulist">';
$home_menu_content .= '<ul class="nav nav-list">';
$home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu_content .= '</ul>';
$html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');
@ -288,7 +288,7 @@ class IndexManager {
function return_skills_links() {
$html = '';
if (api_get_setting('allow_skills_tool') == 'true') {
$content = '<ul class="menulist">';
$content = '<ul class="nav nav-list">';
$content .= Display::tag('li', Display::url(get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/skills_tree.php'));
$content .= '</ul>';
$html = self::show_right_block(get_lang("Skills"), $content, 'skill_block');
@ -689,7 +689,7 @@ class IndexManager {
$classes .= Display::tag('li', Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add'));
}
if (!empty($classes)) {
$classes = Display::tag('ul', $classes, array('class'=>'menulist'));
$classes = Display::tag('ul', $classes, array('class'=>'nav nav-list'));
$html .= self::show_right_block(get_lang('Classes'), $classes, 'classes_block');
}
}
@ -699,7 +699,7 @@ class IndexManager {
function return_reservation_block() {
$html = '';
if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course()) {
$booking_content .='<ul class="menulist">';
$booking_content .='<ul class="nav nav-list">';
$booking_content .='<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />';
$booking_content .='</ul>';
$html .= self::show_right_block(get_lang('Booking'), $booking_content, 'reservation_block');
@ -736,7 +736,7 @@ class IndexManager {
return;
}
$profile_content .= '<ul class="menulist">';
$profile_content .= '<ul class="nav nav-list">';
// @todo Add a platform setting to add the user image.
if (api_get_setting('allow_message_tool') == 'true') {
@ -783,7 +783,7 @@ class IndexManager {
// Main navigation section.
// Tabs that are deactivated are added here.
if (!empty($this->tpl->menu_navigation)) {
$content = '<ul class="menulist">';
$content = '<ul class="nav nav-list">';
foreach ($this->tpl->menu_navigation as $section => $navigation_info) {
$current = $section == $GLOBALS['this_section'] ? ' id="current"' : '';
$content .= '<li'.$current.'>';
@ -816,7 +816,7 @@ class IndexManager {
}
// My account section
$my_account_content = '<ul class="menulist">';
$my_account_content = '<ul class="nav nav-list">';
if ($show_create_link) {
$my_account_content .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';

Write Preview
Loading…
Cancel
Save