Skip to content

Commit b08c939

Browse files
aXenDeveloperaXenDeveloper
committed
Fix stroke-dasharray in SVG
1 parent 0db3c85 commit b08c939

File tree

10 files changed

+78
-11
lines changed

10 files changed

+78
-11
lines changed

‎data/javascript.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<javascript app="axenserverlist">
3-
<file javascript_app="axenserverlist" javascript_location="front" javascript_path="controllers/axenserverlist" javascript_name="aXenServerList.js" javascript_type="controller" javascript_version="10010" javascript_position="1000050"><![CDATA[const COOKIE_AXENSERVERLIST_HIDE = 'aXenServerList_widget_hide';
3+
<file javascript_app="axenserverlist" javascript_location="front" javascript_path="controllers/axenserverlist" javascript_name="aXenServerList.js" javascript_type="controller" javascript_version="10011" javascript_position="1000050"><![CDATA[const COOKIE_AXENSERVERLIST_HIDE = 'aXenServerList_widget_hide';
44
const COOKIE_AXENSERVERLIST_SCROLL = 'aXenServerList_widget_scroll';
55
const COOKIE_AXENSERVERLIST_FULLWIDTH = 'aXenServerList_widget_fullWidth';
66

‎data/lang.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<language>
3-
<app key="axenserverlist" version="10010">
3+
<app key="axenserverlist" version="10011">
44
<word key="__app_axenserverlist" js="0">(aXen) Advanced Server List</word>
55
<word key="menutab__axenserverlist_icon" js="0">server</word>
66
<word key="menutab__axenserverlist" js="0">Advanced Server List</word>

‎data/theme.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,11 @@
212212
213213
<li class="aXenServerList_item_players">
214214
{{$calcPlayers = $row['axenserverlist_max_players'] ? round( ($row['axenserverlist_current_players'] * 100) / $row['axenserverlist_max_players'] ) : 0;}}
215+
{{$calcPlayers = $calcPlayers <= 100 ? $calcPlayers : 100;}}
215216
216217
<svg xmlns="http://www.w3.org/2000/svg" class="aXenServerList_item_players_svg" viewBox="0 0 49 40.22">
217218
<path class="aXenServerList_item_players_svg:none" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)"></path>
218-
<path class="aXenServerList_item_players_svg:fill{{if $calcPlayers > 0 && $calcPlayers <= 20}} aXenServerList_item_players_svg:fill_1_20{{elseif $calcPlayers > 20 && $calcPlayers <= 40 }} aXenServerList_item_players_svg:fill_21_40{{elseif $calcPlayers > 40 && $calcPlayers <= 60 }} aXenServerList_item_players_svg:fill_41_60{{elseif $calcPlayers > 60 && $calcPlayers <= 80 }} aXenServerList_item_players_svg:fill_61_80{{elseif $calcPlayers > 80 }} aXenServerList_item_players_svg:fill_81_100{{endif}}" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)" style="stroke-dashoffset: calc(98px - {$calcPlayers}px);"></path>
219+
<path class="aXenServerList_item_players_svg:fill{{if $calcPlayers > 0 && $calcPlayers <= 20}} aXenServerList_item_players_svg:fill_1_20{{elseif $calcPlayers > 20 && $calcPlayers <= 40 }} aXenServerList_item_players_svg:fill_21_40{{elseif $calcPlayers > 40 && $calcPlayers <= 60 }} aXenServerList_item_players_svg:fill_41_60{{elseif $calcPlayers > 60 && $calcPlayers <= 80 }} aXenServerList_item_players_svg:fill_61_80{{elseif $calcPlayers > 80 }} aXenServerList_item_players_svg:fill_81_100{{endif}}" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)" style="stroke-dashoffset: calc(100px - {$calcPlayers}px);"></path>
219220
</svg>
220221
221222
<span>{$row['axenserverlist_current_players']} / {$row['axenserverlist_max_players']}</span>
@@ -509,7 +510,7 @@
509510
stroke: rgb(var(--theme-link_hover));
510511
fill-opacity: 0;
511512
stroke-width: 4;
512-
stroke-dasharray: 97.6754, 97.6754;
513+
stroke-dasharray: 97.6754, 100;
513514
}
514515
515516
{{if settings.aXenServerList_settings_colors}}

‎data/versions.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"10007": "1.0.2",
1010
"10008": "1.1.0 Alpha 2",
1111
"10009": "1.1.0 Alpha 3",
12-
"10010": "1.1.0"
12+
"10010": "1.1.0",
13+
"10011": "1.1.1"
1314
}

