From e9b1b7a8ab2f76e8be13c65f8bae7628b6a9d473 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Mon, 24 Apr 2017 19:22:50 +0900 Subject: [PATCH] [TIC-Core] __EXPAND__ support for category tabs. Add spaces for linked blocks 1. __EXPAND__ support for category tabs. (TIC-Web patches will follow soon) 2. Add two spaces in the text for linked blocks. Added tooltips for them as well. Change-Id: Ib75ae2aff92625f1f9e75e4df8e71082ec9992f0 Signed-off-by: MyungJoo Ham --- tic/parser/view_parser.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tic/parser/view_parser.py b/tic/parser/view_parser.py index c227622..5bff01b 100644 --- a/tic/parser/view_parser.py +++ b/tic/parser/view_parser.py @@ -92,7 +92,7 @@ def make_view_data(pkg_group): def make_meta_node(pkgname, viewtext): return dict(text=viewtext, metaname=pkgname, nodes=[]) def make_linked_meta_node(pkgname, viewtext, cat): - return dict(text=''+viewtext+'', metaname=pkgname, nodes=[], category=cat) + return dict(text='  '+viewtext+'', metaname=pkgname, nodes=[], category=cat, tooltip="This is a link of a building block.") def is_blank_ui_meta_node(pkgname): return (pkgname[-8:-2] == '__UI__') def handle_ui_meta_node(tag, node): @@ -151,11 +151,16 @@ def make_view_data(pkg_group): return node ksURL += m.group(0) node['tooltip'] = 'Image base from '+ksURL + node['icon'] = 'glyphicon glyphicon-list-alt' node['ks'] = ksURL elif desc[0:10] == '__EXPAND__': # Omit the first line with __EXPAND__ from showing. pkg_info['description'] = desc[len(desc.splitlines(True)[0]):] - node['state'] = { 'expanded': True } + option = desc.splitlines()[0][10:].strip(': \t') + if len(option) == 0: + node['expandcondition'] = 'all' + else: + node['expandcondition'] = option return node # view_data for tree view on web-ui -- 2.7.4