1
0
forked from ScoDoc/ScoDoc

Cosmétique: barre page accueil

This commit is contained in:
Emmanuel Viennet 2021-09-10 23:18:27 +02:00
parent d14ec48602
commit a6b97e9667
4 changed files with 26 additions and 7 deletions

View File

@ -183,7 +183,7 @@ def _sem_table(sems):
"""Affiche liste des semestres, utilisée pour semestres en cours""" """Affiche liste des semestres, utilisée pour semestres en cours"""
tmpl = """<tr class="%(trclass)s">%(tmpcode)s tmpl = """<tr class="%(trclass)s">%(tmpcode)s
<td class="semicon">%(lockimg)s <a href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s#groupes">%(groupicon)s</a></td> <td class="semicon">%(lockimg)s <a href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s#groupes">%(groupicon)s</a></td>
<td class="datesem">%(mois_debut)s</td><td class="datesem"><a title="%(session_id)s">-</a> %(mois_fin)s</td> <td class="datesem">%(mois_debut)s <a title="%(session_id)s">-</a> %(mois_fin)s</td>
<td><a class="stdlink" href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(titre_num)s</a> <td><a class="stdlink" href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(titre_num)s</a>
<span class="respsem">(%(responsable_name)s)</span> <span class="respsem">(%(responsable_name)s)</span>
</td> </td>
@ -196,7 +196,7 @@ def _sem_table(sems):
H = ['<table class="listesems">'] H = ['<table class="listesems">']
for modalite in modalites: for modalite in modalites:
if len(modalites) > 1: if len(modalites) > 1:
H.append('<tr><th colspan="4">%s</th></tr>' % modalite["titre"]) H.append('<tr><th colspan="3">%s</th></tr>' % modalite["titre"])
if sems_by_mod[modalite["modalite"]]: if sems_by_mod[modalite["modalite"]]:
cur_idx = sems_by_mod[modalite["modalite"]][0]["semestre_id"] cur_idx = sems_by_mod[modalite["modalite"]][0]["semestre_id"]

View File

@ -96,6 +96,10 @@ tr.bandeaugtr {
text-decoration: underline; text-decoration: underline;
} }
.navbar-default .navbar-nav>li.logout a {
color: rgb(255,0,0);
}
/* ----- page content ------ */ /* ----- page content ------ */
div.about-logo { div.about-logo {
@ -324,6 +328,9 @@ table.listesems th {
padding-top: 0.5em; padding-top: 0.5em;
padding-left: 0.5em; padding-left: 0.5em;
} }
table.listesems td {
vertical-align: center;
}
table.listesems td.semicon { table.listesems td.semicon {
padding-left: 1.5em; padding-left: 1.5em;
@ -333,6 +340,11 @@ table.listesems tr.firstsem td {
padding-top: 0.8em; padding-top: 0.8em;
} }
td.datesem {
font-size: 80%;
white-space: nowrap;
}
h2.listesems { h2.listesems {
padding-top: 10px; padding-top: 10px;
padding-bottom: 0px; padding-bottom: 0px;

View File

@ -25,15 +25,21 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
{% if current_user.is_administrator() %} {% if current_user.is_administrator() %}
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{{ url_for('scodoc.configuration') }}">Configuration</a></li> <li><a href="{{ url_for('scodoc.configuration') }}">configuration</a></li>
</ul> </ul>
{% endif %} {% endif %}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% if current_user.is_anonymous %} {% if current_user.is_anonymous %}
<li><a href="{{ url_for('auth.login') }}">Login</a></li> <li><a href="{{ url_for('auth.login') }}">connexion</a></li>
{% else %} {% else %}
<li>{{current_user.user_name}}</li> <li>{% if current_user.dept %}
<li><a href="{{ url_for('auth.logout') }}">Logout</a></li> <a href="{{ url_for('users.user_info_page', scodoc_dept=current_user.dept, user_name=current_user.user_name )
}}">{{current_user.user_name}} ({{current_user.dept}})</a>
{% else %}
<a href="">{{current_user.user_name}}</a>
{% endif %}
</li>
<li class="logout"><a href="{{ url_for('auth.logout') }}">déconnexion</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

View File

@ -38,8 +38,9 @@
</form> </form>
{% endif %} {% endif %}
<!--
<div style="margin-top: 1cm;"> <div style="margin-top: 1cm;">
<p><a href="/ScoDoc/static/mobile">Charger la version mobile (expérimentale)</a></p> <p><a href="/ScoDoc/static/mobile">Charger la version mobile (expérimentale)</a></p>
</div> </div> -->
{% endblock %} {% endblock %}