Revision c3fb77bb

b/web_client/src/gr/grnet/pithos/web/client/Pithos.java
91 91
import com.google.gwt.user.client.Window;
92 92
import com.google.gwt.user.client.ui.AbstractImagePrototype;
93 93
import com.google.gwt.user.client.ui.Button;
94
import com.google.gwt.user.client.ui.Composite;
94 95
import com.google.gwt.user.client.ui.HTML;
95 96
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
96 97
import com.google.gwt.user.client.ui.HasVerticalAlignment;
......
244 245
    protected AccountResource account;
245 246
    
246 247
    Folder trash;
248
    
249
    List<Composite> treeViews = new ArrayList<Composite>();
247 250

  
248 251
    @SuppressWarnings("rawtypes") List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
249 252
    
......
292 295
        HorizontalPanel header = new HorizontalPanel();
293 296
        header.addStyleName("pithos-header");
294 297
        header.setWidth(contentWidth);
298
        if (bareContent)
299
        	header.addStyleName("pithos-header-noframe");
295 300
        HorizontalPanel leftHeader = new HorizontalPanel();
296 301
        VerticalPanel uploadButtonPanel = new VerticalPanel();
297 302
        upload = new Button("Upload File", new ClickHandler() {
......
355 360
                if (folderTreeSelectionModel.getSelectedObject() != null) {
356 361
                    deselectOthers(folderTreeView, folderTreeSelectionModel);
357 362
                    applyPermissions(folderTreeSelectionModel.getSelectedObject());
358
                    folderTreeView.addStyleName("cellTreeWidget-selectedTree");
359 363
                    Folder f = folderTreeSelectionModel.getSelectedObject();
360 364
                    showFiles(f);
361 365
                }
362
                else
363
                    folderTreeView.removeStyleName("cellTreeWidget-selectedTree");
364 366
            }
365 367
        });
366 368
        selectionModels.add(folderTreeSelectionModel);
367 369

  
368 370
        folderTreeViewModel = new FolderTreeViewModel(this, folderTreeSelectionModel);
369 371
        folderTreeView = new FolderTreeView(folderTreeViewModel);
370

  
372
        treeViews.add(folderTreeView);
373
        
371 374
        fileList = new FileList(this, images, folderTreeView);
372 375
        inner.add(fileList);
373 376

  
374 377
        groupTreeViewModel = new GroupTreeViewModel(this);
375 378
        groupTreeView = new GroupTreeView(groupTreeViewModel);
376

  
379
        treeViews.add(groupTreeView);
380
        
377 381
        trees = new VerticalPanel();
378 382
        trees.setWidth("100%");
379 383

  
......
419 423
	        outer.add(statusPanel);
420 424
	        outer.setCellHorizontalAlignment(statusPanel, HasHorizontalAlignment.ALIGN_CENTER);
421 425
        }
426
        else
427
        	splitPanel.addStyleName("pithos-splitPanel-noframe");
422 428

  
423 429
        // Hook the window resize event, so that we can adjust the UI.
424 430
        Window.addResizeHandler(this);
......
492 498
	@SuppressWarnings({ "rawtypes", "unchecked" })
493 499
	public void deselectOthers(TreeView _selectedTree, SingleSelectionModel model) {
494 500
    	selectedTree = _selectedTree;
501
    	
502
    	for (Composite c : treeViews)
503
    		if (c.equals(selectedTree))
504
    			c.addStyleName("cellTreeWidget-selectedTree");
505
    		else
506
    			c.removeStyleName("cellTreeWidget-selectedTree");
507
    	
495 508
        for (SingleSelectionModel s : selectionModels)
496 509
            if (!s.equals(model))
497 510
                s.setSelected(s.getSelectedObject(), false);
......
710 723

  
711 724
	protected void onWindowResized(int height) {
712 725
		// Adjust the split panel to take up the available room in the window.
713
		int newHeight = height - splitPanel.getAbsoluteTop() - 60;
726
		int newHeight = height - splitPanel.getAbsoluteTop();
714 727
		if (newHeight < 1)
715 728
			newHeight = 1;
716 729
		splitPanel.setHeight("" + newHeight);
......
1116 1129
		            deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
1117 1130
		            upload.setEnabled(false);
1118 1131
		            updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
1119
		            mysharedTreeView.addStyleName("cellTreeWidget-selectedTree");
1120 1132
		        }
1121
                else
1122
                    mysharedTreeView.removeStyleName("cellTreeWidget-selectedTree");
1123 1133
 		    }
