From 0ae83d194f857aa47f93b228016650c1f4851508 Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Wed, 17 Aug 2011 18:27:49 +0300 Subject: [PATCH] CSS changes --- .../src/gr/grnet/pithos/resources/2folder22.png | Bin 0 -> 338 bytes .../src/gr/grnet/pithos/resources/background.png | Bin 405 -> 0 bytes .../src/gr/grnet/pithos/resources/myshared22.png | Bin 0 -> 1034 bytes .../src/gr/grnet/pithos/resources/othersshared.png | Bin 0 -> 1185 bytes web_client/src/gr/grnet/pithos/resources/trash.png | Bin 0 -> 1117 bytes .../src/gr/grnet/pithos/web/client/FileList.java | 134 +-------- .../grnet/pithos/web/client/FileUploadDialog.java | 9 - .../gr/grnet/pithos/web/client/GssCellTable.css | 18 +- .../grnet/pithos/web/client/GssCellTreeBasic.css | 4 +- .../src/gr/grnet/pithos/web/client/Pithos.java | 89 +++--- .../pithos/web/client/SessionExpiredDialog.java | 2 +- .../gr/grnet/pithos/web/client/StatusPanel.java | 3 +- .../src/gr/grnet/pithos/web/client/TopPanel.java | 12 +- .../web/client/foldertree/FolderTreeView.java | 8 +- .../web/client/foldertree/FolderTreeViewModel.java | 2 +- web_client/src/gr/grnet/pithos/web/public/gss.css | 297 +++++++------------- .../grnet/pithos/web/public/images/background.png | Bin 152 -> 405 bytes 17 files changed, 177 insertions(+), 401 deletions(-) create mode 100644 web_client/src/gr/grnet/pithos/resources/2folder22.png delete mode 100644 web_client/src/gr/grnet/pithos/resources/background.png create mode 100644 web_client/src/gr/grnet/pithos/resources/myshared22.png create mode 100644 web_client/src/gr/grnet/pithos/resources/othersshared.png create mode 100644 web_client/src/gr/grnet/pithos/resources/trash.png diff --git a/web_client/src/gr/grnet/pithos/resources/2folder22.png b/web_client/src/gr/grnet/pithos/resources/2folder22.png new file mode 100644 index 0000000000000000000000000000000000000000..1e9df8c357a5d81f6d36a336de224296c051ee67 GIT binary patch literal 338 zcmV-Y0j>UtP)*M-JQg^C>B92MO!-`K-h(;?0g4H-y^LL zBEE(%V5uO%KQwEIn+*|nZ;FkG2-!P@2d0{D4&MxSL{<3@T<8Js{g#OAuga8Vc`G4} z(=>H)96ta%Ez!HkY;D*uNC6I<_x?;(Pb}6biaOQ?PE{{}bxT-8tX?9kG?dUcHsb)2 zj&OdIu$#o@gPS^KyUG#ZXRd_nyvyLG*N6}M4!^f%uQMCN`{OU=H^==i2K2%|2*n#r zURq;e;>j}N7vAILLSZm0KFfYtfSdQE9qvEx!|L)cmjPBuc3dnM;=4svq kK(Z{m6p_=QI_+F70NOA|{P$zyng9R*07*qoM6N<$f*#tBXaE2J literal 0 HcmV?d00001 diff --git a/web_client/src/gr/grnet/pithos/resources/background.png b/web_client/src/gr/grnet/pithos/resources/background.png deleted file mode 100644 index 601dc255babcc2a229647dc8ed4e34a99c7ecb4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmV;G0c!qVQ>00004b3#c}2nYxW zdK~zYI?Nz}M!!QVwGIQtZ9-Yd4xUmfgpOf}if4Jm~5Eewi zKG5WG`3+x^03Pwe4~rIA|Y_HfT`nmDQ543p+B>}H(w1-lV!;R9Q?o0M&04-1=} zPn!0N`q~}_#1(tU{!yb=%l5FoG&03&73|>+O_&FHmgA*?00000NkvXXu0mjfh{UQL diff --git a/web_client/src/gr/grnet/pithos/resources/myshared22.png b/web_client/src/gr/grnet/pithos/resources/myshared22.png new file mode 100644 index 0000000000000000000000000000000000000000..b867b3037fcf0db271fcf0bd1155d870c1744587 GIT binary patch literal 1034 zcmV+l1oiugP)yU~x)aew1B!7Wv`PPx3L^M}KZ8h{ML=5e)^qIyG7(frPM3d+6=G`Tr$SIGdnwbgKbLg z2ak=7z3Dj4nLT^8jS{8Ym6~r6h*Jj%*=e-4y*u5rBb(2>WkyYkH?C|;)6Gf;5ZIJ5D<&SwAT9b z(b3UtJFwn7M>CmB^7{4b+`fIAdc97w*~IsKf*`;c13(Z2IF6HY9H#_))7G(wywqy7 zocZ~A=H}*DSXf|VV}pD?Pb!td7=wsVC=^I0la5mA`E5B?N@e%%-7CYx!!(;sQmGXA zd>#=2;MT2M)a!Lz*X7!^Yf>(k3+=!PAPmEwmzS5<3WWlLgM;++^xT62ba!_%Ffc%W ze?Lo0OY316{<2|5?@?|AOLF-V?cz~u3gmD)~Hk}uH!gAY|HW0 zt5<&mzCL&EoNuf}e4mclSrQWyBraS)-MK@k6z9*M_mxr;moHx~w*%kXFGP$8U?`m`g(6qPtSP#k+dGF-Oll?#)u>X(Ubi9B6{*Ixcq3=$dIB~}FyvfPQ zNvhTAJ`s6RDK%HC)&4qt`m~D0Vy{_iUl)-#N~O}xwvJP&)Kfcm?i>)2iEK9e$@uvA zXV%&;wbtKa`cI< zYXCm}sexKqSsCo=>Jor>JicXvs~(=_VRcGtUF_`av;azN9rID7jWOwsjg9!!)D&84 z9LK?0i!lakEyZGyk&zLy*(}q4w)kf)Y771S-{9~60AhTK7E0AH@c;k-07*qoM6N<$ Ef>faI`Tzg` literal 0 HcmV?d00001 diff --git a/web_client/src/gr/grnet/pithos/resources/othersshared.png b/web_client/src/gr/grnet/pithos/resources/othersshared.png new file mode 100644 index 0000000000000000000000000000000000000000..fb96ffd79290569cc61eab99041327a51c83b7cd GIT binary patch literal 1185 zcmV;S1YY}zP);bbxyztL!X3jB~v zCbu}0o1mX)n)cn;*qA;vG=yoIn5Id+UT632-K?yvkk9AIWHN+8AZ;wk%6XDX;bS_lrY^4$ME5=rRlCxsj#%PM6FgM9*-l0 zz%)(n-n~mMm&5mcdV6~@O_QFUo<=sCJqr8`Af=SYdU|?H+qSuL=MIKp;5ZHdp6Aip z+DfTZLen%9MPYh+8pm-^)xWD=US4MZ{{8ITySHUwVd0%-6pEs}9gD?y{P;1|YL!Qi z93bw+t=5}(*avsTVs8FeWM9>UH7+KE;n-O)G4#0 zql03xNIV{=UawOq6xg+E7oDA*7>2P0`c$s#GC4WP+}xb!d0zg~rAyy58jXdgj%BS@ zqqn!0R4RoKg4?%mW7{@6ckbl$>C>2|NwHYm23}lT?{)#6WhQqkSCJKr0crw`0VT~^YinZIB{Z2 z$%>+o&1R|9YG?ww0_uOBa6ka4&FyAc)@O!ce0kx*1%1z+J*3lV?%lhG=XnGI0Sv?7 zEhobV{VgxG`_=E2EsOr!dc7{MUcLIo;lqbHd-kmC>+2(*&$GI^%EH0|dPw4%oy8Bq3M*FY3aw@nbPmM zU&n=+p|piA{3UPBn{&?l;rvR08FSqErDzFdmQR zGeuGSp-_mrx;kvzCZErf&*w>{QjX&|OQvbsmSy>>tE)A~aVUgkS=hFXWm$Qk{V6aY z0E7@vCWJuKG?JO5XDBmN<}dZ5D>_x)Dm)$!uIutFiM6?+C{Jy;@W%xXetnQj(MxDs zG&H|Pce0z&*->&Uxo3jcIbN;F*+-n~{tmUw;`aUPT!{Lp4piexm%*t)PVYO7ZQGkV z_N-l8b{2X2^?H2U;pF=tGxd0itAAakYp{zWyN*25?S_sOMWH|0Pg|@F1%(gmKjOrJ zlZ1nZ_>>Z6=4Ti+Mz}F{jT<8+oY?otrjCnw_@yw$qQTU{6n$fTyi?tXSKA7}3#ER} z-~WQ&l9y;7`I(9N^rqnAtL5!HcOKs1-sC+}xfGY|KM}0*tvX&wEqh4O}F9L5=Vl~#(k_bH#h%Y zT3T9DTU)!Uyu4i7y?Zy|aG08!8eG>c`~k&rR@_5he7X3Sq|<5A=`@C6kj-Y@!NI{{ zAgf9#|88k%Y4m!%BoYZ?u^7F*y#SPzl~G?`&#`02icWmyt8{dBFf=rTVHhkdEFh&U zEDK-{@S^~J>FVmTJsuB%K!9K{NH7>gRaH`{6z%QpjE;^L!4ne`^!D~LHa5om{QPQY zK@M<5L?V&flarHu(P$LQvet!d+w}GIEfuP6-n==xQ5USz?MNgNDfDqiJRWC!e7p!N z1i;<9cd>07DJ8L3Y@Nk5x&}|W;-ZxD%Uic@RR)7Wyk0M+X%>%}$z--fqtOLT(-gxn zwmk=$1%3ih3dPOM&7T7;x~}hW9LFz&z%l_~ z?(d%h7xdu4gR0@-;Zp+x13RaurvtfMZu{KaT!m?xej$Vl%<8(H)->&*uIq_FATZF{ j+S(ruhv$J6Kmz;=OPMpIJbpl@00000NkvXXu0mjfnd>1G literal 0 HcmV?d00001 diff --git a/web_client/src/gr/grnet/pithos/web/client/FileList.java b/web_client/src/gr/grnet/pithos/web/client/FileList.java index 55ba207..922620f 100644 --- a/web_client/src/gr/grnet/pithos/web/client/FileList.java +++ b/web_client/src/gr/grnet/pithos/web/client/FileList.java @@ -115,15 +115,6 @@ public class FileList extends Composite { public SafeHtml spanWithIdAndClass(String id, String cssClass, String content); } - private String showingStats = ""; - - private int startIndex = 0; - - /** - * A constant that denotes the completion of an IncrementalCommand. - */ - public static final boolean DONE = false; - private final DateTimeFormat formatter = DateTimeFormat.getFormat("d/M/yyyy h:mm a"); /** @@ -234,14 +225,6 @@ public class FileList extends Composite { SortableHeader nameHeader; - GssSimplePager pagerBottom; - - GssSimplePager pagerTop; - - Button uploadButtonBottom; - - Button uploadButtonTop; - FolderTreeView treeView; private Pithos app; @@ -308,47 +291,14 @@ public class FileList extends Composite { celltable.redrawHeaders(); - Column aColumn = new Column(new TextCell()) { - @Override - public String getValue(File object) { - return object.getOwner(); - } - }; - SortableHeader aheader = new SortableHeader("Owner"); - celltable.addColumn(aColumn, aheader); - allHeaders.add(aheader); - aheader.setUpdater(new FileValueUpdater(aheader, "owner")); - - aColumn = new Column(new TextCell()) { - @Override - public String getValue(File object) { - return object.getPath(); - } - }; - aheader = new SortableHeader("Path"); - celltable.addColumn(aColumn, aheader); - allHeaders.add(aheader); - aheader.setUpdater(new FileValueUpdater(aheader, "path")); - - aColumn = new Column(new TextCell()) { - @Override - public String getValue(File object) { - return String.valueOf(object.getVersion()); - } - }; - aheader = new SortableHeader("Version"); - celltable.addColumn(aColumn, aheader); - allHeaders.add(aheader); - aheader.setUpdater(new FileValueUpdater(aheader, "version")); - - aColumn = new Column(new TextCell()) { + Column aColumn = new Column(new TextCell()) { @Override public String getValue(File object) { // TODO Auto-generated method stub return object.getSizeAsString(); } }; - aheader = new SortableHeader("Size"); + SortableHeader aheader = new SortableHeader("Size"); celltable.addColumn(aColumn, aheader); allHeaders.add(aheader); aheader.setUpdater(new FileValueUpdater(aheader, "size")); @@ -369,40 +319,8 @@ public class FileList extends Composite { VerticalPanel vp = new VerticalPanel(); vp.setWidth("100%"); - pagerTop = new GssSimplePager(GssSimplePager.TextLocation.CENTER); - pagerTop.setVisible(false); - pagerTop.setDisplay(celltable); - uploadButtonTop = new Button("" + AbstractImagePrototype.create(images.fileUpdate()).getHTML() + " Upload"); - uploadButtonTop.addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - new UploadFileCommand(app, null, treeView.getSelection()).execute(); - } - }); - HorizontalPanel topPanel = new HorizontalPanel(); - topPanel.add(pagerTop); - topPanel.add(uploadButtonTop); - vp.add(topPanel); - vp.add(celltable); - pagerBottom = new GssSimplePager(GssSimplePager.TextLocation.CENTER); - pagerBottom.setVisible(false); - pagerBottom.setDisplay(celltable); - uploadButtonBottom=new Button("" + AbstractImagePrototype.create(images.fileUpdate()).getHTML() + " Upload"); - uploadButtonBottom.addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - new UploadFileCommand(app, null, treeView.getSelection()).execute(); - } - }); - HorizontalPanel bottomPanel = new HorizontalPanel(); - bottomPanel.add(pagerBottom); - bottomPanel.add(uploadButtonBottom); - - vp.add(bottomPanel); vp.setCellWidth(celltable, "100%"); vp.addHandler(new ContextMenuHandler() { @Override @@ -475,26 +393,6 @@ public class FileList extends Composite { * Update the display of the file list. */ void update(boolean sort) { - int count = folderFileCount; - int max = startIndex + Pithos.VISIBLE_FILE_COUNT; - if (max > count) - max = count; - folderTotalSize = 0; - - for(File f : files){ - folderTotalSize += f.getBytes(); - } - if (folderFileCount == 0) { - showingStats = "no files"; - } else if (folderFileCount < Pithos.VISIBLE_FILE_COUNT) { - if (folderFileCount == 1) - showingStats = "1 file"; - else - showingStats = folderFileCount + " files"; -// showingStats += " (" + FileResource.getFileSizeAsString(folderTotalSize) + ")"; - } else { -// showingStats = "" + (startIndex + 1) + " - " + max + " of " + count + " files" + " (" + FileResource.getFileSizeAsString(folderTotalSize) + ")"; - } showCellTable(); } @@ -564,16 +462,6 @@ public class FileList extends Composite { } } - if(files.size() > Pithos.VISIBLE_FILE_COUNT){ - pagerBottom.setVisible(true); - pagerTop.setVisible(true); - } - else{ - pagerTop.setVisible(false); - pagerBottom.setVisible(false); - } - Folder selectedItem = treeView.getSelection(); - provider.setList(files); selectionModel.clear(); } @@ -690,14 +578,6 @@ public class FileList extends Composite { * Shows the files in the cellTable */ private void showCellTable(){ - if(files.size()> Pithos.VISIBLE_FILE_COUNT){ - pagerBottom.setVisible(true); - pagerTop.setVisible(true); - } - else{ - pagerTop.setVisible(false); - pagerBottom.setVisible(false); - } provider.setList(files); provider.refresh(); @@ -705,14 +585,4 @@ public class FileList extends Composite { //celltable.redraw(); celltable.redrawHeaders(); } - - public void showTrash() { - uploadButtonBottom.setVisible(false); - uploadButtonTop.setVisible(false); - } - - public void showFiles() { - uploadButtonBottom.setVisible(true); - uploadButtonTop.setVisible(true); - } } diff --git a/web_client/src/gr/grnet/pithos/web/client/FileUploadDialog.java b/web_client/src/gr/grnet/pithos/web/client/FileUploadDialog.java index 2143f26..9c53ff6 100644 --- a/web_client/src/gr/grnet/pithos/web/client/FileUploadDialog.java +++ b/web_client/src/gr/grnet/pithos/web/client/FileUploadDialog.java @@ -98,11 +98,6 @@ public class FileUploadDialog extends DialogBox { // Create a panel to hold all of the form widgets. VerticalPanel panel = new VerticalPanel(); form.setWidget(panel); - final HTML info = new HTML("You may select a file to upload. Install" + - " Google " + - "Gears
for uploading multiple files simultaneously."); - info.addStyleName("pithos-uploadNote"); - panel.add(info); final Hidden auth = new Hidden("X-Auth-Token", ""); panel.add(auth); @@ -150,7 +145,6 @@ public class FileUploadDialog extends DialogBox { buttons.add(cancel); buttons.setCellHorizontalAlignment(cancel, HasHorizontalAlignment.ALIGN_CENTER); buttons.setSpacing(8); - buttons.addStyleName("pithos-DialogBox"); panel.add(buttons); panel.setCellHorizontalAlignment(buttons, HasHorizontalAlignment.ALIGN_CENTER); @@ -183,9 +177,6 @@ public class FileUploadDialog extends DialogBox { } }); - - panel.addStyleName("pithos-DialogBox"); - addStyleName("pithos-DialogBox"); setWidget(form); } diff --git a/web_client/src/gr/grnet/pithos/web/client/GssCellTable.css b/web_client/src/gr/grnet/pithos/web/client/GssCellTable.css index 0496d77..fdfa014 100644 --- a/web_client/src/gr/grnet/pithos/web/client/GssCellTable.css +++ b/web_client/src/gr/grnet/pithos/web/client/GssCellTable.css @@ -19,11 +19,10 @@ } .cellTableHeader { - /*padding: 3px 9px;*/ - border:none; - background-color: #E0EDFE; + border:none; font-weight: bold; cursor: pointer; + color: white; } .cellTableCell { @@ -62,24 +61,21 @@ .cellTableEvenRow { cursor: hand; cursor: pointer; + background: none; } .cellTableOddRow { cursor: hand; cursor: pointer; + background: none; } .cellTableSelectedRow { - background: #628cd5; - color: white; + color: #d45500; height: auto; overflow: auto; } - .cellTableHoveredRow { - - /*background-color: #E0EDFE; - color: white; - height: auto; - overflow: auto;*/ +.cellTableHoveredRow { + background: none; } \ No newline at end of file diff --git a/web_client/src/gr/grnet/pithos/web/client/GssCellTreeBasic.css b/web_client/src/gr/grnet/pithos/web/client/GssCellTreeBasic.css index b37b22e..fabc026 100644 --- a/web_client/src/gr/grnet/pithos/web/client/GssCellTreeBasic.css +++ b/web_client/src/gr/grnet/pithos/web/client/GssCellTreeBasic.css @@ -61,13 +61,11 @@ } .cellTreeKeyboardSelectedItem { - background-color: #ffc; outline: none; } .cellTreeSelectedItem { - background-color: #628cd5; - color: white; + color: #d45500; height: auto; overflow: visible; } diff --git a/web_client/src/gr/grnet/pithos/web/client/Pithos.java b/web_client/src/gr/grnet/pithos/web/client/Pithos.java index 3e1ba6c..9ffbee2 100644 --- a/web_client/src/gr/grnet/pithos/web/client/Pithos.java +++ b/web_client/src/gr/grnet/pithos/web/client/Pithos.java @@ -36,6 +36,8 @@ package gr.grnet.pithos.web.client; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.http.client.Request; import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestCallback; @@ -47,9 +49,17 @@ import com.google.gwt.json.client.JSONParser; import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant; +import com.google.gwt.user.client.ui.HasVerticalAlignment; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SelectionChangeEvent.Handler; import com.google.gwt.view.client.SingleSelectionModel; +import gr.grnet.pithos.web.client.commands.UploadFileCommand; import gr.grnet.pithos.web.client.foldertree.AccountResource; import gr.grnet.pithos.web.client.foldertree.File; import gr.grnet.pithos.web.client.foldertree.Folder; @@ -189,16 +199,7 @@ public class Pithos implements EntryPoint, ResizeHandler { /** * The tab panel that occupies the right side of the screen. */ - private TabPanel inner = new DecoratedTabPanel(){ - -// public void onBrowserEvent(com.google.gwt.user.client.Event event) { -// if (DOM.eventGetType(event) == Event.ONCONTEXTMENU){ -// if(isFileListShowing()){ -// getFileList().showContextMenu(event); -// } -// } -// }; - }; + private VerticalPanel inner = new VerticalPanel(); /** @@ -244,32 +245,43 @@ public class Pithos implements EntryPoint, ResizeHandler { } private void initialize() { + VerticalPanel outer = new VerticalPanel(); + outer.setWidth("100%"); + topPanel = new TopPanel(this, Pithos.images); topPanel.setWidth("100%"); + outer.add(topPanel); messagePanel.setWidth("100%"); messagePanel.setVisible(false); + outer.add(messagePanel); + outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER); // Inner contains the various lists. inner.sinkEvents(Event.ONCONTEXTMENU); - inner.setAnimationEnabled(true); - inner.getTabBar().addStyleName("pithos-MainTabBar"); - inner.getDeckPanel().addStyleName("pithos-MainTabPanelBottom"); - inner.setWidth("100%"); - inner.addSelectionHandler(new SelectionHandler() { + HorizontalPanel rightside = new HorizontalPanel(); + rightside.addStyleName("pithos-rightSide"); + rightside.setSpacing(5); + PushButton parentButton = new PushButton(new Image(images.asc()), new ClickHandler() { @Override - public void onSelection(SelectionEvent event) { - int tabIndex = event.getSelectedItem(); - switch (tabIndex) { - case 0: - break; - } + public void onClick(ClickEvent event) { + } }); + parentButton.addStyleName("pithos-parentButton"); + rightside.add(parentButton); + + HTML folderStatistics = new HTML("5 Files (size: 1.1GB)"); + folderStatistics.addStyleName("pithos-folderStatistics"); + rightside.add(folderStatistics); + inner.add(rightside); + inner.setCellHorizontalAlignment(rightside, HasHorizontalAlignment.ALIGN_RIGHT); + inner.setCellVerticalAlignment(rightside, HasVerticalAlignment.ALIGN_MIDDLE); + inner.setCellHeight(rightside, "60px"); folderTreeSelectionModel = new SingleSelectionModel(); folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { @@ -287,7 +299,7 @@ public class Pithos implements EntryPoint, ResizeHandler { folderTreeView = new FolderTreeView(folderTreeViewModel); fileList = new FileList(this, images, folderTreeView); - inner.add(fileList, createHeaderHTML(AbstractImagePrototype.create(images.folders()), "Files"), true); + inner.add(fileList); tagTreeSelectionModel = new SingleSelectionModel(); tagTreeSelectionModel.addSelectionChangeHandler(new Handler() { @@ -304,6 +316,21 @@ public class Pithos implements EntryPoint, ResizeHandler { tagTreeView = new TagTreeView(tagTreeViewModel); VerticalPanel trees = new VerticalPanel(); + + Button upload = new Button("Upload File", new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + new UploadFileCommand(Pithos.this, null, folderTreeView.getSelection()).execute(); + } + }); + upload.addStyleName("pithos-uploadButton"); + trees.add(upload); + + HorizontalPanel treeHeader = new HorizontalPanel(); + treeHeader.addStyleName("pithos-treeHeader"); + treeHeader.add(new HTML("Total Files: 6 | Used: 2.1 of 50 GB (4.2%)")); + trees.add(treeHeader); + trees.add(folderTreeView); trees.add(tagTreeView); // Add the left and right panels to the split panel. @@ -312,18 +339,11 @@ public class Pithos implements EntryPoint, ResizeHandler { splitPanel.setSplitPosition("25%"); splitPanel.setSize("100%", "100%"); splitPanel.addStyleName("pithos-splitPanel"); - - // Create a dock panel that will contain the menu bar at the top, - // the shortcuts to the left, the status bar at the bottom and the - // right panel taking the rest. - VerticalPanel outer = new VerticalPanel(); - outer.add(topPanel); - outer.add(messagePanel); outer.add(splitPanel); + statusPanel = new StatusPanel(); outer.add(statusPanel); - outer.setWidth("100%"); - outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER); + // Hook the window resize event, so that we can adjust the UI. Window.addResizeHandler(this); @@ -353,12 +373,6 @@ public class Pithos implements EntryPoint, ResizeHandler { } public void showFiles(Folder f) { - inner.selectTab(0); - if (f.isTrash()) { - fileList.showTrash(); - } - else - fileList.showFiles(); Set files = f.getFiles(); showFiles(files); } @@ -443,7 +457,6 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void onSuccess(AccountResource result) { account = result; - inner.selectTab(0); if (account.getContainers().isEmpty()) createHomeContainers(); else diff --git a/web_client/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java b/web_client/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java index b74e374..362a90e 100644 --- a/web_client/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java +++ b/web_client/src/gr/grnet/pithos/web/client/SessionExpiredDialog.java @@ -60,7 +60,7 @@ public class SessionExpiredDialog extends DialogBox { // Create the text and set a style name so we can style it with CSS. HTML text = new HTML("

