diff options
21 files changed, 78 insertions, 71 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index ecd80e36f..4102c01c4 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -25,7 +25,7 @@ {% if item.operation.code_patriarche %} <p><label>{%trans "Complete ID:"%}</label> {% else %} -<p class='alert'><label>{%trans "Patriarche OA code not yet recorded!"%}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Patriarche OA code not yet recorded!"%}</label></p> <p><label>{%trans "Temporary ID:"%}</label> {%endif%} <span class='value'>{{item.full_label}}</span></p> @@ -84,7 +84,7 @@ <td class='string'>{{ relation.right_record.datings.all|join:", " }}</td>{# periods ?#} <td class='string'>{{ relation.right_record.description }}</td> <td class='string'>{{ relation.right_record.parcel.section }} - {{relation.right_record.parcel.parcel_number}}</td> - <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-contextrecord relation.right_record.pk ''%}")'>{% trans "Details" %}</a></td> + <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-contextrecord relation.right_record.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% endfor %} <table class='simple'> @@ -98,7 +98,7 @@ {% if item.operation.code_patriarche %} <p><label>{%trans "Patriarche OA code:"%}</label> <span class='value'>{{ item.operation.code_patriarche }}</span></p> -{% else %}<p class='alert'><label>{%trans "Patriarche OA code not yet recorded!"%}</label></p> +{% else %}<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Patriarche OA code not yet recorded!"%}</label></p> {%endif%} {#<p><label>{%trans "Operation's name:"%}</label><span class='value'>{{ item.operation.internal_reference }}</span></p>#} <p><label>{%trans "Head scientist:"%}</label> @@ -120,7 +120,7 @@ <p><label>{%trans "Related operation:"%}</label> <span class='value'><a href="#" onclick='load_window("{% url show-operation item.operation.pk ''%}");'>{{ item.operation }}</a></span></p> {# TODO: Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related operation #} -{% else %}<p class='alert'><label>{%trans "No operation linked to this context unit!"%}</label></p> +{% else %}<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "No operation linked to this context unit!"%}</label></p> {% endif %} {% trans "Document from this context record" as cr_docs %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 3272e87e3..7a6120e42 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -137,7 +137,7 @@ <td class='string'>{{operation.in_charge|default:""}}</td> <td>{{operation.start_date|default:""}}</td> <td>{{operation.excavation_end_date|default:""}}</td> - <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td> + <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% empty %} <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr> diff --git a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html index fd85de473..f5268f582 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html @@ -5,10 +5,10 @@ {% block "warning_informations" %} {% for file in numeric_reference_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files have the same numeric index as this file:" %}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{% trans "The following files have the same numeric index as this file:" %}</label></p> <ul> {% endif%} - <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> + <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% if forloop.last %} </ul> <hr/> @@ -16,10 +16,10 @@ {% endfor %} {% for file in similar_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files are in the same town and have parcels in common with this file:" %}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{% trans "The following files are in the same town and have parcels in common with this file:" %}</label></p> <ul> {% endif%} - <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> + <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% if forloop.last %} </ul> <hr/> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index d1cd1578c..9af7a3e44 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -26,7 +26,7 @@ <div class='tool modify'><a href='{% url operation_modify item.pk %}'>{% trans "Modify" %}</a></div> {% if item.virtual_operation %} -<p class='alert'>{% trans "This operation is virtual." %}</p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans "This operation is virtual." %}</p> {% endif %} <h3>{% trans "General"%}</h3> @@ -35,7 +35,7 @@ {% if item.operation_code %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value strong'>{{ item.operation_code }}</span></p>{% endif %} {% if item.code_patriarche %}<p><label>{%trans "Patriarche OA code:"%}</label> <span class='value'>OA{{ item.code_patriarche }}</span></p>{%else%} -<p class='alert'>{%trans "Patriarche OA code not yet recorded!"%}</p>{%endif%} +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {%trans "Patriarche OA code not yet recorded!"%}</p>{%endif%} <p><label>{%trans "Edition date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></p> <!-- date = now --> <p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.full_label }}</span></p> @@ -117,7 +117,7 @@ {% ifchanged rel.relation_type %} {% if forloop.counter0 %}</ul>{% endif %} <h4>{{rel.relation_type}}</h4><ul>{% endifchanged %} -<li><a href="#" onclick="load_window('/show-operation/{{rel.right_record.pk}}/');" class="display_details">{% trans "Details" %}</a> {{rel.right_record}}</li> +<li><a href="#" onclick="load_window('/show-operation/{{rel.right_record.pk}}/');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> {{rel.right_record}}</li> {% if forloop.last %}</ul>{% endif %} {% endfor %} {% endif %} diff --git a/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html b/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html index 0b44b4ad0..0e47a417c 100644 --- a/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html +++ b/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html @@ -3,6 +3,6 @@ {% block "extra_informations" %} {% if current_object.index %} -<p class='alert'><label>{%trans "This act is indexed!"%}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "This act is indexed!"%}</label></p> {% endif %} {% endblock %} diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index e74a6d205..51b9de79d 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -33,6 +33,9 @@ a.add-button, color:#fff; } +#context_menu { +} + #context_menu .orange { color:#dd6011; } @@ -44,11 +47,12 @@ a.add-button, #context_menu .normal{ color:#000; } +#context_menu .basket{ + font-family: 'FontAwesome', Arial, Helvetica, sans-serif; +} #context_menu option.basket{ color:#000; - font-weight: bold; - font-style: italic; } /* borders */ @@ -94,7 +98,7 @@ div.form { } body{ - font-family:Arial, Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; font-size: 11pt; margin:0; color:#61615C; @@ -242,7 +246,10 @@ div.nav-button{ width:15px; z-index:1000; position:fixed; - right:20px; + right:32px; + font-size: 40px; + background-color: transparent; + border: 0 solid transparent; } #to_bottom_arrow{ @@ -300,12 +307,9 @@ a.button{ .display_details_inline, .display_details{ display:inline-block; - font-size:0; - color:transparent; + font-size:18px; width:18px; height:16px; - background-image:url(images/info.png); - background-repeat:no-repeat; text-decoration:none; vertical-align: bottom; } @@ -747,15 +751,18 @@ table.confirm tr.spacer td:last-child{ .previous_page, .next_page{ position:absolute; - top:1px; + top:40px; + font-size: 30px; + color: #000; + z-index: 1000; } .previous_page{ - left:135px; + left:35px; } .next_page{ - right:135px; + right:35px; } a.photo{ @@ -996,8 +1003,7 @@ p.info-box, p.alert{ display:block; font-style:italic; width:670px; - padding:1em; - padding-left:2em; + padding:1em 0.5em; background-color:#f1f2f6; -moz-border-radius:8px; -webkit-border-radius:8px; @@ -1005,11 +1011,12 @@ p.info-box, p.alert{ font-size: 0.9em; } +p.info-box .fa, p.alert .fa{ + padding-right: 1em; +} + p.alert{ color:#D14; - background-image:url(images/red_flag.png); - background-repeat:no-repeat; - background-position:left center; } div.form p.alert{ diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 8cd3c7793..b325be2fb 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -20,6 +20,7 @@ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script> <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css" rel="stylesheet" /> + <link rel="stylesheet" href="{{STATIC_URL}}/font-awesome/css/font-awesome.min.css" /> <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" /> <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css" /> <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> @@ -54,10 +55,10 @@ {% endblock %} </div> <div class="nav-button ui-state-default ui-corner-all" id="to_bottom_arrow"> - <span class="ui-icon ui-icon-circle-arrow-s"></span> + <i class="fa fa-arrow-circle-down" aria-hidden="true"></i> </div> <div class="nav-button ui-state-default ui-corner-all" id="to_top_arrow"> - <span class="ui-icon ui-icon-circle-arrow-n"></span> + <i class="fa fa-arrow-circle-up" aria-hidden="true"></i> </div> <div id="window"></div> <div id="logo"> @@ -75,10 +76,10 @@ <td> <select class='{{main_cls}}' id='current_{{model_name}}'> <option class='normal' value=''>--</option> - {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{%endif%}>{{label}}</option> + {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %} {% endifequal %}{{label}}</option> {% endfor %}</select> </td>{% with 'show-'|add:model_name as model_url%} - <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></td> + <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> {% endwith %} </tr> {% endfor %} diff --git a/ishtar_common/templates/ishtar/basket_list.html b/ishtar_common/templates/ishtar/basket_list.html index a0a0e5d73..011ed97a0 100644 --- a/ishtar_common/templates/ishtar/basket_list.html +++ b/ishtar_common/templates/ishtar/basket_list.html @@ -1,7 +1,7 @@ {% load i18n %} <table> <tr>{% for item in basket.items.all %} - <td><a class="display_details" href="#" onclick="load_window('{{item_url}}/{{item.pk}}/');">{% trans 'Details' %}</a></td> + <td><a class="display_details" href="#" onclick="load_window('{{item_url}}/{{item.pk}}/');"><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> <td>{{item.full_label}}</td> <td><a class='async-link' data-target='#basket-content' href='{{delete_url}}/{{basket.pk}}/{{item.pk}}/'>{% trans "remove" %}</a></td></tr>{% endfor %} </table> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index d7ea16d90..ff6234764 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -16,12 +16,12 @@ <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> <div class='table'> <div id="chart_{{unique_id}}" style="height:400px; width:700px;"></div> - <p class='info-box'>{% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}</p> + <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> {% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}</p> <div class='form chart-img-form'> <button id="chart_img_display_{{unique_id}}" class='submit'>{% trans "Display as an image" %}</button> <div id="chart_img_{{unique_id}}" class='chart-img'> <div id="img_{{unique_id}}"></div> - <p class='info-box'>{% trans 'Right-click on this image to save it.' %}</p> + <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> {% trans 'Right-click on this image to save it.' %}</p> </div> </div> </div> @@ -105,7 +105,7 @@ if (typeof values_1_{{unique_id}} === 'undefined' || values_1_{{unique_id}}.length == 0){ $('#chart_img_{{unique_id}}').hide(); -$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for these criteria.' %}</p>"); +$('#chart_{{unique_id}}').html("<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans 'No data for these criteria.' %}</p>"); } else { var showmarker = false; diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html index 6332b326e..64793c46d 100644 --- a/ishtar_common/templates/ishtar/manage_basket.html +++ b/ishtar_common/templates/ishtar/manage_basket.html @@ -4,7 +4,7 @@ <h2>{{page_name}}{% trans ":"%} {{basket}}</h2> <form enctype="multipart/form-data" action="." method="post">{% csrf_token %} <div class='form'> -<p class='alert'>{% trans 'Checking "Select all" only select the current page.' %}</p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans 'Checking "Select all" only select the current page.' %}</p> {{form}} <button id='add_to' onclick='return false'>{% trans "Add" %}</button> <h3>{% trans "Basket content" %}</h3> diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html index edd27a722..0e15da62a 100644 --- a/ishtar_common/templates/ishtar/merge.html +++ b/ishtar_common/templates/ishtar/merge.html @@ -4,7 +4,7 @@ {% block content %} <h2>{% trans "Merge" %}</h2> <div class='form'> -<p class='alert'><label>{%trans "Every operation on this form is irreversible"%}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Every operation on this form is irreversible"%}</label></p> <p>{% if previous_page %}<a href='{% url current_url 1 %}'>↞</a><a href='{% url current_url previous_page %}'>←</a>{% else %} {% endif %} {% trans "Page " %}{{current_page}}/{{max_page}} {% if next_page %}<a href='{% url current_url next_page %}'>→</a><a href='{% url current_url max_page %}'>↠</a>{% else %} {% endif %} </p> diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html index e4ca430a1..87eab7d53 100644 --- a/ishtar_common/templates/ishtar/merge_organization.html +++ b/ishtar_common/templates/ishtar/merge_organization.html @@ -4,14 +4,14 @@ {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %} <tr> <td> - <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details">Détails</a> + <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})<br /> {{form.instance.from_organization.address_lbl|linebreaksbr}} </td> <td> - <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details">Détails</a> + <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})<br /> diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html index f677a5cf3..4e76c804b 100644 --- a/ishtar_common/templates/ishtar/merge_person.html +++ b/ishtar_common/templates/ishtar/merge_person.html @@ -4,14 +4,14 @@ {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %} <tr> <td> - <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details">Détails</a> + <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> {{form.instance.from_person}} ({{form.instance.from_person.pk}})<br/> {{form.instance.from_person.address_lbl|linebreaksbr}} </td> <td> - <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details">Détails</a> + <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> {{form.instance.to_person}} ({{form.instance.to_person.pk}})<br/> diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index 714bfa762..5cb75ea3a 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -18,10 +18,10 @@ <div class="head"> -<a href='#' class='previous_page ui-icon ui-icon-circle-arrow-w'>{% trans "Previous" %}</a> +<a href='#' class='previous_page'><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></a> <a href='#' onclick='$("#{{window_id}}").hide("slow")'>{% trans "Close" %}</a> - <a href='#' onclick='closeAllWindows();'>{% trans "Close all windows" %}</a> -<a href='#' class='next_page ui-icon ui-icon-circle-arrow-e'>{% trans "Next" %}</a> +<a href='#' class='next_page'><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a> </div> diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html index c5f01b96a..8deeebf98 100644 --- a/ishtar_common/templates/ishtar/sheet_organization.html +++ b/ishtar_common/templates/ishtar/sheet_organization.html @@ -32,7 +32,7 @@ <td class='string'>{{person.name|default:""}}</td> <td class='string'>{{person.surname|default:""}}</td> <td>{% for type in person.person_types.all %}{% if forloop.counter0 %}, {% endif %}{{type.label}}{% endfor %}</td> - <td class='link'><a class='display_details' href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "Details" %}</a></td> + <td class='link'><a class='display_details' href="#" onclick='load_window("{%url show-person person.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% empty %} <tr><td colspan="8" class='no_items'>{% trans "No person in this organization" %}</td></tr> diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index 5afa69360..e417b5e4d 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -9,7 +9,7 @@ {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} -{% if automatic_parcel_association %}<p class='alert'><label>{%trans "Existing parcels from the operation will be automatically added to the archaeological file." %}</label></p>{% endif %} +{% if automatic_parcel_association %}<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Existing parcels from the operation will be automatically added to the archaeological file." %}</label></p>{% endif %} {%if wizard.form.non_form_errors%} <table class='formset'> <tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr> diff --git a/ishtar_common/templates/ishtar/wizard/towns_wizard.html b/ishtar_common/templates/ishtar/wizard/towns_wizard.html index 4f9ff6c5f..889108f32 100644 --- a/ishtar_common/templates/ishtar/wizard/towns_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/towns_wizard.html @@ -24,7 +24,7 @@ </table> {% endif %} {% else %} -<p class='alert'>{% trans "No town set in the associated file." %}</p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans "No town set in the associated file." %}</p> {% endif %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html index 6de2fbe8c..c4d765352 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_organization_deletion.html @@ -6,7 +6,7 @@ <h3>{% trans "Associated persons" %}</h3> <ul class='list'> {% for person in current_object.members.all %} - <li>{{person}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{person}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-person person.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -14,7 +14,7 @@ <h3>{% trans "Associated archaeological files" %}</h3> <ul class='list'> {% for file in current_object.files.all %} - <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -22,7 +22,7 @@ <h3>{% trans "Operator of archaeological operations" %}</h3> <ul class='list'> {% for operation in current_object.operator.all %} - <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -30,7 +30,7 @@ <h3>{% trans "Adminact: operator of archaeological operations" %}</h3> <ul class='list'> {% for adminact in current_object.adminact_operator.all %} - <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html index ee04fbd84..03b941c60 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html @@ -6,7 +6,7 @@ <h3>{% trans "In charge of archaeological files" %}</h3> <ul class='list'> {% for file in current_object.file_responsability.all %} - <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -14,7 +14,7 @@ <h3>{% trans "General contractor of archaeological files" %}</h3> <ul class='list'> {% for file in current_object.general_contractor.all %} - <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -22,7 +22,7 @@ <h3>{% trans "Responsible town planning service of archaeological files" %}</h3> <ul class='list'> {% for file in current_object.responsible_town_planning_service.all %} - <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -30,7 +30,7 @@ <h3>{% trans "Scientist in charge of archaeological files" %}</h3> <ul class='list'> {% for file in current_object.scientist.all %} - <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -38,7 +38,7 @@ <h3>{% trans "Scientist in charge of archaeological operations" %}</h3> <ul class='list'> {% for operation in current_object.operation_scientist_responsability.all %} - <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -46,7 +46,7 @@ <h3>{% trans "In charge of archaeological operations" %}</h3> <ul class='list'> {% for operation in current_object.operation_responsability.all %} - <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -54,7 +54,7 @@ <h3>{% trans "Rapporteur CIRA des operations" %}</h3> <ul class='list'> {% for operation in current_object.cira_rapporteur.all %} - <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -62,7 +62,7 @@ <h3>{% trans "Administrativ act: in charge of archaeological operations" %}</h3> <ul class='list'> {% for adminact in current_object.adminact_operation_in_charge.all %} - <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -70,7 +70,7 @@ <h3>{% trans "Administrativ act: scientist in charge" %}</h3> <ul class='list'> {% for adminact in current_object.adminact_scientist.all %} - <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -78,7 +78,7 @@ <h3>{% trans "Administrativ act: signatory" %}</h3> <ul class='list'> {% for adminact in current_object.signatory.all %} - <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{adminact}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-administrativeact adminact.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} @@ -95,10 +95,10 @@ <ul class='list'> {% for treatments in current_object.treatments.all %} {% if treatment.downstream_treatment %} - <li>{{treatment.downstream_treatment}} ({% trans "downstream"%}) <a class='display_details_inline' href="#" onclick='load_window("{%url show-item treatment.downstream_treatment ''%}")'>{% trans "show"%}</a></li> + <li>{{treatment.downstream_treatment}} ({% trans "downstream"%}) <a class='display_details_inline' href="#" onclick='load_window("{%url show-item treatment.downstream_treatment ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% endif %} {% if treatment.upstream_treatment %} - <li>{{treatment.upstream_treatment}} ({% trans "upstream"%}) <a class='display_details_inline' href="#" onclick='load_window("{%url show-find treatment.upstream_treatment ''%}")'>{% trans "show"%}</a></li> + <li>{{treatment.upstream_treatment}} ({% trans "upstream"%}) <a class='display_details_inline' href="#" onclick='load_window("{%url show-find treatment.upstream_treatment ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% endif %} {% endfor %} </ul> @@ -108,7 +108,7 @@ <h3>{% trans "Property of items" %}</h3> <ul class='list'> {% for property in current_object.properties.all %} - <li>{{property.find}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-find property.find.pk ''%}")'>{% trans "show"%}</a></li>{% endfor %} + <li>{{property.find}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-find property.find.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> {% endif %} diff --git a/ishtar_common/templatetags/link_to_window.py b/ishtar_common/templatetags/link_to_window.py index 009a089d2..79666eba8 100644 --- a/ishtar_common/templatetags/link_to_window.py +++ b/ishtar_common/templatetags/link_to_window.py @@ -4,7 +4,6 @@ from django.core.urlresolvers import reverse from django.template import Library from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ register = Library() @@ -13,9 +12,9 @@ register = Library() def link_to_window(item): return mark_safe( u' <a class="display_details" href="#" ' - u'onclick="load_window(\'{}\')">{}</a>'.format( - reverse(item.SHOW_URL, args=[item.pk, '']), - _("Details"))) + u'onclick="load_window(\'{}\')">' + u'<i class="fa fa-info-circle" aria-hidden="true"></i></a>'.format( + reverse(item.SHOW_URL, args=[item.pk, '']))) @register.filter diff --git a/ishtar_common/views.py b/ishtar_common/views.py index d508444a4..e05d63db3 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -658,8 +658,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], datas = reversed(datas) datas = list(datas)[start:end] link_template = "<a class='display_details' href='#' "\ - "onclick='load_window(\"%%s\")'>%s</a>" % \ - (unicode(_("Details"))) + "onclick='load_window(\"%s\")'>"\ + "<i class=\"fa fa-info-circle\" aria-hidden=\"true\"></i></a>" if data_type == "json": rows = [] for data in datas: |