Minor - fixing links and CSS styles

skala
Julio Montoya 13 years ago
parent 87bea5e5c6
commit 90d550f6c0
  1. 12
      main/css/base.css
  2. 2
      main/inc/lib/display.lib.php
  3. 2
      main/inc/lib/javascript/chat/js/chat.js
  4. 36
      main/template/default/layout/header.tpl

@ -1694,6 +1694,10 @@ button:hover {
/* Warning and error messages to the user */
.error {
color: red;
}
.confirmation-message, .error-message, .normal-message, .warning-message {
min-height: 15px;
position: relative;
@ -3653,12 +3657,10 @@ form div.error textarea:focus {
box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
}
form div.error {
background: none repeat scroll 0 0 #FAE5E3;
border-radius: 4px 4px 4px 4px;
padding: 10px 0;
color: #b94a48;
border-color: #ee5f5b;
}

@ -1343,7 +1343,7 @@ class Display {
$labels[]= $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : '';
if (!$add_div_wrapper && api_is_anonymous()) {
$labels[]= get_lang('LoginToVote');
$labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));
}
$html .= Display::span(implode(' ', $labels) , array('id' => 'vote_label_'.$id));

@ -131,7 +131,7 @@ function restructureChatBoxes() {
}
function chatWith(user_id, user_name) {
createChatBox(user_id, user_name, 0, 1);
createChatBox(user_id, user_name, 0, 0);
$("#chatbox_"+user_id+" .chatboxtextarea").focus();
}

@ -11,29 +11,29 @@
<li class="dropdown">
<a class="dropdown-toggle" href="#">{'Teaching'|get_lang}</a>
<ul class="dropdown-menu">
<li><a href="{$_p.main}create_course/add_course.php">{"AddCourse"|get_lang}</a></li>
<li><a href="{$_p.main}auth/courses.php">{"Catalog"|get_lang}</a></li>
<li><a href="{$_p.web_main}create_course/add_course.php">{"AddCourse"|get_lang}</a></li>
<li><a href="{$_p.web_main}auth/courses.php">{"Catalog"|get_lang}</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" href="#">{'Tracking'|get_lang}</a>
<ul class="dropdown-menu">
<li><a href="{$_p.main}mySpace/">{"CoursesReporting"|get_lang}</a></li>
<li><a href="{$_p.main}mySpace/index.php?view=admin">{"AdminReports"|get_lang}</a></li>
<li><a href="{$_p.main}tracking/exams.php">{"ExamsReporting"|get_lang}</a></li>
<li><a href="{$_p.web_main}mySpace/">{"CoursesReporting"|get_lang}</a></li>
<li><a href="{$_p.web_main}mySpace/index.php?view=admin">{"AdminReports"|get_lang}</a></li>
<li><a href="{$_p.web_main}tracking/exams.php">{"ExamsReporting"|get_lang}</a></li>
<li class="divider"></li>
<li><a href="{$_p.main}dashboard/">{"Dashboard"|get_lang}</a></li>
<li><a href="{$_p.web_main}dashboard/">{"Dashboard"|get_lang}</a></li>
</ul>
</li>
{if $_u.is_admin == 1}
<li class="dropdown">
<a class="dropdown-toggle" href="#">{'Administration'|get_lang}</a>
<ul class="dropdown-menu">
<li><a href="{$_p.main}admin/">{"Home"|get_lang}</a></li>
<li><a href="{$_p.main}admin/user_list.php">{"UserList"|get_lang}</a></li>
<li><a href="{$_p.main}admin/course_list.php">{"CourseList"|get_lang}</a></li>
<li><a href="{$_p.main}admin/session_list.php">{"SessionsList"|get_lang}</a></li>
<li><a href="{$_p.main}admin/settings.php">{"Settings"|get_lang}</a></li>
<li><a href="{$_p.web_main}admin/">{"Home"|get_lang}</a></li>
<li><a href="{$_p.web_main}admin/user_list.php">{"UserList"|get_lang}</a></li>
<li><a href="{$_p.web_main}admin/course_list.php">{"CourseList"|get_lang}</a></li>
<li><a href="{$_p.web_main}admin/session_list.php">{"SessionsList"|get_lang}</a></li>
<li><a href="{$_p.web_main}admin/settings.php">{"Settings"|get_lang}</a></li>
</ul>
</li>
{/if}
@ -41,23 +41,23 @@
{/if}
{if $_u.is_admin == 1}
<form action="{$_p.main}admin/user_list.php" method="get">
<form action="{$_p.web_main}admin/user_list.php" method="get">
<input type="text" placeholder="{'SearchUsers'|get_lang}" name="keyword">
</form>
{/if}
{if $_u.logged}
<ul class="nav secondary-nav">
<li><a href="{$_p.main}social/home.php"><img src="{$_u.avatar_small}"/></a></li>
<li><a href="{$_p.web_main}social/home.php"><img src="{$_u.avatar_small}"/></a></li>
<li class="dropdown">
<a class="dropdown-toggle" href="#">{$_u.complete_name}</a>
<ul class="dropdown-menu">
<li><a href="{$_p.main}social/home.php">{"Profile"|get_lang}</a></li>
<li><a href="{$_p.main}calendar/agenda_js.php?type=personal">{"MyAgenda"|get_lang}</a></li>
<li><a href="{$_p.main}messages/inbox.php">{"Messages"|get_lang}</a></li>
<li><a href="{$_p.main}auth/my_progress.php">{"MyReporting"|get_lang}</a></li>
<li><a href="{$_p.web_main}social/home.php">{"Profile"|get_lang}</a></li>
<li><a href="{$_p.web_main}calendar/agenda_js.php?type=personal">{"MyAgenda"|get_lang}</a></li>
<li><a href="{$_p.web_main}messages/inbox.php">{"Messages"|get_lang}</a></li>
<li><a href="{$_p.web_main}auth/my_progress.php">{"MyReporting"|get_lang}</a></li>
<li class="divider"></li>
<li><a href="{$_p.main}social/invitations.php">{"PendingInvitations"|get_lang}</a></li>
<li><a href="{$_p.web_main}social/invitations.php">{"PendingInvitations"|get_lang}</a></li>
</ul>
</li>
<li><a href="{$_p.web}index.php?logout=logout">Logout</a></li>

Loading…
Cancel
Save