Your session has expired. You will have to reauthenticate with your Identity Provider.

"); - text.setStyleName("pithos-AboutText"); + text.setStyleName("pithos-sessionExpired"); outer.add(text); // Create the 'OK' button, along with a listener that hides the dialog diff --git a/web_client/src/gr/grnet/pithos/web/client/StatusPanel.java b/web_client/src/gr/grnet/pithos/web/client/StatusPanel.java index 4a06cbb..2b970d6 100644 --- a/web_client/src/gr/grnet/pithos/web/client/StatusPanel.java +++ b/web_client/src/gr/grnet/pithos/web/client/StatusPanel.java @@ -70,8 +70,9 @@ public class StatusPanel extends Composite { HorizontalPanel secondLine = new HorizontalPanel(); secondLine.add(new HTML("Copyright (C) 2011 Greek Research and Technology Network")); inner.add(secondLine); - outer.add(inner); + outer.addStyleName("pithos-statusbar"); + initWidget(outer); } } diff --git a/web_client/src/gr/grnet/pithos/web/client/TopPanel.java b/web_client/src/gr/grnet/pithos/web/client/TopPanel.java index d611151..4824967 100644 --- a/web_client/src/gr/grnet/pithos/web/client/TopPanel.java +++ b/web_client/src/gr/grnet/pithos/web/client/TopPanel.java @@ -42,6 +42,8 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.MenuBar; +import com.google.gwt.user.client.ui.MenuItem; /** * The top panel, which contains the menu bar icons and the user name. @@ -76,12 +78,18 @@ public class TopPanel extends Composite { // outer.setSpacing(2); outer.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); - outer.setStyleName("toolbar"); + outer.setStyleName("pithos-topPanel"); HTML logos = new HTML("
" + AbstractImagePrototype.create(images.pithosLogo()).getHTML() + "
"); outer.add(logos); -// outer.setCellHorizontalAlignment(logos, HasHorizontalAlignment.ALIGN_RIGHT); + MenuBar username = new MenuBar(); + username.setStyleName("pithos-usernameMenu"); + MenuItem userItem = new MenuItem(_app.getUsername(), new MenuBar(true)); + userItem.addStyleName("pithos-usernameMenu"); + username.addItem(userItem); + outer.add(username); + outer.setCellHorizontalAlignment(username, HasHorizontalAlignment.ALIGN_RIGHT); initWidget(outer); } diff --git a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java index cf959a6..7d554ad 100644 --- a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java +++ b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java @@ -93,22 +93,22 @@ public class FolderTreeView extends Composite { @Source("gr/grnet/pithos/resources/folder_home.png") ImageResource home(); - @Source("gr/grnet/pithos/resources/folder_yellow.png") + @Source("gr/grnet/pithos/resources/2folder22.png") public ImageResource folderYellow(); @Source("gr/grnet/pithos/resources/mimetypes/document.png") ImageResource document(); - @Source("gr/grnet/pithos/resources/internet.png") + @Source("gr/grnet/pithos/resources/othersshared.png") ImageResource othersShared(); - @Source("gr/grnet/pithos/resources/edit_user.png") + @Source("gr/grnet/pithos/resources/myshared22.png") ImageResource myShared(); @Source("gr/grnet/pithos/resources/folder_user.png") ImageResource sharedFolder(); - @Source("gr/grnet/pithos/resources/trashcan_empty.png") + @Source("gr/grnet/pithos/resources/trash.png") ImageResource trash(); } diff --git a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java index fb53fb1..0a71279 100644 --- a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java +++ b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java @@ -71,7 +71,7 @@ public class FolderTreeViewModel implements TreeViewModel { public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) { String html; if (folder.isTrash()) - html = AbstractImagePrototype.create(FolderTreeView.images.emptyTrash()).getHTML(); + html = AbstractImagePrototype.create(FolderTreeView.images.trash()).getHTML(); else html = AbstractImagePrototype.create(FolderTreeView.images.folderYellow()).getHTML(); safeHtmlBuilder.appendHtmlConstant(html); diff --git a/web_client/src/gr/grnet/pithos/web/public/gss.css b/web_client/src/gr/grnet/pithos/web/public/gss.css index 3cd85a5..baf601a 100644 --- a/web_client/src/gr/grnet/pithos/web/public/gss.css +++ b/web_client/src/gr/grnet/pithos/web/public/gss.css @@ -1,8 +1,6 @@ body { - background-color: #4085a5; color: black; font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif; - font-size: small; margin: 8px; margin-top: 3px; } @@ -15,112 +13,121 @@ a:visited { color: darkblue; } -.hidden-link { - text-decoration: none !important; - color: black !important; +a.info { + position: relative; /*this is the key*/ + z-index: 24; + color: black; + text-decoration: none } -.hidden-link:visited { - text-decoration: none !important; - color: black !important; +a.info:hover { + z-index: 25; + background-color: yellow; } -.pithos-TopPanel { - font-size: 100%; +a.info div { + display: none } -.pithos-TopPanelLinks { - font-size: 100%; +a.info:hover span { + cursor: pointer; } -.pithos-AboutText { - width: 24em; - /* Restore the padding we remove when overriding the gwt-DialogBox style */ - padding: 3px; +/* The span will only display on :hover state. */ +a.info:hover div { + display: block; + position: absolute; + bottom: 2em; + right: 1em; + width: 10em; + border: 1px solid lightblue; + background-color: #D0E4F6; + color: black; + text-align: center } -.pithos-Groups { - background-color: white; - font-size: 80%; +/* + * Remove the padding inside the dialog boxes so that our background color + * appears uniform in warnings and errors. + */ +.gwt-DialogBox .dialogMiddleCenter { + background:none repeat scroll 0 0 white; + padding: 0; } -.toolbar { - font-size: 80%; +table.pithos-permList { + border-spacing: 3px; + border-collapse: collapse; + } -.toolbarmenu { - font-size: 80%; - cursor: pointer; +table.pithos-permList td { + padding: 5px 5px 5px 5px; + font-size:80%; } -.statusbar-inner { - border: none; - font-size: 90%; - vertical-align: middle; - font-weight: normal; +table.pithos-permList.props-labels { + font-weight: bold; } -.pithos-List { - background-color: white; +.props-labels { font-size: 80%; - cursor: default; - border-collapse: collapse; - /* prevents selecting text in table with shift and ctrl*/ - -moz-user-select: none; -} -.pithos-List thead tr{ - border: 1px lightblue solid; - } - - .GK31MSKBKG{ - border-bottom:none; - } -.pithos-ListHeader { - - background-color: #E0EDFE; font-weight: bold; - cursor: pointer; } -.pithos-searchLabel { +.props-toplabels { + font-size: 80%; font-weight: bold; font-style: italic; - font-size: 90%; - padding:5px; } -.pithos-ListNavBar { +.props-values { font-size: 80%; } -.pithos-SelectedRow { - background-color: #E0EDFE; -} -.pithos-fileRow{ - cursor: pointer; +.hidden-link { + text-decoration: none !important; + color: black !important; } -.pithos-Toolbar { +.hidden-link:visited { + text-decoration: none !important; + color: black !important; } -.pithos-ToolButton { +.pithos-topPanel { + background-color: #4085a5; font-size: 80%; - width: 10em; } -.props-labels { - font-size: 80%; - font-weight: bold; +.pithos-usernameMenu { + cursor: pointer; + color: white; } -.props-toplabels { - font-size: 80%; - font-weight: bold; - font-style: italic; +.pithos-usernameMenuItem { + cursor: pointer; } -.props-values { - font-size: 80%; +.pithos-sessionExpired { + width: 24em; + /* Restore the padding we remove when overriding the gwt-DialogBox style */ + padding: 3px; +} + +.pithos-statusbar { + background-color: #4085a5; + border: none; + font-size: 90%; + vertical-align: middle; + font-weight: normal; +} + +.pithos-List { + cursor: default; + border-collapse: collapse; + /* prevents selecting text in table with shift and ctrl*/ + -moz-user-select: none; } .pithos-errorMessage { @@ -155,17 +162,6 @@ a:visited { color: black; } -.pithos-search { - color: black; -} - -.pithos-search-empty { - color: #d3d3d3; -} - -.pithos-DialogBox { -} - .pithos-readForAllNote { width: 240px; text-align: justify; @@ -174,108 +170,6 @@ a:visited { padding-left: 4; } -/* Tooltips */ -a.info { - position: relative; /*this is the key*/ - z-index: 24; - color: black; - text-decoration: none -} - -a.info:hover { - z-index: 25; - background-color: yellow; -} - -a.info div { - display: none -} - -a.info:hover span { - cursor: pointer; -} - -/* The span will only display on :hover state. */ -a.info:hover div { - display: block; - position: absolute; - bottom: 2em; - right: 1em; - width: 10em; - border: 1px solid lightblue; - background-color: #D0E4F6; - color: black; - text-align: center -} - -table.pithos-permList.props-labels { - font-weight: bold; -} - -table.pithos-permList { - border-spacing: 3px; - border-collapse: collapse; - -} - -table.pithos-permList td { - padding: 5px 5px 5px 5px; - font-size:80%; -} - -.progressbar-text { - font-weight: bold; -} - -.progressbar-remaining { - font-size: 12px; - font-style: italic; -} - -.progressbar-outer { -} - -.progressbar-inner { - border: 1px solid darkgrey; - margin: 1px; -} - -.progressbar-bar { - width: 5px; - height: 15px; - margin: 0px; -} - -.progressbar-fullbar { - background: #E0EDFE; -} - -.progressbar-blankbar { - background: white; -} - -.pithos-uploadNote { - text-align: justify; - font-style: italic; - font-size: 12px; - padding-top: 16; - padding-bottom: 16; - padding-right: 4; - padding-left: 4; -} - -.pithos-MainTabBar { - padding-top: 4px; -} - -.pithos-MainTabPanelBottom { - border-bottom: none; - border-left: none; - border-right: none; - overflow: hidden; - padding: 6px; -} - .pithos-TabPanelBottom { border-color: darkgrey; border-width: 1px 1px 1px; @@ -285,34 +179,39 @@ table.pithos-permList td { .pithos-splitPanel { border: 1px solid white; - background: url(resources/background.png) repeat-x; -} - -.pithos-tag { - display:inline; + background: url(images/background.png) repeat-x; } /* Use the background color for the splitter. */ .gwt-HorizontalSplitPanel .hsplitter { cursor: move; - border: 0px; + border: 0px; background: #bec8e6; } -/* Avoid extended background color in tree nodes. */ -.gwt-TreeItem-selected .gwt-HTML { - display: inline; +.pithos-tag { + display:inline; } -/* - * Remove the padding inside the dialog boxes so that our background color - * appears uniform in warnings and errors. - */ -.gwt-DialogBox .dialogMiddleCenter { - background:none repeat scroll 0 0 white; - padding: 0; +.pithos-uploadButton { + background: none; + background-color: #ff6600; + font-size: 120%; + text-align: center; + height: 40px; + width: 100%; +} + +.pithos-rightSide { + vertical-align: middle; +} +.pithos-parentButton { + background: none; + background-color: #a1c8da; } -.droppableHover { - background-color: #C1DEFD; +.pithos-folderStatistics { + background-color: #a1c8da; + text-align: center; + color: white; } diff --git a/web_client/src/gr/grnet/pithos/web/public/images/background.png b/web_client/src/gr/grnet/pithos/web/public/images/background.png index 26e3e9a6dac9d38c00467ba9166e71bfce944658..601dc255babcc2a229647dc8ed4e34a99c7ecb4d 100644 GIT binary patch literal 405 zcmV;G0c!qVQ>00004b3#c}2nYxW zdK~zYI?Nz}M!!QVwGIQtZ9-Yd4xUmfgpOf}if4Jm~5Eewi zKG5WG`3+x^03Pwe4~rIA|Y_HfT`nmDQ543p+B>}H(w1-lV!;R9Q?o0M&04-1=} zPn!0N`q~}_#1(tU{!yb=%l5FoG&03&73|>+O_&FHmgA*?00000NkvXXu0mjfh{UQL literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jljKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sfO(sE3J+?MeVQ-+2mZytjh{y5dJLQignR6M0na>_radEL* jzm#p(7bM2v`xy*UkC|2+7OWNo>SFM8^>bP0l+XkK1?(xt -- 1.7.10.4