‎dev/css/front/widget.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
stroke: rgb(var(--theme-link_hover));
189189
fill-opacity: 0;
190190
stroke-width: 4;
191-
stroke-dasharray: 97.6754, 97.6754;
191+
stroke-dasharray: 97.6754, 100;
192192
}
193193

194194
{{if settings.aXenServerList_settings_colors}}

‎dev/html/front/servers/row.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<svg xmlns="http://www.w3.org/2000/svg" class="aXenServerList_item_players_svg" viewBox="0 0 49 40.22">
5050
<path class="aXenServerList_item_players_svg:none" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)"></path>
51-
<path class="aXenServerList_item_players_svg:fill{{if $calcPlayers > 0 && $calcPlayers <= 20}} aXenServerList_item_players_svg:fill_1_20{{elseif $calcPlayers > 20 && $calcPlayers <= 40 }} aXenServerList_item_players_svg:fill_21_40{{elseif $calcPlayers > 40 && $calcPlayers <= 60 }} aXenServerList_item_players_svg:fill_41_60{{elseif $calcPlayers > 60 && $calcPlayers <= 80 }} aXenServerList_item_players_svg:fill_61_80{{elseif $calcPlayers > 80 }} aXenServerList_item_players_svg:fill_81_100{{endif}}" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)" style="stroke-dashoffset: calc(98px - {$calcPlayers}px);"></path>
51+
<path class="aXenServerList_item_players_svg:fill{{if $calcPlayers > 0 && $calcPlayers <= 20}} aXenServerList_item_players_svg:fill_1_20{{elseif $calcPlayers > 20 && $calcPlayers <= 40 }} aXenServerList_item_players_svg:fill_21_40{{elseif $calcPlayers > 40 && $calcPlayers <= 60 }} aXenServerList_item_players_svg:fill_41_60{{elseif $calcPlayers > 60 && $calcPlayers <= 80 }} aXenServerList_item_players_svg:fill_61_80{{elseif $calcPlayers > 80 }} aXenServerList_item_players_svg:fill_81_100{{endif}}" d="M1048.02,1119.34a22.5,22.5,0,1,1,37.15-.28" transform="translate(-1042 -1082)" style="stroke-dashoffset: calc(100px - {$calcPlayers}px);"></path>
5252
</svg>
5353

5454
<span>{$row['axenserverlist_current_players']} / {$row['axenserverlist_max_players']}</span>

‎setup/upg_10011/data.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"id": 10011,
3+
"name": "1.1.1",
4+
"steps": {
5+
"queries": true,
6+
"lang": false,
7+
"theme": true,
8+
"themeSettings": false,
9+
"javascript": true,
10+
"emailTemplates": false,
11+
"hooks": false,
12+
"acpSearchKeywords": false,
13+
"settings": false,
14+
"tasks": false,
15+
"modules": false,
16+
"widgets": false,
17+
"whatsnew": false,
18+
"customOptions": false,
19+
"customRoutines": false
20+
},
21+
"forceMainUpgrader": false,
22+
"forceManualDownloadNoCiC": false,
23+
"forceManualDownloadCiC": false
24+
}

‎setup/upg_10011/javascript.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"files": {
3+
"added": [],
4+
"edited": [
5+
"axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js"
6+
],
7+
"removed": []
8+
},
9+
"orders": {
10+
"added": [],
11+
"edited": [],
12+
"removed": []
13+
}
14+
}

‎setup/upg_working/queries.json ‎setup/upg_10011/queries.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[
2-
{
1+
{
2+
"1": {
33
"method": "changeColumn",
44
"params": [
55
"axenserverlist_servers",
@@ -18,7 +18,7 @@
1818
}
1919
]
2020
},
21-
{
21+
"2": {
2222
"method": "changeColumn",
2323
"params": [
2424
"axenserverlist_servers",
@@ -37,4 +37,4 @@
3737
}
3838
]
3939
}
40-
]
40+
}

‎setup/upg_10011/theme.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"html": {
3+
"added": [],
4+
"edited": [
5+
"front\/pages\/aXenServerListPage",
6+
"front\/servers\/debugTotal",
7+
"front\/servers\/footer",
8+
"front\/servers\/more",
9+
"front\/servers\/row",
10+
"front\/servers\/title",
11+
"front\/widgets\/aXenServerListWidget"
12+
],
13+
"removed": []
14+
},
15+
"css": {
16+
"added": [],
17+
"edited": [
18+
"front\/widget.css"
19+
],
20+
"removed": []
21+
},
22+
"resources": {
23+
"added": [],
24+
"edited": [],
25+
"removed": []
26+
}
27+
}

0 commit comments

Comments
 (0)