]> git.quilime.com - plog_bk.git/commitdiff
cleanup for main site gd
authorGabriel Dunne <quilime@monkey.dreamhost.com>
Wed, 27 Jan 2010 05:10:57 +0000 (21:10 -0800)
committerGabriel Dunne <quilime@monkey.dreamhost.com>
Wed, 27 Jan 2010 05:10:57 +0000 (21:10 -0800)
20 files changed:
.gitignore
css/style.css
lib/config
pages/404.html [moved from t/404.html with 100% similarity]
pages/about.html [new file with mode: 0644]
pages/agg.html [moved from t/agg.html with 100% similarity]
pages/code.html [moved from t/code.html with 100% similarity]
pages/cv.html [new file with mode: 0644]
pages/header-src.html [moved from t/header-src.html with 100% similarity]
pages/img.html [moved from t/img.html with 100% similarity]
pages/index.html [moved from t/index.html with 71% similarity]
pages/links.html [new file with mode: 0644]
pages/log.html [moved from t/log.html with 100% similarity]
pages/nav.html [new file with mode: 0644]
pages/news.html [new file with mode: 0644]
pages/photo.html [moved from t/photo.html with 100% similarity]
pages/projects.html [moved from t/projects.html with 93% similarity]
t/about.html [deleted file]
t/links.html [deleted file]
t/nav.html [deleted file]

index f331b3b40e09cf11534af78282c9309746fa572a..f80d52b1f8f23683b08d3a26fb9947fae17640c5 100644 (file)
@@ -1,3 +1,3 @@
 c
-t
+#t
 /lib/config
