Implements #6841 Add Bootstrap icons and make module icons configurable in module.conf.php

tbrehm · tbrehm · commit 6299f105f7d7 · 2025-03-25T18:40:35.000+01:00
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
@@ -8,6 +8,7 @@
 $module['startpage']  = 'admin/server_list.php';
 $module['tab_width']    = '60';
 $module['order']    = '90';
+$module['icon'] = 'icon icon-admin';
 
 
 $items[] = array(   'title'     => 'CP Users',
diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
@@ -6,7 +6,7 @@
 $module["startpage"]  = "client/client_list.php";
 $module["tab_width"]    = '';
 $module['order']    = '20';
-
+$module['icon'] = 'icon icon-client';
 
 $items[] = array(   'title'  => "Edit Client",
 	'target'  => 'content',
diff --git a/interface/web/dashboard/dashlets/modules.php b/interface/web/dashboard/dashlets/modules.php
@@ -25,6 +25,7 @@ function show() {
 			foreach($modules as $mt) {
 				if(is_file('../' . $mt . '/lib/module.conf.php')) {
 					if(!preg_match("/^[a-z]{2,20}$/i", $mt)) die('module name contains unallowed chars.');
+					if(isset($module)) unset($module);
 					include_once '../' . $mt.'/lib/module.conf.php';
 					/* We don't want to show the dashboard */
 					if ($mt != 'dashboard') {
@@ -52,9 +53,12 @@ function show() {
 						} else {
 							if(strlen($module_title) > 8) $module_title = substr($module_title, 0, 7).'..';
 						}
+						$icon = isset($module['icon']) ? $module['icon'] : 'icon icon-'. $module['name'];
 						$mod[$module['order'].'-'.$module['name']] = array( 'modules_title'  => $module_title,
 							'modules_startpage' => $module['startpage'],
-							'modules_name'   => $module['name']);
+							'modules_name'   => $module['name'],
+							'modules_icon'   => $icon,
+							);
 					}
 				}
 			}
diff --git a/interface/web/dashboard/dashlets/templates/modules.htm b/interface/web/dashboard/dashlets/templates/modules.htm
@@ -4,7 +4,7 @@ <h2>{tmpl_var name='available_modules_txt'}</h2>
 	<tmpl_loop name='modules'>
 		<li>
 			<div class='clear'>
-			  <div class='icon icon-{tmpl_var name='modules_name'}'></div>
+			  <div class='{tmpl_var name="modules_icon"}'></div>
 			  <div class='left'>
 				<div class='title'>{tmpl_var name='modules_title'}</div>
 			  </div>
diff --git a/interface/web/dashboard/lib/module.conf.php b/interface/web/dashboard/lib/module.conf.php
@@ -33,17 +33,5 @@
 $module['startpage']  = 'dashboard/dashboard.php';
 $module['tab_width']    = '';
 $module['order']    = '1';
+$module['icon'] = 'icon icon-dashboard';
 
-//$items = array();
-//
-//$items[] = array( 'title'  => 'Dashboard 1',
-//      'target'  => 'content',
-//      'link' => 'dashboard/dashboard.php');
-//
-//$module['nav'][] = array( 'title' => 'Dashboard 2',
-//       'open'  => 1,
-//       'items' => $items);
-
-
-
-?>
diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php
@@ -8,6 +8,7 @@
 $module["startpage"]  = "dns/dns_soa_list.php";
 $module["tab_width"]    = '';
 $module['order']    = '50';
+$module['icon'] = 'icon icon-dns';
 
 
 $items[] = array( 'title'  => "Add DNS Zone",
@@ -44,12 +45,6 @@
 	'target'  => 'content',
 	'link' => 'dns/dns_soa_list.php',
 	'html_id' => 'dns_soa_list');
-/*
-$items[] = array( 'title' 	=> "A-Records",
-				  'target' 	=> 'content',
-				  'link'	=> 'dns/dns_a_list.php',
-				  'html_id' => 'dns_a_list');
-*/
 
 
 $module["nav"][] = array( 'title' => 'DNS',
@@ -71,10 +66,3 @@
 	
 	unset($items);
 }
-
-
-
-
-
-
-?>
diff --git a/interface/web/help/lib/module.conf.php b/interface/web/help/lib/module.conf.php
@@ -34,6 +34,7 @@
 
 //* The width of the tab. Normally you should leave this empty and let the browser define the width automatically.
 $module['tab_width'] = '';
+$module['icon'] = 'icon icon-help';
 
 
 //*** Menu Definition *****************************************
@@ -90,8 +91,6 @@
 }
 //* -- end of the FAQ menu section
 
-
-
 if($_SESSION['s']['user']['typ'] == 'admin') {
 	//* make sure that the items array is empty
 	$items = array();
diff --git a/interface/web/login/lib/module.conf.php b/interface/web/login/lib/module.conf.php
@@ -4,4 +4,5 @@
 $module["template"]  = "module.tpl.htm";
 $module["startpage"]  = "login/index.php";
 $module["nav"] = array();
-?>
+$module['icon'] = 'icon icon-login';
+
diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
@@ -8,7 +8,7 @@
 $module['startpage']  = 'mail/mail_domain_list.php';
 $module['tab_width']    = '';
 $module['order']    = '40';
-
+$module['icon'] = 'icon icon-mail';
 
 //**** Email accounts menu
 $items = array();
diff --git a/interface/web/mailuser/lib/module.conf.php b/interface/web/mailuser/lib/module.conf.php
@@ -7,7 +7,7 @@
 $module['template']             = 'module.tpl.htm';
 $module['startpage']            = 'mailuser/index.php';
 $module['tab_width']            = '';
-
+$module['icon'] = 'icon icon-mailuser';
 
 //**** menu
 $items = array();
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
@@ -3,12 +3,13 @@
 /*
  Config of the Module
  */
-$module["name"]   = "monitor";
-$module["title"]   = "top_menu_monitor";
-$module["template"]  = "module.tpl.htm";
-$module["tab_width"]    = '';
-$module["startpage"]  = "monitor/show_sys_state.php?state=system";
+$module['name']   = 'monitor';
+$module['title']   = 'top_menu_monitor';
+$module['template']  = 'module.tpl.htm';
+$module['tab_width']    = '';
+$module['startpage']  = 'monitor/show_sys_state.php?state=system';
 $module['order']    = '60';
+$module['icon'] = 'icon icon-monitor';
 
 unset($items);
 $items[] = array( 'title'  => "Overview",
@@ -35,7 +36,6 @@
 	'open'  => 1,
 	'items' => $items);
 
-
 /*
  We need all the available servers on the left navigation.
  So fetch them from the database and add then to the navigation as dropdown-list
diff --git a/interface/web/nav.php b/interface/web/nav.php
@@ -74,13 +74,16 @@
 						if($vm_servers['cnt'] == 0) continue;
 					}
 
+					if(isset($module)) unset($module);
 					include_once $mt.'/lib/module.conf.php';
 					$language = $app->functions->check_language((isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language']);
 					$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
 					$active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
+					$icon = isset($module['icon']) ? $module['icon'] : 'icon icon-'. $module['name'];
 					$topnav[$module['order'].'-'.$module['name']] = array( 'title'  => $app->lng($module['title']),
 						'active'  => $active,
-						'module' => $module['name']);
+						'module' => $module['name'],
+						'icon' => $icon);
 				}
 			}
 			ksort($topnav);
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
@@ -2,12 +2,13 @@
 
 $userid=$app->auth->get_user_id();
 
-$module["name"]  = "sites";
-$module["title"]  = "top_menu_sites";
-$module["template"]  = "module.tpl.htm";
-$module["startpage"]  = "sites/web_vhost_domain_list.php";
-$module["tab_width"]    = '';
+$module['name']  = 'sites';
+$module['title']  = 'top_menu_sites';
+$module['template']  = 'module.tpl.htm';
+$module['startpage']  = 'sites/web_vhost_domain_list.php';
+$module['tab_width']    = '';
 $module['order']    = '30';
+$module['icon'] = 'icon icon-sites';
 
 // Websites menu
 $items=array();
diff --git a/interface/web/themes/default/assets/stylesheets/bootstrap-icons.min.css b/interface/web/themes/default/assets/stylesheets/bootstrap-icons.min.css
diff --git a/interface/web/themes/default/assets/stylesheets/fonts/bootstrap-icons.woff b/interface/web/themes/default/assets/stylesheets/fonts/bootstrap-icons.woff
diff --git a/interface/web/themes/default/assets/stylesheets/fonts/bootstrap-icons.woff2 b/interface/web/themes/default/assets/stylesheets/fonts/bootstrap-icons.woff2
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -119,6 +119,10 @@ max-width: 1260px; }
 	transition: all ease 500ms; }
 	#main-navigation .icon {
 	font-size: 32px; }
+	#main-navigation .bi-icon {
+		margin-top: 3px;
+		margin-bottom: -3px;
+		font-size: 28px; }
 	#main-navigation .title {
 		margin-top: 2px;
 	font-weight: bold; }
@@ -215,6 +219,12 @@ max-width: 1260px; }
 		float: left;
 		margin-right: 15px;
 	font-size: 50px; }
+	.modules .bi-icon {
+		float: left;
+		margin-right: 15px;
+		margin-top: 5px;
+		margin-left: 5px;
+		font-size: 35px; }
 	.modules .left {
 	margin-top: 5px; }
 	.modules .title {
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
@@ -30,6 +30,8 @@
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/select2-bootstrap.css' />
   <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/font-awesome-4.7.0/css/font-awesome.min.css' />
+  <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap-icons.min.css' />
+  <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
   <tmpl_if name='logged_in' value='n'><link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/login.css' /></tmpl_if>
 </head>
 
diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm
@@ -1,8 +1,8 @@
 	<!-- main navigation -->
 	<nav id='main-navigation' class='btn-group btn-group-justified'>
     <tmpl_loop name="nav_top">
-		<a href="#" class="btn btn-default <tmpl_if name="active">active"<tmpl_else>" data-capp="<tmpl_var name='module'>"</tmpl_if> data-icon-class="icon-<tmpl_var name='module'>">
-		  <div class="icon icon-<tmpl_var name='module'>"></div>
+		<a href="#" class="btn btn-default <tmpl_if name="active">active"<tmpl_else>" data-capp="<tmpl_var name='module'>"</tmpl_if> data-icon-class="<tmpl_var name='icon'>">
+		  <div class="{tmpl_var name='icon'}"></div>
 		  <div class="title"><tmpl_var name="title"></div>
 		</a>
     </tmpl_loop>
diff --git a/interface/web/tools/lib/module.conf.php b/interface/web/tools/lib/module.conf.php
@@ -8,6 +8,7 @@
 $module['startpage']  = 'tools/user_settings.php';
 $module['tab_width']    = '60';
 $module['order']    = '80';
+$module['icon'] = 'icon icon-tools';
 
 
 //**** Change User password
@@ -24,4 +25,4 @@
 	'items' => $items);
 
 unset($items);
-?>
+
diff --git a/interface/web/vm/lib/module.conf.php b/interface/web/vm/lib/module.conf.php
@@ -6,6 +6,7 @@
 $module['startpage']  = 'vm/openvz_vm_list.php';
 $module['tab_width']    = '';
 $module['order'] = '50';
+$module['icon'] = 'icon icon-vm';
 
 //**** Templates menu
 $items = array();

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ function show() {`
`25`	`25`	`foreach($modules as $mt) {`
`26`	`26`	`if(is_file('../' . $mt . '/lib/module.conf.php')) {`
`27`	`27`	`if(!preg_match("/^[a-z]{2,20}$/i", $mt)) die('module name contains unallowed chars.');`
	`28`	`+ if(isset($module)) unset($module);`
`28`	`29`	`include_once '../' . $mt.'/lib/module.conf.php';`
`29`	`30`	`/* We don't want to show the dashboard */`
`30`	`31`	`if ($mt != 'dashboard') {`
`@@ -52,9 +53,12 @@ function show() {`
`52`	`53`	`} else {`
`53`	`54`	`if(strlen($module_title) > 8) $module_title = substr($module_title, 0, 7).'..';`
`54`	`55`	`}`
	`56`	`+ $icon = isset($module['icon']) ? $module['icon'] : 'icon icon-'. $module['name'];`
`55`	`57`	`$mod[$module['order'].'-'.$module['name']] = array( 'modules_title' => $module_title,`
`56`	`58`	`'modules_startpage' => $module['startpage'],`
`57`		`- 'modules_name' => $module['name']);`
	`59`	`+ 'modules_name' => $module['name'],`
	`60`	`+ 'modules_icon' => $icon,`
	`61`	`+ );`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`	`}`