update to bootstrap 3

fcrepo · Oct 30, 2013 · 9f9c18c · 9f9c18c
1 parent 91db096
commit 9f9c18c
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 38 deletions.
diff --git a/fcrepo-http-api/src/main/resources/views/common-head.vsl b/fcrepo-http-api/src/main/resources/views/common-head.vsl
@@ -1,7 +1,7 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
 
-<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
 <script type="text/javascript">
    #include("views/common.js")
 </script>

diff --git a/fcrepo-http-api/src/main/resources/views/common-header.vsl b/fcrepo-http-api/src/main/resources/views/common-header.vsl
@@ -1,22 +1,28 @@
 #* @vtlvariable name="uriInfo" type="javax.ws.rs.core.UriInfo" *#
 
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
-        <a class="brand" href="$uriInfo.baseUriBuilder.build()">Fedora 4</a>
-        <ul class="nav">
+<nav class="navbar navbar-default" role="navigation">
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="$uriInfo.baseUriBuilder.build()">Fedora 4</a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse navbar-ex1-collapse">
+        <ul class="nav navbar-nav">
             <li><a href="$uriInfo.baseUriBuilder.build()">Home</a></li>
             <li><a href="$uriInfo.baseUriBuilder.build()fcr:namespaces">Namespaces</a></li>
             <li><a href="$uriInfo.baseUriBuilder.build()fcr:workspaces">Workspaces</a></li>
-
         </ul>
-
-        <form class="navbar-search pull-right" method="GET" action="$uriInfo.baseUriBuilder.build()fcr:search">
-            <div class="input-append">
+        <form class="navbar-form navbar-left" role="search" method="GET" action="$uriInfo.baseUriBuilder.build()fcr:search">
+            <div class="form-group">
                 <input class="search-query" type="text" name="q" placeholder="Search"/>
             </div>
+            <button type="submit" class="btn btn-default">Search</button>
         </form>
-
-        </div>
-        </div>
-    </div>
+    </div>
+</nav>
diff --git a/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl b/fcrepo-http-api/src/main/resources/views/common-node-actions.vsl
@@ -47,16 +47,18 @@ WHERE { }
 
 #if($serializations.hasNext())
 <div class="btn-group">
-    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-        Export as...
-        <span class="caret"></span>
-    </a>
-
-    <ul class="dropdown-menu">
-    #foreach($quad in $helpers.getSortedTriples($model, $serializations))
-      <li><a href="$quad.getObject().getURI()">$helpers.getObjectTitle($rdf, $quad.getObject())</a></li>
-    #end
-    </ul>
+    <div class="dropdown">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+            Export as...
+            <span class="caret"></span>
+        </a>
+
+        <ul class="dropdown-menu">
+        #foreach($quad in $helpers.getSortedTriples($model, $serializations))
+          <li><a href="$quad.getObject().getURI()">$helpers.getObjectTitle($rdf, $quad.getObject())</a></li>
+        #end
+        </ul>
+    </div>
 </div>
 <hr />
 #end

diff --git a/fcrepo-http-api/src/main/resources/views/common-node-header.vsl b/fcrepo-http-api/src/main/resources/views/common-node-header.vsl
@@ -2,7 +2,7 @@
 #parse("views/common-header.vsl")
 
 <div class="row">
-    <div class="span9">
+    <div class="col-md-9">
         <h1>$esc.html($helpers.getObjectTitle($rdf, $topic))</h1>
     </div>
 </div>
diff --git a/fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl b/fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl
@@ -14,7 +14,7 @@
     #parse("views/common-header.vsl")
 
     <div class="row">
-<div class="span9">
+<div class="col-md-9">
 <h1>Namespaces</h1>
 
 ## output other nodes
@@ -26,7 +26,7 @@
     #end
 </div>
 
-<div class="span3">
+<div class="col-md-9">
     <form id="action_register_namespace">
         <h3>Register Namespace</h3>
         <label>

diff --git a/fcrepo-http-api/src/main/resources/views/jcr-workspaces.vsl b/fcrepo-http-api/src/main/resources/views/jcr-workspaces.vsl
@@ -14,7 +14,7 @@
     #parse("views/common-header.vsl")
 
     <div class="row">
-<div class="span9">
+<div class="col-md-9">
 <h1>Workspaces</h1>
 
 ## output other nodes

diff --git a/fcrepo-http-api/src/main/resources/views/mode-root.vsl b/fcrepo-http-api/src/main/resources/views/mode-root.vsl
@@ -17,7 +17,7 @@
     #parse("views/common-node-header.vsl")
 
     <div class="row">
-        <div class="span9">
+        <div class="col-md-9">
 
             #parse("views/common-breadcrumb.vsl")
             #parse("views/common-metadata.vsl")
@@ -42,7 +42,7 @@
 
         </div>
 
-        <div class="span3">
+        <div class="col-md-3">
         ## output actions
     <div class="actions">
         #parse("views/common-node-actions.vsl")

diff --git a/fcrepo-http-api/src/main/resources/views/node.vsl b/fcrepo-http-api/src/main/resources/views/node.vsl
@@ -16,7 +16,7 @@
 
 
     <div class="row">
-        <div class="span9">
+        <div class="col-md-9">
 
 
             #parse("views/common-breadcrumb.vsl")
@@ -42,7 +42,7 @@
             #end
         </div>
 
-        <div class="span3">
+        <div class="col-md-3">
         ## output actions
             <div class="actions">
                 #parse("views/common-node-actions.vsl")

diff --git a/fcrepo-http-api/src/main/resources/views/nt-file.vsl b/fcrepo-http-api/src/main/resources/views/nt-file.vsl
@@ -15,7 +15,7 @@
     #parse("views/common-node-header.vsl")
 
     <div class="row">
-        <div class="span9">
+        <div class="col-md-9">
 
 
             #parse("views/common-breadcrumb.vsl")
@@ -46,7 +46,7 @@
             #end
         </div>
 
-        <div class="span3">
+        <div class="col-md-3">
         ## output actions
     ## output actions
     <div class="actions">

diff --git a/fcrepo-http-api/src/main/resources/views/nt-resource.vsl b/fcrepo-http-api/src/main/resources/views/nt-resource.vsl
@@ -16,7 +16,7 @@
 
 
     <div class="row">
-        <div class="span9">
+        <div class="col-md-9">
 
 
             #parse("views/common-breadcrumb.vsl")
@@ -41,7 +41,7 @@
             #end
         </div>
 
-        <div class="span3">
+        <div class="col-md-3">
         ## output actions
         #parse("views/common-node-actions.vsl")
         </div>

diff --git a/fcrepo-http-api/src/main/resources/views/search-form.vsl b/fcrepo-http-api/src/main/resources/views/search-form.vsl
@@ -15,7 +15,7 @@
 
 ## output actions
 <div class="actions">
-    <form class="form-search" method="GET">
+    <form class="form-search" method="GET" role="search">
         <div class="input-append">
             <input class="search-query" type="text" name="q" />
             <button type="submit" class="btn">Search</button>