more bootstrap integration, cleanup and some small bugfixes

[photo-tags.git] / index.php
diff --git a/index.php b/index.php

index 353a848b0972f7c6726d46f8abb1e06bd53f68e0..bb56f89cf31ae1b94a7e57d508c6fd66d04bc8f8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -42,12 +42,15 @@ function autoversion($file)
  
  /* The basic layout */
  ?>
-
+<!DOCTYPE html>
  <html>
+<head>
+<meta charset="utf-8">
  <title><?php echo htmlspecialchars($title) ?></title>
  <script src = "<?php echo $webbase.autoversion("/js/d3.min.js")?>"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/normalize.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/bootstrap.min.css")?>" />
  <link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/style.css")?>" />
+</head>
  
  <body>
  
@@ -55,22 +58,27 @@ function autoversion($file)
  <h1><?php echo htmlspecialchars($title) ?></h1>
  
  <nav>
-page <span class="index"></span>
-<button class="prev" type="button" disabled="disabled" onclick="prev_page()"> prev </button>
-<button class="next" type="button" onclick="next_page()">next </button>
-<button class="all"  type="submit" onclick="document.location.href='<?php echo $webbase?>'">all</button>
+
+<div class="pagination">
+  <ul>
+  </ul>
+</div>
+
  </nav>
  
+
  <div class="permalink"></div>
  
  <div class="tagsearch">
-<form method="get" action="">
- Search for tag: <input list="MyTags" id="MyTagsInput" type="text" value="" />
+<form class="form-search" method="get" action="">
+ <label>Search for tag:</label> <input class="input-medium search-query" list="MyTags" id="MyTagsInput" type="text" value="" />
    <datalist id="MyTags">
    </datalist>
+ <p> Current tags:<span id="currenttags"></span>
+  <button class="next btn btn-small btn-info" onclick="tagcloud()">tag cloud</button>
+  <a class="btn btn-small btn-success" href='<?php echo $webbase?>'>all</a>
+ </p>
  </form>
-  Current tags:<span id="currenttags"></span>
-  <button class="next" type="button" onclick="tagcloud()">tag cloud</button>
  </div>
  
  <div class="nextprev"> <ul></ul></div>
@@ -84,6 +92,8 @@ page <span class="index"></span>
  
  
  <script src = "<?php echo $webbase.autoversion("/js/photo-tags.js")?>"></script>
+<script src="http://code.jquery.com/jquery-latest.js"></script>
+<script src="js/bootstrap.min.js"></script>
  <script type="text/javascript" >
  
  /*hand parameters over to javascript*/