# HG changeset patch # User sergey # Date 1400074102 -14400 # Node ID 7d92a42f8e186244c17bc5cd8e9f4725932b2f89 # Parent fa7a99c2d079bc2d86b05c96927a79513c1c1772 improved doxygen library diff -r fa7a99c2d079 -r 7d92a42f8e18 deploy.pl --- a/deploy.pl Wed May 14 01:22:21 2014 +0400 +++ b/deploy.pl Wed May 14 17:28:22 2014 +0400 @@ -2,7 +2,6 @@ use strict; use lib '.'; use config; -use config::bootstrap; use IMPL::require { DoxModel => 'Benzin::Doxygen::Model' }; diff -r fa7a99c2d079 -r 7d92a42f8e18 public_html/static/css/global.css --- a/public_html/static/css/global.css Wed May 14 01:22:21 2014 +0400 +++ b/public_html/static/css/global.css Wed May 14 17:28:22 2014 +0400 @@ -4,6 +4,12 @@ padding: 0; } +a { + transition: all 0.5s; + color: inherit; + font-weight: bold; +} + .block { display: block; } @@ -12,6 +18,23 @@ text-align: center; } +/********************************* MENUS **************************************/ + +ul.menu-bar { + padding: 0; + margin: 0; + list-style: none; +} + +ul.menu-bar li { + display: inline-block; + line-height: 100%; +} + +.menu-bar a { + +} + /********************************* TABLES *************************************/ table.pretty-table diff -r fa7a99c2d079 -r 7d92a42f8e18 schemas/doxygen/compound.xsd --- a/schemas/doxygen/compound.xsd Wed May 14 01:22:21 2014 +0400 +++ b/schemas/doxygen/compound.xsd Wed May 14 17:28:22 2014 +0400 @@ -214,6 +214,7 @@ + diff -r fa7a99c2d079 -r 7d92a42f8e18 shared_view/layout/default.tt --- a/shared_view/layout/default.tt Wed May 14 01:22:21 2014 +0400 +++ b/shared_view/layout/default.tt Wed May 14 17:28:22 2014 +0400 @@ -3,6 +3,8 @@ document.scripts = []; document.meta = []; document.class = []; + document.postRender = []; + render('init',model = model); %] [% BLOCK PAGE_LAYOUT %] @@ -13,7 +15,7 @@ [% END %] [% FOREACH item IN document.scripts +%] - [% END %] @@ -32,5 +34,8 @@ [% WRAPPER PAGE_LAYOUT; WRAPPER CONTENT_LAYOUT; content; - END; + END; + FOREACH item IN document.postRender; + render(item, model = model); + END; END %] diff -r fa7a99c2d079 -r 7d92a42f8e18 shared_view/layout/init.tt diff -r fa7a99c2d079 -r 7d92a42f8e18 view/layout/default/library.tt --- a/view/layout/default/library.tt Wed May 14 01:22:21 2014 +0400 +++ b/view/layout/default/library.tt Wed May 14 17:28:22 2014 +0400 @@ -2,7 +2,8 @@ labels( CollectionTitle = "Home (%name%)" ); - document.css.push(css.global); + document.postRender.push('dojo'); + document.css.push(css.library); CollectionClass = 'Benzin::Doxygen::Model::Collection'; @@ -53,6 +54,7 @@ [% END %] [% END %] +[% BLOCK LAYOUT %]
\ No newline at end of file +
+[% END %] +[% WRAPPER LAYOUT; + render('base', content = content); +END %] \ No newline at end of file diff -r fa7a99c2d079 -r 7d92a42f8e18 view/layout/dojo.tt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/view/layout/dojo.tt Wed May 14 17:28:22 2014 +0400 @@ -0,0 +1,15 @@ +[% + modules = document.dojo.modules.unique; + style = document.dojo.style || 'tundra'; + dojo.js = cdn.dojo.SetView('js').dojo.dojo; + dijit.css = cdn.dojo.dijit.themes.${style}.${style}.SetView('css'); + dojo.css = cdn.dojo.dojo.resources.dojo.SetView('css'); + + document.css.push(dojo.css); + document.css.push(dijit.css); + document.scripts.push({ text = 'dojoConfig = ' _ toJSON(document.dojo.config) _ ';' }); + document.scripts.push({ src = dojo.js }); + IF modules.size; + document.scripts.push({ text = "require(" _ toJSON(modules) _ ");"}); + END; +%] \ No newline at end of file diff -r fa7a99c2d079 -r 7d92a42f8e18 view/layout/init.tt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/view/layout/init.tt Wed May 14 17:28:22 2014 +0400 @@ -0,0 +1,12 @@ +[% + document.dojo = { + modules = [], + config = { + parseOnLoad = 1, + async = 1, + packages = [ + {name = 'implab', location = app.location.static.js.implab.toString()} + ] + } + }; +%] \ No newline at end of file diff -r fa7a99c2d079 -r 7d92a42f8e18 view/site/library/@Collection.tt --- a/view/site/library/@Collection.tt Wed May 14 01:22:21 2014 +0400 +++ b/view/site/library/@Collection.tt Wed May 14 17:28:22 2014 +0400 @@ -2,13 +2,12 @@ document.layout = 'library'; compounds = resource.GetCompoundsLocation(); IF model.indexDocument; - display_model( - model.indexDocument, - args = { - compounds = compounds.toString(), - members = resource.GetMembersLocation().toString() - } - ); + args = { + compounds = compounds.toString(), + members = resource.GetMembersLocation().toString() + } + T = import('Benzin::Doxygen::DisplayTransform'); + T.instance.DisplayCompound(model.indexDocument, args ); ELSE; %]

$model.description

diff -r fa7a99c2d079 -r 7d92a42f8e18 view/templates/Collection.tt diff -r fa7a99c2d079 -r 7d92a42f8e18 view/templates/Compound.tt diff -r fa7a99c2d079 -r 7d92a42f8e18 view/templates/Library.tt diff -r fa7a99c2d079 -r 7d92a42f8e18 view/templates/Member.tt