commit a7463ad68998b1c627f526ba208d607c8cb0057b add directly connected cablerun view diff --git a/src/classes/cmdb/ui/global/isys_cmdb_ui_category_g_virtual_cabling.class.php b/src/classes/cmdb/ui/global/isys_cmdb_ui_category_g_virtual_cabling.class.php index aacbdfd..c1ab2c5 100755 --- a/src/classes/cmdb/ui/global/isys_cmdb_ui_category_g_virtual_cabling.class.php +++ b/src/classes/cmdb/ui/global/isys_cmdb_ui_category_g_virtual_cabling.class.php @@ -131,6 +131,10 @@ class isys_cmdb_ui_category_g_virtual_cabling extends isys_cmdb_ui_category_g_vi /* lookup table for dTree parent IDs to avoid duplicate input parents */ $l_parents = array(); + + /* longest strlen() of connection titles (used for spacing calculation) */ + $strlen_connection = strlen($g_comp_template_language_manager->get("LC__CATG__STORAGE_CONNECTION_TYPE")); + $isys_catg_connector_list__title_longest = $strlen_connection; /* resolve cable run for outputs */ while($l_row = $l_catdata->get_row()) { @@ -160,6 +164,11 @@ class isys_cmdb_ui_category_g_virtual_cabling extends isys_cmdb_ui_category_g_vi $l_row["type"] = $l_dao_connector->get_assigned_category_title($l_row["isys_catg_connector_list__assigned_category"]); + /** strlen for spacers */ + $l_row["isys_catg_connector_list__title_length"] = strlen($l_row["isys_catg_connector_list__title"]); + if ($l_row["isys_catg_connector_list__title_length"] > $isys_catg_connector_list__title_longest) + $isys_catg_connector_list__title_longest = $l_row["isys_catg_connector_list__title_length"]; + /** * CAROUSEL */ @@ -199,7 +208,11 @@ class isys_cmdb_ui_category_g_virtual_cabling extends isys_cmdb_ui_category_g_vi $l_connections[] = $l_row; /* -- */ } - + + foreach($l_connections as &$l_row) + $l_row["isys_catg_connector_list__title_spacers"] = $isys_catg_connector_list__title_longest - $l_row["isys_catg_connector_list__title_length"]; + + $g_comp_template->assign("connection_spacers", $isys_catg_connector_list__title_longest - $strlen_connection); $g_comp_template->assign("tree", $this->get_tree()); $g_comp_template->assign("connections", $l_connections); diff --git a/src/lang/de.inc.php b/src/lang/de.inc.php index 5dc8b2d..50df4c6 100755 --- a/src/lang/de.inc.php +++ b/src/lang/de.inc.php @@ -214,6 +214,8 @@ $g_langcache = array( 'LC__CATG__CONNECTOR__SIBLING_IN_OR_OUT' => 'Zugehöriger Eingang/Ausgang', 'LC__CATG__CONNECTOR__SIBLING_OUT' => 'Zugehörige Ausgänge', 'LC__CATG__CONNECTOR__SUFFIX_SCHEMA' => 'Namensschema für Ausgangspärchen', + 'LC__CATG__CONNECTOR__DIRECTLY_CONNECTED' => 'Direkte Verbindungen', + 'LC__CATG__CONNECTOR__CONNECTED_TO' => 'Verbunden mit', 'LC__CATG__CONTACT_COMMENT' => 'Kommentar', 'LC__CATG__CONTACT_COMPANY' => 'Firma', 'LC__CATG__CONTACT_EMAIL' => 'E-Mail', diff --git a/src/lang/en.inc.php b/src/lang/en.inc.php index 50dc3ec..82226ec 100755 --- a/src/lang/en.inc.php +++ b/src/lang/en.inc.php @@ -209,6 +209,8 @@ $g_langcache = array ( 'LC__CATG__CONNECTOR__SIBLING_IN_OR_OUT' => 'Assigned Input/Output', 'LC__CATG__CONNECTOR__SIBLING_OUT' => 'Corresponding outputs', 'LC__CATG__CONNECTOR__SUFFIX_SCHEMA' => 'Naming schema for output sibling', + 'LC__CATG__CONNECTOR__DIRECTLY_CONNECTED' => 'Directly connected', + 'LC__CATG__CONNECTOR__CONNECTED_TO' => 'Connected to', 'LC__CATG__CONTACT_COMMENT' => 'Comment', 'LC__CATG__CONTACT_COMPANY' => 'Company', 'LC__CATG__CONTACT_EMAIL' => 'E-Mail', diff --git a/src/themes/default/smarty/templates/content/bottom/content/catg__cabling.tpl b/src/themes/default/smarty/templates/content/bottom/content/catg__cabling.tpl index 7c8cb5b..9f2150b 100755 --- a/src/themes/default/smarty/templates/content/bottom/content/catg__cabling.tpl +++ b/src/themes/default/smarty/templates/content/bottom/content/catg__cabling.tpl @@ -10,6 +10,10 @@
  • [{isys type="lang" ident="LC__CATG__CONNECTOR__CABLERUN"}]: [{isys type="lang" ident="LC__UNIVERSAL__TREEVIEW"}] ([{isys type="lang" ident="LC__UNIVERSAL__NESTING"}])
  • +
  • + [{isys type="lang" ident="LC__CATG__CONNECTOR__DIRECTLY_CONNECTED"}] +
  • +
    @@ -103,6 +107,38 @@ [{$tree}]
    +
    + + + + + + + + + + + + + [{foreach from=$connections item=con}] + [{assign var=connected_to value=$con.carousel[1]}] + + + + + [{/foreach}] + +
    [{isys type="lang" ident="LC__CATG__STORAGE_CONNECTION_TYPE"}] [{' '|str_repeat:$connection_spacers}]  [{isys type="lang" ident="LC__CATG__CONNECTOR__CONNECTED_TO"}]
    + [{$con.isys_catg_connector_list__title}] + [{' '|str_repeat:$con.isys_catg_connector_list__title_spacers}]-> + + [{if isset($connected_to)}] + [{isys type="cmdb_link" quickinfo="1" objID=$connected_to.OBJECT_ID p_strValue=$connected_to.OBJECT_TITLE}] + ([{$connected_to.CONNECTOR_TITLE}]) + [{/if}] +
    +
    +