Changeset 317

Timestamp:

Oct 31, 2017, 9:55:08 AM (7 years ago)

Author:

g7moreau

Message:

• Add fqdn_html_breakable function and change unit to ex in style file

Location:

trunk

Files:

• klask (modified) (10 diffs)
• style-klask.css (modified) (4 diffs)

trunk/klask

@@ -496 +496 @@
    my $port_hr = shift;
    $port_hr =~ s/($SEP_AGGREGATOR_PORT)/ - /; # First occurence
-   $port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence
+   $port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g;  # Other occurence
    return $port_hr;
+   }
+
+#---------------------------------------------------------------
+# fqdn_html_breakable change it's parameter, use it like chomp perl function
+
+sub fqdn_html_breakable {
+   my $ref_fqdn = \($_[0]);
+   
+   # Add HTML <wbr> before every . to permit line break
+   $$ref_fqdn =~ s{\.}{<wbr />.}g;
    }
 
@@ -1779 +1789 @@
       my $parent_port_hr = format_aggregator4html($computerdb->{$ip}{'switch_port_hr'});
 
+      fqdn_html_breakable($switch_hostname);
+      fqdn_html_breakable(my $hostname_fq_html = $computerdb->{$ip}{'hostname_fq'});
+
       print <<"END_HTML";
   <tr class="$typerow">
@@ -1784 +1797 @@
    <td class="bklask-port">$parent_port_hr</td>
    <td class="bklask-arrow">$arrow</td>
-   <td sorttable_customkey="$host_short">$computerdb->{$ip}{'hostname_fq'}</td>
+   <td sorttable_customkey="$host_short">$hostname_fq_html</td>
    <td sorttable_customkey="$ip_sort">$ip</td>
    <td sorttable_customkey="$mac_sort">$computerdb->{$ip}{'mac_address'}</td>
@@ -1791 +1804 @@
   </tr>
 END_HTML
-#   <td colspan="2">$arrow</td>
       }
 
@@ -1839 +1851 @@
          my $parent_port_hr = format_aggregator4html($db_switch_output_port{$sw});
          my $child_port_hr  = format_aggregator4html($db_switch_parent{$sw}->{'port_hr'});
+
+         fqdn_html_breakable($sw);
+         fqdn_html_breakable(my $sw_child_html = $db_switch_parent{$sw}->{'switch'});
 
          print <<"END_HTML";
@@ -1845 +1860 @@
    <td class="bklask-port">$parent_port_hr</td>
    <td class="bklask-arrow">$arrow $child_port_hr</td>
-   <td sorttable_customkey="$host_short">$db_switch_parent{$sw}->{'switch'}</td>
+   <td sorttable_customkey="$host_short">$sw_child_html</td>
    <td sorttable_customkey="$ip_sort">$ipv4_address</td>
    <td sorttable_customkey="$mac_sort">$mac_address</td>
@@ -1877 +1892 @@
          my $arrow ='&#10235;';
             $arrow ='&#10237;' if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/;
+
+         fqdn_html_breakable($sw);
 
          print <<"END_HTML";
@@ -1890 +1907 @@
   </tr>
 END_HTML
-         #<td>$arrow</td><td>$parent_port_hr</td>
-
          next LOOP_ON_OUTPUT_SWITCH;
-
-         # Old print
-         print <<"END_HTML";
-  <tr class="$typerow">
-   <td sorttable_customkey="$switch_hostname_sort">$sw</td>
-   <td class="bklask-port">$parent_port_hr</td>
-   <td class="bklask-arrow">$arrow</td><td></td>
-   <td sorttable_customkey="router">router</td>
-   <td sorttable_customkey="999999999999"></td>
-   <td sorttable_customkey="99999"></td>
-   <td></td>
-   <td></td>
-  </tr>
-END_HTML
          }
       }
@@ -1946 +1947 @@
             my $parent_port_hr = format_aggregator4html($port_connect);
             my $child_port_hr  = format_aggregator4html($db_switch_output_port{$sw});
+
+            fqdn_html_breakable($sw);
+            fqdn_html_breakable($sw_connect);
 
             print <<"END_HTML";
@@ -1962 +1966 @@
          else {
             my $parent_port_hr = format_aggregator4html($port_connect);
+
+            fqdn_html_breakable($sw);
+            fqdn_html_breakable($sw_connect);
 
             print <<"END_HTML";

trunk/style-klask.css

@@ -23 +23 @@
 
 th.klask-header-left {
-  -moz-border-radius-topleft : 1em;
+  -moz-border-radius-topleft : 1ex;
   }
 
 th.klask-header-right {
-  -moz-border-radius-topright : 1em;
+  -moz-border-radius-topright : 1ex;
   }
 
 th.klask-footer-left {
-  -moz-border-radius-bottomleft : 1em;
+  -moz-border-radius-bottomleft : 1ex;
   }
 
 th.klask-footer-right {
-  -moz-border-radius-bottomright : 1em;
+  -moz-border-radius-bottomright : 1ex;
   }
 
@@ -50 +50 @@
   border-collapse : collapse;
   font-family     : Courier;
-  padding-left    : 0.5em;
-  padding-right   : 0.5em;
+  padding-left    : 0.5ex;
+  padding-right   : 0.5ex;
   }
 
@@ -58 +58 @@
   border-collapse : collapse;
   font-family     : Courier;
-  padding-left    : 0.5em;
-  padding-right   : 0.5em;
+  padding-left    : 0.5ex;
+  padding-right   : 0.5ex;
   }
 
@@ -68 +68 @@
 td.bklask-arrow {
   text-align      : left;
-  text-indent     : -6em;
-  padding-left    : 7em !important;
+  text-indent     : -5.5ex;
+  padding-left    : 6.5em !important;
   }