diff options
Diffstat (limited to 'ishtar_common/templates')
4 files changed, 86 insertions, 40 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index bfacee069..1ebebd815 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -2,7 +2,7 @@ {% load url from future%} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}"> <head> <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"/> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html index 06b671343..8822875b5 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html @@ -8,6 +8,7 @@ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jqplot/plugins/jqplot.highlighter.min.js"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jqplot/plugins/jqplot.pieRenderer.min.js"></script> +<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jqplot/plugins/jqplot.dateAxisRenderer.min.js"></script> <link rel="stylesheet" href="{{STATIC_URL}}js/jqplot/jquery.jqplot.min.css" /> {% endblock %} {% block content %} @@ -18,8 +19,9 @@ $(function() { $( "#dash-tabs" ).tabs(); }); <div id="dash-tabs"> <ul> {% for label, app in app_list %} - <li><a href="{% url 'dashboard-main-detail' app %}">{{label}}</a></li> - {% endfor %}</ul> + <li><a href="{% url 'dashboard-main-detail' app %}">{{label}}</a></li>{% endfor %} + <li><a href="{% url 'dashboard-main-detail' 'users' %}">{% trans "Users" %}</a></li> + </ul> </div> </div> {% endblock %} diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index 6a99c4fdd..610457ae3 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -1,38 +1,21 @@ {% load i18n %} -<div class='dashboard'> -<script language="javascript" type="text/javascript"> -$(document).ready(function(){ -var values_{{item_name}} = []; - -{% for idx, lbl, values in dashboard.values %} {% for value in values %} -{% ifequal forloop.parentloop.counter0 0 %}values_{{item_name}}.push([{{value}}, 0]); -{% else %}values_{{item_name}}[{{forloop.counter0}}][1] = {{value}};{% endifequal %}{% endfor%}{% endfor%} - -var plot_{{item_name}} = $.jqplot('chart_{{item_name}}', - [values_{{item_name}}], { - series:[{showMarker:false}], - axes:{ - xaxis:{ - label:'{% trans "Year" %}' - }, - yaxis:{ - label:'{% trans "Number"%}', - min:0 - } - }, - highlighter: { - show: true, - sizeAdjust: 7.5 - } - }); -}); -</script> - <h3>{{lbl}}</h3> +{% load url from future %} +<div class='dashboard' id="{{unique_id}}-tab"> <div> <h4>{% trans "Numbers" %}</h4> <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> <div class='table'> - <div id="chart_{{item_name}}" style="height:400px; width:700px;"></div> + <div id="chart_{{unique_id}}" style="height:400px; width:700px;"></div> + {% if form %} + <div class='form'> + <form method='post' action="{% url 'dashboard-main-detail' item_name %}" id='{{unique_id}}_form'> + <table>{% csrf_token %} + {{form}} + </table> + <button id="search_{{unique_id}}" class="submit">{% trans "Change" %}</button> + </form> + </div> + {% endif %} {% comment %} <table> {% for idx, lbl, values in dashboard.values %} @@ -43,7 +26,7 @@ var plot_{{item_name}} = $.jqplot('chart_{{item_name}}', {% endfor%} </table>{% endcomment %} </div> - {% if dashboard.years %} + {% if dashboard.periods %} <h4>{% trans "By years" %}</h4> <ul> <li><strong>{% trans "Average:" %}</strong> {{dashboard.average}}</li> @@ -65,7 +48,7 @@ var plot_{{item_name}} = $.jqplot('chart_{{item_name}}', {% endif %} <h4>{% trans "Created last" %}</h4> <div class='table'> - <table> + <table class='resume'> <tr><th>{{lbl}}</th><th>{% trans "Created" %}</th><th></th></tr> {% for item in dashboard.lasts %}<tr> <td class='ref'>{{item}}</td> @@ -76,7 +59,7 @@ var plot_{{item_name}} = $.jqplot('chart_{{item_name}}', </div> <h4>{% trans "Recent changes" %}</h4> <div class='table'> - <table> + <table class='resume'> <tr><th>{{lbl}}</th><th>{% trans "Modified" %}</th><th></th></tr> {% for item in dashboard.recents %}<tr> <td class='ref'>{{item}}</td> @@ -86,3 +69,64 @@ var plot_{{item_name}} = $.jqplot('chart_{{item_name}}', </table> </div> </div> +<script language="javascript" type="text/javascript"> +$(document).ready(function(){ +var values_{{unique_id}} = []; + + +{% for idx, lbl, values in dashboard.values %} {% for value in values %}{% ifequal forloop.parentloop.counter0 0 %} +values_{{unique_id}}.push([{{VALUE_QUOTE|safe}}{{value}}{{VALUE_QUOTE|safe}}, 0]); +{% else %}values_{{unique_id}}[{{forloop.counter0}}][1] = {{value}};{% endifequal %}{% endfor%}{% endfor%} + +if (values_{{unique_id}}.length > 0){ + +var showmarker = false; +if (values_{{unique_id}}.length < 25){ + var showmarker = true; +} + +var plot_{{unique_id}} = $.jqplot('chart_{{unique_id}}', + [values_{{unique_id}}], { + series:[{showMarker:showmarker}], + axes:{ {%ifequal slicing 'year'%} + xaxis:{ + label:'{% trans "Year" %}', + tickOptions: { + formatString: "%d" + } + },{%endifequal%}{%ifequal slicing 'month'%} + xaxis:{ + label:'{% trans "Month" %}', + renderer:$.jqplot.DateAxisRenderer, + tickOptions:{formatString:'%b %Y'}, + },{%endifequal%} + yaxis:{ + label:'{% trans "Number"%}', + min:0 + } + }, + highlighter: { + show: true, + sizeAdjust: 7.5 + } + }); + +} else { +$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for theses criteria.' %}</p"); +} + +$('#search_{{unique_id}}').click(function (){ + $.post("{% url 'dashboard-main-detail' item_name %}", + $("#{{unique_id}}_form").serialize(), + function(data){ + $("#{{unique_id}}-tab").parent().html(data); + }); + return false; +}); + +{% ifequal item_name 'files' %} +load_jquerydate_after(); +load_jquerydate_before(); +{% endifequal %} +}); +</script> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html index 6602d5193..6ffd8c3c9 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html @@ -1,5 +1,5 @@ {% load i18n %} - <h3>{% trans "Users" %}</h3> +<div class='dashboard'> <div> <script language="javascript" type="text/javascript"> $(document).ready(function(){ @@ -15,14 +15,14 @@ var plot_users = jQuery.jqplot ('user_chart', [values_users], showDataLabels: true } }, - legend: { show:true, location: 's' } + legend: { show:true, location: 'e' } } ); }); </script> - <div id="user_chart" style="height:400px; width:700px;"></div> + <div id="user_chart" style="height:300px; width:700px;"></div> <div class='table'> - <table> + <table class='resume'> <tr><th>{% trans "User type" %}</th><th>{% trans "Number" %}</th></tr> {% for user_type in ishtar_users.types %} <tr> |