FELIX-1988 Apply 21.assorted2.patch by Valentin Valchev (thanks)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@912370 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/resources/res/ui/webconsole.css b/webconsole/src/main/resources/res/ui/webconsole.css
index 9a1fae9..3e14eb0 100644
--- a/webconsole/src/main/resources/res/ui/webconsole.css
+++ b/webconsole/src/main/resources/res/ui/webconsole.css
@@ -70,7 +70,7 @@
 
 /* used in some plugins - showing ID (long) element in tables */
 .col_Id {
-	width: 40px;
+	width: 5em;
 }
 
 /* styling button groups like in the bundles & log plugins */
diff --git a/webconsole/src/main/resources/templates/bundles_upload.html b/webconsole/src/main/resources/templates/bundles_upload.html
index 18f9b52..7202ef3 100644
--- a/webconsole/src/main/resources/templates/bundles_upload.html
+++ b/webconsole/src/main/resources/templates/bundles_upload.html
@@ -1,5 +1,4 @@
-<!--<script type="text/javascript" src="res/ui/bundles.js"></script>-->
-<script type="text/javascript" src="res/lib/jquery.multifile-1.4.6.js"></script>
+<script type="text/javascript" src="${appRoot}/res/lib/jquery.multifile-1.4.6.js"></script>
 
 <form method="post" enctype="multipart/form-data" action="../" style="width:50%">