entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

style: merge .warning and #highlight

This commit is contained in:
Jérôme Schneider 2014-04-01 18:34:58 +02:00
parent 0052d80130
commit 636dcdbaef
5 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calebasse/dossiers/templates/dossiers/patientaddress_confirm_delete.html
View File

@ -5,7 +5,7 @@
{% endif %}
<form action="{{ request.get_full_path }}" method="post">{% csrf_token %}
{% if object.place_of_life %}
<p class="warning">ATTENTION cette adresse est un lieu de vie</p>
<p class="highlight">ATTENTION cette adresse est un lieu de vie</p>
{% endif %}
<p>Êtes-vous sûr de vouloir supprimer l'adresse : {{ object.display_name }} ?</p>
</form>

16
calebasse/dossiers/templates/dossiers/patientrecord_tab1_general.html
View File

@ -14,9 +14,9 @@
{% if nb_place_of_lifes == 1 %}
<label>Lieux de vie :</label>
{% elif nb_place_of_lifes > 1 %}
<label class="warning">{{ nb_place_of_lifes }} lieux de vie :</label>
<label class="highlight">{{ nb_place_of_lifes }} lieux de vie :</label>
{% else %}
<label class="warning">Pas de lieu de vie</label>
<label class="highlight">Pas de lieu de vie</label>
{% endif %}
{% if object.contact_comment %}<pre>{{ object.contact_comment }}</pre>{% endif %}
{% if object.addresses.all %}
@ -25,7 +25,7 @@
{% if address.place_of_life %}<li>✔ {{ address.display_name }}</li>{% endif %}
{% endfor %}
</ul>
{% else %}Aucun{% endif %}
{% endif %}
</li>
<li><label>Date de contact :</label> {{ initial_state.date_selected|date:"d/m/Y" }}</li>
<li><label>Date de création :</label> {{ object.created|date:"d/m/Y" }}</li>
@ -96,11 +96,11 @@
<div class="notifs">
<h4>Information sur la prise en charge</h4>
<ul>
<li><span{% if hc_status.1 %} id="highlight"{% endif %}>{{ hc_status.0 }}</span></li>
{% if object.pause %}<li><span id="highlight">Le dossier est en pause facturation.</span></li>{% endif %}
{% if missing_policy %}<li><span id="highlight">Informations d'assuré social manquantes.</span></li>{% endif %}
{% if missing_birthdate %}<li><span id="highlight">Date de naissance manquante.</span></li>{% endif %}
{% if object.policyholder.ame %}<li><span id="highlight">Le contact assuré est AME.</span></li>{% endif %}
<li><span{% if hc_status.1 %} class="highlight"{% endif %}>{{ hc_status.0 }}</span></li>
{% if object.pause %}<li><span class="highlight">Le dossier est en pause facturation.</span></li>{% endif %}
{% if missing_policy %}<li><span class="highlight">Informations d'assuré social manquantes.</span></li>{% endif %}
{% if missing_birthdate %}<li><span class="highlight">Date de naissance manquante.</span></li>{% endif %}
{% if object.policyholder.ame %}<li><span class="highlight">Le contact assuré est AME.</span></li>{% endif %}
</div>
{% endif %}

10
calebasse/dossiers/templates/dossiers/patientrecord_tab4_notifs.html
View File

@ -3,11 +3,11 @@
<div class="notifs">
<h4>Information sur la prise en charge</h4>
<ul>
<li><span{% if hc_status.1 %} id="highlight"{% endif %}>{{ hc_status.0 }}</span></li>
{% if object.pause %}<li><span id="highlight">Le dossier est en pause facturation.</span></li>{% endif %}
{% if missing_policy %}<li><span id="highlight">Informations d'assuré sociale manquantes.</span></li>{% endif %}
{% if missing_birthdate %}<li><span id="highlight">Date de naissance manquante.</span></li>{% endif %}
{% if object.policyholder.ame %}<li><span id="highlight">Le contact assuré est AME.</span></li>{% endif %}
<li><span{% if hc_status.1 %} class="highlight"{% endif %}>{{ hc_status.0 }}</span></li>
{% if object.pause %}<li><span class="highlight">Le dossier est en pause facturation.</span></li>{% endif %}
{% if missing_policy %}<li><span class="highlight">Informations d'assuré sociale manquantes.</span></li>{% endif %}
{% if missing_birthdate %}<li><span class="highlight">Date de naissance manquante.</span></li>{% endif %}
{% if object.policyholder.ame %}<li><span class="highlight">Le contact assuré est AME.</span></li>{% endif %}
</div>
<p>
<button id="new-hcdiag-btn">Nouvelle PC diagnostic</button>

2
calebasse/dossiers/templates/dossiers/patientrecord_update.html
View File

@ -14,7 +14,7 @@
{% block title %}{{ object.last_name }} {{ object.first_name }}{% if object.paper_id %} - Dossier {{ object.paper_id}}{% endif %}{% endblock %}
{% block appbar %}
<h2><strong>{% if current_state.status.type == 'CLOS' %}<span id="highlight">{% endif %}<span class="lastname">{{ object.last_name }}</span> {{ object.first_name }}{% if object.paper_id %} - Dossier {{ object.paper_id}}{% endif %}{% if current_state.status.type == 'CLOS' %} clos</span>{% endif %}</strong></h2>
<h2><strong>{% if current_state.status.type == 'CLOS' %}<span class="highlight">{% endif %}<span class="lastname">{{ object.last_name }}</span> {{ object.first_name }}{% if object.paper_id %} - Dossier {{ object.paper_id}}{% endif %}{% if current_state.status.type == 'CLOS' %} clos</span>{% endif %}</strong></h2>
<span id="ajax-redirect" data-url="{{ object.id }}/view"/>
<a href="..">Retourner aux dossiers</a>
{% if 'validator' in role %}{% if object.can_be_deleted %}<button type="button" id="patientrecord-delete">Supprimer</button>{% endif %}{% endif %}

8
calebasse/static/css/style.css
View File

@ -1178,8 +1178,9 @@ a [class^="icon-"], a [class*=" icon-"] {
text-decoration: inherit;
}
#highlight {
.highlight, div#tabs label.highlight {
color: #FF7800;
font-weight: bold;
}
#last_name_matches {
@ -1370,11 +1371,6 @@ div.statistic {
list-style-type: none;
}
.warning, div#tabs label.warning {
color: orange;
font-weight: bold;
}
.social-security-label {
cursor: pointer;
}