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

Various UI fixes #3568

Merged
merged 3 commits into from
Oct 8, 2022
Merged

Various UI fixes #3568

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
86d055c
- Prevent map zoom via scroll wheel
osoner Oct 8, 2022
704117b
- Remove spaces before % throughout the dashboard
osoner Oct 8, 2022
94cf3bd
Fix Codacy CSS issues
osoner Oct 8, 2022
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
2 changes: 1 addition & 1 deletion frontend/express/public/core/device-and-type/templates/devices-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="version-graph-block bu-p-3">
<div class="bu-columns version-graph-title">
<div class="bu-column has-ellipsis">{{item2.name}}</div>
<div class="bu-column">{{item2.percent}} % </div>
<div class="bu-column">{{item2.percent}}% </div>
</div>
<cly-progress-bar :entities="item2.bar" :height=8></cly-progress-bar>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/device-and-type/templates/technologyHomeWidget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="version-graph-block bu-p-3">
<div class="bu-columns version-graph-title">
<div class="bu-column">{{item2.name}}</div>
<div class="bu-column">{{formatNumber(item2.value)}} {{item2.value > 1 ? 'Users' : 'User'}} | {{item2.percent}} % </div>
<div class="bu-column">{{formatNumber(item2.value)}} {{item2.value > 1 ? 'Users' : 'User'}}<span class="divider"> | </span>{{item2.percent}}% </div>
</div>
<cly-progress-bar :entities="item2.bar" :height=8></cly-progress-bar>
</div>
Expand Down
25 changes: 19 additions & 6 deletions frontend/express/public/core/geo-countries/stylesheets/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
.routename-analytics-geo .geo-date-picker-container {
margin-bottom:32px;
margin-bottom: 32px;
}

// .geo-countries-section .cly-vue-radio-block .radio-wrapper .radio-button {
// padding: 95px 33px;
// }

