From 1ea4f6d275095efa556a3a5807e4ecf3b5911d64 Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Mon, 30 Mar 2015 02:33:39 +0200 Subject: [PATCH] baculum: Jobs working refresh in realtime and add new tray bar --- .../protected/JavaScript/slide-window.js | 4 ++ gui/baculum/protected/Lang/en/messages.mo | Bin 26660 -> 26774 bytes gui/baculum/protected/Lang/en/messages.po | 7 +++ gui/baculum/protected/Lang/pl/messages.mo | Bin 28755 -> 28882 bytes gui/baculum/protected/Lang/pl/messages.po | 6 +++ gui/baculum/protected/Pages/Home.page | 2 + gui/baculum/protected/Pages/Monitor.php | 40 ++++++++++++++++++ gui/baculum/protected/Pages/config.xml | 2 +- .../protected/Portlets/JobConfiguration.php | 12 +++++- .../protected/Portlets/JobConfiguration.tpl | 37 +++++++++++++--- gui/baculum/protected/Portlets/JobList.tpl | 1 + .../Portlets/JobRunConfiguration.tpl | 2 +- gui/baculum/protected/Portlets/TrayBar.php | 25 +++++++++++ gui/baculum/protected/Portlets/TrayBar.tpl | 32 ++++++++++++++ gui/baculum/protected/application.xml | 1 + gui/baculum/themes/Baculum-v1/check-icon.png | Bin 0 -> 911 bytes .../themes/Baculum-v1/gearwheel-icon.png | Bin 0 -> 1830 bytes gui/baculum/themes/Baculum-v1/style.css | 16 ++++++- 18 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 gui/baculum/protected/Pages/Monitor.php create mode 100644 gui/baculum/protected/Portlets/TrayBar.php create mode 100644 gui/baculum/protected/Portlets/TrayBar.tpl create mode 100644 gui/baculum/themes/Baculum-v1/check-icon.png create mode 100644 gui/baculum/themes/Baculum-v1/gearwheel-icon.png diff --git a/gui/baculum/protected/JavaScript/slide-window.js b/gui/baculum/protected/JavaScript/slide-window.js index 9e3f499f87..44e1545828 100644 --- a/gui/baculum/protected/JavaScript/slide-window.js +++ b/gui/baculum/protected/JavaScript/slide-window.js @@ -138,6 +138,10 @@ var SlideWindowClass = Class.create({ }.bind(this) }); }, + + isWindowOpen: function() { + return !(this.window.style.display === 'none'); + }, resetSize : function() { if(this.isConfigurationOpen()) { diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo index 5b75739980b5aaad03e2be27292fb2e34ecab2d3..6bf2bb9bfb3f8fefb8e70eb3e12abbcf62138142 100644 GIT binary patch delta 7322 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 delta 7208 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 H8U+6bSsd<5 diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po index a2457c4895..22242be45d 100644 --- a/gui/baculum/protected/Lang/en/messages.po +++ b/gui/baculum/protected/Lang/en/messages.po @@ -1003,3 +1003,10 @@ msgstr "Verify by JobId" msgid "Verify option:" msgstr "Verify option:" + +msgid "Running jobs:" +msgstr "Running jobs:" + +msgid "Finished jobs:" +msgstr "Finished jobs:" + diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo index f05d48bc1e07b6ed7189fb3aa96334fabe209bcf..417ecba3fa3ba78d2888d7dfc2863eba3c75e3f8 100644 GIT binary patch delta 7323 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 delta 7198 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 diff --git a/gui/baculum/protected/Lang/pl/messages.po b/gui/baculum/protected/Lang/pl/messages.po index b0d5575c49..9cccbab7d3 100644 --- a/gui/baculum/protected/Lang/pl/messages.po +++ b/gui/baculum/protected/Lang/pl/messages.po @@ -1005,3 +1005,9 @@ msgstr "Weryfikuj na podstawie JobId" msgid "Verify option:" msgstr "Opcja weryfikacji:" +msgid "Running jobs:" +msgstr "Uruchomione zadania:" + +msgid "Finished jobs:" +msgstr "Zakończone zadania:" + diff --git a/gui/baculum/protected/Pages/Home.page b/gui/baculum/protected/Pages/Home.page index 6660973a4f..75341c00e8 100644 --- a/gui/baculum/protected/Pages/Home.page +++ b/gui/baculum/protected/Pages/Home.page @@ -9,6 +9,7 @@ +
@@ -126,8 +132,27 @@ - +
+ + +
<%[ Console status ]%>
diff --git a/gui/baculum/protected/Portlets/JobList.tpl b/gui/baculum/protected/Portlets/JobList.tpl index d7ccc5dd7d..7e20d226e9 100644 --- a/gui/baculum/protected/Portlets/JobList.tpl +++ b/gui/baculum/protected/Portlets/JobList.tpl @@ -65,6 +65,7 @@ ConfigurationWindow.getObj('JobWindow').show(); ConfigurationWindow.getObj('JobWindow').progress(false); + status_callback_func(); diff --git a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl index e0500c994d..44e948a155 100644 --- a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl +++ b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl @@ -133,7 +133,7 @@
- + diff --git a/gui/baculum/protected/Portlets/TrayBar.php b/gui/baculum/protected/Portlets/TrayBar.php new file mode 100644 index 0000000000..8a19981c92 --- /dev/null +++ b/gui/baculum/protected/Portlets/TrayBar.php @@ -0,0 +1,25 @@ + + + <%[ Running jobs: ]%> <%[ Running jobs: ]%> + <%[ Finished jobs: ]%> <%[ Finished jobs: ]%> +
+ diff --git a/gui/baculum/protected/application.xml b/gui/baculum/protected/application.xml index bf154c9bd4..d6438c8e46 100644 --- a/gui/baculum/protected/application.xml +++ b/gui/baculum/protected/application.xml @@ -14,6 +14,7 @@ + diff --git a/gui/baculum/themes/Baculum-v1/check-icon.png b/gui/baculum/themes/Baculum-v1/check-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..004d3b5b1bdf66b346ba892f0b0e3bcf00631fd0 GIT binary patch literal 911 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