Updating js libraries: jquery ui to version to 1.10.3, jquery to version 1.10 , Bootstrap to 3.0.2, modernizr to version 2.7.0
Julio Montoya
12 years ago
parent
442e992b49
commit
3ce2029f24
File diff suppressed because it is too large
Load Diff
@ -1,61 +1,57 @@ |
||||
{% if menu is not null %} |
||||
<div class="navbar subnav"> |
||||
<div class="navbar-inner"> |
||||
{% if app.full_width == 1 %} |
||||
<div id="main" class="container-fluid"> |
||||
{% else %} |
||||
<div id="main" class="container"> |
||||
{% endif %} |
||||
<a data-toggle="collapse" data-target=".nav-collapse" class="btn btn-navbar"> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
</a> |
||||
<a class="brand" href="{{ _p.web }}">{{ portal_name }}</a> |
||||
<div class="nav-collapse"> |
||||
<ul class="nav"> |
||||
{{ menu }} |
||||
</ul> |
||||
<div class="navbar navbar-default nav-menu"> |
||||
|
||||
{% if _u.logged == 1 %} |
||||
<ul class="nav pull-right"> |
||||
{% if is_profile_editable == true %} |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> |
||||
{% if ('allow_message_tool' | get_setting) == 'true' %} |
||||
{{ _u.messages_count }} |
||||
{% endif %} |
||||
<img src="{{ _u.avatar_small }}"/> |
||||
{{ _u.complete_name }} |
||||
<b class="caret"></b> |
||||
</a> |
||||
<ul class="dropdown-menu"> |
||||
<li> |
||||
{{ profile_link }} |
||||
{{ message_link }} |
||||
</li> |
||||
</ul> |
||||
</li> |
||||
{% else %} |
||||
<div class="navbar-header"> |
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#menu-collapse"> |
||||
<span class="sr-only"> {{ "Toggle navigation" | trans }}</span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
</button> |
||||
</div> |
||||
|
||||
<div id="menu-collapse" class="navbar-collapse collapse"> |
||||
<ul class="nav navbar-nav"> |
||||
{{ menu }} |
||||
</ul> |
||||
|
||||
{% if _u.logged == 1 %} |
||||
<ul class="nav navbar-nav navbar-right"> |
||||
{% if is_profile_editable == true %} |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> |
||||
{% if ('allow_message_tool' | get_setting) == 'true' %} |
||||
{{ _u.messages_count }} |
||||
{% endif %} |
||||
<img src="{{ _u.avatar_small }}"/> |
||||
{{ _u.complete_name }} |
||||
<b class="caret"></b> |
||||
</a> |
||||
<ul class="dropdown-menu"> |
||||
<li> |
||||
<a> |
||||
{% if ('allow_message_tool' | get_setting) == 'true' %} |
||||
{{ _u.messages_count }} |
||||
{% endif %} |
||||
<img src="{{ _u.avatar_small }}"/> |
||||
{{ _u.complete_name }} |
||||
</a> |
||||
{{ profile_link }} |
||||
{{ message_link }} |
||||
</li> |
||||
{% endif %} |
||||
<li> |
||||
<a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('logout') }}" > |
||||
<img src="{{ "exit.png"|icon(22) }}"> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</ul> |
||||
</li> |
||||
{% else %} |
||||
<li> |
||||
<a> |
||||
{% if ('allow_message_tool' | get_setting) == 'true' %} |
||||
{{ _u.messages_count }} |
||||
{% endif %} |
||||
<img src="{{ _u.avatar_small }}"/> |
||||
{{ _u.complete_name }} |
||||
</a> |
||||
</li> |
||||
{% endif %} |
||||
<li> |
||||
<a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('logout') }}" > |
||||
<img src="{{ "exit.png"|icon(22) }}"> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
{% endif %} |
||||
|
||||
@ -1,93 +1,93 @@ |
||||
<!-- Topbar --> |
||||
{% if show_toolbar == 1 %} |
||||
<div id="topbar" class="navbar navbar-fixed-top"> |
||||
<div class="navbar-inner"> |
||||
{% if app.full_width == 1 %} |
||||
<div id="main" class="container-fluid"> |
||||
{% else %} |
||||
<div id="main" class="container"> |
||||
{% endif %} |
||||
|
||||
<a class="brand" href="{{ _p.web }}"> |
||||
<nav id="topbar" class="navbar navbar-default navbar-fixed-top" role="navigation"> |
||||
<div class="container"> |
||||
<div class="navbar-header"> |
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#topbar-collapse"> |
||||
<span class="sr-only"> {{ "Toggle navigation" | trans }}</span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
<span class="icon-bar"></span> |
||||
</button> |
||||
|
||||
<a class="navbar-brand" href="{{ _p.web }}"> |
||||
{{ "siteName" | get_setting }} |
||||
</a> |
||||
</div> |
||||
|
||||
{% if _u.logged %} |
||||
<div class="nav-collapse"> |
||||
<ul class="nav"> |
||||
<li class="active"><a href="{{ _p.web }}user_portal.php"> {{ "MyCourses"|get_lang }}</a></li> |
||||
{# |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Teaching'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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" data-toggle="dropdown" href="#">{{'Tracking'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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.web_main }}dashboard/">{{ "Dashboard"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
{% if _u.is_admin == 1 %} |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Administration'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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 }}session/session_list.php">{{ "SessionList"|get_lang }}</a></li> |
||||
<li class="divider"></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li> |
||||
<li class="divider"></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php?category=Plugins">{{ "Plugins"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php?category=Regions">{{ "Regions"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
|
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ 'Add'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}session/session_add.php">{{ "Session"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
{% endif %} |
||||
</ul> |
||||
|
||||
|
||||
{% if _u.logged %} |
||||
<div id="topbar-collapse" class="collapse navbar-collapse"> |
||||
<ul class="nav navbar-nav"> |
||||
<li class="active"> |
||||
<a href="{{ _p.web }}user_portal.php"> {{ "MyCourses"|get_lang }}</a> |
||||
</li> |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> |
||||
{{'Tracking'|get_lang }}<b class="caret"></b> |
||||
</a> |
||||
<ul class="dropdown-menu"> |
||||
<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.web_main }}dashboard/">{{ "Dashboard"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
{% if _u.is_admin == 1 %} |
||||
<form class="navbar-search pull-left" action="{{ _p.web_main }}admin/user_list.php" method="get"> |
||||
<input type="text" class="search-query span2" placeholder="{{'SearchUsers'|get_lang }}" name="keyword"> |
||||
</form> |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{'Administration'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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 }}session/session_list.php">{{ "SessionList"|get_lang }}</a></li> |
||||
<li class="divider"></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li> |
||||
<li class="divider"></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php?category=Plugins">{{ "Plugins"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}admin/settings.php?category=Regions">{{ "Regions"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
|
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ 'Add'|get_lang }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li> |
||||
<li><a href="{{ _p.web_main }}session/session_add.php">{{ "Session"|get_lang }}</a></li> |
||||
</ul> |
||||
</li> |
||||
{% endif %} |
||||
</ul> |
||||
|
||||
<ul class="nav pull-right"> |
||||
<li><a href="{{ _p.web_main }}social/home.php"><img src="{{ _u.avatar_small }}" /></a></li> |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ _u.complete_name }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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">{{ "Inbox"|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.web_main }}social/invitations.php">{{ "PendingInvitations"|get_lang }}</a></li> --> |
||||
</ul> |
||||
</li> |
||||
<li><a href="{{ _p.public_web }}logout">{{ "Logout"|get_lang }}</a></li> |
||||
</ul> |
||||
</div> <!-- /nav collapse --> |
||||
{% endif %} |
||||
</div> <!-- /container-fluid--> |
||||
</div><!-- /navbar-inner --> |
||||
</div><!-- /topbar --> |
||||
<div id="topbar_push"></div> |
||||
{% if _u.is_admin == 1 %} |
||||
<form class="navbar-form navbar-left" action="{{ _p.web_main }}admin/user_list.php" method="get"> |
||||
<div class="form-group"> |
||||
<input type="text" class="form-control" placeholder="{{'SearchUsers'|get_lang }}" name="keyword"> |
||||
</div> |
||||
</form> |
||||
{% endif %} |
||||
|
||||
<ul class="nav navbar-nav navbar-right"> |
||||
<li> |
||||
<a href="{{ _p.web_main }}social/home.php"><img src="{{ _u.avatar_small }}" /></a> |
||||
</li> |
||||
<li class="dropdown"> |
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ _u.complete_name }}<b class="caret"></b></a> |
||||
<ul class="dropdown-menu"> |
||||
<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">{{ "Inbox"|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.web_main }}social/invitations.php">{{ "PendingInvitations"|get_lang }}</a></li> --> |
||||
</ul> |
||||
</li> |
||||
<li><a href="{{ _p.public_web }}logout">{{ "Logout"|get_lang }}</a></li> |
||||
</ul> |
||||
</div> <!-- /nav collapse --> |
||||
{% endif %} |
||||
</div> <!-- /container--> |
||||
</nav><!-- /topbar --> |
||||
{% endif %} |
||||
|
||||
Loading…
Reference in new issue