1124 1134
		});
1125 1135
		selectionModels.add(mysharedTreeSelectionModel);
......
1129 1139
			@Override
1130 1140
			public void execute() {
1131 1141
			    mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel);
1132
				trees.insert(mysharedTreeView, 3);
1142
				trees.insert(mysharedTreeView, 2);
1143
				treeViews.add(mysharedTreeView);
1133 1144
				createOtherSharedTree();
1134 1145
			}
1135 1146
		});
......
1142 1153
		    public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
1143 1154
		        if (otherSharedTreeSelectionModel.getSelectedObject() != null) {
1144 1155
		            deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
1156
		            otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree");
1145 1157
		            applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
1146 1158
		            updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true);
1147
		            otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree");
1148 1159
		        }
1149
                else
1150
                    otherSharedTreeView.removeStyleName("cellTreeWidget-selectedTree");
1151 1160
 		    }
1152 1161
		});
1153 1162
		selectionModels.add(otherSharedTreeSelectionModel);
......
1157 1166
			@Override
1158 1167
			public void execute() {
1159 1168
			    otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel);
1160
				trees.insert(otherSharedTreeView, 4);
1169
				trees.insert(otherSharedTreeView, 3);
1170
				treeViews.add(otherSharedTreeView);
1161 1171
			}
1162 1172
		});
1163 1173
	}
b/web_client/src/gr/grnet/pithos/web/client/PithosCellTreeBasic.css
44 44
  outline: none;
45 45
}
46 46

  
47
.cellTreeItemValue img {
48
	vertical-align: middle;
49
}
50

  
47 51
.cellTreeItem:HOVER {
48 52
	background-color: #A1C8DB;
49 53
}
b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java
145 145
    static interface Templates extends SafeHtmlTemplates {
146 146
        public Templates INSTANCE = GWT.create(Templates.class);
147 147

  
148
        @Template("<span class='pithos-folderLabel'>{0}</span>")
148
        @Template("<span style='vertical-align: middle;'>{0}</span>")
149 149
        public SafeHtml nameSpan(String name);
150 150

  
151 151
        @Template("<span class='pithos-folderLabel'>{0}</span>")
b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
59 59
import com.google.gwt.user.client.Command;
60 60
import com.google.gwt.user.client.ui.AbstractImagePrototype;
61 61
import com.google.gwt.user.client.ui.HTML;
62
import com.google.gwt.user.client.ui.UIObject;
62 63
import com.google.gwt.view.client.AsyncDataProvider;
63 64
import com.google.gwt.view.client.HasData;
64 65
import com.google.gwt.view.client.ListDataProvider;
b/web_client/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java
140 140
			public void onSelectionChange(SelectionChangeEvent event) {
141 141
				if (rootSelectionModel.getSelectedObject() != null) {
142 142
					app.deselectOthers(app.getGroupTreeView(), rootSelectionModel);
143
					app.getGroupTreeView().addStyleName("cellTreeWidget-selectedTree");
144 143
					app.showFiles(new HashSet<File>());
145 144
				}
146
                else
147
                    app.getGroupTreeView().removeStyleName("cellTreeWidget-selectedTree");
148 145
			}
149 146
		});
150 147

  
b/web_client/src/gr/grnet/pithos/web/public/pithos.css
4 4
	font-size: 16px;
5 5
	margin: 8px;
6 6
	margin-top: 3px;
7
	background-color: transparent;
7 8
}
8 9

  
9 10
table td {
......
343 344
	margin-bottom: 34px;
344 345
}
345 346

  
347
.pithos-splitPanel-noframe {
348
	margin-bottom: 0;
349
}
350

  
346 351
/* Use the background color for the splitter. */
347 352
.gwt-HorizontalSplitPanel .hsplitter {
348 353
	cursor: move;
......
405 410
	margin-top: 34;
406 411
}
407 412

  
413
.pithos-header-noframe {
414
	margin-top: 0;
415
}
416

  
408 417
.cellTreeWidget-selectedTree {
409 418
    background-color: #a1c8da;
410 419
}
411

  

Also available in: Unified diff