Additional CSS to ensure that the uploadFileForm displays correctly from the product dialogue. Addressed - BroadleafCommerce#615

bpolster · Jerry77oz · commit cc69083e78e4 · 2014-09-11T10:47:08.000-05:00
(cherry picked from commit 2329fd9)
diff --git a/admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/css/admin/blc-admin.css b/admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/css/admin/blc-admin.css
@@ -1444,7 +1444,11 @@ div.uploadMessage {
 	display: none;
 }
 
-form.uploadFileForm {
+form.uploadFileForm { 
+}
+
+form.uploadFileForm.entityListWithUpload {
+	display: none;
 }
 
 div.imagePreviewContainer {
diff --git a/admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/views/entityListWithUploadForm.html b/admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/views/entityListWithUploadForm.html
@@ -1,4 +1,4 @@
-<blc:form method="post" class="uploadFileForm"
+<blc:form method="post" class="uploadFileForm entityListWithUpload"
     enctype="multipart/form-data"  
     th:action="@{${'/asset/uploadAsset'}}"
     id="assetUploadForm">

Original file line number	Diff line number	Diff line change
`@@ -1444,7 +1444,11 @@ div.uploadMessage {`
`1444`	`1444`	`display: none;`
`1445`	`1445`	`}`
`1446`	`1446`
`1447`		`-form.uploadFileForm {`
	`1447`	`+form.uploadFileForm {`
	`1448`	`+}`
	`1449`	`+`
	`1450`	`+form.uploadFileForm.entityListWithUpload {`
	`1451`	`+ display: none;`
`1448`	`1452`	`}`
`1449`	`1453`
`1450`	`1454`	`div.imagePreviewContainer {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<blc:form method="post" class="uploadFileForm"`
	`1`	`+<blc:form method="post" class="uploadFileForm entityListWithUpload"`
`2`	`2`	`enctype="multipart/form-data"`
`3`	`3`	`th:action="@{${'/asset/uploadAsset'}}"`
`4`	`4`	`id="assetUploadForm">`