Merge branch 'dev' into live

[dylansserver.git] / index.php

diff --git a/index.php b/index.php
index b2b3be0..f9020b5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -10,13 +10,8 @@
 
   <title>dylanstestserver</title>
   <link href="includes/style.css" rel="stylesheet" type="text/css">
-  <link rel="icon" href="icon.png" type="image/png">
-  <script type="text/javascript" src="includes/jquery-core.js">
-</script>
-  <script type="text/javascript" src=
-  "includes/jquery-components.js">
-</script>
-  <script type="text/javascript" src="includes/tabs.js">
+  <link rel="icon" href="favicon.ico" type="image/png">
+  <script type="text/javascript" src="includes/all.js">
 </script>
 </head>
 
@@ -67,12 +62,33 @@
           "http://www.python.org/">python</a>.</span>
         </div>
 
+        <div class="tabs" id="i_like_pandora_">
+          <span class="i_like_pandora-entry-title"><a href=
+          "https://github.com/nospampleasemam/i_like_pandora">i_like_pandora</a></span><br>
+
+          <br>
+          <span class="i_like_pandora-entry"><br>
+          searches <a href="http://youtube.com">youtube</a> for
+          what you like on <a href=
+          "http://pandora.com">pandora</a>.<br>
+          <br>
+          then it downloads the first video.<br>
+          <br>
+          it's not <i>quite</i> done yet.<br>
+          <br>
+          <br>
+          the code is free (as in freedom), <a href=
+          "http://github.com/nospampleasemam/i_like_pandora">here</a>.<br>
+          </span>
+        </div>
+
         <div class="tabs" id="peepshow_">
-          <h3><i><a href=
-          "foxy-addons/peepshow">foxy-addons/</a></i></h3>
+          <h3><span class="peepshow-entry-title"><i><a href=
+          "foxy-addons/peepshow/peepshow.xpi">foxy-addons/</a></i></span></h3>
+
+          <h1><span class="peepshow-entry"><i><a href=
+          "foxy-addons/peepshow/peepshow.xpi">peepshow</a></i></span></h1><span class="i_like_pandora-entry"><br>
 
-          <h1><i><a href=
-          "foxy-addons/peepshow">peepshow</a></i></h1><br>
           <br>
           <br>
           <span class="peepshow_entry">a <a href=
@@ -82,7 +98,7 @@
           <br>
           here's the <a href=
           "http://github.com/nospampleasemam/peepshow/">repo</a>
-          for the source code.</span>
+          for the source code.</span></span>
         </div>
 
         <div class="tabs" id="drawcss_">
@@ -103,22 +119,17 @@
         </div>
 
         <div class="tabs" id="readoo_">
-          <span class="readoo_entry"><a href="readoo">readoo</a>
+          <span class="readoo_entry"><a href=
+          "http://github.com/nospampleasemam/readoo">readoo</a>
           helps you find search keywords to target.<br>
           <br>
           it reads your IIS logs, and finds successful keywords
           worth focusing on.<br>
           <br>
           it's not done yet! here's the <a href=
-          "github.com/nospampleasemam/READOO">source
+          "http://github.com/nospampleasemam/readoo">source
           code</a>.</span>
         </div><br>
-        <br>
-        <br>
-        <br>
-        <br>
-        <br>
-        <br>
       </div>
 
       <ul class="portfolio" style="text-align:right">
@@ -136,6 +147,11 @@
 
         <li style="list-style: none"><br></li>
 
+        <li class="project"><a class="exhibit" href=
+        "#i_like_pandora">i_like_pandora</a></li>
+
+        <li style="list-style: none"><br></li>
+
         <li class="project"><a class="exhibit" href=
         "#peepshow">foxy-addons/peepshow</a></li>
 
@@ -168,31 +184,31 @@
           <br>
           <br>
 
-          <h3>things i'm doing for others:</h3>
+          <h3>something i've worked on:</h3>
         </li>
 
         <li class="project"><a href=
-        "kjondesign/">kjondesign</a></li>
+        "http://tempositions.com">tempositions.com</a></li>
 
         <li style="list-style: none">
           <br>
           <br>
 
-          <h3>something i've worked on:</h3>
+          <h3>my github repo:</h3>
         </li>
 
         <li class="project"><a href=
-        "http://tempositions.com">tempositions.com</a></li>
+        "http://github.com/nospampleasemam">github@github.com:nospampleasemam</a></li>
 
         <li style="list-style: none">
           <br>
           <br>
 
-          <h3>my github repo:</h3>
+          <h3>my repo:</h3>
         </li>
 
-        <li class="project"><a href=
-        "http://github.com/nospampleasemam">github@github.com:nospampleasemam</a></li>
+        <li class="project">
+        git://dylanstestserver.com/project_name</li>
 
         <li style="list-style: none">
           <br>
@@ -200,7 +216,6 @@
           <br>
           <br>
           <br>
-          <br>
 
           <h1><a href="mailto:dylan@psu.edu">dylan</a></h1><a href=
           "mailto:dylan@psu.edu">@psu.edu</a>