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 [2/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/index.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/index.html (original)
+++ websites/staging/isis/trunk/content/docs/index.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>
 
 
 
@@ -541,10 +581,10 @@
 
 
 
-        <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.
@@ -567,7 +607,7 @@
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           
 
@@ -581,9 +621,9 @@
 
 
 
-    <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>
 
 
 
@@ -673,16 +713,16 @@
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -791,10 +831,6 @@
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/introducing-apache-isis/common-use-cases/common-use-cases.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/introducing-apache-isis/common-use-cases/common-use-cases.html (original)
+++ websites/staging/isis/trunk/content/docs/introducing-apache-isis/common-use-cases/common-use-cases.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/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html (original)
+++ websites/staging/isis/trunk/content/docs/introducing-apache-isis/isis-in-pictures/isis-in-pictures.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/release-notes/release-notes.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/release-notes/release-notes.html (original)
+++ websites/staging/isis/trunk/content/docs/release-notes/release-notes.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-config-and-deployment.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-config-and-deployment.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-config-and-deployment.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
@@ -654,10 +694,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.
@@ -680,7 +720,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="#_configuration_files">Configuration Files</a></li>
@@ -737,9 +777,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>
 
 
 
@@ -829,16 +869,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -947,10 +987,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-apache-isis-vs.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
@@ -529,10 +569,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.
@@ -555,7 +595,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="#_vs_spring">vs Spring</a></li>
@@ -574,9 +614,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>
 
 
 
@@ -666,16 +706,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -784,10 +824,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-building-blocks.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-building-blocks.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-building-blocks.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
@@ -834,10 +874,10 @@ public interface EmailService {
 
 
 
-        <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.
@@ -860,7 +900,7 @@ public interface EmailService {
 
         <!-- the 'hide' class is removed by Javascript -->
 
-        <div id="toc" class="toc2 hide">
+        <div id="toc" class="toc2">
 
           <ul class="sectlevel1">
 <li><a href="#_a_metamodel_with_explicit_and_inferred_semantics">A MetaModel with Explicit and Inferred Semantics</a></li>
@@ -902,9 +942,9 @@ public interface EmailService {
 
 
 
-    <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>
 
 
 
@@ -994,16 +1034,16 @@ public interface EmailService {
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -1112,10 +1152,6 @@ public interface EmailService {
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-framework-provided-services.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-framework-provided-services.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-framework-provided-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>
 
 
 
@@ -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
@@ -626,10 +666,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.
@@ -652,7 +692,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="#_api_vs_spi">API vs SPI</a></li>
@@ -708,9 +748,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>
 
 
 
@@ -800,16 +840,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -918,10 +958,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();
 
 

Modified: websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-principles.html
==============================================================================
--- websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-principles.html (original)
+++ websites/staging/isis/trunk/content/docs/user-guide/user-guide-core-concepts-principles.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;
-
-        }
-
-        #forkongithub a:hover{
-
-            background:#0D0;
-
-            color:#fff;
+    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
 
-        }
-
-        #forkongithub a::before,
-
-        #forkongithub a::after{
+    <!--[if lt IE 9]>
 
-            content:"";width:100%;
+      <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
 
-            display:block;
+    <![endif]-->
 
-            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>
 
-    </span>
+    </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
@@ -512,13 +552,20 @@ TODO
 <div class="sect1">
 <h2 id="_naked_objects_pattern">Naked Objects Pattern</h2>
 <div class="sectionbody">
-<div class="exampleblock">
-<div class="title">Example 1. Object Interface Mapping</div>
-<div class="content">
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="title">Object Interface Mapping</div>
 <div class="paragraph">
 <p>Just as an ORM (such as <a href="http://datanucleus.org">DataNucleus</a> or <a href="http:hibernate.org">Hibernate</a>) maps domain entities to a database, you can think of Naked Objects as an OIM - mapping domain objects to a user interface.</p>
 </div>
-</div>
+</td>
+</tr>
+</table>
 </div>
 <div class="ulist">
 <ul>
@@ -532,15 +579,18 @@ TODO
 <div class="sect1">
 <h2 id="_hexagonal_architecture">Hexagonal Architecture</h2>
 <div class="sectionbody">
-<div class="admonitionblock note">
+<div class="paragraph">
+<p>Originally described by Alistair Cockburn, the <a href="http://alistair.cockburn.us/Hexagonal+architecture">Hexagonal Architecture</a> &#8230;&#8203;</p>
+</div>
+<div class="admonitionblock tip">
 <table>
 <tr>
 <td class="icon">
-<i class="fa icon-note" title="Note"></i>
+<i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>The hexagonal architecture is also known as the ports-and-adapters architecture.  another name used (less frequently) is the onion architecture.</p>
+<p>The hexagonal architecture is also known as the <a href="http://c2.com/cgi/wiki?PortsAndAdaptersArchitecture:">Ports and Adapters</a> architecture or (less frequently) as the <a href="http://jeffreypalermo.com/blog/the-onion-architecture-part-1/">Onion</a> architecture.</p>
 </div>
 </td>
 </tr>
@@ -624,10 +674,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.
@@ -650,7 +700,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="#_domain_driven_design">Domain-Driven Design</a>
@@ -675,9 +725,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>
 
 
 
@@ -767,16 +817,16 @@ TODO
 
 
 
-           //console.log("id = " + id + ", lastId = "  + lastId);
-
-
-
            if (lastId !== id && id) {
 
                scrollTo(id);
 
            }
 
+
+
+           window.history.pushState({}, "", window.location.origin + window.location.pathname + "#" + id);
+
         });
 
 
@@ -885,10 +935,6 @@ TODO
 
 
 
-        $("#toc").removeClass("hide");
-
-
-
         $(syncMenuItem).click();