Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Css style and legend height #146

Merged
merged 3 commits into from
May 24, 2024
Merged

Css style and legend height #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7857612
move style to css file
clavay May 16, 2024
c01882f
limit legend max height to the chart height
clavay May 16, 2024
3933df2
legend auto overflow
clavay May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pyscada/hmi/static/pyscada/css/pyscada/pyscada-theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ html,body {
position: relative;
min-height: 1px;
float: left;
height:450px;
width:100%;
}
.half-size-chart{
float: left;
Expand Down Expand Up @@ -312,6 +314,11 @@ html,body {

}

.legend-sidebar .legend {
max-height: 450px;
overflow-y: auto;
}

.legendTitle {
font-size: 12px;
}
Expand Down
2 changes: 1 addition & 1 deletion pyscada/hmi/templates/chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="widget-body chart-body {{ widget_extra_css_class }}" id="widget-body-{{ widget_pk }}-ch-{{chart.pk}}">
{% if chart.x_axis_var is not None %}<div class="hidden variable-config" data-name="{{ chart.x_axis_var.name }}" data-key="{{ chart.x_axis_var.id }}" data-init-type="1" data-type="variable"></div>{% endif %}
<div class="main-chart-area" style="height:450px; width:100%;">
<div class="main-chart-area">
<div id="chart-container-{{ widget_pk }}-{{chart.pk}}" class="chart-container" style="width: 100%; height:100%;"
data-xaxis='{"id":"{% if chart.x_axis_var is not None %}{{chart.x_axis_var.id}}{% else %}False{% endif %}","linlog":"{% if chart.x_axis_linlog %}True{% else %}False{% endif %}"}'
data-xaxis-ticks='{{chart.x_axis_ticks}}'
Expand Down
2 changes: 1 addition & 1 deletion pyscada/hmi/templates/circular_gauge.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="widget-body gauge-body {{ widget_extra_css_class }}" id="widget-body-{{ widget_pk }}-gauge-{{ item.pk }}">
<div class="main-chart-area" style="height:450px; width:100%;">
<div class="main-chart-area">
<div id="chart-container-{{ widget_pk }}-{{ item.pk }}" class="gauge-container" style="width: 100%; height:100%;" data-id="{{ item.web_id }}-{{ uuid }}" data-params='{{ item.gauge_params }}' >
<div class="chart-placeholder"><div class="loading-gauge" style="vertical-align: middle;">Loading gauge...</div></div>
<div class="gauge-title" style="display: none; text-align: center; font-size: 20px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; position: relative; width: 100%; top: -14px; cursor: default;">{{ item.label }} ({{ item.unit }})</div>
Expand Down
2 changes: 1 addition & 1 deletion pyscada/hmi/templates/pie.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="widget-body pie-body {{ widget_extra_css_class }}" id="widget-body-{{ widget_pk }}-pie-{{pie.pk}}">
<div class="main-chart-area" style="height:450px; width:100%;">
<div class="main-chart-area">
<div id="chart-container-{{ widget_pk }}-{{pie.pk}}" class="pie-container" style="width: 100%; height:100%;" data-radius='{"radius":"{{pie.radius}}","innerRadius":"{{pie.innerRadius}}"}' >
<div class="chartTitle">{{pie.title}}</div>
<div class="chart-placeholder"></div>
Expand Down