Re: [Kimchi-devel] [PATCH v3] Display version/build number in UI

Add a new "About" menu choice to allow the user access to the kimchi version and build number. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com&gt; --- ui/css/theme-default/about.css | 21 +++++++++++++++++++++ ui/css/theme-default/topbar.css | 1 + ui/images/theme-default/logo-plain.gif | Bin 0 -> 1601 bytes ui/js/src/kimchi.main.js | 4 ++++ ui/pages/kimchi-ui.html.tmpl | 27 +++++++++++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 ui/css/theme-default/about.css create mode 100644 ui/images/theme-default/logo-plain.gif diff --git a/ui/css/theme-default/about.css b/ui/css/theme-default/about.css new file mode 100644 index 0000000..577b403 --- /dev/null +++ b/ui/css/theme-default/about.css @@ -0,0 +1,21 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2014 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.about-window { + width: 350px; + height: 300px; +} diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 7180cd5..aed4f3f 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -155,6 +155,7 @@ color: black; padding: 12px 18px; white-space: nowrap; + line-height: 12px; } .user-menu-item { diff --git a/ui/images/theme-default/logo-plain.gif b/ui/images/theme-default/logo-plain.gif new file mode 100644 index 0000000000000000000000000000000000000000..4fd30d56db7951bb3efda43ea250d6335a49e40a GIT binary patch literal 1601 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 literal 0 HcmV?d00001 diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index ef64bf8..018f5e7 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -204,6 +204,10 @@ kimchi.main = function() { kimchi.message.error(err.responseJSON.reason); }); }); + $('#btn-about').on('click', function(event) { + kimchi.window.open({"content": $('#about-tmpl').html()}); + event.preventDefault(); + }); $('#btn-help').on('click', kimchi.getHelp); }; diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index eb3cd9d..08b27a8 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -21,6 +21,7 @@ #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) #silent _ = t.gettext #silent _t = t.gettext +#from kimchi.config import get_version <!DOCTYPE html> <html lang="$lang.lang[0]"> <head> @@ -77,6 +78,9 @@ <div class="action-panel popover right-side"> <a id="btn-help" class="user-menu-item" href="javascript:void(0);">$_("Help")</a> <br/> + <br/> + <a id="btn-about" class="user-menu-item" href="javascript:void(0);">$_("About")</a> + <br/> <hr/> <a id="btn-logout" class="user-menu-item" href="javascript: void(0);">$_("Log out")</a> </div> @@ -101,5 +105,28 @@ <p><code>make</code></p> </div> </div> + +<script id="about-tmpl" type="kimchi/template"> + <div class="window about-window"> + <header> + <h1 class="title"><img alt="Kimchi logo" src="/images/logo.ico"/> $_("About")</h1> + <div class="close">X</div> + </header> + <div class="content" align="center"> + <center> + <div> + <br/> + <br/> + <img src="/images/theme-default/logo-plain.gif"/> + <br/> + <br/> + <h2>Kimchi</h2> + <p>$_("Version:") $get_version()</p> + </div> + </center> + </div> + </div> +</script> + </body> </html>