diff --git a/beat/web/reports/templates/reports/panels/viewer.html b/beat/web/reports/templates/reports/panels/viewer.html
index 262adcd5f55d8bc45c1b02b0235685589e033f9c..f1cc222afaee2eb2f1c7c0c37b9a020f262dc11c 100644
--- a/beat/web/reports/templates/reports/panels/viewer.html
+++ b/beat/web/reports/templates/reports/panels/viewer.html
@@ -61,19 +61,14 @@
</div>{# collapse #}
</div>{# panel #}
{% endif %}
-
- <div ng-if="report.experiments.length == 0" class="alert alert-warning"{% if not owner or status != 'Editable' %}style="display:none;"{% endif %}>
- <i class="fa fa-warning fa-lg"></i> You have <strong>not added any experiments</strong> in this report yet. You may add experiments from <a href="{{ URL_PREFIX }}/experiments/{{ object.author.username }}/">any experiment list page</a> to unlock editing features for this report.
- </div>
-
- {# DISPLAYED TABLES AND FIGURES #}
- <div class="panel-group" id="space-for-report-items" role="tablist" aria-multiselectable="true">
</div>
-
- <div groups-layout></div>
-
</div>{# col-sm-12 #}
</div>{# row #}
+<div class="row">
+ <div class="col-sm-12">
+ <div groups-layout></div>
+ </div>
+</div>
{% endwith %}
{% csrf_token %}
diff --git a/beat/web/reports/templates/reports/report.html b/beat/web/reports/templates/reports/report.html
index 10670d5f7de868d22deedd5e6716deba98871f53..69b8accde57208a9914d609a6e6f401bb58c95a5 100644
--- a/beat/web/reports/templates/reports/report.html
+++ b/beat/web/reports/templates/reports/report.html
@@ -134,57 +134,57 @@
{% block content %}
{% if author %}
- <div class="col-sm-12" ng-app="reportApp" ng-controller="reportController" ng-init="init('{{ author }}', '{{report_name}}', '{{ URL_PREFIX }}')">
+<div class="col-sm-12" ng-app="reportApp" ng-controller="reportController" ng-init="init('{{ author }}', '{{report_name}}', '{{ URL_PREFIX }}')"></div>
{% endif %}
{% if report_number %}
- <div class="col-sm-12" ng-app="reportApp" ng-controller="reportController" ng-init="initWithReportNumber('{{report_number}}', '{{ URL_PREFIX }}')">
+<div class="col-sm-12" ng-app="reportApp" ng-controller="reportController" ng-init="initWithReportNumber('{{report_number}}', '{{ URL_PREFIX }}')"></div>
{% endif %}
{% csrf_token %}
{% if report %}
<div id="title" class="row">
- <div class="{% if owner %}col-sm-9 vertical-center{% else %}col-sm-12{% endif %}"{% if owner %} onmouseover="expand_breadcrumb(this, 9, 3);" onmouseout="reset_breadcrumb(this, 9, 3);"{% endif %}>
- {% report_breadcrumb report %}
- <!-- Note: keep no space between divs here! -->
- </div>{% if owner %}<div class="col-sm-3 vertical-center">
- {% report_actions report False %}
- </div>{% endif %}
+ <div class="{% if owner %}col-sm-9 vertical-center{% else %}col-sm-12{% endif %}"{% if owner %} onmouseover="expand_breadcrumb(this, 9, 3);" onmouseout="reset_breadcrumb(this, 9, 3);"{% endif %}>
+ {% report_breadcrumb report %}
+ <!-- Note: keep no space between divs here! -->
+ </div>{% if owner %}<div class="col-sm-3 vertical-center">
+ {% report_actions report False %}
+ </div>{% endif %}
</div>
{% with report.get_status_display as status %}
<div class="row">
- <div class="col-sm-12">
-
- <p class="bs-callout bs-callout-{% if status == 'Editable' %}danger{% elif status == 'Locked' %}warning{% else %}info{% endif %}">
-
-{% if report.short_description %}
-<i class="fa fa-file-text"></i> {{ report.short_description }}<br/>
-{% endif %}
-
-{% ifequal request.user.username author %}
-<i class="fa fa-arrow-circle-right"></i> Unique report id: <a href="{{ report.get_absolute_url }}" title="Use this link on your report or to share access with users and reviewers" data-toggle="tooltip" data-placement="top">{{ report.number }}</a> <span class="help">(follow link to see review/publication URL.)</span><br/>
-{% endifequal %}
-
-{% if report.publication_date %}
-<i class="fa fa-calendar-o"></i> Published: <strong>{{ report.publication_date|naturaltime }}</strong><br/>
-{% else %}
-<i class="fa fa-calendar-o"></i> Created: <strong>{{ report.creation_date|naturaltime }}</strong><br/>
-{% endif %}
-{% if report.last_edited_date != None and not report.publication_date %}
-<i class="fa fa-calendar-o"></i> Last Edited: <strong>{{ report.last_edited_date|naturaltime }}</strong><br/>
-{% endif %}
-
-{% if status == 'Editable' %}
-<i class="fa fa-warning"></i> This report is <strong class="text-danger">{{ status }}</strong> (it may change in time)<br/>
-{% elif status == 'Locked' %}
-<i class="fa fa-warning"></i> This report is <strong class="text-warning">{{ status }}</strong> (not yet published)<br/>
-<i class="fa fa-calendar-o"></i> Expires in <strong>{{ report.expiration_date|naturaltime }}</strong>, on {{ report.expiration_date }} (publish it to make it permanent)<br/>
-{% endif %}
-
- </p>
- </div>
+ <div class="col-sm-12">
+
+ <p class="bs-callout bs-callout-{% if status == 'Editable' %}danger{% elif status == 'Locked' %}warning{% else %}info{% endif %}">
+
+ {% if report.short_description %}
+ <i class="fa fa-file-text"></i> {{ report.short_description }}<br/>
+ {% endif %}
+
+ {% ifequal request.user.username author %}
+ <i class="fa fa-arrow-circle-right"></i> Unique report id: <a href="{{ report.get_absolute_url }}" title="Use this link on your report or to share access with users and reviewers" data-toggle="tooltip" data-placement="top">{{ report.number }}</a> <span class="help">(follow link to see review/publication URL.)</span><br/>
+ {% endifequal %}
+
+ {% if report.publication_date %}
+ <i class="fa fa-calendar-o"></i> Published: <strong>{{ report.publication_date|naturaltime }}</strong><br/>
+ {% else %}
+ <i class="fa fa-calendar-o"></i> Created: <strong>{{ report.creation_date|naturaltime }}</strong><br/>
+ {% endif %}
+ {% if report.last_edited_date != None and not report.publication_date %}
+ <i class="fa fa-calendar-o"></i> Last Edited: <strong>{{ report.last_edited_date|naturaltime }}</strong><br/>
+ {% endif %}
+
+ {% if status == 'Editable' %}
+ <i class="fa fa-warning"></i> This report is <strong class="text-danger">{{ status }}</strong> (it may change in time)<br/>
+ {% elif status == 'Locked' %}
+ <i class="fa fa-warning"></i> This report is <strong class="text-warning">{{ status }}</strong> (not yet published)<br/>
+ <i class="fa fa-calendar-o"></i> Expires in <strong>{{ report.expiration_date|naturaltime }}</strong>, on {{ report.expiration_date }} (publish it to make it permanent)<br/>
+ {% endif %}
+
+ </p>
+ </div>
</div>
{% endwith %}
@@ -193,14 +193,6 @@
{% endif %}
-<div id="tabs_progress" class="progress">
- <i class="fa fa-spin fa-refresh fa-1x"></i>
-</div>
-
-<div id="report_items" class="row">
- <div id="space-for-report-items"></div>
-</div>
-
{% list_selector "list_selector" %}
{% multiple_selector "multiple_selector" %}
{% multiple_selector "multiple_selector_updater" %}