From af34a668b3f3816a110357dac18dfe0f769ed0ee Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 24 Dec 2015 22:09:30 +0100 Subject: haproxy-devel, move icon usage to separate file for easy changing 'themes' / prepare for 2.3 --- config/haproxy-devel/haproxy.xml | 4 ++ config/haproxy-devel/pkg/haproxy_gui.inc | 75 ++++++++++++++++++++++++++ config/haproxy-devel/pkg/haproxy_htmllist.inc | 29 +++++----- config/haproxy-devel/www/haproxy_listeners.php | 60 ++++++++++++--------- config/haproxy-devel/www/haproxy_pools.php | 37 ++++++++----- 5 files changed, 153 insertions(+), 52 deletions(-) create mode 100644 config/haproxy-devel/pkg/haproxy_gui.inc diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml index 07dc53d1..68637209 100644 --- a/config/haproxy-devel/haproxy.xml +++ b/config/haproxy-devel/haproxy.xml @@ -109,6 +109,10 @@ /usr/local/www/ https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_templates.php + + /usr/local/pkg/ + https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_gui.inc + /usr/local/pkg/ https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_socketinfo.inc diff --git a/config/haproxy-devel/pkg/haproxy_gui.inc b/config/haproxy-devel/pkg/haproxy_gui.inc new file mode 100644 index 00000000..5392e87a --- /dev/null +++ b/config/haproxy-devel/pkg/haproxy_gui.inc @@ -0,0 +1,75 @@ + array( + "faicon" => "fa-arrow-up", + "icon" => "icon_up.gif", + "iconsize" => 17), + 'movedown' => array( + "faicon" => "fa-arrow-down", + "icon" => "icon_down.gif", + "iconsize" => 17), + 'add' => array( + "faicon" => "fa-level-down", + "icon" => "icon_plus.gif", + "iconsize" => 17), + 'delete' => array( + "faicon" => "fa-trash", + "icon" => "icon_x.gif", + "iconsize" => 17), + 'edit' => array( + "faicon" => "fa-pencil", + "icon" => "icon_e.gif", + "iconsize" => 17), + 'clone' => array( + "faicon" => "fa-clone", + "icon" => "icon_plus.gif"), + 'acl' => array( + "faicon" => "fa-random", + "icon" => "icon_ts_rule.gif", + "iconsize" => 11), + 'cert' => array( + "faicon" => "fa-lock", + "icon" => "icon_frmfld_cert.png", + "iconsize" => 11), + 'advanced' => array( + "faicon" => "fa-cog", + "icon" => "icon_advanced.gif", + "iconsize" => 11), + 'enabled' => array( + "faicon" => "fa-check", + "icon" => "icon_pass.gif", + "iconsize" => 11), + 'disabled' => array( + "faicon" => "fa-ban", + "icon" => "icon_reject.gif", + "iconsize" => 11), + 'stats' => array( + "faicon" => "fa-tasks", + "icon" => "icon_log_s.gif", + "iconsize" => 11) +); + +global $pf_version; +$pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); + +function pf_version() { + global $pf_version; + return $pf_version; +} + +function haproxyicon($iconname, $title) { + global $g, $haproxy_icons; + $title = htmlspecialchars($title); + $title = str_replace("'", "'", $title); + + $faicon = $haproxy_icons[$iconname]["faicon"]; + if (pf_version() < "2.3") { + $icon = $haproxy_icons[$iconname]["icon"]; + $iconsize = $haproxy_icons[$iconname]["iconsize"]; + return ""; + } else { + return ""; + } + +} diff --git a/config/haproxy-devel/pkg/haproxy_htmllist.inc b/config/haproxy-devel/pkg/haproxy_htmllist.inc index d5386fcd..70a53c86 100644 --- a/config/haproxy-devel/pkg/haproxy_htmllist.inc +++ b/config/haproxy-devel/pkg/haproxy_htmllist.inc @@ -33,6 +33,7 @@ require_once("config.inc"); require_once("haproxy_utils.inc"); +require_once("haproxy_gui.inc"); class HaproxyHtmlList { @@ -193,20 +194,20 @@ class HaproxyHtmlList "; if (empty($this->noindex)) { echo ""; } echo "
- + ".haproxyicon('edit','edit entry')." - + ".haproxyicon('delete','delete entry')." - + ".haproxyicon('clone','duplicate entry')." - + ".haproxyicon('moveup','move row up')." - + ".haproxyicon('movedown','move row down')."
@@ -232,17 +233,17 @@ class HaproxyHtmlList "; if (empty($this->noindex)) { echo ""; } echo "
- + ".haproxyicon('delete','delete entry')." - + ".haproxyicon('clone','duplicate entry')." - + ".haproxyicon('moveup','move row up')." - + ".haproxyicon('movedown','move row down')."
@@ -328,7 +329,7 @@ class HaproxyHtmlList echo " - + ".haproxyicon('add','add another entry')." "; } } @@ -445,12 +446,12 @@ function haproxy_htmllist_js(){ btd.setAttribute("valign", "middle"); btd.innerHTML = '' + - '"; + '"; btr.appendChild(btd); btd = document.createElement("td"); btd.setAttribute("valign", "middle"); - btd.innerHTML = '"; + btd.innerHTML = '"; btr.appendChild(btd); @@ -458,12 +459,12 @@ function haproxy_htmllist_js(){ if (tabledefinition && tabledefinition['keyfield'] == "") { btd = document.createElement("td"); btd.setAttribute("valign", "middle"); - btd.innerHTML = '"; + btd.innerHTML = '"; btr.appendChild(btd); btd = document.createElement("td"); btd.setAttribute("valign", "middle"); - btd.innerHTML = '"; + btd.innerHTML = '"; btr.appendChild(btd); } diff --git a/config/haproxy-devel/www/haproxy_listeners.php b/config/haproxy-devel/www/haproxy_listeners.php index c7288e7d..e3dc7120 100644 --- a/config/haproxy-devel/www/haproxy_listeners.php +++ b/config/haproxy-devel/www/haproxy_listeners.php @@ -35,6 +35,7 @@ require_once("haproxy.inc"); require_once("certs.inc"); require_once("haproxy_utils.inc"); require_once("pkg_haproxy_tabs.inc"); +require_once("haproxy_gui.inc"); $changedesc = "Services: HAProxy: Frontends"; @@ -132,23 +133,24 @@ echo "
"; ?> @@ -197,9 +199,6 @@ function js_callback(req) { } ksort($a_frontend_grouped); - $img_cert = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png"; - $img_adv = "/themes/{$g['theme']}/images/icons/icon_advanced.gif"; - $img_acl = "/themes/{$g['theme']}/images/icons/icon_ts_rule.gif"; $textgray = ""; $first = true; $last_frontend_shared = false; @@ -218,13 +217,12 @@ function js_callback(req) { - - " alt="icon" /> + + " ondblclick="document.location='haproxy_listeners_edit.php?id=';"> @@ -235,11 +233,12 @@ function js_callback(req) { $acls = get_frontend_acls($frontend); $isaclset = ""; foreach ($acls as $acl) { - $isaclset .= " " . htmlspecialchars($acl['descr']); + $isaclset .= "\n" . htmlspecialchars($acl['descr']); + } + if ($isaclset) { + echo haproxyicon("acl", gettext("acl's used") . ": {$isaclset}"); } - if ($isaclset) - echo ""; - + if (get_frontend_uses_ssl($frontend)) { $cert = lookup_cert($frontend['ssloffloadcert']); $descr = htmlspecialchars($cert['descr']); @@ -252,14 +251,15 @@ function js_callback(req) { } } } - echo 'SSL offloading'; + echo haproxyicon("cert", "SSL offloading cert: {$descr}"); } $isadvset = ""; if ($frontend['advanced_bind']) $isadvset .= "Advanced bind: ".htmlspecialchars($frontend['advanced_bind'])."\r\n"; if ($frontend['advanced']) $isadvset .= "Advanced pass thru setting used\r\n"; - if ($isadvset) - echo ""; + if ($isadvset) { + echo haproxyicon("advanced", gettext("Advanced settings set") . ": {$isadvset}"); + } ?> @@ -277,7 +277,7 @@ function js_callback(req) { print "
"; print "{$addr['addr']}:{$addr['port']}"; if ($addr['ssl'] == 'yes') { - echo 'SSL'; + echo haproxyicon("cert", "SSL offloading"); } print " - - - + + +
" width="17" height="17" border="0" />" width="17" height="17" border="0" />" width="17" height="17" border="0" /> + + + + + +
@@ -342,7 +348,9 @@ function js_callback(req) { - +
" width="17" height="17" border="0" /> + +
diff --git a/config/haproxy-devel/www/haproxy_pools.php b/config/haproxy-devel/www/haproxy_pools.php index d98c7f41..ca449246 100644 --- a/config/haproxy-devel/www/haproxy_pools.php +++ b/config/haproxy-devel/www/haproxy_pools.php @@ -33,7 +33,7 @@ $shortcut_section = "haproxy"; require_once("guiconfig.inc"); require_once("haproxy.inc"); require_once("pkg_haproxy_tabs.inc"); - +require_once("haproxy_gui.inc"); if (!is_array($config['installedpackages']['haproxy']['ha_pools']['item'])) { $config['installedpackages']['haproxy']['ha_pools']['item'] = array(); @@ -97,7 +97,6 @@ haproxy_css(); "> '; + if ($pool['stats_enabled']=='yes') { + echo haproxyicon("stats", gettext("stats enabled")); } $isadvset = ""; - if ($pool['advanced']) $isadvset .= "Per server pass thru\r\n"; - if ($pool['advanced_backend']) $isadvset .= "Backend pass thru\r\n"; - if ($isadvset) - echo ""; + if ($pool['advanced']) { + $isadvset .= "Per server pass thru\r\n"; + } + if ($pool['advanced_backend']) { + $isadvset .= "Backend pass thru\r\n"; + } + if ($isadvset) { + echo haproxyicon("advanced", gettext("advanced settings set") . ": {$isadvset}"); + } ?> @@ -156,9 +160,15 @@ haproxy_css(); - - - + + +
" width="17" height="17" border="0" />" width="17" height="17" border="0" />" width="17" height="17" border="0" /> + + + + + +
@@ -173,7 +183,10 @@ haproxy_css(); - +
" width="17" height="17" border="0" /> + + +
-- cgit v1.2.3