fix grid courses and menu - refs BT#11017

ofaj
Alex Aragon 10 years ago
parent 4c9290bd78
commit 9e86eed26b
  1. 35
      app/Resources/public/css/themes/rainbow/default.css
  2. 13
      main/template/rainbow/layout/menu.tpl
  3. 6
      main/template/rainbow/user_portal/grid_courses.tpl
  4. 3
      main/template/rainbow/user_portal/index.tpl
  5. 5
      main/template/rainbow/user_portal/index_grid.tpl
  6. 103
      main/template/rainbow/user_portal/session.tpl

@ -29,8 +29,6 @@
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
}
html {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
@ -41,7 +39,6 @@ body {
line-height: 1.72222;
background: url('images/bg.png') center center repeat-x;
}
a {
color: #00829C;
text-decoration: none;
@ -108,6 +105,10 @@ a:focus {
color: #FFFFFF;
}
/* Menu Option */
.item-menu{
width: 165px;
text-align: center;
}
.item-menu a{
color: #fff !important;
font-size: 15px;
@ -255,7 +256,6 @@ a:focus {
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus{
background: #07578a;
color: #ffffff;
}
.navbar-nav > li > .dropdown-menu{
min-width: 100%;
@ -266,18 +266,29 @@ a:focus {
}
.navbar-default .navbar-nav > .open > .dropdown-menu{
padding: 3px 4px;
background-color: #07578a;
}
.navbar-default .navbar-nav > .open > .dropdown-menu > li > a{
padding: 6px 9px;
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
color: #ffffff !important;
font-weight: normal;
}
.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:hover,
.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:focus{
background-color:#2E75A3;
.navbar-right .dropdown .dropdown-toggle{
padding-top: 5px;
padding-bottom: 5px;
}
.dropdown-toggle .img-circle{
border: 2px solid #ccc;
}
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus{
background-color: #FFF;
}
.navbar-default .navbar-nav > li > a:focus,
.navbar-default .navbar-nav > li > a:hover{
color: #666666;
}
.nav > li > a:hover, .nav > li > a:focus{
background-color: transparent;
@ -388,4 +399,10 @@ footer a:hover{
}
.page-header{
margin: 10px 0 10px;
}
@media (max-width: 480px) {
.item-menu{
width: 100%;
text-align: center;
}
}

@ -9,13 +9,13 @@
<span class="icon-bar"></span>
</button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="menuone">
<ul class="nav navbar-nav">
{% if _u.logged == 1 %}
{% for items in menu %}
{% if items.key != 'profile' and items.key != 'dashboard' %}
{% if items.key != 'profile' and items.key != 'dashboard' and items.key != 'admin' and items.key != 'agenda' %}
{% set counter = counter + 1 %}
<li class="item-menu menu-{{ counter }} {{ items.key }} {{ items.current }}"><a href="{{ items.url }}">{{ items.title }}</a></li>
{% endif %}
@ -24,7 +24,7 @@
{% if _u.logged == 0 %}
<li class="item-menu menu-1"><a href="{{ _p.web }}">{{ "CampusHomepage"|get_lang }}</a></li>
{% endif %}
<li class="item-menu menu-2"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
<li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
{% if _u.logged == 0 %}
<li class="item-menu menu-3"><a href="{{ _p.web }}main/auth/inscription.php">{{ "Subscription"|get_lang }}</a></li>
<li class="item-menu menu-4"><a href="#">{{ "Demo"|get_lang }}</a></li>
@ -39,9 +39,14 @@
{% if _u.status != 6 %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
{{ _u.complete_name }} <span class="caret"></span>
<img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
{% if _u.is_admin == 1 %}
<li class=""><a href="{{ _p.web }}main/admin">{{ "NomPageAdmin"|get_lang }}</a></li>
{% endif %}
<li class=""><a href="{{ _p.web }}main/calendar/agenda_js.php?type=personal">{{ "AllowPersonalAgendaTitle"|get_lang }}</a></li>
<li role="separator" class="divider"></li>
<li>
{{ profile_link }}
{{ message_link }}

@ -2,7 +2,7 @@
<div class="grid-courses">
<div class="row">
{% for item in special_courses %}
<div class="col-md-4 col-sm-4 col-xs-6">
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="items">
<div class="image">
<div class="pin">{{ item.icon }}</div>
@ -76,7 +76,7 @@
<div class="panel-body">
<div class="row">
{% for item in category.courses %}
<div class="col-md-4 col-sm-4 col-xs-6">
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="items">
<div class="image">
<img src="{{ item.image }}" class="img-responsive">
@ -141,7 +141,7 @@
<!-- end courses in category -->
<div class="row">
{% for item in courses.not_category %}
<div class="col-md-4 col-sm-4 col-xs-6">
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="items">
<div class="image">
<img src="{{ item.image }}" class="img-responsive">

@ -1,3 +0,0 @@
{% for item in items %}
{{ item }}
{% endfor %}

@ -1,5 +0,0 @@
{% for item in items %}
<div class="well">
{{ item }}
</div>
{% endfor %}

@ -1,103 +0,0 @@
<div class="panel panel-default">
{% if not session.show_simple_session_info %}
<div class="panel-heading">
{% if session.show_link_to_session %}
<a href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ session.id }}">
<img id="session_img_{{ session.id }}" src="{{ "window_list.png"|icon(32) }}" width="32" height="32" alt="{{ session.title }}" title="{{ session.title }}">
{{ session.title }}
</a>
{% else %}
<img id="session_img_{{ session.id }}" src="{{ "window_list.png"|icon(32) }}" width="32" height="32" alt="{{ session.title }}" title="{{ session.title }}">
{{ session.title }}
{% endif %}
{% if session.show_actions %}
<div class="pull-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ session.id }}">
<img src="{{ "edit.png"|icon(22) }}" width="22" height="22" alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}
</div>
{% endif %}
<div class="sessions panel-body">
{% if session.show_simple_session_info %}
<div class="row">
<div class="col-md-7">
<h3>
{{ session.title ~ session.notifications }}
</h3>
{% if session.show_description %}
<div>
{{ session.description }}
</div>
{% endif %}
{% if session.subtitle %}
<small>{{ session.subtitle }}</small>
{% endif %}
{% if session.teachers %}
<h5 class="teacher-name">{{ "teacher.png"|icon(16) ~ session.teachers }}</h5>
{% endif %}
{% if session.coaches %}
<h5 class="teacher-name">{{ "teacher.png"|icon(16) ~ session.coaches }}</h5>
{% endif %}
</div>
{% if session.show_actions %}
<div class="col-md-5 text-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ session.id }}">
<img src="{{ "edit.png"|icon(22) }}" width="22" height="22" alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}
</div>
{% else %}
<div class="row">
<div class="col-md-12">
{% if session.subtitle %}
<div class="subtitle-session">
<em class="fa fa-clock-o"></em> {{ session.subtitle }}
</div>
{% endif %}
{% if session.show_description %}
<div class="description-session">
{{ session.description }}
</div>
{% endif %}
<div class="sessions-items">
{% for item in session.courses %}
<div class="row">
<div class="col-md-2">
{% if item.link %}
<a href="{{ item.link }}" class="thumbnail">{{ item.icon }}</a>
{% else %}
{{ item.icon }}
{% endif %}
</div>
<div class="col-md-10">
{{ item.title }}
{% if item.coaches|length > 0 %}
<img src="{{ 'teacher.png'|icon(16) }}" width="16" height="16">
{% for coach in item.coaches %}
{{ loop.index > 1 ? ' | ' }}
<a href="{{ _p.web_ajax ~ 'user_manager.ajax.php?' ~ {'a': 'get_user_popup', 'user_id': coach.user_id}|url_encode() }}" data-title="{{ coach.full_name }}" class="ajax">
{{ coach.full_name }}
</a>
{% endfor %}
{% endif %}
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
</div>
Loading…
Cancel
Save