hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	templates/web/report/ajax_dashboard_content_child.html.twig
	templates/web/report/all_content.html.twig
	templates/web/report/report_layout_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php
This commit is contained in:
Nicolas Le Goff
2014-03-23 19:49:12 +01:00
parent 2d6e1e0145 2f10a708d7
commit 5e07b68780
10 changed files with 315 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
templates/web/report/report_layout_child.html.twig
View File

@@ -2,22 +2,34 @@
{% block report_dashboard_layout %}
<div id="dash" class="inside-container">
<div class="answers">
<div class="answers container-fluid">
<div class="content">
<div id='dashboard'>
<div id="panel" style="height:40px;width:100%;display:none;">
<div style="margin-top:15px;float:left;margin-bottom:20px;">
<div style="float:left;" >
<label for="dmin" class="form_titre">{{ "report:: Du (date)" | trans }}</label>
<input class= "dminDash" name="dmin" type="text" value="{{ dashboard.dmin}}" size="10" />
<div class="row-fluid">
<div class="well-large well" style="background: #313131;margin-top:20px;border:none;">
<form id="dashboard-form" class="form-inline" method="GET" action="{{ path("report_dashboard") }}">
<label for="dminDash" style="color:#eee">{{ "from"|trans|title }}</label>
<div class="input-prepend">
<span class="add-on"><i class="icon icon-calendar"></i></span>
<input id="dminDash" name="dmin" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "from"|trans }}" value="{{ "-1 month"|date("Y-m-d") }}">
</div>
<div style="float:left;margin-left:15px;">
<label for="dmax" class="form_titre">{{ "report:: Au (date)" | trans }}</label>
<input class="dmaxDash" name="dmax" type="text" value="{{dashboard.dmax}}" size="10" />
<label for="dmaxDash" style="color:#eee">{{ "to"|trans|title }}</label>
<div class="input-prepend">
to
<span class="add-on"><i class="icon icon-calendar"></i></span>
<input id="dmaxDash" name="dmax" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "to"|trans }}" value="{{ "now"|date("Y-m-d") }}">
</div>
<button class="btn submit-dashboard" type="button">{{ "Generate" | trans }}</button>
</form>
<div>
<span class="text-info" style="font-style: italic">
<i class="icon icon-warning-sign"></i>
{{
"Report generation may take a long time to generate, depending on the number of collections and the period selected." | trans
}}
</span>
</div>
{# <div id="chooose" style="margin-left:15px;float:left;margin-top:15px;"> #}
{# <div class="form_titre">{{ "report:: 2 - Bases" | trans }}</div> #}
{# <div class="form_titre">{% trans "report:: 2 - Bases" %}</div> #}
{# <label for="nameDash"></label> #}
{# <select name="nameDash" style = "background-color:#555;color:orange;border:none;"> #}
{# <option value="all">Global</option> #}
@@ -27,20 +39,22 @@
{#</select> #}
{#</div> #}
</div>
<div class="slide" style="margin-top:-5px;"><a class="btn-slide arrowDown"
style="width:100px;height:20px;padding:5px;float:right; text-align:center;display:block;color:#999;
">options</a></div>
<div id="dashdash" style="float:left;width:100%;">
{% if ajax_dash %}
{% include "report/ajax_dashboard_content_child.html.twig" %}
{% endif %}
</div>
</div>
<div id='dashboard' class="well well-large text-center" style="background-color:#696969;border:none;">
<button class="btn btn-primary submit-dashboard" style="
padding: 18px 28px;
font-size: 22px; //change this to your desired size
line-height: normal;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;"
>
{{ "Generate dashboard" | trans }}
</button>
</div>
</div>
</div>
</div>
{% endblock report_dashboard_layout %}
{% block report_connexion_layout %}