From 7e8e9ff01800c3c3e63b4fcff68cd28bfadeff9f Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Thu, 19 Apr 2012 18:43:13 +0300 Subject: [PATCH] More changes for the new left pane --- src/gr/grnet/pithos/resources/2folder22.png | Bin 0 -> 338 bytes src/gr/grnet/pithos/resources/sharedbyme22.png | Bin 0 -> 1142 bytes src/gr/grnet/pithos/resources/sharedtome22.png | Bin 0 -> 1092 bytes .../pithos/web/client/PithosDisclosurePanel.css | 5 +++ .../pithos/web/client/PithosDisclosurePanel.java | 14 +++++-- .../web/client/foldertree/FolderTreeView.java | 22 ++++++++--- .../web/client/foldertree/FolderTreeViewModel.java | 2 +- .../pithos/web/client/grouptree/GroupTreeView.java | 2 +- .../web/client/mysharedtree/MysharedTreeView.java | 16 ++++---- .../client/mysharedtree/MysharedTreeViewModel.java | 33 +++------------- .../othersharedtree/OtherSharedTreeView.java | 12 +++--- .../othersharedtree/OtherSharedTreeViewModel.java | 40 ++++++-------------- src/gr/grnet/pithos/web/public/pithos.css | 13 ++++++- 13 files changed, 78 insertions(+), 81 deletions(-) create mode 100644 src/gr/grnet/pithos/resources/2folder22.png create mode 100644 src/gr/grnet/pithos/resources/sharedbyme22.png create mode 100644 src/gr/grnet/pithos/resources/sharedtome22.png diff --git a/src/gr/grnet/pithos/resources/2folder22.png b/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/src/gr/grnet/pithos/resources/sharedbyme22.png b/src/gr/grnet/pithos/resources/sharedbyme22.png new file mode 100644 index 0000000000000000000000000000000000000000..54e3a519984ad072bf97d128443604a2637020d7 GIT binary patch literal 1142 zcmV-+1d02JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb( z3mOYjX+v5700Z_(L_t(I%Z-#zXcSi*$3Jgoc4so1gpIC}Wvwv@B^X-or$GC9eg6Qe# zq17c`1<%gTa`Wa*+1uNTs;WGH{v6A)XxvGs(_(CFtR=A0*v!q%F*`de&zw0!e}6x^ zuA}QZrfCA8swy{b+>ncli>-sVwzjx>^{PC3_AGn%?rnaO5Gaa*@B0Knz|72y+}_^a z6|4cw&(C8R29F*+!nSQTH#ezPtGKR<=XnG{0D$lN_`c7=!UCsGo!VXT!-o&0Wm)9& zc~(|dSX*18R;v+<#pvwpBnSe85X53JR8?hpd0DokxL&U_G&IEE;2@6U5Q#*HMx#5I zDwPV3MF*QCp*!W&m-z}JkR6l)2Aep$<`G2_V#l8_;K#vzfT|~ifz-D$)Ml4 zLt7?;S}IW&f_wMwapJ@Y4jw$%xerNpu3l_pvOC$B!RVDwU+J>r^Tg*4NjWoSc+~VK6>EE>fu!s;V}Z z;?}KO((^nH9Xf<*npCS*0G5`PC=?2>y;9e8!r?F*&kFRL9!r1v?Af!2si`S3Ffj1a zAS){?3=Itd(B0jQ>$=#s&HDN}PVslN|8#9*QhXQ>^XYpX{8IG!a;eP4ix=hS=qM8t z6G8)c@!|!hX`(0!x~@~J)&6x~Sn~Dh=&t|tZY;z%BT;_%ZJTR%zbBW=Nu^!LZ1gJBo|gu~&c1TPT$?FMMdo1tM<5D5wX+N$x@ zQk9?o2sn4{w9tyhA{`wa0E9xJrX;7X@bTU98==X!!hHUIJKyEE`1V(qzJWomees#- z>+3@+m&-Jq^lG~RB$G)Ji3C9q?DS_tK)qgPap5OE`LT@UYmBDGNT<`HQA*8qT}q`A z)6>)ct16XBarp4zCa_@`#N%Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb( z3mh%hK4BpM00YEHL_t(I%Z-%JOIv9ahM(`=Xl`yay^g6Uw%Q;f>O$yr0Q;;sI zIJoJ$2#WuK|A32vhzz*$$D+dsZUkwFV5kcvtwN<0n=Wcv5sKoCSG_U0N$xib8>cc_ zbKtj0>#%JlTK zTwPr)9(;a&&gA5z92gj&va<5(NJ5|}3fXKH*L9hgn2?!F=2ox=AR3LLX&Ud}zsIsH zPESusrBbBRX&lGFbzK0m*(}*?me;Re^Z4=O+Z}IhZAsHKiO1vY?Ch|&w?{6QBNz-4 z2n29l7a;_}U=USR+1}okMLEvr^R&0O)6&v{ZQJ<$ehkC76rG%$VB0nxkB4|XPCA_~ zZpXE?wOE#gVHnib)?R@E1OfqSYHGN9_b!%Yaqr$eQ53kVt4n!!>C6`_N znwpZ~a2UfdC@U-D^z@XIlM{M+dU*c)xe!9&^Z9O1h?J7!<6}lgM`a-Cb$w`FtJ#P16wKzfcvT`=?JRuYc5s5_j@a-E4(A?ZCIyyS81y@#9;z_5| z9334oHa2#xsJFM5=H_Oanwn^6XyEPJx4e1thQ7W&y1Tn?bp0null as the default @@ -177,8 +186,9 @@ public class FolderTreeView extends Composite implements TreeView { CellTree.Resources res = GWT.create(BasicResources.class); tree = new CellTree(model, null, res); tree.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); - + tree.addStyleName("pithos-folderTreeSectionContent"); panel.add(tree); + initWidget(panel); } diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java index 843f14f..5e4f348 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java @@ -72,7 +72,7 @@ public class FolderTreeViewModel implements TreeViewModel { String html; SafeHtml name; if (folder.isHome()) { - html = AbstractImagePrototype.create(FolderTreeView.images.home()).getHTML(); + html = AbstractImagePrototype.create(FolderTreeView.images.folderYellow()).getHTML(); name = Templates.INSTANCE.nameSpan("Pithos"); } else if (folder.isTrash()) { diff --git a/src/gr/grnet/pithos/web/client/grouptree/GroupTreeView.java b/src/gr/grnet/pithos/web/client/grouptree/GroupTreeView.java index f2b58fd..104d73e 100644 --- a/src/gr/grnet/pithos/web/client/grouptree/GroupTreeView.java +++ b/src/gr/grnet/pithos/web/client/grouptree/GroupTreeView.java @@ -131,7 +131,7 @@ public class GroupTreeView extends Composite implements TreeView { public static interface Templates extends SafeHtmlTemplates { public Templates INSTANCE = GWT.create(Templates.class); - @Template("{0}") + @Template("{0}") public SafeHtml nameSpan(String name); } diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java index e2fdeed..e286195 100644 --- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java +++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeView.java @@ -55,7 +55,7 @@ import com.google.gwt.user.client.ui.Tree; public class MysharedTreeView extends Composite implements TreeView { public void updateChildren(Folder folder) { - TreeNode root = ((CellTree) getWidget()).getRootTreeNode(); + TreeNode root = tree.getRootTreeNode(); updateChildren(root, folder); } @@ -105,18 +105,18 @@ public class MysharedTreeView extends Composite implements TreeView { @Source("gr/grnet/pithos/resources/home22.png") ImageResource home(); - @Source("gr/grnet/pithos/resources/folder22.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/othersshared.png") - ImageResource othersShared(); - @Source("gr/grnet/pithos/resources/myshared22.png") ImageResource myShared(); + @Source("gr/grnet/pithos/resources/sharedbyme22.png") + ImageResource sharedByMe(); + @Source("gr/grnet/pithos/resources/folder_user.png") ImageResource sharedFolder(); } @@ -132,12 +132,14 @@ public class MysharedTreeView extends Composite implements TreeView { interface Resources extends gr.grnet.pithos.web.client.PithosDisclosurePanel.Resources { @Override - @Source("gr/grnet/pithos/resources/myshared22.png") + @Source("gr/grnet/pithos/resources/sharedbyme22.png") ImageResource icon(); } private MysharedTreeViewModel model; + private CellTree tree; + public MysharedTreeView(MysharedTreeViewModel viewModel) { this.model = viewModel; @@ -148,7 +150,7 @@ public class MysharedTreeView extends Composite implements TreeView { * CustomTreeModel#getNodeInfo(); */ CellTree.Resources res = GWT.create(BasicResources.class); - CellTree tree = new CellTree(model, null, res); + tree = new CellTree(model, null, res); tree.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); panel.add(tree); diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java index 8b98bc2..e5595ce 100644 --- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java @@ -119,37 +119,16 @@ public class MysharedTreeViewModel implements TreeViewModel { @Override public NodeInfo getNodeInfo(T value) { if (value == null) { - ListDataProvider rootDataProvider = new ListDataProvider(); - rootDataProvider.getList().add("Shared by me"); - return new DefaultNodeInfo(rootDataProvider, new TextCell(new SafeHtmlRenderer() { - @Override - public SafeHtml render(String object) { - SafeHtmlBuilder builder = new SafeHtmlBuilder(); - render(object, builder); - return builder.toSafeHtml(); - } - - @Override - public void render(String object, SafeHtmlBuilder builder) { - String html = AbstractImagePrototype.create(MysharedTreeView.images.myShared()).getHTML(); - builder.appendHtmlConstant(html).appendHtmlConstant(" "); - builder.append(MysharedTreeView.Templates.INSTANCE.nameSpan(object)); - } - }), null, null); - } - else if (value instanceof String) { fetchSharedContainers(null); return new DefaultNodeInfo(firstLevelDataProvider, folderCell, selectionModel, null); } - else { - final Folder f = (Folder) value; - if (dataProviderMap.get(f) == null) { - dataProviderMap.put(f, new ListDataProvider()); - } - final ListDataProvider dataProvider = dataProviderMap.get(f); - fetchFolder(f, dataProvider, false); - return new DefaultNodeInfo(dataProvider, folderCell, selectionModel, null); + final Folder f = (Folder) value; + if (dataProviderMap.get(f) == null) { + dataProviderMap.put(f, new ListDataProvider()); } + final ListDataProvider dataProvider = dataProviderMap.get(f); + fetchFolder(f, dataProvider, false); + return new DefaultNodeInfo(dataProvider, folderCell, selectionModel, null); } private void fetchSharedContainers(final Command callback) { diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java index 02174ed..f74bd2b 100644 --- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java +++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeView.java @@ -56,7 +56,7 @@ import com.google.gwt.user.client.ui.Tree; public class OtherSharedTreeView extends Composite implements TreeView { public void updateChildren(Folder folder) { - TreeNode root = ((CellTree) getWidget()).getRootTreeNode(); + TreeNode root = tree.getRootTreeNode(); updateChildren(root, folder); } @@ -106,13 +106,13 @@ public class OtherSharedTreeView extends Composite implements TreeView { @Source("gr/grnet/pithos/resources/home22.png") ImageResource home(); - @Source("gr/grnet/pithos/resources/folder22.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/othersshared.png") + @Source("gr/grnet/pithos/resources/sharedtome22.png") ImageResource othersShared(); @Source("gr/grnet/pithos/resources/myshared22.png") @@ -136,12 +136,14 @@ public class OtherSharedTreeView extends Composite implements TreeView { interface Resources extends gr.grnet.pithos.web.client.PithosDisclosurePanel.Resources { @Override - @Source("gr/grnet/pithos/resources/othersshared.png") + @Source("gr/grnet/pithos/resources/sharedtome22.png") ImageResource icon(); } private OtherSharedTreeViewModel model; + private CellTree tree; + public OtherSharedTreeView(OtherSharedTreeViewModel viewModel) { this.model = viewModel; @@ -152,7 +154,7 @@ public class OtherSharedTreeView extends Composite implements TreeView { * CustomTreeModel#getNodeInfo(); */ CellTree.Resources res = GWT.create(BasicResources.class); - CellTree tree = new CellTree(model, null, res); + tree = new CellTree(model, null, res); tree.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); panel.add(tree); diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java index 63c2426..291287a 100644 --- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java +++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java @@ -121,43 +121,25 @@ public class OtherSharedTreeViewModel implements TreeViewModel { @Override public NodeInfo getNodeInfo(T value) { if (value == null) { - rootDataProvider.getList().add(treeTitle); - return new DefaultNodeInfo(rootDataProvider, new TextCell(new SafeHtmlRenderer() { - @Override - public SafeHtml render(String object) { + fetchSharingUsers(null); + return new DefaultNodeInfo(userLevelDataProvider, new TextCell(new SafeHtmlRenderer() { + + @Override + public SafeHtml render(String object) { SafeHtmlBuilder builder = new SafeHtmlBuilder(); render(object, builder); return builder.toSafeHtml(); - } + } - @Override - public void render(String object, SafeHtmlBuilder builder) { - String html = AbstractImagePrototype.create(OtherSharedTreeView.images.othersShared()).getHTML(); + @Override + public void render(String object, SafeHtmlBuilder builder) { + String html = AbstractImagePrototype.create(OtherSharedTreeView.images.myShared()).getHTML(); builder.appendHtmlConstant(html).appendHtmlConstant(" "); builder.append(OtherSharedTreeView.Templates.INSTANCE.nameSpan(object)); - } - }), null, null); + } + }), null, null); } else if (value instanceof String) { - if (value.equals(treeTitle)) { - fetchSharingUsers(null); - return new DefaultNodeInfo(userLevelDataProvider, new TextCell(new SafeHtmlRenderer() { - - @Override - public SafeHtml render(String object) { - SafeHtmlBuilder builder = new SafeHtmlBuilder(); - render(object, builder); - return builder.toSafeHtml(); - } - - @Override - public void render(String object, SafeHtmlBuilder builder) { - String html = AbstractImagePrototype.create(OtherSharedTreeView.images.user()).getHTML(); - builder.appendHtmlConstant(html).appendHtmlConstant(" "); - builder.append(OtherSharedTreeView.Templates.INSTANCE.nameSpan(object)); - } - }), null, null); - } String username = (String) value; if (userDataProviderMap.get(username) == null) { userDataProviderMap.put(username, new ListDataProvider()); diff --git a/src/gr/grnet/pithos/web/public/pithos.css b/src/gr/grnet/pithos/web/public/pithos.css index b618fda..4825ca5 100644 --- a/src/gr/grnet/pithos/web/public/pithos.css +++ b/src/gr/grnet/pithos/web/public/pithos.css @@ -377,8 +377,8 @@ table.pithos-permList.props-labels { text-align: center; height: auto; padding: 8px; - width: 146px; - border: none; + width: 127px; + border: 0px; } .pithos-uploadButton-loading { @@ -733,3 +733,12 @@ a.pithos-tag { .pithos-versionList { padding-right: 5px; } + +.pithos-folderTreeSection { + padding-left: 10px; +} + +.pithos-folderTreeSectionContent { + padding: 4px 0px 4px 8px; + margin-left: 6px; +} \ No newline at end of file -- 1.7.10.4