You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/10/06 09:59:00 UTC

svn commit: r1529590 - in /isis/site/trunk: content/documentation.md templates/isis-template.html

Author: danhaywood
Date: Sun Oct  6 07:59:00 2013
New Revision: 1529590

URL: http://svn.apache.org/r1529590
Log:
to bootstrap3

Modified:
    isis/site/trunk/content/documentation.md
    isis/site/trunk/templates/isis-template.html

Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1529590&r1=1529589&r2=1529590&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Sun Oct  6 07:59:00 2013
@@ -4,7 +4,7 @@ Title: Documentation
 
 {row
 
-{span4
+{col-md-4
 ### Getting started
 
 - [Screencasts](getting-started/screencasts.html)
@@ -22,7 +22,7 @@ Title: Documentation
 
 }
 
-{span4
+{col-md-4
 ###  Learning More
 
 - [Common Use Cases](learning-more/common-use-cases.html)
@@ -39,7 +39,7 @@ Title: Documentation
 
 }
 
-{span4
+{col-md-4
 ###  Contributors
 
 - [Contributing](contributors/contributing.html)
@@ -57,11 +57,11 @@ Guidance for committers is at the bottom
 
 {row
 
-{span12
+{col-md-12
 ## Core [1.2.0](core/release-notes/about.html)
 }
 
-{span4
+{col-md-4
 ###  Applib
 
 - [Configuration Files](core/configuration-files.html)
@@ -79,7 +79,7 @@ Guidance for committers is at the bottom
 
 }
 
-{span4
+{col-md-4
 ### Dev Support
 
 - [Unit Test Support](core/unittestsupport.html)
@@ -93,7 +93,7 @@ Guidance for committers is at the bottom
 
 }
 
-{span4
+{col-md-4
 ### Runtime
 
 - [Core Runtime](core/runtime.html) [stub]
@@ -113,11 +113,11 @@ Guidance for committers is at the bottom
 
 {row
 
-{span12
+{col-md-12
 ## Viewers
 }
 
-{span4
+{col-md-4
 ###  Wicket [1.2.0](components/viewers/wicket/release-notes/about.html)
 
 - [About](components/viewers/wicket/about.html)
@@ -129,7 +129,7 @@ Guidance for committers is at the bottom
 
 }
 
-{span4
+{col-md-4
 ###  RestfulObjects [2.0.0](components/viewers/restfulobjects/release-notes/about.html)
 
 - [About](components/viewers/restfulobjects/about.html)
@@ -140,7 +140,7 @@ Guidance for committers is at the bottom
 - [Event Serializer per RO Spec](components/viewers/restfulobjects/event-serializer-rospec.html)
 }
 
-{span4
+{col-md-4
 ### DHTMLX
 - [About](third-party/viewers/dhtmlx/about.html)
 
@@ -153,11 +153,11 @@ Note: this viewer is third-party open so
 
 {row
 
-{span12
+{col-md-12
 ## JDO/DataNucleus Object Store [1.1.0](components/objectstores/jdo/release-notes/about.html)
 }
 
-{span4
+{col-md-4
 ###  Configuration
 
 - [About](components/objectstores/jdo/about.html)
@@ -170,7 +170,7 @@ Note: this viewer is third-party open so
 - [Deploying on the Google App Engine](components/objectstores/jdo/deploying-on-the-google-app-engine.html)
 }
 
-{span4
+{col-md-4
 ###  JDO Mapping Hints
 - [Mapping Mandatory and Optional Properties](components/objectstores/jdo/mapping-mandatory-and-optional-properties.html)
 - [Mapping JODA Dates](components/objectstores/jdo/mapping-joda-dates.html)
@@ -181,7 +181,7 @@ Note: this viewer is third-party open so
  
 }
 
-{span4
+{col-md-4
 ### Applib Service Implementations
 
 - [Eagerly Registering Entity Types](components/objectstores/jdo/eagerly-registering-entities.html)
@@ -197,11 +197,11 @@ Note: this viewer is third-party open so
 
 {row
 
-{span12
+{col-md-12
 ## Security
 }
 
-{span4
+{col-md-4
 ### Shiro [1.1.1](components/security/shiro/release-notes/about.html)
 
 - [About](components/security/shiro/about.html)
@@ -211,24 +211,24 @@ Note: this viewer is third-party open so
 - [Format of Isis Permissions](components/security/shiro/format-of-permissions.html)
 }
 
-{span4
+{col-md-4
 ### File [1.0.1](components/security/file/release-notes/about.html)
 - [About](components/security/file/about.html)
 
 }
 
-{span4
+{col-md-4
 }
 
 }
 
 {row
 
-{span12
+{col-md-12
 ## Unreleased Components
 }
 
-{span4
+{col-md-4
 ###  NoSQL Object Store [0.2.0-incubating](components/objectstores/nosql/release-notes/about.html)
 
 - [About](components/objectstores/nosql/about.html)
@@ -240,7 +240,7 @@ Note: this viewer is third-party open so
 
 }
 
-{span4
+{col-md-4
 ###  Scimpi Viewer [0.2.0-incubating](components/viewers/scimpi/release-notes/about.html)
 
 - [About](components/viewers/scimpi/about.html)
@@ -253,7 +253,7 @@ Note: this viewer is third-party open so
 }
 
 
-{span4
+{col-md-4
 ###Groovy Programming Model [0.2.0-incubating](components/progmodels/groovy/release-notes/about.html)
 
 - [About](components/progmodels/groovy/about.html)
@@ -270,11 +270,11 @@ Note: this viewer is third-party open so
 
 {row
 
-{span12
+{col-md-12
 ##  Other Topics
 }
 
-{span4
+{col-md-4
 ### Plugins
 
 - [Maven Plugin](other/maven-plugin.html) [stub]
@@ -291,7 +291,7 @@ Note: this viewer is third-party open so
 
 }
 
-{span4
+{col-md-4
 ###  Committers
 
 - [Updating the CMS site](contributors/updating-the-cms-site.html)
@@ -305,7 +305,7 @@ Note: this viewer is third-party open so
 
 }
 
-{span4
+{col-md-4
 ###  Mothballed Components
 
 These are no longer under active development

Modified: isis/site/trunk/templates/isis-template.html
URL: http://svn.apache.org/viewvc/isis/site/trunk/templates/isis-template.html?rev=1529590&r1=1529589&r2=1529590&view=diff
==============================================================================
--- isis/site/trunk/templates/isis-template.html (original)
+++ isis/site/trunk/templates/isis-template.html Sun Oct  6 07:59:00 2013
@@ -188,82 +188,69 @@
 
   <body>
 
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="navbar-brand" href="{{base}}index.html">Apache Isis&trade;</a>
-          <ul class="nav">
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li>
-                  <a href="http://www.apache.org/">Apache Homepage <i class="icon-share-alt"></i></a>
-                </li>
-                <li>
-                  <a href="http://www.apache.org/licenses/">Licenses <i class="icon-share-alt"></i></a>
-                </li>
-                <li>
-                  <a href="http://www.apache.org/security/">Security <i class="icon-share-alt"></i></a>
-                </li>
-                <li>
-                  <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share-alt"></i></a>
-                </li>
-                <li>
-                  <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
-                </li>
-                <li>
-                  <a href="{{base}}more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
-                </li>
-              </ul>
-            </li>
-            <li><a href="{{base}}download.html">Download</a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Screenshots<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="{{base}}getting-started/screenshots.html">Screenshots</a></li>
-                <li><a href="{{base}}getting-started/screencasts.html">Screencasts</a></li>
-                <li><a href="{{base}}getting-started/powered-by.html">Powered by</a></li>
-                <!--
-                <li><a href="#">Online Demo</a></li>
-                -->
-              </ul>
+    <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+      <a class="navbar-brand" href="{{base}}index.html">Apache Isis&trade;</a>
+      <ul class="nav navbar-nav">
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li>
+              <a href="http://www.apache.org/">Apache Homepage <i class="icon-share-alt"></i></a>
             </li>
-            <li><a href="{{base}}documentation.html">Documentation</a></li>
-            <li><a href="{{base}}support.html">Support</a></li>
-
+            <li>
+              <a href="http://www.apache.org/licenses/">Licenses <i class="icon-share-alt"></i></a>
+            </li>
+            <li>
+              <a href="http://www.apache.org/security/">Security <i class="icon-share-alt"></i></a>
+            </li>
+            <li>
+              <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share-alt"></i></a>
+            </li>
+            <li>
+              <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
+            </li>
+            <li>
+              <a href="{{base}}more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+            </li>
+          </ul>
+        </li>
+        <li><a href="{{base}}download.html">Download</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Screenshots<b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="{{base}}getting-started/screenshots.html">Screenshots</a></li>
+            <li><a href="{{base}}getting-started/screencasts.html">Screencasts</a></li>
+            <li><a href="{{base}}getting-started/powered-by.html">Powered by</a></li>
+            <!--
+            <li><a href="#">Online Demo</a></li>
+            -->
           </ul>
+        </li>
+        <li><a href="{{base}}documentation.html">Documentation</a></li>
+        <li><a href="{{base}}support.html">Support</a></li>
+
+      </ul>
+
+      <!-- Google CSE Search Box Begins -->
+      <div>
+        <xxdiv class="isis-tweak">
+          <xxdiv style="float: right; position: relative; ">
+        </xxdiv>
 
-          <!-- Google CSE Search Box Begins -->
-          <div class="isis-tweak">
-            <div style="float: right; position: relative; ">
+        
+        <FORM class="navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+          <div class="form-group">
+            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+            <INPUT type="hidden" name="cof" value="FORID:0">
+            <INPUT class="form-control" name="q" type="text" placeholder="Search">
           </div>
+        </FORM>
 
-          <!--
-              <form action="http://www.google.com/cse" id="cse-search-box" _lpchecked="1">
-                <div>
-                    <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                    <input type="hidden" name="ie" value="UTF-8">
-                    <input type="text" name="q" placeholder="Search" size="31" style="border: 1px solid rgb(126, 157, 185); padding: 2px; background-color: rgb(255, 255, 255); background-position: 0% 50%; background-repeat: no-repeat no-repeat;">
-                    <input type="submit" name="sa" value="Search">
-                </div>
-                <input name="siteurl" type="hidden" value="isis.apache.org">
-                <input name="ref" type="hidden" value="">
-                <input name="ss" type="hidden" value="677j458329j2">
-            </form>
-          -->
-          
-            <FORM class="pull-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                    <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                <INPUT type="hidden" name="cof" value="FORID:0">
-                <INPUT name="q" type="text" placeholder="Search">
-            </FORM>
-
-          </div>
-       <!-- Google CSE Search Box Ends -->
-        
-        </div>
       </div>
-    </div>
+    <!-- Google CSE Search Box Ends -->
+        
+
+    </nav>
 
     <div class="container">
       <div class="markdown-content">