.routename-analytics-geo .radio-column{
.routename-analytics-geo .radio-column {
width: 256px;
}

.leaflet-noclick-map .leaflet-interactive {
cursor: -webkit-grab;
cursor: -moz-grab;
cursor: grab;
}

.leaflet-control-zoom {
user-select: none;
border-color: #dcdcdc !important;

a {
color: #333c48;
border-bottom-color: #dcdcdc;
}
}

.geo-analytics-data {
.cly-vue-button {
padding: 6px 10px;
border-radius: 4px;
}
}
4 changes: 2 additions & 2 deletions frontend/express/public/core/geo-countries/templates/countries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ <h2> {{i18n('countries.title')}}
@country-click="regionClick"
>
</cly-worldmap>
<div style="position: absolute; top: 20px; left:20px;">
<a ref="toCityViewLink" class="cly-vue-button button-light-skin ToLink" :href="buttonLink">{{buttonText}}</a>
<div style="position: absolute; top: 20px; left:20px; z-index: 400;">
<a ref="toCityViewLink" class="cly-vue-button button-light-skin ToLink" :href="buttonLink">{{buttonText}}</a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions frontend/express/public/core/geo-countries/templates/countriesHomeWidget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
@country-click="regionClick"
>
</cly-worldmap>
<div style="position: absolute; top: 20px; left:20px;">
<a ref="toCityViewLink" class="cly-vue-button button-light-skin ToLink" :href="buttonLink">{{buttonText}}</a>
<div style="position: absolute; top: 20px; left:20px; z-index: 400;">
<a ref="toCityViewLink" class="cly-vue-button button-light-skin ToLink" :href="buttonLink">{{buttonText}}</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/platform/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ var AppPlatformView = countlyVue.views.create({
"name": data[k].origos_,
"value": countlyCommon.getShortNumber(data[k][property] || 0),
"percent": percent,
"percentText": percent + " % " + CV.i18n('common.of-total'),
"percentText": percent + "% " + CV.i18n('common.of-total'),
"info": "some description",
"color": this.graphColors[k % this.graphColors.length]
});
Expand Down
8 changes: 6 additions & 2 deletions frontend/express/public/core/platform/stylesheets/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.technology-analytics-wrapper .allPlatformVersions {
border-left:1px solid #ececec;
border-left: 1px solid #ececec;
height: 264px;
border-top: 1px solid #ececec;
border-bottom: 1px solid #ececec;
Expand Down Expand Up @@ -33,7 +33,11 @@
font-weight: normal;
font-size: 14px;
line-height: 20px;
color:#333C48;
color: #333c48;

.divider {
color: #a7aeb8;
}
}

.technology-analytics-wrapper .version-graph-title div:first-child {
Expand Down
4 changes: 2 additions & 2 deletions frontend/express/public/core/platform/templates/platform.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h4>{{i18n('platforms.platforms-for')}}</h4>
<span class="text-medium">{{item.percentText}}</span>
</template>
</cly-metric-card>
<div v-if="platformItems.length < 4 && !isLoading" class="technology-analytics-wrapper__empty-card">
<div v-if="platformItems.length < 1 && !isLoading" class="technology-analytics-wrapper__empty-card">
<div class="text-medium">{{i18n('common.table.no-data')}}</div>
</div>
</cly-metric-cards>
Expand All @@ -60,7 +60,7 @@ <h5 class="bu-pb-4"> {{i18n('platforms.version-distribution')}} </h5>
:scroll-ops="breakdownScrollOps"
v-for="(item, idx) in platformVersions">
</cly-metric-breakdown>
<div v-if="platformItems.length < 4 && !isLoading" class="technology-analytics-wrapper__empty-card">
<div v-if="platformItems.length < 1 && !isLoading" class="technology-analytics-wrapper__empty-card">
<div class="text-medium">{{i18n('common.table.no-data')}}</div>
</div>
</cly-metric-cards>
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/session-durations/templates/session-durations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2> {{i18n('session-durations.title')}} </h2>
<template slot-scope="scope">
<div class="bu-level-left">
<div class="bu-level-item slipping-away-users-table-data-item">
<span>{{scope.row.percentage}} %</span>
<span>{{scope.row.percentage}}%</span>
</div>
<cly-progress-bar :percentage="parseInt(scope.row.percentage)" :color="progressBarColor" > </cly-progress-bar>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/core/session-frequency/templates/session-frequency.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2> {{i18n('session-frequency.title')}} </h2>
<template slot-scope="scope">
<div class="bu-level-left">
<div class="bu-level-item slipping-away-users-table-data-item">
<span>{{scope.row.percentage}} %</span>
<span>{{scope.row.percentage}}%</span>
</div>
<cly-progress-bar :percentage="parseInt(scope.row.percentage)" :color="progressBarColor" > </cly-progress-bar>
</div>
Expand Down
3 changes: 2 additions & 1 deletion frontend/express/public/core/user-activity/stylesheets/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ $user-activity-progress-bar-background-color: #39C0C8;
&__divider {
width: 16px;
justify-content: space-evenly;
color: #a7aeb8;
}
&__data-item-container {
flex-basis: 75px;
margin-right: 8px;
margin-right: 14px;
}
}
.user-activity-table-progress-bar-container {
Expand Down
6 changes: 3 additions & 3 deletions frontend/express/public/core/user-activity/templates/user-activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2> {{i18n('user-activity.title')}} </h2>
<span>|</span>
</div>
<div class="bu-level bu-is-justify-content-flex-end">
<span>{{formatPercentage(scope.row.all/seriesTotal.all)}} %</span>
<span>{{formatPercentage(scope.row.all/seriesTotal.all)}}%</span>
</div>
</div>
<cly-progress-bar :percentage="formatPercentage(scope.row.all/seriesTotal.all)" :color="progressBarColor"> </cly-progress-bar>
Expand All @@ -51,7 +51,7 @@ <h2> {{i18n('user-activity.title')}} </h2>
<span>|</span>
</div>
<div class="bu-level bu-is-justify-content-flex-end">
<span>{{formatPercentage(scope.row.thirtyDays/seriesTotal.thirtyDays)}} %</span>
<span>{{formatPercentage(scope.row.thirtyDays/seriesTotal.thirtyDays)}}%</span>
</div>
</div>
<cly-progress-bar :percentage="formatPercentage(scope.row.thirtyDays/seriesTotal.thirtyDays)" :color="progressBarColor"> </cly-progress-bar>
Expand All @@ -69,7 +69,7 @@ <h2> {{i18n('user-activity.title')}} </h2>
<span>|</span>
</div>
<div class="bu-level bu-is-justify-content-flex-end">
<span>{{formatPercentage(scope.row.sevenDays/seriesTotal.sevenDays)}} %</span>
<span>{{formatPercentage(scope.row.sevenDays/seriesTotal.sevenDays)}}%</span>
</div>
</div>
<cly-progress-bar :percentage="formatPercentage(scope.row.sevenDays/seriesTotal.sevenDays)" :color="progressBarColor"> </cly-progress-bar>
Expand Down
2 changes: 1 addition & 1 deletion frontend/express/public/javascripts/countly/vue/components/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@

if (this.formatting === 'auto') {
if (this.isPercentage) {
return this.number + " %";
return this.number + "%";
}
else if (Math.abs(this.number) >= 10000) {
return this.getShortNumber(this.number);
Expand Down
17 changes: 9 additions & 8 deletions frontend/express/public/javascripts/countly/vue/components/vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,7 +2175,8 @@
'l-geo-json': Vue2Leaflet.LGeoJson,
'l-tile-layer': Vue2Leaflet.LTileLayer,
'l-control': Vue2Leaflet.LControl,
'l-tooltip': Vue2Leaflet.LTooltip
'l-tooltip': Vue2Leaflet.LTooltip,
'l-control-zoom': Vue2Leaflet.LControlZoom
},
mixins: [countlyVue.mixins.commonFormatters, countlyVue.mixins.i18n],
props: {
Expand Down Expand Up @@ -2288,7 +2289,7 @@
},
minZoom: {
type: Number,
default: 0
default: 1
},
maxZoom: {
type: Number,
Expand Down Expand Up @@ -2340,9 +2341,7 @@
citiesToLatLng: {},
markerTooltipOptions: {
sticky: true,
direction: "right",
//permanent: true,
//offset: L.point(5, 5)
direction: "auto"
},
circleMarkerConfig: {
pane: "markerPane",
Expand All @@ -2352,9 +2351,11 @@
},
defaultMapOptions: {
attributionControl: false,
zoomControl: false,
zoom: 1,
zoomSnap: 0.1,
zoom: 1.3
zoomDelta: 0.5,
zoomControl: false,
scrollWheelZoom: false
}
};
},
Expand Down Expand Up @@ -2604,7 +2605,7 @@
if (boundingBox) {
this.maxBounds = this.boxToLatLng2d(boundingBox);
if (this.$refs.lmap && this.$refs.lmap.mapObject) {
this.$refs.lmap.mapObject.fitBounds(this.maxBounds);
this.$refs.lmap.mapObject.fitBounds(this.maxBounds, {animate: false, padding: [20, 20]});
}
}
},
Expand Down
10 changes: 6 additions & 4 deletions frontend/express/public/javascripts/countly/vue/templates/breakdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
</div>
<div class="bu-column cly-vue-metric-breakdown__numbers">
<a v-if="item.link" :href="item.link">
<span v-if="item.description">{{item.description}} | </span>
<span>{{item.percent}} % </span>
<span v-if="item.description">{{item.description}}</span>
<span class="divider"> | </span>
<span>{{item.percent}}%</span>
<i class="fas fa-arrow-circle-right color-cool-gray-40"></i>
</a>
<div v-else>
<span v-if="item.description">{{item.description}} | </span>
<span>{{item.percent}} % </span>
<span v-if="item.description">{{item.description}}</span>
<span class="divider"> | </span>
<span>{{item.percent}}%</span>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions frontend/express/public/javascripts/countly/vue/templates/worldmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ <h4>{{formatNumberSafe(item.value)}}</h4>
</div>
</l-tooltip>
</l-circle-marker>
<l-control-zoom position="bottomright"></l-control-zoom>
</l-map>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions frontend/express/public/stylesheets/vue/clyvue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
.bu-column {
padding: 0px;
}
.divider {
color:#A7AEB8;
}
}
&__value-row {
border-radius: 4px;
Expand Down Expand Up @@ -1437,6 +1440,10 @@
display: flex;
justify-content: center;
align-items: center;
color: #333c48;
font-size: 14px;
font-weight: 400;
line-height: 20px;
}
&__blur_container {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion plugins/browser/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"name": data[k].browser,
"value": countlyCommon.getShortNumber(data[k][property] || 0),
"percent": percent,
"percentText": percent + " % " + CV.i18n('common.of-total'),
"percentText": percent + "% " + CV.i18n('common.of-total'),
"info": CV.i18n('common.info'),
"color": this.graphColors[k]
});
Expand Down
10 changes: 5 additions & 5 deletions plugins/crashes/frontend/public/templates/crashgroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ <h4>{{i18n("crashes.no-comments-yet")}}</h4>
<div>
<div class="bu-is-flex bu-is-align-items-baseline">
<h2>{{(mobileDiagnostics[diagnosticKey].average ? mobileDiagnostics[diagnosticKey].average.toFixed(2) : 0) + ("unit" in
mobileDiagnostics[diagnosticKey] ? "" : " %")}}</h2>
mobileDiagnostics[diagnosticKey] ? "" : "%")}}</h2>
<h4 class="bu-ml-2" v-if="'unit' in mobileDiagnostics[diagnosticKey]">
{{mobileDiagnostics[diagnosticKey].unit}}</h4>
</div>
Expand All @@ -236,23 +236,23 @@ <h4 class="bu-ml-2" v-if="'unit' in mobileDiagnostics[diagnosticKey]">
<cly-crashes-dashboard-tile columnWidth="3" :tooltip="i18n('crashes.help-root')" showDonut
:donutPercentage="mobileMetrics.rootedPercent || 0">
<template v-slot:title>{{i18n('crashes.root')}}</template>
<template v-slot:value>{{mobileMetrics.rootedPercent ? mobileMetrics.rootedPercent.toFixed(2) : 0}} %</template>
<template v-slot:value>{{mobileMetrics.rootedPercent ? mobileMetrics.rootedPercent.toFixed(2) : 0}}%</template>
</cly-crashes-dashboard-tile>
<cly-crashes-dashboard-tile columnWidth="3" :tooltip="i18n('crashes.help-online')" showDonut
:donutPercentage="mobileMetrics.onlinePercent || 0">
<template v-slot:title>{{i18n('crashes.online')}}</template>
<template v-slot:value>{{mobileMetrics.onlinePercent ? mobileMetrics.onlinePercent.toFixed(2) : 0}} %</template>
<template v-slot:value>{{mobileMetrics.onlinePercent ? mobileMetrics.onlinePercent.toFixed(2) : 0}}%</template>
</cly-crashes-dashboard-tile>
<cly-crashes-dashboard-tile columnWidth="3" :tooltip="i18n('crashes.help-muted')" showDonut
:donutPercentage="mobileMetrics.mutedPercent || 0">
<template v-slot:title>{{i18n('crashes.muted')}}</template>
<template v-slot:value>{{mobileMetrics.mutedPercent ? mobileMetrics.mutedPercent.toFixed(2) : 0}} %</template>
<template v-slot:value>{{mobileMetrics.mutedPercent ? mobileMetrics.mutedPercent.toFixed(2) : 0}}%</template>
</cly-crashes-dashboard-tile>
<cly-crashes-dashboard-tile class="has-ellipsis" columnWidth="3"
:tooltip="i18n('crashes.help-background')" showDonut
:donutPercentage="mobileMetrics.backgroundPercent || 0">
<template v-slot:title>{{i18n('crashes.background')}}</template>
<template v-slot:value>{{mobileMetrics.backgroundPercent ? mobileMetrics.backgroundPercent.toFixed(2) : 0}} %</template>
<template v-slot:value>{{mobileMetrics.backgroundPercent ? mobileMetrics.backgroundPercent.toFixed(2) : 0}}%</template>
</cly-crashes-dashboard-tile>
</div>
</cly-section>
Expand Down
2 changes: 1 addition & 1 deletion plugins/density/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"name": data[k].density,
"value": countlyCommon.getShortNumber(data[k][property] || 0),
"percent": percent,
"percentText": percent + " % " + CV.i18n('common.of-total'),
"percentText": percent + "% " + CV.i18n('common.of-total'),
"info": CV.i18n('common.info'),
"color": k > 3 ? this.graphColors[k % 4] : this.graphColors[k]
});
Expand Down
Loading