From: Gabriel Dunne Date: Sat, 8 Sep 2012 02:14:29 +0000 (-0700) Subject: Editing working. X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=7e4a2a0f3ecfb76665e9d69aaa05ff54a192ac88;p=plog.git Editing working. --- diff --git a/content/studio/config b/content/studio/config old mode 100644 new mode 100755 index f33aa2d..6961c44 --- a/content/studio/config +++ b/content/studio/config @@ -1,2 +1,4 @@ --- -Studio +title = studio +-- +Studio + diff --git a/data/content/data.json b/data/content/data.json index 8ca625c..783ffad 100644 --- a/data/content/data.json +++ b/data/content/data.json @@ -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":"

\n \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":"

<\/a><\/p>\n\n

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":"

\n

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

—\"The Inspector\" Overlord. 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":"

\n

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—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

—\"The Inspector\" Overlord. 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>\n\n

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>\n\n

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":"

\n \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":"

<\/a><\/p>\n\n

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":"

\n

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

—\"The Inspector\" Overlord. 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":"

\n

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

\u2014\"The Inspector\" Overlord. 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>\n\n

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>\n\n

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 diff --git a/lib/model.php b/lib/model.php index a3c862a..d2ced5b 100644 --- a/lib/model.php +++ b/lib/model.php @@ -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'] ), '/' ), '/'); } diff --git a/pages/about b/pages/about old mode 100644 new mode 100755 index 3999a3b..bf03865 --- a/pages/about +++ b/pages/about @@ -1,3 +1,3 @@ -title = about --- -Born, lives, and works in the San Francisco Bay Area +title = about +-- +Born, lives, and works in the San Francisco Bay Area \ No newline at end of file diff --git a/pages/bio b/pages/bio old mode 100644 new mode 100755 diff --git a/pages/contact b/pages/contact old mode 100644 new mode 100755 diff --git a/pages/cv b/pages/cv old mode 100644 new mode 100755 diff --git a/pages/links b/pages/links old mode 100644 new mode 100755 diff --git a/pages/links1 b/pages/links1 old mode 100644 new mode 100755 index 6914b61..0441ec7 --- a/pages/links1 +++ b/pages/links1 @@ -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 & 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 +-- ++ [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 & 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) \ No newline at end of file diff --git a/pages/photo b/pages/photo old mode 100644 new mode 100755 diff --git a/pages/tag b/pages/tag old mode 100644 new mode 100755 diff --git a/pages/test b/pages/test old mode 100644 new mode 100755 diff --git a/templates/default.html.tpl b/templates/default.html.tpl index 97ec6ec..a54988e 100644 --- a/templates/default.html.tpl +++ b/templates/default.html.tpl @@ -10,7 +10,15 @@ include_template('nav.html.tpl') ?> +include_template('edit.html.tpl'); ?> +

+ content)): ?> + ' . $entry->content); ?> + + edit + +
diff --git a/templates/page.html.tpl b/templates/page.html.tpl index 4458caf..7dfa9fe 100644 --- a/templates/page.html.tpl +++ b/templates/page.html.tpl @@ -10,10 +10,17 @@ include_template('nav.html.tpl') ?> +include_template('edit.html.tpl'); ?> +
' . $entry->content); ?> + +edit + + +
include_template('footer.html.tpl') ?>