(legacy) first step in transition of /themes/ to /ui/themes/ to glue both new...

(legacy) first step in transition of /themes/ to /ui/themes/  to glue both new and old components better together.
The old /themes/ directory should eventually be removed when all references are gone.

src/www/fbegin.inc

@@ -121,8 +121,8 @@ if($need_alert_display == true) {
 		<div class="container-fluid">
 			<div class="navbar-header">
 				<a class="navbar-brand" href="/index.php">
-				<img class="brand-logo" src="/themes/<?=$g['theme'];?>/assets/images/default-logo.png" height="30" width="150"/>
-				<img class="brand-icon" src="/themes/<?=$g['theme'];?>/assets/images/icon-logo.png" height="30" width="29"/>
+				<img class="brand-logo" src="/ui/themes/<?=$g['theme'];?>/build/images/default-logo.png" height="30" width="150"/>
+				<img class="brand-icon" src="/ui/themes/<?=$g['theme'];?>/build/images/icon-logo.png" height="30" width="29"/>
 				</a>
 				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation">
 					<span class="sr-only">Toggle navigation</span>

src/www/head.inc

@@ -35,11 +35,18 @@ $pagetitle = gentitle( $pgtitle );
 
 		<title><?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?></title>
 
-		<link href="/themes/<?=$g['theme'];?>/build/css/main.css" media="screen, projection" rel="stylesheet">
-		<!-- Stylesheet for fancy select/dropdown -->
-		<link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme'];?>/build/css/bootstrap-select.css">
+		<!-- include (theme) style -->
+		<link href="/ui/themes/<?=$g['theme'];?>/build/css/main.css" media="screen, projection" rel="stylesheet">
+
 		<!-- Favicon -->
-		<link href="/themes/<?=$g['theme'];?>/assets/images/favicon.png" rel="shortcut icon">
+		<link href="/ui/themes/<?=$g['theme'];?>/build/images/favicon.png" rel="shortcut icon">
+
+		<!-- Stylesheet for fancy select/dropdown -->
+		<link rel="stylesheet" type="text/css" href="/ui/themes/<?=$g['theme'];?>/build/css/bootstrap-select.css">
+
+		<!-- bootstrap dialog -->
+		<link href="/ui/themes/<?=$g['theme'];?>/build/css/bootstrap-dialog.css" rel="stylesheet" type="text/css" />
+
 
 		<!-- Font awesome -->
 		<link rel="stylesheet" href="/ui/css/font-awesome.min.css">

src/www/index.php

@@ -383,7 +383,7 @@ if (isset($config['trigger_initial_wizard'])) :
 				<div class="content-box" style="padding: 20px;">
 							<div class="table-responsive">
 								<?php
-                                echo "<img src=\"/themes/{$g['theme']}/assets/images/default-logo.png\" border=\"0\" alt=\"logo\" /><p>\n";
+                                echo "<img src=\"/ui/themes/{$g['theme']}/build/images/default-logo.png\" border=\"0\" alt=\"logo\" /><p>\n";
                                 ?>
 								<br />
 								<div class="content-box-main">