From 2668c28ff8a4bb678304e73b156c34dc889aea8b Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Sat, 7 May 2011 20:57:35 +0530 Subject: Added new plug-in project for help, Changed title of all summary views to "Summary", modified not to show the disk usage pie chart when the storage cloud is empty. --- .../.project | 22 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 8 +++++++ .../build.properties | 4 ++++ .../html/concepts/maintopic.html | 13 +++++++++++ .../html/concepts/subtopic.html | 13 +++++++++++ .../html/concepts/subtopic2.html | 13 +++++++++++ .../html/gettingstarted/maintopic.html | 13 +++++++++++ .../html/gettingstarted/subtopic.html | 13 +++++++++++ .../html/gettingstarted/subtopic2.html | 13 +++++++++++ .../html/help_home.html | 10 +++++++++ .../html/reference/maintopic.html | 13 +++++++++++ .../html/reference/subtopic.html | 13 +++++++++++ .../html/reference/subtopic2.html | 13 +++++++++++ .../html/tasks/maintopic.html | 13 +++++++++++ .../html/tasks/subtopic.html | 13 +++++++++++ .../html/tasks/subtopic2.html | 13 +++++++++++ .../html/toc.html | 13 +++++++++++ .../plugin.xml | 25 ++++++++++++++++++++++ .../toc.xml | 17 +++++++++++++++ .../tocconcepts.xml | 11 ++++++++++ .../tocgettingstarted.xml | 11 ++++++++++ .../tocreference.xml | 11 ++++++++++ .../toctasks.xml | 11 ++++++++++ .../feature.xml | 6 ++++++ .../META-INF/MANIFEST.MF | 3 ++- .../preferences.ini | 3 ++- .../gui/ApplicationActionBarAdvisor.java | 7 ++++++ .../management/gui/views/ClusterSummaryView.java | 16 +++++++++++++- .../gui/views/GlusterServerSummaryView.java | 1 + .../gui/views/GlusterServersSummaryView.java | 5 ++--- .../management/gui/views/VolumeSummaryView.java | 1 + .../management/gui/views/VolumesSummaryView.java | 2 +- 32 files changed, 336 insertions(+), 7 deletions(-) create mode 100644 src/com.gluster.storage.management.console.help/.project create mode 100644 src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF create mode 100644 src/com.gluster.storage.management.console.help/build.properties create mode 100644 src/com.gluster.storage.management.console.help/html/concepts/maintopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/concepts/subtopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html create mode 100644 src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html create mode 100644 src/com.gluster.storage.management.console.help/html/help_home.html create mode 100644 src/com.gluster.storage.management.console.help/html/reference/maintopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/reference/subtopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/reference/subtopic2.html create mode 100644 src/com.gluster.storage.management.console.help/html/tasks/maintopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/tasks/subtopic.html create mode 100644 src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html create mode 100644 src/com.gluster.storage.management.console.help/html/toc.html create mode 100644 src/com.gluster.storage.management.console.help/plugin.xml create mode 100644 src/com.gluster.storage.management.console.help/toc.xml create mode 100644 src/com.gluster.storage.management.console.help/tocconcepts.xml create mode 100644 src/com.gluster.storage.management.console.help/tocgettingstarted.xml create mode 100644 src/com.gluster.storage.management.console.help/tocreference.xml create mode 100644 src/com.gluster.storage.management.console.help/toctasks.xml (limited to 'src') diff --git a/src/com.gluster.storage.management.console.help/.project b/src/com.gluster.storage.management.console.help/.project new file mode 100644 index 00000000..ba39c551 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/.project @@ -0,0 +1,22 @@ + + + com.gluster.storage.management.console.help + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + diff --git a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF new file mode 100644 index 00000000..2bfb3270 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Gluster Management Console - Help +Bundle-SymbolicName: com.gluster.storage.management.console.help; singleton:=true +Bundle-Version: 1.0.0 +Bundle-Vendor: GLUSTER +Require-Bundle: org.eclipse.help.ui;bundle-version="3.5.2", + org.eclipse.help.webapp;bundle-version="3.5.2" diff --git a/src/com.gluster.storage.management.console.help/build.properties b/src/com.gluster.storage.management.console.help/build.properties new file mode 100644 index 00000000..3c05d072 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/build.properties @@ -0,0 +1,4 @@ +bin.includes = plugin.xml,\ + META-INF/,\ + html/,\ + *.xml diff --git a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html b/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html new file mode 100644 index 00000000..a476078a --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html b/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html new file mode 100644 index 00000000..8a61c501 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html b/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html new file mode 100644 index 00000000..86bcbf9c --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html new file mode 100644 index 00000000..a476078a --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html new file mode 100644 index 00000000..8a61c501 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html new file mode 100644 index 00000000..86bcbf9c --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/help_home.html b/src/com.gluster.storage.management.console.help/html/help_home.html new file mode 100644 index 00000000..cfd6489d --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/help_home.html @@ -0,0 +1,10 @@ + + + + +Gluster Management Console + + +Gluster Management Console Help Home Page + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html b/src/com.gluster.storage.management.console.help/html/reference/maintopic.html new file mode 100644 index 00000000..a476078a --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/reference/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html b/src/com.gluster.storage.management.console.help/html/reference/subtopic.html new file mode 100644 index 00000000..8a61c501 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/reference/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html b/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html new file mode 100644 index 00000000..86bcbf9c --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html new file mode 100644 index 00000000..a476078a --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html new file mode 100644 index 00000000..8a61c501 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html new file mode 100644 index 00000000..86bcbf9c --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/html/toc.html b/src/com.gluster.storage.management.console.help/html/toc.html new file mode 100644 index 00000000..326f0a9f --- /dev/null +++ b/src/com.gluster.storage.management.console.help/html/toc.html @@ -0,0 +1,13 @@ + + + + + + Table of Contents + + + +

