[CP][mod] added regex to strip port from upstream name in html files

(cherry picked from commit e4d912106d)
This commit is contained in:
2021-02-28 12:10:09 -05:00
parent 0a23303f66
commit b960cb5acf
9 changed files with 69 additions and 30 deletions

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -15,9 +15,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -13,9 +13,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -15,9 +15,13 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1"> <div class="pure-u-1-1">
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>

View File

@@ -16,26 +16,33 @@
<div class="logo"> <div class="logo">
<div class="left"><!--# echo var="server_domain" default="some" --></div> <div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div> <div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="website" --></div> <div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div> </div>
</div> </div>
<div class="pure-u-1-1"></div> <div class="pure-u-1-1"></div>
<div class="pure-u-1-1 center-elements vert-70 status-code"> <div class="pure-u-1-1 center-elements vert-70 status-code">
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1-1 code">0x2A</div> <div class="pure-u-1-1 code">0x2A</div>
<div class="pure-u-1-1 pure-u-md-1-2 center-elements msg"> <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
(1/42) installing <!--# echo var="upstream" default="website" --> (1/42) installing
</div> <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<div class="pure-u-1-1 pure-u-md-1-2 center-elements msg"> <!--# echo var="server_name" default="website" -->
[###### <!--# endif -->
<div style="top: -13px; position: relative;"> </div>
<div class="loader pipe loader-0-3">|</div> <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
<div class="loader loader-1-3">/</div> [######
<div class="loader loader-2-3">-</div> <div style="top: -13px; position: relative;">
<div class="loader loader-3-3">\</div> <div class="loader pipe loader-0-3">|</div>
</div> <div class="loader loader-1-3">/</div>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26% <div class="loader loader-2-3">-</div>
<div class="loader loader-3-3">\</div>
</div> </div>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26%
</div>
</div> </div>
</div> </div>
</div> </div>