You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2015/04/16 09:54:59 UTC

svn commit: r947854 [5/7] - in /websites/staging/isis/trunk: cgi-bin/ content/ content/docs/ content/docs/css/github-fork-ribbon-css/ content/docs/css/github-fork-ribbon-css/0.1.1/ content/docs/getting-started/archetype/ content/docs/getting-started/de...

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-triggering-events.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-triggering-events.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-triggering-events.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-            padding:5px 40px;
+    <!--[if lt IE 9]>
 
-            font-size:1rem;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
-
-        #forkongithub a:hover{
-
-            background:#0D0;
-
-            color:#fff;
-
-        }
+    <![endif]-->
 
-        #forkongithub a::before,
 
-        #forkongithub a::after{
 
-            content:"";width:100%;
-
-            display:block;
-
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
+    <style>
 
-                z-index: 9999;
 
-            }
 
-            #forkongithub a{
-
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+    <div class="github-fork-ribbon">
 
-    </span>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
+
+</div>
 
 
 
@@ -486,11 +526,11 @@
 
           <div id="preamble">
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -685,10 +725,10 @@ methods for properties (see ?).</p>
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -711,7 +751,7 @@ methods for properties (see ?).</p>
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
 <li><a href="#_publishing_and_subscribing_to_events_pulling_changes">Publishing and Subscribing to Events (Pulling Changes)</a></li>
@@ -733,9 +773,9 @@ methods for properties (see ?).</p>
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -825,16 +865,16 @@ methods for properties (see ?).</p>
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -943,10 +983,6 @@ methods for properties (see ?).</p>
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-ui-hints.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-ui-hints.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos-ui-hints.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-            padding:5px 40px;
+    <!--[if lt IE 9]>
 
-            font-size:1rem;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            line-height:2rem;
+    <![endif]-->
 
-            position:relative;
-
-            transition:0.5s;
-
-        }
-
-        #forkongithub a:hover{
-
-            background:#0D0;
-
-            color:#fff;
-
-        }
 
-        #forkongithub a::before,
 
-        #forkongithub a::after{
-
-            content:"";width:100%;
-
-            display:block;
-
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
+    <style>
 
-                z-index: 9999;
 
-            }
 
-            #forkongithub a{
+    <style>
 
-                display:inherit;
+    .github-fork-ribbon-wrapper.right {
 
-                width:250px;
+        position: fixed;
 
-                position:fixed;
+    }
 
-                font-size:small;
+    .github-fork-ribbon {
 
-                top:40px;
+        background: #090;
 
-                right:-60px;
+    }
 
-                transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -webkit-transform:rotate(45deg);
+        background:#0D0;
 
-                -ms-transform:rotate(45deg);
+        color:#fff;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        font-size: 1.1em;
 
-            }
-
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+    <div class="github-fork-ribbon">
 
-    </span>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
+
+</div>
 
 
 
@@ -486,11 +526,11 @@
 
           <div id="preamble">
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -597,10 +637,10 @@ isis.reflector.facet.cssClass.patterns=\
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -623,7 +663,7 @@ isis.reflector.facet.cssClass.patterns=\
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
 <li><a href="#_icons_and_titles">Icons and Titles</a>
@@ -667,9 +707,9 @@ isis.reflector.facet.cssClass.patterns=\
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -759,16 +799,16 @@ isis.reflector.facet.cssClass.patterns=\
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -877,10 +917,6 @@ isis.reflector.facet.cssClass.patterns=\
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-how-tos.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-            padding:5px 40px;
+    <!--[if lt IE 9]>
 
-            font-size:1rem;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            line-height:2rem;
+    <![endif]-->
 
-            position:relative;
-
-            transition:0.5s;
-
-        }
-
-        #forkongithub a:hover{
-
-            background:#0D0;
-
-            color:#fff;
-
-        }
 
-        #forkongithub a::before,
 