Table of Contents

+Please enter your text here. + + \ No newline at end of file diff --git a/src/com.gluster.storage.management.console.help/plugin.xml b/src/com.gluster.storage.management.console.help/plugin.xml new file mode 100644 index 00000000..0b62d954 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/plugin.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.console.help/toc.xml b/src/com.gluster.storage.management.console.help/toc.xml new file mode 100644 index 00000000..963995c6 --- /dev/null +++ b/src/com.gluster.storage.management.console.help/toc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.console.help/tocconcepts.xml b/src/com.gluster.storage.management.console.help/tocconcepts.xml new file mode 100644 index 00000000..d01f925e --- /dev/null +++ b/src/com.gluster.storage.management.console.help/tocconcepts.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml new file mode 100644 index 00000000..38f27e0b --- /dev/null +++ b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.console.help/tocreference.xml b/src/com.gluster.storage.management.console.help/tocreference.xml new file mode 100644 index 00000000..660cdecc --- /dev/null +++ b/src/com.gluster.storage.management.console.help/tocreference.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.console.help/toctasks.xml b/src/com.gluster.storage.management.console.help/toctasks.xml new file mode 100644 index 00000000..c96b94bb --- /dev/null +++ b/src/com.gluster.storage.management.console.help/toctasks.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/com.gluster.storage.management.gui.feature/feature.xml b/src/com.gluster.storage.management.gui.feature/feature.xml index 7f99803e..06df1a47 100644 --- a/src/com.gluster.storage.management.gui.feature/feature.xml +++ b/src/com.gluster.storage.management.gui.feature/feature.xml @@ -779,4 +779,10 @@ version="0.0.0" unpack="false"/> + + diff --git a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF index 076a2805..55029ee6 100644 --- a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF +++ b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF @@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1", com.ibm.icu;bundle-version="4.2.1", com.richclientgui.rcptoolbox;bundle-version="1.0.5", org.eclipse.core.resources, - org.apache.commons.lang;bundle-version="2.3.0" + org.apache.commons.lang;bundle-version="2.3.0", + com.gluster.storage.management.console.help;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/src/com.gluster.storage.management.gui/preferences.ini b/src/com.gluster.storage.management.gui/preferences.ini index 91228592..24389288 100644 --- a/src/com.gluster.storage.management.gui/preferences.ini +++ b/src/com.gluster.storage.management.gui/preferences.ini @@ -1 +1,2 @@ -org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig \ No newline at end of file +org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig +org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html \ No newline at end of file diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java index 3f6cb7d5..fa613efd 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java @@ -46,6 +46,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { */ private IWorkbenchAction exitAction; private IWorkbenchAction aboutAction; + private IWorkbenchAction helpContentsAction; private GUIHelper guiHelper = GUIHelper.getInstance(); @@ -68,6 +69,11 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { aboutAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.HELP)); register(aboutAction); + + helpContentsAction = ActionFactory.HELP_CONTENTS.create(window); + helpContentsAction.setText("&Contents"); + //helpContentsAction.setImageDescriptor(newImage) + register(helpContentsAction); } protected void fillMenuBar(IMenuManager menuBar) { @@ -78,6 +84,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { // Help MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP); + helpMenu.add(helpContentsAction); helpMenu.add(aboutAction); menuBar.add(fileMenu); 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 4ec1f586..c37bcd76 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 @@ -78,7 +78,7 @@ public class ClusterSummaryView extends ViewPart { if (cluster == null) { cluster = model.getCluster(); } - + setPartName("Summary"); createSections(parent); } @@ -127,6 +127,10 @@ public class ClusterSummaryView extends ViewPart { private void createDiskSpaceSection() { Composite section = guiHelper.createSection(form, toolkit, "Disk Space", null, 3, false); + if (cluster.getServers().size() == 0) { + toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud."); + return; + } double totalDiskSpace = cluster.getTotalDiskSpace(); double diskSpaceInUse = cluster.getDiskSpaceInUse(); @@ -241,6 +245,7 @@ public class ClusterSummaryView extends ViewPart { createServersSection(); createDiskSpaceSection(); createCPUUsageSection(); + createNetworkUsageSection(); //createMemoryUsageSection(); createActionsSection(); createAlertsSection(); @@ -256,9 +261,18 @@ public class ClusterSummaryView extends ViewPart { private void createCPUUsageSection() { Composite section = guiHelper.createSection(form, toolkit, "CPU Usage (aggregated)", null, 1, false); + if (cluster.getServers().size() == 0) { + toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud."); + return; + } toolkit.createLabel(section, "Historical CPU Usage graph aggregated across all servers will be displayed here."); } + private void createNetworkUsageSection() { + Composite section = guiHelper.createSection(form, toolkit, "Network Usage", null, 1, false); + toolkit.createLabel(section, "Historical Network Usage graph will be displayed here."); + } + private void createRunningTasksSection() { Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java index 87ad17d6..d43cab15 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java @@ -68,6 +68,7 @@ public class GlusterServerSummaryView extends ViewPart { if (server == null) { server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class); } + setPartName("Summary"); createSections(parent); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java index bb9114b3..080ebace 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java @@ -54,7 +54,7 @@ public class GlusterServersSummaryView extends ViewPart { if (servers == null) { servers = (EntityGroup)guiHelper.getSelectedEntity(getSite(), EntityGroup.class); } - + setPartName("Summary"); createSections(parent); } @@ -62,12 +62,11 @@ public class GlusterServersSummaryView extends ViewPart { * @param parent */ private void createSections(Composite parent) { - form = guiHelper.setupForm(parent, toolkit, "Volumes - Summary"); + form = guiHelper.setupForm(parent, toolkit, "Servers - Summary"); createSummarySection(); createRunningTasksSection(); createAlertsSection(); - parent.layout(); // IMP: lays out the form properly } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java index 1c9577ac..3c633bf4 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java @@ -64,6 +64,7 @@ public class VolumeSummaryView extends ViewPart { } this.parent = parent; + setPartName("Summary"); createSections(); // Refresh the navigation tree whenever there is a change to the data model 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 2b9d7178..bc136b61 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 @@ -72,7 +72,7 @@ public class VolumesSummaryView extends ViewPart { volumes = (EntityGroup) selectedObj; } } - + setPartName("Summary"); createSections(parent); } -- cgit