diff options
Diffstat (limited to 'ishtar_common/templates')
6 files changed, 37 insertions, 16 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 1a7c8fa54..b601076fe 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -122,6 +122,10 @@ </div> <div id="progress"> <div id='progress-content'> + <p class='progress-detail progress-1'>{% trans "Processing..." %}</p> + <p class='progress-detail progress-2'>{% trans "This can be long." %}</p> + <p class='progress-detail progress-3'>{% trans "Time to take a coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></p> + <p class='progress-detail progress-4'>{% trans "Time to take another coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></p></div> </div> </div> </body> diff --git a/ishtar_common/templates/blocks/JQueryAutocomplete.js b/ishtar_common/templates/blocks/JQueryAutocomplete.js index 16ffef3a0..53a5e18ae 100644 --- a/ishtar_common/templates/blocks/JQueryAutocomplete.js +++ b/ishtar_common/templates/blocks/JQueryAutocomplete.js @@ -37,4 +37,10 @@ $(function() { }); $('#{{item_id}}').change(); {% endfor %}{% endif %} + + $('#id_{{field_id}}').change(function(){ + $("#id_select_{{field_id}}").attr('title', $('#id_select_{{field_id}}').val()); + }); + + $('#id_{{field_id}}').change(); }); diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html index f1592cc42..6d5c1f704 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Title" %}</th> <th>{% trans "Type" %}</th> @@ -18,4 +20,4 @@ </tr> {% endfor %} </table> - +</div></div> diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html index d6686b553..e378bdf49 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html @@ -1,6 +1,8 @@ {% load i18n %} - -<table class='simple'> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <caption>{{caption}}</caption> <tr>{% for col in col_names %} <th>{% trans col %}</th>{% endfor %} @@ -9,3 +11,4 @@ <td>{{value}}</td>{%endfor%} </tr>{% endfor %} </table> +</div></div> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index 7247a5cda..fd92578a2 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -1,4 +1,4 @@ -{% load i18n date_formating %} +{% load i18n date_formating humanize %} {% load url from future %} <div class='dashboard' id="{{unique_id}}-tab"> <div> @@ -13,7 +13,7 @@ </form> </div> {% endif %} - <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> + <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number|intcomma}}</p> <div class='table'> <div id="chart_{{unique_id}}" style="height:400px; width:700px;"></div> <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> @@ -25,8 +25,9 @@ </div> </div> </div> - <div class='table'> - <table class='resume'> + <div class='clean-table'> + <div class='clean-table-wrap'> + <table> {% for idx, lbl, values in dashboard.values %} <tr class='idx {% if forloop.counter0|divisibleby:"2" %}even{%else%}odd{%endif%}'> <th>{{lbl}}</th> @@ -35,6 +36,7 @@ {% endfor%} </table> </div> + </div> {% if dashboard.periods %} <h4>{% trans "By years" %}</h4> <ul> @@ -55,25 +57,29 @@ <li><strong>{% trans "Mode:" %}</strong> {{dashboard.operation_mode}}</li> </ul> {% endif %} + <div class='clean-table'> <h4>{% trans "Created last" %}</h4> - <div class='table'> - <table class='resume'> + <table> <tr><th>{{lbl}}</th><th>{% trans "Created" %}</th><th></th></tr> {% for item in dashboard.lasts %}<tr> <td class='ref'>{{item}}</td> <td>{{item.history_date}}</td> - <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td> + <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a>{%endif%}</td> </tr>{% endfor %} </table> </div> + <div class='clean-table'> <h4>{% trans "Recent changes" %}</h4> - <div class='table'> - <table class='resume'> + <table> <tr><th>{{lbl}}</th><th>{% trans "Modified" %}</th><th></th></tr> {% for item in dashboard.recents %}<tr> <td class='ref'>{{item}}</td> <td>{{item.history_date}}</td> - <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td> + <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a>{%endif%}</td> </tr>{% endfor %} </table> </div> diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index f5734cf98..55a4ea883 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -55,7 +55,7 @@ </tr> {% endfor %} </table> - <input type="submit" value="{% trans "Validate" %}"/> + <input type="submit" onclick="long_wait();return true;" value="{% trans "Validate" %}" /> </form> {% endif %} </div> |