-        #forkongithub a::after{
-
-            content:"";width:100%;
-
-            display:block;
-
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
+
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -486,11 +526,11 @@
 
           <div id="preamble">
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -501,13 +541,13 @@ TODO
 </div>
 </div>
 <div class="sect1">
-<h2 id="_class_members">Class Members</h2>
+<h2 id="_class_structure">Class Structure</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -633,24 +673,45 @@ TODO
 </div>
 <div class="sect2">
 <h3 id="_collection">Collection</h3>
-<div class="listingblock">
-<div class="content">
-<pre>While Isis support collections of references, the framework (currently) does not support collections of values. That is, it isn't possible to define a collection of type `Set&lt;String&gt;`.
-
-Or, actually, you can, because that is a valid mapping supported by JDO/DataNucleus .  However, Isis has no default visualization.
-
-The workaround is to mark the collection as `@Programmatic`, as described in &lt;&lt;Ignoring Methods&gt;&gt;.  This ensures that the collection is ignored by Isis.</pre>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>While Isis support collections of references, the framework (currently) does not support collections of values. That is, it isn&#8217;t possible to define a collection of type <code>Set&lt;String&gt;</code>.</p>
 </div>
+<div class="paragraph">
+<p>Or, actually, you can, because that is a valid mapping supported by JDO/DataNucleus .  However, Isis has no default visualization.</p>
+</div>
+<div class="paragraph">
+<p>The workaround is to mark the collection as <code>@Programmatic</code>, as described in <a href="#_ignoring_methods">Ignoring Methods</a>.  This ensures that the collection is ignored by Isis.</p>
+</div>
+</td>
+</tr>
+</table>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_actions">Actions</h3>
-<div class="listingblock">
-<div class="content">
-<pre>While Isis support actions whose parameters' types are scalar (values such as `String`, `int`, or references such as `Customer`), the framework (currently) does not support parameter types that are collections or maps.
-
-The workaround is to mark the collection as `@Programmatic`, as described in &lt;&lt;Ignoring Methods&gt;&gt;.  This ensures that the collection is ignored by Isis.</pre>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>While Isis support actions whose parameters' types are scalar (values such as <code>String</code>, <code>int</code>, or references such as <code>Customer</code>), the framework (currently) does not support parameter types that are collections or maps.</p>
+</div>
+<div class="paragraph">
+<p>The workaround is to mark the collection as <code>@Programmatic</code>, as described in <a href="#_ignoring_methods">Ignoring Methods</a>.  This ensures that the collection is ignored by Isis.</p>
 </div>
+</td>
+</tr>
+</table>
 </div>
 <div class="sect3">
 <h4 id="_optional_action_argument">Optional Action Argument</h4>
@@ -724,11 +785,11 @@ The workaround is to mark the collection
 <div class="sect1">
 <h2 id="_entity_relationships">Entity Relationships</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -749,11 +810,11 @@ TODO
 <div class="sect1">
 <h2 id="_contributed_members">Contributed Members</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -778,11 +839,11 @@ TODO
 <div class="sect1">
 <h2 id="_derived_members">Derived Members</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -831,11 +892,11 @@ TODO
 <div class="sect1">
 <h2 id="_object_management_crud">Object Management (CRUD)</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -864,11 +925,11 @@ TODO
 <div class="sect1">
 <h2 id="_ui_hints">UI Hints</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -965,11 +1026,11 @@ isis.reflector.facet.cssClass.patterns=\
 <div class="sect1">
 <h2 id="_business_rules">Business Rules</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1066,11 +1127,11 @@ TODO
 <div class="sect1">
 <h2 id="_business_rules_2">Business Rules</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1128,11 +1189,11 @@ TODO
 <div class="sect1">
 <h2 id="_triggering_events">Triggering Events</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1321,11 +1382,11 @@ methods for properties (see ?).</p>
 <div class="sect1">
 <h2 id="_tips_n_tricks">Tips n Tricks</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1444,11 +1505,11 @@ used by the supporting <code>validateXxx
 <div class="sect1">
 <h2 id="_error_handling">Error Handling</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1469,11 +1530,11 @@ TODO
 <div class="sect1">
 <h2 id="_i18n">i18n</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1486,11 +1547,11 @@ TODO
 <div class="sect1">
 <h2 id="_multi_tenancy">Multi-tenancy</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1503,11 +1564,11 @@ TODO
 <div class="sect1">
 <h2 id="_persistence_lifecycle">Persistence Lifecycle</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -1522,10 +1583,10 @@ TODO
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -1548,10 +1609,10 @@ TODO
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
-<li><a href="#_class_members">Class Members</a>
+<li><a href="#_class_structure">Class Structure</a>
 <ul class="sectlevel2">
 <li><a href="#_class_definition">Class Definition</a></li>
 <li><a href="#_property">Property</a>
