]> git.quilime.com - plog.git/commitdiff
Editing working.
authorGabriel Dunne <gdunne@quilime.com>
Sat, 8 Sep 2012 02:14:29 +0000 (19:14 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Sat, 8 Sep 2012 02:14:29 +0000 (19:14 -0700)
14 files changed:
content/studio/config [changed mode: 0644->0755]
data/content/data.json
lib/model.php
pages/about [changed mode: 0644->0755]
pages/bio [changed mode: 0644->0755]
pages/contact [changed mode: 0644->0755]
pages/cv [changed mode: 0644->0755]
pages/links [changed mode: 0644->0755]
pages/links1 [changed mode: 0644->0755]
pages/photo [changed mode: 0644->0755]
pages/tag [changed mode: 0644->0755]
pages/test [changed mode: 0644->0755]
templates/default.html.tpl
templates/page.html.tpl

old mode 100644 (file)
new mode 100755 (executable)
index f33aa2d..6961c44
@@ -1,2 +1,4 @@
---
-Studio
+title = studio\r
+--\r
+Studio\r
+\r
index 8ca625c63592ba61754500e3bab241bc4ec9731d..783ffad99a2d191d5dcd1c19da8947347d80b2b2 100644 (file)
@@ -1 +1 @@
-{"entries":[{"config":{"date":"feb 20 2012","title":"temple","tags":"photo"},"title":"temple","filename":"temple","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/temple","fileInfo":{},"timestamp":"1329724800","tags":["photo"],"content":"<p><a href=\"http:\/\/www.flickr.com\/photos\/quilime\/6914577153\/sizes\/z\/in\/photostream\/\">\n    <img src=\"http:\/\/farm8.staticflickr.com\/7053\/6914577153_4c2b7d8a1a_z.jpg\">\n<\/a><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/temple\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/temple\/","thumb":"media\/\/og\/temple\/thumb.png","url":"\/og\/temple"},{"config":{"title":"Water Is Life","date":"Oct 23 2011 06:04:38 PM","tags":"water photo"},"title":"Water Is Life","filename":"water_is_life","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/water_is_life","fileInfo":{},"timestamp":"1319418278","tags":["water","photo"],"content":"<p><a href=\"http:\/\/www.flickr.com\/photos\/quilime\/6266458764\/sizes\/l\/in\/photostream\/\"><img src=\"http:\/\/farm7.staticflickr.com\/6034\/6266458764_6f71bd0a7e_z.jpg\"><\/a><\/p>\n\n<p>near Quotar Minar in Dadabari.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/water_is_life\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/water_is_life\/","thumb":"media\/\/og\/water_is_life\/thumb.png","url":"\/og\/water_is_life"},{"config":{"title":"islands","date":"Oct 05 2011, 03:53:55 PM","tags":"writing quote"},"title":"islands","filename":"islands","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/islands","fileInfo":{},"timestamp":"1317855235","tags":["writing","quote"],"content":"<blockquote>\n  <p>Imagine that every man's mind is an island, surrounded by ocean. Each seems isolated, yet in reality all are linked by the bedrock from which they spring. If the ocean were to vanish, that would be the end of the islands. They would all be part of one continent, but their individuality would be gone.<\/p>\n  \n  <p>&mdash;\"The Inspector\" Overlord. <u>Childhoods End<\/u>, Arthur C. Clark. p.176<\/p>\n<\/blockquote>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/islands\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/islands\/","thumb":"media\/\/og\/islands\/thumb.png","url":"\/og\/islands"},{"config":{"title":"childhoods end","date":"Oct 05 2011, 03:17:57 PM","tags":"india quote"},"title":"childhoods end","filename":"overlords","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/overlords","fileInfo":{},"timestamp":"1317853077","tags":["india","quote"],"content":"<blockquote>\n  <p>The case of India is particularly instructive. The main difference between us and the British in India was that they had no real motives for going there&mdash;no conscious objectives, that is, except such trivial and temporary ones as trade or hostility to other European powers. They found themselves possessors of an empire before they knew what to do with it, and were never really happy until they had got rid of it again.<\/p>\n  \n  <p>&mdash;\"The Inspector\" Overlord. <u>Childhoods End<\/u>, Arthur C. Clark. p.161<\/p>\n<\/blockquote>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/overlords\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/overlords\/","thumb":"media\/\/og\/overlords\/thumb.png","url":"\/og\/overlords"},{"config":{"title":"prism","date":"2007-08-23","thumb":"http:\/\/portfolio.quilime.com\/2008\/prism\/thumb.png","tags":"prism painting"},"title":"prism","filename":"prism","path":"\/Users\/gdunne\/_code\/plog\/content\/projects\/prism","fileInfo":{},"timestamp":"1187852400","tags":["prism","painting"],"content":"<p><img src=\"http:\/\/portfolio.quilime.com\/2008\/prism\/3.jpg\" \/><\/p>\n\n<p>oil on canvas. 4' x 3'<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/projects\/prism\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"rojects","url":"projects\/"},"media":"media\/\/rojects\/prism\/","thumb":"http:\/\/portfolio.quilime.com\/2008\/prism\/thumb.png","url":"\/rojects\/prism"},{"config":{"title":"mask","date":"2007-07-02","thumb":"http:\/\/portfolio.quilime.com\/2008\/mask\/thumb.png","tags":"mask painting"},"title":"mask","filename":"mask","path":"\/Users\/gdunne\/_code\/plog\/content\/projects\/mask","fileInfo":{},"timestamp":"1183359600","tags":["mask","painting"],"content":"<p><img src=\"http:\/\/portfolio.quilime.com\/2008\/mask\/mask.jpg\" \/><\/p>\n\n<p>graphite on plywood. 12\" x 12\"<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/projects\/mask\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"rojects","url":"projects\/"},"media":"media\/\/rojects\/mask\/","thumb":"http:\/\/portfolio.quilime.com\/2008\/mask\/thumb.png","url":"\/rojects\/mask"}]}
\ No newline at end of file
+{"entries":[{"config":{"date":"feb 20 2012","title":"temple","tags":"photo"},"title":"temple","filename":"temple","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/temple","fileInfo":{},"timestamp":"1329724800","tags":["photo"],"content":"<p><a href=\"http:\/\/www.flickr.com\/photos\/quilime\/6914577153\/sizes\/z\/in\/photostream\/\">\n    <img src=\"http:\/\/farm8.staticflickr.com\/7053\/6914577153_4c2b7d8a1a_z.jpg\">\n<\/a><\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/temple\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/temple\/","thumb":"media\/\/og\/temple\/thumb.png","url":"\/og\/temple"},{"config":{"title":"Water Is Life","date":"Oct 23 2011 06:04:38 PM","tags":"water photo"},"title":"Water Is Life","filename":"water_is_life","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/water_is_life","fileInfo":{},"timestamp":"1319418278","tags":["water","photo"],"content":"<p><a href=\"http:\/\/www.flickr.com\/photos\/quilime\/6266458764\/sizes\/l\/in\/photostream\/\"><img src=\"http:\/\/farm7.staticflickr.com\/6034\/6266458764_6f71bd0a7e_z.jpg\"><\/a><\/p>\n\n<p>near Quotar Minar in Dadabari.<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/water_is_life\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/water_is_life\/","thumb":"media\/\/og\/water_is_life\/thumb.png","url":"\/og\/water_is_life"},{"config":{"title":"islands","date":"Oct 05 2011, 03:53:55 PM","tags":"writing quote"},"title":"islands","filename":"islands","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/islands","fileInfo":{},"timestamp":"1317855235","tags":["writing","quote"],"content":"<blockquote>\n  <p>Imagine that every man's mind is an island, surrounded by ocean. Each seems isolated, yet in reality all are linked by the bedrock from which they spring. If the ocean were to vanish, that would be the end of the islands. They would all be part of one continent, but their individuality would be gone.<\/p>\n  \n  <p>&mdash;\"The Inspector\" Overlord. <u>Childhoods End<\/u>, Arthur C. Clark. p.176<\/p>\n<\/blockquote>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/islands\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/islands\/","thumb":"media\/\/og\/islands\/thumb.png","url":"\/og\/islands"},{"config":{"title":"childhoods end","date":"Oct 05 2011, 03:17:57 PM","tags":"india quote"},"title":"childhoods end","filename":"overlords","path":"\/Users\/gdunne\/_code\/plog\/content\/log\/overlords","fileInfo":{},"timestamp":"1317853077","tags":["india","quote"],"content":"<blockquote>\n  <p>The case of India is particularly instructive. The main difference between us and the British in India was that they had no real motives for going there\u2014no conscious objectives, that is, except such trivial and temporary ones as trade or hostility to other European powers. They found themselves possessors of an empire before they knew what to do with it, and were never really happy until they had got rid of it again.<\/p>\n  \n  <p>\u2014\"The Inspector\" Overlord. <u>Childhoods End<\/u>, Arthur C. Clark. p.161<\/p>\n<\/blockquote>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/log\/overlords\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"og","url":"log\/"},"media":"media\/\/og\/overlords\/","thumb":"media\/\/og\/overlords\/thumb.png","url":"\/og\/overlords"},{"config":{"title":"prism","date":"2007-08-23","thumb":"http:\/\/portfolio.quilime.com\/2008\/prism\/thumb.png","tags":"prism painting"},"title":"prism","filename":"prism","path":"\/Users\/gdunne\/_code\/plog\/content\/projects\/prism","fileInfo":{},"timestamp":"1187852400","tags":["prism","painting"],"content":"<p><img src=\"http:\/\/portfolio.quilime.com\/2008\/prism\/3.jpg\" \/><\/p>\n\n<p>oil on canvas. 4' x 3'<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/projects\/prism\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"rojects","url":"projects\/"},"media":"media\/\/rojects\/prism\/","thumb":"http:\/\/portfolio.quilime.com\/2008\/prism\/thumb.png","url":"\/rojects\/prism"},{"config":{"title":"mask","date":"2007-07-02","thumb":"http:\/\/portfolio.quilime.com\/2008\/mask\/thumb.png","tags":"mask painting"},"title":"mask","filename":"mask","path":"\/Users\/gdunne\/_code\/plog\/content\/projects\/mask","fileInfo":{},"timestamp":"1183359600","tags":["mask","painting"],"content":"<p><img src=\"http:\/\/portfolio.quilime.com\/2008\/mask\/mask.jpg\" \/><\/p>\n\n<p>graphite on plywood. 12\" x 12\"<\/p>\n","comments_enabled":false,"comments":{"comments":[],"comments_loc":"\/Users\/gdunne\/_code\/plogcomments\/\/Users\/gdunne\/_code\/plog\/content\/projects\/mask\/","fileInfo":{},"_recaptcha_resp":null,"_recaptcha_error":null,"_comment_error":null},"cat":{"name":"rojects","url":"projects\/"},"media":"media\/\/rojects\/mask\/","thumb":"http:\/\/portfolio.quilime.com\/2008\/mask\/thumb.png","url":"\/rojects\/mask"}]}
\ No newline at end of file
index a3c862a4ace4520538d0ab92b6d03b95e5cac507..d2ced5b2add0b8a71d62325632b3f3e50aa27bcf 100644 (file)
@@ -146,6 +146,8 @@ class Model
        {
                if ($this->is_page())
                        return rtrim(join(array( LOCAL_ROOT, PAGE_DIR, $this->request['path'] ), '/' ), '/');
+               else if ($this->is_multiple()) 
+                       return rtrim(join(array( LOCAL_ROOT, CONTENT_DIR, $this->request['path'], CONFIG_FILE ), '/' ), '/');
                else 
                        return rtrim(join(array( LOCAL_ROOT, CONTENT_DIR, $this->request['path'] ), '/' ), '/');
        }
old mode 100644 (file)
new mode 100755 (executable)
index 3999a3b..bf03865
@@ -1,3 +1,3 @@
-title = about
---
-Born, lives, and works in the San Francisco Bay Area
+title = about\r
+--\r
+Born, lives, and works in the San Francisco Bay Area
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index 6914b61..0441ec7
@@ -1,29 +1,28 @@
-title = links
---
-
-+   [quilime.com](http://quilime.com) process blog  
-+   [ssherriff.com](http://ssherriff.com) stephanie sherriff
-+   [onecm.com](http://onecm.com) ryan alexander
-+   [ripevessel.com](http://ripevessel.com) adam roth
-+   [jtnimoy.net](http://jtnimoy.net) joshua nimoy
-+   [oddsympathy.com](http://oddsympathy.com) daniel massey
-+   [carbonworkshop.com](http://carbonworkshop.com) gustavo huber &amp; shelly brown
-+   [keithpasko.com](http://keithpasko.com) keith pasko
-+   [dabkitsch.com/jml/](http://dabkitsch.com/jml/) jeff lubow
-+   [ghost-hack.com](http://ghost-hack.com) michael chang
-+   [flight404.com](http://flight404.com) robert hodgin
-+   [pohflepp.com](http://pohflepp.com) sascha pohflep
-+   [mylinhtrieu.com](http://mylinhtrieu.com) mylinh ttieu nguyen
-+   [fredericeyl.de](http://fredericeyl.de) frédéric eyl 
-+   [thegreeneyl.com](http://thegreeneyl.com) the green eyl 
-+   [universaloscillation.com](http://universaloscillation.com) aaron meyers
-+   [aaronkoblin.com](http://aaronkoblin.com) aaron koblin
-+   [tom-carden.co.uk](http://tom-carden.co.uk) tom carden
-+   [mike.teczno.co](http://mike.teczno.com) michal migurski
-+   [davidrager.org](http://davidrager.org) david rager
-+   [digitanalog.net](http://digitanalog.net) marc nimoy 
-+   [makaga.com](http://makaga.com) matthew gale 
-+   [reas.com](http://rea.com/) casey reas  
-+   [n-e-r-v-o-u-s.com](http://n-e-r-v-o-u-s.com/) nervous system 
-+   [gaffta.org](http://gaffta.org) gray area foundation for the arts (GAFFTA)
-+   [bavc.org](http://bavc.org) bay area video coalition (BAVC)
+title = links\r
+--\r
++   [quilime.com](http://quilime.com) process blog  \r
++   [ssherriff.com](http://ssherriff.com) stephanie sherriff\r
++   [onecm.com](http://onecm.com) ryan alexander\r
++   [ripevessel.com](http://ripevessel.com) adam roth\r
++   [jtnimoy.net](http://jtnimoy.net) joshua nimoy\r
++   [oddsympathy.com](http://oddsympathy.com) daniel massey\r
++   [carbonworkshop.com](http://carbonworkshop.com) gustavo huber & shelly brown\r
++   [keithpasko.com](http://keithpasko.com) keith pasko\r
++   [dabkitsch.com/jml/](http://dabkitsch.com/jml/) jeff lubow\r
++   [ghost-hack.com](http://ghost-hack.com) michael chang\r
++   [flight404.com](http://flight404.com) robert hodgin\r
++   [pohflepp.com](http://pohflepp.com) sascha pohflep\r
++   [mylinhtrieu.com](http://mylinhtrieu.com) mylinh ttieu nguyen\r
++   [fredericeyl.de](http://fredericeyl.de) frédéric eyl \r
++   [thegreeneyl.com](http://thegreeneyl.com) the green eyl \r
++   [universaloscillation.com](http://universaloscillation.com) aaron meyers\r
++   [aaronkoblin.com](http://aaronkoblin.com) aaron koblin\r
++   [tom-carden.co.uk](http://tom-carden.co.uk) tom carden\r
++   [mike.teczno.co](http://mike.teczno.com) michal migurski\r
++   [davidrager.org](http://davidrager.org) david rager\r
++   [digitanalog.net](http://digitanalog.net) marc nimoy \r
++   [makaga.com](http://makaga.com) matthew gale \r
++   [reas.com](http://rea.com/) casey reas  \r
++   [n-e-r-v-o-u-s.com](http://n-e-r-v-o-u-s.com/) nervous system \r
++   [gaffta.org](http://gaffta.org) gray area foundation for the arts (GAFFTA)\r
++   [bavc.org](http://bavc.org) bay area video coalition (BAVC)
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index 97ec6ecca17addeb940c17566359735e03eec14c..a54988e21f9b9eab5b03c407e5bc538ed2a2c53b 100644 (file)
 
     <? $this->include_template('nav.html.tpl') ?>
 
+<? if ($is_edit) $this->include_template('edit.html.tpl'); ?>
+
 <div id="content">
+    <? if (isset($entry->content)): ?>
+        <? eval('?>' . $entry->content); ?>
+        <? if (EDIT) : ?>
+        <a href="<?=WEB_ROOT?>edit/<?=$entry->url?>">edit</a>
+        <? endif; ?>
+    <? endif; ?>
 
     <? $entry = 0; foreach($entries as $entry): ?>
     <div class="entry">
index 4458cafeb00d05a9514a2c97a0a45af6fcb4a436..7dfa9fefc2349cf473fe2dd4856b5140359f5fd0 100644 (file)
 
     <? $this->include_template('nav.html.tpl') ?>
 
+<? if ($is_edit) $this->include_template('edit.html.tpl'); ?>
+
 <div id="content" class="page">
     
     <? eval('?>' . $entry->content); ?>
 
+<? if (EDIT) : ?>
+<a href="<?=WEB_ROOT?>edit/<?=$entry->filename?>">edit</a>
+<? endif; ?>
+
+
 </div>
 
     <? $this->include_template('footer.html.tpl') ?>