diff --git a/DocApplication/head.skin b/DocApplication/head.skin index 1bd8e6a2..56c9c797 100644 --- a/DocApplication/head.skin +++ b/DocApplication/head.skin @@ -1,6 +1,6 @@ -

AppDoc <% this.name %> -
- -> +

AppDoc <% this.name %>

+

<% param.path %>

+

-> AppManager | ">public

diff --git a/DocApplication/macros.js b/DocApplication/macros.js index a18e1142..beb71311 100644 --- a/DocApplication/macros.js +++ b/DocApplication/macros.js @@ -18,6 +18,24 @@ function href_macro(par) { } +/** + * macro rendering page head + */ +function head_macro(par) { + var obj = new Object(); + obj.path = this.getPath(); + this.renderSkin("head",obj); +} + + +/** + * utility function for head_macro, rendering link to app + */ +function getPath() { + return( '' + this.name + '' ); +} + + /** * link to the "real" application object (ie not the DocApplication) */ diff --git a/DocApplication/main.skin b/DocApplication/main.skin index 2a8c5681..72cbefc0 100644 --- a/DocApplication/main.skin +++ b/DocApplication/main.skin @@ -1,4 +1,4 @@ -<% this.skin name="head" %> +<% this.head %> diff --git a/DocFunction/macros.js b/DocFunction/macros.js index 2f58e1ce..ced4f0e9 100644 --- a/DocFunction/macros.js +++ b/DocFunction/macros.js @@ -18,6 +18,27 @@ function href_macro(par) { } +/** + * macro rendering page head + */ +function head_macro(par) { + var obj = new Object(); + obj.path = this.getPath(); + var appObj = this.getApplication(); + appObj.renderSkin("head",obj); +} + + +/** + * utility function for head_macro, rendering link to app and to prototype + */ +function getPath() { + var protoObj = this.getDocPrototype(); + var str = protoObj.getPath() + "/" + this.getFullName(); + return( str ); +} + + /** * macro returning name of file this method resides in */ diff --git a/DocFunction/main.skin b/DocFunction/main.skin index 29a7bc8f..26420fb2 100644 --- a/DocFunction/main.skin +++ b/DocFunction/main.skin @@ -1,9 +1,4 @@ - - -

- ">Prototype <% docprototype.name %>
- <% this.fullname %> -

+<% this.head %>
in <% docprototype.name%>/<% this.location %>: diff --git a/DocPrototype/macros.js b/DocPrototype/macros.js index 3db36027..4334e1bf 100644 --- a/DocPrototype/macros.js +++ b/DocPrototype/macros.js @@ -18,6 +18,28 @@ function href_macro(par) { } +/** + * macro rendering page head + */ +function head_macro(par) { + var obj = new Object(); + obj.path = this.getPath(); + var appObj = this.getApplication(); + appObj.renderSkin("head",obj); +} + + +/** + * utility function for head_macro, rendering link to app and to prototype + */ +function getPath() { + var appObj = this.getApplication(); + var str = appObj.getPath(); + str += '/' + this.name + ''; + return( str ); +} + + /** * macro returning the comment for this prototype */ diff --git a/DocPrototype/main.skin b/DocPrototype/main.skin index 71821440..20cc8ec5 100644 --- a/DocPrototype/main.skin +++ b/DocPrototype/main.skin @@ -1,5 +1,4 @@ - -

Prototype <% this.name %>

+<% this.head %> <% this.actions %> <% this.skins %>