Revision c658bf66
b/web_client/src/gr/grnet/pithos/web/client/MessagePanel.java | ||
---|---|---|
113 | 113 |
* Build the panel that contains the icon, the message and the 'clear' link. |
114 | 114 |
*/ |
115 | 115 |
private void buildPanel() { |
116 |
inner.clear(); |
|
116 | 117 |
inner.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); |
117 | 118 |
inner.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); |
118 |
inner.setSpacing(4); |
|
119 |
// inner.setSpacing(4);
|
|
119 | 120 |
inner.add(message); |
120 | 121 |
inner.add(clearMessageLink); |
121 | 122 |
inner.setCellVerticalAlignment(message, HasVerticalAlignment.ALIGN_MIDDLE); |
b/web_client/src/gr/grnet/pithos/web/client/Pithos.java | ||
---|---|---|
287 | 287 |
outer.setCellHorizontalAlignment(topPanel, HasHorizontalAlignment.ALIGN_CENTER); |
288 | 288 |
} |
289 | 289 |
|
290 |
messagePanel.setWidth(contentWidth); |
|
291 |
messagePanel.setVisible(false); |
|
292 |
outer.add(messagePanel); |
|
293 |
outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER); |
|
294 |
|
|
295 | 290 |
HorizontalPanel header = new HorizontalPanel(); |
296 | 291 |
header.addStyleName("pithos-header"); |
297 | 292 |
header.setWidth(contentWidth); |
298 | 293 |
if (bareContent) |
299 | 294 |
header.addStyleName("pithos-header-noframe"); |
300 |
HorizontalPanel leftHeader = new HorizontalPanel(); |
|
301 |
VerticalPanel uploadButtonPanel = new VerticalPanel(); |
|
302 | 295 |
upload = new Button("Upload File", new ClickHandler() { |
303 | 296 |
@Override |
304 | 297 |
public void onClick(@SuppressWarnings("unused") ClickEvent event) { |
... | ... | |
306 | 299 |
} |
307 | 300 |
}); |
308 | 301 |
upload.addStyleName("pithos-uploadButton"); |
309 |
uploadButtonPanel.add(upload); |
|
310 |
uploadButtonPanel.setWidth("100%"); |
|
311 |
uploadButtonPanel.setHeight("60px"); |
|
312 |
uploadButtonPanel.setCellHorizontalAlignment(upload, HasHorizontalAlignment.ALIGN_LEFT); |
|
313 |
uploadButtonPanel.setCellVerticalAlignment(upload, HasVerticalAlignment.ALIGN_MIDDLE); |
|
314 |
leftHeader.add(uploadButtonPanel); |
|
315 |
header.add(leftHeader); |
|
316 |
header.setCellWidth(leftHeader, "35%"); |
|
317 |
|
|
318 |
HorizontalPanel rightHeader = new HorizontalPanel(); |
|
319 |
rightHeader.addStyleName("pithos-rightSide"); |
|
320 |
rightHeader.setSpacing(5); |
|
302 |
header.add(upload); |
|
303 |
header.setCellHorizontalAlignment(upload, HasHorizontalAlignment.ALIGN_LEFT); |
|
304 |
header.setCellVerticalAlignment(upload, HasVerticalAlignment.ALIGN_MIDDLE); |
|
305 |
header.setCellWidth(upload, "146px"); |
|
321 | 306 |
|
307 |
messagePanel.setVisible(false); |
|
308 |
header.add(messagePanel); |
|
309 |
header.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER); |
|
310 |
header.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE); |
|
311 |
|
|
312 |
|
|
322 | 313 |
toolsButton = new Button(AbstractImagePrototype.create(images.tools()).getHTML()); |
323 | 314 |
toolsButton.addClickHandler(new ClickHandler() { |
324 | 315 |
|
... | ... | |
331 | 322 |
} |
332 | 323 |
} |
333 | 324 |
}); |
334 |
rightHeader.add(toolsButton); |
|
335 |
rightHeader.setCellHorizontalAlignment(toolsButton, HasHorizontalAlignment.ALIGN_LEFT); |
|
325 |
header.add(toolsButton); |
|
326 |
header.setCellHorizontalAlignment(toolsButton, HasHorizontalAlignment.ALIGN_RIGHT); |
|
327 |
header.setCellVerticalAlignment(toolsButton, HasVerticalAlignment.ALIGN_MIDDLE); |
|
328 |
header.setCellWidth(toolsButton, "30px"); |
|
336 | 329 |
|
337 | 330 |
HorizontalPanel folderStatistics = new HorizontalPanel(); |
338 | 331 |
folderStatistics.addStyleName("pithos-folderStatistics"); |
... | ... | |
342 | 335 |
HTML numOfFilesLabel = new HTML(" Files"); |
343 | 336 |
folderStatistics.add(numOfFilesLabel); |
344 | 337 |
folderStatistics.setCellVerticalAlignment(numOfFilesLabel, HasVerticalAlignment.ALIGN_MIDDLE); |
345 |
rightHeader.add(folderStatistics); |
|
346 |
rightHeader.setCellHorizontalAlignment(folderStatistics, HasHorizontalAlignment.ALIGN_RIGHT); |
|
347 |
header.add(rightHeader); |
|
348 |
header.setCellVerticalAlignment(rightHeader, HasVerticalAlignment.ALIGN_MIDDLE); |
|
349 |
header.setCellHeight(rightHeader, "60px"); |
|
338 |
header.add(folderStatistics); |
|
339 |
header.setCellHorizontalAlignment(folderStatistics, HasHorizontalAlignment.ALIGN_RIGHT); |
|
340 |
header.setCellVerticalAlignment(folderStatistics, HasVerticalAlignment.ALIGN_MIDDLE); |
|
341 |
header.setCellWidth(folderStatistics, "60px"); |
|
350 | 342 |
outer.add(header); |
351 | 343 |
outer.setCellHorizontalAlignment(header, HasHorizontalAlignment.ALIGN_CENTER); |
352 | 344 |
// Inner contains the various lists.nner |
... | ... | |
476 | 468 |
}); |
477 | 469 |
} |
478 | 470 |
}); |
471 |
|
|
472 |
// Scheduler.get().scheduleDeferred(new Command() { |
|
473 |
// |
|
474 |
// @Override |
|
475 |
// public void execute() { |
|
476 |
// displayError("lalala"); |
|
477 |
// |
|
478 |
// } |
|
479 |
// }); |
|
479 | 480 |
} |
480 | 481 |
|
481 | 482 |
public void applyPermissions(Folder f) { |
b/web_client/src/gr/grnet/pithos/web/client/PithosCellTreeBasic.css | ||
---|---|---|
32 | 32 |
} |
33 | 33 |
|
34 | 34 |
.cellTreeItemImage { |
35 |
padding-top: 5px; |
|
35 | 36 |
} |
36 | 37 |
|
37 | 38 |
.cellTreeItemImageValue { |
... | ... | |
49 | 50 |
} |
50 | 51 |
|
51 | 52 |
.cellTreeItem:HOVER { |
52 |
background-color: #A1C8DB;
|
|
53 |
background-color: #A1C8DA;
|
|
53 | 54 |
} |
54 | 55 |
|
55 | 56 |
.cellTreeOpenItem { |
... | ... | |
73 | 74 |
|
74 | 75 |
.cellTreeSelectedItem { |
75 | 76 |
color: #d45500; |
77 |
background-color: #BCD7E3; |
|
76 | 78 |
height: auto; |
77 | 79 |
overflow: visible; |
78 | 80 |
} |
b/web_client/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java | ||
---|---|---|
205 | 205 |
|
206 | 206 |
public String getFileSizeAsString() { |
207 | 207 |
if (bytesUsed < 1024) |
208 |
return String.valueOf(bytesUsed) + " B";
|
|
208 |
return String.valueOf(bytesUsed) + "B"; |
|
209 | 209 |
else if (bytesUsed < 1024*1024) |
210 |
return getSize(bytesUsed, 1024D) + " KB";
|
|
210 |
return getSize(bytesUsed, 1024D) + "KB"; |
|
211 | 211 |
else if (bytesUsed < 1024*1024*1024) |
212 |
return getSize(bytesUsed,(1024D*1024D)) + " MB";
|
|
213 |
return getSize(bytesUsed , (1024D*1024D*1024D)) + " GB";
|
|
212 |
return getSize(bytesUsed,(1024D*1024D)) + "MB"; |
|
213 |
return getSize(bytesUsed , (1024D*1024D*1024D)) + "GB"; |
|
214 | 214 |
} |
215 | 215 |
|
216 | 216 |
public String getQuotaAsString() { |
217 | 217 |
long quota = bytesUsed + bytesRemaining; |
218 | 218 |
if (quota < 1024) |
219 |
return String.valueOf(quota) + " B";
|
|
219 |
return String.valueOf(quota) + "B"; |
|
220 | 220 |
else if (quota < 1024 * 1024) |
221 |
return getSize(quota, 1024D) + " KB";
|
|
221 |
return getSize(quota, 1024D) + "KB"; |
|
222 | 222 |
else if (quota < 1024 * 1024 * 1024) |
223 |
return getSize(quota,(1024D * 1024D)) + " MB";
|
|
224 |
return getSize(quota , (1024D * 1024D * 1024D)) + " GB";
|
|
223 |
return getSize(quota,(1024D * 1024D)) + "MB"; |
|
224 |
return getSize(quota , (1024D * 1024D * 1024D)) + "GB"; |
|
225 | 225 |
} |
226 | 226 |
|
227 | 227 |
public List<Group> getGroups() { |
b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java | ||
---|---|---|
98 | 98 |
|
99 | 99 |
@Override |
100 | 100 |
@ImageOptions(flipRtl = true) |
101 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif")
|
|
101 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.png")
|
|
102 | 102 |
ImageResource cellTreeClosedItem(); |
103 | 103 |
|
104 | 104 |
@Override |
... | ... | |
108 | 108 |
|
109 | 109 |
@Override |
110 | 110 |
@ImageOptions(flipRtl = true) |
111 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif")
|
|
111 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.png")
|
|
112 | 112 |
ImageResource cellTreeOpenItem(); |
113 | 113 |
|
114 | 114 |
@Override |
b/web_client/src/gr/grnet/pithos/web/client/grouptree/GroupTreeView.java | ||
---|---|---|
81 | 81 |
|
82 | 82 |
@Override |
83 | 83 |
@ImageOptions(flipRtl = true) |
84 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif")
|
|
84 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.png")
|
|
85 | 85 |
ImageResource cellTreeClosedItem(); |
86 | 86 |
|
87 | 87 |
@Override |
... | ... | |
91 | 91 |
|
92 | 92 |
@Override |
93 | 93 |
@ImageOptions(flipRtl = true) |
94 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif")
|
|
94 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.png")
|
|
95 | 95 |
ImageResource cellTreeOpenItem(); |
96 | 96 |
|
97 | 97 |
@Override |
b/web_client/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java | ||
---|---|---|
76 | 76 |
|
77 | 77 |
@Override |
78 | 78 |
@ImageOptions(flipRtl = true) |
79 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif")
|
|
79 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.png")
|
|
80 | 80 |
ImageResource cellTreeClosedItem(); |
81 | 81 |
|
82 | 82 |
@Override |
... | ... | |
86 | 86 |
|
87 | 87 |
@Override |
88 | 88 |
@ImageOptions(flipRtl = true) |
89 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif")
|
|
89 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.png")
|
|
90 | 90 |
ImageResource cellTreeOpenItem(); |
91 | 91 |
|
92 | 92 |
@Override |
b/web_client/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java | ||
---|---|---|
76 | 76 |
|
77 | 77 |
@Override |
78 | 78 |
@ImageOptions(flipRtl = true) |
79 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif")
|
|
79 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.png")
|
|
80 | 80 |
ImageResource cellTreeClosedItem(); |
81 | 81 |
|
82 | 82 |
@Override |
... | ... | |
86 | 86 |
|
87 | 87 |
@Override |
88 | 88 |
@ImageOptions(flipRtl = true) |
89 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif")
|
|
89 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.png")
|
|
90 | 90 |
ImageResource cellTreeOpenItem(); |
91 | 91 |
|
92 | 92 |
@Override |
b/web_client/src/gr/grnet/pithos/web/client/tagtree/TagTreeView.java | ||
---|---|---|
52 | 52 |
|
53 | 53 |
@Override |
54 | 54 |
@ImageOptions(flipRtl = true) |
55 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.gif")
|
|
55 |
@Source("gr/grnet/pithos/web/client/cellTreeClosedItem.png")
|
|
56 | 56 |
ImageResource cellTreeClosedItem(); |
57 | 57 |
|
58 | 58 |
@Override |
... | ... | |
62 | 62 |
|
63 | 63 |
@Override |
64 | 64 |
@ImageOptions(flipRtl = true) |
65 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.gif")
|
|
65 |
@Source("gr/grnet/pithos/web/client/cellTreeOpenItem.png")
|
|
66 | 66 |
ImageResource cellTreeOpenItem(); |
67 | 67 |
|
68 | 68 |
@Override |
b/web_client/src/gr/grnet/pithos/web/public/pithos.css | ||
---|---|---|
286 | 286 |
|
287 | 287 |
.pithos-errorMessage { |
288 | 288 |
font-size: 90%; |
289 |
background-color: #ff9999; |
|
289 |
background-color: #880000; |
|
290 |
color: #fff; |
|
290 | 291 |
cursor: pointer; |
291 | 292 |
} |
292 | 293 |
|
... | ... | |
340 | 341 |
} |
341 | 342 |
|
342 | 343 |
.pithos-splitPanel { |
343 |
background: url(images/white50.png); |
|
344 |
background: url(images/white50.png) transparent;
|
|
344 | 345 |
margin-bottom: 34px; |
345 | 346 |
} |
346 | 347 |
|
... | ... | |
364 | 365 |
background-color: #ff7f2a; |
365 | 366 |
font-size: 120%; |
366 | 367 |
text-align: center; |
367 |
height: 32px; |
|
368 |
height: auto; |
|
369 |
padding: 8px; |
|
368 | 370 |
width: 146px; |
369 | 371 |
border: none; |
370 | 372 |
} |
... | ... | |
408 | 410 |
.pithos-header { |
409 | 411 |
background: url(images/white50.png); |
410 | 412 |
margin-top: 34; |
413 |
height: 60px; |
|
411 | 414 |
} |
412 | 415 |
|
413 | 416 |
.pithos-header-noframe { |
414 | 417 |
margin-top: 0; |
415 | 418 |
} |
416 | 419 |
|
417 |
.cellTreeWidget-selectedTree { |
|
418 |
background-color: #a1c8da; |
|
420 |
/*.cellTreeWidget-selectedTree { |
|
421 |
background-color: #BCD7E3; |
|
422 |
}*/ |
|
423 |
|
|
424 |
.pithos-list thead th img { |
|
425 |
top: 5px; |
|
419 | 426 |
} |
427 |
|
|
428 |
.effectPanel-inner { |
|
429 |
background-color: #4085A5; |
|
430 |
} |
Also available in: Unified diff