\ No newline at end of file
index 5cd2c79c2429d5bed8d9bca310f03e8ef3c946d0..319b516e203bf6c7838814195a9b2846fa1e2d50 100644 (file)
@@ -7,10 +7,10 @@ html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; c
 ::selection {background: #08f !important; color:#fff;} 
 
 /*links*/
-a { color:#07e; border:0; text-decoration:none;  }
+a { color:#555; border:0; text-decoration:underline; background:#ffe;  }
 a img { border:0; }
 a.mute { color:#555; }
-a:hover, a.mute:hover { color:#fa4; background:#ffa;  text-decoration:none;  }
+a:hover, a.mute:hover { color:#e07; background:#ffa;  text-decoration:none;  }
 .caption a { color:#888;}
 .caption a:hover { color:#905;}
 
@@ -69,8 +69,9 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em;
     
 .nav { position:fixed; top:1em; left:1em; line-height:1.1em;}
 .nav ul { margin-left:1em; }
-.nav li a { background:#ffe; font-weight:bold; }
+.nav a { font-weight:bold; text-decoration:none; }
 .nav h3 { margin-bottom:0.4em; }
+.nav li.section { font-weight:bold; color:#bbb; padding-bottom:0.5em;}
 
     
 .caption { font-style:italic; margin-top:5px; color:#444; }
index d1f8cde577843a44ac5dd5cef38e1d6be44f0e5e..4b468c21adfe42efb74dce85615d723371e2eb33 100644 (file)
@@ -1,5 +1,5 @@
+SITE_TITLE = Gabriel Dunne
 LOCAL_ROOT = /home/quilime/gabrieldunne.com/
 CONTENT_DIR = c/
-TEMPLATE_DIR = t/
-SITE_TITLE = gabriel dunne
+TEMPLATE_DIR = pages/
 DELIM = /
similarity index 100%
rename from t/404.html
rename to pages/404.html
diff --git a/pages/about.html b/pages/about.html
new file mode 100644 (file)
index 0000000..523184a
--- /dev/null
@@ -0,0 +1,54 @@
+<html>
+
+<head>
+
+    <?php include_template('header-src.html'); ?>
+        
+    <title><?php echo SITE_TITLE ?>:about</title>
+    
+</head>
+
+<body>
+    
+    <?php include_template('nav.html'); ?>
+
+    <div id="content">
+        
+        <h1>About</h1>
+
+        <p>
+            Gabriel Dunne, b.1981, experiments with design and technology in 
+            the mediums of installation, architecture, industrial design, 
+            and audio/visual software. His pursuits insight the exploration 
+            of music and sound, structure,  life, and systems in the natural and technological world. 
+            His projects have been shown in internationally at conferences and 
+            exhibitions including New York MoMA, SIGGRAPH, Japan Media Arts Festival, 
+            Barcelona Festival Sonar, Interferenze Italia, and numerous publications. 
+        </p>
+        <p>
+            San Francisco native, currently lives/works in San Francisco.
+        </p>
+        
+        <h2>contact</h2>
+        <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#115;&#x74;&#117;&#x64;&#105;&#111;&#64;&#x67;&#x61;&#x62;&#114;&#105;&#x65;&#x6c;&#x64;&#x75;&#110;&#110;&#x65;&#46;&#99;&#x6f;&#x6d;">&#115;&#x74;&#117;&#x64;&#105;&#111;&#64;&#x67;&#x61;&#x62;&#114;&#105;&#x65;&#x6c;&#x64;&#x75;&#110;&#110;&#x65;&#46;&#99;&#x6f;&#x6d;</a>
+        <br/>
+        +1 415 493 8496
+        <br/>
+        <br/>        
+        <br/>          
+        
+       &copy; 1997&mdash;<?= date('Y'); ?>
+       
+        <p>
+            website source code is available <a href="http://git.quilime.com/?p=plog.git;a=tree">here</a>
+        </p>           
+       
+       
+       
+       
+
+    </div>
+    
+</body>
+
+</html>
\ No newline at end of file
similarity index 100%
rename from t/agg.html
rename to pages/agg.html
similarity index 100%
rename from t/code.html
rename to pages/code.html
diff --git a/pages/cv.html b/pages/cv.html
new file mode 100644 (file)
index 0000000..f82cddd
--- /dev/null
@@ -0,0 +1,120 @@
+<html>
+
+<head>
+
+    <?php include_template('header-src.html'); ?>
+    
+    <title><?php echo SITE_TITLE ?>:c/v</title>
+    
+    <style>
+        small { color:#aaa; font-weight:bold;  }
+    </style>
+    
+</head>
+
+<body>
+
+    
+    <?php include_template('nav.html'); ?>
+
+    <div id="content">
+
+       <h1>gabriel gunne</h1>
+       
+       <p>b. 1981, San Francisco</p>
+
+    <br/><br/>
+
+<h3>cv</h3>
+Gray Area</br>
+Tessellated Group</br>
+Stamen Design</br>
+Google, Inc</br>
+Motion Theory
+
+<br/><br/><br/>
+
+<h3>edu</h3>
+2004 B.A. Design | Media Arts, UCLA
+<br/>
+2002 Pont Avent School of Art, France
+<br/>
+1999 Architecture, Art, College of Marin
+
+<br/><br/><br/>
+
+<h3>selected exhibitions / conferences</h3>
+PROTOTYPE, Gray Area Foundation for the Arts, San Francisco<br/>
+Design and the Elastic Mind, MoMA NYC (w/Stamen Design. Permanent Collection)<br/>
+Interferenze: Naturalis Electronica, Valle Caudina, Italy <br/>
+Japan Media Arts Festival, Tokyo, Japan (collab.) <br/>
+Festival Sonar, Barcelona, Spain <br/>
+SIGGRAPH, Boston<br/>
+New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.)<br/>
+SIGGRAPH, Los Angeles<br/>
+:Output International Design Competition, Amsterdam, Netherlands <br/>
+CiberArt: International Festival of New Technologies, Bilbao, Spain <br/>
+Traffic, New Wight Gallery, UCLA, Los Angeles, CA (collab.) <br/>
+Sur(Face), Design Media Arts EDA, Los Angeles, CA <br/>
+Eyberrations Digital Film Festival, Irvine, CA<br/>
+Melbourne International Film Festival, Melbourne, Australia<br/>
+Experimental Works On Paper, Paris, France<br/>
+Experimental Works On Paper, Rennes, France<br/>
+Jaquez Gallery Collection, Pont Aven, France. Permanent  Collection.<br/>
+
+<br/><br/>
+
+<h3>talks</h3>
+Text + Architecture & Writing in Architecture, SCIARC, Los Angeles <br/>
+narr@tive: Digital Storytelling, Hammer Museum, Los Angeles<br/>
+
+<br/><br/>
+
+<h3>teaching</h3>
+Creative Coding w/Processing (Gray Area)</br>
+Programming and Design (UCLA student workshops)</br>
+Video, (UCLA student workshops)<br/>
+Processing (Makers Faire)<br/>
+Maya Workshop Series (UCLA)<br/>
+Typography Workshop Series (UCLA)<br/>
+Adobe Design Workshops (UCLA)<br/>
+Macromedia Design Student Workshops (UCLA)
+
+       
+<br/><br/><br/>
+  
+       
+<h3>publications</h3>
+MIT Aerospace Annual<br/>
+a minima #17<br/>
+Contemporary Art of Science and Technology<br/>
+AD: Architectural Digest</br>
+FOCUS Italia, May Issue<br/>
+Discover Magazine<br/>
+Wired<br/>
+HDRI<br/>
+
+<!--
+<h3>awards</h3>
+<small>2005</small><br/>
+Creative Review Best in Show  â€“ Beck â€˜Girl’ Music Video (w/Motion Theory)<br/>
+Type Directors Award â€“ Nike â€˜Golf’ (w/Motion Theory)<br/>
+<small>2004</small><br/>
+AIGA â€“ HP â€˜It Consolidates’ (w/Motion Theory)<br/>
+AICP â€“ HP â€˜Hands’ (w/Motion Theory)<br/>
+<small>2003</small><br/>
+Screen Network Australia<br/>
+<small>2002</small><br/>
+Shorttakes Film Festival<br/>
+
+
+<br/><br/><br/><br/>   
+-->
+
+
+</div>
+
+    
+</body>
+
+</html>
\ No newline at end of file
similarity index 100%
rename from t/header-src.html
rename to pages/header-src.html
similarity index 100%
rename from t/img.html
rename to pages/img.html
similarity index 71%
rename from t/index.html
rename to pages/index.html
index 400a5f71262773f5c1a026537c1837c889feae24..357f07cdd8992e9651d42765c0f248be1298ee97 100644 (file)
 
     <div id="content">
         <img src="http://farm3.static.flickr.com/2532/3928515140_e2ed67b1c7.jpg" />
-        
-        <p>
-        projects, process log, experiments, code, reference, inspiration, aggregate    
-        </p>
     </div>
 
 </body>
diff --git a/pages/links.html b/pages/links.html
new file mode 100644 (file)
index 0000000..9677934
--- /dev/null
@@ -0,0 +1,65 @@
+<html>
+
+<head>
+
+    <?php include_template('header-src.html'); ?>
+    
+    <title><?php echo SITE_TITLE ?> - links</title>
+    
+</head>
+
+<body>
+    
+    <?php include_template('nav.html'); ?>
+
+    <div id="content">
+
+        <?php
+        
+            function linklist($links)
+            { ?>
+                <?php foreach($links as $l) : ?>
+               <li><a href="<?php echo $l[0];?>"><?php echo $l[1];?></a></li>
+                <?php endforeach; ?>                
+            <?php 
+            }
+        
+            $people = array(
+
+                    array('http://ssherriff.com', 'Stephanie Sherriff'),                                        
+                    array('http://www.oddsympathy.com/', 'Daniel Massey'),
+                    array('http://onecm.com', 'Ryan Alexander'),      
+                    array('http://dabkitsch.com/jml', 'Jeff Lubow'),                                                                          
+                    array('http://pohflepp.com', 'sascha pohflepp'),
+                    array('http://jtnimoy.net', 'Joshua Nimoy'),                                        
+                    array('http://keithpasko.com', 'Keith Pasko'),                                                            
+                    array('http://fredericeyl.de', 'Frédéric Eyl'),
+                    array('http://ghost-hack.com', 'Michael Chang'),                                        
+                    array('http://aaronkoblin.com', 'Aaron Koblin'),
+                    array('http://mylinhtrieu.com', 'Mylinh Trieu'),                    
+                    array('http://renataraksha.com', 'Renata Raksha'),                                        
+                    array('http://universaloscillation.com', 'Aaron Meyers'),                                                                                
+                    array('http://tom-carden.co.uk', 'Tom Carden'),
+                    array('http://mike.teczno.com', 'Michal Migurski'),                                        
+                    array('http://ripevessel.com', 'Adam Roth'),
+                    array('http://cenizal.com', 'Cj Cenizal'),
+                    array('http://davidrager.org', 'David Rager'),
+                    array('http://digitanalog.net', 'Marc Nimoy'),
+                    array('http://makaga.com', 'Matthew Gale')
+                    );
+                    
+            $places = array(
+                array('http://www.thegreeneyl.com/', 'The Green Eyl'),                
+                array('http://gaffta.org', 'Gray Area')
+                );        
+        ?>
+        
+        <ul><?php linklist($people); ?></ul>
+        <br/>
+        <ul><?php linklist($places); ?></ul>        
+
+    </div>
+    
+</body>
+
+</html>
\ No newline at end of file
similarity index 100%
rename from t/log.html
rename to pages/log.html
diff --git a/pages/nav.html b/pages/nav.html
new file mode 100644 (file)
index 0000000..2a2b986
--- /dev/null
@@ -0,0 +1,31 @@
+<ul class="nav">          
+    
+    <h3>
+        <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong>
+    </h3>
+
+    <br/>
+    <br/>    
+
+    <li class="section">projects</li>
+    <?php 
+    list($projects_list, $total) = get_content('projects');    
+    foreach($projects_list as $project): 
+    ?>
+        <li>
+            <a href="<?php echo $project['href']?>"><? echo $project['title']; ?></a>
+        </li>
+    <? endforeach; ?>    
+
+    <br/>
+    <li><a href="/about/">About</a></li>        
+<!--
+    <li><a href="/img/">IMG</a></li>
+    <li><a href="/log/">Log</a></li>    
+    <li><a href="/links/">Links</a></li>
+    -->
+    
+    <br/>
+    
+    
+</ul>  
diff --git a/pages/news.html b/pages/news.html
new file mode 100644 (file)
index 0000000..1d14888
--- /dev/null
@@ -0,0 +1,66 @@
+<?php
+
+    $single = false;
+    
+    if (is_dir(CONTENT_DIR . $url_string) && !is_file(CONTENT_DIR . $url_string . '/config') ) {
+        list($log_list, $total) = get_content(basename($url_string), "type=flat");
+    }
+    else {
+        $config = parse_config(CONTENT_DIR . $url_string);
+        $log = $config;
+        $base_dir = $log['base_dir'];        
+        $single = true;        
+    }
+    
+    $list = isset($_GET['list']) ? $_GET['list'] : false;
+    
+?>
+<html>
+
+<head>
+
+    <?php include_template('header-src.html'); ?>
+        
+    <title>
+        <?php echo SITE_TITLE; ?><?php if ($single) : ?> - news: <?echo strtolower($log['title']); ?> [<?php echo date("Y M d", strtotime($log['date']));?>]<? else: ?> - news<? endif; ?></title>
+
+    <script src="/js/jquery-1.3.2.min.js"></script>
+
+</head>
+
+<body>
+    
+    <?php include_template('nav.html'); ?>
+
+    <div id="content">
+
+        <?php if ($single) : ?>
+
+               <h1><a href="/log/">log</a> / <?php echo $log['title']; ?> <small class="date"><?php echo date("M d Y", $log['timestamp']); ?></small></h1>    
+            
+            <div class="content">
+            <?php echo $log['inline_content']; ?>
+            </div>
+            
+        <?php else: ?>
+
+            <h1>news</h1>
+            
+            <ul class="inline_content log">
+            <?php foreach($log_list as $log): ?>
+                   <li>
+                       <strong>
+                   <?php echo date("M d Y", $log['timestamp']); ?>
+                       </strong>
+                    <?php echo $log['inline_content']; ?>
+                </li>
+            <? endforeach; ?>
+            </ul>
+            
+        <?php endif; ?>
+                
+    </div>
+    
+</body>
+
+</html>
\ No newline at end of file
similarity index 100%
rename from t/photo.html
rename to pages/photo.html
similarity index 93%
rename from t/projects.html
rename to pages/projects.html
index 88ccc04e836d5e71cc49513436b1a864f101293b..b46b457663964601dad0d05a934f9406480823e2 100644 (file)
@@ -31,7 +31,6 @@
 
         <?php if ($single) : ?>
 
-           <h1><a href="<?php echo get_base_dir(); ?>/projects">projects/</a> <?php echo $project['title']; ?></h1>
             <?php
                 $base_dir = $project['base_dir'];
                 include_once($project['content']);
diff --git a/t/about.html b/t/about.html
deleted file mode 100644 (file)
index 0ae4bbb..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-
-<head>
-
-    <?php include_template('header-src.html'); ?>
-        
-    <title><?php echo SITE_TITLE ?>:about</title>
-    
-</head>
-
-<body>
-    
-    <?php include_template('nav.html'); ?>
-
-    <div id="content">
-        
-        <h1>about</h1>
-
-        <p>
-            This website is a collection of experiments, code, images, sounds, reference, and aggregate.        
-        </p>
-        
-        <p>
-            <a href="<?=$base_dir?>/cv/">c/v</a>
-        </p>
-        
-        <h2>contact</h2>
-        email <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;">&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;</a>        
-        <br/>
-        phone +1 415 493 8496
-        
-        <br/>
-        <br/>        
-        <br/>          
-
-       &copy; 1997&mdash;<?= date('Y'); ?>
-       
-        <p>
-            This website source is based on a custom CMS written in PHP, the code of which is available <a href="http://git.quilime.com/?p=plog.git;a=summary">here</a>.
-        </p>
-       
-       
-       
-
-    </div>
-    
-</body>
-
-</html>
\ No newline at end of file
diff --git a/t/links.html b/t/links.html
deleted file mode 100644 (file)
index 8db231a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-
-<head>
-
-    <?php include_template('header-src.html'); ?>
-    
-    <title><?php echo SITE_TITLE ?> - links</title>
-    
-</head>
-
-<body>
-    
-    <?php include_template('nav.html'); ?>
-
-    <div id="content">
-
-        <?php
-        
-            function linklist($links)
-            { ?>
-                <?php foreach($links as $l) : ?>
-               <li><a href="<?php echo $l[0];?>"><?php echo $l[1];?></a></li>
-                <?php endforeach; ?>                
-            <?php 
-            }
-        
-            $people = array(
-
-                    array('http://onecm.com', 'ryan alexander'),                    
-                    array('http://ssherriff.com', 'stephanie sherriff'),                                        
-                    array('http://www.oddsympathy.com/', 'daniel massey'),
-                    array('http://pohflepp.com', 'sascha pohflepp'),
-                    array('http://dabkitsch.com/jml', 'jeff lubow'),                    
-                    array('http://jtnimoy.net', 'joshua nimoy'),                                        
-                    array('http://keithpasko.com', 'keith pasko'),                                                            
-                    array('http://fredericeyl.de', 'frédéric eyl'),
-                    array('http://ghost-hack.com', 'michael chang'),                                        
-                    array('http://aaronkoblin.com', 'aaron koblin'),
-                    array('http://mylinhtrieu.com', 'mylinh trieu'),                    
-                    array('http://renataraksha.com', 'renata raksha'),                                        
-                    array('http://universaloscillation.com', 'aaron meyers'),                                                                                
-
-                    array('http://tom-carden.co.uk', 'tom carden'),
-                    array('http://mike.teczno.com', 'michal migurski'),                                        
-
-                
-                    array('http://ripevessel.com', 'adam roth'),
-                    array('http://cenizal.com', 'cj cenizal'),
-                    array('http://davidrager.org', 'david rager'),
-                    array('http://digitanalog.net', 'marc nimoy'),
-                    array('http://makaga.com', 'matthew gale'),
-                    
-                    array(' ', '&nbsp;'),                    
-                                        
-                    array('http://www.thegreeneyl.com/', 'the green eyl'),
-                    array('http://gaffta.org/', 'gaffta')
-                    );
-        ?>
-        
-        <h1>links</h1>
-        <ul>
-            <?php linklist($people); ?>
-        </ul>
-
-    </div>
-    
-</body>
-
-</html>
\ No newline at end of file
diff --git a/t/nav.html b/t/nav.html
deleted file mode 100644 (file)
index 6ca2d67..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<ul class="nav">          
-    
-    <h3>
-        <strong><a class="mute" href="/"><?= SITE_TITLE ?></a></strong>
-    </h3>
-    <p>
-    projects, process
-    </p>
-
-    <br/>
-    <br/>    
-
-    <li><a href="/log/">log</a></li>    
-    <li><a href="/projects/">projects</a></li>
-    <li><a href="/img/">img</a></li>
-
-    <br/>
-    
-    <li><a href="/agg/">aggregate</a></li>
-    <li><a href="/links/">links</a></li>
-    <li><a href="/about/">about</a></li>    
-    
-    <br/>
-    
-    
-</ul>