Permalink
Browse files

Fix various uploader issues DnD, styling, and implement upload from W…

…elcome page with a workspace picker. Expand Drop zone to whole desktop in workspace.
  • Loading branch information...
1 parent ef01617 commit 7c0cdba00df1b3bef9a05b32022acb182fcfc3d7 @cdujeu cdujeu committed Oct 12, 2016
@@ -93,4 +93,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,4 +90,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,4 +90,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+"78" => "Pick a target workspace",
);
@@ -94,4 +94,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -89,4 +89,5 @@
"75"=> "Chercher dans tous les fichiers...",
"76" => "Utilisez le menu en haut à droite pour acceder au %1.",
"77" => "panneau d'administration",
+ "78" => "Sélectionnez un workspace",
);
@@ -93,4 +93,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,4 +90,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,5 +90,6 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,4 +90,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -90,4 +90,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -91,4 +91,5 @@
"75"=> "Search all files...",
"76" => "Access the %1 through the top-right menu",
"77" => "admin dashboard",
+ "78" => "Pick a target workspace",
);
@@ -30,6 +30,7 @@ Proto.Menu = Class.create({
anchorSrc:'',
anchorTitle:'',
anchorPosition:'last',
+ forceCheckHeight:false,
beforeShow: e,
beforeHide: e,
beforeSelect: e,
@@ -383,7 +384,7 @@ Proto.Menu = Class.create({
checkHeight : function(offsetTop){
offsetTop = parseInt(offsetTop);
- if(this.options.anchor == 'mouse') return;
+ if(this.options.anchor == 'mouse' && !this.options.forceCheckHeight) return;
var vpHeight = getViewPortHeight()-10;
if(this.options.menuMaxHeight){
vpHeight = Math.min(this.options.menuMaxHeight, vpHeight);
@@ -220,6 +220,25 @@ div.menu {
background-color: darken(@menu_desktop_background_color, 5%);
}
+ &.home_upload{
+ background-color: rgba(255, 255, 255, 0.93);
+ width:300px;
+ li{
+ border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+ a{
+ font-size:15px;
+ }
+ &.menuTitle {
+ display: block;
+ padding: 16px;
+ text-align: left;
+ background-color: #607D8B;
+ color: white;
+ font-weight: 500;
+ }
+ }
+ }
+
}
&.menuDetails {
@@ -62,8 +62,12 @@ div#multiple_download_container{
background-position: center;
}
-.dropareaHover{
- background-color: #FAF3ED !important;
+.dropareaHover, .dropareaHover #content_pane{
+ background-color: #FFF8E1 !important;
+}
+
+.webfx-tree-item.dropareaHover{
+ background-color: rgba(255, 253, 231, 0.43) !important;
}
#content_pane.dropareaHover div.thumbnail_selectable_cell{
@@ -136,7 +140,6 @@ div#total_files_list{
.dotted_container_item_mixin{
overflow: hidden;
padding: 16px 14px;
- height: 20px;
position: relative;
background-image: url('@{imagePath}dl_bg.png');
/*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -2066,8 +2066,12 @@ div#multiple_download_container a span.mdi-download {
.uploadFilesList.droparea {
background-position: center;
}
-.dropareaHover {
- background-color: #FAF3ED !important;
+.dropareaHover,
+.dropareaHover #content_pane {
+ background-color: #FFF8E1 !important;
+}
+.webfx-tree-item.dropareaHover {
+ background-color: rgba(255, 253, 231, 0.43) !important;
}
#content_pane.dropareaHover div.thumbnail_selectable_cell {
background-color: transparent !important;
@@ -2132,7 +2136,6 @@ div#total_files_list {
.dotted_container_item_mixin {
overflow: hidden;
padding: 16px 14px;
- height: 20px;
position: relative;
background-image: url('../images/dl_bg.png');
/*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -2151,7 +2154,6 @@ div#upload_files_list {
div#upload_files_list > div {
overflow: hidden;
padding: 16px 14px;
- height: 20px;
position: relative;
background-image: url('../images/dl_bg.png');
/*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -2265,7 +2267,6 @@ div#upload_files_list span.mdi-close:hover {
div#multiple_download_container div {
overflow: hidden;
padding: 16px 14px;
- height: 20px;
position: relative;
background-image: url('../images/dl_bg.png');
/*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -5074,6 +5075,24 @@ div.menu.desktop.panelHeaderMenu li.menuTitle {
text-align: left;
background-color: #f2f2f2;
}
+div.menu.desktop.home_upload {
+ background-color: rgba(255, 255, 255, 0.93);
+ width: 300px;
+}
+div.menu.desktop.home_upload li {
+ border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+}
+div.menu.desktop.home_upload li a {
+ font-size: 15px;
+}
+div.menu.desktop.home_upload li.menuTitle {
+ display: block;
+ padding: 16px;
+ text-align: left;
+ background-color: #607D8B;
+ color: white;
+ font-weight: 500;
+}
div.menu.menuDetails a {
line-height: 17px;
padding: 10px 5px;
@@ -28,7 +28,7 @@
</registry_contributions>
<dependencies>
<!-- Stream Wrapper Access -->
- <activePlugin pluginName="access.AJXP_STREAM_PROVIDER|action.quicksend"/>
+ <activePlugin pluginName="access.AJXP_STREAM_PROVIDER|access.ajxp_home"/>
</dependencies>
<processing>
<clientForm id="flash_upload_form"><![CDATA[
Oops, something went wrong.

0 comments on commit 7c0cdba

Please sign in to comment.