|
|
@@ -366,7 +366,7 @@ jQuery(document).ready(function() {
|
|
|
default: {
|
|
|
$fun_init = V::get('FUNCTION_INIT', '', $_GET);
|
|
|
switch ($fun_init) {
|
|
|
- case 'MENU_SELECT_PROCES': $active = 'testy_moje'; break;
|
|
|
+ case 'MENU_SELECT_PROCES': $active = 'testy'; break;
|
|
|
case 'PRZYPOMNIJ_FUNC': $active = 'przypomnij'; break;
|
|
|
case 'PRZYPOMNIJ': $active = 'przypomnij'; break;
|
|
|
default:
|
|
|
@@ -381,7 +381,10 @@ jQuery(document).ready(function() {
|
|
|
case 'CRM_LISTA_ZASOBOW': $active = 'zasoby'; break;
|
|
|
case 'CRM_WYSWIETL_OBOWIAZKI': $active = 'obowiazki'; break;
|
|
|
case 'CRM_TESTY': $active = 'testy'; break;
|
|
|
- case 'CRM_TESTY_WYNIKI': $active = 'testy_wyniki'; break;
|
|
|
+ case 'CRM_TESTY_WYNIKI': $active = 'testy'; break;
|
|
|
+ case 'CRM_TESTY__LIST': $active = 'testy'; break;
|
|
|
+ case 'CRM_TESTY__ADD_TEST': $active = 'testy'; break;
|
|
|
+ case 'CRM_TESTY__ADD_KANDYDAT': $active = 'testy'; break;
|
|
|
case 'CRM_SEARCH': $active = 'search'; break;
|
|
|
default:
|
|
|
// testy_moje ?FUNCTION_INIT=MENU_SELECT_PROCES&MENU_SELECT_PROCES=show_menu_with_process => _action=showMyTests
|
|
|
@@ -712,7 +715,7 @@ jQuery(document).ready(function() {
|
|
|
</li>
|
|
|
<li<?php if ($active == 'obowiazki') echo ' class="active"'; ?>><a href="procesy5.php?task=CRM_WYSWIETL_OBOWIAZKI" title="Wyswietlenie OBOWIAZKOW">Obowiązki</a></li>
|
|
|
|
|
|
- <li class="dropdown <?php if ($active == 'testy' || $active == 'testy_moje' || $active == 'testy_wyniki') echo "active"; ?>">
|
|
|
+ <li class="dropdown <?php if ($active == 'testy') echo "active"; ?>">
|
|
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Testy (<?php echo "{$testy_ok} z {$proces_cnt}: T {$testy_teoretyczne}, P {$testy_praktyczne}"; ?>) <b class="caret"></b></a>
|
|
|
<ul class="dropdown-menu">
|
|
|
<li>
|
|
|
@@ -746,7 +749,7 @@ jQuery(document).ready(function() {
|
|
|
<li<?php if ($active == 'kontakty') echo ' class="active"'; ?>><a href="index.php?MENU_INIT=VIEWTABLE_KONTAKTY" title="Kontakty">Kontakty</a></li>
|
|
|
<li<?php if ($active == 'przypomnij') echo ' class="active"'; ?>><a href="index.php?_route=Przypomnij&KTO=<?php echo User::getLogin(); ?>" title="Przypomnij">Przypomnij</a></li>
|
|
|
</ul>
|
|
|
- <form class="navbar-form navbar-left" role="search" action="procesy5.php?task=CRM_SEARCH" method="post">
|
|
|
+ <form class="navbar-form navbar-left" style="margin:3px 0;" role="search" action="procesy5.php?task=CRM_SEARCH" method="post">
|
|
|
<div class="input-group">
|
|
|
<input type="text" class="form-control input-sm" placeholder="Szukaj..." name="q">
|
|
|
<span class="input-group-btn">
|
|
|
@@ -756,7 +759,10 @@ jQuery(document).ready(function() {
|
|
|
</form>
|
|
|
<div class="navbar-form navbar-right">
|
|
|
<div class="btn-group">
|
|
|
- <button type="button" class="btn btn-link"><?php S::show_session_timer(); ?></button>
|
|
|
+ <button type="button" class="btn btn-link" style="margin:0; padding:6px 8px 4px 8px;"><?php S::show_session_timer(); ?></button>
|
|
|
+<!--
|
|
|
+ <a href="index.php?_route=UserMsgs" class="btn btn-link" style="margin:0; padding:6px 8px 0 8px; font-size:20px; line-height:24px;"><i class="glyphicon glyphicon-envelope"></i></a>
|
|
|
+-->
|
|
|
<div class="btn-group">
|
|
|
<button id="ProcesMenuLoginDropdownLink" type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><?php echo User::getName(); ?> <span class="caret"></span></button>
|
|
|
<ul class="dropdown-menu" role="menu">
|