@@ -1757,9 +1818,9 @@ TODO
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -1849,16 +1910,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -1967,10 +2028,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-integrating-with-other-systems.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-integrating-with-other-systems.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-integrating-with-other-systems.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
-
-            padding:5px 40px;
-
-            font-size:1rem;
-
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        #forkongithub a:hover{
+    <!--[if lt IE 9]>
 
-            background:#0D0;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            color:#fff;
+    <![endif]-->
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
-
-            content:"";width:100%;
 
-            display:block;
 
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -486,11 +526,11 @@
 
           <div id="preamble">
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -513,10 +553,10 @@ TODO
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -539,7 +579,7 @@ TODO
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
 <li><a href="#_non_ui_execution">Non UI Execution</a></li>
@@ -555,9 +595,9 @@ TODO
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -647,16 +687,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -765,10 +805,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-isis-addons.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-isis-addons.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-isis-addons.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
-
-            padding:5px 40px;
-
-            font-size:1rem;
-
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        #forkongithub a:hover{
+    <!--[if lt IE 9]>
 
-            background:#0D0;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            color:#fff;
+    <![endif]-->
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
-
-            content:"";width:100%;
 
-            display:block;
 
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -486,11 +526,11 @@
 
           <div id="preamble">
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -622,10 +662,10 @@ Note that Isis addons, while maintained
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -648,7 +688,7 @@ Note that Isis addons, while maintained
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
 <li><a href="#_command_service_persistence">Command Service (persistence)</a>
@@ -703,9 +743,9 @@ Note that Isis addons, while maintained
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -795,16 +835,16 @@ Note that Isis addons, while maintained
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -913,10 +953,6 @@ Note that Isis addons, while maintained
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-applib-utility-classes.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-applib-utility-classes.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-applib-utility-classes.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
-
-            padding:5px 40px;
-
-            font-size:1rem;
-
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        #forkongithub a:hover{
+    <!--[if lt IE 9]>
 
-            background:#0D0;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            color:#fff;
+    <![endif]-->
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
-
-            content:"";width:100%;
 
-            display:block;
 
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -484,11 +524,11 @@
 
         <div id="doc-content">
 
-          <div class="admonitionblock note">
+          <div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -501,10 +541,10 @@ TODO
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -527,7 +567,7 @@ TODO
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           
 
@@ -541,9 +581,9 @@ TODO
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -633,16 +673,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -751,10 +791,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-convenience-superclasses.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-convenience-superclasses.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-convenience-superclasses.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
-
-            padding:5px 40px;
-
-            font-size:1rem;
-
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        #forkongithub a:hover{
+    <!--[if lt IE 9]>
 
-            background:#0D0;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            color:#fff;
+    <![endif]-->
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
-
-            content:"";width:100%;
 
-            display:block;
 
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -484,11 +524,11 @@
 
         <div id="doc-content">
 
-          <div class="admonitionblock note">
+          <div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -501,10 +541,10 @@ TODO
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -527,7 +567,7 @@ TODO
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           
 
