nitdoc: Replace old nitdoc by nitdoc_ni
authorAlexandre Terrasa <alexandre@moz-code.org>
Wed, 6 Nov 2013 00:55:27 +0000 (19:55 -0500)
committerAlexandre Terrasa <alexandre@moz-code.org>
Wed, 6 Nov 2013 00:55:27 +0000 (19:55 -0500)
Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

50 files changed:
Makefile
share/ni_nitdoc/resources/icons/const_private.png [deleted file]
share/ni_nitdoc/resources/icons/const_protected.png [deleted file]
share/ni_nitdoc/resources/icons/const_public.png [deleted file]
share/ni_nitdoc/resources/icons/github-icon.png [deleted file]
share/ni_nitdoc/resources/icons/meth_private.png [deleted file]
share/ni_nitdoc/resources/icons/meth_protected.png [deleted file]
share/ni_nitdoc/resources/icons/meth_public.png [deleted file]
share/ni_nitdoc/resources/icons/vtype_private.png [deleted file]
share/ni_nitdoc/resources/icons/vtype_protected.png [deleted file]
share/ni_nitdoc/resources/icons/vtype_public.png [deleted file]
share/ni_nitdoc/scripts/jquery-1.7.1.min.js [deleted file]
share/ni_nitdoc/styles/main.css [deleted file]
share/nitdoc/ZeroClipboard.swf [moved from share/ni_nitdoc/ZeroClipboard.swf with 100% similarity]
share/nitdoc/help.html [deleted file]
share/nitdoc/resources/icons/close.png [deleted file]
share/nitdoc/resources/icons/const_private.png
share/nitdoc/resources/icons/const_protected.png
share/nitdoc/resources/icons/const_public.png
share/nitdoc/resources/icons/copy.png [moved from share/ni_nitdoc/resources/icons/copy.png with 100% similarity]
share/nitdoc/resources/icons/github-icon-green.png [moved from share/ni_nitdoc/resources/icons/github-icon-green.png with 100% similarity]
share/nitdoc/resources/icons/github-icon-w.png [deleted file]
share/nitdoc/resources/icons/github-icon-white.png [moved from share/ni_nitdoc/resources/icons/github-icon-white.png with 100% similarity]
share/nitdoc/resources/icons/meth_private.png
share/nitdoc/resources/icons/meth_protected.png
share/nitdoc/resources/icons/meth_public.png
share/nitdoc/resources/icons/vtype_private.png
share/nitdoc/resources/icons/vtype_protected.png
share/nitdoc/resources/icons/vtype_public.png
share/nitdoc/resources/top_back.gif [deleted file]
share/nitdoc/scripts/Markdown.Converter.js [moved from share/ni_nitdoc/scripts/Markdown.Converter.js with 100% similarity]
share/nitdoc/scripts/Nitdoc.GitHub.js [moved from share/ni_nitdoc/scripts/Nitdoc.GitHub.js with 90% similarity]
share/nitdoc/scripts/Nitdoc.QuickSearch.js [moved from share/ni_nitdoc/scripts/Nitdoc.QuickSearch.js with 100% similarity]
share/nitdoc/scripts/Nitdoc.UI.js [moved from share/ni_nitdoc/scripts/Nitdoc.UI.js with 75% similarity]
share/nitdoc/scripts/ZeroClipboard.min.js [moved from share/ni_nitdoc/scripts/ZeroClipboard.min.js with 100% similarity]
share/nitdoc/scripts/base64.js [moved from share/ni_nitdoc/scripts/base64.js with 100% similarity]
share/nitdoc/scripts/js-facilities.js [deleted file]
share/nitdoc/styles/Nitdoc.GitHub.css [moved from share/ni_nitdoc/styles/Nitdoc.GitHub.css with 100% similarity]
share/nitdoc/styles/Nitdoc.QuickSearch.css [moved from share/ni_nitdoc/styles/Nitdoc.QuickSearch.css with 100% similarity]
share/nitdoc/styles/Nitdoc.UI.css [moved from share/ni_nitdoc/styles/Nitdoc.UI.css with 91% similarity]
share/nitdoc/styles/main.css
src/Makefile
src/ni_nitdoc.nit [deleted file]
src/nitdoc.nit
tests/ni_nitdoc.args [deleted file]
tests/nitdoc.args
tests/sav/nitdoc.res
tests/sav/nitdoc.sav
tests/sav/nitdoc_args1.sav
tests/testfull.sh

index ac55776..068fa2f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,6 @@ doc/stdlib/index.html: bin/nitdoc
                --custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
                --custom-overview-text "<p>Documentation for the standard library of Nit<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
                --custom-footer-text "Nit standard library. Version $$(git describe)." \
-               --github nit \
                --source "https://github.com/privat/nit/blob/$$(git show --format="%H" | head -1)/%f#L%l-%L"
 
 doc/nitc/index.html: bin/nitdoc
@@ -45,16 +44,17 @@ doc/nitc/index.html: bin/nitdoc
                --custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
                --custom-overview-text "<p>Documentation for the Nit compiler and tools<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
                --custom-footer-text "Nit compiler. Version $$(git describe)." \
-               --github nit \
                --source "https://github.com/privat/nit/blob/$$(git show --format="%H" | head -1)/%f#L%l-%L"
 
 doc/newmodel/index.html: bin/nitdoc
-       bin/nitdox src/nit.nit src/nitmetrics.nit src/nitg.nit src/nitx.nit src/nitunit.nit src/nitlight.nit src/ni_nitdoc.nit src/dbgcli.nit src/netdbg.nit -d doc/newmodel \
+       bin/nitdoc src/nit.nit src/nitmetrics.nit src/nitg.nit src/nitx.nit src/nitunit.nit src/nitlight.nit src/dbgcli.nit src/netdbg.nit -d doc/newmodel \
                --custom-title "Nit New Model" \
                --custom-menu-items "<li><a href=\"http://nitlanguage.org/\">Nitlanguage.org</a></li>" \
                --custom-overview-text "<p>Documentation for the Nit tools based on the new metamodel<br/>Version $$(git describe)<br/>Date: $$(git show --format="%cd" | head -1)</p>" \
                --custom-footer-text "Nit new metamodel. Version $$(git describe)." \
-               --github-origin "privat:nit:master" \
+               --github-upstream "privat:nit:master" \
+               --github-base-sha1 "$$(git show | head -1 | cut -c8-)" \
+               --github-gitdir "." \
                --source "https://github.com/privat/nit/blob/$$(git show --format="%H" | head -1)/%f#L%l-%L"
 
 clean:
diff --git a/share/ni_nitdoc/resources/icons/const_private.png b/share/ni_nitdoc/resources/icons/const_private.png
deleted file mode 100644 (file)
index 53def84..0000000
Binary files a/share/ni_nitdoc/resources/icons/const_private.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/const_protected.png b/share/ni_nitdoc/resources/icons/const_protected.png
deleted file mode 100644 (file)
index 99530e3..0000000
Binary files a/share/ni_nitdoc/resources/icons/const_protected.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/const_public.png b/share/ni_nitdoc/resources/icons/const_public.png
deleted file mode 100644 (file)
index 393f130..0000000
Binary files a/share/ni_nitdoc/resources/icons/const_public.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/github-icon.png b/share/ni_nitdoc/resources/icons/github-icon.png
deleted file mode 100644 (file)
index 8b25551..0000000
Binary files a/share/ni_nitdoc/resources/icons/github-icon.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/meth_private.png b/share/ni_nitdoc/resources/icons/meth_private.png
deleted file mode 100644 (file)
index 0217515..0000000
Binary files a/share/ni_nitdoc/resources/icons/meth_private.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/meth_protected.png b/share/ni_nitdoc/resources/icons/meth_protected.png
deleted file mode 100644 (file)
index eb20e7c..0000000
Binary files a/share/ni_nitdoc/resources/icons/meth_protected.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/meth_public.png b/share/ni_nitdoc/resources/icons/meth_public.png
deleted file mode 100644 (file)
index e5906ee..0000000
Binary files a/share/ni_nitdoc/resources/icons/meth_public.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/vtype_private.png b/share/ni_nitdoc/resources/icons/vtype_private.png
deleted file mode 100644 (file)
index b526812..0000000
Binary files a/share/ni_nitdoc/resources/icons/vtype_private.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/vtype_protected.png b/share/ni_nitdoc/resources/icons/vtype_protected.png
deleted file mode 100644 (file)
index f3515e7..0000000
Binary files a/share/ni_nitdoc/resources/icons/vtype_protected.png and /dev/null differ
diff --git a/share/ni_nitdoc/resources/icons/vtype_public.png b/share/ni_nitdoc/resources/icons/vtype_public.png
deleted file mode 100644 (file)
index a70354d..0000000
Binary files a/share/ni_nitdoc/resources/icons/vtype_public.png and /dev/null differ
diff --git a/share/ni_nitdoc/scripts/jquery-1.7.1.min.js b/share/ni_nitdoc/scripts/jquery-1.7.1.min.js
deleted file mode 100644 (file)
index 75eeb51..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
-f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
-!function(t,e,i){var o=["webkit","Moz","ms","O"],r={},n;function a(t,i){var o=e.createElement(t||"div"),r;for(r in i)o[r]=i[r];return o}function s(t){for(var e=1,i=arguments.length;e<i;e++)t.appendChild(arguments[e]);return t}var f=function(){var t=a("style",{type:"text/css"});s(e.getElementsByTagName("head")[0],t);return t.sheet||t.styleSheet}();function l(t,e,i,o){var a=["opacity",e,~~(t*100),i,o].join("-"),s=.01+i/o*100,l=Math.max(1-(1-t)/e*(100-s),t),p=n.substring(0,n.indexOf("Animation")).toLowerCase(),u=p&&"-"+p+"-"||"";if(!r[a]){f.insertRule("@"+u+"keyframes "+a+"{"+"0%{opacity:"+l+"}"+s+"%{opacity:"+t+"}"+(s+.01)+"%{opacity:1}"+(s+e)%100+"%{opacity:"+t+"}"+"100%{opacity:"+l+"}"+"}",f.cssRules.length);r[a]=1}return a}function p(t,e){var r=t.style,n,a;if(r[e]!==i)return e;e=e.charAt(0).toUpperCase()+e.slice(1);for(a=0;a<o.length;a++){n=o[a]+e;if(r[n]!==i)return n}}function u(t,e){for(var i in e)t.style[p(t,i)||i]=e[i];return t}function c(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var r in o)if(t[r]===i)t[r]=o[r]}return t}function d(t){var e={x:t.offsetLeft,y:t.offsetTop};while(t=t.offsetParent)e.x+=t.offsetLeft,e.y+=t.offsetTop;return e}var h={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",speed:1,trail:100,opacity:1/4,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto",position:"relative"};function m(t){if(!this.spin)return new m(t);this.opts=c(t||{},m.defaults,h)}m.defaults={};c(m.prototype,{spin:function(t){this.stop();var e=this,i=e.opts,o=e.el=u(a(0,{className:i.className}),{position:i.position,width:0,zIndex:i.zIndex}),r=i.radius+i.length+i.width,s,f;if(t){t.insertBefore(o,t.firstChild||null);f=d(t);s=d(o);u(o,{left:(i.left=="auto"?f.x-s.x+(t.offsetWidth>>1):parseInt(i.left,10)+r)+"px",top:(i.top=="auto"?f.y-s.y+(t.offsetHeight>>1):parseInt(i.top,10)+r)+"px"})}o.setAttribute("aria-role","progressbar");e.lines(o,e.opts);if(!n){var l=0,p=i.fps,c=p/i.speed,h=(1-i.opacity)/(c*i.trail/100),m=c/i.lines;(function y(){l++;for(var t=i.lines;t;t--){var r=Math.max(1-(l+t*m)%c*h,i.opacity);e.opacity(o,i.lines-t,r,i)}e.timeout=e.el&&setTimeout(y,~~(1e3/p))})()}return e},stop:function(){var t=this.el;if(t){clearTimeout(this.timeout);if(t.parentNode)t.parentNode.removeChild(t);this.el=i}return this},lines:function(t,e){var i=0,o;function r(t,o){return u(a(),{position:"absolute",width:e.length+e.width+"px",height:e.width+"px",background:t,boxShadow:o,transformOrigin:"left",transform:"rotate("+~~(360/e.lines*i+e.rotate)+"deg) translate("+e.radius+"px"+",0)",borderRadius:(e.corners*e.width>>1)+"px"})}for(;i<e.lines;i++){o=u(a(),{position:"absolute",top:1+~(e.width/2)+"px",transform:e.hwaccel?"translate3d(0,0,0)":"",opacity:e.opacity,animation:n&&l(e.opacity,e.trail,i,e.lines)+" "+1/e.speed+"s linear infinite"});if(e.shadow)s(o,u(r("#000","0 0 4px "+"#000"),{top:2+"px"}));s(t,s(o,r(e.color,"0 0 1px rgba(0,0,0,.1)")))}return t},opacity:function(t,e,i){if(e<t.childNodes.length)t.childNodes[e].style.opacity=i}});(function(){function t(t,e){return a("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',e)}var e=u(a("group"),{behavior:"url(#default#VML)"});if(!p(e,"transform")&&e.adj){f.addRule(".spin-vml","behavior:url(#default#VML)");m.prototype.lines=function(e,i){var o=i.length+i.width,r=2*o;function n(){return u(t("group",{coordsize:r+" "+r,coordorigin:-o+" "+-o}),{width:r,height:r})}var a=-(i.width+i.length)*2+"px",f=u(n(),{position:"absolute",top:a,left:a}),l;function p(e,r,a){s(f,s(u(n(),{rotation:360/i.lines*e+"deg",left:~~r}),s(u(t("roundrect",{arcsize:i.corners}),{width:o,height:i.width,left:i.radius,top:-i.width>>1,filter:a}),t("fill",{color:i.color,opacity:i.opacity}),t("stroke",{opacity:0}))))}if(i.shadow)for(l=1;l<=i.lines;l++)p(l,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(l=1;l<=i.lines;l++)p(l);return s(e,f)};m.prototype.opacity=function(t,e,i,o){var r=t.firstChild;o=o.shadow&&o.lines||0;if(r&&e+o<r.childNodes.length){r=r.childNodes[e+o];r=r&&r.firstChild;r=r&&r.firstChild;if(r)r.opacity=i}}}else n=p(e,"animation")})();if(typeof define=="function"&&define.amd)define(function(){return m});else t.Spinner=m}(window,document);
\ No newline at end of file
diff --git a/share/ni_nitdoc/styles/main.css b/share/ni_nitdoc/styles/main.css
deleted file mode 100644 (file)
index d9174f4..0000000
+++ /dev/null
@@ -1,467 +0,0 @@
-/* General */\r
-\r
-body {\r
-       font: 14px "Helvetica Neue", Helvetica, Tahoma, sans-serif;\r
-}\r
-\r
-a {\r
-       color: #333;\r
-       text-decoration: none;\r
-}\r
-\r
-a:hover {\r
-       color: #0D8921;\r
-}\r
-\r
-ul {\r
-       list-style-type: square;\r
-}\r
-\r
-pre, code {\r
-       white-space: pre;\r
-       font-family: monospace;\r
-       font-size: 1em;\r
-}\r
-\r
-.description div.comment {\r
-       background: #EEE;\r
-       color: black;\r
-       overflow: auto;\r
-       padding: 0 0 0 12px;\r
-       margin: 1em 0 0 0;\r
-}\r
-\r
-.description textarea.baseComment {\r
-       display: none;\r
-}\r
-\r
-hr {\r
-       background-color: #DDD;\r
-       height: 1px;\r
-       border: 0;\r
-}\r
-\r
-div.clear {\r
-       clear: both;\r
-}\r
-\r
-/* Titles */\r
-\r
-h1, h2, h3, h4, h5 {\r
-       font-family: Verdana, Geneva, sans-serif;\r
-       color: #6C6C6C;\r
-       font-weight: normal;\r
-}\r
-\r
-h1 {\r
-       font-size: 300%;\r
-       margin: 0 0 10px 0;\r
-}\r
-\r
-h3 {\r
-       font-weight: bold;\r
-}\r
-\r
-/* Page display */\r
-\r
-html {\r
-       height: 100%;\r
-       overflow: hidden;\r
-}\r
-\r
-body {\r
-       height: 100%;\r
-       margin: 0;\r
-}\r
-\r
-header {\r
-       position: fixed;\r
-       z-index: 600;\r
-       left: 0;\r
-       right: 0;\r
-}\r
-\r
-.page {\r
-       margin: auto;\r
-       height: 100%;\r
-}\r
-\r
-.sidebar {\r
-       position: fixed;\r
-       z-index: 500;\r
-       top: 50px;\r
-       bottom: 1em;\r
-       width: 250px;\r
-       overflow-y:     scroll;\r
-}\r
-\r
-.sidebar nav:last-child {\r
-       margin-bottom: 0;\r
-}\r
-\r
-.content {\r
-       position: fixed;\r
-       z-index: 500;\r
-       top: 50px;\r
-       bottom: 1em;\r
-       left: 0;\r
-       right: 0;\r
-       margin-left: 265px;\r
-       overflow-y:     scroll;\r
-       margin-right: 5px;\r
-       padding-right: 10px;\r
-}\r
-\r
-.content.fullpage {\r
-       margin-left: 20px;\r
-       width: auto;\r
-}\r
-\r
-.page.footed .content, .page.footed .sidebar {\r
-       bottom: 2em;\r
-}\r
-\r
-footer {\r
-       position: fixed;\r
-       z-index: 500;\r
-       bottom: 0;\r
-       width: 100%;\r
-}\r
-\r
-/* Webkit scroll bars */\r
-\r
-.sidebar {\r
-    overflow-y: hidden;\r
-}\r
-\r
-.sidebar:hover {\r
-    overflow-y: scroll;\r
-}\r
-\r
-.sidebar::-webkit-scrollbar, .content::-webkit-scrollbar {\r
-    width: 10px;\r
-}\r
-\r
-.sidebar::-webkit-scrollbar-thumb, .content::-webkit-scrollbar-thumb {\r
-       background: #CCC;\r
-       -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10),inset 0 -1px 0 rgba(0,0,0,0.07);\r
-}\r
-\r
-.sidebar::-webkit-scrollbar-thumb:hover, .content::-webkit-scrollbar-thumb:hover {\r
-       background: #999;\r
-}\r
-\r
-.sidebar::-webkit-scrollbar-corner, .content::-webkit-scrollbar-corner {\r
-       background: transparent;\r
-}\r
-\r
-.sidebar::-webkit-scrollbar-button, .content::-webkit-scrollbar-button {\r
-       width: 0;\r
-       height: 0;\r
-       display: none;\r
-}\r
-\r
-/* Header, Footer */\r
-\r
-header nav ul {\r
-       padding: 0;\r
-       list-style-type: none;\r
-       margin: auto;\r
-}\r
-\r
-header nav ul li {\r
-       display: inline;\r
-       padding: 3px 6px;\r
-       margin: auto 5px;\r
-       color: #999;\r
-}\r
-\r
-footer {\r
-       text-align: center;\r
-       padding-bottom: 10px;\r
-       color: #CCC;\r
-}\r
-\r
-/* Main menu */\r
-\r
-header nav.main {\r
-       background: #f1f1f1;\r
-       border-bottom: 1px solid #ddd;\r
-       padding: 7px 0;\r
-}\r
-\r
-header nav.main ul li.current {\r
-       background: #0D8921;\r
-       border-radius: 2px;\r
-       -moz-border-radius: 2px;\r
-       -webkit-border-radius: 2px;\r
-       border: 1px solid #1d7900;\r
-       color: #fff;\r
-       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-}\r
-\r
-/* Sidebar */\r
-\r
-.sidebar nav {\r
-       margin: 20px;\r
-       width: 208px;\r
-       border: 1px solid #ddd;\r
-}\r
-\r
-.sidebar nav:first-child {\r
-       margin-top: 0;\r
-}\r
-\r
-.sidebar nav h3 {\r
-       margin: 0;\r
-       padding: 5px;\r
-       background: #f1f1f1;\r
-       font-size: 1em;\r
-}\r
-\r
-.sidebar nav h4 {\r
-       font-weight: bold;\r
-       color: #555555;\r
-       margin: 10px 0 0 10px;\r
-       font-size: 12px;\r
-}\r
-\r
-.sidebar nav h4:last-child {\r
-       margin-bottom: 5px;\r
-}\r
-\r
-.sidebar nav ul {\r
-       margin: 10px;\r
-       padding: 0;\r
-       list-style-type: none;\r
-}\r
-\r
-.sidebar nav ul li {\r
-       overflow: hidden;\r
-       color: #CCC;\r
-}\r
-\r
-/* Content */\r
-\r
-.content article {\r
-       color: #6C6C6C;\r
-       background-repeat: no-repeat;\r
-       background-position: left 7px;\r
-       margin: 20px 0;\r
-       padding: 5px 20px;\r
-}\r
-\r
-.content article h3 {\r
-       margin: 0;\r
-       font-weight: bold;\r
-       color: #333;\r
-}\r
-\r
-.content article.graph {\r
-       text-align: center;\r
-}\r
-\r
-.content article.modules,\r
-.content article.classes,\r
-.content article.properties {\r
-       float: left;\r
-       width: 250px;\r
-       overflow: hidden;\r
-}\r
-\r
-.content article.overview ul,\r
-.content article.modules ul,\r
-.content article.classes ul,\r
-.content article.properties ul {\r
-       list-style-type: none;\r
-       padding: 0;\r
-}\r
-\r
-.content article.properties ul ul {\r
-       padding-left: 10px;\r
-}\r
-\r
-nav ul li span {\r
-       color: #CCC;\r
-       text-align: center;\r
-       font-family: monospace;\r
-       margin-right: 5px;\r
-}\r
-\r
-.content article.modules ul code,\r
-.content article.classes ul code,\r
-.content article.properties ul code {\r
-       font-weight: normal;\r
-}\r
-\r
-.content section.summary h2, .content section.summary article{\r
-       color: #000000;\r
-}\r
-\r
-.content section.summary article h3{\r
-       font-weight: bold;\r
-       color: #555;\r
-}\r
-\r
-.content article:target {\r
-       background-color: #FFF3C2;\r
-       color: black;\r
-}\r
-\r
-.content .subtitle {\r
-       color: #6C6C6C;\r
-}\r
-\r
-.content a {\r
-       color: #0D8921;\r
-}\r
-\r
-.content a:hover {\r
-       color: #333;\r
-}\r
-\r
-.info {\r
-       color: #6C6C6C;\r
-}\r
-\r
-.info a {\r
-       color: #333;\r
-}\r
-\r
-.info a:hover {\r
-       color: #0D8921;\r
-}\r
-\r
-\r
-article .info .code {\r
-       float: right;\r
-}\r
-\r
-.description .inheritance {\r
-       text-align: right;\r
-       margin: 2px;\r
-\r
-}\r
-\r
-.content .concern-doc {\r
-       border-bottom: 1px dashed #CCC;\r
-       padding: 5px 0;\r
-       color: #6C6C6C;\r
-}\r
-\r
-.content section.concerns {\r
-       padding: 10px;\r
-       border: 1px solid #ccc;\r
-\r
-}\r
-\r
-.content section.concerns h2 {\r
-       margin-top: 0;\r
-}\r
-\r
-.content section.concerns ul {\r
-    list-style-type: none;\r
-    padding-left: 0;\r
-    margin: 0;\r
-}\r
-\r
-.content section.concerns li {\r
-    margin-top: 20px;\r
-}\r
-\r
-.content section.concerns ul ul {\r
-    padding-left: 20px;\r
-}\r
-\r
-.content section.concerns li li {\r
-    margin-top: 0;\r
-}\r
-\r
-.content section.methods h3.concern-toplevel {\r
-       padding: 10px;\r
-       border: 1px solid #ccc;\r
-       color: #6C6C6C;\r
-}\r
-\r
-.show-code {\r
-       margin: 0;\r
-}\r
-\r
-/* Icons */\r
-\r
-.type.public, .interface.public, .abstract.class.public { background-image: url('../resources/icons/vtype_public.png')}\r
-.type.protected, .interface.protected, .abstract.class.protected { background-image: url('../resources/icons/vtype_protected.png')}\r
-.type.private, .interface.private, .abstract.class.private { background-image: url('../resources/icons/vtype_private.png')}\r
-.init.public, .enum.public { background-image: url('../resources/icons/const_public.png')}\r
-.init.protected, .enum.protected { background-image: url('../resources/icons/const_protected.png')}\r
-.init.private, .enum.private { background-image: url('../resources/icons/const_private.png')}\r
-.fun.public, .class.public, .extern.public { background-image: url('../resources/icons/meth_public.png')}\r
-.fun.protected, .class.protected, .extern.protected { background-image: url('../resources/icons/meth_protected.png')}\r
-.fun.private, .class.private, .extern.private { background-image: url('../resources/icons/meth_private.png')}\r
-\r
-/* Form elements */\r
-\r
-input[type=text] {\r
-       border: 1px solid #CCC;\r
-       padding: 1px 2px;\r
-}\r
-\r
-nav.main input[type=text] {\r
-       margin: -2px 10px;\r
-       color: black;\r
-       font-style: normal;\r
-}\r
-\r
-/* New comments style */\r
-\r
-.content .nitdoc {\r
-  background: #F7F7F7;\r
-  padding: 5px;\r
-  color: black;\r
-  overflow: auto;\r
-}\r
-\r
-.content .nitdoc pre {\r
-  background: #EEE;\r
-}\r
-\r
-.content .nitdoc code {\r
-  background: #DDD;\r
-  padding: 0 1px;\r
-}\r
-\r
-.rawcode {\r
-}\r
-\r
-.nitcode a { color: inherit; text-decoration: inherit; } /* hide links */\r
-.nitcode a:hover { text-decoration: underline; } /* underline links */\r
-.nitcode span[title]:hover { text-decoration: underline; } /* underline titles */\r
-/* lexical raw tokens. independent of usage or semantic: */\r
-.nitcode .nc_c { color: gray; font-style: italic; } /* comment */\r
-.nitcode .nc_d { color: #3D8127; font-style: italic; } /* documentation comments */\r
-.nitcode .nc_k { font-weight: bold; } /* keyword */\r
-.nitcode .nc_o {} /* operator */\r
-.nitcode .nc_i {} /* standard identifier */\r
-.nitcode .nc_t { color: #445588; font-weight: bold; } /* type/class identifier */\r
-.nitcode .nc_a { color: #445588; font-style: italic; } /* old style attribute identifier */\r
-.nitcode .nc_l { color: #009999; } /* char and number literal */\r
-.nitcode .nc_s { color: #8F1546; } /* string literal */\r
-/* syntactic token usage. added because of their position in the AST */\r
-.nitcode .nc_ast { color: blue; } /* assert label */\r
-.nitcode .nc_la { color: blue; } /* break/continue label */\r
-.nitcode .nc_m { color: #445588; } /* module name */\r
-/* syntactic groups */\r
-.nitcode .nc_def { font-weight: bold; color: blue; } /* name used in a definition */\r
-.nitcode .nc_def.nc_a { color: blue; } /* name used in a attribute definition */\r
-.nitcode .nc_def.nc_t { color: blue; } /* name used in a class or vt definition */\r
-.nitcode .nc_ss { color: #9E6BEB; } /* superstrings */\r
-.nitcode .nc_cdef {} /* A whole class definition */\r
-.nitcode .nc_pdef {} /* A whole property definition */\r
-/* semantic token usage */\r
-.nitcode .nc_v { font-style: italic; } /* local variable or parameter */\r
-.nitcode .nc_vt { font-style: italic; } /* virtual type or formal type */\r
-\r
-.nitcode .nc_error { border: 1px red solid;} /* not used */\r
-\r
diff --git a/share/nitdoc/help.html b/share/nitdoc/help.html
deleted file mode 100644 (file)
index b65a7b7..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>\r
-<html>\r
-       <head>\r
-               <meta charset="utf-8">\r
-               <title>NitDoc | Help</title>\r
-               \r
-               <script type="text/javascript" src="scripts/jquery-1.7.1.min.js"></script>\r
-               <script type="text/javascript" src="scripts/js-facilities.js"></script>\r
-               \r
-        <link rel="shortcut icon" href="favicon.ico">\r
-        <link rel="stylesheet" href="./styles/main.css" type="text/css"  media="screen">\r
-       </head>\r
-       <body>\r
-               <!-- Page header -->\r
-               <header>\r
-                       <!-- Main navigation -->\r
-                       <nav class="main">\r
-                               <ul>\r
-                                       <li><a href="index.html">Overview</a></li>\r
-                                       <li><a href="full-index.html">Full Index</a></li>\r
-                                       <li class="current">Help</li>\r
-                               </ul>\r
-                       </nav>\r
-               </header>\r
-               \r
-               <!-- Page content -->\r
-               <div class="page">\r
-                       <!-- Content -->\r
-                       <div class="content fullpage">\r
-                               <h1>Help</h1>\r
-                               <div class="subtitle">This documentation is organized as follows.</div>
-                               
-                               <article>\r
-                                       <h2>Menu Bar</h2>\r
-                                       <p>The menu bar allows you to navigate different views of this documentation.</p>
-                                       <ul>
-                                               <li>The <a href="index.html">Overview</a> is the front page of this documentation</li>
-                                               <li>The <a href="full-index.html">Full Index</a> lists all properties, classes and modules</li>
-                                               <li>The <a href="help.html">Help</a> displays this page</li>
-                                       </ul>
-                                       <p>If JavaScript is enabled on your browser, a search field appears and allows you to search in all properties, classes and modules.</p>\r
-                               </article>\r
-                               \r
-                               <article>\r
-                                       <h2>Overview</h2>\r
-                                       <p>The <a href="index.html">Overview</a> page is the front page of this documentation and provides a list of all modules with a summary for each.</p>\r
-                               </article>\r
-                               \r
-                               <article>\r
-                                       <h2>Modules</h2>\r
-                                       <p>Each module has a page that contains a summary of the module, a graphic representation and a list of its classes (including interfaces) and properties. The left block contains a list of imported and nested modules.</p>\r
-                                       <p>If JavaScript is enabled on your browser, classes and properties can be filtered by name.</p>\r
-                               </article>\r
-                               \r
-                               <article>\r
-                                       <h2>Class</h2>\r
-                                       <p>Each class and interface has its own separate page. Each of these pages has four sections consisting of a class/interface description, virtual and formal types list, detailed properties descriptions and inherited properties.</p>\r
-                                       <p>Blocks on the left display :</p>\r
-                                       <ul>\r
-                                               <li>Properties (virtual types, formal types, methods)</li>\r
-                                               <li>Inheritance relations (super and subclasses)</li>\r
-                                       </ul>\r
-                                       <p>Before the detail of each property an icon show the type of property (diamond = virtual type, square = constructor, circle = method). The color of the icon reflect the property visibility (red = private, orange = protected, green = public).</p>\r
-                               </article>\r
-                               \r
-                               <article>\r
-                                       <h2>Full Index</h2>\r
-                                       <p>The <a href="full-index.html">Full Index</a> contains an alphabetic list of all modules, classes/interfaces and properties.</p>\r
-                                       <p>If JavaScript is enabled on your browser, lists can be filtered by name.</p>\r
-                               </article>\r
-                       </div>          \r
-                       <div class="clear"></div>\r
-               </div>\r
-       </body>\r
-</html>\r
diff --git a/share/nitdoc/resources/icons/close.png b/share/nitdoc/resources/icons/close.png
deleted file mode 100755 (executable)
index c11f7af..0000000
Binary files a/share/nitdoc/resources/icons/close.png and /dev/null differ
index 9d0605b..53def84 100644 (file)
Binary files a/share/nitdoc/resources/icons/const_private.png and b/share/nitdoc/resources/icons/const_private.png differ
index f931ced..99530e3 100644 (file)
Binary files a/share/nitdoc/resources/icons/const_protected.png and b/share/nitdoc/resources/icons/const_protected.png differ
index 3977f93..393f130 100644 (file)
Binary files a/share/nitdoc/resources/icons/const_public.png and b/share/nitdoc/resources/icons/const_public.png differ
diff --git a/share/nitdoc/resources/icons/github-icon-w.png b/share/nitdoc/resources/icons/github-icon-w.png
deleted file mode 100644 (file)
index ba6a6b1..0000000
Binary files a/share/nitdoc/resources/icons/github-icon-w.png and /dev/null differ
index d80a19d..0217515 100644 (file)
Binary files a/share/nitdoc/resources/icons/meth_private.png and b/share/nitdoc/resources/icons/meth_private.png differ
index 1777da9..eb20e7c 100644 (file)
Binary files a/share/nitdoc/resources/icons/meth_protected.png and b/share/nitdoc/resources/icons/meth_protected.png differ
index a08a470..e5906ee 100644 (file)
Binary files a/share/nitdoc/resources/icons/meth_public.png and b/share/nitdoc/resources/icons/meth_public.png differ
index 141f8ce..b526812 100644 (file)
Binary files a/share/nitdoc/resources/icons/vtype_private.png and b/share/nitdoc/resources/icons/vtype_private.png differ
index 0e11eab..f3515e7 100644 (file)
Binary files a/share/nitdoc/resources/icons/vtype_protected.png and b/share/nitdoc/resources/icons/vtype_protected.png differ
index caaa932..a70354d 100644 (file)
Binary files a/share/nitdoc/resources/icons/vtype_public.png and b/share/nitdoc/resources/icons/vtype_public.png differ
diff --git a/share/nitdoc/resources/top_back.gif b/share/nitdoc/resources/top_back.gif
deleted file mode 100644 (file)
index 82e1e83..0000000
Binary files a/share/nitdoc/resources/top_back.gif and /dev/null differ
similarity index 90%
rename from share/ni_nitdoc/scripts/Nitdoc.GitHub.js
rename to share/nitdoc/scripts/Nitdoc.GitHub.js
index 542011b..37f4104 100644 (file)
@@ -29,9 +29,10 @@ Nitdoc.GitHub = {}; // Declare Nitdoc.GitHub submodule
 // Load GitHub UI\r
 $(document).ready(function() {\r
        //FIXME base should be choosen by user\r
-       var origin = $("body").attr("data-github-origin");\r
-       if(origin) {\r
-               Nitdoc.GitHub.UI.init(origin);\r
+       var upstream = $("body").attr("data-github-upstream");\r
+       var basesha1 = $("body").attr("data-github-base-sha1");\r
+       if(upstream && basesha1) {\r
+               Nitdoc.GitHub.UI.init(upstream, basesha1);\r
        }\r
 });\r
 \r
@@ -43,22 +44,23 @@ Nitdoc.GitHub.UI = function() {
        var user = false; // logged user\r
        var origin;\r
 \r
-       var init = function(originStr) {\r
-               console.log("init GitHub module (origin: "+ originStr +")");\r
+       var init = function(upstream, basesha1) {\r
+               console.log("init GitHub module (upstream: "+ upstream +", base: " + basesha1 + ")");\r
 \r
                // parse origin\r
-               var parts = originStr.split(":");\r
+               var parts = upstream.split(":");\r
                origin = {\r
                        user: parts[0],\r
                        repo: parts[1],\r
-                       branch: parts[2]\r
+                       branch: parts[2],\r
+                       sha: basesha1\r
                };\r
 \r
                // check local session\r
                if(localStorage.user) {\r
                        var session = JSON.parse(localStorage.user);\r
                        var user = tryLogin(session.login, Base64.decode(session.password), session.repo, session.branch);\r
-                       if(!user) {\r
+                       if(!user.login) {\r
                                console.log("Session found but authentification failed");\r
                                localStorage.clear();\r
                        }\r
@@ -68,7 +70,7 @@ Nitdoc.GitHub.UI = function() {
 \r
                // activate ui\r
                Nitdoc.GitHub.LoginBox.init("nav.main ul");\r
-               if(user) {\r
+               if(user && user.login) {\r
                        Nitdoc.GitHub.LoginBox.displayLogout(origin, user);\r
                        activate(user);\r
                } else {\r
@@ -90,12 +92,11 @@ Nitdoc.GitHub.UI = function() {
                saveSession(user);\r
                \r
                // check local storage synchro with branch\r
-               if(localStorage.latestCommit != user.latest.sha) {\r
-                       console.log("Latest commit changed: cleaned cache");\r
+               if(localStorage.base != origin.sha) {\r
+                       console.log("Base changed: cleaned cache");\r
                        localStorage.requests = "[]";\r
-                       localStorage.latestCommit = user.latest.sha;\r
+                       localStorage.base = origin.sha;\r
                }\r
-               console.log("Latest commit sha: " + localStorage.latestCommit);\r
 \r
                attachCommentEvents();\r
                reloadComments();\r
@@ -118,14 +119,17 @@ Nitdoc.GitHub.UI = function() {
        var tryLogin = function(login, password, repo, branch) {\r
                var user = new Nitdoc.GitHub.User(login, password, repo, branch);\r
                if(!Nitdoc.GitHub.API.login(user)) {\r
-                       return false;\r
+                       return "error:login";\r
                }\r
-               // get lastest commit\r
-               var latest = Nitdoc.GitHub.API.getLastCommit(user);\r
-               if(!latest || !latest.sha) {\r
-                       return false;\r
+               // check github profile fields\r
+               if(!user.infos.name || !user.infos.email) {\r
+                       return "error:profile";\r
+               }\r
+               // check correct base commit\r
+               var commit = Nitdoc.GitHub.API.getCommit(user, origin.sha);\r
+               if(!commit || !commit.sha) {\r
+                       return "error:sha";\r
                }\r
-               user.latest = latest;\r
                return user;\r
        }\r
 \r
@@ -136,7 +140,7 @@ Nitdoc.GitHub.UI = function() {
                        //FIXME this should be done by nitdoc\r
                        var baseComment = $(this).parent().prev();\r
                        var location = Nitdoc.GitHub.Utils.parseLocation(baseComment.attr("data-comment-location"));\r
-                       var locString = "../" + location.path + ":" + location.lstart + "," + location.tabpos + "--" + location.lstart + ",0";\r
+                       var locString = location.path + ":" + location.lstart + "," + location.tabpos + "--" + location.lstart + ",0";\r
                        baseComment.attr("data-comment-location", locString);\r
                        $(this).html("<a class='nitdoc-github-editComment noComment'>add comment</a> for ");\r
                        $(this).addClass("nitdoc-github-editComment");\r
@@ -291,7 +295,7 @@ Nitdoc.GitHub.UI = function() {
                5. create the pull request\r
        */\r
        var pushChanges = function(infos) {\r
-               var baseTree = Nitdoc.GitHub.API.getTree(user, localStorage.latestCommit);\r
+               var baseTree = Nitdoc.GitHub.API.getTree(user, origin.sha);\r
                if(!baseTree.sha) {\r
                        Nitdoc.GitHub.ModalBox.open("Unable to locate base tree!", baseTree.status + ": " + baseTree.statusText, true);\r
                        return false;\r
@@ -309,13 +313,13 @@ Nitdoc.GitHub.UI = function() {
                        return false;\r
                }\r
                console.log("New tree: " + newTree.url);\r
-               var newCommit = Nitdoc.GitHub.API.createCommit(user, infos.message, localStorage.latestCommit, newTree);\r
+               var newCommit = Nitdoc.GitHub.API.createCommit(user, infos.message, baseTree.sha, newTree);\r
                if(!newCommit.sha) {\r
                        Nitdoc.GitHub.ModalBox.open("Unable to create new commit!", newCommit.status + ": " + newCommit.statusText, true);\r
                        return false;\r
                }\r
                console.log("New commit: " + newCommit.url);\r
-               var pullRequest = Nitdoc.GitHub.API.createPullRequest(user, infos.message.split("\n\n")[0], infos.message, origin, newCommit.sha);\r
+               var pullRequest = Nitdoc.GitHub.API.createPullRequest(user, infos.message.split("\n\n")[0], "Pull request from Nitdoc", origin, newCommit.sha);\r
                if(!pullRequest.number) {\r
                        Nitdoc.GitHub.ModalBox.open("Unable to create pull request!", pullRequest.status + ": " + pullRequest.statusText, true);\r
                        return false;\r
@@ -462,7 +466,7 @@ Nitdoc.GitHub.API = function() {
 \r
        // build signedoff user default signature\r
        var getSignedOff = function(user) {\r
-               return user.infos.name + " &lt;" + user.infos.email + "&gt;";\r
+               return user.infos.name + " <" + user.infos.email + ">";\r
        }\r
 \r
        // get the branches list from a repo\r
@@ -489,18 +493,18 @@ Nitdoc.GitHub.API = function() {
        /* GitHub commits */\r
 \r
        // get the latest commit on `branchName`\r
-       var getLastCommit = function(user) {\r
+       var getCommit = function(user, sha) {\r
                var res = false;\r
                $.ajax({\r
                        beforeSend: function (xhr) {\r
                                xhr.setRequestHeader ("Authorization", user.auth);\r
                        },\r
                        type: "GET",\r
-                       url: "https://api.github.com/repos/" + user.login + "/" + user.repo + "/git/refs/heads/" + user.branch,\r
+                       url: "https://api.github.com/repos/" + user.login + "/" + user.repo + "/git/commits/" + sha,\r
                        async: false,\r
                        dataType: 'json',\r
                        success: function(response) {\r
-                               res = response.object;\r
+                               res = response;\r
                        },\r
                        error: function(response) {\r
                                res = response;\r
@@ -688,7 +692,7 @@ Nitdoc.GitHub.API = function() {
 \r
        var api = {\r
                login: login,\r
-               getLastCommit: getLastCommit,\r
+               getCommit: getCommit,\r
                getBranches: getBranches,\r
                getTree: getTree,\r
                createBlob: createBlob,\r
@@ -871,8 +875,12 @@ Nitdoc.GitHub.LoginBox = function() {
                                        Nitdoc.GitHub.ModalBox.open("Sign in error", "Please enter your GitHub username, password, repository and branch.", true);\r
                                } else {\r
                                        var user = Nitdoc.GitHub.UI.tryLogin(login, password, repo, branch);\r
-                                       if(!user) {\r
+                                       if(user == "error:login") {\r
                                                Nitdoc.GitHub.ModalBox.open("Sign in error", "The username, password, repo or branch you entered is incorrect.", true);\r
+                                       } else if(user == "error:sha") {\r
+                                               Nitdoc.GitHub.ModalBox.open("Base commit not found", "The provided GitHub repository must contains the base commit '" + Nitdoc.GitHub.UI.getOrigin().sha + "'", true);\r
+                                       } else if(user == "error:profile") {\r
+                                               Nitdoc.GitHub.ModalBox.open("Incomplete GitHub profile", "Please set your public name and email in your <a href='https://github.com/settings/profile'>GitHub profile</a>.<br/><br/>Your public profile informations are used to sign-off your commits.", true);\r
                                        } else {\r
                                                Nitdoc.GitHub.UI.activate(user);\r
                                                var origin = Nitdoc.GitHub.UI.getOrigin();\r
@@ -1043,12 +1051,14 @@ Nitdoc.GitHub.ModalBox = function() {
                        $("#nitdoc-github-modal").addClass("nitdoc-github-error");\r
                }\r
 \r
-               $("#nitdoc-github-modal").css({\r
+               $("#nitdoc-github-modal")\r
+               .css({\r
                        top: "50%",\r
                        marginTop: -($("#nitdoc-github-modal").outerHeight() / 2) + "px",\r
                        left: "50%",\r
                        marginLeft: -($("#nitdoc-github-modal").outerWidth() / 2) + "px"\r
-               });\r
+               })\r
+               .find("button.nitdoc-github-button").focus();\r
        }\r
 \r
        // Close modal box instance\r
@@ -1123,7 +1133,7 @@ Nitdoc.GitHub.CommitBox = function() {
                                .append(\r
                                        $(document.createElement("label"))\r
                                        .attr("for", "nitdoc-github-commit-signedoff")\r
-                                       .append("Signed-off-by: " + infos.user.signedOff)\r
+                                       .text("Signed-off-by: " + infos.user.signedOff)\r
                                )\r
                        ).append(\r
                                $(document.createElement("div"))\r
@@ -1151,12 +1161,14 @@ Nitdoc.GitHub.CommitBox = function() {
                        )\r
                );\r
 \r
-               $("#nitdoc-github-commitBox").css({\r
+               $("#nitdoc-github-commitBox")\r
+               .css({\r
                        top: "50%",\r
                        marginTop: -($("#nitdoc-github-commitBox").outerHeight() / 2) + "px",\r
                        left: "50%",\r
                        marginLeft: -($("#nitdoc-github-commitBox").outerWidth() / 2) + "px"\r
-               });\r
+               })\r
+               .find("#nitdoc-github-commit-message").focus();\r
        }\r
 \r
        // Close commit box instance\r
@@ -1178,20 +1190,19 @@ Nitdoc.GitHub.CommitBox = function() {
  */\r
 \r
 Nitdoc.GitHub.Utils = function() {\r
-       // Extract infos from string location "../lib/standard/collection/array.nit:457,1--458,0"\r
-       //FIXME this should be done by nitdoc\r
+       // Extract infos from string location "lib/standard/collection/array.nit:457,1--458,0"\r
        var parseLocation = function(location) {\r
                var parts = location.split(":");\r
                var loc = new Object();\r
                loc.origin = location;\r
-               loc.path = parts[0].substr(3, parts[0].length);\r
+               loc.path = parts[0];\r
                loc.lstart = parseInt(parts[1].split("--")[0].split(",")[0]);\r
                loc.tabpos = parseInt(parts[1].split("--")[0].split(",")[1]);\r
                loc.lend = parseInt(parts[1].split("--")[1].split(",")[0]);\r
                return loc;\r
        }\r
 \r
-       // Meld modified comment into file content\r
+       // Meld modified comment into file conten\r
        var mergeComment = function(fileContent, comment, location) {\r
                // replace comment in file content\r
                var res = new String();\r
similarity index 75%
rename from share/ni_nitdoc/scripts/Nitdoc.UI.js
rename to share/nitdoc/scripts/Nitdoc.UI.js
index 5988f06..5b8d004 100644 (file)
@@ -149,12 +149,60 @@ Nitdoc.UI = function() {
                }\r
        }\r
 \r
+       // Allow user to filter sidebar box entries by name\r
+       var enableSearchPageField = function(filterSelector) {\r
+               var div = $(document.createElement("div"))\r
+               .addClass("nitdoc-ui-searchpage-filter")\r
+               .append(\r
+                       $(document.createElement("input"))\r
+                       .addClass("nitdoc-ui-searchpage-field")\r
+                       .addClass("nitdoc-ui-filter-field-notused")\r
+                       .attr("type", "text")\r
+                       .attr("value",  "filter...")\r
+                       .keyup(function() {\r
+                               var box = $(this).parents(".content.fullpage").find("article.filterable");\r
+                               var value = $(this).val();\r
+                               box.find("ul li:not(:icontains('" + value + "'))").hide();\r
+                               box.find("ul li:icontains('" + value + "')").show();\r
+                       })\r
+                       .focusout(function() {\r
+                               if($(this).val() == "") {\r
+                                       $(this).addClass("nitdoc-ui-filter-field-notused");\r
+                                       $(this).val("filter...");\r
+                               }\r
+                       })\r
+                       .focusin(function() {\r
+                               if($(this).val() == "filter...") {\r
+                                       $(this).removeClass("nitdoc-ui-filter-field-notused");\r
+                                       $(this).val("");\r
+                               }\r
+                       })\r
+               );\r
+               $(filterSelector).after(div);\r
+               preloadSearchPageField();\r
+       }\r
+\r
+       // Prealod filter using search query\r
+       var preloadSearchPageField = function() {\r
+               var anchor = Nitdoc.Utils.extractAnchor(document.location.hash);\r
+               if(!anchor || anchor.indexOf("q=") == -1) return;\r
+\r
+               var query = anchor.substring(2);\r
+               if(!query) return;\r
+\r
+               $(".nitdoc-ui-searchpage-field")\r
+               .val(query)\r
+               .removeClass("nitdoc-ui-notused")\r
+               .trigger("keyup");\r
+       }\r
+\r
        // Public interface\r
        var ui = {\r
                enableFolding: enableFolding,\r
                enableCopyToClipboard: enableCopyToClipboard,\r
                enableSidebarTextFilters: enableSidebarTextFilters,\r
-               enableSidebarTypeFilters: enableSidebarTypeFilters\r
+               enableSidebarTypeFilters: enableSidebarTypeFilters,\r
+               enableSearchPageField: enableSearchPageField\r
        };\r
 \r
        return ui;\r
@@ -166,6 +214,7 @@ $(document).ready(function() {
        Nitdoc.UI.enableCopyToClipboard(".signature");\r
        Nitdoc.UI.enableSidebarTextFilters("nav.filterable h3");\r
        Nitdoc.UI.enableSidebarTypeFilters("nav.filterable");\r
+       Nitdoc.UI.enableSearchPageField(".content.fullpage h1:contains('Search')");\r
 });\r
 \r
 /*\r
@@ -198,5 +247,3 @@ $.expr[':'].icontains = function(obj, index, meta, stack){
        return (obj.textContent.replace(/\[[0-9]+\]/g, "") || obj.innerText.replace(/\[[0-9]+\]/g, "") || jQuery(obj).text().replace(/\[[0-9]+\]/g, "") || '').toLowerCase().indexOf(meta[3].toLowerCase()) >= 0;\r
 };\r
 \r
-//rename file\r
-//commit\r
diff --git a/share/nitdoc/scripts/js-facilities.js b/share/nitdoc/scripts/js-facilities.js
deleted file mode 100644 (file)
index a943d1b..0000000
+++ /dev/null
@@ -1,1513 +0,0 @@
-// User\r
-var userB64 = null;\r
-var userName = "";\r
-var password = "";\r
-var sessionStarted = false;\r
-var editComment = 0;\r
-var currentfileContent = '';\r
-var originalFileContent = '';\r
-var addNewComment = false;\r
-var commentLineStart;\r
-var commentLineEnd;\r
-\r
-// SHA GitHub\r
-var shaLastCommit = "";\r
-var shaBaseTree;\r
-var shaNewTree;\r
-var shaNewCommit;\r
-var shaBlob;\r
-var shaMaster;\r
-var repoExist = false;\r
-var branchExist = false;\r
-var githubRepo;\r
-var loginProcess = false;\r
-var signedOff = '';\r
-var userEmail = '';\r
-var commitMessage = '';\r
-var numComment = '';\r
-var showcomment = false;\r
-\r
-// Spinner vars\r
-var opts = {\r
-         lines: 11, // The number of lines to draw\r
-         length: 7, // The length of each line\r
-         width: 4, // The line thickness\r
-         radius: 10, // The radius of the inner circle\r
-         corners: 1, // Corner roundness (0..1)\r
-         rotate: 0, // The rotation offset\r
-         color: '#FFF', // #rgb or #rrggbb\r
-         speed: 1, // Rounds per second\r
-         trail: 60, // Afterglow percentage\r
-         shadow: false, // Whether to render a shadow\r
-         hwaccel: false, // Whether to use hardware acceleration\r
-         className: 'spinner', // The CSS class to assign to the spinner\r
-         zIndex: 99999, // The z-index (defaults to 2000000000)\r
-         top: '300', // Top position relative to parent in px\r
-         left: 'auto' // Left position relative to parent in px\r
-       };\r
-var targetSpinner = document.getElementById('waitCommit');\r
-var spinner = new Spinner(opts).spin(targetSpinner);\r
-\r
-/*\r
-* JQuery Case Insensitive :icontains selector\r
-*/\r
-$.expr[':'].icontains = function(obj, index, meta, stack){\r
-       return (obj.textContent.replace(/\[[0-9]+\]/g, "") || obj.innerText.replace(/\[[0-9]+\]/g, "") || jQuery(obj).text().replace(/\[[0-9]+\]/g, "") || '').toLowerCase().indexOf(meta[3].toLowerCase()) >= 0;\r
-};\r
-\r
-/*\r
- *     Quick Search global vars\r
- */\r
-\r
-// Current search results preview table\r
-var currentTable = null;\r
-\r
-//Hightlighted index in search result preview table\r
-var currentIndex = -1;\r
-\r
-// Check if a comment is editing\r
-window.onbeforeunload = function() {\r
-       if(editComment > 0){\r
-       return 'Are you sure you want to leave this page?';\r
-       }\r
-};\r
-\r
-/*\r
-* Add folding and filtering facilities to class description page.\r
-*/\r
-$(document).ready(function() {\r
-\r
-       // Hide edit tags\r
-       $('textarea').hide();\r
-       $('a[id=commitBtn]').hide();\r
-       $('a[id=cancelBtn]').hide();\r
-       // Hide Authenfication form\r
-       $(".popover").hide();\r
-       // Update display\r
-       updateDisplaying();\r
-       /*\r
-       * Highlight the spoted element\r
-       */\r
-       highlightBlock(currentAnchor());\r
-\r
-       /*\r
-       * Nav block folding\r
-       */\r
-\r
-       // Menu nav folding\r
-       $(".menu nav h3")\r
-       .prepend(\r
-               $(document.createElement("a"))\r
-               .html("-")\r
-               .addClass("fold")\r
-       )\r
-       .css("cursor", "pointer")\r
-       .click( function() {\r
-                       if($(this).find("a.fold").html() == "+") {\r
-                               $(this).find("a.fold").html("-");\r
-                       } else {\r
-                               $(this).find("a.fold").html("+");\r
-                       }\r
-                       $(this).nextAll().toggle();\r
-       })\r
-\r
-       // Insert search field\r
-       $("nav.main ul")\r
-       .append(\r
-               $(document.createElement("li"))\r
-               .append(\r
-                       $(document.createElement("form"))\r
-                       .append(\r
-                               $(document.createElement("input"))\r
-                               .attr({\r
-                                       id: "search",\r
-                                       type:   "text",\r
-                                       autocomplete: "off",\r
-                                       value: "quick search..."\r
-                               })\r
-                               .addClass("notUsed")\r
-\r
-                               // Key management\r
-                               .keyup(function(e) {\r
-                                       switch(e.keyCode) {\r
-\r
-                                               // Select previous result on "Up"\r
-                                               case 38:\r
-                                                       // If already on first result, focus search input\r
-                                                       if(currentIndex == 0) {\r
-                                                               $("#search").val($(currentTable.find("tr")[currentIndex]).data("searchDetails").name);\r
-                                                               $("#search").focus();\r
-                                                       // Else select previous result\r
-                                                       } else if(currentIndex > 0) {\r
-                                                               $(currentTable.find("tr")[currentIndex]).removeClass("activeSearchResult");\r
-                                                               currentIndex--;\r
-                                                               $(currentTable.find("tr")[currentIndex]).addClass("activeSearchResult");\r
-                                                               $("#search").val($(currentTable.find("tr")[currentIndex]).data("searchDetails").name);\r
-                                                               $("#search").focus();\r
-                                                       }\r
-                                               break;\r
-\r
-                                               // Select next result on "Down"\r
-                                               case 40:\r
-                                                       if(currentIndex < currentTable.find("tr").length - 1) {\r
-                                                               $(currentTable.find("tr")[currentIndex]).removeClass("activeSearchResult");\r
-                                                               currentIndex++;\r
-                                                               $(currentTable.find("tr")[currentIndex]).addClass("activeSearchResult");\r
-                                                               $("#search").val($(currentTable.find("tr")[currentIndex]).data("searchDetails").name);\r
-                                                               $("#search").focus();\r
-                                                       }\r
-                                               break;\r
-                                               // Go to url on "Enter"\r
-                                               case 13:\r
-                                                       if(currentIndex > -1) {\r
-                                                               window.location = $(currentTable.find("tr")[currentIndex]).data("searchDetails").url;\r
-                                                               return false;\r
-                                                       }\r
-                                                       if($("#search").val().length == 0)\r
-                                                               return false\r
-\r
-                                                       window.location = "full-index.html#q=" + $("#search").val();\r
-                                                       if(window.location.href.indexOf("full-index.html") > -1) {\r
-                                                               location.reload();\r
-                                                       }\r
-                                                       return false;\r
-                                               break;\r
-\r
-                                               // Hide results preview on "Escape"\r
-                                               case 27:\r
-                                                       $(this).blur();\r
-                                                       if(currentTable != null) {\r
-                                                               currentTable.remove();\r
-                                                               currentTable = null;\r
-                                                       }\r
-                                               break;\r
-\r
-                                               default:\r
-                                                       if($("#search").val().length == 0) {\r
-                                                               return false;\r
-                                                       }\r
-\r
-                                                       // Remove previous table\r
-                                                       if(currentTable != null) {\r
-                                                               currentTable.remove();\r
-                                                       }\r
-\r
-                                                       // Build results table\r
-                                                       currentIndex = -1;\r
-                                                       currentTable = $(document.createElement("table"));\r
-\r
-                                                       // Escape regexp related characters in query\r
-                                                       var query = $("#search").val();\r
-                                                       query = query.replace(/\[/gi, "\\[");\r
-                                                       query = query.replace(/\|/gi, "\\|");\r
-                                                       query = query.replace(/\*/gi, "\\*");\r
-                                                       query = query.replace(/\+/gi, "\\+");\r
-                                                       query = query.replace(/\\/gi, "\\\\");\r
-                                                       query = query.replace(/\?/gi, "\\?");\r
-                                                       query = query.replace(/\(/gi, "\\(");\r
-                                                       query = query.replace(/\)/gi, "\\)");\r
-\r
-                                                       var index = 0;\r
-                                                       var regexp = new RegExp("^" + query, "i");\r
-                                                       for(var entry in entries) {\r
-                                                               if(index > 10) {\r
-                                                                       break;\r
-                                                               }\r
-                                                               var result = entry.match(regexp);\r
-                                                               if(result != null && result.toString().toUpperCase() == $("#search").val().toUpperCase()) {\r
-                                                                       for(var i = 0; i < entries[entry].length; i++) {\r
-                                                                               if(index > 10) {\r
-                                                                                       break;\r
-                                                                               }\r
-                                                                               currentTable.append(\r
-                                                                                       $(document.createElement("tr"))\r
-                                                                                       .data("searchDetails", {name: entry, url: entries[entry][i]["url"]})\r
-                                                                                       .data("index", index)\r
-                                                                                       .append($(document.createElement("td")).html(entry))\r
-                                                                                       .append(\r
-                                                                                               $(document.createElement("td"))\r
-                                                                                                       .addClass("entryInfo")\r
-                                                                                                       .html(entries[entry][i]["txt"] + "&nbsp;&raquo;"))\r
-                                                                                       .mouseover( function() {\r
-                                                                                               $(currentTable.find("tr")[currentIndex]).removeClass("activeSearchResult");\r
-                                                                                               $(this).addClass("activeSearchResult");\r
-                                                                                               currentIndex = $(this).data("index");\r
-                                                                                       })\r
-                                                                                       .mouseout( function() {\r
-                                                                                               $(this).removeClass("activeSearchResult");\r
-                                                                                        })\r
-                                                                                       .click( function() {\r
-                                                                                               window.location = $(this).data("searchDetails")["url"];\r
-                                                                                       })\r
-                                                                               );\r
-                                                                               index++;\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
-\r
-                                                       // Initialize table properties\r
-                                                       currentTable.attr("id", "searchTable");\r
-                                                       currentTable.css("position", "absolute");\r
-                                                       currentTable.width($("#search").outerWidth());\r
-                                                       $("header").append(currentTable);\r
-                                                       currentTable.offset({left: $("#search").offset().left + ($("#search").outerWidth() - currentTable.outerWidth()), top: $("#search").offset().top + $("#search").outerHeight()});\r
-\r
-                                                       // Preselect first entry\r
-                                                       if(currentTable.find("tr").length > 0) {\r
-                                                               currentIndex = 0;\r
-                                                               $(currentTable.find("tr")[currentIndex]).addClass("activeSearchResult");\r
-                                                               $("#search").focus();\r
-                                                       }\r
-                                               break;\r
-                                       }\r
-                               })\r
-                               .focusout(function() {\r
-                                       if($(this).val() == "") {\r
-                                               $(this).addClass("notUsed");\r
-                                               $(this).val("quick search...");\r
-                                       }\r
-                               })\r
-                               .focusin(function() {\r
-                                       if($(this).val() == "quick search...") {\r
-                                               $(this).removeClass("notUsed");\r
-                                               $(this).val("");\r
-                                       }\r
-                               })\r
-                       )\r
-                       .submit( function() {\r
-                               return false;\r
-                       })\r
-               )\r
-        );\r
-\r
-        // Close quicksearch list on click\r
-        $(document).click(function(e) {\r
-               if(e.target != $("#search")[0] && e.target != $("#searchTable")[0]) {\r
-                       if(currentTable != null) {\r
-                               currentTable.remove();\r
-                               currentTable = null;\r
-                       }\r
-               }\r
-        });\r
-\r
-       // Insert filter field\r
-       $("article.filterable h2, nav.filterable h3")\r
-       .after(\r
-               $(document.createElement("div"))\r
-               .addClass("filter")\r
-               .append(\r
-                       $(document.createElement("input"))\r
-                       .attr({\r
-                               type:   "text",\r
-                               value:  "filter..."\r
-                       })\r
-                       .addClass("notUsed")\r
-                       .keyup(function() {\r
-                               $(this).parent().parent().find("ul li:not(:icontains('" + $(this).val() + "'))").addClass("hide");\r
-                               $(this).parent().parent().find("ul li:icontains('" + $(this).val() + "')").removeClass("hide");\r
-                       })\r
-                       .focusout(function() {\r
-                               if($(this).val() == "") {\r
-                                       $(this).addClass("notUsed");\r
-                                       $(this).val("filter...");\r
-                               }\r
-                       })\r
-                       .focusin(function() {\r
-                               if($(this).val() == "filter...") {\r
-                                       $(this).removeClass("notUsed");\r
-                                       $(this).val("");\r
-                               }\r
-                       })\r
-               )\r
-       );\r
-\r
-       // Filter toggle between H I R in nav porperties list\r
-       $("nav.properties.filterable .filter")\r
-       .append(\r
-               $(document.createElement("a"))\r
-               .html("H")\r
-               .attr({\r
-                       title:  "hide inherited properties"\r
-               })\r
-               .click( function() {\r
-                       if($(this).hasClass("hidden")) {\r
-                               $(this).parent().parent().find("li.inherit").show();\r
-                       } else {\r
-                               $(this).parent().parent().find("li.inherit").hide();\r
-                       }\r
-\r
-                       $(this).toggleClass("hidden");\r
-               })\r
-       )\r
-       .append(\r
-               $(document.createElement("a"))\r
-               .html("R")\r
-               .attr({\r
-                       title:  "hide redefined properties"\r
-               })\r
-               .click( function() {\r
-                       if($(this).hasClass("hidden")) {\r
-                               $(this).parent().parent().find("li.redef").show();\r
-                       } else {\r
-                               $(this).parent().parent().find("li.redef").hide();\r
-                       }\r
-\r
-                       $(this).toggleClass("hidden");\r
-               })\r
-       )\r
-       .append(\r
-               $(document.createElement("a"))\r
-               .html("I")\r
-               .attr({\r
-                       title:  "hide introduced properties"\r
-               })\r
-               .click( function() {\r
-                       if($(this).hasClass("hidden")) {\r
-                               $(this).parent().parent().find("li.intro").show();\r
-                       } else {\r
-                               $(this).parent().parent().find("li.intro").hide();\r
-                       }\r
-\r
-                       $(this).toggleClass("hidden");\r
-               })\r
-       );\r
-\r
-       // Filter toggle between I R in\r
-       $("article.properties.filterable .filter, article.classes.filterable .filter")\r
-       .append(\r
-               $(document.createElement("a"))\r
-               .html("I")\r
-               .attr({\r
-                       title:  "hide introduced properties"\r
-               })\r
-               .click( function() {\r
-                       if($(this).hasClass("hidden")) {\r
-                               $(this).parent().parent().find("li.intro").show();\r
-                       } else {\r
-                               $(this).parent().parent().find("li.intro").hide();\r
-                       }\r
-\r
-                       $(this).toggleClass("hidden");\r
-               })\r
-       )\r
-       .append(\r
-               $(document.createElement("a"))\r
-               .html("R")\r
-               .attr({\r
-                       title:  "hide redefined properties"\r
-               })\r
-               .click( function() {\r
-                       if($(this).hasClass("hidden")) {\r
-                               $(this).parent().parent().find("li.redef").show();\r
-                       } else {\r
-                               $(this).parent().parent().find("li.redef").hide();\r
-                       }\r
-\r
-                       $(this).toggleClass("hidden");\r
-               })\r
-       );\r
-\r
-       /*\r
-       * Anchors jumps\r
-       */\r
-       $("a[href*='#']").click( function() {\r
-               highlightBlock($(this).attr("href").split(/#/)[1]);\r
-       });\r
-\r
-       //Preload filter fields with query string\r
-       preloadFilters();\r
-       // Hide Authenfication form\r
-       $(".popover").hide();\r
-       // Display Login modal\r
-       $("#logGitHub").click(function(){ displayLogginModal(); });\r
-       // Update display\r
-       updateDisplaying();\r
-       // If cookie existing the session is opened\r
-       if(sessionStarted){ userB64 = "Basic " + getUserPass("logginNitdoc"); }\r
-\r
-       // Sign In an github user or Log out him\r
-       $("#signIn").click(function(){\r
-               if(!sessionStarted){\r
-                       if($('#loginGit').val() == "" || $('#passwordGit').val() == ""){ displayMessage('Please informed login/password field!', 40, 45); }\r
-                       else\r
-                       {\r
-                               userName = $('#loginGit').val();\r
-                               password = $('#passwordGit').val();\r
-                               githubRepo = $('#repositoryGit').val();\r
-                               branchName = $('#branchGit').val();\r
-                               userB64 = "Basic " +  base64.encode(userName+':'+password);\r
-                               if(checkSignIn()){\r
-                                       // Check if repo exist\r
-                                       isRepoExisting();\r
-                                       if(repoExist){\r
-                                               $.when(isBranchExisting()).done(function(){\r
-                                                       loginProcess = true;\r
-                                                       if(branchExist){\r
-                                                               setCookie("logginNitdoc", base64.encode(userName+':'+password+':'+githubRepo+':'+branchName), 1);\r
-                                                               $('#loginGit').val("");\r
-                                                               $('#passwordGit').val("");\r
-                                                               reloadComment();\r
-                                                       }\r
-                                               });\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       // Delete cookie and reset settings\r
-                       del_cookie("logginNitdoc");\r
-                       closeAllCommentInEdtiting();\r
-               }\r
-               displayLogginModal();\r
-       });\r
-\r
-       // Activate edit mode\r
-       $('pre[class=text_label]').click(function(){\r
-               // the customer is loggued ?\r
-               if(!sessionStarted || userName == ""){\r
-                       // No => nothing happen\r
-                       return;\r
-               }\r
-               else{\r
-                       numComment = $(this).attr('title');\r
-                       var arrayNew = $(this).text().split('\n');\r
-                       var lNew = arrayNew.length - 1;\r
-                       var adapt = "";\r
-\r
-                       for (var i = 0; i < lNew; i++) {\r
-                               adapt += arrayNew[i];\r
-                               if(i < lNew-1){ adapt += "\n"; }\r
-                       }\r
-                       editComment += 1;\r
-                       getCommentOfFunction($(this));\r
-                       // hide comment\r
-                       $(this).hide();\r
-                       // Show edit box\r
-                       $(this).next().show();\r
-                       // Show cancel button\r
-                       $(this).next().next().show();\r
-                       // Show commit button\r
-                       $(this).next().next().next().show();\r
-                       // Add text in edit box\r
-                       if($(this).next().val() == "" || $(this).next().val() != adapt){ $(this).next().val(adapt); }\r
-                       // Resize edit box\r
-                       $(this).next().height($(this).next().prop("scrollHeight"));\r
-                       resizeTextarea($(this).next());\r
-                       // Select it\r
-                       $(this).next().select();\r
-                       preElement = $(this);\r
-               }\r
-       });\r
-\r
-       // Disable the edit mode\r
-       $('a[id=cancelBtn]').click(function(){\r
-               $(this).parent().prev().children('#lblDiffCommit').text("");\r
-               showcomment = false;\r
-               closeEditing($(this));\r
-       });\r
-\r
-       // Display commit form\r
-       $('a[id=commitBtn]').click(function(){\r
-               updateComment = $(this).prev().prev().val();\r
-               commentType = $(this).prev().prev().prev().attr('type');\r
-\r
-               if(updateComment == ""){ displayMessage('The comment field is empty!', 40, 45); }\r
-               else{\r
-                       if(!sessionStarted){\r
-                               displayMessage("You need to be loggued before commit something", 45, 40);\r
-                               displayLogginModal();\r
-                               return;\r
-                       }\r
-\r
-                       // Create the commit message\r
-                       commitMessage = 'Wikidoc: modified comment in ' + $(this).parent().prev().prev().html().split(' ')[1];\r
-                       $('#commitMessage').text(commitMessage);\r
-                       $('#commitMessage').css({'display': 'block'});\r
-                       pathFile = $(this).prev().prev().prev().attr('tag');\r
-                       $('#modal').show().prepend('<a class="close"><img src="resources/icons/close.png" class="btn_close" title="Close" alt="Close" /></a>');\r
-                       $('body').append('<div id="fade"></div>');\r
-                       $('#fade').css({'filter' : 'alpha(opacity=80)'}).fadeIn();\r
-               }\r
-        });\r
-\r
-       // Close commit form\r
-       $('.btn_close').click(function(){\r
-               $(this).hide();\r
-               $(this).next().hide();\r
-               if(editComment > 0){ editComment -= 1; }\r
-               $('#chkSignedOff').attr('checked', false);\r
-               removeSignedOff();\r
-        });\r
-\r
-       //Close Popups and Fade Layer\r
-       $('body').on('click', 'a.close, #fade', function() {\r
-               if(editComment > 0){ editComment -= 1; }\r
-               $('#fade , #modal').fadeOut(function() {\r
-                       $('#fade, a.close').remove();\r
-               });\r
-               $('#modalQuestion').hide();\r
-               $('#chkSignedOff').attr('checked', false);\r
-               removeSignedOff();\r
-       });\r
-\r
-       $('#loginAction').click(function(){\r
-               var text;\r
-               var url;\r
-               var line;\r
-               // Look if the customer is logged\r
-               if(!sessionStarted){\r
-                       displayMessage("You need to be loggued before commit something", 100, 40);\r
-                       $('.popover').show();\r
-                       return;\r
-               }\r
-               else{ userB64 = "Basic " + getUserPass("logginNitdoc"); }\r
-               // Check if repo exist\r
-               isRepoExisting();\r
-               if(repoExist){\r
-                       isBranchExisting();\r
-                       if(branchExist){\r
-                               editComment -= 1;\r
-                               commitMessage = $('#commitMessage').val().replace(/\r?\n/g, '\\n').replace(/\t/g, '\\t').replace(/\"/g,'\\"');\r
-                               if(commitMessage == ""){ commitMessage = "New commit";}\r
-                               if(sessionStarted){\r
-                                       if ($.trim(updateComment) == ''){ this.value = (this.defaultValue ? this.defaultValue : ''); }\r
-                                       else{\r
-                                               displaySpinner();\r
-                                               startCommitProcess();\r
-                                       }\r
-                               }\r
-                               $('#modal, #modalQuestion').fadeOut(function() {\r
-                                       $('#login').val("");\r
-                                       $('#password').val("");\r
-                                       $('textarea').hide();\r
-                                       $('textarea').prev().show();\r
-                               });\r
-                               $('a[id=cancelBtn]').hide();\r
-                               $('a[id=commitBtn]').hide();\r
-                               $('a[id=lblDiffCommit]').text("");\r
-                               showcomment = false;\r
-                               // Re-load all comment\r
-                               reloadComment();\r
-                       }\r
-               }\r
-               else{ editComment -= 1; }\r
-               $('#chkSignedOff').attr('checked', false);\r
-       });\r
-\r
-       // Cancel creating branch\r
-       $('#btnCancelBranch').click(function(){\r
-               editComment -= 1;\r
-               $('#modalQuestion').hide();\r
-               $('#fade , #modal').fadeOut(function() { $('#fade, a.close').remove(); });\r
-               return;\r
-       });\r
-\r
-       // Create new branch and continu\r
-       $('#btnCreateBranch').click(function(){\r
-               $('#modalQuestion').hide();\r
-               if($('#btnCreateBranch').text() != 'Ok'){\r
-                       // Create the branch\r
-                       createBranch();\r
-                       commitMessage = $('#commitMessage').val().replace(/\r?\n/g, '\\n').replace(/\t/g, '\\t').replace(/\"/g,'\\"');\r
-                       if(commitMessage == ""){ commitMessage = "New commit"; }\r
-                       if(userB64 != ""){\r
-                       if(loginProcess){\r
-                                       setCookie("logginNitdoc", base64.encode(userName+':'+password+':'+githubRepo+':'+branchName), 1);\r
-                                       $('#loginGit').val("");\r
-                                       $('#passwordGit').val("");\r
-                                       loginProcess = false;\r
-                                       displayLogginModal();\r
-                       }\r
-                       else{\r
-                                       if ($.trim(updateComment) == ''){ this.value = (this.defaultValue ? this.defaultValue : ''); }\r
-                                       else{ startCommitProcess(); }\r
-                               }\r
-                   }\r
-               }\r
-               else\r
-               {\r
-                       $('#fade , #modalQuestion, #modal').fadeOut(function() { $('#fade, a.close').remove(); });\r
-               }\r
-       });\r
-\r
-       $('a[class=newComment]').click(function(){\r
-               addNewComment = true;\r
-               editComment += 1;\r
-               // hide comment\r
-               $(this).hide();\r
-               // Show edit box\r
-               $(this).next().show();\r
-               // Show cancel button\r
-               $(this).next().next().show();\r
-               // Show commit button\r
-               $(this).next().next().next().show();\r
-               // Resize edit box\r
-               $(this).next().height($(this).next().prop("scrollHeight"));\r
-               resizeTextarea($(this).next());\r
-               // Select it\r
-               $(this).next().select();\r
-               preElement = $(this);\r
-        });\r
-\r
-       $("#dropBranches").change(function () {\r
-               $("#dropBranches option:selected").each(function () {\r
-                       if(branchName != $(this).text()){\r
-                               branchName = $(this).text();\r
-                       }\r
-               });\r
-               $.when(updateCookie(userName, password, githubRepo, branchName)).done(function(){\r
-                       closeAllCommentInEdtiting();\r
-                       reloadComment();\r
-               });\r
-       });\r
-\r
-       $("pre").hover(\r
-               function () {\r
-                       if(sessionStarted == true){\r
-                               $(this).css({'cursor' : 'hand'});\r
-                       }\r
-                       else{\r
-                               $(this).css({'cursor' : ''});\r
-                       }\r
-               },\r
-               function () {\r
-                       if(sessionStarted == true){\r
-                               $(this).css({'cursor' : 'pointer'});\r
-                       }\r
-                       else{\r
-                               $(this).css({'cursor' : ''});\r
-                       }\r
-               }\r
-       );\r
-\r
-       $('#chkSignedOff').click(function(){\r
-               if($(this).is(':checked')){ addSignedOff(); }\r
-               else{ removeSignedOff(); }\r
-       })\r
-\r
-       $('a[id=lblDiffCommit]').click(function(){\r
-               showComment($(this));\r
-       });\r
-});\r
-\r
-/* Parse current URL and return anchor name */\r
-function currentAnchor() {\r
-    var index = document.location.hash.indexOf("#");\r
-    if (index >= 0) {\r
-               return document.location.hash.substring(index + 1);\r
-       }\r
-       return null;\r
-}\r
-\r
-/* Prealod filters field using search query */\r
-function preloadFilters() {\r
-       // Parse URL and get query string\r
-       var search = currentAnchor();\r
-\r
-       if(search == null || search.indexOf("q=") == -1)\r
-               return;\r
-\r
-       search = search.substring(2, search.length);\r
-\r
-       if(search == "" || search == "undefined")\r
-               return;\r
-\r
-       $(":text").val(search);\r
-       $(".filter :text")\r
-               .removeClass("notUsed")\r
-               .trigger("keyup");\r
-\r
-}\r
-\r
-/* Hightlight the spoted block */\r
-function highlightBlock(a) {\r
-       if(a == undefined) {\r
-               return;\r
-       }\r
-\r
-       $(".highlighted").removeClass("highlighted");\r
-\r
-       var target = $("#" + a);\r
-\r
-       if(target.is("article")) {\r
-               target.parent().addClass("highlighted");\r
-       }\r
-\r
-       target.addClass("highlighted");\r
-       target.show();\r
-}\r
-\r
-// Init process to commit the new comment\r
-function startCommitProcess()\r
-{\r
-       if($('#chkSignedOff').is(':checked')){\r
-               var numL = preElement.attr("title");\r
-               commentLineStart = numL.split('-')[0] - 1;\r
-               if(addNewComment) { commentLineStart++; }\r
-               commentLineEnd = (commentLineStart + preElement.text().split('\n').length) - 1;\r
-               state = true;\r
-               replaceComment(updateComment, currentfileContent);\r
-               getLastCommit();\r
-               getBaseTree();\r
-               editComment = false;\r
-       }\r
-       else{\r
-               displayMessage('Please sign this commit', 40, 40);\r
-       }\r
-}\r
-\r
-function displayLogginModal(){\r
-       if ($('.popover').is(':hidden')) {\r
-               if(sessionStarted){ getListBranches(); }\r
-               $('.popover').show();\r
-       }\r
-       else { $('.popover').hide(); }\r
-       updateDisplaying();\r
-}\r
-\r
-function updateDisplaying(){\r
-       if (checkCookie())\r
-       {\r
-               userB64 = "Basic " + getUserPass("logginNitdoc");\r
-               $('#loginGit').hide();\r
-               $('#passwordGit').hide();\r
-               $('#lbpasswordGit').hide();\r
-               $('#lbloginGit').hide();\r
-               $('#repositoryGit').hide();\r
-               $('#lbrepositoryGit').hide();\r
-               $('#lbbranchGit').hide();\r
-               $('#branchGit').hide();\r
-               $('#listBranches').show();\r
-               $('#divGitHubRepoDisplay').show();\r
-               $("#liGitHub").attr("class", "current");\r
-               $("#imgGitHub").attr("src", "resources/icons/github-icon-w.png");\r
-               $('#nickName').text(userName);\r
-               $('#githubAccount').attr("href", "https://github.com/"+userName);\r
-               $('#logginMessage').css({'display' : 'block'});\r
-               $('#logginMessage').css({'text-align' : 'center'});\r
-               $('.popover').css({'height' : '190px'});\r
-               $('#signIn').text("Sign out");\r
-               $('#githubRepoDisplay').text(githubRepo);\r
-               sessionStarted = true;\r
-               reloadComment();\r
-       }\r
-       else\r
-       {\r
-               sessionStarted = false;\r
-               $('#logginMessage').css({'display' : 'none'});\r
-               $("#liGitHub").attr("class", "");\r
-               $("#imgGitHub").attr("src", "resources/icons/github-icon.png");\r
-               $('#loginGit').val("");\r
-               $('#passwordGit').val("");\r
-               $('#nickName').text("");\r
-               $('.popover').css({'height' : '325px'});\r
-               $('#logginMessage').css({'display' : 'none'});\r
-               $('#repositoryGit').val($('#repoName').attr('name'));\r
-               $('#branchGit').val('wikidoc');\r
-               $('#signIn').text("Sign In");\r
-               $('#loginGit').show();\r
-               $('#passwordGit').show();\r
-               $('#lbpasswordGit').show();\r
-               $('#lbloginGit').show();\r
-               $('#repositoryGit').show();\r
-               $('#lbrepositoryGit').show();\r
-               $('#lbbranchGit').show();\r
-               $('#branchGit').show();\r
-               $('#listBranches').hide();\r
-               $('#divGitHubRepoDisplay').hide();\r
-       }\r
-}\r
-\r
-function setCookie(c_name, value, exdays)\r
-{\r
-       var exdate=new Date();\r
-       exdate.setDate(exdate.getDate() + exdays);\r
-       var c_value=escape(value) + ((exdays==null) ? "" : "; expires="+exdate.toUTCString());\r
-       document.cookie=c_name + "=" + c_value;\r
-}\r
-\r
-function del_cookie(c_name)\r
-{\r
-    document.cookie = c_name + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';\r
-}\r
-\r
-function updateCookie(user, pwd, repo, branch){\r
-       if(checkCookie()){\r
-               branchName = branch;\r
-               setCookie("logginNitdoc", base64.encode(user+':'+pwd+':'+repo+':'+branch), 1);\r
-       }\r
-}\r
-\r
-function getCookie(c_name)\r
-{\r
-       var c_value = document.cookie;\r
-       var c_start = c_value.indexOf(" " + c_name + "=");\r
-       if (c_start == -1) { c_start = c_value.indexOf(c_name + "="); }\r
-       if (c_start == -1) { c_value = null; }\r
-       else\r
-       {\r
-               c_start = c_value.indexOf("=", c_start) + 1;\r
-               var c_end = c_value.indexOf(";", c_start);\r
-               if (c_end == -1) { c_end = c_value.length; }\r
-               c_value = unescape(c_value.substring(c_start,c_end));\r
-       }\r
-       return c_value;\r
-}\r
-\r
-function getUserPass(c_name){\r
-       var cookie = base64.decode(getCookie(c_name));\r
-       return base64.encode(cookie.split(':')[0] + ':' + cookie.split(':')[1]);\r
-}\r
-\r
-function checkCookie()\r
-{\r
-       var cookie=getCookie("logginNitdoc");\r
-       if (cookie!=null && cookie!="")\r
-       {\r
-               cookie = base64.decode(cookie);\r
-               userName = cookie.split(':')[0];\r
-               password = cookie.split(':')[1];\r
-               githubRepo = cookie.split(':')[2];\r
-               branchName = cookie.split(':')[3];\r
-               return true;\r
-       }\r
-       else { return false; }\r
-}\r
-\r
-\r
-/*\r
-* Base64\r
-*/\r
-base64 = {};\r
-base64.PADCHAR = '=';\r
-base64.ALPHA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\r
-base64.getbyte64 = function(s,i) {\r
-    // This is oddly fast, except on Chrome/V8.\r
-    //  Minimal or no improvement in performance by using a\r
-    //   object with properties mapping chars to value (eg. 'A': 0)\r
-    var idx = base64.ALPHA.indexOf(s.charAt(i));\r
-    if (idx == -1) {\r
-    throw "Cannot decode base64";\r
-    }\r
-    return idx;\r
-}\r
-\r
-base64.decode = function(s) {\r
-    // convert to string\r
-    s = "" + s;\r
-    var getbyte64 = base64.getbyte64;\r
-    var pads, i, b10;\r
-    var imax = s.length\r
-    if (imax == 0) {\r
-        return s;\r
-    }\r
-\r
-    if (imax % 4 != 0) {\r
-    throw "Cannot decode base64";\r
-    }\r
-\r
-    pads = 0\r
-    if (s.charAt(imax -1) == base64.PADCHAR) {\r
-        pads = 1;\r
-        if (s.charAt(imax -2) == base64.PADCHAR) {\r
-            pads = 2;\r
-        }\r
-        // either way, we want to ignore this last block\r
-        imax -= 4;\r
-    }\r
-\r
-    var x = [];\r
-    for (i = 0; i < imax; i += 4) {\r
-        b10 = (getbyte64(s,i) << 18) | (getbyte64(s,i+1) << 12) |\r
-            (getbyte64(s,i+2) << 6) | getbyte64(s,i+3);\r
-        x.push(String.fromCharCode(b10 >> 16, (b10 >> 8) & 0xff, b10 & 0xff));\r
-    }\r
-\r
-    switch (pads) {\r
-    case 1:\r
-        b10 = (getbyte64(s,i) << 18) | (getbyte64(s,i+1) << 12) | (getbyte64(s,i+2) << 6)\r
-        x.push(String.fromCharCode(b10 >> 16, (b10 >> 8) & 0xff));\r
-        break;\r
-    case 2:\r
-        b10 = (getbyte64(s,i) << 18) | (getbyte64(s,i+1) << 12);\r
-        x.push(String.fromCharCode(b10 >> 16));\r
-        break;\r
-    }\r
-    return x.join('');\r
-}\r
-\r
-base64.getbyte = function(s,i) {\r
-    var x = s.charCodeAt(i);\r
-    if (x > 255) {\r
-        throw "INVALID_CHARACTER_ERR: DOM Exception 5";\r
-    }\r
-    return x;\r
-}\r
-\r
-\r
-base64.encode = function(s) {\r
-    if (arguments.length != 1) {\r
-    throw "SyntaxError: Not enough arguments";\r
-    }\r
-    var padchar = base64.PADCHAR;\r
-    var alpha   = base64.ALPHA;\r
-    var getbyte = base64.getbyte;\r
-\r
-    var i, b10;\r
-    var x = [];\r
-\r
-    // convert to string\r
-    s = "" + s;\r
-\r
-    var imax = s.length - s.length % 3;\r
-\r
-    if (s.length == 0) {\r
-        return s;\r
-    }\r
-    for (i = 0; i < imax; i += 3) {\r
-        b10 = (getbyte(s,i) << 16) | (getbyte(s,i+1) << 8) | getbyte(s,i+2);\r
-        x.push(alpha.charAt(b10 >> 18));\r
-        x.push(alpha.charAt((b10 >> 12) & 0x3F));\r
-        x.push(alpha.charAt((b10 >> 6) & 0x3f));\r
-        x.push(alpha.charAt(b10 & 0x3f));\r
-    }\r
-    switch (s.length - imax) {\r
-    case 1:\r
-        b10 = getbyte(s,i) << 16;\r
-        x.push(alpha.charAt(b10 >> 18) + alpha.charAt((b10 >> 12) & 0x3F) +\r
-               padchar + padchar);\r
-        break;\r
-    case 2:\r
-        b10 = (getbyte(s,i) << 16) | (getbyte(s,i+1) << 8);\r
-        x.push(alpha.charAt(b10 >> 18) + alpha.charAt((b10 >> 12) & 0x3F) +\r
-               alpha.charAt((b10 >> 6) & 0x3f) + padchar);\r
-        break;\r
-    }\r
-    return x.join('');\r
-}\r
-\r
-\r
-\r
-function getLastCommit()\r
-{\r
-       var urlHead = '';\r
-       if(sessionStarted){ urlHead = "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/refs/heads/"+branchName;}\r
-       else{\r
-               // TODO: get url of the original repo.\r
-               return;\r
-       }\r
-\r
-    $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if (userB64 != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: urlHead,\r
-        dataType:"json",\r
-        async: false,\r
-        success: function(success)\r
-        {\r
-            shaLastCommit = success.object.sha;\r
-        }\r
-    });\r
-}\r
-\r
-function getBaseTree()\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if (userB64 != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/commits/" + shaLastCommit,\r
-        dataType:"json",\r
-        async: false,\r
-        success: function(success)\r
-        {\r
-            shaBaseTree = success.tree.sha;\r
-            if (state){ setBlob(); }\r
-            else{ return; }\r
-        },\r
-        error: function(){\r
-       return;\r
-        }\r
-    });\r
-}\r
-\r
-function setNewTree()\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) { xhr.setRequestHeader ("Authorization", userB64); },\r
-        type: "POST",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/trees",\r
-        async: false,\r
-        dataType:'json',\r
-        data:'{ "base_tree" : "'+shaBaseTree+'", '+\r
-                '"tree":[{ '+\r
-                    '"path":"'+ pathFile +'",'+\r
-                    '"mode":"100644",'+\r
-                    '"type":"blob",'+\r
-                    '"sha": "'+ shaBlob +'"'+\r
-                '}] '+\r
-            '}',\r
-        success: function(success)\r
-        { // si l'appel a bien fonctionné\r
-            shaNewTree = success.sha;\r
-            setNewCommit();\r
-        },\r
-        error: function(){\r
-       return;\r
-        }\r
-    });\r
-}\r
-\r
-function setNewCommit()\r
-{\r
-    addSignedOff();\r
-    $.ajax({\r
-        beforeSend: function (xhr) { xhr.setRequestHeader ("Authorization", userB64); },\r
-        type: "POST",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/commits",\r
-        async: false,\r
-        dataType:'json',\r
-        data:'{ "message" : "'+ commitMessage +'", '+\r
-                '"parents" :"'+shaLastCommit+'",'+\r
-                '"tree": "'+shaNewTree+'"'+\r
-             '}',\r
-        success: function(success)\r
-        {\r
-            shaNewCommit = success.sha;\r
-            commit();\r
-        },\r
-        error: function(){\r
-       return;\r
-        }\r
-    });\r
-}\r
-\r
-//Create a commit\r
-function commit()\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) { xhr.setRequestHeader ("Authorization", userB64); },\r
-        type: "POST",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/refs/heads/"+branchName,\r
-        dataType:'json',\r
-        data:'{ "sha" : "'+shaNewCommit+'", '+\r
-                '"force" :"true"'+\r
-             '}',\r
-        success: function(success) { displayMessage('Commit created successfully', 40, 40); },\r
-        error:function(error){ displayMessage('Error ' + error.object.message, 40, 40); }\r
-    });\r
-}\r
-\r
-// Create a blob\r
-function setBlob()\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) { xhr.setRequestHeader ("Authorization",  userB64); },\r
-        type: "POST",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/blobs",\r
-        async: false,\r
-        dataType:'json',\r
-        data:'{ "content" : "'+text.replace(/\r?\n/g, '\\n').replace(/\t/g, '\\t').replace(/\"/g,'\\"')+'", '+\r
-                '"encoding" :"utf-8"'+\r
-            '}',\r
-        success: function(success)\r
-        {\r
-            shaBlob = success.sha;\r
-            setNewTree();\r
-        },\r
-        error:function(error){\r
-       displayMessage('Error : Problem parsing JSON', 40, 40);\r
-       return;\r
-       }\r
-    });\r
-}\r
-\r
-// Display file content\r
-function getFileContent(urlFile, newComment)\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) {\r
-            xhr.setRequestHeader ("Accept",  "application/vnd.github-blob.raw");\r
-            if (userB64 != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: urlFile,\r
-        async:false,\r
-        success: function(success)\r
-        {\r
-            state = true;\r
-            replaceComment(newComment, success);\r
-        }\r
-    });\r
-}\r
-\r
-function replaceComment(newComment, fileContent){\r
-       var arrayNew = newComment.split('\n');\r
-       var lNew = arrayNew.length;\r
-       text = "";\r
-       var lines = fileContent.split("\n");\r
-       for (var i = 0; i < lines.length; i++) {\r
-               if(i == commentLineStart){\r
-                       if(addNewComment){\r
-                               for(var indexLine=0; indexLine < lines[i+1].length; indexxLine++){\r
-                                       if(lines[i+1].substr(indexLine,1) == "\t" || lines[i+1].substr(indexLine,1) == "#"){ text += lines[i+1].substr(indexLine,1); }\r
-                                       else{ break;}\r
-                               }\r
-                               text += lines[i] + "\n";\r
-                       }\r
-                       // We change the comment\r
-                       for(var j = 0; j < lNew; j++){\r
-                               if(commentType == 1){ text += "\t# " + arrayNew[j] + "\n"; }\r
-                               else{\r
-                                       if(arrayNew[j] == ""){ text += "#"+"\n"; }\r
-                                       else{ text += "# " + arrayNew[j] + "\n"; }\r
-                               }\r
-                       }\r
-               }\r
-               else if(i < commentLineStart || i >= commentLineEnd){\r
-                       if(i == lines.length-1){ text += lines[i]; }\r
-                       else{ text += lines[i] + "\n"; }\r
-               }\r
-       }\r
-       if(addNewComment){\r
-               addNewComment = false;\r
-       }\r
-}\r
-\r
-function getCommentLastCommit(path, origin){\r
-       var urlRaw;\r
-       var bkBranch = '';\r
-       if(origin){// We want to get the original file\r
-               bkBranch = branchName;\r
-               branchName = "master";\r
-       }\r
-       getLastCommit();\r
-       if(shaLastCommit != ""){\r
-               if (checkCookie()) {\r
-                       urlRaw="https://rawgithub.com/"+ userName +"/"+ githubRepo +"/" + shaLastCommit + "/" + path;\r
-                       $.ajax({\r
-                           type: "GET",\r
-                           url: urlRaw,\r
-                           async: false,\r
-                           success: function(success)\r
-                           {\r
-                                   if(origin){ originalFileContent = success; }\r
-                                   else{ currentfileContent = success; }\r
-                           }\r
-                       });\r
-               }\r
-       }\r
-       if(origin){ branchName = bkBranch; }\r
-}\r
-\r
-function displayMessage(msg, widthDiv, margModal){\r
-       spinner.stop();\r
-       $('#modal').hide();\r
-       $('#btnCancelBranch').hide();\r
-       $('#modalQuestion').show().prepend('<a class="close"><img src="resources/icons/close.png" class="btnCloseQuestion" title="Close" alt="Close" /></a>');\r
-       $('#txtQuestion').text(msg);\r
-       $('#btnCreateBranch').text("Ok");\r
-       var xModal = $('#modalQuestion').css('width').split('px')[0];\r
-       var yModal = $('#modalQuestion').css('height').split('px')[0];\r
-       var x = $(document).width/2 - xModal/2;\r
-       var y = $(document).height/2 - yModal/2;\r
-       var xBtnBranch = $('#btnCreateBranch').css('width').split('px')[0];\r
-       $('#modalQuestion').css({'left' : x, 'top' : y});\r
-       $('#modalQuestion').show();\r
-       $('#btnCreateBranch').css('margin-left', xModal/2 - xBtnBranch);\r
-       $('body').append('<div id="fade"></div>');\r
-       $('#fade').css({'filter' : 'alpha(opacity=80)'}).fadeIn();\r
-}\r
-\r
-function displaySpinner(){\r
-       spinner.spin(targetSpinner);\r
-       $("#waitCommit").show();\r
-}\r
-\r
-// Check if the repo already exist\r
-function isRepoExisting(){\r
-       $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if (userB64 != "") { xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo,\r
-        async:false,\r
-        dataType:'json',\r
-        success: function(){ repoExist = true; },\r
-        error: function()\r
-        {\r
-       displayMessage('Repo not found !', 35, 45);\r
-       repoExist = false;\r
-        }\r
-    });\r
-}\r
-\r
-// Check if the branch already exist\r
-function isBranchExisting(){\r
-       $.ajax({\r
-               beforeSend: function (xhr) {\r
-                       if (userB64 != "") { xhr.setRequestHeader ("Authorization", userB64); }\r
-               },\r
-               type: "GET",\r
-               url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/refs/heads/"+branchName,\r
-               async:false,\r
-               dataType:'json',\r
-               success: function(){ branchExist = true; },\r
-               error: function()\r
-               {\r
-                       branchExist = false;\r
-                       editComment -= 1;\r
-                       $('#modal').hide();\r
-                       $('#txtQuestion').text("Are you sure you want to create that branch ?");\r
-                       $('#btnCancelBranch').show();\r
-                       $('#btnCreateBranch').text("Yes");\r
-                       $('#modalQuestion').show();\r
-                       $('#modalQuestion').show().prepend('<a class="close"><img src="resources/icons/close.png" class="btnCloseQuestion" title="Close" alt="Close" /></a>');\r
-                       $('body').append('<div id="fade"></div>');\r
-                       $('#fade').css({'filter' : 'alpha(opacity=80)'}).fadeIn();\r
-               }\r
-       });\r
-}\r
-\r
-function getMasterSha()\r
-{\r
-    $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if (userB64 != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/refs/heads/master",\r
-        dataType:"json",\r
-        async: false,\r
-        success: function(success) { shaMaster = success.object.sha; }\r
-    });\r
-}\r
-\r
-function createBranch(){\r
-\r
-       getMasterSha();\r
-\r
-       $.ajax({\r
-        beforeSend: function (xhr) { xhr.setRequestHeader ("Authorization", userB64); },\r
-        type: "POST",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/git/refs",\r
-        data:'{ "ref" : "refs/heads/'+branchName+'",'+\r
-               '"sha" : "'+shaMaster+'"'+\r
-            '}',\r
-        success: function(){ return; },\r
-        error: function(){\r
-       editComment -= 1;\r
-       displayMessage('Impossible to create the new branch : ' + branchName, 40, 40);\r
-        }\r
-    });\r
-}\r
-\r
-$.fn.spin = function(opts) {\r
-  this.each(function() {\r
-    var $this = $(this),\r
-        data = $this.data();\r
-\r
-    if (data.spinner) {\r
-      data.spinner.stop();\r
-      delete data.spinner;\r
-    }\r
-    if (opts !== false) {\r
-      data.spinner = new Spinner($.extend({color: $this.css('color')}, opts)).spin(this);\r
-    }\r
-  });\r
-  return this;\r
-};\r
-\r
-function reloadComment(){\r
-       var path = $('pre[class=text_label]').attr('tag');\r
-       $.when(getCommentLastCommit(path, false)).done(function(){\r
-               if(sessionStarted){ getCommentLastCommit(path, true); }\r
-               $('pre[class=text_label]').each(function(){ getCommentOfFunction($(this)); });\r
-       });\r
-}\r
-\r
-function getCommentOfFunction(element){\r
-       var textC = "";\r
-       var numL = element.attr("title");\r
-       if(numL != null){\r
-               commentLineStart = numL-1;\r
-               commentLineEnd = element.attr('name').split(numL)[1].split('-')[1]-1;\r
-               var lines = currentfileContent.split("\n");\r
-               for (var i = 0; i < lines.length; i++) {\r
-                       if(i >= commentLineStart-1 && i <= commentLineEnd+1){\r
-                               if (lines[i].substr(1,1) == "#"){ textC += lines[i].substr(3,lines[i].length) + "\n";}\r
-                               else if(lines[i].substr(0,1) == '#'){ textC += lines[i].substr(2,lines[i].length) + "\n"; }\r
-               }\r
-           }\r
-           if(textC != element.text){element.text(textC);}\r
-           if (textC != "" && editComment > 0){\r
-               var originContent = originalFileContent.split("\n");\r
-               var origin = '';\r
-               var lblDiff = element.parent().prev().children('#lblDiffCommit');\r
-               var preSave = element.parent().children('#preSave');\r
-               for (var i = 0; i < originContent.length; i++) {\r
-                       if(i >= commentLineStart-1 && i <= commentLineEnd+1){\r
-                               if (originContent[i].substr(1,1) == "#"){ origin += originContent[i].substr(3,originContent[i].length) + "\n";}\r
-                               else if(originContent[i].substr(0,1) == '#'){ origin += originContent[i].substr(2,originContent[i].length) + "\n"; }\r
-                       }\r
-               }\r
-               if(textC != origin && numL == numComment){\r
-                       // The comment is different compare to the original\r
-                       if(showcomment == false){ lblDiff.text("Show original comment"); }\r
-                       preSave.text(origin);\r
-               }\r
-               else if (numL == numComment){ lblDiff.text(""); }\r
-           }\r
-       }\r
-}\r
-\r
-// Get list of branches\r
-function getListBranches()\r
-{\r
-       cleanListBranches();\r
-    $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if ($("#login").val() != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo+"/branches",\r
-        async:false,\r
-        dataType:'json',\r
-        success: function(success)\r
-        {\r
-            for(var branch in success) {\r
-       var selected = '';\r
-       if(branchName == success[branch].name){\r
-               selected = 'selected';\r
-       }\r
-       $('#dropBranches').append('<option value="" '+ selected +'>' + success[branch].name + '</option>');\r
-            }\r
-        }\r
-    });\r
-}\r
-\r
-// Delete all option in the list\r
-function cleanListBranches(){\r
-       $('#dropBranches').children("option").remove();\r
-}\r
-\r
-function closeAllCommentInEdtiting(){\r
-       $('a[id=cancelBtn]').each(function(){\r
-               closeEditing($(this));\r
-       });\r
-}\r
-\r
-function closeEditing(tag){\r
-       if(editComment > 0){ editComment -= 1; }\r
-       // Hide itself\r
-       tag.hide();\r
-       // Hide commitBtn\r
-       tag.next().hide();\r
-       // Hide Textarea\r
-       tag.prev().hide();\r
-       // Show comment\r
-       tag.prev().prev().show();\r
-}\r
-\r
-function checkSignIn(){\r
-       var response = false;\r
-       $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if ($("#login").val() != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/repos/"+userName+"/"+githubRepo,\r
-        async:false,\r
-        dataType:'json',\r
-        success: function(success)\r
-        {\r
-       getUserInfo();\r
-       response = true;\r
-       displayMessage('You are now logged in');\r
-        },\r
-        error: function()\r
-        {\r
-       displayMessage('Error : Wrong username or password');\r
-       response = false;\r
-        }\r
-    });\r
-    return response;\r
-}\r
-\r
-function getUserInfo(){\r
-       $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if ($("#login").val() != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/user/emails",\r
-        async:false,\r
-        dataType:'json',\r
-        success: function(success)\r
-        {\r
-       userEmail = success;\r
-        }\r
-    });\r
-}\r
-\r
-function getSignedOff(){\r
-       $.ajax({\r
-        beforeSend: function (xhr) {\r
-            if ($("#login").val() != ""){ xhr.setRequestHeader ("Authorization", userB64); }\r
-        },\r
-        type: "GET",\r
-        url: "https://api.github.com/users/"+userName,\r
-        async:false,\r
-        dataType:'json',\r
-        success: function(success)\r
-        {\r
-       signedOff = success.name;\r
-        }\r
-    });\r
-}\r
-\r
-function addSignedOff(){\r
-       $.when(getUserInfo()).done(function(){\r
-               $.when(getSignedOff()).done(function(){\r
-                       $('#commitMessage').val($('#commitMessage').val() + "\n\nSigned-off-by: "+signedOff+" <"+userEmail+">");\r
-               });\r
-       });\r
-       resizeTextarea($('#commitMessage'));\r
-}\r
-\r
-function removeSignedOff(){\r
-       $('#commitMessage').val(commitMessage);\r
-       resizeTextarea($('#commitMessage'));\r
-}\r
-\r
-function resizeTextarea(element){\r
-       var nLines = element.val().split('\n').length + 1;\r
-       element.attr('rows', nLines);\r
-}\r
-\r
-function showComment(element){\r
-       // Display the original comment\r
-       if (showcomment == true){\r
-               showcomment = false;\r
-               element.text("Show original comment");\r
-       }\r
-       else{\r
-               // Show the comment updated in user's repo\r
-               showcomment = true;\r
-               element.text("Comment changed in "+githubRepo+" / "+branchName);\r
-       }\r
-       var parent = element.parent().next(".description");\r
-       var textarea = parent.children('#fileContent');\r
-       var text = textarea.val();\r
-       var preSave = parent.children('#preSave');\r
-       textarea.val(preSave.text());\r
-       preSave.text(text);\r
-       // Resize edit box\r
-       textarea.height(textarea.prop("scrollHeight"));\r
-       resizeTextarea(textarea);\r
-}\r
similarity index 91%
rename from share/ni_nitdoc/styles/Nitdoc.UI.css
rename to share/nitdoc/styles/Nitdoc.UI.css
index 3265cc0..35c5343 100644 (file)
@@ -58,6 +58,12 @@ article:hover > .signature button.nitdoc-ui-copy, button.nitdoc-ui-copy.zeroclip
        visibility: visible;\r
 }\r
 \r
+/* Search page field */\r
+\r
+.nitdoc-ui-searchpage-field {\r
+       width: 750px;\r
+}\r
+\r
 /* Side bar boxes text filtering */\r
 \r
 .nitdoc-ui-filter {\r
index d45e1cc..d9174f4 100644 (file)
@@ -1,7 +1,6 @@
 /* General */\r
 \r
 body {\r
-       margin: 0;\r
        font: 14px "Helvetica Neue", Helvetica, Tahoma, sans-serif;\r
 }\r
 \r
@@ -24,11 +23,16 @@ pre, code {
        font-size: 1em;\r
 }\r
 \r
-pre {\r
+.description div.comment {\r
        background: #EEE;\r
-       padding: 5px;\r
        color: black;\r
        overflow: auto;\r
+       padding: 0 0 0 12px;\r
+       margin: 1em 0 0 0;\r
+}\r
+\r
+.description textarea.baseComment {\r
+       display: none;\r
 }\r
 \r
 hr {\r
@@ -60,76 +64,98 @@ h3 {
 \r
 /* Page display */\r
 \r
-body {\r
+html {\r
+       height: 100%;\r
        overflow: hidden;\r
+}\r
+\r
+body {\r
        height: 100%;\r
+       margin: 0;\r
 }\r
 \r
 header {\r
+       position: fixed;\r
+       z-index: 600;\r
+       left: 0;\r
+       right: 0;\r
 }\r
 \r
 .page {\r
-       width: 937px;\r
        margin: auto;\r
+       height: 100%;\r
 }\r
 \r
-.menu {\r
+.sidebar {\r
        position: fixed;\r
+       z-index: 500;\r
        top: 50px;\r
-       bottom: 2em;\r
+       bottom: 1em;\r
        width: 250px;\r
        overflow-y:     scroll;\r
 }\r
 \r
+.sidebar nav:last-child {\r
+       margin-bottom: 0;\r
+}\r
+\r
 .content {\r
        position: fixed;\r
+       z-index: 500;\r
        top: 50px;\r
-       bottom: 2em;\r
+       bottom: 1em;\r
+       left: 0;\r
+       right: 0;\r
        margin-left: 265px;\r
-       width: 667px;\r
        overflow-y:     scroll;\r
+       margin-right: 5px;\r
        padding-right: 10px;\r
 }\r
 \r
 .content.fullpage {\r
        margin-left: 20px;\r
-       width: 910px;\r
+       width: auto;\r
+}\r
+\r
+.page.footed .content, .page.footed .sidebar {\r
+       bottom: 2em;\r
 }\r
 \r
 footer {\r
        position: fixed;\r
+       z-index: 500;\r
        bottom: 0;\r
        width: 100%;\r
 }\r
 \r
 /* Webkit scroll bars */\r
 \r
-.menu {\r
+.sidebar {\r
     overflow-y: hidden;\r
 }\r
 \r
-.menu:hover {\r
+.sidebar:hover {\r
     overflow-y: scroll;\r
 }\r
 \r
-.menu::-webkit-scrollbar, .content::-webkit-scrollbar {\r
+.sidebar::-webkit-scrollbar, .content::-webkit-scrollbar {\r
     width: 10px;\r
 }\r
 \r
-.menu::-webkit-scrollbar-thumb, .content::-webkit-scrollbar-thumb {\r
+.sidebar::-webkit-scrollbar-thumb, .content::-webkit-scrollbar-thumb {\r
        background: #CCC;\r
        -webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.10),inset 0 -1px 0 rgba(0,0,0,0.07);\r
 }\r
 \r
-.menu::-webkit-scrollbar-thumb:hover, .content::-webkit-scrollbar-thumb:hover {\r
+.sidebar::-webkit-scrollbar-thumb:hover, .content::-webkit-scrollbar-thumb:hover {\r
        background: #999;\r
 }\r
 \r
-.menu::-webkit-scrollbar-corner, .content::-webkit-scrollbar-corner {\r
+.sidebar::-webkit-scrollbar-corner, .content::-webkit-scrollbar-corner {\r
        background: transparent;\r
 }\r
 \r
-.menu::-webkit-scrollbar-button, .content::-webkit-scrollbar-button {\r
+.sidebar::-webkit-scrollbar-button, .content::-webkit-scrollbar-button {\r
        width: 0;\r
        height: 0;\r
        display: none;\r
@@ -140,7 +166,6 @@ footer {
 header nav ul {\r
        padding: 0;\r
        list-style-type: none;\r
-       width: 900px;\r
        margin: auto;\r
 }\r
 \r
@@ -151,14 +176,6 @@ header nav ul li {
        color: #999;\r
 }\r
 \r
-header nav ul li a {\r
-       color: black;\r
-}\r
-\r
-header nav ul li a:hover {\r
-       color: #0D8921;\r
-}\r
-\r
 footer {\r
        text-align: center;\r
        padding-bottom: 10px;\r
@@ -168,62 +185,66 @@ footer {
 /* Main menu */\r
 \r
 header nav.main {\r
-       background: #E0E0E0 url(../resources/top_back.gif) repeat-x top left;\r
+       background: #f1f1f1;\r
+       border-bottom: 1px solid #ddd;\r
        padding: 7px 0;\r
 }\r
 \r
 header nav.main ul li.current {\r
        background: #0D8921;\r
-       color: white;\r
+       border-radius: 2px;\r
+       -moz-border-radius: 2px;\r
+       -webkit-border-radius: 2px;\r
+       border: 1px solid #1d7900;\r
+       color: #fff;\r
+       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
+       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
+       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
 }\r
 \r
-/* Latteral Menu */\r
+/* Sidebar */\r
 \r
-.menu nav {\r
+.sidebar nav {\r
        margin: 20px;\r
        width: 208px;\r
-       border: 1px solid #CCC;\r
+       border: 1px solid #ddd;\r
 }\r
 \r
-.menu nav:first-child {\r
+.sidebar nav:first-child {\r
        margin-top: 0;\r
 }\r
 \r
-.menu nav h3 {\r
+.sidebar nav h3 {\r
        margin: 0;\r
        padding: 5px;\r
-       background: #CCC;\r
+       background: #f1f1f1;\r
        font-size: 1em;\r
 }\r
 \r
-.menu nav h4 {\r
+.sidebar nav h4 {\r
        font-weight: bold;\r
        color: #555555;\r
        margin: 10px 0 0 10px;\r
        font-size: 12px;\r
 }\r
 \r
-.menu nav h4:last-child {\r
+.sidebar nav h4:last-child {\r
        margin-bottom: 5px;\r
 }\r
 \r
-.menu nav ul {\r
+.sidebar nav ul {\r
        margin: 10px;\r
        padding: 0;\r
        list-style-type: none;\r
 }\r
 \r
-.menu nav ul li {\r
+.sidebar nav ul li {\r
        overflow: hidden;\r
        color: #CCC;\r
 }\r
 \r
 /* Content */\r
 \r
-.content section {\r
-       margin: 20px 0;\r
-}\r
-\r
 .content article {\r
        color: #6C6C6C;\r
        background-repeat: no-repeat;\r
@@ -234,7 +255,7 @@ header nav.main ul li.current {
 \r
 .content article h3 {\r
        margin: 0;\r
-       font-weight: normal;\r
+       font-weight: bold;\r
        color: #333;\r
 }\r
 \r
@@ -262,8 +283,7 @@ header nav.main ul li.current {
        padding-left: 10px;\r
 }\r
 \r
-nav ul li span,\r
-.content article ul li span {\r
+nav ul li span {\r
        color: #CCC;\r
        text-align: center;\r
        font-family: monospace;\r
@@ -285,7 +305,7 @@ nav ul li span,
        color: #555;\r
 }\r
 \r
-.content article.highlighted {\r
+.content article:target {\r
        background-color: #FFF3C2;\r
        color: black;\r
 }\r
@@ -294,27 +314,47 @@ nav ul li span,
        color: #6C6C6C;\r
 }\r
 \r
+.content a {\r
+       color: #0D8921;\r
+}\r
+\r
 .content a:hover {\r
        color: #333;\r
 }\r
 \r
-.content a {\r
+.info {\r
+       color: #6C6C6C;\r
+}\r
+\r
+.info a {\r
+       color: #333;\r
+}\r
+\r
+.info a:hover {\r
        color: #0D8921;\r
 }\r
 \r
+\r
 article .info .code {\r
        float: right;\r
 }\r
 \r
+.description .inheritance {\r
+       text-align: right;\r
+       margin: 2px;\r
+\r
+}\r
+\r
 .content .concern-doc {\r
-       border-top: 3px dotted #CCC;\r
+       border-bottom: 1px dashed #CCC;\r
        padding: 5px 0;\r
-       color: #999;\r
+       color: #6C6C6C;\r
 }\r
 \r
 .content section.concerns {\r
        padding: 10px;\r
        border: 1px solid #ccc;\r
+\r
 }\r
 \r
 .content section.concerns h2 {\r
@@ -340,508 +380,88 @@ article .info .code {
 }\r
 \r
 .content section.methods h3.concern-toplevel {\r
-       border-top: 3px dotted #CCC;\r
-       padding-top: 0.83em;\r
-       color: #999;\r
+       padding: 10px;\r
+       border: 1px solid #ccc;\r
+       color: #6C6C6C;\r
 }\r
 \r
 .show-code {\r
        margin: 0;\r
 }\r
 \r
-/* JS facilities */\r
+/* Icons */\r
+\r
+.type.public, .interface.public, .abstract.class.public { background-image: url('../resources/icons/vtype_public.png')}\r
+.type.protected, .interface.protected, .abstract.class.protected { background-image: url('../resources/icons/vtype_protected.png')}\r
+.type.private, .interface.private, .abstract.class.private { background-image: url('../resources/icons/vtype_private.png')}\r
+.init.public, .enum.public { background-image: url('../resources/icons/const_public.png')}\r
+.init.protected, .enum.protected { background-image: url('../resources/icons/const_protected.png')}\r
+.init.private, .enum.private { background-image: url('../resources/icons/const_private.png')}\r
+.fun.public, .class.public, .extern.public { background-image: url('../resources/icons/meth_public.png')}\r
+.fun.protected, .class.protected, .extern.protected { background-image: url('../resources/icons/meth_protected.png')}\r
+.fun.private, .class.private, .extern.private { background-image: url('../resources/icons/meth_private.png')}\r
+\r
+/* Form elements */\r
 \r
 input[type=text] {\r
-       width: 150px;\r
        border: 1px solid #CCC;\r
-       margin-right: 5px;\r
        padding: 1px 2px;\r
 }\r
 \r
-input[type=text].notUsed {\r
-       color: #999;\r
-       font-style: italic;\r
-}\r
-\r
-nav .filter {\r
-       text-align: center;\r
-       padding: 5px;\r
-}\r
-\r
 nav.main input[type=text] {\r
        margin: -2px 10px;\r
        color: black;\r
        font-style: normal;\r
 }\r
 \r
-nav.main form {\r
-       float: right;\r
-}\r
-\r
-.filter a {\r
-       color: #0D8921;\r
-       cursor: pointer;\r
-       font-family: monospace;\r
-       margin-right: 5px;\r
-   font-weight: bold;\r
-}\r
-\r
-.filter a.hidden {\r
-       color: #999;\r
-   font-weight: normal;\r
-}\r
+/* New comments style */\r
 \r
-.filter a:hover {\r
-       text-decoration: underline;\r
+.content .nitdoc {\r
+  background: #F7F7F7;\r
+  padding: 5px;\r
+  color: black;\r
+  overflow: auto;\r
 }\r
 \r
-nav h3 a.fold {\r
-       margin: 0 5px;\r
-       color: #999;\r
-       font-family: monospace;\r
-       font-weight: bold;\r
-       font-size: 120%;\r
-       cursor: pointer;\r
+.content .nitdoc pre {\r
+  background: #EEE;\r
 }\r
 \r
-.hide {\r
-       overflow-y: hidden;\r
-       height: 0;\r
+.content .nitdoc code {\r
+  background: #DDD;\r
+  padding: 0 1px;\r
 }\r
 \r
-/* Icons */\r
-.vtype.public { background-image: url('../resources/icons/vtype_public.png')}\r
-.vtype.protected { background-image: url('../resources/icons/vtype_protected.png')}\r
-.vtype.private { background-image: url('../resources/icons/vtype_private.png')}\r
-.init.public { background-image: url('../resources/icons/const_public.png')}\r
-.init.protected { background-image: url('../resources/icons/const_protected.png')}\r
-.init.private { background-image: url('../resources/icons/const_private.png')}\r
-.fun.public { background-image: url('../resources/icons/meth_public.png')}\r
-.fun.protected { background-image: url('../resources/icons/meth_protected.png')}\r
-.fun.private { background-image: url('../resources/icons/meth_private.png')}\r
-\r
-/* Quick Search */\r
-\r
-#search {\r
-       width: 300px;\r
+.rawcode {\r
 }\r
 \r
-#searchTable {\r
-       background-color: #FFFFFF;\r
-       border: 1px solid #E0E0E0;\r
-       border-spacing: 0px;\r
-       z-index: 10; /* the menu must be over the rest of the page. */\r
-}\r
+.nitcode a { color: inherit; text-decoration: inherit; } /* hide links */\r
+.nitcode a:hover { text-decoration: underline; } /* underline links */\r
+.nitcode span[title]:hover { text-decoration: underline; } /* underline titles */\r
+/* lexical raw tokens. independent of usage or semantic: */\r
+.nitcode .nc_c { color: gray; font-style: italic; } /* comment */\r
+.nitcode .nc_d { color: #3D8127; font-style: italic; } /* documentation comments */\r
+.nitcode .nc_k { font-weight: bold; } /* keyword */\r
+.nitcode .nc_o {} /* operator */\r
+.nitcode .nc_i {} /* standard identifier */\r
+.nitcode .nc_t { color: #445588; font-weight: bold; } /* type/class identifier */\r
+.nitcode .nc_a { color: #445588; font-style: italic; } /* old style attribute identifier */\r
+.nitcode .nc_l { color: #009999; } /* char and number literal */\r
+.nitcode .nc_s { color: #8F1546; } /* string literal */\r
+/* syntactic token usage. added because of their position in the AST */\r
+.nitcode .nc_ast { color: blue; } /* assert label */\r
+.nitcode .nc_la { color: blue; } /* break/continue label */\r
+.nitcode .nc_m { color: #445588; } /* module name */\r
+/* syntactic groups */\r
+.nitcode .nc_def { font-weight: bold; color: blue; } /* name used in a definition */\r
+.nitcode .nc_def.nc_a { color: blue; } /* name used in a attribute definition */\r
+.nitcode .nc_def.nc_t { color: blue; } /* name used in a class or vt definition */\r
+.nitcode .nc_ss { color: #9E6BEB; } /* superstrings */\r
+.nitcode .nc_cdef {} /* A whole class definition */\r
+.nitcode .nc_pdef {} /* A whole property definition */\r
+/* semantic token usage */\r
+.nitcode .nc_v { font-style: italic; } /* local variable or parameter */\r
+.nitcode .nc_vt { font-style: italic; } /* virtual type or formal type */\r
 \r
-#searchTable .activeSearchResult {\r
-       cursor: pointer;\r
-       background: #EEE;\r
-}\r
+.nitcode .nc_error { border: 1px red solid;} /* not used */\r
 \r
-#searchTable td {\r
-       white-space: nowrap;\r
-       overflow: hidden;\r
-       line-height: 22px;\r
-       padding: 2px;\r
-       width: 25%;\r
-}\r
-\r
-#searchTable td.entryInfo {\r
-       color: #0D8921;\r
-       font-size: small;\r
-       width: 75%;\r
-       text-align: right;\r
-}\r
-\r
-textarea {\r
-       margin: 10px;\r
-       font-family: monospace;\r
-       font-size: 1em;\r
-       width: 100%;\r
-}\r
-#commitBtn, #cancelBtn{\r
-       float: right;\r
-       margin-right: 10px;\r
-}\r
-#commitBtn:hover, #cancelBtn:hover, #lblDiffCommit:hover{\r
-       cursor: hand; cursor: pointer;\r
-}\r
-\r
-#waitCommit { /*--Masque opaque noir de fond--*/\r
-       display: none;\r
-       top: 40%; left: 40%;\r
-       z-index: 99999;\r
-}\r
-#fade { /*--Masque opaque noir de fond--*/\r
-       display: none; /*--masqué par défaut--*/\r
-       background: #000;\r
-       position: fixed; left: 0; top: 0;\r
-       width: 100%; height: 100%;\r
-       opacity: .80;\r
-       z-index: 9999;\r
-}\r
-#modal{\r
-       display: none; /*--masqué par défaut--*/\r
-       background: #fff;\r
-       padding: 20px;\r
-       border: 3px solid #ddd;\r
-       float: left;\r
-       font-size: 1.2em;\r
-       position: fixed;\r
-       top: 20%; left: 40%;\r
-       z-index: 99999;\r
-       /*--Les différentes définitions de Box Shadow en CSS3--*/\r
-       -webkit-box-shadow: 0px 0px 20px #000;\r
-       -moz-box-shadow: 0px 0px 20px #000;\r
-       box-shadow: 0px 0px 20px #000;\r
-       /*--Coins arrondis en CSS3--*/\r
-       -webkit-border-radius: 10px;\r
-       -moz-border-radius: 10px;\r
-       border-radius: 10px;\r
-}\r
-\r
-#modal #logginName{\r
-       display: none; /*--masqué par défaut--*/\r
-       background: #fff;\r
-       padding: 20px;\r
-       margin-bottom: 400px;\r
-       font-size: 1.2em;\r
-}\r
-\r
-#modalQuestion{\r
-       display: none; /*--masqué par défaut--*/\r
-       background: #fff;\r
-       padding: 20px;\r
-       border: 3px solid #ddd;\r
-       float: left;\r
-       font-size: 1.2em;\r
-       position: fixed;\r
-       top: 20%; left: 40%;\r
-       z-index: 99999;\r
-       /*--Les différentes définitions de Box Shadow en CSS3--*/\r
-       -webkit-box-shadow: 0px 0px 20px #000;\r
-       -moz-box-shadow: 0px 0px 20px #000;\r
-       box-shadow: 0px 0px 20px #000;\r
-       /*--Coins arrondis en CSS3--*/\r
-       -webkit-border-radius: 10px;\r
-       -moz-border-radius: 10px;\r
-       border-radius: 10px;\r
-}\r
-\r
-#btnCreateBranch, #btnCancelBranch{\r
-       padding: 6px 7px;\r
-       -moz-border-bottom-colors: none;\r
-    -moz-border-left-colors: none;\r
-    -moz-border-right-colors: none;\r
-    -moz-border-top-colors: none;\r
-    background-color: #F5F5F5;\r
-    background-image: linear-gradient(to bottom, #FFFFFF, #E6E6E6);\r
-    background-repeat: repeat-x;\r
-    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) #B3B3B3;\r
-    border-image: none;\r
-    border-radius: 4px 4px 4px 4px;\r
-    border-style: solid;\r
-    border-width: 1px;\r
-    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);\r
-    color: #333333;\r
-    cursor: pointer;\r
-    display: inline-block;\r
-    font-size: 14px;\r
-    line-height: 20px;\r
-    margin-bottom: 0;\r
-    padding: 4px 12px;\r
-    text-align: center;\r
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);\r
-    vertical-align: middle;\r
-    margin-top: 5%;\r
-    margin-left: 10px;\r
-\r
-}\r
-\r
-#btnCreateBranch{\r
-       margin-left: 35%;\r
-}\r
-\r
-img.btn_close, img.btnCloseQuestion {\r
-       float: right;\r
-       margin: -35px -35px 0 0;\r
-}\r
-fieldset {\r
-    margin-bottom: 20px;\r
-}\r
-\r
-#login, #password, #commitMessage, #repoCommit, #branchName{\r
-       border: 1px solid #ccc;\r
-       padding: 6px 7px;\r
-       outline: none;\r
-       -moz-border-radius: 2px;\r
-       -webkit-border-radius: 2px;\r
-       border-radius: 2px;\r
-       font: 13px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;\r
-       color: #777;\r
-       margin: 0;\r
-       width: 210px;\r
-       max-width: 100%;\r
-       display: block;\r
-       margin-bottom: 20px;\r
-       background: #fff;\r
-}\r
-\r
-.connect-button a{\r
-       display: block;\r
-       cursor: pointer;\r
-       margin: 0 0 20px 0;\r
-       background-color: #92C929;\r
-       background-image: -webkit-gradient(linear, left top, left bottom, from(#92C929), to(#1d7900)); /* Saf4+, Chrome */\r
-       background-image: -webkit-linear-gradient(top, #92C929, #1d7900); /* Chrome 10+, Saf5.1+ */\r
-       background-image:    -moz-linear-gradient(top, #92C929, #1d7900); /* FF3.6 */\r
-       background-image:     -ms-linear-gradient(top, #92C929, #1d7900); /* IE10 */\r
-       background-image:      -o-linear-gradient(top, #92C929, #1d7900); /* Opera 11.10+ */\r
-       background-image:         linear-gradient(top, #92C929, #1d7900);\r
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#92C929', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-       border-radius: 4px;\r
-       -moz-border-radius: 4px;\r
-       -webkit-border-radius: 4px;\r
-       -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;\r
-       box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -moz-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -webkit-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       border: 1px solid #1d7900;\r
-       color: #fff;\r
-       font-weight: 300;\r
-       font-size: 14px;\r
-       padding: 5px 7px 5px 7px;\r
-       text-align: center;\r
-       margin-top: 0px;\r
-}\r
-\r
-.connect-button a:hover{\r
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#9AD42C), to(#1d7900)); /* Saf4+, Chrome */\r
-    background-image: -webkit-linear-gradient(top, #9AD42C, #1d7900); /* Chrome 10+, Saf5.1+ */\r
-    background-image:    -moz-linear-gradient(top, #9AD42C, #1d7900); /* FF3.6 */\r
-    background-image:     -ms-linear-gradient(top, #9AD42C, #1d7900); /* IE10 */\r
-    background-image:      -o-linear-gradient(top, #9AD42C, #1d7900); /* Opera 11.10+ */\r
-    background-image:         linear-gradient(top, #92C929, #1d7900);\r
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#9AD42C', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-}\r
-\r
-.connect-button a:active{\r
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#73BD39), to(#1d7900)); /* Saf4+, Chrome */\r
-    background-image: -webkit-linear-gradient(top, #73BD39, #1d7900); /* Chrome 10+, Saf5.1+ */\r
-    background-image:    -moz-linear-gradient(top, #73BD39, #1d7900); /* FF3.6 */\r
-    background-image:     -ms-linear-gradient(top, #73BD39, #1d7900); /* IE10 */\r
-    background-image:      -o-linear-gradient(top, #73BD39, #1d7900); /* Opera 11.10+ */\r
-    background-image:         linear-gradient(top, #73BD39, #1d7900);\r
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#73BD39', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-}\r
-\r
-.connect-button a strong{\r
-    color: #fff;\r
-    font-weight: 600;\r
-}\r
-\r
-.connect-button a:hover{\r
-    text-decoration: none;\r
-}\r
-\r
-.connect-button a img{\r
-    margin-right: 7px;\r
-    margin-bottom: -3px;\r
-    height: 16px;\r
-    width: 16px;\r
-}\r
-\r
-.popover a:hover {\r
-       color: #333;\r
-       cursor: hand; cursor: pointer;\r
-}\r
-\r
-.popover a {\r
-       color: #0D8921;\r
-       margin-bottom: 10px;\r
-}\r
-\r
-.popover {\r
-       position: absolute;\r
-       width : 220px;\r
-       height:280px;\r
-       margin-left: -102px;\r
-       z-index: 1010;\r
-       display: block;\r
-       max-width: 276px;\r
-       padding: 1px;\r
-       text-align: left;\r
-       white-space: normal;\r
-       background-color: #ffffff;\r
-       border: 1px solid #ccc;\r
-       border: 1px solid rgba(0, 0, 0, 0.2);\r
-       -webkit-border-radius: 6px;\r
-        -moz-border-radius: 6px;\r
-             border-radius: 6px;\r
-       -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
-        -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
-             box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
-       -webkit-background-clip: padding-box;\r
-        -moz-background-clip: padding;\r
-             background-clip: padding-box;\r
-}\r
-\r
-.popover.bottom {\r
-       margin-top: 10px;\r
-}\r
-\r
-.popover-title {\r
-       padding: 8px 14px;\r
-       margin: 0;\r
-       font-size: 14px;\r
-       font-weight: normal;\r
-       line-height: 18px;\r
-       background-color: #f7f7f7;\r
-       border-bottom: 1px solid #ebebeb;\r
-       -webkit-border-radius: 5px 5px 0 0;\r
-        -moz-border-radius: 5px 5px 0 0;\r
-             border-radius: 5px 5px 0 0;\r
-}\r
-\r
-.popover-title:empty {\r
-       display: none;\r
-}\r
-\r
-.popover-content {\r
-       padding: 9px 14px;\r
-}\r
-\r
-.popover .arrow,\r
-.popover .arrow:after {\r
-       position: absolute;\r
-       display: block;\r
-       width: 0;\r
-       height: 0;\r
-       border-color: transparent;\r
-       border-style: solid;\r
-}\r
-\r
-.popover .arrow {\r
-       border-width: 11px;\r
-}\r
-\r
-.popover .arrow:after {\r
-       border-width: 10px;\r
-       content: "";\r
-}\r
-\r
-.popover.bottom .arrow {\r
-       top: -11px;\r
-       left: 50%;\r
-       margin-left: -11px;\r
-       border-bottom-color: #999;\r
-       border-bottom-color: rgba(0, 0, 0, 0.25);\r
-       border-top-width: 0;\r
-}\r
-\r
-.popover.bottom .arrow:after {\r
-       top: 1px;\r
-       margin-left: -10px;\r
-       border-bottom-color: #ffffff;\r
-       border-top-width: 0;\r
-}\r
-\r
-#logGitHub{\r
-       cursor: hand; cursor: pointer;\r
-       height: 17px;\r
-       width: 17px;\r
-}\r
-\r
-#liGitHub{\r
-       float:right;\r
-       margin-top:-4px;\r
-       height: 20px;\r
-}\r
-\r
-#liGitHub input {\r
-       margin: 4px 10px 5px 10px;\r
-       color: black;\r
-       font-style: normal;\r
-       font-size: 12px;\r
-       border: 1px solid #CCC;\r
-}\r
-\r
-#lbloginGit, #lbpasswordGit, #lbrepositoryGit, #lbbranchGit, #lblSignedOff{\r
-       color: black;\r
-       font-style: normal;\r
-       margin-left: 10px;\r
-       margin-top: 10px;\r
-}\r
-#logginMessage , #lbBranches{\r
-       color: black;\r
-       font-style: normal;\r
-       text-align: center;\r
-       margin-top: 10px;\r
-}\r
-\r
-#divlogIn{\r
-       text-align: center;\r
-}\r
-\r
-#signIn{\r
-       display: block;\r
-       cursor: pointer;\r
-       margin: 10px 10px 5px 10px;\r
-       background-color: #92C929;\r
-       background-image: -webkit-gradient(linear, left top, left bottom, from(#92C929), to(#1d7900)); /* Saf4+, Chrome */\r
-       background-image: -webkit-linear-gradient(top, #92C929, #1d7900); /* Chrome 10+, Saf5.1+ */\r
-       background-image:    -moz-linear-gradient(top, #92C929, #1d7900); /* FF3.6 */\r
-       background-image:     -ms-linear-gradient(top, #92C929, #1d7900); /* IE10 */\r
-       background-image:      -o-linear-gradient(top, #92C929, #1d7900); /* Opera 11.10+ */\r
-       background-image:         linear-gradient(top, #92C929, #1d7900);\r
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#92C929', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-       border-radius: 4px;\r
-       -moz-border-radius: 4px;\r
-       -webkit-border-radius: 4px;\r
-       -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;\r
-       box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -moz-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       -webkit-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
-       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
-       border: 1px solid #1d7900;\r
-       color: #fff;\r
-       font-weight: 300;\r
-       font-size: 14px;\r
-       padding: 5px 7px 5px 7px;\r
-       text-align: center;\r
-}\r
-\r
-#passwordGit, #loginGit, #repositoryGit, #branchGit, #signedOff{\r
-       height:30px;\r
-       width: 200px;\r
-}\r
-\r
-#imgGitHub{\r
-       width:20px;\r
-}\r
-\r
-#dropBranches{\r
-       font-size: 12px;\r
-       height:20px;\r
-}\r
-\r
-#listBranches, #divGitHubRepoDisplay{\r
-       color: #000000;\r
-       display:block;\r
-       text-align:center;\r
-       margin-top: 15px;\r
-       margin-bottom: 15px;\r
-}\r
-\r
-.githubTitle{\r
-       text-align:center;\r
-}\r
-\r
-#preSave{\r
-       display: none;\r
-}\r
index 5f151ab..70b0911 100644 (file)
@@ -16,7 +16,7 @@
 
 NITCOPT=
 
-all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/nit ../bin/nitx ../bin/netdbg ../bin/dbgcli ../bin/nitdox ../bin/nitunit ../bin/nitlight
+all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/nit ../bin/nitx ../bin/netdbg ../bin/dbgcli ../bin/nitunit ../bin/nitlight
 
 ../bin/nitc: ../c_src/nitc parser/parser.nit
        @echo '***************************************************************'
@@ -67,13 +67,6 @@ all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/
        ./git-gen-version.sh
        ../bin/nitg ${NITCOPT} -o ../bin/nitx -v nitx.nit
 
-../bin/nitdox: ../bin/nitg
-       @echo '***************************************************************'
-       @echo '* Compile nitdcx from NIT source files                        *'
-       @echo '***************************************************************'
-       ./git-gen-version.sh
-       ../bin/nitg ${NITCOPT} -o ../bin/nitdox -v ni_nitdoc.nit
-
 ../bin/netdbg : ../bin/nitc
        @echo '***************************************************************'
        @echo '* Compile netdbg from NIT source files                          *'
diff --git a/src/ni_nitdoc.nit b/src/ni_nitdoc.nit
deleted file mode 100644 (file)
index 7f2e529..0000000
+++ /dev/null
@@ -1,1812 +0,0 @@
-# This file is part of NIT ( http://www.nitlanguage.org ).
-#
-# 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.
-
-# Documentation generator for the nit language.
-# Generate API documentation in HTML format from nit source code.
-module ni_nitdoc
-
-import model_utils
-import modelize_property
-import markdown
-
-# The NitdocContext contains all the knowledge used for doc generation
-class NitdocContext
-
-       private var toolcontext = new ToolContext
-       private var model: Model
-       private var mbuilder: ModelBuilder
-       private var mainmodule: MModule
-       private var class_hierarchy: POSet[MClass]
-       private var arguments: Array[String]
-       private var output_dir: nullable String
-       private var dot_dir: nullable String
-       private var share_dir: nullable String
-       private var source: nullable String
-       private var min_visibility: MVisibility
-
-       private var opt_dir = new OptionString("Directory where doc is generated", "-d", "--dir")
-       private var opt_source = new OptionString("What link for source (%f for filename, %l for first line, %L for last line)", "--source")
-       private var opt_sharedir = new OptionString("Directory containing the nitdoc files", "--sharedir")
-       private var opt_nodot = new OptionBool("Do not generate graphes with graphiviz", "--no-dot")
-       private var opt_private: OptionBool = new OptionBool("Generate the private API", "--private")
-
-       private var opt_custom_title: OptionString = new OptionString("Title displayed in the top of the Overview page and as suffix of all page names", "--custom-title")
-       private var opt_custom_menu_items: OptionString = new OptionString("Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)", "--custom-menu-items")
-       private var opt_custom_overview_text: OptionString = new OptionString("Text displayed as introduction of Overview page before the modules list", "--custom-overview-text")
-       private var opt_custom_footer_text: OptionString = new OptionString("Text displayed as footer of all pages", "--custom-footer-text")
-
-       private var opt_github_origin: OptionString = new OptionString("The branch where edited commits will be pulled into (ex: user:repo:branch)", "--github-origin")
-
-       init do
-               toolcontext.option_context.add_option(opt_dir)
-               toolcontext.option_context.add_option(opt_source)
-               toolcontext.option_context.add_option(opt_sharedir)
-               toolcontext.option_context.add_option(opt_nodot)
-               toolcontext.option_context.add_option(opt_private)
-               toolcontext.option_context.add_option(opt_custom_title)
-               toolcontext.option_context.add_option(opt_custom_footer_text)
-               toolcontext.option_context.add_option(opt_custom_overview_text)
-               toolcontext.option_context.add_option(opt_custom_menu_items)
-               toolcontext.option_context.add_option(opt_github_origin)
-               toolcontext.process_options
-               self.arguments = toolcontext.option_context.rest
-
-               if arguments.length < 1 then
-                       print "usage: nitdoc [options] file..."
-                       toolcontext.option_context.usage
-                       exit(1)
-               end
-
-               model = new Model
-               mbuilder = new ModelBuilder(model, toolcontext)
-               # Here we load an process all modules passed on the command line
-               var mmodules = mbuilder.parse(arguments)
-               if mmodules.is_empty then return
-               mbuilder.run_phases
-
-               if mmodules.length == 1 then
-                       mainmodule = mmodules.first
-               else
-                       # We need a main module, so we build it by importing all modules
-                       mainmodule = new MModule(model, null, "<main>", new Location(null, 0, 0, 0, 0))
-                       mainmodule.set_imported_mmodules(mmodules)
-               end
-               self.class_hierarchy = mainmodule.flatten_mclass_hierarchy
-               self.process_options
-       end
-
-       private fun process_options do
-               if not opt_dir.value is null then
-                       output_dir = opt_dir.value
-               else
-                       output_dir = "doc"
-               end
-               if not opt_sharedir.value is null then
-                       share_dir = opt_sharedir.value
-               else
-                       var dir = "NIT_DIR".environ
-                       if dir.is_empty then
-                               dir = "{sys.program_name.dirname}/../share/ni_nitdoc"
-                       else
-                               dir = "{dir}/share/ni_nitdoc"
-                       end
-                       share_dir = dir
-                       if share_dir is null then
-                               print "Error: Cannot locate nitdoc share files. Uses --sharedir or envvar NIT_DIR"
-                               abort
-                       end
-                       dir = "{share_dir.to_s}/scripts/js-facilities.js"
-                       if share_dir is null then
-                               print "Error: Invalid nitdoc share files. Check --sharedir or envvar NIT_DIR"
-                               abort
-                       end
-
-                       if opt_private.value then
-                               min_visibility = none_visibility
-                       else
-                               min_visibility = protected_visibility
-                       end
-               end
-               source = opt_source.value
-       end
-
-       fun generate_nitdoc do
-               # Create destination dir if it's necessary
-               if not output_dir.file_exists then output_dir.mkdir
-               sys.system("cp -r {share_dir.to_s}/* {output_dir.to_s}/")
-               self.dot_dir = null
-               if not opt_nodot.value then self.dot_dir = output_dir.to_s
-               overview
-               search
-               modules
-               classes
-               quicksearch_list
-       end
-
-       private fun overview do
-               var overviewpage = new NitdocOverview(self, dot_dir)
-               overviewpage.save("{output_dir.to_s}/index.html")
-       end
-
-       private fun search do
-               var searchpage = new NitdocSearch(self)
-               searchpage.save("{output_dir.to_s}/search.html")
-       end
-
-       private fun modules do
-               for mmodule in model.mmodules do
-                       if mmodule.name == "<main>" then continue
-                       var modulepage = new NitdocModule(mmodule, self, dot_dir)
-                       modulepage.save("{output_dir.to_s}/{mmodule.url}")
-               end
-       end
-
-       private fun classes do
-               for mclass in mbuilder.model.mclasses do
-                       var classpage = new NitdocClass(mclass, self, dot_dir, source)
-                       classpage.save("{output_dir.to_s}/{mclass.url}")
-               end
-       end
-
-       private fun quicksearch_list do
-               var file = new OFStream.open("{output_dir.to_s}/quicksearch-list.js")
-               file.write("var nitdocQuickSearchRawList = \{ ")
-               for mmodule in model.mmodules do
-                       file.write("\"{mmodule.name}\": [")
-                       file.write("\{txt: \"{mmodule.full_name}\", url:\"{mmodule.url}\" \},")
-                       file.write("],")
-               end
-               for mclass in model.mclasses do
-                       if mclass.visibility < min_visibility then continue
-                       file.write("\"{mclass.name}\": [")
-                       file.write("\{txt: \"{mclass.full_name}\", url:\"{mclass.url}\" \},")
-                       file.write("],")
-               end
-               var name2mprops = new HashMap[String, Set[MPropDef]]
-               for mproperty in model.mproperties do
-                       if mproperty.visibility < min_visibility then continue
-                       if mproperty isa MAttribute then continue
-                       if not name2mprops.has_key(mproperty.name) then name2mprops[mproperty.name] = new HashSet[MPropDef]
-                       name2mprops[mproperty.name].add_all(mproperty.mpropdefs)
-               end
-               for mproperty, mpropdefs in name2mprops do
-                       file.write("\"{mproperty}\": [")
-                       for mpropdef in mpropdefs do
-                               file.write("\{txt: \"{mpropdef.full_name}\", url:\"{mpropdef.url}\" \},")
-                       end
-                       file.write("],")
-               end
-               file.write(" \};")
-               file.close
-       end
-
-end
-
-# Nitdoc base page
-abstract class NitdocPage
-
-       var dot_dir: nullable String
-       var source: nullable String
-       var ctx: NitdocContext
-
-       init(ctx: NitdocContext) do
-               self.ctx = ctx
-       end
-
-       protected fun head do
-               append("<meta charset='utf-8'/>")
-               append("<script type='text/javascript' src='scripts/jquery-1.7.1.min.js'></script>")
-               append("<script type='text/javascript' src='scripts/ZeroClipboard.min.js'></script>")
-               append("<script type='text/javascript' src='scripts/Nitdoc.UI.js'></script>")
-               append("<script type='text/javascript' src='scripts/Markdown.Converter.js'></script>")
-               append("<script type='text/javascript' src='scripts/base64.js'></script>")
-               append("<script type='text/javascript' src='scripts/Nitdoc.GitHub.js'></script>")
-               append("<script type='text/javascript' src='quicksearch-list.js'></script>")
-               append("<script type='text/javascript' src='scripts/Nitdoc.QuickSearch.js'></script>")
-               append("<link rel='stylesheet' href='styles/main.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='styles/Nitdoc.UI.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='styles/Nitdoc.QuickSearch.css' type='text/css' media='screen'/>")
-               append("<link rel='stylesheet' href='styles/Nitdoc.GitHub.css' type='text/css' media='screen'/>")
-               var title = ""
-               if ctx.opt_custom_title.value != null then
-                       title = " | {ctx.opt_custom_title.value.to_s}"
-               end
-               append("<title>{self.title}{title}</title>")
-       end
-
-       protected fun menu do
-               if ctx.opt_custom_menu_items.value != null then
-                       append(ctx.opt_custom_menu_items.value.to_s)
-               end
-       end
-
-       protected fun title: String is abstract
-
-       protected fun header do
-               append("<header>")
-               append("<nav class='main'>")
-               append("<ul>")
-               menu
-               append("</ul>")
-               append("</nav>")
-               append("</header>")
-       end
-
-       protected fun content is abstract
-
-       protected fun footer do
-               if ctx.opt_custom_footer_text.value != null then
-                       append("<footer>{ctx.opt_custom_footer_text.value.to_s}</footer>")
-               end
-       end
-
-       # Generate a clickable graphviz image using a dot content
-       protected fun generate_dot(dot: String, name: String, alt: String) do
-               var output_dir = dot_dir
-               if output_dir == null then return
-               var file = new OFStream.open("{output_dir}/{name}.dot")
-               file.write(dot)
-               file.close
-               sys.system("\{ test -f {output_dir}/{name}.png && test -f {output_dir}/{name}.s.dot && diff {output_dir}/{name}.dot {output_dir}/{name}.s.dot >/dev/null 2>&1 ; \} || \{ cp {output_dir}/{name}.dot {output_dir}/{name}.s.dot && dot -Tpng -o{output_dir}/{name}.png -Tcmapx -o{output_dir}/{name}.map {output_dir}/{name}.s.dot ; \}")
-               append("<article class='graph'>")
-               append("<img src='{name}.png' usemap='#{name}' style='margin:auto' alt='{alt}'/>")
-               append("</article>")
-               var fmap = new IFStream.open("{output_dir}/{name}.map")
-               append(fmap.read_all)
-               fmap.close
-       end
-
-       # Add a (source) link for a given location
-       protected fun show_source(l: Location): String
-       do
-               if source == null then
-                       return "({l.file.filename.simplify_path})"
-               else
-                       # THIS IS JUST UGLY ! (but there is no replace yet)
-                       var x = source.split_with("%f")
-                       source = x.join(l.file.filename.simplify_path)
-                       x = source.split_with("%l")
-                       source = x.join(l.line_start.to_s)
-                       x = source.split_with("%L")
-                       source = x.join(l.line_end.to_s)
-                       return " (<a target='_blank' title='Show source' href=\"{source.to_s}\">source</a>)"
-               end
-       end
-
-       # Render the page as a html string
-       protected fun render do
-               append("<!DOCTYPE html>")
-               append("<head>")
-               head
-               append("</head>")
-               append("<body")
-               if not ctx.opt_github_origin.value == null then
-                       append(" data-github-origin='{ctx.opt_github_origin.value.as(not null)}'")
-               end
-               append(">")
-               header
-               var footed = ""
-               if ctx.opt_custom_footer_text.value != null then footed = "footed"
-               append("<div class='page {footed}'>")
-               content
-               append("</div>")
-               footer
-               append("</body>")
-       end
-
-       # Append a string to the page
-       fun append(s: String) do out.write(s)
-
-       # Save html page in the specified file
-       fun save(file: String) do
-               self.out = new OFStream.open(file)
-               render
-               self.out.close
-       end
-       private var out: nullable OFStream
-end
-
-# The overview page
-class NitdocOverview
-       super NitdocPage
-       private var mbuilder: ModelBuilder
-       private var mmodules = new Array[MModule]
-
-       init(ctx: NitdocContext, dot_dir: nullable String) do
-               super(ctx)
-               self.mbuilder = ctx.mbuilder
-               self.dot_dir = dot_dir
-               # get modules
-               var mmodules = new HashSet[MModule]
-               for mmodule in mbuilder.model.mmodules do
-                       if mmodule.name == "<main>" then continue
-                       var owner = mmodule.public_owner
-                       if owner != null then
-                               mmodules.add(owner)
-                       else
-                               mmodules.add(mmodule)
-                       end
-               end
-               # sort modules
-               var sorter = new MModuleNameSorter
-               self.mmodules.add_all(mmodules)
-               sorter.sort(self.mmodules)
-       end
-
-       redef fun title do return "Overview"
-
-       redef fun menu do
-               super
-               append("<li class='current'>Overview</li>")
-               append("<li><a href='search.html'>Search</a></li>")
-       end
-
-       redef fun content do
-               append("<div class='content fullpage'>")
-               var title = "Overview"
-               if ctx.opt_custom_title.value != null then
-                       title = ctx.opt_custom_title.value.to_s
-               end
-               append("<h1>{title}</h1>")
-               var text = ""
-               if ctx.opt_custom_overview_text.value != null then
-                       text = ctx.opt_custom_overview_text.value.to_s
-               end
-               append("<article class='overview'>{text}</article>")
-               append("<article class='overview'>")
-               # module list
-               append("<h2>Modules</h2>")
-               append("<ul>")
-               for mmodule in mmodules do
-                       if mbuilder.mmodule2nmodule.has_key(mmodule) then
-                               var amodule = mbuilder.mmodule2nmodule[mmodule]
-                               append("<li>")
-                               mmodule.html_link(self)
-                               append("&nbsp;{amodule.short_comment}</li>")
-                       end
-               end
-               append("</ul>")
-               # module graph
-               process_generate_dot
-               append("</article>")
-               append("</div>")
-       end
-
-       private fun process_generate_dot do
-               # build poset with public owners
-               var poset = new POSet[MModule]
-               for mmodule in mmodules do
-                       poset.add_node(mmodule)
-                       for omodule in mmodules do
-                               if mmodule == omodule then continue
-                               if mmodule.in_importation < omodule then
-                                       poset.add_node(omodule)
-                                       poset.add_edge(mmodule, omodule)
-                               end
-                       end
-               end
-               # build graph
-               var op = new Buffer
-               op.append("digraph dep \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               for mmodule in poset do
-                       op.append("\"{mmodule.name}\"[URL=\"{mmodule.url}\"];\n")
-                       for omodule in poset[mmodule].direct_greaters do
-                               op.append("\"{mmodule.name}\"->\"{omodule.name}\";\n")
-                       end
-               end
-               op.append("\}\n")
-               generate_dot(op.to_s, "dep", "Modules hierarchy")
-       end
-end
-
-# The search page
-class NitdocSearch
-       super NitdocPage
-
-       init(ctx: NitdocContext) do
-               super(ctx)
-               self.dot_dir = null
-       end
-
-       redef fun title do return "Search"
-
-       redef fun menu do
-               super
-               append("<li><a href='index.html'>Overview</a></li>")
-               append("<li class='current'>Search</li>")
-       end
-
-       redef fun content do
-               append("<div class='content fullpage'>")
-               append("<h1>{title}</h1>")
-               module_column
-               classes_column
-               properties_column
-               append("</div>")
-       end
-
-       # Add to content modules column
-       private fun module_column do
-               var sorted = ctx.mbuilder.model.mmodule_importation_hierarchy.to_a
-               var sorter = new MModuleNameSorter
-               sorter.sort(sorted)
-               append("<article class='modules filterable'>")
-               append("<h2>Modules</h2>")
-               append("<ul>")
-               for mmodule in sorted do
-                       append("<li>")
-                       mmodule.html_link(self)
-                       append("</li>")
-               end
-               append("</ul>")
-               append("</article>")
-       end
-
-       # Add to content classes modules
-       private fun classes_column do
-               var sorted = ctx.mbuilder.model.mclasses
-               var sorter = new MClassNameSorter
-               sorter.sort(sorted)
-               append("<article class='modules filterable'>")
-               append("<h2>Classes</h2>")
-               append("<ul>")
-               for mclass in sorted do
-                       if mclass.visibility < ctx.min_visibility then continue
-                       append("<li>")
-                       mclass.html_link(self)
-                       append("</li>")
-               end
-               append("</ul>")
-               append("</article>")
-       end
-
-       # Insert the properties column of fullindex page
-       private fun properties_column do
-               var sorted = ctx.mbuilder.model.mproperties
-               var sorter = new MPropertyNameSorter
-               sorter.sort(sorted)
-               append("<article class='modules filterable'>")
-               append("<h2>Properties</h2>")
-               append("<ul>")
-               for mproperty in sorted do
-                       if mproperty.visibility < ctx.min_visibility then continue
-                       if mproperty isa MAttribute then continue
-                       append("<li>")
-                       mproperty.intro.html_link(self)
-                       append(" (")
-                       mproperty.intro.mclassdef.mclass.html_link(self)
-                       append(")</li>")
-               end
-               append("</ul>")
-               append("</article>")
-       end
-
-end
-
-# A module page
-class NitdocModule
-       super NitdocPage
-
-       private var mmodule: MModule
-       private var mbuilder: ModelBuilder
-       private var local_mclasses = new HashSet[MClass]
-       private var intro_mclasses = new HashSet[MClass]
-       private var redef_mclasses = new HashSet[MClass]
-
-       init(mmodule: MModule, ctx: NitdocContext, dot_dir: nullable String) do
-               super(ctx)
-               self.mmodule = mmodule
-               self.mbuilder = ctx.mbuilder
-               self.dot_dir = dot_dir
-               # get local mclasses
-               for m in mmodule.in_nesting.greaters do
-                       for mclassdef in m.mclassdefs do
-                               if mclassdef.mclass.visibility < ctx.min_visibility then continue
-                               if mclassdef.is_intro then
-                                       intro_mclasses.add(mclassdef.mclass)
-                               else
-                                       if mclassdef.mclass.mpropdefs_in_module(self).is_empty then continue
-                                       redef_mclasses.add(mclassdef.mclass)
-                               end
-                               local_mclasses.add(mclassdef.mclass)
-                       end
-               end
-       end
-
-       redef fun title do
-               if mbuilder.mmodule2nmodule.has_key(mmodule) and not mbuilder.mmodule2nmodule[mmodule].short_comment.is_empty then
-                       var nmodule = mbuilder.mmodule2nmodule[mmodule]
-                       return "{mmodule.html_name} module | {nmodule.short_comment}"
-               else
-                       return "{mmodule.html_name} module"
-               end
-       end
-
-       redef fun menu do
-               super
-               append("<li><a href='index.html'>Overview</a></li>")
-               append("<li class='current'>{mmodule.html_name}</li>")
-               append("<li><a href='search.html'>Search</a></li>")
-       end
-
-       redef fun content do
-               append("<div class='sidebar'>")
-               classes_column
-               importation_column
-               append("</div>")
-               append("<div class='content'>")
-               module_doc
-               append("</div>")
-       end
-
-       private fun classes_column do
-               var sorter = new MClassNameSorter
-               var sorted = new Array[MClass]
-               sorted.add_all(intro_mclasses)
-               sorted.add_all(redef_mclasses)
-               sorter.sort(sorted)
-               if not sorted.is_empty then
-                       append("<nav class='properties filterable'>")
-                       append("<h3>Classes</h3>")
-                       append("<h4>Classes</h4>")
-                       append("<ul>")
-                       for mclass in sorted do mclass.html_sidebar_item(self)
-                       append("</ul>")
-                       append("</nav>")
-               end
-       end
-
-       private fun importation_column do
-               append("<nav>")
-               append("<h3>Module Hierarchy</h3>")
-               var dependencies = new Array[MModule]
-               for dep in mmodule.in_importation.greaters do
-                       if dep == mmodule or dep.direct_owner == mmodule or dep.public_owner == mmodule then continue
-                       dependencies.add(dep)
-               end
-               if mmodule.in_nesting.direct_greaters.length > 0 then
-                       append("<h4>Nested Modules</h4>")
-                       display_module_list(mmodule.in_nesting.direct_greaters.to_a)
-               end
-               if dependencies.length > 0 then
-                       append("<h4>All dependencies</h4>")
-                       display_module_list(dependencies)
-               end
-               var clients = new Array[MModule]
-               for dep in mmodule.in_importation.smallers do
-                       if dep.name == "<main>" then continue
-                       if dep == mmodule then continue
-                       clients.add(dep)
-               end
-               if clients.length > 0 then
-                       append("<h4>All clients</h4>")
-                       display_module_list(clients)
-               end
-               append("</nav>")
-       end
-
-       private fun display_module_list(list: Array[MModule]) do
-               append("<ul>")
-               var sorter = new MModuleNameSorter
-               sorter.sort(list)
-               for m in list do
-                       append("<li>")
-                       m.html_link(self)
-                       append("</li>")
-               end
-               append("</ul>")
-       end
-
-       private fun module_doc do
-               # title
-               append("<h1>{mmodule.html_name}</h1>")
-               append("<div class='subtitle info'>")
-               mmodule.html_signature(self)
-               append("</div>")
-               # comment
-               mmodule.html_comment(self)
-               process_generate_dot
-               # classes
-               var class_sorter = new MClassNameSorter
-               # intro
-               if not intro_mclasses.is_empty then
-                       var sorted = new Array[MClass]
-                       sorted.add_all(intro_mclasses)
-                       class_sorter.sort(sorted)
-                       append("<section class='classes'>")
-                       append("<h2 class='section-header'>Introduced classes</h2>")
-                       for mclass in sorted do mclass.html_full_desc(self)
-                       append("</section>")
-               end
-               # redefs
-               var redefs = new Array[MClass]
-               for mclass in redef_mclasses do if not intro_mclasses.has(mclass) then redefs.add(mclass)
-               class_sorter.sort(redefs)
-               if not redefs.is_empty then
-                       append("<section class='classes'>")
-                       append("<h2 class='section-header'>Refined classes</h2>")
-                       for mclass in redefs do mclass.html_full_desc(self)
-                       append("</section>")
-               end
-       end
-
-       private fun process_generate_dot do
-               # build poset with public owners
-               var poset = new POSet[MModule]
-               for mmodule in self.mmodule.in_importation.poset do
-                       if mmodule.name == "<main>" then continue
-                       #if mmodule.public_owner != null then continue
-                       if not mmodule.in_importation < self.mmodule and not self.mmodule.in_importation < mmodule and mmodule != self.mmodule then continue
-                       poset.add_node(mmodule)
-                       for omodule in mmodule.in_importation.poset do
-                               if mmodule == omodule then continue
-                               if omodule.name == "<main>" then continue
-                               if not omodule.in_importation < self.mmodule and not self.mmodule.in_importation < omodule then continue
-                               if omodule.in_importation < mmodule then
-                                       poset.add_node(omodule)
-                                       poset.add_edge(omodule, mmodule)
-                               end
-                               if mmodule.in_importation < omodule then
-                                       poset.add_node(omodule)
-                                       poset.add_edge(mmodule, omodule)
-                               end
-                               #if omodule.public_owner != null then continue
-                               #if mmodule.in_importation < omodule then
-                                       #poset.add_node(omodule)
-                                       #poset.add_edge(mmodule, omodule)
-                               #end
-                       end
-               end
-               # build graph
-               var op = new Buffer
-               var name = "dep_{mmodule.name}"
-               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               for mmodule in poset do
-                       if mmodule == self.mmodule then
-                               op.append("\"{mmodule.name}\"[shape=box,margin=0.03];\n")
-                       else
-                               op.append("\"{mmodule.name}\"[URL=\"{mmodule.url}\"];\n")
-                       end
-                       for omodule in poset[mmodule].direct_greaters do
-                               op.append("\"{mmodule.name}\"->\"{omodule.name}\";\n")
-                       end
-               end
-               op.append("\}\n")
-               generate_dot(op.to_s, name, "Dependency graph for module {mmodule.name}")
-       end
-end
-
-# A class page
-class NitdocClass
-       super NitdocPage
-
-       private var mclass: MClass
-       private var vtypes = new HashSet[MVirtualTypeDef]
-       private var consts = new HashSet[MMethodDef]
-       private var meths = new HashSet[MMethodDef]
-       private var inherited = new HashSet[MPropDef]
-
-       init(mclass: MClass, ctx: NitdocContext, dot_dir: nullable String, source: nullable String) do
-               super(ctx)
-               self.mclass = mclass
-               self.dot_dir = dot_dir
-               self.source = source
-               # load properties
-               var locals = new HashSet[MProperty]
-               for mclassdef in mclass.mclassdefs do
-                       for mpropdef in mclassdef.mpropdefs do
-                               if mpropdef.mproperty.visibility < ctx.min_visibility then continue
-                               if mpropdef isa MVirtualTypeDef then vtypes.add(mpropdef)
-                               if mpropdef isa MMethodDef then
-                                       if mpropdef.mproperty.is_init then
-                                               consts.add(mpropdef)
-                                       else
-                                               meths.add(mpropdef)
-                                       end
-                               end
-                               locals.add(mpropdef.mproperty)
-                       end
-               end
-               # get inherited properties
-               for pclass in mclass.in_hierarchy(ctx.mainmodule).greaters do
-                       if pclass == mclass then continue
-                       for pclassdef in pclass.mclassdefs do
-                               for mprop in pclassdef.intro_mproperties do
-                                       var mpropdef = mprop.intro
-                                       if mprop.visibility < ctx.min_visibility then continue # skip if not correct visibiility
-                                       if locals.has(mprop) then continue # skip if local
-                                       if mclass.name != "Object" and mprop.intro_mclassdef.mclass.name == "Object" and (mprop.visibility <= protected_visibility or mprop.intro_mclassdef.mmodule.public_owner == null or mprop.intro_mclassdef.mmodule.public_owner.name != "standard") then continue # skip toplevels
-                                       if mpropdef isa MVirtualTypeDef then vtypes.add(mpropdef)
-                                       if mpropdef isa MMethodDef then
-                                               if mpropdef.mproperty.is_init then
-                                                       consts.add(mpropdef)
-                                               else
-                                                       meths.add(mpropdef)
-                                               end
-                                       end
-                                       inherited.add(mpropdef)
-                               end
-                       end
-               end
-       end
-
-       redef fun title do
-               var nclass = ctx.mbuilder.mclassdef2nclassdef[mclass.intro]
-               if nclass isa AStdClassdef then
-                       return "{mclass.html_name} class | {nclass.short_comment}"
-               else
-                       return "{mclass.html_name} class"
-               end
-       end
-
-       redef fun menu do
-               super
-               append("<li><a href='index.html'>Overview</a></li>")
-               var public_owner = mclass.public_owner
-               if public_owner is null then
-                       append("<li>")
-                       mclass.intro_mmodule.html_link(self)
-                       append("</li>")
-               else
-                       append("<li>")
-                       public_owner.html_link(self)
-                       append("</li>")
-               end
-               append("<li class='current'>{mclass.html_name}</li>")
-               append("<li><a href='search.html'>Search</a></li>")
-       end
-
-       redef fun content do
-               append("<div class='sidebar'>")
-               properties_column
-               inheritance_column
-               append("</div>")
-               append("<div class='content'>")
-               class_doc
-               append("</div>")
-       end
-
-       private fun properties_column do
-               var sorter = new MPropDefNameSorter
-               append("<nav class='properties filterable'>")
-               append("<h3>Properties</h3>")
-               # virtual types
-               if vtypes.length > 0 then
-                       var vts = new Array[MVirtualTypeDef]
-                       vts.add_all(vtypes)
-                       sorter.sort(vts)
-                       append("<h4>Virtual Types</h4>")
-                       append("<ul>")
-                       for mprop in vts do
-                               mprop.html_sidebar_item(self)
-                       end
-                       append("</ul>")
-               end
-               # constructors
-               if consts.length > 0 then
-                       var cts = new Array[MMethodDef]
-                       cts.add_all(consts)
-                       sorter.sort(cts)
-                       append("<h4>Constructors</h4>")
-                       append("<ul>")
-                       for mprop in cts do
-                               if mprop.mproperty.name == "init" and mprop.mclassdef.mclass != mclass then continue
-                               mprop.html_sidebar_item(self)
-                       end
-                       append("</ul>")
-               end
-               # methods
-               if meths.length > 0 then
-                       var mts = new Array[MMethodDef]
-                       mts.add_all(meths)
-                       sorter.sort(mts)
-                       append("<h4>Methods</h4>")
-                       append("<ul>")
-                       for mprop in mts do
-                               mprop.html_sidebar_item(self)
-                       end
-                       append("</ul>")
-               end
-               append("</nav>")
-       end
-
-       private fun inheritance_column do
-               var sorted = new Array[MClass]
-               var sorterp = new MClassNameSorter
-               append("<nav>")
-               append("<h3>Inheritance</h3>")
-               var greaters = mclass.in_hierarchy(ctx.mainmodule).greaters.to_a
-               if greaters.length > 1 then
-                       ctx.mainmodule.linearize_mclasses(greaters)
-                       append("<h4>Superclasses</h4>")
-                       append("<ul>")
-                       for sup in greaters do
-                               if sup == mclass then continue
-                               append("<li>")
-                               sup.html_link(self)
-                               append("</li>")
-                       end
-                       append("</ul>")
-               end
-               var smallers = mclass.in_hierarchy(ctx.mainmodule).smallers.to_a
-               var direct_smallers = mclass.in_hierarchy(ctx.mainmodule).direct_smallers.to_a
-               if smallers.length <= 1 then
-                       append("<h4>No Known Subclasses</h4>")
-               else if smallers.length <= 100 then
-                       ctx.mainmodule.linearize_mclasses(smallers)
-                       append("<h4>Subclasses</h4>")
-                       append("<ul>")
-                       for sub in smallers do
-                               if sub == mclass then continue
-                               append("<li>")
-                               sub.html_link(self)
-                               append("</li>")
-                       end
-                       append("</ul>")
-               else if direct_smallers.length <= 100 then
-                       ctx.mainmodule.linearize_mclasses(direct_smallers)
-                       append("<h4>Direct Subclasses Only</h4>")
-                       append("<ul>")
-                       for sub in direct_smallers do
-                               if sub == mclass then continue
-                               append("<li>")
-                               sub.html_link(self)
-                               append("</li>")
-                       end
-                       append("</ul>")
-               else
-                       append("<h4>Too much Subclasses to list</h4>")
-               end
-               append("</nav>")
-       end
-
-       private fun class_doc do
-               # title
-               append("<h1>{mclass.html_name}{mclass.html_short_signature}</h1>")
-               append("<div class='subtitle info'>")
-               if mclass.visibility < public_visibility then append("{mclass.visibility.to_s} ")
-               append("{mclass.kind.to_s} ")
-               mclass.html_namespace(self)
-               append("{mclass.html_short_signature}</div>")
-               # comment
-               mclass.html_comment(self)
-               process_generate_dot
-               # concerns
-               var concern2meths = new ArrayMap[MModule, Array[MMethodDef]]
-               var sorted_meths = new Array[MMethodDef]
-               var sorted = new Array[MModule]
-               sorted_meths.add_all(meths)
-               ctx.mainmodule.linearize_mpropdefs(sorted_meths)
-               for meth in meths do
-                       if inherited.has(meth) then continue
-                       var mmodule = meth.mclassdef.mmodule
-                       if not concern2meths.has_key(mmodule) then
-                               sorted.add(mmodule)
-                               concern2meths[mmodule] = new Array[MMethodDef]
-                       end
-                       concern2meths[mmodule].add(meth)
-               end
-               var sections = new ArrayMap[MModule, Array[MModule]]
-               for mmodule in concern2meths.keys do
-                       var owner = mmodule.public_owner
-                       if owner == null then owner = mmodule
-                       if not sections.has_key(owner) then sections[owner] = new Array[MModule]
-                       if owner != mmodule then sections[owner].add(mmodule)
-               end
-               append("<section class='concerns'>")
-               append("<h2 class='section-header'>Concerns</h2>")
-               append("<ul>")
-               for owner, mmodules in sections do
-                       var nowner = ctx.mbuilder.mmodule2nmodule[owner]
-                       append("<li>")
-                       if nowner.short_comment.is_empty then
-                               append("<a href=\"#{owner.anchor}\">{owner.html_name}</a>")
-                       else
-                               append("<a href=\"#{owner.anchor}\">{owner.html_name}</a>: {nowner.short_comment}")
-                       end
-                       if not mmodules.is_empty then
-                               append("<ul>")
-                               for mmodule in mmodules do
-                                       var nmodule = ctx.mbuilder.mmodule2nmodule[mmodule]
-                                       if nmodule.short_comment.is_empty then
-                                               append("<li><a href=\"#{mmodule.anchor}\">{mmodule.html_name}</a></li>")
-                                       else
-                                               append("<li><a href=\"#{mmodule.anchor}\">{mmodule.html_name}</a>: {nmodule.short_comment}</li>")
-                                       end
-                               end
-                               append("</ul>")
-                       end
-                       append("</li>")
-               end
-               append("</ul>")
-               append("</section>")
-               # properties
-               var prop_sorter = new MPropDefNameSorter
-               var lmmodule = new List[MModule]
-               var nclass = ctx.mbuilder.mclassdef2nclassdef[mclass.intro]
-               # virtual and formal types
-               var local_vtypes = new Array[MVirtualTypeDef]
-               for vt in vtypes do if not inherited.has(vt) then local_vtypes.add(vt)
-               if local_vtypes.length > 0 or mclass.arity > 0 then
-                       append("<section class='types'>")
-                       append("<h2>Formal and Virtual Types</h2>")
-                       # formal types
-                       if mclass.arity > 0 and nclass isa AStdClassdef then
-                               for ft, bound in mclass.parameter_types do
-                                       append("<article id='FT_{ft}'>")
-                                       append("<h3 class='signature' data-untyped-signature='{ft.to_s}'><span>{ft}: ")
-                                       bound.html_link(self)
-                                       append("</span></h3>")
-                                       append("<div class=\"info\">formal generic type</div>")
-                                       append("</article>")
-                               end
-                       end
-                       # virtual types
-                       prop_sorter.sort(local_vtypes)
-                       for prop in local_vtypes do prop.html_full_desc(self, self.mclass)
-                       append("</section>")
-               end
-               # constructors
-               var local_consts = new Array[MMethodDef]
-               for const in consts do if not inherited.has(const) then local_consts.add(const)
-               prop_sorter.sort(local_consts)
-               if local_consts.length > 0 then
-                       append("<section class='constructors'>")
-                       append("<h2 class='section-header'>Constructors</h2>")
-                       for prop in local_consts do prop.html_full_desc(self, self.mclass)
-                       append("</section>")
-               end
-               # methods
-               if not concern2meths.is_empty then
-                       append("<section class='methods'>")
-                       append("<h2 class='section-header'>Methods</h2>")
-                       for owner, mmodules in sections do
-                               append("<a id=\"{owner.anchor}\"></a>")
-                               if owner != mclass.intro_mmodule and owner != mclass.public_owner then
-                                       var nowner = ctx.mbuilder.mmodule2nmodule[owner]
-                                       append("<h3 class=\"concern-toplevel\">Methods refined in ")
-                                       owner.html_link(self)
-                                       append("</h3>")
-                                       append("<p class=\"concern-doc\">")
-                                       owner.html_link(self)
-                                       if not nowner.short_comment.is_empty then
-                                               append(": {nowner.short_comment}")
-                                       end
-                                       append("</p>")
-                               end
-                               if concern2meths.has_key(owner) then
-                                       var mmethods = concern2meths[owner]
-                                       prop_sorter.sort(mmethods)
-                                       for prop in mmethods do prop.html_full_desc(self, self.mclass)
-                               end
-                               for mmodule in mmodules do
-                                       append("<a id=\"{mmodule.anchor}\"></a>")
-                                       var nmodule = ctx.mbuilder.mmodule2nmodule[mmodule]
-                                       if mmodule != mclass.intro_mmodule and mmodule != mclass.public_owner then
-                                               append("<p class=\"concern-doc\">")
-                                               mmodule.html_link(self)
-                                               if not nmodule.short_comment.is_empty then
-                                                       append(": {nmodule.short_comment}")
-                                               end
-                                               append("</p>")
-                                       end
-                                       var mmethods = concern2meths[mmodule]
-                                       prop_sorter.sort(mmethods)
-                                       for prop in mmethods do prop.html_full_desc(self, self.mclass)
-                               end
-                       end
-                       append("</section>")
-               end
-               # inherited properties
-               if inherited.length > 0 then
-                       var sorted_inherited = new Array[MPropDef]
-                       sorted_inherited.add_all(inherited)
-                       ctx.mainmodule.linearize_mpropdefs(sorted_inherited)
-                       var classes = new ArrayMap[MClass, Array[MPropDef]]
-                       for mmethod in sorted_inherited.reversed do
-                               var mclass = mmethod.mclassdef.mclass
-                               if not classes.has_key(mclass) then classes[mclass] = new Array[MPropDef]
-                               classes[mclass].add(mmethod)
-                       end
-                       append("<section class='inherited'>")
-                       append("<h2 class='section-header'>Inherited Properties</h2>")
-                       for c, mmethods in classes do
-                               prop_sorter.sort(mmethods)
-                               append("<p>Defined in ")
-                               c.html_link(self)
-                               append(": ")
-                               for i in [0..mmethods.length[ do
-                                       var mmethod = mmethods[i]
-                                       mmethod.html_link(self)
-                                       if i <= mmethods.length - 1 then append(", ")
-                               end
-                               append("</p>")
-                       end
-                       append("</section>")
-               end
-       end
-
-       private fun process_generate_dot do
-               var pe = ctx.class_hierarchy[mclass]
-               var cla = new HashSet[MClass]
-               var sm = new HashSet[MClass]
-               var sm2 = new HashSet[MClass]
-               sm.add(mclass)
-               while cla.length + sm.length < 10 and sm.length > 0 do
-                       cla.add_all(sm)
-                       sm2.clear
-                       for x in sm do
-                               sm2.add_all(pe.poset[x].direct_smallers)
-                       end
-                       var t = sm
-                       sm = sm2
-                       sm2 = t
-               end
-               cla.add_all(pe.greaters)
-
-               var op = new Buffer
-               var name = "dep_{mclass.name}"
-               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               for c in cla do
-                       if c == mclass then
-                               op.append("\"{c.name}\"[shape=box,margin=0.03];\n")
-                       else
-                               op.append("\"{c.name}\"[URL=\"{c.url}\"];\n")
-                       end
-                       for c2 in pe.poset[c].direct_greaters do
-                               if not cla.has(c2) then continue
-                               op.append("\"{c.name}\"->\"{c2.name}\";\n")
-                       end
-                       if not pe.poset[c].direct_smallers.is_empty then
-                               var others = true
-                               for c2 in pe.poset[c].direct_smallers do
-                                       if cla.has(c2) then others = false
-                               end
-                               if others then
-                                       op.append("\"{c.name}...\"[label=\"\"];\n")
-                                       op.append("\"{c.name}...\"->\"{c.name}\"[style=dotted];\n")
-                               end
-                       end
-               end
-               op.append("\}\n")
-               generate_dot(op.to_s, name, "Dependency graph for class {mclass.name}")
-       end
-end
-
-#
-# Model redefs
-#
-
-redef class MModule
-       # Return the HTML escaped name of the module
-       private fun html_name: String do return name.html_escape
-
-       # URL to nitdoc page
-       #       module_owner_name.html
-       private fun url: String do
-               if url_cache == null then
-                       var res = new Buffer
-                       res.append("module_")
-                       var mowner = public_owner
-                       if mowner != null then
-                               res.append("{public_owner.name}_")
-                       end
-                       res.append("{self.name}.html")
-                       url_cache = res.to_s
-               end
-               return url_cache.as(not null)
-       end
-       private var url_cache: nullable String
-
-       # html anchor id for the module in a nitdoc page
-       #       MOD_owner_name
-       private fun anchor: String do
-               if anchor_cache == null then
-                       var res = new Buffer
-                       res.append("MOD_")
-                       var mowner = public_owner
-                       if mowner != null then
-                               res.append("{public_owner.name}_")
-                       end
-                       res.append(self.name)
-                       anchor_cache = res.to_s
-               end
-               return anchor_cache.as(not null)
-       end
-       private var anchor_cache: nullable String
-
-       # Return a link (html a tag) to the nitdoc module page
-       #       <a href="url" title="short_comment">html_name</a>
-       private fun html_link(page: NitdocPage) do
-               if html_link_cache == null then
-                       var res = new Buffer
-                       if page.ctx.mbuilder.mmodule2nmodule.has_key(self) then
-                               res.append("<a href='{url}' title='{page.ctx.mbuilder.mmodule2nmodule[self].short_comment}'>{html_name}</a>")
-                       else
-                               res.append("<a href='{url}'>{html_name}</a>")
-                       end
-                       html_link_cache = res.to_s
-               end
-               page.append(html_link_cache.as(not null))
-       end
-       private var html_link_cache: nullable String
-
-       # Return the module signature decorated with html
-       #       <span>module html_full_namespace</span>
-       private fun html_signature(page: NitdocPage) do
-               page.append("<span>module ")
-               html_full_namespace(page)
-               page.append("</span>")
-       end
-
-       # Return the module full namespace decorated with html
-       #       <span>public_owner.html_namespace::html_link</span>
-       private fun html_full_namespace(page: NitdocPage) do
-               page.append("<span>")
-               var mowner = public_owner
-               if mowner != null then
-                       public_owner.html_namespace(page)
-                       page.append("::")
-               end
-               html_link(page)
-               page.append("</span>")
-       end
-
-       # Return the module full namespace decorated with html
-       #       <span>public_owner.html_namespace</span>
-       private fun html_namespace(page: NitdocPage) do
-               page.append("<span>")
-               var mowner = public_owner
-               if mowner != null then
-                       public_owner.html_namespace(page)
-               else
-                       html_link(page)
-               end
-               page.append("</span>")
-       end
-
-       # Return the full comment of the module decorated with html
-       private fun html_comment(page: NitdocPage) do
-               page.append("<div class='description'>")
-               if page.ctx.mbuilder.mmodule2nmodule.has_key(self) then
-                       var nmodule = page.ctx.mbuilder.mmodule2nmodule[self]
-                       page.append("<textarea class='baseComment' data-comment-namespace='{full_name}' data-comment-location='{nmodule.doc_location.to_s}'>{nmodule.full_comment}</textarea>")
-                       if nmodule.full_comment == "" then
-                               page.append("<p class='info inheritance'>")
-                               page.append("<span class=\"noComment\">no comment for </span>")
-                       else
-                               page.append("<div class='comment'>{nmodule.full_markdown}</div>")
-                               page.append("<p class='info inheritance'>")
-                       end
-                       page.append("definition in ")
-                       self.html_full_namespace(page)
-                       page.append(" {page.show_source(nmodule.location)}</p>")
-               end
-               page.append("</div>")
-       end
-
-       private fun has_mclassdef_for(mclass: MClass): Bool do
-               for mmodule in self.in_nesting.greaters do
-                       for mclassdef in mmodule.mclassdefs do
-                               if mclassdef.mclass == mclass then return true
-                       end
-               end
-               return false
-       end
-
-       private fun has_mclassdef(mclassdef: MClassDef): Bool do
-               for mmodule in self.in_nesting.greaters do
-                       for oclassdef in mmodule.mclassdefs do
-                               if mclassdef == oclassdef then return true
-                       end
-               end
-               return false
-       end
-end
-
-redef class MClass
-       # Return the HTML escaped name of the module
-       private fun html_name: String do return name.html_escape
-
-       # URL to nitdoc page
-       #       class_owner_name.html
-       private fun url: String do
-               return "class_{public_owner}_{name}.html"
-       end
-
-       # html anchor id for the class in a nitdoc page
-       #       MOD_owner_name
-       private fun anchor: String do
-               if anchor_cache == null then
-                       anchor_cache = "CLASS_{public_owner.name}_{name}"
-               end
-               return anchor_cache.as(not null)
-       end
-       private var anchor_cache: nullable String
-
-       # Return a link (with signature) to the nitdoc class page
-       #       <a href="url" title="short_comment">html_name(signature)</a>
-       private fun html_link(page: NitdocPage) do
-               if html_link_cache == null then
-                       var res = new Buffer
-                       res.append("<a href='{url}'")
-                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
-                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
-                               if nclass isa AStdClassdef then
-                                       res.append(" title=\"{nclass.short_comment}\"")
-                               end
-                       end
-                       res.append(">{html_name}{html_short_signature}</a>")
-                       html_link_cache = res.to_s
-               end
-               page.append(html_link_cache.as(not null))
-       end
-       private var html_link_cache: nullable String
-
-       # Return a short link (without signature) to the nitdoc class page
-       #       <a href="url" title="short_comment">html_name</a>
-       private fun html_short_link(page: NitdocPage) do
-               if html_short_link_cache == null then
-                       var res = new Buffer
-                       res.append("<a href='{url}'")
-                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
-                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
-                               if nclass isa AStdClassdef then
-                                       res.append(" title=\"{nclass.short_comment}\"")
-                               end
-                       end
-                       res.append(">{html_name}</a>")
-                       html_short_link_cache = res.to_s
-               end
-               page.append(html_short_link_cache.as(not null))
-       end
-       private var html_short_link_cache: nullable String
-
-       # Return a link (with signature) to the class anchor
-       #       <a href="url" title="short_comment">html_name</a>
-       private fun html_link_anchor(page: NitdocPage) do
-               if html_link_anchor_cache == null then
-                       var res = new Buffer
-                       res.append("<a href='#{anchor}'")
-                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
-                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
-                               if nclass isa AStdClassdef then
-                                       res.append(" title=\"{nclass.short_comment}\"")
-                               end
-                       end
-                       res.append(">{html_name}{html_short_signature}</a>")
-                       html_link_anchor_cache = res.to_s
-               end
-               page.append(html_link_anchor_cache.as(not null))
-       end
-       private var html_link_anchor_cache: nullable String
-
-       # Return the generic signature of the class with bounds
-       #       [E: <a>MType</a>, F: <a>MType</a>]
-       private fun html_signature(page: NitdocPage) do
-               if arity > 0 then
-                       page.append("[")
-                       for i in [0..intro.parameter_names.length[ do
-                               page.append("{intro.parameter_names[i]}: ")
-                               intro.bound_mtype.arguments[i].html_link(page)
-                               if i < intro.parameter_names.length - 1 then page.append(", ")
-                       end
-                       page.append("]")
-               end
-       end
-
-       # Return the generic signature of the class without bounds
-       #       [E, F]
-       private fun html_short_signature: String do
-               if arity > 0 then
-                       return "[{intro.parameter_names.join(", ")}]"
-               else
-                       return ""
-               end
-       end
-
-       # Return the class namespace decorated with html
-       #       <span>intro_module::html_short_link</span>
-       private fun html_namespace(page: NitdocPage) do
-               intro_mmodule.html_namespace(page)
-               page.append("::<span>")
-               html_short_link(page)
-               page.append("</span>")
-       end
-
-       # Return a list item for the mclass
-       #       <li>html_link</li>
-       private fun html_sidebar_item(page: NitdocModule) do
-               if page.mmodule.in_nesting.greaters.has(intro.mmodule) then
-                       page.append("<li class='intro'>")
-                       page.append("<span title='Introduced'>I</span>")
-                       html_link_anchor(page)
-               else if page.mmodule.has_mclassdef_for(self) then
-                       page.append("<li class='redef'>")
-                       page.append("<span title='Redefined'>R</span>")
-                       html_link_anchor(page)
-               else
-                       page.append("<li class='inherit'>")
-                       page.append("<span title='Inherited'>H</span>")
-                       html_link(page)
-               end
-               page.append("</li>")
-       end
-
-       private fun html_full_desc(page: NitdocModule) do
-               var is_redef = not page.mmodule.in_nesting.greaters.has(intro.mmodule)
-               var redefs = mpropdefs_in_module(page)
-               if not is_redef or not redefs.is_empty then
-                       var classes = new Array[String]
-                       classes.add(kind.to_s)
-                       if is_redef then classes.add("redef")
-                       classes.add(visibility.to_s)
-                       page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
-                       page.append("<h3 class='signature' data-untyped-signature='{html_name}{html_short_signature}'>")
-                       page.append("<span>")
-                       html_short_link(page)
-                       html_signature(page)
-                       page.append("</span></h3>")
-                       html_info(page)
-                       html_comment(page)
-                       page.append("</article>")
-               end
-       end
-
-       private fun html_info(page: NitdocModule) do
-               page.append("<div class='info'>")
-               if visibility < public_visibility then page.append("{visibility.to_s} ")
-               if not page.mmodule.in_nesting.greaters.has(intro.mmodule) then page.append("redef ")
-               page.append("{kind} ")
-               html_namespace(page)
-               page.append("{html_short_signature}</div>")
-       end
-
-       private fun html_comment(page: NitdocPage) do
-               page.append("<div class='description'>")
-               if page isa NitdocModule then
-                       page.mmodule.linearize_mclassdefs(mclassdefs)
-                       # comments for each mclassdef contained in current mmodule
-                       for mclassdef in mclassdefs do
-                               if not mclassdef.is_intro and not page.mmodule.mclassdefs.has(mclassdef) then continue
-                               if page.ctx.mbuilder.mclassdef2nclassdef.has_key(mclassdef) then
-                                       var nclass = page.ctx.mbuilder.mclassdef2nclassdef[mclassdef]
-                                       if nclass isa AStdClassdef then
-                                               page.append("<textarea class='baseComment' data-comment-namespace='{mclassdef.mmodule.full_name}::{name}' data-comment-location='{nclass.doc_location.to_s}'>{nclass.full_comment}</textarea>")
-                                               if nclass.full_comment == "" then
-                                                       page.append("<p class='info inheritance'>")
-                                                       page.append("<span class=\"noComment\">no comment for </span>")
-                                               else
-                                                       page.append("<div class='comment'>{nclass.full_markdown}</div>")
-                                                       page.append("<p class='info inheritance'>")
-                                               end
-                                               if mclassdef.is_intro then
-                                                       page.append("introduction in ")
-                                               else
-                                                       page.append("refinement in ")
-                                               end
-                                               mclassdef.mmodule.html_full_namespace(page)
-                                               page.append(" {page.show_source(nclass.location)}</p>")
-                                       end
-                               end
-                       end
-               else
-                       # comments for intro
-                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
-                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
-                               if nclass isa AStdClassdef then
-                                       page.append("<textarea class='baseComment' data-comment-namespace='{intro.mmodule.full_name}::{name}' data-comment-location='{nclass.doc_location.to_s}'>{nclass.full_comment}</textarea>")
-                                       if nclass.full_comment == "" then
-                                               page.append("<p class='info inheritance'>")
-                                               page.append("<span class=\"noComment\">no comment for </span>")
-                                       else
-                                               page.append("<div class='comment'>{nclass.full_markdown}</div>")
-                                               page.append("<p class='info inheritance'>")
-                                       end
-                                       page.append("introduction in ")
-                                       intro.mmodule.html_full_namespace(page)
-                                       page.append(" {page.show_source(nclass.location)}</p>")
-                               end
-                       end
-               end
-               page.append("</div>")
-       end
-
-       private fun mpropdefs_in_module(page: NitdocModule): Array[MPropDef] do
-               var res = new Array[MPropDef]
-               page.mmodule.linearize_mclassdefs(mclassdefs)
-               for mclassdef in mclassdefs do
-                       if not page.mmodule.mclassdefs.has(mclassdef) then continue
-                       if mclassdef.is_intro then continue
-                       for mpropdef in mclassdef.mpropdefs do
-                               if mpropdef.mproperty.visibility < page.ctx.min_visibility then continue
-                               if mpropdef isa MAttributeDef then continue
-                               res.add(mpropdef)
-                       end
-               end
-               return res
-       end
-end
-
-redef class MProperty
-       # Escape name for html output
-       private fun html_name: String do return name.html_escape
-
-       # Return the property namespace decorated with html
-       #       <span>intro_module::intro_class::html_link</span>
-       private fun html_namespace(page: NitdocPage) do
-               intro_mclassdef.mclass.html_namespace(page)
-               page.append(intro_mclassdef.mclass.html_short_signature)
-               page.append("::<span>")
-               intro.html_link(page)
-               page.append("</span>")
-       end
-end
-
-redef class MType
-       # Link to the type definition in the nitdoc page
-       private fun html_link(page: NitdocPage) is abstract
-end
-
-redef class MClassType
-       redef fun html_link(page) do mclass.html_link(page)
-end
-
-redef class MNullableType
-       redef fun html_link(page) do
-               page.append("nullable ")
-               mtype.html_link(page)
-       end
-end
-
-redef class MGenericType
-       redef fun html_link(page) do
-               page.append("<a href='{mclass.url}'>{mclass.html_name}</a>[")
-               for i in [0..arguments.length[ do
-                       arguments[i].html_link(page)
-                       if i < arguments.length - 1 then page.append(", ")
-               end
-               page.append("]")
-       end
-end
-
-redef class MParameterType
-       redef fun html_link(page) do
-               var name = mclass.intro.parameter_names[rank]
-               page.append("<a href='{mclass.url}#FT_{name}' title='formal type'>{name}</a>")
-       end
-end
-
-redef class MVirtualType
-       redef fun html_link(page) do mproperty.intro.html_link(page)
-end
-
-redef class MClassDef
-       # Return the classdef namespace decorated with html
-       private fun html_namespace(page: NitdocPage) do
-               mmodule.html_full_namespace(page)
-               page.append("::<span>")
-               mclass.html_link(page)
-               page.append("</span>")
-       end
-end
-
-redef class MPropDef
-       # Return the full qualified name of the mpropdef
-       #       module::classdef::name
-       private fun full_name: String do
-               return "{mclassdef.mclass.public_owner.name}::{mclassdef.mclass.name}::{mproperty.name}"
-       end
-
-       # URL into the nitdoc page
-       #       class_owner_name.html#anchor
-       private fun url: String do
-               if url_cache == null then
-                       url_cache = "{mclassdef.mclass.url}#{anchor}"
-               end
-               return url_cache.as(not null)
-       end
-       private var url_cache: nullable String
-
-       # html anchor id for the property in a nitdoc class page
-       #       PROP_mclass_propertyname
-       private fun anchor: String do
-               if anchor_cache == null then
-                       anchor_cache = "PROP_{mclassdef.mclass.public_owner.name}_{mproperty.name.replace(" ", "_")}"
-               end
-               return anchor_cache.as(not null)
-       end
-       private var anchor_cache: nullable String
-
-       # Return a link to property into the nitdoc class page
-       #       <a href="url" title="short_comment">html_name</a>
-       private fun html_link(page: NitdocPage) do
-               if html_link_cache == null then
-                       var res = new Buffer
-                       if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
-                               var nprop = page.ctx.mbuilder.mpropdef2npropdef[self]
-                               res.append("<a href=\"{url}\" title=\"{nprop.short_comment}\">{mproperty.html_name}</a>")
-                       else
-                               res.append("<a href=\"{url}\">{mproperty.html_name}</a>")
-                       end
-                       html_link_cache = res.to_s
-               end
-               page.append(html_link_cache.as(not null))
-       end
-       private var html_link_cache: nullable String
-
-       # Return a list item for the mpropdef
-       #       <li>html_link</li>
-       private fun html_sidebar_item(page: NitdocClass) do
-               if is_intro and mclassdef.mclass == page.mclass then
-                       page.append("<li class='intro'>")
-                       page.append("<span title='Introduced'>I</span>")
-               else if is_intro and mclassdef.mclass != page.mclass then
-                       page.append("<li class='inherit'>")
-                       page.append("<span title='Inherited'>H</span>")
-               else
-                       page.append("<li class='redef'>")
-                       page.append("<span title='Redefined'>R</span>")
-               end
-               html_link(page)
-               page.append("</li>")
-       end
-
-       private fun html_full_desc(page: NitdocPage, ctx: MClass) is abstract
-       private fun html_info(page: NitdocPage, ctx: MClass) is abstract
-
-       private fun html_comment(page: NitdocPage) do
-               page.append("<div class='description'>")
-               if not is_intro then
-                       if page.ctx.mbuilder.mpropdef2npropdef.has_key(mproperty.intro) then
-                               var intro_nprop = page.ctx.mbuilder.mpropdef2npropdef[mproperty.intro]
-                               page.append("<textarea class='baseComment' data-comment-namespace='{mproperty.intro.mclassdef.mmodule.full_name}::{mproperty.intro.mclassdef.mclass.name}::{mproperty.name}' data-comment-location='{intro_nprop.doc_location.to_s}'>{intro_nprop.full_comment}</textarea>")
-                               if intro_nprop.full_comment.is_empty then
-                                       page.append("<p class='info inheritance'>")
-                                       page.append("<span class=\"noComment\">no comment for </span>")
-                               else
-                                       page.append("<div class='comment'>{intro_nprop.full_markdown}</div>")
-                                       page.append("<p class='info inheritance'>")
-                               end
-                               page.append("introduction in ")
-                               mproperty.intro.mclassdef.html_namespace(page)
-                               page.append(" {page.show_source(intro_nprop.location)}</p>")
-                       end
-               end
-               if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
-                       var nprop = page.ctx.mbuilder.mpropdef2npropdef[self]
-                       page.append("<textarea class='baseComment' data-comment-namespace='{mclassdef.mmodule.full_name}::{mclassdef.mclass.name}::{mproperty.name}' data-comment-location='{nprop.doc_location.to_s}'>{nprop.full_comment}</textarea>")
-                       if nprop.full_comment == "" then
-                               page.append("<p class='info inheritance'>")
-                               page.append("<span class=\"noComment\">no comment for </span>")
-                       else
-                               page.append("<div class='comment'>{nprop.full_markdown}</div>")
-                               page.append("<p class='info inheritance'>")
-                       end
-                       if is_intro then
-                               page.append("introduction in ")
-                       else
-                               page.append("redefinition in ")
-                       end
-                       mclassdef.html_namespace(page)
-                       page.append(" {page.show_source(nprop.location)}</p>")
-               end
-               page.append("</div>")
-       end
-end
-
-redef class MMethodDef
-       redef fun html_full_desc(page, ctx) do
-               var classes = new Array[String]
-               var is_redef = mproperty.intro_mclassdef.mclass != ctx
-               if mproperty.is_init then
-                       classes.add("init")
-               else
-                       classes.add("fun")
-               end
-               if is_redef then classes.add("redef")
-               classes.add(mproperty.visibility.to_s)
-               page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
-               if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
-                       page.append("<h3 class='signature' data-untyped-signature='{mproperty.name}{msignature.untyped_signature(page)}'>")
-                       page.append("<span>{mproperty.html_name}")
-                       msignature.html_signature(page)
-                       page.append("</span></h3>")
-               else
-                       page.append("<h3 class='signature' data-untyped-signature='init{msignature.untyped_signature(page)}'>")
-                       page.append("<span>init")
-                       msignature.html_signature(page)
-                       page.append("</span></h3>")
-               end
-               html_info(page, ctx)
-               html_comment(page)
-               page.append("</article>")
-       end
-
-       redef fun html_info(page, ctx) do
-               page.append("<div class='info'>")
-               if mproperty.visibility < public_visibility then page.append("{mproperty.visibility.to_s} ")
-               if mproperty.intro_mclassdef.mclass != ctx then page.append("redef ")
-               if mproperty.is_init then
-                       page.append("init ")
-               else
-                       page.append("fun ")
-               end
-               mproperty.html_namespace(page)
-               page.append("</div>")
-       end
-end
-
-redef class MVirtualTypeDef
-       redef fun html_full_desc(page, ctx) do
-               var is_redef = mproperty.intro_mclassdef.mclass != ctx
-               var classes = new Array[String]
-               classes.add("type")
-               if is_redef then classes.add("redef")
-               classes.add(mproperty.visibility.to_s)
-               page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
-               page.append("<h3 class='signature' data-untyped-signature='{mproperty.name}'><span>{mproperty.html_name}: ")
-               bound.html_link(page)
-               page.append("</span></h3>")
-               html_info(page, ctx)
-               html_comment(page)
-               page.append("</article>")
-       end
-
-       redef fun html_info(page, ctx) do
-               page.append("<div class='info'>")
-               if mproperty.intro_mclassdef.mclass != ctx then page.append("redef ")
-               page.append("type ")
-               mproperty.html_namespace(page)
-               page.append("</div>")
-       end
-end
-
-redef class MSignature
-       private fun html_signature(page: NitdocPage) do
-               if not mparameters.is_empty then
-                       page.append("(")
-                       for i in [0..mparameters.length[ do
-                               mparameters[i].html_link(page)
-                               if i < mparameters.length - 1 then page.append(", ")
-                       end
-                       page.append(")")
-               end
-               if return_mtype != null then
-                       page.append(": ")
-                       return_mtype.html_link(page)
-               end
-       end
-
-       private fun untyped_signature(page: NitdocPage): String do
-               var res = new Buffer
-               if not mparameters.is_empty then
-                       res.append("(")
-                       for i in [0..mparameters.length[ do
-                               res.append(mparameters[i].name)
-                               if i < mparameters.length - 1 then res.append(", ")
-                       end
-                       res.append(")")
-               end
-               return res.to_s
-       end
-end
-
-redef class MParameter
-       private fun html_link(page: NitdocPage) do
-               page.append("{name}: ")
-               mtype.html_link(page)
-               if is_vararg then page.append("...")
-       end
-end
-
-#
-# Nodes redefs
-#
-
-redef class ADoc
-       private fun short_comment: String do
-               return n_comment.first.text.substring_from(2).replace("\n", "").html_escape
-       end
-
-       private fun full_comment: String do
-               var res = new Buffer
-               for t in n_comment do
-                       var text = t.text
-                       text = text.substring_from(1)
-                       if text.first == ' ' then text = text.substring_from(1)
-                       res.append(text.html_escape)
-               end
-               var str = res.to_s
-               return str.substring(0, str.length - 1)
-       end
-end
-
-redef class AModule
-       private fun short_comment: String do
-               if n_moduledecl != null and n_moduledecl.n_doc != null then
-                       return n_moduledecl.n_doc.short_comment
-               end
-               return ""
-       end
-
-       private fun full_comment: String do
-               if n_moduledecl != null and n_moduledecl.n_doc != null then
-                       return n_moduledecl.n_doc.full_comment
-               end
-               return ""
-       end
-
-       private fun full_markdown: String do
-               if n_moduledecl != null and n_moduledecl.n_doc != null then
-                       return n_moduledecl.n_doc.full_markdown.html
-               end
-               return ""
-       end
-
-       private fun doc_location: Location do
-               if n_moduledecl != null and n_moduledecl.n_doc != null then
-                       return n_moduledecl.n_doc.location
-               end
-               return location
-       end
-end
-
-redef class AStdClassdef
-       private fun short_comment: String do
-               if n_doc != null then return n_doc.short_comment
-               return ""
-       end
-
-       private fun full_comment: String do
-               if n_doc != null then return n_doc.full_comment
-               return ""
-       end
-
-       private fun full_markdown: String do
-               if n_doc != null then return n_doc.full_markdown.html
-               return ""
-       end
-
-       private fun doc_location: Location do
-               if n_doc != null then return n_doc.location
-               return location
-       end
-end
-
-redef class APropdef
-       private fun short_comment: String do
-               if n_doc != null then return n_doc.short_comment
-               return ""
-       end
-
-       private fun full_comment: String do
-               if n_doc != null then return n_doc.full_comment
-               return ""
-       end
-
-       private fun full_markdown: String do
-               if n_doc != null then return n_doc.full_markdown.html
-               return ""
-       end
-
-       private fun doc_location: Location do
-               if n_doc != null then return n_doc.location
-               return location
-       end
-end
-
-
-var nitdoc = new NitdocContext
-nitdoc.generate_nitdoc
index f3823bf..0adf6a4 100644 (file)
@@ -1,12 +1,10 @@
 # This file is part of NIT ( http://www.nitlanguage.org ).
 #
-# Copyright 2008 Jean Privat <jean@pryen.org>
-#
 # 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
+# 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,
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The main module of the nitdoc program
+# Documentation generator for the nit language.
+# Generate API documentation in HTML format from nit source code.
 module nitdoc
 
-import syntax
-private import utils
-import abstracttool
-
-
-# Store knowledge and facilities to generate files
-class DocContext
-       super AbstractCompiler
-       # Destination directory
-       readable writable var _dir: String = "doc"
-       # GitHub Repo name
-       var github_repo: nullable String = null
-       # Content of a generated file
-       var _stage_context: StageContext = new StageContext(null)
-
-       # Add a string in the content
-       fun add(s: String) do
-               _stage_context.content.add(s)
-               _stage_context.validate = true
-       end
-
-       # Add a string in the content iff some other string are added
-       fun stage(s: String) do _stage_context.content.add(s)
-
-       # Create a new stage in the content
-       fun open_stage do _stage_context = new StageContext(_stage_context)
-
-       # Close the current stage in the content
-       fun close_stage
-       do
-               var s = _stage_context.parent
-               if _stage_context.validate then
-                       s.content.add_all(_stage_context.content)
-                       s.validate = true
-               end
-               assert s != null
-               _stage_context = s
-       end
-
-       # Write the content to a new file
-       fun write_to(filename: String)
-       do
-               var f = new OFStream.open(filename)
-               for s in _stage_context.content do
-                       f.write(s)
-               end
-               f.close
-       end
-
-       # Start a new file
-       fun clear
-       do
-               _stage_context = new StageContext(null)
-       end
-
-       # Sorter of entities in alphabetical order
-       var _sorter: AlphaSorter[MMEntity] = new AlphaSorter[MMEntity]
-
-       # Sort entities in the alphabetical order
-       fun sort(array: Array[MMEntity])
-       do
-               _sorter.sort(array)
-       end
-
-       readable var _opt_dir: OptionString = new OptionString("Directory where doc is generated", "-d", "--dir")
-       readable var _opt_source: OptionString = new OptionString("What link for source (%f for filename, %l for first line, %L for last line)", "--source")
-       readable var _opt_public: OptionBool = new OptionBool("Generate only the public API", "--public")
-       readable var _opt_private: OptionBool = new OptionBool("Generate the private API", "--private")
-       readable var _opt_nodot: OptionBool = new OptionBool("Do not generate graphes with graphviz", "--no-dot")
-       readable var _opt_sharedir: OptionString = new OptionString("Directory containing the nitdoc files", "--sharedir")
-       
-       readable var _opt_custom_menu_items: OptionString = new OptionString("Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)", "--custom-menu-items")
-       readable var _opt_custom_title: OptionString = new OptionString("Title displayed in the top of the Overview page and as suffix of all page names", "--custom-title")
-       readable var _opt_custom_overview_text: OptionString = new OptionString("Text displayed as introduction of Overview page before the modules list", "--custom-overview-text")
-       readable var _opt_custom_footer_text: OptionString = new OptionString("Text displayed as footer of all pages", "--custom-footer-text")
-       readable var _opt_github_repo_name: OptionString = new OptionString("GitHub repo name, example: --github MyRepoName", "--github")
-       var sharedir: nullable String
-
-       fun public_only: Bool
-       do
-               if self._opt_public.value == true then return true
-               return false
-       end
-
-       fun with_private: Bool
-       do
-               if self._opt_private.value == true then return true
-               return false
-       end
-
-       # The current processed filename
-       var filename: String
-
-       # The main virtual module
-       var mainmod: nullable MMVirtualModule
-
-       redef fun perform_work(mods)
-       do
-               mainmod = new MMVirtualModule(self, mods)
-
-               dir.mkdir
-
-               sys.system("cp -r '{sharedir.to_s}'/* {dir}/")
-
-               # Compute the set of direct owned nested modules
-               var owns = new HashMap[MMModule, Array[MMModule]]
-               for mod in modules do
-                       owns[mod] = new Array[MMModule]# [mod]
-               end
-               for mod in modules do
-                       if mod == mainmod then continue
-                       var d = mod.directory
-                       loop
-                               var o = d.owner
-                               if o != null and o != mod then
-                                       owns[o].add(mod)
-                               end
-                               var dp = d.parent
-                               if dp == null or dp == d then break
-                               d = dp
-                       end
-               end
-
-               # Builds the various module hierarchies
-               var mnh = new PartialOrder[MMModule] # nested module hierarchy
-               var tmh = new PartialOrder[MMModule] # top module import hierrchy
-               var ms = mainmod.mhe.linear_extension.reversed
-               for m in ms do
-                       if ms == mainmod then continue
-                       m.mnhe_ = mnh.add(m, owns[m])
-                       var pub = new Array[MMModule]
-                       for m2 in m.mhe.greaters do
-                               if m2.toplevel_owner != m2 and m2.toplevel_owner != m.toplevel_owner then continue
-                               if m.mnhe <= m2 then continue
-                               if m.visibility_for(m2) <= 0 then
-                                       # nothing
-                               else if m.visibility_for(m2) == 1 then
-                               else
-                                       pub.add(m2)
-                               end
-                       end
-                       m.tmhe_ = tmh.add(m, pub)
-               end
-
-               var head = "<meta charset=\"utf-8\">" +
-                       "<script type=\"text/javascript\" src=\"scripts/jquery-1.7.1.min.js\"></script>\n" +
-                       "<script type=\"text/javascript\" src=\"quicksearch-list.js\"></script>\n" +
-                       "<script type=\"text/javascript\" src=\"scripts/js-facilities.js\"></script>\n" +
-                       "<link rel=\"stylesheet\" href=\"styles/main.css\" type=\"text/css\"  media=\"screen\" />"
-
-               var custom_items = ""
-               if self._opt_custom_menu_items.value != null then custom_items = self._opt_custom_menu_items.value.as(not null)
-
-               var action_bar = "<header><nav class='main'><ul>{custom_items}<li class=\"current\">Overview</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li><li id=\"liGitHub\" class=\"\"><a id=\"logGitHub\" class=\"btn\" ><img id=\"imgGitHub\" src=\"resources/icons/github-icon.png\" /></a><div class=\"popover bottom\"><div class=\"arrow\"></div><div class=\"githubTitle\"><h3>Github Sign In</h3></div><div><label id=\"lbloginGit\" for=\"login\">Username</label><input id=\"loginGit\" type=\"text\" name=\"login\"><label id=\"logginMessage\" >Hello <a id=\"githubAccount\" ><strong id=\"nickName\"></strong></a></label></div><div><label id=\"lbpasswordGit\" for=\"password\">Password</label><input id=\"passwordGit\" type=\"password\" name=\"password\"><div id=\"divGitHubRepoDisplay\"><label id=\"lbRepoDisplay\">Repository: </label><strong><label id=\"githubRepoDisplay\"></label></strong></div></div><div><label id=\"lbrepositoryGit\" for=\"repository\">Repository</label><input id=\"repositoryGit\" type=\"text\" name=\"repository\"><div id=\"listBranches\"><label id=\"lbBranches\">Branch </label><select id=\"dropBranches\" name=\"dropBranches\" tabindex=\"1\" class=\"dropdown\"></select></div></div><div><label id=\"lbbranchGit\" for=\"branch\">Branch</label><input id=\"branchGit\" type=\"text\" name=\"branch\"></div><div id=\"divlogIn\"><a id=\"signIn\" >Sign In</a></div></div></li></ul></nav></header>\n"
-               var custom_title = "Nitdoc"
-               if self._opt_custom_title.value != null then custom_title = self._opt_custom_title.value.as(not null)
-               
-               var overview_text = ""
-               if self._opt_custom_overview_text.value != null then overview_text = self._opt_custom_overview_text.value.as(not null)
-
-               var footer_text = ""
-               if self._opt_custom_footer_text.value != null then footer_text = self._opt_custom_footer_text.value.as(not null)
-               
-               # generate the index
-               self.filename = "index.html"
-               clear
-               add("<!DOCTYPE html>")
-               add("<html><head>{head}<title>Overview | {custom_title}</title></head><body>\n")
-               add(action_bar)
-               add("<div class=\"page\">")
-               add("<div class=\"content fullpage\">")
-               add("<h1>{custom_title}</h1>\n<article class='overview'>{overview_text}</article><article class='overview'><h2>Modules</h2><ul>")
-               var modss = mainmod.mhe.greaters_and_self.to_a
-               sort(modss)
-               for mod in modss do
-                       if not mod.is_toplevel then continue
-                       if not mod.require_doc(self) then continue
-                       assert mod isa MMSrcModule
-                       add("<li>{mod.html_link(self)} {mod.short_doc}</li>")
-
-               end
-               add("</ul>")
-
-               var op = new Buffer
-               op.append("digraph dep \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               for mod in modss do
-                       if not mod.is_toplevel then continue
-                       if not mod.require_doc(self) then continue
-                       op.append("\"{mod.name}\"[URL=\"{mod.html_name}.html\"];\n")
-                       for mod2 in mod.tmhe.direct_greaters do
-                               if not modss.has(mod2) then continue
-                               op.append("\"{mod.name}\"->\"{mod2.name}\";\n")
-                       end
-               end
-               op.append("\}\n")
-               self.gen_dot(op.to_s, "dep", "Modules hierarchy")
-               add("</article></div>")
-               add("</div>")
-               add("<footer>{footer_text}</footer>")
-               addGithubInformation
-               addCommitForm
-               add("</body></html>\n")
-               write_to("{dir}/index.html")
-
-               # Generate page for modules
-               for mod in modules do
-                       if mod == mainmod then continue
-                       assert mod isa MMSrcModule
-                       if not mod.require_doc(self) then continue
-                       self.filename = mod.html_name
-                       action_bar = "<header><nav class='main'><ul>{custom_items}<li><a href='./index.html'>Overview</a></li><li class=\"current\">{mod.name}</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li><li id=\"liGitHub\" class=\"\"><a id=\"logGitHub\" class=\"btn\" ><img id=\"imgGitHub\" src=\"resources/icons/github-icon.png\" /></a><div class=\"popover bottom\"><div class=\"arrow\"></div><div class=\"githubTitle\"><h3>Github Sign In</h3></div><div><label id=\"lbloginGit\" for=\"login\">Username</label><input id=\"loginGit\" type=\"text\" name=\"login\"><label id=\"logginMessage\" >Hello <a id=\"githubAccount\" ><strong id=\"nickName\"></strong></a></label></div><div><label id=\"lbpasswordGit\" for=\"password\">Password</label><input id=\"passwordGit\" type=\"password\" name=\"password\"><div id=\"divGitHubRepoDisplay\"><label id=\"lbRepoDisplay\">Repository: </label><strong><label id=\"githubRepoDisplay\"></label></strong></div></div><div><label id=\"lbrepositoryGit\" for=\"repository\">Repository</label><input id=\"repositoryGit\" type=\"text\" name=\"repository\"><div id=\"listBranches\"><label id=\"lbBranches\">Branch </label><select id=\"dropBranches\" name=\"dropBranches\" tabindex=\"1\" class=\"dropdown\"></select></div></div><div><label id=\"lbbranchGit\" for=\"branch\">Branch</label><input id=\"branchGit\" type=\"text\" name=\"branch\"></div><div id=\"divlogIn\"><a id=\"signIn\" >Sign In</a></div></div></li></ul></nav></header>\n"
-                       clear
-                       add("<!DOCTYPE html>")
-                       add("<html><head>{head}<title>{mod.name} module | {custom_title}</title></head><body>\n")
-                       add(action_bar)
-                       add("<div class=\"page\">")
-                       mod.file_page_doc(self)
-                       add("</div>")
-                       add("<footer>{footer_text}</footer>")
-                       addGithubInformation
-                       addCommitForm
-                       add("</body></html>\n")
-                       write_to("{dir}/{mod.html_name}.html")
-               end
-
-               # Generate pages for global classes
-               for c in mainmod.local_classes do
-                       if not c.require_doc(self) then continue
-                       self.filename = c.html_name
-                       action_bar = "<header><nav class='main'><ul>{custom_items}<li><a href='./index.html'>Overview</a></li><li>{c.global.intro.mmmodule.toplevel_owner.html_link(self)}</li><li class=\"current\">{c.name}</li><li><a href='full-index.html'>Full Index</a></li><li><a href=\"help.html\">Help</a></li><li id=\"liGitHub\" class=\"\"><a id=\"logGitHub\" class=\"btn\" ><img id=\"imgGitHub\" src=\"resources/icons/github-icon.png\" /></a><div class=\"popover bottom\"><div class=\"arrow\"></div><div class=\"githubTitle\"><h3>Github Sign In</h3></div><div><label id=\"lbloginGit\" for=\"login\">Username</label><input id=\"loginGit\" type=\"text\" name=\"login\"><label id=\"logginMessage\" >Hello <a id=\"githubAccount\" ><strong id=\"nickName\"></strong></a></label></div><div><label id=\"lbpasswordGit\" for=\"password\">Password</label><input id=\"passwordGit\" type=\"password\" name=\"password\"><div id=\"divGitHubRepoDisplay\"><label id=\"lbRepoDisplay\">Repository: </label><strong><label id=\"githubRepoDisplay\"></label></strong></div></div><div><label id=\"lbrepositoryGit\" for=\"repository\">Repository</label><input id=\"repositoryGit\" type=\"text\" name=\"repository\"><div id=\"listBranches\"><label id=\"lbBranches\">Branch </label><select id=\"dropBranches\" name=\"dropBranches\" tabindex=\"1\" class=\"dropdown\"></select></div></div><div><label id=\"lbbranchGit\" for=\"branch\">Branch</label><input id=\"branchGit\" type=\"text\" name=\"branch\"></div><div id=\"divlogIn\"><a id=\"signIn\" >Sign In</a></div></div></li></ul></nav></header>\n"
-                       clear
-                       add("<!DOCTYPE html>")
-                       add("<html><head>{head}<title>{c.name} class | {custom_title}</title></head><body>\n")
-                       add(action_bar)
-                       add("<div class=\"page\">")
-                       c.file_page_doc(self)
-                       add("</div>")
-                       add("<footer>{footer_text}</footer>")
-                       addGithubInformation
-                       addCommitForm
-                       add("</body></html>\n")
-                       write_to("{dir}/{c.html_name}.html")
-               end
-
-               self.filename = "fullindex"
-               action_bar = "<header><nav class='main'><ul>{custom_items}<li><a href='./index.html'>Overview</a></li><li class=\"current\">Full Index</li><li><a href=\"help.html\">Help</a></li><li id=\"liGitHub\" class=\"\"><a id=\"logGitHub\" class=\"btn\" ><img id=\"imgGitHub\" src=\"resources/icons/github-icon.png\" /></a><div class=\"popover bottom\"><div class=\"arrow\"></div><div class=\"githubTitle\"><h3>Github Sign In</h3></div><div><label id=\"lbloginGit\" for=\"login\">Username</label><input id=\"loginGit\" type=\"text\" name=\"login\"><label id=\"logginMessage\" >Hello <a id=\"githubAccount\" ><strong id=\"nickName\"></strong></a></label></div><div><label id=\"lbpasswordGit\" for=\"password\">Password</label><input id=\"passwordGit\" type=\"password\" name=\"password\"><div id=\"divGitHubRepoDisplay\"><label id=\"lbRepoDisplay\">Repository: </label><strong><label id=\"githubRepoDisplay\"></label></strong></div></div><div><label id=\"lbrepositoryGit\" for=\"repository\">Repository</label><input id=\"repositoryGit\" type=\"text\" name=\"repository\"><div id=\"listBranches\"><label id=\"lbBranches\">Branch </label><select id=\"dropBranches\" name=\"dropBranches\" tabindex=\"1\" class=\"dropdown\"></select></div></div><div><label id=\"lbbranchGit\" for=\"branch\">Branch</label><input id=\"branchGit\" type=\"text\" name=\"branch\"></div></div> <div id=\"divlogIn\"><a id=\"signIn\" >Sign In</a></div></div></li></ul></nav></header>\n"
-               clear
-               add("<!DOCTYPE html>")
-               add("<html><head>{head}<title>Full Index | {custom_title}</title></head><body>\n")
-               add(action_bar)
-               add("<div class=\"page\">")
-               add("<div class=\"content fullpage\">")
-               mainmod.file_index_page_doc(self)
-               add("</div>")
-               add("</div>")
-               add("<footer>{footer_text}</footer>")
-               addGithubInformation
-               addCommitForm
-               add("</body></html>\n")
-               write_to("{dir}/full-index.html")
-
-               self.filename = "quicksearch-list"
-               clear
-               mainmod.file_quicksearch_list_doc(self)
-               write_to("{dir}/quicksearch-list.js")
-       end
-       
-       # Add or not a tag for the github repository
-       fun addGithubInformation do
-               if not github_repo == null then add("<div id=\"repoName\" name=\"{github_repo.to_s}\"></div>")
-       end
-
-       # Add all tags for the commit form
-       fun addCommitForm do    
-               add("<div id=\"modal\"><form class=\"clearfix\"><div><label for=\"commitMessage\">Commit message</label><textarea id=\"commitMessage\" rows=\"1\" cols=\"76\" name=\"commitMessage\" ></textarea><input id=\"chkSignedOff\" type=\"checkbox\" name=\"chkSignedOff\">Signed-Off </div><div class=\"social-signup login\"><form ></form></div><form id=\"github-connect-form\" class=\"connect-button\" name=\"login\"><a id=\"loginAction\" title=\"Commit on GitHub\"><img src=\"resources/icons/github-icon.png\"><span id=\"btnGitHub\"><strong>Commit</strong></span></a></form></form></div><div id=\"modalQuestion\"><label id=\"txtQuestion\"></label><br><a id=\"btnCreateBranch\">Yes</a><a id=\"btnCancelBranch\">No</a></div><div id=\"waitCommit\"></div>\n\n")
-       end
-
-       # Add a (source) link fo a given location
-       fun show_source(l: Location)
-       do
-               var s = opt_source.value
-               if s == null then
-                       add("({l.file.filename.simplify_path})")
+import model_utils
+import modelize_property
+import markdown
+
+# The NitdocContext contains all the knowledge used for doc generation
+class NitdocContext
+
+       private var toolcontext = new ToolContext
+       private var model: Model
+       private var mbuilder: ModelBuilder
+       private var mainmodule: MModule
+       private var class_hierarchy: POSet[MClass]
+       private var arguments: Array[String]
+       private var output_dir: nullable String
+       private var dot_dir: nullable String
+       private var share_dir: nullable String
+       private var source: nullable String
+       private var min_visibility: MVisibility
+
+       private var github_upstream: nullable String
+       private var github_basesha1: nullable String
+       private var github_gitdir: nullable String
+
+       private var opt_dir = new OptionString("Directory where doc is generated", "-d", "--dir")
+       private var opt_source = new OptionString("What link for source (%f for filename, %l for first line, %L for last line)", "--source")
+       private var opt_sharedir = new OptionString("Directory containing the nitdoc files", "--sharedir")
+       private var opt_nodot = new OptionBool("Do not generate graphes with graphviz", "--no-dot")
+       private var opt_private: OptionBool = new OptionBool("Generate the private API", "--private")
+
+       private var opt_custom_title: OptionString = new OptionString("Title displayed in the top of the Overview page and as suffix of all page names", "--custom-title")
+       private var opt_custom_menu_items: OptionString = new OptionString("Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)", "--custom-menu-items")
+       private var opt_custom_overview_text: OptionString = new OptionString("Text displayed as introduction of Overview page before the modules list", "--custom-overview-text")
+       private var opt_custom_footer_text: OptionString = new OptionString("Text displayed as footer of all pages", "--custom-footer-text")
+
+       private var opt_github_upstream: OptionString = new OptionString("The branch where edited commits will be pulled into (ex: user:repo:branch)", "--github-upstream")
+       private var opt_github_base_sha1: OptionString = new OptionString("The sha1 of the base commit used to create pull request", "--github-base-sha1")
+       private var opt_github_gitdir: OptionString = new OptionString("The git working directory used to resolve path name (ex: /home/me/myproject/)", "--github-gitdir")
+
+       init do
+               toolcontext.option_context.add_option(opt_dir)
+               toolcontext.option_context.add_option(opt_source)
+               toolcontext.option_context.add_option(opt_sharedir)
+               toolcontext.option_context.add_option(opt_nodot)
+               toolcontext.option_context.add_option(opt_private)
+               toolcontext.option_context.add_option(opt_custom_title)
+               toolcontext.option_context.add_option(opt_custom_footer_text)
+               toolcontext.option_context.add_option(opt_custom_overview_text)
+               toolcontext.option_context.add_option(opt_custom_menu_items)
+               toolcontext.option_context.add_option(opt_github_upstream)
+               toolcontext.option_context.add_option(opt_github_base_sha1)
+               toolcontext.option_context.add_option(opt_github_gitdir)
+               toolcontext.process_options
+               self.arguments = toolcontext.option_context.rest
+
+               if arguments.length < 1 then
+                       print "usage: nitdoc [options] file..."
+                       toolcontext.option_context.usage
+                       exit(1)
+               end
+               self.process_options
+
+               model = new Model
+               mbuilder = new ModelBuilder(model, toolcontext)
+               # Here we load and process all modules passed on the command line
+               var mmodules = mbuilder.parse(arguments)
+               if mmodules.is_empty then return
+               mbuilder.run_phases
+
+               if mmodules.length == 1 then
+                       mainmodule = mmodules.first
                else
-                       # THIS IS JUST UGLY ! (but there is no replace yet)
-                       var x = s.split_with("%f")
-                       s = x.join(l.file.filename.simplify_path)
-                       x = s.split_with("%l")
-                       s = x.join(l.line_start.to_s)
-                       x = s.split_with("%L")
-                       s = x.join(l.line_end.to_s)
-                       add(" (<a href=\"{s}\">show code</a>)")
+                       # We need a main module, so we build it by importing all modules
+                       mainmodule = new MModule(model, null, "<main>", new Location(null, 0, 0, 0, 0))
+                       mainmodule.set_imported_mmodules(mmodules)
                end
+               self.class_hierarchy = mainmodule.flatten_mclass_hierarchy
        end
 
-       # Return source link for a given location
-       fun get_source(l: Location): String
-       do
-               var s = opt_source.value
-               if s == null then
-                       return l.file.filename.simplify_path
+       private fun process_options do
+               if not opt_dir.value is null then
+                       output_dir = opt_dir.value
                else
-                       # THIS IS JUST UGLY ! (but there is no replace yet)
-                       var x = s.split_with("%f")
-                       s = x.join(l.file.filename.simplify_path)
-                       x = s.split_with("%l")
-                       s = x.join(l.line_start.to_s)
-                       x = s.split_with("%L")
-                       s = x.join(l.line_end.to_s)
-                       return s
+                       output_dir = "doc"
                end
-       end
-
-       # Generate a clicable graphiz image using a dot content.
-       # `name' refer to the filename (without extension) and the id name of the map.
-       # `name' must also match the name of the graph in the dot content (eg. digraph NAME {...)
-       fun gen_dot(dot: String,  name: String, alt: String)
-       do
-               if opt_nodot.value then return
-               var f = new OFStream.open("{self.dir}/{name}.dot")
-               f.write(dot)
-               f.close
-               sys.system("\{ test -f {self.dir}/{name}.png && test -f {self.dir}/{name}.s.dot && diff {self.dir}/{name}.dot {self.dir}/{name}.s.dot >/dev/null 2>&1 ; \} || \{ cp {self.dir}/{name}.dot {self.dir}/{name}.s.dot && dot -Tpng -o{self.dir}/{name}.png -Tcmapx -o{self.dir}/{name}.map {self.dir}/{name}.s.dot ; \}")
-               self.add("<article class=\"graph\"><img src=\"{name}.png\" usemap=\"#{name}\" style=\"margin:auto\" alt=\"{alt}\"/></article>")
-               var fmap = new IFStream.open("{self.dir}/{name}.map")
-               self.add(fmap.read_all)
-               fmap.close
-       end
-
-       init
-       do
-               keep_ast = true
-               super("nitdoc")
-               filename = "-unset-"
-               option_context.add_option(opt_public)
-               option_context.add_option(opt_private)
-               option_context.add_option(opt_dir)
-               option_context.add_option(opt_source)
-               option_context.add_option(opt_nodot)
-               option_context.add_option(opt_sharedir)
-               option_context.add_option(opt_custom_title)
-               option_context.add_option(opt_custom_menu_items)
-               option_context.add_option(opt_custom_overview_text)
-               option_context.add_option(opt_custom_footer_text)
-               option_context.add_option(opt_github_repo_name)
-       end
-
-       redef fun process_options
-       do
-               super
-               var d = opt_dir.value
-               if d != null then dir = d
-
-               if not opt_nodot.value then
-                       # Test if dot is runable
-                       var res = sys.system("sh -c dot </dev/null >/dev/null 2>&1")
-                       if res != 0 then
-                               stderr.write "--no-dot implied since `dot' is not available. Try to install graphviz.\n"
-                               opt_nodot.value = true
-                       end
-               end
-               
-               sharedir = opt_sharedir.value
-               if sharedir == null then
+               if not opt_sharedir.value is null then
+                       share_dir = opt_sharedir.value
+               else
                        var dir = "NIT_DIR".environ
                        if dir.is_empty then
                                dir = "{sys.program_name.dirname}/../share/nitdoc"
-                               if dir.file_exists then sharedir = dir
                        else
                                dir = "{dir}/share/nitdoc"
-                               if dir.file_exists then sharedir = dir
                        end
-                       if sharedir == null then
-                               fatal_error(null, "Error: Cannot locate nitdoc shared files. Uses --sharedir or envvar NIT_DIR.")
+                       share_dir = dir
+                       if share_dir is null then
+                               print "Error: Cannot locate nitdoc share files. Uses --sharedir or envvar NIT_DIR"
+                               abort
                        end
-                       dir = "{sharedir.to_s}/scripts/js-facilities.js"
-                       if sharedir == null then
-                               fatal_error(null, "Error: Invalid nitdoc shared files. Check --sharedir or envvar NIT_DIR.")
+                       dir = "{share_dir.to_s}/scripts/js-facilities.js"
+                       if share_dir is null then
+                               print "Error: Invalid nitdoc share files. Check --sharedir or envvar NIT_DIR"
+                               abort
                        end
 
+                       if opt_private.value then
+                               min_visibility = none_visibility
+                       else
+                               min_visibility = protected_visibility
+                       end
                end
-               var git = opt_github_repo_name.value
-               if not git == null then github_repo = git
-       end
-
-       redef fun handle_property_conflict(lc, impls)
-       do
-               # THIS IS SO UGLY! See MMVirtualModule
-               if lc.mmmodule == self.mainmod then 
-                       return # We just accept, so one in impls is arbitrary inherited
+               var gh_upstream = opt_github_upstream.value
+               var gh_base_sha = opt_github_base_sha1.value
+               var gh_gitdir = opt_github_gitdir.value
+               if not gh_upstream == null or not gh_base_sha == null or not gh_gitdir == null then
+                       if gh_upstream == null or gh_base_sha == null or gh_gitdir == null then
+                               print "Error: Options {opt_github_upstream.names.first}, {opt_github_base_sha1.names.first} and {opt_github_gitdir.names.first} are required to enable the GitHub plugin"
+                               abort
+                       else
+                               self.github_upstream = gh_upstream
+                               self.github_basesha1 = gh_base_sha
+                               self.github_gitdir = gh_gitdir
+                       end
                end
-               super
+               source = opt_source.value
        end
-end
-
-# A virtual module is used to work as an implicit main module that combine unrelated modules
-# Since conflict may arrise in a virtual module (the main method for instance) conflicts are disabled
-class MMVirtualModule
-       super MMModule
-       init(ctx: MMContext, mods: Array[MMModule])
-       do
-               # We need to compute the whole metamodel since there is no mmbuilder to do it
-               super(" main".to_symbol, mods.first.directory, ctx, new Location(null,0,0,0,0))
-               ctx.add_module(self, mods)
-               for m in mods do
-                       self.add_super_module(m, 1)
-               end
-               self.import_global_classes
-               self.import_local_classes
-               for c in self.local_classes do
-                       c.compute_super_classes
-               end
-               for c in self.local_classes do
-                       c.compute_ancestors
-               end
 
+       fun generate_nitdoc do
+               # Create destination dir if it's necessary
+               if not output_dir.file_exists then output_dir.mkdir
+               sys.system("cp -r {share_dir.to_s}/* {output_dir.to_s}/")
+               self.dot_dir = null
+               if not opt_nodot.value then self.dot_dir = output_dir.to_s
+               overview
+               search
+               modules
+               classes
+               quicksearch_list
        end
-       redef fun require_doc(dctx) do return false
-end
-
-# Conditionnal part of the text content of a DocContext
-class StageContext
-       # Content of the current stage
-       readable var _content: Array[String] = new Array[String]
 
-       # Is a normal string already added?
-       readable writable var _validate: Bool = false
+       private fun overview do
+               var overviewpage = new NitdocOverview(self, dot_dir)
+               overviewpage.save("{output_dir.to_s}/index.html")
+       end
 
-       # Parent stage is any
-       readable var _parent: nullable StageContext = null
+       private fun search do
+               var searchpage = new NitdocSearch(self)
+               searchpage.save("{output_dir.to_s}/search.html")
+       end
 
-       init(parent: nullable StageContext) do _parent = parent
-end
+       private fun modules do
+               for mmodule in model.mmodules do
+                       if mmodule.name == "<main>" then continue
+                       var modulepage = new NitdocModule(mmodule, self, dot_dir)
+                       modulepage.save("{output_dir.to_s}/{mmodule.url}")
+               end
+       end
 
+       private fun classes do
+               for mclass in mbuilder.model.mclasses do
+                       var classpage = new NitdocClass(mclass, self, dot_dir, source)
+                       classpage.save("{output_dir.to_s}/{mclass.url}")
+               end
+       end
 
-# Efficiently sort object with their to_s method
-class AlphaSorter[E: Object]
-       super AbstractSorter[E]
-       redef fun compare(a, b)
-       do
-               var sa: String
-               var sb: String
-               var d = _dico
-               if d.has_key(a) then
-                       sa = d[a]
-               else
-                       sa = a.to_s
-                       d[a] = sa
+       private fun quicksearch_list do
+               var file = new OFStream.open("{output_dir.to_s}/quicksearch-list.js")
+               file.write("var nitdocQuickSearchRawList = \{ ")
+               for mmodule in model.mmodules do
+                       if mmodule.name == "<main>" then continue
+                       file.write("\"{mmodule.name}\": [")
+                       file.write("\{txt: \"{mmodule.full_name}\", url:\"{mmodule.url}\" \},")
+                       file.write("],")
                end
-               if d.has_key(b) then
-                       sb = d[b]
-               else
-                       sb = b.to_s
-                       d[b] = sb
+               for mclass in model.mclasses do
+                       if mclass.visibility < min_visibility then continue
+                       file.write("\"{mclass.name}\": [")
+                       file.write("\{txt: \"{mclass.full_name}\", url:\"{mclass.url}\" \},")
+                       file.write("],")
                end
-               return sa <=> sb
+               var name2mprops = new HashMap[String, Set[MPropDef]]
+               for mproperty in model.mproperties do
+                       if mproperty.visibility < min_visibility then continue
+                       if mproperty isa MAttribute then continue
+                       if not name2mprops.has_key(mproperty.name) then name2mprops[mproperty.name] = new HashSet[MPropDef]
+                       name2mprops[mproperty.name].add_all(mproperty.mpropdefs)
+               end
+               for mproperty, mpropdefs in name2mprops do
+                       file.write("\"{mproperty}\": [")
+                       for mpropdef in mpropdefs do
+                               file.write("\{txt: \"{mpropdef.full_name}\", url:\"{mpropdef.url}\" \},")
+                       end
+                       file.write("],")
+               end
+               file.write(" \};")
+               file.close
        end
 
-       # Keep track of to_s values
-       var _dico: HashMap[Object, String] = new HashMap[Object, String]
-
-       init do end
 end
 
-# Generalization of metamodel entities
-interface MMEntity
-       # Return a link to
-       fun html_link(dctx: DocContext): String is abstract
+# Nitdoc base page
+abstract class NitdocPage
 
-       # Return a one liner description
-       fun short_doc: String do return "&nbsp;"
+       var dot_dir: nullable String
+       var source: nullable String
+       var ctx: NitdocContext
 
-       # The doc node from the AST
-       # Return null is none
-       fun doc: nullable ADoc do return null
-
-       # Return a JSON entry for quicksearch list
-       fun json_entry(dctx: DocContext): String is abstract
-
-       # Return the qualified name as string
-       fun qualified_name: String is abstract
-               
-end
-
-redef class MMModule
-       super MMEntity
-       redef fun html_link(dctx) do 
-               if short_doc == "&nbsp;" then
-                       return "<a href=\"{html_name}.html\"\">{self}</a>"
-               else 
-                       return "<a href=\"{html_name}.html\" title=\"{short_doc}\">{self}</a>"
-               end
-       end
-       
-       fun html_anchor: String do 
-               return "<a id=\"MOD_{html_name}\"></a>"
-       end
-       
-       fun html_link_to_anchor: String do 
-               return "<a href=\"#MOD_{html_name}\" title=\"Jump to definitions from module {html_name}\">{self}</a>"
+       init(ctx: NitdocContext) do
+               self.ctx = ctx
        end
 
-       redef fun json_entry(dctx) do
-               return "\{txt:\"{self.qualified_name}\",url:\"{html_name}.html\"\},"
+       protected fun head do
+               append("<meta charset='utf-8'/>")
+               append("<script type='text/javascript' src='scripts/jquery-1.7.1.min.js'></script>")
+               append("<script type='text/javascript' src='scripts/ZeroClipboard.min.js'></script>")
+               append("<script type='text/javascript' src='scripts/Nitdoc.UI.js'></script>")
+               append("<script type='text/javascript' src='scripts/Markdown.Converter.js'></script>")
+               append("<script type='text/javascript' src='scripts/base64.js'></script>")
+               append("<script type='text/javascript' src='scripts/Nitdoc.GitHub.js'></script>")
+               append("<script type='text/javascript' src='quicksearch-list.js'></script>")
+               append("<script type='text/javascript' src='scripts/Nitdoc.QuickSearch.js'></script>")
+               append("<link rel='stylesheet' href='styles/main.css' type='text/css' media='screen'/>")
+               append("<link rel='stylesheet' href='styles/Nitdoc.UI.css' type='text/css' media='screen'/>")
+               append("<link rel='stylesheet' href='styles/Nitdoc.QuickSearch.css' type='text/css' media='screen'/>")
+               append("<link rel='stylesheet' href='styles/Nitdoc.GitHub.css' type='text/css' media='screen'/>")
+               var title = ""
+               if ctx.opt_custom_title.value != null then
+                       title = " | {ctx.opt_custom_title.value.to_s}"
+               end
+               append("<title>{self.title}{title}</title>")
        end
 
-       redef fun qualified_name do
-               var buffer = new Buffer
-               for m in mnhe.smallers do
-                       buffer.append("{m.html_name}::")
+       protected fun menu do
+               if ctx.opt_custom_menu_items.value != null then
+                       append(ctx.opt_custom_menu_items.value.to_s)
                end
-               buffer.append("{self.name}")
-               return buffer.to_s
        end
 
-       fun require_doc(dctx: DocContext): Bool
-       do
-               if dctx.public_only and not is_toplevel then return false
-               return true
-       end
+       protected fun title: String is abstract
 
-       # Return true if the module is a top-level owner or a top-level module
-       fun is_toplevel: Bool
-       do
-               var pd = directory.parent
-               return pd == null or (pd.owner == null and directory.owner == self)
+       protected fun header do
+               append("<header>")
+               append("<nav class='main'>")
+               append("<ul>")
+               menu
+               append("</ul>")
+               append("</nav>")
+               append("</header>")
        end
 
-       # Element in the module nesting tree
-       fun mnhe: PartialOrderElement[MMModule] do return mnhe_.as(not null)
-       var mnhe_: nullable PartialOrderElement[MMModule] = null
-
-       # Element in the top level module importation hierarchy
-       fun tmhe: PartialOrderElement[MMModule] do return tmhe_.as(not null)
-       var tmhe_: nullable PartialOrderElement[MMModule] = null
+       protected fun content is abstract
 
-       fun toplevel_owner: MMModule
-       do
-               var m = self
-               loop
-                       var ds = m.mnhe.direct_smallers
-                       if ds.length == 0 then return m
-                       if ds.length == 1 then m = ds.first else abort
+       protected fun footer do
+               if ctx.opt_custom_footer_text.value != null then
+                       append("<footer>{ctx.opt_custom_footer_text.value.to_s}</footer>")
                end
        end
 
-       fun html_name: String
-       do
-               return "{name}"
+       # Generate a clickable graphviz image using a dot content
+       protected fun generate_dot(dot: String, name: String, alt: String) do
+               var output_dir = dot_dir
+               if output_dir == null then return
+               var file = new OFStream.open("{output_dir}/{name}.dot")
+               file.write(dot)
+               file.close
+               sys.system("\{ test -f {output_dir}/{name}.png && test -f {output_dir}/{name}.s.dot && diff {output_dir}/{name}.dot {output_dir}/{name}.s.dot >/dev/null 2>&1 ; \} || \{ cp {output_dir}/{name}.dot {output_dir}/{name}.s.dot && dot -Tpng -o{output_dir}/{name}.png -Tcmapx -o{output_dir}/{name}.map {output_dir}/{name}.s.dot ; \}")
+               append("<article class='graph'>")
+               append("<img src='{name}.png' usemap='#{name}' style='margin:auto' alt='{alt}'/>")
+               append("</article>")
+               var fmap = new IFStream.open("{output_dir}/{name}.map")
+               append(fmap.read_all)
+               fmap.close
        end
 
-       fun direct_owner: nullable MMModule
+       # Add a (source) link for a given location
+       protected fun show_source(l: Location): String
        do
-               var d = directory
-               while d.owner == self do d = d.parent.as(not null)
-               return d.owner
-       end
+               if source == null then
+                       return "({l.file.filename.simplify_path})"
+               else
+                       # THIS IS JUST UGLY ! (but there is no replace yet)
+                       var x = source.split_with("%f")
+                       source = x.join(l.file.filename.simplify_path)
+                       x = source.split_with("%l")
+                       source = x.join(l.line_start.to_s)
+                       x = source.split_with("%L")
+                       source = x.join(l.line_end.to_s)
+                       return " (<a target='_blank' title='Show source' href=\"{source.to_s}\">source</a>)"
+               end
+       end
+
+       # Render the page as a html string
+       protected fun render do
+               append("<!DOCTYPE html>")
+               append("<head>")
+               head
+               append("</head>")
+               append("<body")
+               if ctx.opt_github_upstream.value != null and ctx.opt_github_base_sha1.value != null then
+                       append(" data-github-upstream='{ctx.opt_github_upstream.value.as(not null)}'")
+                       append(" data-github-base-sha1='{ctx.opt_github_base_sha1.value.as(not null)}'")
+               end
+               append(">")
+               header
+               var footed = ""
+               if ctx.opt_custom_footer_text.value != null then footed = "footed"
+               append("<div class='page {footed}'>")
+               content
+               append("</div>")
+               footer
+               append("</body>")
+       end
+
+       # Append a string to the page
+       fun append(s: String) do out.write(s)
+
+       # Save html page in the specified file
+       fun save(file: String) do
+               self.out = new OFStream.open(file)
+               render
+               self.out.close
+       end
+       private var out: nullable OFStream
+end
 
-       # Fill the body for the page associated to the module 
-       fun file_page_doc(dctx: DocContext)
-       do
-               dctx.add("<div class=\"menu\">\n")
-
-               var mods = new Array[MMModule]
-               mods = self.mhe.greaters.to_a
-               dctx.sort(mods)
-
-               dctx.open_stage
-               dctx.stage("<nav>\n")
-               dctx.stage("<h3>Module Hierarchy</h3>\n")
-               dctx.stage("<h4>All dependencies</h4>\n")
-               dctx.stage("<ul>\n")
-               for mod in mods do
-                       if not mod.require_doc(dctx) then continue
-                       if self.mnhe <= mod then continue # do not want nested stuff
-                       if mod.direct_owner != null and not mod.direct_owner.mnhe <= self then continue # not in the right nesting
-                       dctx.add("<li>{mod.html_link(dctx)}</li>")
-               end
-               dctx.stage("</ul>\n")
-
-               mods = self.mhe.smallers.to_a
-               dctx.sort(mods)
-               dctx.stage("<h4>All clients</h4>\n")
-               dctx.stage("<ul>\n")
-               for mod in mods do
-                       if not mod.require_doc(dctx) then continue
-                       if self.mnhe <= mod then continue # do not want nested stuff
-                       if mod.direct_owner != null and not mod.direct_owner.mnhe <= self then continue # not in the right nesting
-                       dctx.add("<li>{mod.html_link(dctx)}</li>")
-               end
-               dctx.stage("</ul>\n")
-               dctx.stage("</nav>\n")
-               dctx.close_stage
-
-               if not dctx.public_only then
-                       mods = self.mnhe.direct_greaters.to_a
-                       dctx.sort(mods)
-                       dctx.open_stage
-                       dctx.stage("<nav>\n")
-                       dctx.stage("<h3>Nested Modules</h3><ul>\n")
-                       for mod in mods do
-                               if not mod.require_doc(dctx) then continue
-                               dctx.add("<li>{mod.html_link(dctx)}</li>")
+# The overview page
+class NitdocOverview
+       super NitdocPage
+       private var mbuilder: ModelBuilder
+       private var mmodules = new Array[MModule]
+
+       init(ctx: NitdocContext, dot_dir: nullable String) do
+               super(ctx)
+               self.mbuilder = ctx.mbuilder
+               self.dot_dir = dot_dir
+               # get modules
+               var mmodules = new HashSet[MModule]
+               for mmodule in mbuilder.model.mmodule_importation_hierarchy do
+                       if mmodule.name == "<main>" then continue
+                       var owner = mmodule.public_owner
+                       if owner != null then
+                               mmodules.add(owner)
+                       else
+                               mmodules.add(mmodule)
                        end
-                       dctx.stage("</ul></nav>\n")
-                       dctx.close_stage
                end
+               # sort modules
+               var sorter = new MModuleNameSorter
+               self.mmodules.add_all(mmodules)
+               sorter.sort(self.mmodules)
+       end
 
-               dctx.add("</div>") # metadata
+       redef fun title do return "Overview"
 
-               dctx.add("<div class=\"content\">\n")
-               dctx.add("<h1>{name}</h1>\n")
-               dctx.add("<div class='subtitle'>module ")
-               for m in mnhe.smallers do
-                       dctx.add("{m.html_link(dctx)}::")
+       redef fun menu do
+               super
+               append("<li class='current'>Overview</li>")
+               append("<li><a href='search.html'>Search</a></li>")
+       end
+
+       redef fun content do
+               append("<div class='content fullpage'>")
+               var title = "Overview"
+               if ctx.opt_custom_title.value != null then
+                       title = ctx.opt_custom_title.value.to_s
+               end
+               append("<h1>{title}</h1>")
+               var text = ""
+               if ctx.opt_custom_overview_text.value != null then
+                       text = ctx.opt_custom_overview_text.value.to_s
+               end
+               append("<article class='overview'>{text}</article>")
+               append("<article class='overview'>")
+               # module list
+               append("<h2>Modules</h2>")
+               append("<ul>")
+               for mmodule in mmodules do
+                       if mbuilder.mmodule2nmodule.has_key(mmodule) then
+                               var amodule = mbuilder.mmodule2nmodule[mmodule]
+                               append("<li>")
+                               mmodule.html_link(self)
+                               append("&nbsp;{amodule.short_comment}</li>")
+                       end
                end
-               dctx.add("{self.name}</div>\n")
-               dctx.add("<div style=\"float: right;\"><a id=\"lblDiffCommit\"></a></div>")
-               dctx.add("<section class='description'>\n")
-
-               var doc = doc
-               if doc != null then
-                       dctx.add("<div id=\"description\">\n")
-                       dctx.add("<pre class=\"text_label\">{doc.to_html}</pre>\n")
-                       dctx.add("<textarea rows=\"1\" cols=\"76\" id=\"fileContent\" class=\"edit\"></textarea>\n")
-                       dctx.add("<a id=\"cancelBtn\">Cancel</a><a id=\"commitBtn\">Commit</a>")
-                       dctx.add("<pre id=\"preSave\" type=\"2\" class=\"text_label\" ></pre>")
-                       dctx.add("</div>\n")
+               append("</ul>")
+               # module graph
+               process_generate_dot
+               append("</article>")
+               append("</div>")
+       end
+
+       private fun process_generate_dot do
+               # build poset with public owners
+               var poset = new POSet[MModule]
+               for mmodule in mmodules do
+                       poset.add_node(mmodule)
+                       for omodule in mmodules do
+                               if mmodule == omodule then continue
+                               if mmodule.in_importation < omodule then
+                                       poset.add_node(omodule)
+                                       poset.add_edge(mmodule, omodule)
+                               end
+                       end
                end
-
+               # build graph
                var op = new Buffer
-               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               var ms = new Array[nullable MMModule]
-               do
-                       var m0: nullable MMModule = self
-                       while m0 != null do
-                               m0 = m0.direct_owner
-                               ms.add(m0)
+               op.append("digraph dep \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
+               for mmodule in poset do
+                       op.append("\"{mmodule.name}\"[URL=\"{mmodule.url}\"];\n")
+                       for omodule in poset[mmodule].direct_greaters do
+                               op.append("\"{mmodule.name}\"->\"{omodule.name}\";\n")
                        end
                end
-               var cla = new HashSet[MMModule]
-               cla.add(self)
-               for m0 in self.mhe.greaters do
-                       if not m0.require_doc(dctx) then continue
-                       if self.visibility_for(m0) <= 1 then continue # private or hidden
-                       if self.mnhe <= m0 then continue # do not want nested stuff
-                       if m0.direct_owner != null and not m0.direct_owner.mnhe <= self then continue # not in the right nesting
-                       cla.add(m0)
-               end
-               for m0 in self.mhe.smallers do
-                       if not m0.require_doc(dctx) then continue
-                       if m0.visibility_for(self) <= 1 then continue # private or hidden
-                       if m0.direct_owner != null and not m0.direct_owner.mnhe <= self then continue # not in the right nesting
-                       cla.add(m0)
-               end
-               for m0 in self.mnhe.smallers do
-                       cla.add(m0)
-               end
-               ms = ms.reversed
-               for m0 in ms do
-                       if m0 != null then
-                               op.append("subgraph \"cluster_{m0.name}\"\{\n")
-                       end
-                       for c in cla do
-                               if c.direct_owner != m0 then continue
-                               if c == self then
-                                       op.append("\"{c.name}\"[shape=box,margin=0.03];\n")
+               op.append("\}\n")
+               generate_dot(op.to_s, "dep", "Modules hierarchy")
+       end
+end
+
+# The search page
+class NitdocSearch
+       super NitdocPage
+
+       init(ctx: NitdocContext) do
+               super(ctx)
+               self.dot_dir = null
+       end
+
+       redef fun title do return "Search"
+
+       redef fun menu do
+               super
+               append("<li><a href='index.html'>Overview</a></li>")
+               append("<li class='current'>Search</li>")
+       end
+
+       redef fun content do
+               append("<div class='content fullpage'>")
+               append("<h1>{title}</h1>")
+               module_column
+               classes_column
+               properties_column
+               append("</div>")
+       end
+
+       # Add to content modules column
+       private fun module_column do
+               var sorted = ctx.mbuilder.model.mmodule_importation_hierarchy.to_a
+               var sorter = new MModuleNameSorter
+               sorter.sort(sorted)
+               append("<article class='modules filterable'>")
+               append("<h2>Modules</h2>")
+               append("<ul>")
+               for mmodule in sorted do
+                       if mmodule.name == "<main>" then continue
+                       append("<li>")
+                       mmodule.html_link(self)
+                       append("</li>")
+               end
+               append("</ul>")
+               append("</article>")
+       end
+
+       # Add to content classes modules
+       private fun classes_column do
+               var sorted = ctx.mbuilder.model.mclasses
+               var sorter = new MClassNameSorter
+               sorter.sort(sorted)
+               append("<article class='modules filterable'>")
+               append("<h2>Classes</h2>")
+               append("<ul>")
+               for mclass in sorted do
+                       if mclass.visibility < ctx.min_visibility then continue
+                       append("<li>")
+                       mclass.html_link(self)
+                       append("</li>")
+               end
+               append("</ul>")
+               append("</article>")
+       end
+
+       # Insert the properties column of fullindex page
+       private fun properties_column do
+               var sorted = ctx.mbuilder.model.mproperties
+               var sorter = new MPropertyNameSorter
+               sorter.sort(sorted)
+               append("<article class='modules filterable'>")
+               append("<h2>Properties</h2>")
+               append("<ul>")
+               for mproperty in sorted do
+                       if mproperty.visibility < ctx.min_visibility then continue
+                       if mproperty isa MAttribute then continue
+                       append("<li>")
+                       mproperty.intro.html_link(self)
+                       append(" (")
+                       mproperty.intro.mclassdef.mclass.html_link(self)
+                       append(")</li>")
+               end
+               append("</ul>")
+               append("</article>")
+       end
+
+end
+
+# A module page
+class NitdocModule
+       super NitdocPage
+
+       private var mmodule: MModule
+       private var mbuilder: ModelBuilder
+       private var local_mclasses = new HashSet[MClass]
+       private var intro_mclasses = new HashSet[MClass]
+       private var redef_mclasses = new HashSet[MClass]
+
+       init(mmodule: MModule, ctx: NitdocContext, dot_dir: nullable String) do
+               super(ctx)
+               self.mmodule = mmodule
+               self.mbuilder = ctx.mbuilder
+               self.dot_dir = dot_dir
+               # get local mclasses
+               for m in mmodule.in_nesting.greaters do
+                       for mclassdef in m.mclassdefs do
+                               if mclassdef.mclass.visibility < ctx.min_visibility then continue
+                               if mclassdef.is_intro then
+                                       intro_mclasses.add(mclassdef.mclass)
                                else
-                                       op.append("\"{c.name}\"[URL=\"{c.html_name}.html\"];\n")
+                                       if mclassdef.mclass.mpropdefs_in_module(self).is_empty then continue
+                                       redef_mclasses.add(mclassdef.mclass)
                                end
+                               local_mclasses.add(mclassdef.mclass)
                        end
-                       if m0 != null then
-                               op.append("\"{m0.name}\"[URL=\"{m0.html_name}.html\"];\n")
-                               for c in m0.mhe.direct_greaters do
-                                       if not cla.has(c) then continue
-                                       op.append("\"{m0.name}\"->\"{c.name}\";\n")
+               end
+       end
+
+       redef fun title do
+               if mbuilder.mmodule2nmodule.has_key(mmodule) and not mbuilder.mmodule2nmodule[mmodule].short_comment.is_empty then
+                       var nmodule = mbuilder.mmodule2nmodule[mmodule]
+                       return "{mmodule.html_name} module | {nmodule.short_comment}"
+               else
+                       return "{mmodule.html_name} module"
+               end
+       end
+
+       redef fun menu do
+               super
+               append("<li><a href='index.html'>Overview</a></li>")
+               append("<li class='current'>{mmodule.html_name}</li>")
+               append("<li><a href='search.html'>Search</a></li>")
+       end
+
+       redef fun content do
+               append("<div class='sidebar'>")
+               classes_column
+               importation_column
+               append("</div>")
+               append("<div class='content'>")
+               module_doc
+               append("</div>")
+       end
+
+       private fun classes_column do
+               var sorter = new MClassNameSorter
+               var sorted = new Array[MClass]
+               sorted.add_all(intro_mclasses)
+               sorted.add_all(redef_mclasses)
+               sorter.sort(sorted)
+               if not sorted.is_empty then
+                       append("<nav class='properties filterable'>")
+                       append("<h3>Classes</h3>")
+                       append("<h4>Classes</h4>")
+                       append("<ul>")
+                       for mclass in sorted do mclass.html_sidebar_item(self)
+                       append("</ul>")
+                       append("</nav>")
+               end
+       end
+
+       private fun importation_column do
+               append("<nav>")
+               append("<h3>Module Hierarchy</h3>")
+               var dependencies = new Array[MModule]
+               for dep in mmodule.in_importation.greaters do
+                       if dep == mmodule or dep.direct_owner == mmodule or dep.public_owner == mmodule then continue
+                       dependencies.add(dep)
+               end
+               if mmodule.in_nesting.direct_greaters.length > 0 then
+                       append("<h4>Nested Modules</h4>")
+                       display_module_list(mmodule.in_nesting.direct_greaters.to_a)
+               end
+               if dependencies.length > 0 then
+                       append("<h4>All dependencies</h4>")
+                       display_module_list(dependencies)
+               end
+               var clients = new Array[MModule]
+               for dep in mmodule.in_importation.smallers do
+                       if dep.name == "<main>" then continue
+                       if dep == mmodule then continue
+                       clients.add(dep)
+               end
+               if clients.length > 0 then
+                       append("<h4>All clients</h4>")
+                       display_module_list(clients)
+               end
+               append("</nav>")
+       end
+
+       private fun display_module_list(list: Array[MModule]) do
+               append("<ul>")
+               var sorter = new MModuleNameSorter
+               sorter.sort(list)
+               for m in list do
+                       append("<li>")
+                       m.html_link(self)
+                       append("</li>")
+               end
+               append("</ul>")
+       end
+
+       private fun module_doc do
+               # title
+               append("<h1>{mmodule.html_name}</h1>")
+               append("<div class='subtitle info'>")
+               mmodule.html_signature(self)
+               append("</div>")
+               # comment
+               mmodule.html_comment(self)
+               process_generate_dot
+               # classes
+               var class_sorter = new MClassNameSorter
+               # intro
+               if not intro_mclasses.is_empty then
+                       var sorted = new Array[MClass]
+                       sorted.add_all(intro_mclasses)
+                       class_sorter.sort(sorted)
+                       append("<section class='classes'>")
+                       append("<h2 class='section-header'>Introduced classes</h2>")
+                       for mclass in sorted do mclass.html_full_desc(self)
+                       append("</section>")
+               end
+               # redefs
+               var redefs = new Array[MClass]
+               for mclass in redef_mclasses do if not intro_mclasses.has(mclass) then redefs.add(mclass)
+               class_sorter.sort(redefs)
+               if not redefs.is_empty then
+                       append("<section class='classes'>")
+                       append("<h2 class='section-header'>Refined classes</h2>")
+                       for mclass in redefs do mclass.html_full_desc(self)
+                       append("</section>")
+               end
+       end
+
+       private fun process_generate_dot do
+               # build poset with public owners
+               var poset = new POSet[MModule]
+               for mmodule in self.mmodule.in_importation.poset do
+                       if mmodule.name == "<main>" then continue
+                       #if mmodule.public_owner != null then continue
+                       if not mmodule.in_importation < self.mmodule and not self.mmodule.in_importation < mmodule and mmodule != self.mmodule then continue
+                       poset.add_node(mmodule)
+                       for omodule in mmodule.in_importation.poset do
+                               if mmodule == omodule then continue
+                               if omodule.name == "<main>" then continue
+                               if not omodule.in_importation < self.mmodule and not self.mmodule.in_importation < omodule then continue
+                               if omodule.in_importation < mmodule then
+                                       poset.add_node(omodule)
+                                       poset.add_edge(omodule, mmodule)
+                               end
+                               if mmodule.in_importation < omodule then
+                                       poset.add_node(omodule)
+                                       poset.add_edge(mmodule, omodule)
                                end
+                               #if omodule.public_owner != null then continue
+                               #if mmodule.in_importation < omodule then
+                                       #poset.add_node(omodule)
+                                       #poset.add_edge(mmodule, omodule)
+                               #end
                        end
                end
-               for m0 in ms do
-                       # Close the nesting subgraph
-                       if m0 != null then
-                               op.append("\}\n")
+               # build graph
+               var op = new Buffer
+               var name = "dep_{mmodule.name}"
+               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
+               for mmodule in poset do
+                       if mmodule == self.mmodule then
+                               op.append("\"{mmodule.name}\"[shape=box,margin=0.03];\n")
+                       else
+                               op.append("\"{mmodule.name}\"[URL=\"{mmodule.url}\"];\n")
                        end
-               end
-               for c in cla do
-                       for c2 in c.tmhe.direct_greaters do
-                               if not cla.has(c2) then continue
-                               op.append("\"{c.name}\"->\"{c2.name}\";\n")
+                       for omodule in poset[mmodule].direct_greaters do
+                               op.append("\"{mmodule.name}\"->\"{omodule.name}\";\n")
                        end
                end
                op.append("\}\n")
-               dctx.gen_dot(op.to_s, name.to_s, "Dependency graph for module {name}")
-               dctx.add("</section>")
-
-               var clas = new Array[MMLocalClass]
-               var props = new HashMap[MMGlobalProperty, Array[MMLocalProperty]]
-               var gprops = new Array[MMLocalProperty]
-               do
-                       var m = self
-                       for g in m.global_classes do
-                               var lc = m[g]
-                               if not lc.require_doc(dctx) then continue
-                               var im = g.intro.mmmodule
-                               if self.visibility_for(im) <= 1 then continue # private import or invisible import
-                               var keep = false
-                               for lc2 in lc.crhe.greaters_and_self do
-                                       if not lc2 isa MMSrcLocalClass then continue
-                                       if not self.mnhe <= lc2.mmmodule then continue # not introduced/redefined here/stolen
-                                       keep = true
-                               end
-                               if not keep then continue
-                               clas.add(self[g])
-                               lc.compute_super_classes
-                               for gp in lc.global_properties do
-                                       if self.visibility_for(gp.intro.local_class.mmmodule) <= 1 then continue # private import or invisible import
-                                       var lp = lc[gp]
-                                       var mp = lp.local_class.mmmodule
-                                       if not self.mnhe <= mp then continue # not introduced/redefined here/stolen
-                                       lp = self[g][gp]
-                                       if not lp.require_doc(dctx) then continue
-                                       if props.has_key(lp.global) then
-                                               if not props[lp.global].has(lp) then
-                                                       props[lp.global].add(lp)
-                                               end
+               generate_dot(op.to_s, name, "Dependency graph for module {mmodule.name}")
+       end
+end
+
+# A class page
+class NitdocClass
+       super NitdocPage
+
+       private var mclass: MClass
+       private var vtypes = new HashSet[MVirtualTypeDef]
+       private var consts = new HashSet[MMethodDef]
+       private var meths = new HashSet[MMethodDef]
+       private var inherited = new HashSet[MPropDef]
+
+       init(mclass: MClass, ctx: NitdocContext, dot_dir: nullable String, source: nullable String) do
+               super(ctx)
+               self.mclass = mclass
+               self.dot_dir = dot_dir
+               self.source = source
+               # load properties
+               var locals = new HashSet[MProperty]
+               for mclassdef in mclass.mclassdefs do
+                       for mpropdef in mclassdef.mpropdefs do
+                               if mpropdef.mproperty.visibility < ctx.min_visibility then continue
+                               if mpropdef isa MVirtualTypeDef then vtypes.add(mpropdef)
+                               if mpropdef isa MMethodDef then
+                                       if mpropdef.mproperty.is_init then
+                                               consts.add(mpropdef)
                                        else
-                                               props[lp.global] = [lp]
-                                               gprops.add(lp.global.intro)
+                                               meths.add(mpropdef)
                                        end
                                end
+                               locals.add(mpropdef.mproperty)
                        end
                end
-               dctx.add("<section class=\"module\">\n")
-               dctx.open_stage
-               dctx.stage("<article class=\"classes filterable\">\n")
-               dctx.stage("<h2>Classes</h2>\n")
-               dctx.sort(clas)
-               dctx.stage("<ul>\n")
-               for lc in clas do
-                       if self.mnhe <= lc.global.intro.mmmodule then
-                               dctx.add("<li class='intro'><span title='introduced in this module'>I</span>&nbsp;")
-                       else
-                               dctx.add("<li class='redef'><span title='refined in this module'>R</span>&nbsp;")
-                       end
-                       dctx.add("{lc.html_link(dctx)}</li>\n")
-               end
-               dctx.stage("</ul></article>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<article class=\"properties filterable\">\n")
-               dctx.stage("<h2>Properties</h2>\n")
-               dctx.sort(gprops)
-               dctx.stage("<ul>\n")
-               for lgp in gprops do
-                       var gp = lgp.global
-                       var lps = props[gp]
-
-                       if gp.intro isa MMAttribute then continue
-                       
-                       var lpi = self[gp.intro.local_class.global][gp]
-               
-                       if lps.has(lpi) then
-                               dctx.add("<li class='intro'><span title='introduction in an other module'>I</span>&nbsp;{lpi.html_open_link(dctx)}{lpi.html_name}&nbsp;({lpi.local_class})</a></li>\n")
-                               lps.remove(lpi)
-                       else
-                               dctx.add("<li class='intro'><span title='introduction in this module'>I</span>&nbsp;{lpi.html_name}")
-                               dctx.add("&nbsp;({lpi.local_class})</li>\n")
-                       end
-                       if lps.length >= 1 then
-                               dctx.sort(lps)
-                               for lp in lps do
-                                       dctx.add("<li class='redef'><span title='redefinition'>R</span>&nbsp;{lp.html_open_link(dctx)}{lp.html_name}&nbsp;({lp.local_class})</a></li>")
+               # get inherited properties
+               for pclass in mclass.in_hierarchy(ctx.mainmodule).greaters do
+                       if pclass == mclass then continue
+                       for pclassdef in pclass.mclassdefs do
+                               for mprop in pclassdef.intro_mproperties do
+                                       var mpropdef = mprop.intro
+                                       if mprop.visibility < ctx.min_visibility then continue # skip if not correct visibiility
+                                       if locals.has(mprop) then continue # skip if local
+                                       if mclass.name != "Object" and mprop.intro_mclassdef.mclass.name == "Object" and (mprop.visibility <= protected_visibility or mprop.intro_mclassdef.mmodule.public_owner == null or mprop.intro_mclassdef.mmodule.public_owner.name != "standard") then continue # skip toplevels
+                                       if mpropdef isa MVirtualTypeDef then vtypes.add(mpropdef)
+                                       if mpropdef isa MMethodDef then
+                                               if mpropdef.mproperty.is_init then
+                                                       consts.add(mpropdef)
+                                               else
+                                                       meths.add(mpropdef)
+                                               end
+                                       end
+                                       inherited.add(mpropdef)
                                end
                        end
                end
-               dctx.stage("</ul></article>\n")
-               dctx.close_stage
-               dctx.add("</section>\n")
-               dctx.add("</div>\n")
        end
 
-       # Fill the body for the page associated to the full index
-       fun file_index_page_doc(dctx: DocContext)
-       do
+       redef fun title do
+               var nclass = ctx.mbuilder.mclassdef2nclassdef[mclass.intro]
+               if nclass isa AStdClassdef then
+                       return "{mclass.html_name} class | {nclass.short_comment}"
+               else
+                       return "{mclass.html_name} class"
+               end
+       end
 
-               dctx.add("<h1>Full Index</h1>\n")
-
-               var clas = new Array[MMLocalClass]
-               var props = new HashMap[MMGlobalProperty, Array[MMLocalProperty]]
-               var gprops = new Array[MMLocalProperty]
-               var mods = new Array[MMModule]
-               for m in mhe.greaters_and_self do
-                       if not m.require_doc(dctx) then continue
-                       mods.add(m)
-               end
-               for g in global_classes do
-                       var lc = self[g]
-                       if not lc.require_doc(dctx) then continue
-                       clas.add(lc)
-                       for gp in lc.global_properties do
-                               var lp = lc[gp]
-                               if not lp.require_doc(dctx) then continue
-                               if props.has_key(lp.global) then
-                                       if not props[lp.global].has(lp) then
-                                               props[lp.global].add(lp)
+       redef fun menu do
+               super
+               append("<li><a href='index.html'>Overview</a></li>")
+               var public_owner = mclass.public_owner
+               if public_owner is null then
+                       append("<li>")
+                       mclass.intro_mmodule.html_link(self)
+                       append("</li>")
+               else
+                       append("<li>")
+                       public_owner.html_link(self)
+                       append("</li>")
+               end
+               append("<li class='current'>{mclass.html_name}</li>")
+               append("<li><a href='search.html'>Search</a></li>")
+       end
+
+       redef fun content do
+               append("<div class='sidebar'>")
+               properties_column
+               inheritance_column
+               append("</div>")
+               append("<div class='content'>")
+               class_doc
+               append("</div>")
+       end
+
+       private fun properties_column do
+               var sorter = new MPropDefNameSorter
+               append("<nav class='properties filterable'>")
+               append("<h3>Properties</h3>")
+               # virtual types
+               if vtypes.length > 0 then
+                       var vts = new Array[MVirtualTypeDef]
+                       vts.add_all(vtypes)
+                       sorter.sort(vts)
+                       append("<h4>Virtual Types</h4>")
+                       append("<ul>")
+                       for mprop in vts do
+                               mprop.html_sidebar_item(self)
+                       end
+                       append("</ul>")
+               end
+               # constructors
+               if consts.length > 0 then
+                       var cts = new Array[MMethodDef]
+                       cts.add_all(consts)
+                       sorter.sort(cts)
+                       append("<h4>Constructors</h4>")
+                       append("<ul>")
+                       for mprop in cts do
+                               if mprop.mproperty.name == "init" and mprop.mclassdef.mclass != mclass then continue
+                               mprop.html_sidebar_item(self)
+                       end
+                       append("</ul>")
+               end
+               # methods
+               if meths.length > 0 then
+                       var mts = new Array[MMethodDef]
+                       mts.add_all(meths)
+                       sorter.sort(mts)
+                       append("<h4>Methods</h4>")
+                       append("<ul>")
+                       for mprop in mts do
+                               mprop.html_sidebar_item(self)
+                       end
+                       append("</ul>")
+               end
+               append("</nav>")
+       end
+
+       private fun inheritance_column do
+               var sorted = new Array[MClass]
+               var sorterp = new MClassNameSorter
+               append("<nav>")
+               append("<h3>Inheritance</h3>")
+               var greaters = mclass.in_hierarchy(ctx.mainmodule).greaters.to_a
+               if greaters.length > 1 then
+                       ctx.mainmodule.linearize_mclasses(greaters)
+                       append("<h4>Superclasses</h4>")
+                       append("<ul>")
+                       for sup in greaters do
+                               if sup == mclass then continue
+                               append("<li>")
+                               sup.html_link(self)
+                               append("</li>")
+                       end
+                       append("</ul>")
+               end
+               var smallers = mclass.in_hierarchy(ctx.mainmodule).smallers.to_a
+               var direct_smallers = mclass.in_hierarchy(ctx.mainmodule).direct_smallers.to_a
+               if smallers.length <= 1 then
+                       append("<h4>No Known Subclasses</h4>")
+               else if smallers.length <= 100 then
+                       ctx.mainmodule.linearize_mclasses(smallers)
+                       append("<h4>Subclasses</h4>")
+                       append("<ul>")
+                       for sub in smallers do
+                               if sub == mclass then continue
+                               append("<li>")
+                               sub.html_link(self)
+                               append("</li>")
+                       end
+                       append("</ul>")
+               else if direct_smallers.length <= 100 then
+                       ctx.mainmodule.linearize_mclasses(direct_smallers)
+                       append("<h4>Direct Subclasses Only</h4>")
+                       append("<ul>")
+                       for sub in direct_smallers do
+                               if sub == mclass then continue
+                               append("<li>")
+                               sub.html_link(self)
+                               append("</li>")
+                       end
+                       append("</ul>")
+               else
+                       append("<h4>Too much Subclasses to list</h4>")
+               end
+               append("</nav>")
+       end
+
+       private fun class_doc do
+               # title
+               append("<h1>{mclass.html_name}{mclass.html_short_signature}</h1>")
+               append("<div class='subtitle info'>")
+               if mclass.visibility < public_visibility then append("{mclass.visibility.to_s} ")
+               append("{mclass.kind.to_s} ")
+               mclass.html_namespace(self)
+               append("{mclass.html_short_signature}</div>")
+               # comment
+               mclass.html_comment(self)
+               process_generate_dot
+               # concerns
+               var concern2meths = new ArrayMap[MModule, Array[MMethodDef]]
+               var sorted_meths = new Array[MMethodDef]
+               var sorted = new Array[MModule]
+               sorted_meths.add_all(meths)
+               ctx.mainmodule.linearize_mpropdefs(sorted_meths)
+               for meth in meths do
+                       if inherited.has(meth) then continue
+                       var mmodule = meth.mclassdef.mmodule
+                       if not concern2meths.has_key(mmodule) then
+                               sorted.add(mmodule)
+                               concern2meths[mmodule] = new Array[MMethodDef]
+                       end
+                       concern2meths[mmodule].add(meth)
+               end
+               var sections = new ArrayMap[MModule, Array[MModule]]
+               for mmodule in concern2meths.keys do
+                       var owner = mmodule.public_owner
+                       if owner == null then owner = mmodule
+                       if not sections.has_key(owner) then sections[owner] = new Array[MModule]
+                       if owner != mmodule then sections[owner].add(mmodule)
+               end
+               append("<section class='concerns'>")
+               append("<h2 class='section-header'>Concerns</h2>")
+               append("<ul>")
+               for owner, mmodules in sections do
+                       var nowner = ctx.mbuilder.mmodule2nmodule[owner]
+                       append("<li>")
+                       if nowner.short_comment.is_empty then
+                               append("<a href=\"#{owner.anchor}\">{owner.html_name}</a>")
+                       else
+                               append("<a href=\"#{owner.anchor}\">{owner.html_name}</a>: {nowner.short_comment}")
+                       end
+                       if not mmodules.is_empty then
+                               append("<ul>")
+                               for mmodule in mmodules do
+                                       var nmodule = ctx.mbuilder.mmodule2nmodule[mmodule]
+                                       if nmodule.short_comment.is_empty then
+                                               append("<li><a href=\"#{mmodule.anchor}\">{mmodule.html_name}</a></li>")
+                                       else
+                                               append("<li><a href=\"#{mmodule.anchor}\">{mmodule.html_name}</a>: {nmodule.short_comment}</li>")
                                        end
-                               else
-                                       props[lp.global] = [lp]
-                                       gprops.add(lp.global.intro)
                                end
+                               append("</ul>")
                        end
-               end
-               dctx.open_stage
-               dctx.stage("<article class=\"modules filterable\">\n")
-               dctx.stage("<h2>Modules</h2>\n")
-               dctx.sort(mods)
-               dctx.stage("<ul>\n")
-               for m in mods do
-                       dctx.add("<li>{m.html_link(dctx)}</li>")
-               end
-               dctx.stage("</ul></article>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<article class=\"classes filterable\">\n")
-               dctx.stage("<h2>Classes</h2>\n")
-               dctx.sort(clas)
-               dctx.stage("<ul>\n")
-               for lc in clas do
-                       dctx.add("<li>{lc.html_link(dctx)}</li>")
-               end
-               dctx.stage("</ul></article>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<article class=\"properties filterable\">\n")
-               dctx.stage("<h2>Properties</h2>\n")
-               dctx.sort(gprops)
-               dctx.stage("<ul>\n")
-               for lgp in gprops do
-                       var gp = lgp.global
-                       var lps = props[gp]
-
-                       if gp.intro isa MMAttribute then continue
-
-                       var lpi = self[gp.intro.local_class.global][gp]
-                       
-                       lps.remove(lpi)
-                       dctx.add("<li class='intro'><span title='introduction'>I</span>&nbsp;{lpi.html_open_link(dctx)}{lpi.html_name}&nbsp;({lpi.local_class})</a></li>\n")
-                       if lps.length >= 1 then
-                               dctx.sort(lps)
-                               for lp in lps do
-                                       dctx.add("<li class='redef'><span title='redefinition'>R</span>&nbsp;{lp.html_open_link(dctx)}{lp.html_name}&nbsp;({lp.local_class})</a></li>\n")
+                       append("</li>")
+               end
+               append("</ul>")
+               append("</section>")
+               # properties
+               var prop_sorter = new MPropDefNameSorter
+               var lmmodule = new List[MModule]
+               var nclass = ctx.mbuilder.mclassdef2nclassdef[mclass.intro]
+               # virtual and formal types
+               var local_vtypes = new Array[MVirtualTypeDef]
+               for vt in vtypes do if not inherited.has(vt) then local_vtypes.add(vt)
+               if local_vtypes.length > 0 or mclass.arity > 0 then
+                       append("<section class='types'>")
+                       append("<h2>Formal and Virtual Types</h2>")
+                       # formal types
+                       if mclass.arity > 0 and nclass isa AStdClassdef then
+                               for ft, bound in mclass.parameter_types do
+                                       append("<article id='FT_{ft}'>")
+                                       append("<h3 class='signature' data-untyped-signature='{ft.to_s}'><span>{ft}: ")
+                                       bound.html_link(self)
+                                       append("</span></h3>")
+                                       append("<div class=\"info\">formal generic type</div>")
+                                       append("</article>")
                                end
                        end
-               end
-               dctx.stage("</ul></article>\n")
-               dctx.close_stage
-       end
-
-       # Fill the quicksearch list JSON object
-       fun file_quicksearch_list_doc(dctx: DocContext)
-       do
-               var entities = new HashMap[String, Array[MMEntity]]
-               var props = new HashMap[MMGlobalProperty, Array[MMLocalProperty]]
-               for m in mhe.greaters_and_self do
-                       if not m.require_doc(dctx) then continue
-                       var a = new Array[MMEntity]
-                       a.add(m)
-                       entities[m.html_name] = a
-               end
-               for g in global_classes do
-                       var lc = self[g]
-                       if not lc.require_doc(dctx) then continue
-                       var a = new Array[MMEntity]
-                       a.add(lc)
-                       entities[lc.html_name] = a
-                       for gp in lc.global_properties do
-                               var lp = lc[gp]
-                               if not lp.require_doc(dctx) then continue
-                               if lp.kind == "var" then continue
-                               if props.has_key(lp.global) then
-                                       if not props[lp.global].has(lp) then
-                                               props[lp.global].add(lp)
+                       # virtual types
+                       prop_sorter.sort(local_vtypes)
+                       for prop in local_vtypes do prop.html_full_desc(self, self.mclass)
+                       append("</section>")
+               end
+               # constructors
+               var local_consts = new Array[MMethodDef]
+               for const in consts do if not inherited.has(const) then local_consts.add(const)
+               prop_sorter.sort(local_consts)
+               if local_consts.length > 0 then
+                       append("<section class='constructors'>")
+                       append("<h2 class='section-header'>Constructors</h2>")
+                       for prop in local_consts do prop.html_full_desc(self, self.mclass)
+                       append("</section>")
+               end
+               # methods
+               if not concern2meths.is_empty then
+                       append("<section class='methods'>")
+                       append("<h2 class='section-header'>Methods</h2>")
+                       for owner, mmodules in sections do
+                               append("<a id=\"{owner.anchor}\"></a>")
+                               if owner != mclass.intro_mmodule and owner != mclass.public_owner then
+                                       var nowner = ctx.mbuilder.mmodule2nmodule[owner]
+                                       append("<h3 class=\"concern-toplevel\">Methods refined in ")
+                                       owner.html_link(self)
+                                       append("</h3>")
+                                       append("<p class=\"concern-doc\">")
+                                       owner.html_link(self)
+                                       if not nowner.short_comment.is_empty then
+                                               append(": {nowner.short_comment}")
                                        end
-                               else
-                                       props[lp.global] = [lp]
+                                       append("</p>")
                                end
+                               if concern2meths.has_key(owner) then
+                                       var mmethods = concern2meths[owner]
+                                       prop_sorter.sort(mmethods)
+                                       for prop in mmethods do prop.html_full_desc(self, self.mclass)
+                               end
+                               for mmodule in mmodules do
+                                       append("<a id=\"{mmodule.anchor}\"></a>")
+                                       var nmodule = ctx.mbuilder.mmodule2nmodule[mmodule]
+                                       if mmodule != mclass.intro_mmodule and mmodule != mclass.public_owner then
+                                               append("<p class=\"concern-doc\">")
+                                               mmodule.html_link(self)
+                                               if not nmodule.short_comment.is_empty then
+                                                       append(": {nmodule.short_comment}")
+                                               end
+                                               append("</p>")
+                                       end
+                                       var mmethods = concern2meths[mmodule]
+                                       prop_sorter.sort(mmethods)
+                                       for prop in mmethods do prop.html_full_desc(self, self.mclass)
+                               end
+                       end
+                       append("</section>")
+               end
+               # inherited properties
+               if inherited.length > 0 then
+                       var sorted_inherited = new Array[MPropDef]
+                       sorted_inherited.add_all(inherited)
+                       ctx.mainmodule.linearize_mpropdefs(sorted_inherited)
+                       var classes = new ArrayMap[MClass, Array[MPropDef]]
+                       for mmethod in sorted_inherited.reversed do
+                               var mclass = mmethod.mclassdef.mclass
+                               if not classes.has_key(mclass) then classes[mclass] = new Array[MPropDef]
+                               classes[mclass].add(mmethod)
                        end
+                       append("<section class='inherited'>")
+                       append("<h2 class='section-header'>Inherited Properties</h2>")
+                       for c, mmethods in classes do
+                               prop_sorter.sort(mmethods)
+                               append("<p>Defined in ")
+                               c.html_link(self)
+                               append(": ")
+                               for i in [0..mmethods.length[ do
+                                       var mmethod = mmethods[i]
+                                       mmethod.html_link(self)
+                                       if i <= mmethods.length - 1 then append(", ")
+                               end
+                               append("</p>")
+                       end
+                       append("</section>")
                end
+       end
 
-               for k, v in props do
-                       entities[k.short_name] = v
+       private fun process_generate_dot do
+               var pe = ctx.class_hierarchy[mclass]
+               var cla = new HashSet[MClass]
+               var sm = new HashSet[MClass]
+               var sm2 = new HashSet[MClass]
+               sm.add(mclass)
+               while cla.length + sm.length < 10 and sm.length > 0 do
+                       cla.add_all(sm)
+                       sm2.clear
+                       for x in sm do
+                               sm2.add_all(pe.poset[x].direct_smallers)
+                       end
+                       var t = sm
+                       sm = sm2
+                       sm2 = t
                end
+               cla.add_all(pe.greaters)
 
-               var keys = entities.keys.to_a
-               var sorter = new AlphaSorter[String]
-               sorter.sort(keys)
-               
-               dctx.open_stage
-               dctx.stage("var entries = \{")
-               for key in keys do
-                       dctx.add("\"{key}\": [")
-                       for entity in entities[key] do
-                               dctx.add(entity.json_entry(dctx))
+               var op = new Buffer
+               var name = "dep_{mclass.name}"
+               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
+               for c in cla do
+                       if c == mclass then
+                               op.append("\"{c.name}\"[shape=box,margin=0.03];\n")
+                       else
+                               op.append("\"{c.name}\"[URL=\"{c.url}\"];\n")
+                       end
+                       for c2 in pe.poset[c].direct_greaters do
+                               if not cla.has(c2) then continue
+                               op.append("\"{c.name}\"->\"{c2.name}\";\n")
+                       end
+                       if not pe.poset[c].direct_smallers.is_empty then
+                               var others = true
+                               for c2 in pe.poset[c].direct_smallers do
+                                       if cla.has(c2) then others = false
+                               end
+                               if others then
+                                       op.append("\"{c.name}...\"[label=\"\"];\n")
+                                       op.append("\"{c.name}...\"->\"{c.name}\"[style=dotted];\n")
+                               end
                        end
-                       dctx.add("],")
                end
-               dctx.stage("\};")
-               dctx.close_stage
+               op.append("\}\n")
+               generate_dot(op.to_s, name, "Dependency graph for class {mclass.name}")
        end
 end
 
-redef class MMGlobalProperty
-       # Return the short name of the property
-       fun short_name: String do
-               return self.intro.html_name
-       end
-end 
-
-redef class MMLocalProperty
-       super MMEntity
-       # Anchor of the property description in the module html file
-       fun html_anchor: String
-       do
-               return "PROP_{self.mmmodule.toplevel_owner}_{local_class}_{cmangle(name)}"
-       end
-
-       redef fun json_entry(dctx) do
-               return "\{txt:\"{qualified_name}\",url:\"{local_class.html_name}.html#{html_anchor}\"\},"
-       end
-
-       redef fun qualified_name do
-               return "{intro_module.qualified_name}::{local_class.html_name}::{html_name}"
-       end
+#
+# Model redefs
+#
 
-       fun html_open_link(dctx: DocContext): String
-       do
-               if not require_doc(dctx) then print "not required {self}"
-               var title = "{html_name}{signature.to_s}"
-               if short_doc != "&nbsp;" then
-                       title += " #{short_doc}"
+redef class MModule
+       # Return the HTML escaped name of the module
+       private fun html_name: String do return name.html_escape
+
+       # URL to nitdoc page
+       #       module_owner_name.html
+       private fun url: String do
+               if url_cache == null then
+                       var res = new Buffer
+                       res.append("module_")
+                       var mowner = public_owner
+                       if mowner != null then
+                               res.append("{public_owner.name}_")
+                       end
+                       res.append("{self.name}.html")
+                       url_cache = res.to_s
+               end
+               return url_cache.as(not null)
+       end
+       private var url_cache: nullable String
+
+       # html anchor id for the module in a nitdoc page
+       #       MOD_owner_name
+       private fun anchor: String do
+               if anchor_cache == null then
+                       var res = new Buffer
+                       res.append("MOD_")
+                       var mowner = public_owner
+                       if mowner != null then
+                               res.append("{public_owner.name}_")
+                       end
+                       res.append(self.name)
+                       anchor_cache = res.to_s
                end
-               return "<a href=\"{local_class.html_name}.html#{html_anchor}\" title=\"{title}\">"
+               return anchor_cache.as(not null)
        end
+       private var anchor_cache: nullable String
 
-       fun html_name: String
-       do
-               return self.name.to_s.html_escape
-       end
-
-       redef fun html_link(dctx)
-       do
-               if not require_doc(dctx) then print "not required {self}"
-               var title = "{html_name}{signature.to_s}"
-               if short_doc != "&nbsp;" then
-                       title += " #{short_doc}"
+       # Return a link (html a tag) to the nitdoc module page
+       #       <a href="url" title="short_comment">html_name</a>
+       private fun html_link(page: NitdocPage) do
+               if html_link_cache == null then
+                       var res = new Buffer
+                       if page.ctx.mbuilder.mmodule2nmodule.has_key(self) then
+                               res.append("<a href='{url}' title='{page.ctx.mbuilder.mmodule2nmodule[self].short_comment}'>{html_name}</a>")
+                       else
+                               res.append("<a href='{url}'>{html_name}</a>")
+                       end
+                       html_link_cache = res.to_s
                end
-               return "<a href=\"{local_class.html_name}.html#{html_anchor}\" title=\"{title}\">{html_name}</a>"
+               page.append(html_link_cache.as(not null))
        end
+       private var html_link_cache: nullable String
 
-       fun html_link_special(dctx: DocContext, lc: MMLocalClass): String
-       do
-               if not require_doc(dctx) then print "not required {self}"
-               var title = "{html_name}{signature_for(lc.get_type)}"
-               if short_doc != "&nbsp;" then
-                       title += " #{short_doc}"
-               end
-               return "<a href=\"{lc.html_name}.html#{html_anchor}\" title=\"{title}\">{html_name}</a>"
+       # Return the module signature decorated with html
+       #       <span>module html_full_namespace</span>
+       private fun html_signature(page: NitdocPage) do
+               page.append("<span>module ")
+               html_full_namespace(page)
+               page.append("</span>")
        end
 
-       # Kind of property (fun, attr, etc.)
-       fun kind: String is abstract
-
-       redef fun short_doc
-       do
-               var d = doc
-               if d != null then
-                       return d.short
-               else if global.intro == self then
-                       return "&nbsp;"
-               else
-                       return global.intro.short_doc
+       # Return the module full namespace decorated with html
+       #       <span>public_owner.html_namespace::html_link</span>
+       private fun html_full_namespace(page: NitdocPage) do
+               page.append("<span>")
+               var mowner = public_owner
+               if mowner != null then
+                       public_owner.html_namespace(page)
+                       page.append("::")
                end
+               html_link(page)
+               page.append("</span>")
        end
-       
-       redef fun doc
-       do
-               var n = node
-               if n == null or not n isa APropdef then
-                       return null
-               end
-               var d = n.n_doc
-               if d == null then
-                       return null
-               end
-               if d.n_comment.is_empty then
-                       return null
+
+       # Return the module full namespace decorated with html
+       #       <span>public_owner.html_namespace</span>
+       private fun html_namespace(page: NitdocPage) do
+               page.append("<span>")
+               var mowner = public_owner
+               if mowner != null then
+                       public_owner.html_namespace(page)
                else
-                       return d
+                       html_link(page)
                end
+               page.append("</span>")
        end
 
-       # The most specific module in the nesting hierarchy that exports the intro of self
-       fun intro_module: MMModule
-       do
-               var m = global.intro.mmmodule
-               var mo = m.direct_owner
-               while mo != null and mo.visibility_for(m) >= 2 do 
-                       m = mo
-                       mo = m.direct_owner
+       # Return the full comment of the module decorated with html
+       private fun html_comment(page: NitdocPage) do
+               page.append("<div class='description'>")
+               if page.ctx.mbuilder.mmodule2nmodule.has_key(self) then
+                       var nmodule = page.ctx.mbuilder.mmodule2nmodule[self]
+                       if not page.ctx.github_gitdir is null then
+                               var loc = nmodule.doc_location.github(page.ctx.github_gitdir.as(not null))
+                               page.append("<textarea class='baseComment' data-comment-namespace='{full_name}' data-comment-location='{loc}'>{nmodule.full_comment}</textarea>")
+                       end
+                       if nmodule.full_comment == "" then
+                               page.append("<p class='info inheritance'>")
+                               page.append("<span class=\"noComment\">no comment for </span>")
+                       else
+                               page.append("<div class='comment'>{nmodule.full_markdown}</div>")
+                               page.append("<p class='info inheritance'>")
+                       end
+                       page.append("definition in ")
+                       self.html_full_namespace(page)
+                       page.append(" {page.show_source(nmodule.location)}</p>")
                end
-               return m
+               page.append("</div>")
        end
 
-       # Is the intro of self exported by the top-level module ?
-       fun is_toplevel: Bool
-       do
-               var m = intro_module
-               return m == m.toplevel_owner
+       private fun has_mclassdef_for(mclass: MClass): Bool do
+               for mmodule in self.in_nesting.greaters do
+                       for mclassdef in mmodule.mclassdefs do
+                               if mclassdef.mclass == mclass then return true
+                       end
+               end
+               return false
        end
 
-       # Return true if the global property must be documented according to the visibility configured
-       fun require_doc(dctx: DocContext): Bool
-       do
-               if global.visibility_level == 3 and not dctx.with_private then return false # Private
-               if dctx.public_only then
-                       var m = intro_module
-                       if m != m.toplevel_owner then return false # Unexported
+       private fun has_mclassdef(mclassdef: MClassDef): Bool do
+               for mmodule in self.in_nesting.greaters do
+                       for oclassdef in mmodule.mclassdefs do
+                               if mclassdef == oclassdef then return true
+                       end
                end
-               return true
+               return false
        end
+end
 
-       # Document the global property in the global class lc
-       fun full_documentation(dctx: DocContext, lc: MMLocalClass)
-       do
-               var visibility: String
-               if global.visibility_level == 1 then
-                       visibility = "public"
-               else if global.visibility_level == 2 then
-                       visibility = "protected"
-               else if global.visibility_level == 3 then
-                       visibility = "private"
-               else 
-                       abort
-               end
-
-               var intro_class = global.intro.local_class
-               var is_redef = local_class.global != intro_class.global or local_class.mmmodule.toplevel_owner != intro_class.mmmodule.toplevel_owner
-
-               dctx.add("<article id=\"{html_anchor}\" class=\"{kind} {visibility} {if is_redef then "redef" else ""}\">\n")
-               dctx.add("<h3 class=\"signature\">{html_name}{signature.to_html(dctx, true)}</h3>\n")
-               dctx.add("<div class=\"info\">\n")
-
-               if is_redef then
-                       dctx.add("redef ")
-               end
-               if not is_toplevel then
-                       dctx.add("(unexported) ")
-               end
-               if global.visibility_level == 2 then
-                       dctx.add("protected ")
-               else if global.visibility_level == 3 then
-                       dctx.add("private ")
-               end
-               dctx.add(kind)
-               dctx.add(" {intro_class.mmmodule.toplevel_owner.name}")
-               if intro_class.global == lc.global then
-                       dctx.add("::{lc.name}")
-               else
-                       dctx.add("::{mmmodule[intro_class.global].html_link(dctx)}")
-               end
-               if is_redef then
-                       dctx.add("::{mmmodule[intro_class.global][global].global.intro.html_link(dctx)}")
-               else
-                       dctx.add("::{html_name}")
-               end
-               dctx.add("</div>")
-               dctx.add("<div style=\"float: right;\"><a id=\"lblDiffCommit\"></a></div>")
-               dctx.add("<div class=\"description\">")
+redef class MClass
+       # Return the HTML escaped name of the module
+       private fun html_name: String do return name.html_escape
 
-               # Collect all refinement of the global property in the same global property
-               var lps = new Array[MMLocalProperty]
-               for l in prhe.greaters_and_self do
-                       lps.add(l)
-               end
+       # URL to nitdoc page
+       #       class_owner_name.html
+       private fun url: String do
+               return "class_{public_owner}_{name}.html"
+       end
 
-               var introdoc = false
-               if global.intro.doc != null then
-                       for lp in lps do
-                               if lp.doc == null then introdoc = true
-                       end
+       # html anchor id for the class in a nitdoc page
+       #       MOD_owner_name
+       private fun anchor: String do
+               if anchor_cache == null then
+                       anchor_cache = "CLASS_{public_owner.name}_{name}"
                end
-               if introdoc then
-                       dctx.add("<pre class=\"text_label\" name=\"{html_name}\" >{global.intro.doc.to_html}</pre>")
-                       dctx.add("<textarea rows=\"1\" cols=\"76\" id=\"fileContent\" class=\"edit\"></textarea>")
-                       dctx.add("<a id=\"cancelBtn\">Cancel</a><a id=\"commitBtn\">Commit</a>")
-                       dctx.add("<pre id=\"preSave\" type=\"2\" class=\"text_label\" ></pre>")
-               end
-
-               var tlmods = new Array[MMModule]
-               for lp in lps do
-                       var bm = lp.mmmodule.toplevel_owner
-                       var lcm = lc.global.intro.mmmodule
-                       if lcm.mhe < lp.mmmodule then bm = lcm.toplevel_owner
-                       if not tlmods.has(bm) then tlmods.add(bm)
-               end
-
-               for tm in tlmods do
-                       # Document the top level property for the current top level module
-                       var tlp
-                       if tm.global_classes.has(lc.global) then
-                               tlp = tm[lc.global][self.global]
-                               #assert lps.has(tlp) # FIXME What this line is used for?
-                       else if tm.global_classes.has(self.local_class.global) then
-                               # Self is the inherited property. Process it
-                               tlp = tm[self.local_class.global][self.global]
-                               assert lps.has(tlp)
-                       else
-                               # We skip this module since the props defined by the module is  
-                               continue
-                       end
-
-                       var tlcm = lc.global.intro.mmmodule.toplevel_owner
-                       if not tlcm.mhe <= tm then
-                               dctx.add("<h4>In module {tm.html_link(dctx)} :</h4>")
-                       end
+               return anchor_cache.as(not null)
+       end
+       private var anchor_cache: nullable String
 
-                       var doc = tlp.doc
-                       var n = tlp.node
-                       if doc != null and (not introdoc or global.intro.doc != doc) then
-                               if n != null then
-                                       var l = n.location
-                                       dctx.add("<pre type=\"1\" class=\"text_label\" tag=\"{l.file.filename}\" name=\"{dctx.get_source(l)}\" title=\"{l.line_start.to_s}\" >{doc.to_html}</pre>")
-                               end
-                       else if not is_redef then
-                               if n != null then
-                                       var l = n.location
-                                       dctx.add("<a class=\"newComment\" tag=\"{l.file.filename}\" title=\"{l.line_start.to_s}\">New comment</a>\n")
+       # Return a link (with signature) to the nitdoc class page
+       #       <a href="url" title="short_comment">html_name(signature)</a>
+       private fun html_link(page: NitdocPage) do
+               if html_link_cache == null then
+                       var res = new Buffer
+                       res.append("<a href='{url}'")
+                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
+                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
+                               if nclass isa AStdClassdef then
+                                       res.append(" title=\"{nclass.short_comment}\"")
                                end
                        end
-                       dctx.add("<textarea rows=\"1\" cols=\"76\" id=\"fileContent\" class=\"edit\"></textarea>")
-                       dctx.add("<a id=\"cancelBtn\">Cancel</a><a id=\"commitBtn\">Commit</a>")
-                       dctx.add("<pre id=\"preSave\" type=\"2\" class=\"text_label\" ></pre>")
-                       dctx.add("<p>")
-                       if tlp.local_class.global != lc.global then
-                               dctx.add("inherited from {tlp.local_class.html_link(dctx)} ")
-                       end
-                       if tm != tlp.mmmodule then
-                               dctx.add("defined by the module {tlp.mmmodule.html_link(dctx)} ")
-                       end
-                       if n != null then
-                               var l = n.location
-                               dctx.show_source(l)
-                       end
-                       
-                       dctx.open_stage
-                       dctx.stage(". previously defined by:")
-                       for lp in lps do
-                               var tl = lp.mmmodule.toplevel_owner
-                               if tl != tm then continue
-                               if lp == tlp then continue
-                               dctx.add(" {lp.mmmodule.html_link(dctx)}")
-                               if lp.local_class.global != lc.global then
-                                       dctx.add(" for {lp.local_class.html_link(dctx)} ")
+                       res.append(">{html_name}{html_short_signature}</a>")
+                       html_link_cache = res.to_s
+               end
+               page.append(html_link_cache.as(not null))
+       end
+       private var html_link_cache: nullable String
+
+       # Return a short link (without signature) to the nitdoc class page
+       #       <a href="url" title="short_comment">html_name</a>
+       private fun html_short_link(page: NitdocPage) do
+               if html_short_link_cache == null then
+                       var res = new Buffer
+                       res.append("<a href='{url}'")
+                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
+                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
+                               if nclass isa AStdClassdef then
+                                       res.append(" title=\"{nclass.short_comment}\"")
                                end
-
-                               n = lp.node
-                               if n != null then
-                                       var l = n.location
-                                       dctx.show_source(l)
+                       end
+                       res.append(">{html_name}</a>")
+                       html_short_link_cache = res.to_s
+               end
+               page.append(html_short_link_cache.as(not null))
+       end
+       private var html_short_link_cache: nullable String
+
+       # Return a link (with signature) to the class anchor
+       #       <a href="url" title="short_comment">html_name</a>
+       private fun html_link_anchor(page: NitdocPage) do
+               if html_link_anchor_cache == null then
+                       var res = new Buffer
+                       res.append("<a href='#{anchor}'")
+                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
+                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
+                               if nclass isa AStdClassdef then
+                                       res.append(" title=\"{nclass.short_comment}\"")
                                end
                        end
-                       dctx.close_stage
-                       dctx.add("</p>")
+                       res.append(">{html_name}{html_short_signature}</a>")
+                       html_link_anchor_cache = res.to_s
                end
-               dctx.add("</div>")
-               dctx.add("</article>")
+               page.append(html_link_anchor_cache.as(not null))
        end
-end
-redef class MMMethod
-       redef fun kind do return if global.is_init then "init" else "fun"
-end
-redef class MMAttribute
-       redef fun kind do return "var"
-end
-redef class MMTypeProperty
-       redef fun kind do return "type"
-end
+       private var html_link_anchor_cache: nullable String
 
-redef class MMSrcModule
-       redef fun short_doc
-       do
-               var d = doc
-               if d != null then
-                       return d.short
-               else
-                       return "&nbsp;"
+       # Return the generic signature of the class with bounds
+       #       [E: <a>MType</a>, F: <a>MType</a>]
+       private fun html_signature(page: NitdocPage) do
+               if arity > 0 then
+                       page.append("[")
+                       for i in [0..intro.parameter_names.length[ do
+                               page.append("{intro.parameter_names[i]}: ")
+                               intro.bound_mtype.arguments[i].html_link(page)
+                               if i < intro.parameter_names.length - 1 then page.append(", ")
+                       end
+                       page.append("]")
                end
        end
 
-       redef fun doc
-       do
-               var n = node
-               if n.n_moduledecl == null then
-                       return null
-               end
-               var np = n.n_moduledecl
-               var d = np.n_doc
-               if d == null then
-                       return null
-               end
-               if d.n_comment.is_empty then
-                       return null
+       # Return the generic signature of the class without bounds
+       #       [E, F]
+       private fun html_short_signature: String do
+               if arity > 0 then
+                       return "[{intro.parameter_names.join(", ")}]"
+               else
+                       return ""
+               end
+       end
+
+       # Return the class namespace decorated with html
+       #       <span>intro_module::html_short_link</span>
+       private fun html_namespace(page: NitdocPage) do
+               intro_mmodule.html_namespace(page)
+               page.append("::<span>")
+               html_short_link(page)
+               page.append("</span>")
+       end
+
+       # Return a list item for the mclass
+       #       <li>html_link</li>
+       private fun html_sidebar_item(page: NitdocModule) do
+               if page.mmodule.in_nesting.greaters.has(intro.mmodule) then
+                       page.append("<li class='intro'>")
+                       page.append("<span title='Introduced'>I</span>")
+                       html_link_anchor(page)
+               else if page.mmodule.has_mclassdef_for(self) then
+                       page.append("<li class='redef'>")
+                       page.append("<span title='Redefined'>R</span>")
+                       html_link_anchor(page)
+               else
+                       page.append("<li class='inherit'>")
+                       page.append("<span title='Inherited'>H</span>")
+                       html_link(page)
+               end
+               page.append("</li>")
+       end
+
+       private fun html_full_desc(page: NitdocModule) do
+               var is_redef = not page.mmodule.in_nesting.greaters.has(intro.mmodule)
+               var redefs = mpropdefs_in_module(page)
+               if not is_redef or not redefs.is_empty then
+                       var classes = new Array[String]
+                       classes.add(kind.to_s)
+                       if is_redef then classes.add("redef")
+                       classes.add(visibility.to_s)
+                       page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
+                       page.append("<h3 class='signature' data-untyped-signature='{html_name}{html_short_signature}'>")
+                       page.append("<span>")
+                       html_short_link(page)
+                       html_signature(page)
+                       page.append("</span></h3>")
+                       html_info(page)
+                       html_comment(page)
+                       page.append("</article>")
+               end
+       end
+
+       private fun html_info(page: NitdocModule) do
+               page.append("<div class='info'>")
+               if visibility < public_visibility then page.append("{visibility.to_s} ")
+               if not page.mmodule.in_nesting.greaters.has(intro.mmodule) then page.append("redef ")
+               page.append("{kind} ")
+               html_namespace(page)
+               page.append("{html_short_signature}</div>")
+       end
+
+       private fun html_comment(page: NitdocPage) do
+               page.append("<div class='description'>")
+               if page isa NitdocModule then
+                       page.mmodule.linearize_mclassdefs(mclassdefs)
+                       # comments for each mclassdef contained in current mmodule
+                       for mclassdef in mclassdefs do
+                               if not mclassdef.is_intro and not page.mmodule.mclassdefs.has(mclassdef) then continue
+                               if page.ctx.mbuilder.mclassdef2nclassdef.has_key(mclassdef) then
+                                       var nclass = page.ctx.mbuilder.mclassdef2nclassdef[mclassdef]
+                                       if nclass isa AStdClassdef then
+                                               if not page.ctx.github_gitdir is null then
+                                                       var loc = nclass.doc_location.github(page.ctx.github_gitdir.as(not null))
+                                                       page.append("<textarea class='baseComment' data-comment-namespace='{mclassdef.mmodule.full_name}::{name}' data-comment-location='{loc}'>{nclass.full_comment}</textarea>")
+                                               end
+                                               if nclass.full_comment == "" then
+                                                       page.append("<p class='info inheritance'>")
+                                                       page.append("<span class=\"noComment\">no comment for </span>")
+                                               else
+                                                       page.append("<div class='comment'>{nclass.full_markdown}</div>")
+                                                       page.append("<p class='info inheritance'>")
+                                               end
+                                               if mclassdef.is_intro then
+                                                       page.append("introduction in ")
+                                               else
+                                                       page.append("refinement in ")
+                                               end
+                                               mclassdef.mmodule.html_full_namespace(page)
+                                               page.append(" {page.show_source(nclass.location)}</p>")
+                                       end
+                               end
+                       end
                else
-                       return d
+                       # comments for intro
+                       if page.ctx.mbuilder.mclassdef2nclassdef.has_key(intro) then
+                               var nclass = page.ctx.mbuilder.mclassdef2nclassdef[intro]
+                               if nclass isa AStdClassdef then
+                                       if not page.ctx.github_gitdir is null then
+                                               var loc = nclass.doc_location.github(page.ctx.github_gitdir.as(not null))
+                                               page.append("<textarea class='baseComment' data-comment-namespace='{intro.mmodule.full_name}::{name}' data-comment-location='{loc}'>{nclass.full_comment}</textarea>")
+                                       end
+                                       if nclass.full_comment == "" then
+                                               page.append("<p class='info inheritance'>")
+                                               page.append("<span class=\"noComment\">no comment for </span>")
+                                       else
+                                               page.append("<div class='comment'>{nclass.full_markdown}</div>")
+                                               page.append("<p class='info inheritance'>")
+                                       end
+                                       page.append("introduction in ")
+                                       intro.mmodule.html_full_namespace(page)
+                                       page.append(" {page.show_source(nclass.location)}</p>")
+                               end
+                       end
                end
+               page.append("</div>")
        end
-end
 
-redef class ADoc
-       # Html transcription of the doc
-       fun to_html: String
-       do
-               var res = new Buffer
-               for c in n_comment do
-                       res.append(c.text.substring_from(1))
+       private fun mpropdefs_in_module(page: NitdocModule): Array[MPropDef] do
+               var res = new Array[MPropDef]
+               page.mmodule.linearize_mclassdefs(mclassdefs)
+               for mclassdef in mclassdefs do
+                       if not page.mmodule.mclassdefs.has(mclassdef) then continue
+                       if mclassdef.is_intro then continue
+                       for mpropdef in mclassdef.mpropdefs do
+                               if mpropdef.mproperty.visibility < page.ctx.min_visibility then continue
+                               if mpropdef isa MAttributeDef then continue
+                               res.add(mpropdef)
+                       end
                end
-               return res.to_s.html_escape
+               return res
        end
+end
 
-       # Oneliner transcription of the doc
-       fun short: String
-       do
-               return n_comment.first.text.substring_from(1).html_escape
+redef class MProperty
+       # Escape name for html output
+       private fun html_name: String do return name.html_escape
+
+       # Return the property namespace decorated with html
+       #       <span>intro_module::intro_class::html_link</span>
+       private fun html_namespace(page: NitdocPage) do
+               intro_mclassdef.mclass.html_namespace(page)
+               page.append(intro_mclassdef.mclass.html_short_signature)
+               page.append("::<span>")
+               intro.html_link(page)
+               page.append("</span>")
        end
 end
 
-redef class MMLocalClass
-       super MMEntity
-
-       # Anchor of the class description in the module html file
-       fun html_anchor: String do return "CLASS_{self}"
+redef class MType
+       # Link to the type definition in the nitdoc page
+       private fun html_link(page: NitdocPage) is abstract
+end
 
-       fun html_name: String do return "{self}"
+redef class MClassType
+       redef fun html_link(page) do mclass.html_link(page)
+end
 
-       redef fun html_link(dctx)
-       do
-               if not require_doc(dctx) then print "{dctx.filename}: not required {self}"
-               if short_doc == "&nbsp;" then
-                       return "<a href=\"{html_name}.html\"\">{self}</a>"
-               else 
-                       return "<a href=\"{html_name}.html\" title=\"{short_doc}\">{self}</a>"
-               end
+redef class MNullableType
+       redef fun html_link(page) do
+               page.append("nullable ")
+               mtype.html_link(page)
        end
+end
 
-       redef fun json_entry(dctx) do
-               return "\{txt:\"{qualified_name}\",url:\"{html_name}.html\"\},"
+redef class MGenericType
+       redef fun html_link(page) do
+               page.append("<a href='{mclass.url}'>{mclass.html_name}</a>[")
+               for i in [0..arguments.length[ do
+                       arguments[i].html_link(page)
+                       if i < arguments.length - 1 then page.append(", ")
+               end
+               page.append("]")
        end
+end
 
-       redef fun qualified_name do
-               return "{intro_module.qualified_name}::{html_name}"
+redef class MParameterType
+       redef fun html_link(page) do
+               var name = mclass.intro.parameter_names[rank]
+               page.append("<a href='{mclass.url}#FT_{name}' title='formal type'>{name}</a>")
        end
+end
 
-       redef fun short_doc do return global.intro.short_doc
-
-       redef fun doc do return global.intro.doc
+redef class MVirtualType
+       redef fun html_link(page) do mproperty.intro.html_link(page)
+end
 
-       fun kind: String
-       do
-               if global.is_interface then
-                       return "interface"
-               else if global.is_abstract then
-                       return "abstract class"
-               else if global.is_enum then
-                       return "enum"
-               else
-                       return "class"
-               end
+redef class MClassDef
+       # Return the classdef namespace decorated with html
+       private fun html_namespace(page: NitdocPage) do
+               mmodule.html_full_namespace(page)
+               page.append("::<span>")
+               mclass.html_link(page)
+               page.append("</span>")
        end
+end
 
-       # The most specific module in the nesting hierarchy that exports the intro of self
-       fun intro_module: MMModule
-       do
-               var m = global.intro.mmmodule
-               var mo = m.direct_owner
-               while mo != null and mo.visibility_for(m) >= 2 do 
-                       m = mo
-                       mo = m.direct_owner
-               end
-               return m
+redef class MPropDef
+       # Return the full qualified name of the mpropdef
+       #       module::classdef::name
+       private fun full_name: String do
+               return "{mclassdef.mclass.public_owner.name}::{mclassdef.mclass.name}::{mproperty.name}"
        end
 
-       fun menu_link(dctx: DocContext, p: MMLocalProperty)
-       do
-               if p.local_class.global != self.global then
-                       if p.global.intro.local_class.name == "Object".to_symbol then return
-                       if p.global.is_init or p isa MMTypeProperty then
-                               dctx.add("<li class='inherit'><span title='Inherited'>H</span>&nbsp;{p.html_link_special(dctx, self)}</li>\n")
-                       else
-                               dctx.add("<li class='inherit'><span title='Inherited'>H</span>&nbsp;{p.html_link(dctx)}</li>\n")
-                       end
-               else if p.global.intro.local_class.global == self.global then
-                       dctx.add("<li class='intro'><span title='Introduced'>I</span>&nbsp;{p.html_link_special(dctx, self)}</li>\n")
-               else
-                       dctx.add("<li class='redef'><span title='Redefined'>R</span>&nbsp;{p.html_link_special(dctx, self)}</li>\n")
+       # URL into the nitdoc page
+       #       class_owner_name.html#anchor
+       private fun url: String do
+               if url_cache == null then
+                       url_cache = "{mclassdef.mclass.url}#{anchor}"
                end
+               return url_cache.as(not null)
        end
+       private var url_cache: nullable String
 
-       # Return true if the global class must be documented according to the visibility configured
-       fun require_doc(dctx: DocContext): Bool
-       do
-               if global.visibility_level == 3 and not dctx.with_private then return false # Private
-               if dctx.public_only then
-                       var m = intro_module
-                       if m != m.toplevel_owner then return false # Unexported
+       # html anchor id for the property in a nitdoc class page
+       #       PROP_mclass_propertyname
+       private fun anchor: String do
+               if anchor_cache == null then
+                       anchor_cache = "PROP_{mclassdef.mclass.public_owner.name}_{mproperty.name.replace(" ", "_")}"
                end
-               return true
+               return anchor_cache.as(not null)
        end
+       private var anchor_cache: nullable String
 
-       # Fill the body for the page associated to the global class
-       fun file_page_doc(dctx: DocContext)
-       do
-               dctx.add("<div class=\"menu\">\n")
-
-               var props = new Array[MMLocalProperty]
-               var inh = new HashMap[MMLocalClass, Array[MMLocalProperty]]
-               var inhs = new Array[MMLocalClass]
-               for g in global_properties do
-                       var p = self[g]
-                       if not p.require_doc(dctx) then continue
-                       if p.local_class.global == global or g.is_init_for(self) or p isa MMTypeProperty then
-                               props.add(p)
+       # Return a link to property into the nitdoc class page
+       #       <a href="url" title="short_comment">html_name</a>
+       private fun html_link(page: NitdocPage) do
+               if html_link_cache == null then
+                       var res = new Buffer
+                       if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
+                               var nprop = page.ctx.mbuilder.mpropdef2npropdef[self]
+                               res.append("<a href=\"{url}\" title=\"{nprop.short_comment}\">{mproperty.html_name}</a>")
                        else
-                               var lc = mmmodule[p.local_class.global]
-                               if inh.has_key(lc) then
-                                       inh[lc].add(p)
-                               else
-                                       inh[lc] = [p]
-                                       inhs.add(lc)
-                               end
-                               props.add(p)
+                               res.append("<a href=\"{url}\">{mproperty.html_name}</a>")
                        end
+                       html_link_cache = res.to_s
                end
-               dctx.sort(props)
+               page.append(html_link_cache.as(not null))
+       end
+       private var html_link_cache: nullable String
 
-               dctx.add("<nav class=\"properties filterable\">\n")
-               dctx.add("<h3>Properties</h3>\n")
-               dctx.open_stage
-               dctx.stage("<h4>Virtual Types</h4>\n<ul>\n")
-               for p in props do
-                       if p isa MMTypeProperty then
-                               menu_link(dctx, p)
-                       end
-               end
-               dctx.stage("</ul>\n")
-               dctx.close_stage
-               dctx.open_stage
-               dctx.stage("<h4>Constructors</h4>\n<ul>\n")
-               for p in props do
-                       if p.global.is_init_for(self) then
-                               menu_link(dctx, p)
-                       end
-               end
-               dctx.stage("</ul>\n")
-               dctx.close_stage
-               dctx.open_stage
-               dctx.stage("<h4>Methods</h4>\n<ul>\n")
-               for p in props do
-                       if not p.global.is_init and p isa MMMethod then
-                               menu_link(dctx, p)
-                       end
-               end
-               dctx.stage("</ul>\n")
-               dctx.close_stage
-               dctx.add("</nav>\n")
-
-               dctx.add("<nav class=\"inheritance filterable\">\n")
-               dctx.add("<h3>Inheritance</h3>\n")
-               dctx.add("<h4>Superclasses</h4>\n<ul>\n")
-               for lc in cshe.linear_extension do
-                       if lc == self then continue
-                       if not lc.require_doc(dctx) then continue
-                       dctx.add("<li>{lc.html_link(dctx)}</li>\n")
-               end
-               dctx.add("</ul>\n")
-               if cshe.smallers.length == 0 then 
-                       dctx.add("<h4>No Known Subclasses</h4>\n")
-               else if cshe.smallers.length <= 100 then 
-                       dctx.add("<h4>Subclasses</h4>\n")
-                       dctx.add("<ul>\n")
-                       for lc in cshe.smallers do
-                               if not lc.require_doc(dctx) then continue
-                               dctx.add("<li>{lc.html_link(dctx)}</li>\n")
-                       end
-                       dctx.add("</ul>\n")
-               else if cshe.direct_smallers.length <= 100 then 
-                       dctx.add("<h4>Direct Subclasses Only</h4>\n<ul>\n")
-                       for lc in cshe.direct_smallers do
-                               if not lc.require_doc(dctx) then continue
-                               dctx.add("<li>{lc.html_link(dctx)}</li>\n")
-                       end
-                       dctx.add("</ul>\n")
+       # Return a list item for the mpropdef
+       #       <li>html_link</li>
+       private fun html_sidebar_item(page: NitdocClass) do
+               if is_intro and mclassdef.mclass == page.mclass then
+                       page.append("<li class='intro'>")
+                       page.append("<span title='Introduced'>I</span>")
+               else if is_intro and mclassdef.mclass != page.mclass then
+                       page.append("<li class='inherit'>")
+                       page.append("<span title='Inherited'>H</span>")
                else
-                       dctx.add("<h4>Too much Subclasses to list</h4>\n")
-               end
-               dctx.add("</nav>\n")
-
-               dctx.add("</div>\n")
-
-
-               dctx.add("<div class=\"content\">\n")
-               dctx.add("<h1>{name}</h1>\n")
-               dctx.add("<div class='subtitle'>")
-               if global.visibility_level == 2 then
-                       abort
-               else if global.visibility_level == 3 then
-                       dctx.add("private ")
-               else if self.global.intro.mmmodule.toplevel_owner.visibility_for(self.global.intro.mmmodule) <= 1 then
-                       dctx.add("(unexported) ")
-               end
-               dctx.add("{kind} {global.intro.mmmodule.toplevel_owner.html_link(dctx)}::{name}</div>")
-               dctx.add("<div style=\"float: right;\"><a id=\"lblDiffCommit\"></a></div>")
-               dctx.add("<section class=\"description\">\n")
-               var doc = doc
-               if doc != null then
-                       var l = doc.location
-                       dctx.add("<pre type=\"2\" class=\"text_label\" tag=\"{l.file.filename}\" name=\"{dctx.get_source(l)}\" title=\"{l.line_start.to_s}\">{doc.to_html}</pre>\n")
-                       dctx.add("<textarea rows=\"1\" cols=\"76\" id=\"fileContent\" class=\"edit\"></textarea>")
-                       dctx.add("<a id=\"cancelBtn\">Cancel</a><a id=\"commitBtn\">Commit</a>")
-                       dctx.add("<pre id=\"preSave\" type=\"2\" class=\"text_label\" ></pre>")
-               end
-
-               var cla = new HashSet[MMLocalClass]
-               var sm = new HashSet[MMLocalClass]
-               var sm2 = new HashSet[MMLocalClass]
-               sm.add(self)
-               while cla.length + sm.length < 10 and sm.length > 0 do
-                       cla.add_all(sm)
-                       sm2.clear
-                       for x in sm do
-                               sm2.add_all(x.cshe.direct_smallers)
-                       end
-                       var t = sm
-                       sm = sm2
-                       sm2 = t
+                       page.append("<li class='redef'>")
+                       page.append("<span title='Redefined'>R</span>")
                end
-               cla.add_all(cshe.greaters_and_self)
+               html_link(page)
+               page.append("</li>")
+       end
 
-               var op = new Buffer
-               var name = "class_{name}"
-               op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-               for c in cla do
-                       if c == self then
-                               op.append("\"{c.name}\"[shape=box,margin=0.03];\n")
-                       else
-                               op.append("\"{c.name}\"[URL=\"{c.html_name}.html\"];\n")
-                       end
-                       for c2 in c.cshe.direct_greaters do
-                               if not cla.has(c2) then continue
-                               op.append("\"{c.name}\"->\"{c2.name}\";\n")
-                       end
-                       if not c.cshe.direct_smallers.is_empty then
-                               var others = true
-                               for c2 in c.cshe.direct_smallers do
-                                       if cla.has(c2) then others = false
-                               end
-                               if others then
-                                       op.append("\"{c.name}...\"[label=\"\"];\n")
-                                       op.append("\"{c.name}...\"->\"{c.name}\"[style=dotted];\n")
-                               end
-                       end
-               end
-               op.append("\}\n")
-               dctx.gen_dot(op.to_s, name.to_s, "Inheritance graph for class {name}")
-               dctx.add("</section>\n")
-
-               # Concerns table
-               dctx.open_stage
-               dctx.stage("<section class=\"concerns\">\n")
-               dctx.stage("<h2 class=\"section-header\">Concerns</h2>\n")
-
-               var mods = new Array[MMModule]
-               mods.add(global.intro.mmmodule.toplevel_owner)
-               for lc in crhe.greaters do
-                       if not lc isa MMSrcLocalClass then continue
-                       var m = lc.mmmodule.toplevel_owner
-                       if not mods.has(m) then mods.add(m)
-               end
-               
-               var intro = global.intro.mmmodule
-               var short_doc
-               dctx.add("<ul>\n")
-               for m in mods do
-                       short_doc = ""
-                       if m.short_doc != "&nbsp;" then short_doc = ": {m.short_doc}"
-                       dctx.add("<li>{m.html_link_to_anchor}{short_doc}")
-                       dctx.add("<ul>\n")
-                       for lc in crhe.linear_extension.reversed do
-                               if lc.mmmodule.toplevel_owner != m then continue
-                               if lc.mmmodule == m then continue
-                               short_doc = ""
-                               if lc.mmmodule.short_doc != "&nbsp;" then short_doc = ": {lc.mmmodule.short_doc}"
-                               dctx.add("<li>{lc.mmmodule.html_link_to_anchor}{short_doc}</li>")
-                       end
-                       dctx.add("</ul>\n")
-                       dctx.add("</li>\n")
-               end
-               dctx.add("</ul>\n")
-               dctx.stage("</section>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<section class=\"types\">\n")
-               dctx.stage("<h2>Formal and Virtual Types</h2>\n")
-               for i in [0..arity[ do
-                       var f = get_formal(i)
-                       f.full_documentation(dctx, self)
-               end
-               for p in props do
-                       if not p isa MMTypeProperty then continue
-                       p.full_documentation(dctx, self)
-               end
-               dctx.stage("</section>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<section class=\"constructors\">\n")
-               dctx.stage("<h2 class=\"section-header\">Constructors</h2>\n")
-               for p in props do
-                       if not p.global.is_init_for(self) then continue
-                       p.full_documentation(dctx, self)
-               end
-               dctx.stage("</section>\n")
-               dctx.close_stage
-
-               dctx.open_stage
-               dctx.stage("<section class=\"methods\">\n")
-               dctx.stage("<h2 class=\"section-header\">Methods</h2>\n")
-               var redefs = new HashMap[MMModule, HashMap[MMModule, Array[MMMethod]]]
-               for p in props do
-                       if p.global.is_init then continue
-                       if p.local_class.global != self.global then continue
-                       if not p isa MMMethod then continue
-                       # Top level module
-                       var toplevel_module = p.mmmodule.toplevel_owner
-                       if not redefs.has_key(toplevel_module) then
-                               redefs[toplevel_module] = new HashMap[MMModule, Array[MMMethod]]
-                       end
-                       # Nested module
-                       var nested_module = p.mmmodule
-                       if not redefs[toplevel_module].has_key(nested_module) then
-                               redefs[toplevel_module][nested_module] = new Array[MMMethod]
-                       end
-                       # Props
-                       redefs[toplevel_module][nested_module].add(p)
-                       
-                       # Redefs
-                       if p.mmmodule.toplevel_owner != p.intro_module then
-                               toplevel_module = p.intro_module
-                               nested_module = p.global.intro.mmmodule
-                               
-                               if not redefs.has_key(toplevel_module) then
-                                       redefs[toplevel_module] = new HashMap[MMModule, Array[MMMethod]]
+       private fun html_full_desc(page: NitdocPage, ctx: MClass) is abstract
+       private fun html_info(page: NitdocPage, ctx: MClass) is abstract
+
+       private fun html_comment(page: NitdocPage) do
+               page.append("<div class='description'>")
+               if not is_intro then
+                       if page.ctx.mbuilder.mpropdef2npropdef.has_key(mproperty.intro) then
+                               var intro_nprop = page.ctx.mbuilder.mpropdef2npropdef[mproperty.intro]
+                               if page.ctx.github_gitdir != null then
+                                       var loc = intro_nprop.doc_location.github(page.ctx.github_gitdir.as(not null))
+                                       page.append("<textarea class='baseComment' data-comment-namespace='{mproperty.intro.mclassdef.mmodule.full_name}::{mproperty.intro.mclassdef.mclass.name}::{mproperty.name}' data-comment-location='{loc}'>{intro_nprop.full_comment}</textarea>")
                                end
-                               if not redefs[toplevel_module].has_key(nested_module) then
-                                       redefs[toplevel_module][nested_module] = new Array[MMMethod]
+                               if intro_nprop.full_comment.is_empty then
+                                       page.append("<p class='info inheritance'>")
+                                       page.append("<span class=\"noComment\">no comment for </span>")
+                               else
+                                       page.append("<div class='comment'>{intro_nprop.full_markdown}</div>")
+                                       page.append("<p class='info inheritance'>")
                                end
-                       
-                               redefs[toplevel_module][nested_module].add(p.global.intro.as(MMMethod))
+                               page.append("introduction in ")
+                               mproperty.intro.mclassdef.html_namespace(page)
+                               page.append(" {page.show_source(intro_nprop.location)}</p>")
                        end
                end
-               
-               # Display toplevel blocks               
-               for m in mods do
-                       if not redefs.has_key(m) then continue
-                       dctx.add(m.html_anchor)
-                       if m != global.intro.mmmodule.toplevel_owner then
-                               dctx.add("<h3 class=\"concern-toplevel\">Methods refined in {m.html_link(dctx)}</h3>")
+               if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
+                       var nprop = page.ctx.mbuilder.mpropdef2npropdef[self]
+                       if page.ctx.github_gitdir != null then
+                               var loc = nprop.doc_location.github(page.ctx.github_gitdir.as(not null))
+                               page.append("<textarea class='baseComment' data-comment-namespace='{mclassdef.mmodule.full_name}::{mclassdef.mclass.name}::{mproperty.name}' data-comment-location='{loc}'>{nprop.full_comment}</textarea>")
                        end
-                       
-                       # Display nested module blocks
-                       for lc in crhe.linear_extension.reversed do
-                               if lc.mmmodule.toplevel_owner != m then continue
-                               var nm =  lc.mmmodule
-                               if not redefs[m].has_key(nm) then continue
-                               dctx.add(nm.html_anchor)
-                               if nm != global.intro.mmmodule then
-                                       short_doc = ""
-                                       if nm.short_doc != "&nbsp;" then short_doc = ": {nm.short_doc}" 
-                                       dctx.add("<p class=\"concern-doc\">{nm.html_name}{short_doc}</p>\n")
-                               end
-                       
-                               var pps = redefs[m][nm]
-                               dctx.sort(pps)
-                               for p in pps do
-                                       p.full_documentation(dctx, self)
-                               end                                     
+                       if nprop.full_comment == "" then
+                               page.append("<p class='info inheritance'>")
+                               page.append("<span class=\"noComment\">no comment for </span>")
+                       else
+                               page.append("<div class='comment'>{nprop.full_markdown}</div>")
+                               page.append("<p class='info inheritance'>")
                        end
-               end
-
-               if not inhs.is_empty then
-                       dctx.open_stage
-                       dctx.stage("<h3>Inherited Methods</h3>\n")
-                       for lc in inhs do
-                               dctx.open_stage
-                               dctx.stage("<p>Defined in {lc.html_link(dctx)}:")
-                               
-                               var ims = new Array[MMMethod] 
-                               for p in inh[lc] do
-                                       if p.global.is_init then continue
-                                       if not p isa MMMethod then continue
-                                       ims.add(p)
-                               end
-                               
-                               var i = 0
-                               for p in ims do 
-                                       dctx.add(" {p.html_link(dctx)}")
-                                       if i < ims.length - 1 then dctx.add(",")
-                                       i += 1
-                               end
-                               
-                               dctx.stage("</p>")
-                               dctx.close_stage
+                       if is_intro then
+                               page.append("introduction in ")
+                       else
+                               page.append("redefinition in ")
                        end
-                       dctx.close_stage
+                       mclassdef.html_namespace(page)
+                       page.append(" {page.show_source(nprop.location)}</p>")
                end
-               dctx.add("</section>\n")
-               dctx.close_stage
-               dctx.add("</div> <!-- end class {name} -->\n")
+               page.append("</div>")
        end
 end
 
-redef class MMSrcLocalClass
-       redef fun short_doc
-       do
-               var d = doc
-               if d != null then
-                       return d.short
-               else if global.intro == self then
-                       return "&nbsp;"
+redef class MMethodDef
+       redef fun html_full_desc(page, ctx) do
+               var classes = new Array[String]
+               var is_redef = mproperty.intro_mclassdef.mclass != ctx
+               if mproperty.is_init then
+                       classes.add("init")
+               else
+                       classes.add("fun")
+               end
+               if is_redef then classes.add("redef")
+               classes.add(mproperty.visibility.to_s)
+               page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
+               if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then
+                       page.append("<h3 class='signature' data-untyped-signature='{mproperty.name}{msignature.untyped_signature(page)}'>")
+                       page.append("<span>{mproperty.html_name}")
+                       msignature.html_signature(page)
+                       page.append("</span></h3>")
+               else
+                       page.append("<h3 class='signature' data-untyped-signature='init{msignature.untyped_signature(page)}'>")
+                       page.append("<span>init")
+                       msignature.html_signature(page)
+                       page.append("</span></h3>")
+               end
+               html_info(page, ctx)
+               html_comment(page)
+               page.append("</article>")
+       end
+
+       redef fun html_info(page, ctx) do
+               page.append("<div class='info'>")
+               if mproperty.visibility < public_visibility then page.append("{mproperty.visibility.to_s} ")
+               if mproperty.intro_mclassdef.mclass != ctx then page.append("redef ")
+               if mproperty.is_init then
+                       page.append("init ")
                else
-                       var bc = global.intro
-                       return bc.short_doc
+                       page.append("fun ")
                end
+               mproperty.html_namespace(page)
+               page.append("</div>")
        end
+end
 
-       redef fun doc
-       do
-               var n = node
-               if not n isa AStdClassdef then
-                       return null
-               end
-               var d = n.n_doc
-               if d == null then
-                       return null
+redef class MVirtualTypeDef
+       redef fun html_full_desc(page, ctx) do
+               var is_redef = mproperty.intro_mclassdef.mclass != ctx
+               var classes = new Array[String]
+               classes.add("type")
+               if is_redef then classes.add("redef")
+               classes.add(mproperty.visibility.to_s)
+               page.append("<article class='{classes.join(" ")}' id='{anchor}'>")
+               page.append("<h3 class='signature' data-untyped-signature='{mproperty.name}'><span>{mproperty.html_name}: ")
+               bound.html_link(page)
+               page.append("</span></h3>")
+               html_info(page, ctx)
+               html_comment(page)
+               page.append("</article>")
+       end
+
+       redef fun html_info(page, ctx) do
+               page.append("<div class='info'>")
+               if mproperty.intro_mclassdef.mclass != ctx then page.append("redef ")
+               page.append("type ")
+               mproperty.html_namespace(page)
+               page.append("</div>")
+       end
+end
+
+redef class MSignature
+       private fun html_signature(page: NitdocPage) do
+               if not mparameters.is_empty then
+                       page.append("(")
+                       for i in [0..mparameters.length[ do
+                               mparameters[i].html_link(page)
+                               if i < mparameters.length - 1 then page.append(", ")
+                       end
+                       page.append(")")
                end
-               if d.n_comment.is_empty then
-                       return null
-               else
-                       return d
+               if return_mtype != null then
+                       page.append(": ")
+                       return_mtype.html_link(page)
                end
        end
-end
 
-redef class MMSignature
-       # Htlm transcription of the signature (with nested links)
-       fun to_html(dctx: DocContext, with_closure: Bool): String
-       do
+       private fun untyped_signature(page: NitdocPage): String do
                var res = new Buffer
-               if arity > 0 then
+               if not mparameters.is_empty then
                        res.append("(")
-                       for i in [0..arity[ do
-                               if i > 0 then res.append(", ")
-                               res.append(self.params[i].name.to_s)
-                               res.append(": ")
-                               res.append(self[i].html_link(dctx))
-                               if self.vararg_rank == i then
-                                       res.append("...")
-                               end
+                       for i in [0..mparameters.length[ do
+                               res.append(mparameters[i].name)
+                               if i < mparameters.length - 1 then res.append(", ")
                        end
                        res.append(")")
                end
-               if return_type != null then
-                       res.append(": ")
-                       res.append(return_type.html_link(dctx))
-               end
-               if with_closure then
-                       for c in closures do
-                               res.append(" ")
-                               if c.is_optional then res.append("[")
-                               if c.is_break then res.append("break ")
-                               res.append("!{c.name}")
-                               res.append(c.signature.to_html(dctx, false))
-                               if c.is_optional then res.append("]")
-                       end
-               end
                return res.to_s
        end
 end
 
-redef class MMType
-       # Htlm transcription of the type (with nested links)
-       fun html_link(dctx: DocContext): String do return to_s
+redef class MParameter
+       private fun html_link(page: NitdocPage) do
+               page.append("{name}: ")
+               mtype.html_link(page)
+               if is_vararg then page.append("...")
+       end
 end
 
-redef class MMTypeSimpleClass
-       redef fun html_link(dctx) do return local_class.html_link(dctx)
+#
+# Nodes redefs
+#
+
+redef class Location
+       fun github(gitdir: String): String do
+               var base_dir = getcwd.join_path(gitdir).simplify_path
+               var file_loc = getcwd.join_path(file.filename).simplify_path
+               var gith_loc = file_loc.substring(base_dir.length + 1, file_loc.length)
+               return "{gith_loc}:{line_start},{column_start}--{line_end},{column_end}"
+       end
 end
 
-redef class MMTypeGeneric
-       redef fun html_link(dctx)
-       do
+redef class ADoc
+       private fun short_comment: String do
+               return n_comment.first.text.substring_from(2).replace("\n", "").html_escape
+       end
+
+       private fun full_comment: String do
                var res = new Buffer
-               res.append(local_class.html_link(dctx))
-               res.append("[")
-               res.append(params[0].html_link(dctx))
-               for i in [1..params.length[ do
-                       res.append(", ")
-                       res.append(params[i].html_link(dctx))
-               end
-               res.append("]")
-               return res.to_s
+               for t in n_comment do
+                       var text = t.text
+                       text = text.substring_from(1)
+                       if text.first == ' ' then text = text.substring_from(1)
+                       res.append(text.html_escape)
+               end
+               var str = res.to_s
+               return str.substring(0, str.length - 1)
        end
 end
 
-redef class MMTypeFormalParameter
-       fun html_anchor: String
-       do
-               return "FT_{local_class}_{cmangle(name)}"
+redef class AModule
+       private fun short_comment: String do
+               if n_moduledecl != null and n_moduledecl.n_doc != null then
+                       return n_moduledecl.n_doc.short_comment
+               end
+               return ""
        end
-       redef fun html_link(dctx)
-       do
-               return "<a href=\"#{html_anchor}\">{name}</a>"
+
+       private fun full_comment: String do
+               if n_moduledecl != null and n_moduledecl.n_doc != null then
+                       return n_moduledecl.n_doc.full_comment
+               end
+               return ""
        end
-       fun full_documentation(dctx: DocContext, lc: MMLocalClass)
-       do
-               dctx.add("<article id=\"{html_anchor}\">\n")
-               dctx.add("<h3 class=\"signature\">{name}: {bound.html_link(dctx)}</h3>\n")
-               dctx.add("<div class=\"info\">")
-               dctx.add("formal generic type")
-               dctx.add("</div>")
-               dctx.add("</article>")
+
+       private fun full_markdown: String do
+               if n_moduledecl != null and n_moduledecl.n_doc != null then
+                       return n_moduledecl.n_doc.full_markdown.html
+               end
+               return ""
+       end
+
+       private fun doc_location: Location do
+               if n_moduledecl != null and n_moduledecl.n_doc != null then
+                       return n_moduledecl.n_doc.location
+               end
+               return location
        end
 end
 
-redef class MMNullableType
-       redef fun html_link(dctx) do return "nullable " + as_notnull.html_link(dctx)
+redef class AStdClassdef
+       private fun short_comment: String do
+               if n_doc != null then return n_doc.short_comment
+               return ""
+       end
+
+       private fun full_comment: String do
+               if n_doc != null then return n_doc.full_comment
+               return ""
+       end
+
+       private fun full_markdown: String do
+               if n_doc != null then return n_doc.full_markdown.html
+               return ""
+       end
+
+       private fun doc_location: Location do
+               if n_doc != null then return n_doc.location
+               return location
+       end
 end
 
-redef class MMVirtualType
-       redef fun html_link(dctx) do return property.html_link(dctx)
+redef class APropdef
+       private fun short_comment: String do
+               if n_doc != null then return n_doc.short_comment
+               return ""
+       end
+
+       private fun full_comment: String do
+               if n_doc != null then return n_doc.full_comment
+               return ""
+       end
+
+       private fun full_markdown: String do
+               if n_doc != null then return n_doc.full_markdown.html
+               return ""
+       end
+
+       private fun doc_location: Location do
+               if n_doc != null then return n_doc.location
+               return location
+       end
 end
 
-var c = new DocContext
-c.exec_cmd_line
+
+var nitdoc = new NitdocContext
+nitdoc.generate_nitdoc
diff --git a/tests/ni_nitdoc.args b/tests/ni_nitdoc.args
deleted file mode 100644 (file)
index 30c07b9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-module_1.nit -d out/ni_nitdoc_args1.write
index ecb729f..f984808 100644 (file)
@@ -1 +1 @@
-module_1 -d out/nitdoc_args1.write
+module_1.nit -d out/nitdoc_args1.write
index d681ac1..0a917d7 100644 (file)
@@ -1,4 +1,3 @@
-../src/syntax/mmbuilder.nit:998,8--28: Warning: Expression is already a AMethPropdef since it is a AInitPropdef.
 usage: nitdoc [options] file...
   -W, --warn               Show warnings
   -q, --quiet              Do not show warnings
@@ -12,13 +11,13 @@ usage: nitdoc [options] file...
   -I, --path               Set include path for loaders (may be used more than once)
   --only-parse             Only proceed to parse step of loaders
   --only-metamodel         Stop after meta-model processing
-  --public                 Generate only the public API
-  --private                Generate the private API
   -d, --dir                Directory where doc is generated
   --source                 What link for source (%f for filename, %l for first line, %L for last line)
-  --no-dot                 Do not generate graphes with graphviz
   --sharedir               Directory containing the nitdoc files
+  --no-dot                 Do not generate graphes with graphiviz
+  --private                Generate the private API
   --custom-title           Title displayed in the top of the Overview page and as suffix of all page names
-  --custom-menu-items      Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)
-  --custom-overview-text   Text displayed as introduction of Overview page before the modules list
   --custom-footer-text     Text displayed as footer of all pages
+  --custom-overview-text   Text displayed as introduction of Overview page before the modules list
+  --custom-menu-items      Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)
+  --github-origin          The branch where edited commits will be pulled into (ex: user:repo:branch)
index 394b9fa..ee72676 100644 (file)
@@ -11,14 +11,15 @@ usage: nitdoc [options] file...
   -I, --path               Set include path for loaders (may be used more than once)
   --only-parse             Only proceed to parse step of loaders
   --only-metamodel         Stop after meta-model processing
-  --public                 Generate only the public API
-  --private                Generate the private API
   -d, --dir                Directory where doc is generated
   --source                 What link for source (%f for filename, %l for first line, %L for last line)
-  --no-dot                 Do not generate graphes with graphviz
   --sharedir               Directory containing the nitdoc files
+  --no-dot                 Do not generate graphes with graphviz
+  --private                Generate the private API
   --custom-title           Title displayed in the top of the Overview page and as suffix of all page names
-  --custom-menu-items      Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)
-  --custom-overview-text   Text displayed as introduction of Overview page before the modules list
   --custom-footer-text     Text displayed as footer of all pages
-  --github                 GitHub repo name, example: --github MyRepoName
+  --custom-overview-text   Text displayed as introduction of Overview page before the modules list
+  --custom-menu-items      Items displayed in menu before the 'Overview' item (Each item must be enclosed in 'li' tags)
+  --github-upstream        The branch where edited commits will be pulled into (ex: user:repo:branch)
+  --github-base-sha1       The sha1 of the base commit used to create pull request
+  --github-gitdir          The git working directory used to resolve path name (ex: /home/me/myproject/)
index 64d281c..7c2f531 100644 (file)
@@ -1,51 +1,46 @@
-A.html
-B.html
-Bool.html
-Int.html
-Object.html
-Sys.html
-class_A.dot
-class_A.map
-class_A.png
-class_A.s.dot
-class_B.dot
-class_B.map
-class_B.png
-class_B.s.dot
-class_Bool.dot
-class_Bool.map
-class_Bool.png
-class_Bool.s.dot
-class_Int.dot
-class_Int.map
-class_Int.png
-class_Int.s.dot
-class_Object.dot
-class_Object.map
-class_Object.png
-class_Object.s.dot
-class_Sys.dot
-class_Sys.map
-class_Sys.png
-class_Sys.s.dot
+ZeroClipboard.swf
+class_module_0_Int.html
+class_module_0_Object.html
+class_module_0_Sys.html
+class_module_1_A.html
+class_module_1_B.html
 dep.dot
 dep.map
 dep.png
 dep.s.dot
-full-index.html
-help.html
+dep_A.dot
+dep_A.map
+dep_A.png
+dep_A.s.dot
+dep_B.dot
+dep_B.map
+dep_B.png
+dep_B.s.dot
+dep_Int.dot
+dep_Int.map
+dep_Int.png
+dep_Int.s.dot
+dep_Object.dot
+dep_Object.map
+dep_Object.png
+dep_Object.s.dot
+dep_Sys.dot
+dep_Sys.map
+dep_Sys.png
+dep_Sys.s.dot
+dep_module_0.dot
+dep_module_0.map
+dep_module_0.png
+dep_module_0.s.dot
+dep_module_1.dot
+dep_module_1.map
+dep_module_1.png
+dep_module_1.s.dot
 index.html
-module_0.dot
-module_0.html
-module_0.map
-module_0.png
-module_0.s.dot
-module_1.dot
-module_1.html
-module_1.map
-module_1.png
-module_1.s.dot
+module_module_0.html
+module_module_1.html
 quicksearch-list.js
 resources/
 scripts/
+search.html
 styles/
index daf49f4..8c93549 100755 (executable)
@@ -6,4 +6,4 @@ do
        y="$x/$bx.nit"
        test -f $y && list="$list $y"
 done
-./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/src/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../src/nitx.nit ../src/ni_nitdoc.nit ../src/netdbg.nit ../src/nitlight.nit ../contrib/sort_downloads/src/sort_downloads.nit
+./tests.sh "$@" *.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/src/shoot_logic.nit ../lib/*.nit $list ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit ../src/nitx.nit ../src/netdbg.nit ../src/nitlight.nit ../contrib/sort_downloads/src/sort_downloads.nit