Cleaning up index.

diff --git a/css/style.css b/css/style.css
index c3cc13c0405fbe3d054cdfb9d1d0aaf16d366702..edef4b4719c5727817875f2ca80e0ffa016dc53a 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -106,12 +106,11 @@ table, td, tr {
 #content {
   /*display:none;*/
   padding-bottom: 20px;
-  position:absolute;
-  top:13em;
   padding-top:0;
 }
 #content.single {
   margin-left:200px;  
+  max-width:800px;
 }
 
 #nextprev {
@@ -247,8 +246,15 @@ margin-bottom:0.2em;
   margin-bottom:0.25em;
   /*margin-bottom:0.3em;*/
 }
+.entries.projects.index li {
+  width:inherit;
+  height:auto;
+}
+.entries.projects.index .thumb {
+  max-width:400px;
+  max-height:400px;
+}
 .entries.projects.index li strong {
-  display:none;
 }
 .entries.projects.index li:hover strong {
   display:inherit;

diff --git a/lib/data.php b/lib/data.php
index 61ac270fc44fa2e8ed1634018b25cf002d2de577..7034b83ae1eb9674fd8b306015460bf7e423acf9 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -311,6 +311,7 @@ function parse_entry($fileInfo, $page = false)
 
     $file['content'] = Markdown($content);
 
+    $file['content_short'] = null;
     if ($passed_more)
         $file['content_short'] = Markdown($content_short);
 

diff --git a/pages/bio b/pages/bio
index 539d4d6b8b6e00277ede713c0d75a25fb7e59930..eda45bf82dcf105eeab14cd0cdd26a9d982b0d49 100755 (executable)
--- a/pages/bio
+++ b/pages/bio
@@ -14,8 +14,6 @@ He is a designer and consultant for international clients and collaborators, and
 \r
 \r
 ###### contact\r
-1242 Market St, FL 2  \r
-San Francisco, CA 94102  \r
 [email](mailto:studio@gabrieldunne.com)  \r
 [blog](http://quilime.com)  \r
 <br />\r

diff --git a/templates/footer.html.tpl b/templates/footer.html.tpl
index 955eb29b3ada8ae29c60181b723116174f6c1bc5..8e4e42ce74390a6fc73c7875ed9bcedacecff737 100644 (file)
--- a/templates/footer.html.tpl
+++ b/templates/footer.html.tpl
@@ -1,7 +1,16 @@
 
 <!-- footer -->
-
-
 <script src="<?=get_base_dir();?>/js/jquery-1.9.1.min.js"></script> 
-<script src="<?=get_base_dir();?>/js/jquery.masonry.js"></script>
 <script src="<?=get_base_dir();?>/js/js.js"></script>
+
+
+  
+  <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+
+  <script>
+
+  $(function() {
+    $( "ul.entries li" ).draggable();
+  });
+
+  </script>
\ No newline at end of file

diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index 8298d64dd7b11d6a30220c038c7e52c4ed029c98..90cbd5b872fbda83edc3ea34137a761852573b1e 100644 (file)
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -11,21 +11,26 @@
     <ul class="entries index projects <?=isset($tag)&&$tag!==""?'tagged':''; ?> <? if ($entry->config->show_featured && !isset($tag)): ?>featured<? endif;?>">
     <? foreach($entries as $entry): ?>
         <li class="<?=$entry->cat->name?>">
+            <!-- style="<?=$entry->config->style?>" -->
+
+
             <a href="<?=$entry->url;?>">
                 <img src="<?=$entry->thumb?>" class="thumb" />
                 <br />
                 <strong><?=$entry->title;?></strong>
-                </a>
-                <? if (!isset($entry->config->show_featured) && isset($tag)): ?>
-                 <br />
-                &mdash;
-                <br />
-                <ul class="tags">
-                    <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
-                        <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
-                    <? endfor; ?>
-                </ul>
-                <? endif ;?>
+            </a>
+
+            <? if (!isset($entry->config->show_featured) && isset($tag)): ?>
+             <br />
+            &mdash;
+            <br />
+            <ul class="tags">
+                <? for($i = 0; $i < sizeof($entry->tags); $i++) : $tag = $entry->tags[$i]; ?>
+                    <li class="tag"><a href="<?=WEB_ROOT.'tag/'.$tag?>"><?=$tag?></a></li>
+                <? endfor; ?>
+            </ul>
+            <? endif ;?>
+            
         </li>
     <? endforeach; ?>
     </ul>

diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 5bf408beb289475e1d29b6b44dcd3ef17493fd1a..0f0b1e13be30f758c411b761e70a239a94036443 100644 (file)
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -17,7 +17,7 @@
         <? eval('?>' . $entry->content); ?>
     <? endif; ?>
 
-    <!--        
+    <!--   
     <ul>
     <? foreach($entries as $entry): ?>
         <li class="entry <?=$entry->cat->name?>">