Fix stroke-dasharray in SVG

aXenDeveloper · Apr 8, 2021 · b08c939 · b08c939
1 parent 0db3c85
commit b08c939
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 11 deletions.
diff --git a/data/javascript.xml b/data/javascript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="axenserverlist">
- <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';
+ <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';
 const COOKIE_AXENSERVERLIST_SCROLL = 'aXenServerList_widget_scroll';
 const COOKIE_AXENSERVERLIST_FULLWIDTH = 'aXenServerList_widget_fullWidth';
 

diff --git a/data/lang.xml b/data/lang.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="axenserverlist" version="10010">
+ <app key="axenserverlist" version="10011">
   <word key="__app_axenserverlist" js="0">(aXen) Advanced Server List</word>
   <word key="menutab__axenserverlist_icon" js="0">server</word>
   <word key="menutab__axenserverlist" js="0">Advanced Server List</word>

diff --git a/data/theme.xml b/data/theme.xml
@@ -212,10 +212,11 @@
 
     <li class="aXenServerList_item_players">
       {{$calcPlayers = $row['axenserverlist_max_players'] ? round( ($row['axenserverlist_current_players'] * 100) / $row['axenserverlist_max_players'] ) : 0;}}
+      {{$calcPlayers = $calcPlayers <= 100 ? $calcPlayers : 100;}}
 
       <svg xmlns="http://www.w3.org/2000/svg" class="aXenServerList_item_players_svg" viewBox="0 0 49 40.22">
         <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>
-        <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>
+        <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>
       </svg>
 
       <span>{$row['axenserverlist_current_players']} / {$row['axenserverlist_max_players']}</span>
@@ -509,7 +510,7 @@
   stroke: rgb(var(--theme-link_hover));
   fill-opacity: 0;
   stroke-width: 4;
-  stroke-dasharray: 97.6754, 97.6754;
+  stroke-dasharray: 97.6754, 100;
 }
 
 {{if settings.aXenServerList_settings_colors}}

diff --git a/data/versions.json b/data/versions.json
@@ -9,5 +9,6 @@
     "10007": "1.0.2",
     "10008": "1.1.0 Alpha 2",
     "10009": "1.1.0 Alpha 3",
-    "10010": "1.1.0"
+    "10010": "1.1.0",
+    "10011": "1.1.1"
 }
diff --git a/dev/css/front/widget.css b/dev/css/front/widget.css
@@ -188,7 +188,7 @@
   stroke: rgb(var(--theme-link_hover));
   fill-opacity: 0;
   stroke-width: 4;
-  stroke-dasharray: 97.6754, 97.6754;
+  stroke-dasharray: 97.6754, 100;
 }
 
 {{if settings.aXenServerList_settings_colors}}

diff --git a/dev/html/front/servers/row.phtml b/dev/html/front/servers/row.phtml
@@ -48,7 +48,7 @@
 
       <svg xmlns="http://www.w3.org/2000/svg" class="aXenServerList_item_players_svg" viewBox="0 0 49 40.22">
         <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>
-        <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>
+        <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>
       </svg>
 
       <span>{$row['axenserverlist_current_players']} / {$row['axenserverlist_max_players']}</span>

diff --git a/setup/upg_10011/data.json b/setup/upg_10011/data.json
@@ -0,0 +1,24 @@
+{
+    "id": 10011,
+    "name": "1.1.1",
+    "steps": {
+        "queries": true,
+        "lang": false,
+        "theme": true,
+        "themeSettings": false,
+        "javascript": true,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "whatsnew": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}
diff --git a/setup/upg_10011/javascript.json b/setup/upg_10011/javascript.json
@@ -0,0 +1,14 @@
+{
+    "files": {
+        "added": [],
+        "edited": [
+            "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js"
+        ],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}
diff --git a/setup/upg_working/queries.json → setup/upg_10011/queries.json b/setup/upg_working/queries.json → setup/upg_10011/queries.json
@@ -1,5 +1,5 @@
-[
-    {
+{
+    "1": {
         "method": "changeColumn",
         "params": [
             "axenserverlist_servers",
@@ -18,7 +18,7 @@
             }
         ]
     },
-    {
+    "2": {
         "method": "changeColumn",
         "params": [
             "axenserverlist_servers",
@@ -37,4 +37,4 @@
             }
         ]
     }
-]
+}
diff --git a/setup/upg_10011/theme.json b/setup/upg_10011/theme.json
@@ -0,0 +1,27 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/pages\/aXenServerListPage",
+            "front\/servers\/debugTotal",
+            "front\/servers\/footer",
+            "front\/servers\/more",
+            "front\/servers\/row",
+            "front\/servers\/title",
+            "front\/widgets\/aXenServerListWidget"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [
+            "front\/widget.css"
+        ],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}