diff options
| author | Bala.FA <bala@gluster.com> | 2011-08-03 20:45:06 +0530 |
|---|---|---|
| committer | Bala.FA <bala@gluster.com> | 2011-08-03 20:45:06 +0530 |
| commit | 213b4241cac4f2f53df4ec995c1d6b64876edba9 (patch) | |
| tree | e355da953b2e8602442daa6ae1362bb30191363b /src | |
| parent | 64f7221ccb6323c1f1ce9cbaa529b530338509c6 (diff) | |
| parent | 7b46aa84c5578f693971da53946ee1d8a6f60208 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'src')
4 files changed, 14 insertions, 6 deletions
diff --git a/src/com.gluster.storage.management.gateway/WebContent/index.html b/src/com.gluster.storage.management.gateway/WebContent/index.html index 85b03dbf..d8ad6414 100644 --- a/src/com.gluster.storage.management.gateway/WebContent/index.html +++ b/src/com.gluster.storage.management.gateway/WebContent/index.html @@ -101,11 +101,13 @@ </DIV> <DIV ID="unknown_arch" style="display: none"> Could not identify your CPU architecture. Please click on the appropriate link below to invoke Gluster Management Console! - </DIV> + </DIV><br> <DIV ID="always_on" style="display: none"> - Linux - <a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a> <a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a><br> - Mac OS X - <a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a> <a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a><br> - Windows - <a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a> <a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a><br> + <table style="width: 479px; "> + <tr><td style="width: 100px;">Linux</td><td style="width: 60px;"><a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr> + <tr><td style="width: 100px;">Mac OS X</td><td style="width: 60px;"><a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr> + <tr><td style="width: 100px;">Windows</td><td style="width: 60px;"><a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr> + </table> </DIV> </body> diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java index 50733fea..62ea6839 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java @@ -528,6 +528,11 @@ public class GlusterUtil { } } + // add the last read volume + if (volume != null) { + volumes.add(volume); + } + updateCifsInfo(volumes); return volumes; diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index 27b0e32b..8318522b 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -229,7 +229,7 @@ public class ClusterSummaryView extends ViewPart { GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); data.widthHint = 400; - data.heightHint = 150; + data.heightHint = 170; data.verticalAlignment = SWT.CENTER; chartViewerComposite.setLayoutData(data); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java index 60656d51..b14b078d 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java @@ -108,7 +108,8 @@ public class VolumesSummaryView extends ViewPart { private void updateSummarySection() { guiHelper.clearSection(summarySection); populateSummarySection(); - summarySection.layout(); + summarySection.layout(); + form.reflow(true); } @Override |