[checkmk-commits] Check_MK Git: check_mk: ValueSpec dict: new oneline rendering-mode

Module: check_mk Branch: master Commit: d74031c0fca54b0eb30e4b7f8cd63eec7f37a246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d74031c0fca54b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sat Jan 5 15:15:47 2013 +0100 ValueSpec dict: new oneline rendering-mode --- web/htdocs/check_mk.css | 5 +++++ web/htdocs/status.css | 4 ++++ web/htdocs/valuespec.py | 21 +++++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9562b41..1d03130 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -359,6 +359,11 @@ div.warning a { table.dictionary { } +table.dictionary b.header { + font-size: 80%; + font-weight: normal; +} + table.dictionary td.dictright { white-space: nowrap; padding: 0px; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index b6ab766..ed94ca2 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -296,6 +296,10 @@ table.data td.number { text-align: right; } +table.data td.nobr { + white-space: nowrap; +} + td.narrow { width: 10px; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 43b7f83..030b553 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1781,7 +1781,7 @@ class Dictionary(ValueSpec): self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() self._form_narrow = kwargs.get("form_narrow", False) # used if render == "form" - self._headers = kwargs.get("headers") + self._headers = kwargs.get("headers") # "sup" -> small headers in online mode def _get_elements(self): if type(self._elements) == list: @@ -1798,8 +1798,11 @@ class Dictionary(ValueSpec): self.render_input_normal(varprefix, value, self._render == "oneline") def render_input_normal(self, varprefix, value, oneline = False): - if not oneline: + headers_sup = oneline and self._headers == "sup" + if headers_sup or not oneline: html.write("<table class=dictionary>") + if headers_sup: + html.write('<tr>') for param, vs in self._get_elements(): if not oneline: html.write('<tr><td class=dictleft>') @@ -1815,9 +1818,14 @@ class Dictionary(ValueSpec): else: visible = True if vs.title(): + if headers_sup: + html.write('<td><b class=header>') html.write(" %s" % vs.title()) - if oneline: - html.write(": ") + if oneline: + if self._headers == "sup": + html.write('</b><br>') + else: + html.write(": ") if self._columns == 2: if vs.title(): @@ -1843,8 +1851,13 @@ class Dictionary(ValueSpec): html.write("</div>") if not oneline: html.write("</td></tr>") + elif headers_sup: + html.write("</td>") + if not oneline: html.write("</table>") + elif oneline and self._headers == "sup": + html.write('</tr></table>') def render_input_form(self, varprefix, value): if self._headers: