From d7a9f1b8c0b5616397b02c00525569881661e431 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Wed, 26 Jun 2024 08:51:30 +0200
Subject: [PATCH] style: Darker labels, adjust column width etc
---
VIPSWeb/static/css/vipsweb.css | 8 ++++----
observations/static/observations/js/observationList.js | 2 +-
observations/templates/observations/detail.html | 8 ++++----
observations/templates/observations/index.html | 6 +++---
observations/templates/observations/timeseries.html | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 2b389a38..859cf7a7 100755
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -794,10 +794,10 @@ td.dateCell {
}
#observationTimeSeriesDetails .label, #observationDetails .label {
- color: #C9C9C9;
- font-size: 1.1em;
+ color: #969696;
+ font-size: 1.2em;
padding: 0;
- font-weight: normal;
+ font-weight: lighter;
}
#observationData table {
@@ -806,7 +806,7 @@ td.dateCell {
#observationData td {
border: 1px solid #C9C9C9;
- padding: 2px;
+ padding: 2px 10px;
}
table.messageTable tr, table.messageTable td
diff --git a/observations/static/observations/js/observationList.js b/observations/static/observations/js/observationList.js
index b42eae82..7ca4bc60 100644
--- a/observations/static/observations/js/observationList.js
+++ b/observations/static/observations/js/observationList.js
@@ -361,7 +361,7 @@ var renderObservationTable = function(data)
tbodyHTML.push("<td align='center'><a href='/observations/" + obs.observationId + "' target='new'><i class='fa fa-info-circle' aria-hidden='true'/></a></td>");
if(Object.keys(measuredVal).length != 0){
- tbodyHTML.push("<td align='center'><a tabindex='0' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>").replace("'","'") + "' ><i class='fa fa-balance-scale' aria-hidden='true'/></a></td>")
+ tbodyHTML.push("<td><a tabindex='0' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>").replace("'","'") + "' ><i class='fa fa-balance-scale' aria-hidden='true'/></a></td>")
} else{
tbodyHTML.push("<td></td>")
}
diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html
index f159158c..0e226da5 100755
--- a/observations/templates/observations/detail.html
+++ b/observations/templates/observations/detail.html
@@ -26,7 +26,7 @@
{% block content %}
<div id="observationDetails" class="singleBlockContainer">
<div class="row">
- <div class="col-md-5">
+ <div class="col-md-6">
<p class="label">{% trans "Observation" %} </p>
<h1 style="margin-top: 4px;margin-bottom: 30px"><span id="observationHeading"></span></h1>
<p class="label" id="observationTextLabel"></p>
@@ -48,7 +48,7 @@
<p class="label">{% trans "Observation data" %}</p>
<p id="observationData"></p>
</div>
- <div class="col-md-7">
+ <div class="col-md-6">
<div id="observationViewMap" class="map" style="height: 400px;"></div>
</div>
</div>
@@ -95,7 +95,7 @@
if(observation.observationTimeSeries) {
console.info("observation.observationTimeSeries", observation.observationTimeSeries)
document.getElementById("timeSeriesInfo").hidden = false;
- document.getElementById("timeSeries").innerHTML = "<a href='/observations/timeseries/" + observation.observationTimeSeriesId + "'>" + observation.observationTimeSeries.name + "</a>";
+ document.getElementById("timeSeries").innerHTML = "<a href='/observations/timeseries/" + observation.observationTimeSeriesId + "'><span class='timeseries-label'/>" + observation.observationTimeSeries.label + "</a>";
} else {
document.getElementById("timeSeriesInfo").hidden = true;
}
@@ -111,7 +111,7 @@
var observationData = JSON.parse(observation.observationData);
for(var fieldName in observationData)
{
- observationDataHTML += "<tr><td width='180'>" + dataVars[fieldName] + "</td><td width='50' align='center'>" + observationData[fieldName] + "</td></tr>";
+ observationDataHTML += "<tr><td width='180'>" + dataVars[fieldName] + "</td><td>" + observationData[fieldName] + "</td></tr>";
}
observationDataHTML += "</table>";
document.getElementById("observationData").innerHTML = observationDataHTML;
diff --git a/observations/templates/observations/index.html b/observations/templates/observations/index.html
index feec7d46..d55ae212 100644
--- a/observations/templates/observations/index.html
+++ b/observations/templates/observations/index.html
@@ -68,9 +68,9 @@
<th>{% trans "Organism" %}</th>
<th>{% trans "Crop" %}</th>
<th>{% trans "Heading" %}</th>
- <th>{% trans "Time series" %}</th>
- <th>{% trans "Details" %}</th>
- <th></th>
+ <th width='50'>{% trans "Time series" %}</th>
+ <th width='50'>{% trans "Details" %}</th>
+ <th width='30'></th>
</thead>
<tbody id="observationTableBody">
</tbody>
diff --git a/observations/templates/observations/timeseries.html b/observations/templates/observations/timeseries.html
index 8a038514..c3b2bc0d 100644
--- a/observations/templates/observations/timeseries.html
+++ b/observations/templates/observations/timeseries.html
@@ -24,7 +24,7 @@
{% block content %}
<div id="observationTimeSeriesDetails" class="singleBlockContainer">
<div class="row">
- <div class="col-md-5">
+ <div class="col-md-6">
<p class="label">{% trans "Time series" %} </p>
<h1 style="margin-top: 4px;margin-bottom: 30px"><span id="timeSeriesName"></span></h1>
<p class="label" id="timeSeriesDescriptionLabel"></p>
@@ -38,7 +38,7 @@
<p class="label">{% trans "Number of observations" %}</p>
<p id="observationCount"></p>
</div>
- <div class="col-md-7">
+ <div class="col-md-6">
<div id="observationViewMap" class="map" style="height: 400px;"></div>
</div>
</div>
--
GitLab