From 5aaeb4ef2be745e3489fa9d7dfcbc28c43a90119 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 26 Feb 2014 09:46:15 +0000
Subject: [PATCH] BIS-627 / SP-1141: ELN UI - Improve Workspace Uploader (Fix
Button Style, Fix Upload File Options on ELN)
SVN: 30602
---
.../resources/uploader/css/src/upload.css | 48 +++++++++----------
.../newbrowser/html/js/UI/DataSetForm.js | 1 +
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/css/src/upload.css b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/css/src/upload.css
index 9100aed4610..637df1f56e0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/css/src/upload.css
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/css/src/upload.css
@@ -64,6 +64,30 @@ a:visited {
a:hover {
color: #000;
}
+button {
+ box-shadow: inset 0 0 1px white;
+ cursor: pointer;
+ border-radius: 2px;
+ border-top: 1px solid #ccc;
+ border-left: 1px solid #aaa;
+ border-right: 1px solid #999;
+ border-bottom: 1px solid #888;
+ background-color: #e0e0e0;
+ background-image: linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -o-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -moz-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -webkit-linear-gradient(bottom, rgb(200,200,200) 8%, rgb(250,250,250) 89%);
+ font-family: Tahoma, Arial, sans-serif;
+ padding: 0.5ex 0.5em;
+ font-size: 12px;
+ margin: 1ex 0;
+}
+button:hover {
+ background-image: linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -o-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -moz-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+ background-image: -webkit-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
+}
*/
#filedrop {
color: #000;
@@ -96,35 +120,11 @@ a:hover {
color: #444;
font-size: 110%;
}
-button {
- box-shadow: inset 0 0 1px white;
- cursor: pointer;
- border-radius: 2px;
- border-top: 1px solid #ccc;
- border-left: 1px solid #aaa;
- border-right: 1px solid #999;
- border-bottom: 1px solid #888;
- background-color: #e0e0e0;
- background-image: linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -o-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -moz-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -webkit-linear-gradient(bottom, rgb(200,200,200) 8%, rgb(250,250,250) 89%);
- font-family: Tahoma, Arial, sans-serif;
- padding: 0.5ex 0.5em;
- font-size: 12px;
- margin: 1ex 0;
-}
button.huge {
padding: 2ex 4em;
font-size: 13px;
font-weight: bold;
}
-button:hover {
- background-image: linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -o-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -moz-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
- background-image: -webkit-linear-gradient(bottom, rgb(220,220,220) 8%, rgb(255,255,255) 89%);
-}
#filelist-container {
padding: 2ex 1em 3ex 1em;
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetForm.js
index f1cf2b0d6e1..dca22b35ac7 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/DataSetForm.js
@@ -120,6 +120,7 @@ function DataSetForm(serverFacade, containerId, profile, sample, mode) {
break;
}
}
+ localInstance._updateFileOptions();
}
this.serverFacade.openbisServer.createSessionWorkspaceUploader($("#APIUploader"), onComplete, {
--
GitLab