@@ -541,9 +581,9 @@ TODO
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -633,16 +673,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -751,10 +791,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-domain-services.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-domain-services.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-reference-domain-services.html Thu Apr 16 07:54:58 2015
@@ -62,131 +62,155 @@
 
 
 
-    <link rel="stylesheet" href="../css/foundation/5.5.1/foundation.css"/>
+    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
 
     <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
 
-    <link href="../css/asciidoctor/foundation-potion.css" rel="stylesheet">
+    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
 
     <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
 
 
 
-    <style type="text/css">
-
-        #forkongithub a{
-
-            display: none;
-
-            background:#090;
-
-            color:#fff;
-
-            text-decoration:none;
-
-            font-family:arial, sans-serif;
-
-            text-align:center;
-
-            font-weight:bold;
-
-            padding:5px 40px;
-
-            font-size:1rem;
-
-            line-height:2rem;
-
-            position:relative;
-
-            transition:0.5s;
-
-        }
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        #forkongithub a:hover{
+    <!--[if lt IE 9]>
 
-            background:#0D0;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            color:#fff;
+    <![endif]-->
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
-
-            content:"";width:100%;
 
-            display:block;
 
-            position:fixed;
-
-            top:1px;
-
-            left:0;
-
-            height:1px;
+    <style type="text/css">
 
-            background:#fff;
+        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
 
-            z-index: 9999;
 
-        }
 
-        #forkongithub a::after{
+        pre.CodeRay code {
 
-            bottom:1px;
+            background-color: inherit;
 
-            top:auto;
+            border-style: none;
 
         }
 
-        @media screen and (min-width:768px){
-
-            #forkongithub{
-
-                position:fixed;
-
-                display:block;
-
-                top:0;
-
-                right:0;
-
-                width:250px;
-
-                overflow:hidden;
-
-                height:250px;
-
-                z-index: 9999;
+    <style>
 
-            }
 
-            #forkongithub a{
 
-                display:inherit;
+    <style>
 
-                width:250px;
+    .github-fork-ribbon-wrapper.right {
 
-                position:fixed;
+        position: fixed;
 
-                font-size:small;
+    }
 
-                top:40px;
+    .github-fork-ribbon {
 
-                right:-60px;
+        background: #090;
 
-                transform:rotate(45deg);
+    }
 
-                -webkit-transform:rotate(45deg);
+    .github-fork-ribbon a:hover {
 
-                -ms-transform:rotate(45deg);
+        background:#0D0;
 
-                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+        color:#fff;
 
-            }
+        font-size: 1.1em;
 
-        }
+    }
 
     </style>
 
@@ -250,7 +274,7 @@
 
             left: auto;
 
-            padding-top: 120px;
+            padding-top: 80px;
 
             z-index: auto;
 
@@ -270,17 +294,33 @@
 
 
 
+    <style>
+
+        footer {
+
+            margin-top: 1000px;
+
+        }
+
+    </style>
+
+
+
 </head>
 
 <body>
 
 
 
-    <span id="forkongithub">
+<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
+
+    <div class="github-fork-ribbon">
 
-        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+        <a href="https://github.com/apache/isis/fork">Fork me on GitHub</a>
+
+    </div>
 
-    </span>
+</div>
 
 
 
@@ -484,11 +524,11 @@
 
         <div id="doc-content">
 
-          <div class="admonitionblock note">
+          <div class="admonitionblock important">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-important" title="Important"></i>
 </td>
 <td class="content">
 TODO
@@ -501,10 +541,10 @@ TODO
 
 
 
-        <hr>
-
         <footer>
 
+          <hr>
+
           <p class="small">
 
           Copyright &copy; 2010~2015 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
@@ -527,7 +567,7 @@ TODO
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           
 
@@ -541,9 +581,9 @@ TODO
 
 
 
-    <script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
+<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
 
-    <script src="../js/foundation/5.5.1/foundation.min.js"></script>
+<script src="../js/foundation/5.5.1/foundation.min.js"></script>
 
 
 
@@ -633,16 +673,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -751,10 +791,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();