From: Gabriel Dunne Date: Tue, 10 May 2011 05:23:18 +0000 (-0700) Subject: merged in main branch changes X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=608b09962a0611990e5922b75262b87966e24365;p=plog.git merged in main branch changes --- 608b09962a0611990e5922b75262b87966e24365 diff --cc content/blog/2010/05/new _blog index 0000000,0000000..2f974f5 new file mode 100644 --- /dev/null +++ b/content/blog/2010/05/new _blog @@@ -1,0 -1,0 +1,4 @@@ ++title = Process [B]Log ++date = 2010-05-29 ++-- ++First post. diff --cc content/blog/2010/06/chapter_and_verse index 0000000,0000000..4ca11e3 new file mode 100644 --- /dev/null +++ b/content/blog/2010/06/chapter_and_verse @@@ -1,0 -1,0 +1,4 @@@ ++title = Chapter and Verse ++date = 2010-06-01 ++-- ++[Performing](http://www.biennialoftheamericas.org/artists/gabriel-dunne) a new audiovisual project **July 29th** in [Chapter and Verse](http://www.biennialoftheamericas.org/events/month/7/day/29) as part of "Nature of Things", for the Biennial of the Americas in Denver, CO. diff --cc content/blog/2010/06/icosi_rider index 0000000,0000000..14c95dd new file mode 100644 --- /dev/null +++ b/content/blog/2010/06/icosi_rider @@@ -1,0 -1,0 +1,9 @@@ ++title = ICOSI Tech Rider ++date = 2010-06-10 ++-- ++Tech rider developed for new project: ++ ++[![](/media/projects/icosi/rider_02_t.png)](/media/projects/icosi/rider_02.png)    ++[![](/media/projects/icosi/rider_01_t.png)](/media/projects/icosi/rider_01.png) ++ ++[pdf](http://media.quilime.com/files/projects/icosi/gdunne_rider_diag.pdf) diff --cc content/blog/2010/07/icosi index 0000000,f34e1f9..48f4de4 mode 000000,100644..100644 --- a/content/blog/2010/07/icosi +++ b/content/blog/2010/07/icosi @@@ -1,0 -1,16 +1,16 @@@ + tags = fabrication, construction, icosi, installation, design + title = icosi fabrication + date = 2010-07-01 + -- -Fabrication progress for an audiovisual installation. The form is a based on section of a squished icosidodecahedron (scaled on the z-axis by 0.5). The form will act as a projection surface for visual software, which will be produced after fabrication is complete. ++Fabrication process for ICOSI projection surface. The form is a section of an icosidodecahedron (scaled on the z-axis by 0.5). + + + +
+ A laser-cut a small working model. + +
+ Custom jig for slicing the angles. + +
+ Priming the panels, readying them to be stretched with screen-fabric. diff --cc content/blog/2010/07/icosi2 index 0000000,756e7b5..d09d23e mode 000000,100644..100644 --- a/content/blog/2010/07/icosi2 +++ b/content/blog/2010/07/icosi2 @@@ -1,0 -1,9 +1,9 @@@ + title = icosi fabrication 2 + date = 2010-07-07 + tags = icosi fabrication + -- + [![img](http://farm5.static.flickr.com/4140/4773799092_75e68e4e66.jpg)](http://www.flickr.com/photos/quilime/4773799092/) -Assembly test w/stretched panels in the studio. ++Assembly test w/stretched panels in the studio (just hanging). + + [![](http://farm5.static.flickr.com/4123/4773722288_dd579b9956.jpg)](http://www.flickr.com/photos/quilime/4773722288/in/photostream/) + Assembly test. diff --cc content/blog/2010/07/icosi_biennial index 0000000,a3ee9a4..9352f7f mode 000000,100644..100644 --- a/content/blog/2010/07/icosi_biennial +++ b/content/blog/2010/07/icosi_biennial @@@ -1,0 -1,20 +1,31 @@@ -title = denver biennial ++title = ICOSI + tags = perf install projection vis aud + notes = this might need to be split up into a few posts + date = 2010-07-29 + -- -![icosi](http://farm5.static.flickr.com/4110/4847387674_5419f0b672.jpg) + -Audiovisual installation. ++
++ ++
+ -The software and audio toolset was developed over three weeks leading up to the performance. The performance dramatically split my focus into two places (playing music, changing visuals), which was a juggle that I wasn't anticipating, as I was developing the visual software on one split-screen before the performance. Inspired to continue pursuing interfaces and controllers to overcome the separation of creating audio and visuals simultaneously. ++ ++*ICOSI* is an audio/visual sculptural performance which was shown at the Biennial of the Americas, Denver CO, 2010. ++ ++audio synthesis created with Ablton Live/Max/MSP, custom software (OPENGL, Processing). Custom surface fabrication ++dimensions: 230cm x 230 cm (7.9' x 7.9') ++ ++ ++The software and audio toolset was developed over three weeks leading up to the performance. The performance dramatically split my focus into two places (music and visuals), which was a juggle that I didn't fully anticipate as I was developing the visual software on one split-screen before the performance. Inspired to continue pursuing interfaces and controllers to overcome the separation of creating audio and visuals simultaneously. + + The multiple mediums (sculpture, sound, visual media) of this particular project was fascinating. Each iteration represents a process of my own curiosities in technology, consciousness, spirituality, design, and fabrication. + + The piece represents my practice and experiences in regards to my own spiritual growth and experience. Geometrically, the form is inspired by sacred polyhedra that represent forms of transition. The choice of an [icosidodecahedron](http://en.wikipedia.org/wiki/Icosidodecahedron) represents transition of two frequencies, represented by an [icosahedron](http://en.wikipedia.org/wiki/Icosahedron) and its dual polyhedron, a [dodecahedron](http://en.wikipedia.org/wiki/Dodecahedron). + + The form is composed of 7 panels trimmed and scaled from a full icosidodecahedron. The visuals follow the structure of the form nearly explicitly, with the exception of textural elements. + ++ ++ + -[more via flickr →](http://www.flickr.com/photos/quilime/sets/72157624499344281/with/4847387648/) ++[more photos via flickr →](http://www.flickr.com/photos/quilime/sets/72157624499344281/with/4847387648/) diff --cc content/blog/2010/10/seaquence index 0000000,0000000..4e015b8 new file mode 100644 --- /dev/null +++ b/content/blog/2010/10/seaquence @@@ -1,0 -1,0 +1,11 @@@ ++title = Seaquence ++tags = seaquence flash ++notes = this might need to be split up into a few posts ++date = 2010-10-04 ++-- ++ ++Alpha release of [Seaquence: A experimental web-based musical ecosystem](http://seaquence.org) created by Gabriel Dunne, Ryan Alexander and Daniel Massey. ++ ++[![seaquence.org](/projects/seaquence/seaq5.png)](http://seaquence.org) ++ ++[http://seaquence.org](http://seaquence.org) diff --cc content/blog/2010/11/milieux_sonores index 0000000,0000000..b5d16c2 new file mode 100644 --- /dev/null +++ b/content/blog/2010/11/milieux_sonores @@@ -1,0 -1,0 +1,17 @@@ ++title = Event: Audiovisual synthesis and projection mapped forms ++date = 2010-11-05 ++-- ++ ++![](http://farm5.static.flickr.com/4084/4847387746_7352d3a039_z.jpg) ++ ++Date/Time: 06 Nov 2010 from 7:00 PM to 11:00 PM ++Location: Gray Area Foundation for the Arts – 55 Taylor Street, San Francisco ++Performances by Gabriel Dunne & Jeff Lubow, and Gregory Zifcak ++ ++ ++Performances with audiovisual synthesis and projection mapped forms. ++ ++[Event Link](http://www.gaffta.org/2010/11/03/takes-on-sound-space-symposium-performances-this-saturday/) ++ ++ ++ diff --cc content/projects/a-project index 0000000,0000000..d32941f new file mode 100644 --- /dev/null +++ b/content/projects/a-project @@@ -1,0 -1,0 +1,6 @@@ ++title = project title ++featured = yes ++thumb = /projects/the-project/thumb.png ++desc = the project description ++-- ++the project diff --cc css/style.css index 9e8f7be,0000000..9d55def mode 100644,000000..100644 --- a/css/style.css +++ b/css/style.css @@@ -1,75 -1,0 +1,169 @@@ - body { margin:20px 100px 50px 30px; } +html, body, table { - font-family: serif; - font-size:16px; - line-height:1.4em; - color:#44d; - } - - - ::-moz-selection {background: #08f !important; color:#fff;} - ::selection {background: #08f !important; color:#fff;} - - a { color:#000; border:0; padding:0.2em 0.1em 0 0; } - a img { border:0; } - a.mute { text-decoration:none !important; font-weight:normal;} - a:hover, a.mute:hover { color:#d15; text-decoration:none; } - - h1, h2, h3, h4, h5, h6 { font-family:'Droid Serif'; font-size:1em; } - h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { } - h1 { margin:0 0 3em 0; } - h2 { margin:0 0 0.5em 0; } - h3 { margin:0 0 0 0; } - h4 { margin-top:0; } - - ul, li { margin:0; padding:0; list-style-type:none; } - ol { margin:0;} - ol li { list-style-type:decimal; } - - blockquote { font-family:times; background:#000; color:#aaa; - margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; line-height:1.45em; max-width:600px;} - - #content { padding-left:160px; min-width:500px; padding-bottom:200px; z-index:10; } - #content p:first-child { margin-top:0; } - p { max-width:720px; } - - - .nav { position:fixed; top:20px; left:20px; } - .nav a { text-decoration:none; font-weight:bold; } - .nav a.mute { font-weight:normal; } - .nav h1 { } - .index { padding:0; margin:0; } - .index li {line-height:1.1em; margin-bottom:0.4em; } - .index li a { text-decoration:underline; font-weight:normal; } - - .entry { margin-bottom:100px; } - .entry h2 { padding-bottom:4px; font-size:1.3em;} - .entry .metadata { font-style:italic; color:#bbb; } - .entry .metadata a { color:#999; } - .entry .metadata a:hover { color: #000;} - .entry .metadata .tags li { display:inline-block; margin-right:0.3em; } - - .more, .home { text-decoration:none; color:#000; font-weight:bold; } - - table { margin:0; padding:0; border:0; } - table .column { padding-right:100px; min-width:120px; max-width:400px; } - table .column h2 a { text-decoration:none; } - table h2, table h3 { margin-bottom:2em; } - table .video li, table .image li { margin-bottom:2em; } - table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; border-bottom:1px dotted #ddd; } - .reader_links li, .bookmark_links li { padding-top:.75em; margin-bottom:.75em; } - .bookmark_links li a { display:block; } - .bookmark_links li span { font-style: italic; color:#444; } - .image li a { background:none; } - - #footer { margin-top:120px; } - #footer .copy a { text-decoration:none; } - - a.rss { - background:url("/img/rss-icon.png") no-repeat scroll right center transparent; - padding:0 1.3em 0 0; - } - a.external { - background:url("/img/external-icon.png") no-repeat scroll right center transparent; - padding:0 1.3em 0 0; - } ++ background: none repeat scroll 0% 0% #1F1F1F; ++ color: #bbb; ++ font-family: Lekton, sans-serif; ++ font-size: 13px; ++ line-height: 1.5em; ++} ++ ++body { ++ margin: 30px auto; ++} ++ ++a { ++ border: 0pt none; ++ color: #5544FF; ++ padding: 0.2em 0pt; ++ text-decoration: none; ++} ++a img { ++ border: 0pt none; ++} ++a.mute { ++ text-decoration: none ! important; ++} ++a:hover, a.mute:hover { ++ color: #FFDDFF; ++} ++ ++p { ++ max-width:650px; ++ text-align:left; ++ margin:20px auto; ++} ++ ++strong { ++ color: #FFFFFF; ++} ++ ++h1, h2, h3, h4, h5, h6 { ++ font-family:Lekton, sans-serif; ++ color: #FFFFFF; ++ font-size: 16px; ++ font-weight: bold; ++} ++h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { ++ line-height: 2em; ++} ++h1 { ++ margin: 0pt 0pt 3em; ++} ++h2 { ++ margin: 0pt 0pt 0.5em; ++} ++h3 { ++ margin: 0pt; ++} ++ ++ ++ul, li { ++ list-style-type: none; ++ margin: 0pt; ++ padding: 0pt; ++} ++ ++ol li { ++ list-style-type: decimal; ++} ++ ++img { ++ margin-bottom: 0.25em; ++} ++ ++blockquote { ++ background: none repeat scroll 0% 0% #000000; ++ color: #AAAAAA; ++ font-family: times; ++ font-size: 15px; ++ font-style: italic; ++ line-height: 1.4em; ++ margin: 0pt; ++ max-width: 600px; ++ padding: 2em 4em; ++} ++ ++#nav { ++ font-family:Lekton, sans-serif; ++ font-size: 16px; ++ letter-spacing: 0.2em; ++ margin-bottom: 60px; ++ margin-left: 20px; ++ text-align:center; ++} ++#nav h1 { ++ margin:1em 0em; ++} ++.nav a { ++ border: 0pt none; ++ text-decoration: none; ++} ++.nav li { ++ display: inline-block; ++ margin: 0 2em; ++} ++ ++ ++#content { ++ padding: 0pt 20px; ++ text-align:center; ++} ++#content p:first-child { ++ margin-top: 0pt; ++} ++ ++ ++.projects { ++} ++.projects li { ++ display:inline-block; ++} ++.projects li a { ++ background: none repeat scroll 0% 0% #000000; ++ border: 0pt none; ++ display: block; ++ height: 160px; ++ width: 250px; ++} ++.projects li img { ++ height: 100%; ++ width: 100%; ++} ++.projects li a { ++ text-decoration: none; ++} ++ ++ ++ ++.entry { ++ margin-bottom: 150px; ++} ++.entry h2 { ++ margin-bottom:0; ++} ++.entry .title { ++ margin-bottom: 20px; ++} ++.entry .date { ++ color: #994455; ++ border-top:1px solid #333; ++ max-width:200px; ++ margin:0 auto; ++ font-size:12px; ++ padding-top:8px; ++} ++.entry .tags { ++ margin-top:10px; ++ color:#444; ++ font-size:12px; ++ font-style:italic; ++} ++.entry .tags li { ++ display: inline-block; ++} ++ ++ ++.caption { ++ color: #444444; ++ font-style: italic; ++ margin-top: 5px; ++} diff --cc index.php index ab1a99c,fbb2931..c45e7a9 --- a/index.php +++ b/index.php @@@ -12,15 -13,9 +12,17 @@@ $content_request = LOCAL_ROOT . CONTENT_DIR . $url['dirname'] . '/' . $url['filename']; $page_request = LOCAL_ROOT . PAGE_DIR . DIRECTORY_SEPARATOR . $url['filename']; + $total = 0; # content exists, and is a folder - if (is_dir($content_request)) { + + if ($url['filename'] == '') + { - $template = 'index.html.tpl'; ++ $page = parse_entry(new SplFileInfo($page_request.'index'), 1); ++ $t->assign('data', $page); ++ $template = 'page.' . $response_format . '.tpl'; + } + else if (is_dir($content_request)) { # get config in folder, if exists if (is_file($content_request . '/' . CONFIG_FILE )) { $config = parse_entry(new SplFileInfo($content_request . '/' . CONFIG_FILE)); diff --cc lib/data.php index 43110a2,6889caa..59d29f6 --- a/lib/data.php +++ b/lib/data.php @@@ -132,7 -132,6 +133,4 @@@ function parse_entry($fileInfo, $page $file['url'] = WEB_ROOT . ($page ? '' : substr($file['cat']['url'],1)) . $fileInfo->getFilename() . '/'; return $file; --} - -- --?> ++} diff --cc lib/init.php index 1ebcec8,7d82b77..d74d56e --- a/lib/init.php +++ b/lib/init.php @@@ -1,26 -1,24 +1,26 @@@ -'); - define ('TITLE_DELIMITER', ' — '); - define ('CONFIG_FILE', 'config'); - + define ('TITLE_DELIMITER', ': '); + define ('CONFIG_FILE', 'config'); + require_once 'data.php'; require_once 'output.php'; - require_once 'markdown.php'; - require_once 'template.php'; + require_once 'markdown.php'; + require_once 'template.php'; -?> + + //error_reporting(E_ALL); + //ini_set("display_errors", 1); - ++ diff --cc pages/about index 8b695ee,f0a5ee7..9a29f3f --- a/pages/about +++ b/pages/about @@@ -1,19 -1,17 +1,14 @@@ title = about +-- -This selection of work documents explorations of the visual, audible, and physical spectrum, including custom computer software and hardware, drawing influence from natural systems, structures, and rhythms of the perceivable and imperceivable universe. - -I have a passion for creativity and exploration and express it in many different ways. My work takes the form of small exploratory projects, public works, collaborations, software/hardware development, and industrial design and processes. I have contracted to collectives and companies worldwide. - -I am based in the San Francisco Bay Area. - -elsewhere: [quilime.com](http://quilime.com) - -quilime is a codification of creative process that I've kept since 1999. ++My work is an exploration of the visual, audible, and physical spectrum, drawing influence from natural systems, structures, and rhythms of the perceivable and imperceivable universe. - ABOUT - ----- --- ++I have a passion for creativity and exploration and express it in many different ways. My work takes the form of self-initiated explorations and experiments, public works, collaborations, software/hardware development, and industrial design and processes. - `plog` is a CMS written to codify process and resources, written in PHP - by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mailto:gdunne@quilime.com)) for [quilime.com](quilime.com) -A collection of my projects and process ranging from 1999 to current. ++I also publish [quilime.com](http://quilime.com), a codification of creative process and resources. - find me on: - [github](http://github.com/quilime/), - [twitter](http://twitter.com/quilime/) - site source code: plog - - - INSTALL - ------- - extract plog to the subdirectory of your choice, and modify `lib/init.php` -Contact me via email at [gd@gabrieldunne.com](mailt:gd@gabrieldunne.com). ++*contact:* ++1242 Market Street, FL 2 ++San Francisco, CA 94102 +++ 1 415 493 8496 ++studio@gabrieldunne.com diff --cc pages/cv index 0000000,e5280fe..1c6ecbc mode 000000,100644..100644 --- a/pages/cv +++ b/pages/cv @@@ -1,0 -1,110 +1,112 @@@ + title = c/v + -- + -**Gabriel Labov Dunne** -b. 1981, San Francisco - -
- + **edu** + 2003 B.A. Design | Media Arts, UCLA + 2002 Pont Avent School of Art, France + 1999 College of Marin +
+
- ++ ++ ++**residencies / collaborations** ++2011—     Collaboration, Studio Vishal K. Dar ++2009—2010 Artist in Residence, Gray Area Foundation for the Arts ++
++ ++ + **exhibitions, festivals, performance** ++2011 Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco. Live visuals. → + 2010 Milieux Sonores: Sound and Imaginary Space, GAFFTA, San Francisco. Live A/V performance. + 2010 Biennial of the Americas, Denver. Live A/V performance. + 2010 Prototype, GAFFTA, San Francisco. Installation. -2010 Powers of Ten, GAFFTA. Installation. Collab w/Stephanie Sherriff. ++2010 Powers of Ten, GAFFTA. Installation. + 2008 Design and the Elastic Mind, MoMA NYC Permanent Collection. Collab w/Stamen Design. + 2006 Interferenze: Naturalis Electronica, Valle Caudina, Italy. + 2006 Japan Media Arts Festival, Tokyo, Japan + 2006 Festival Sonar, Barcelona, Spain + 2006 SIGGRAPH, Boston + 2005 New Wight Gallery MFA Show, UCLA, Los Angeles, CA (collab.) + 2005 SIGGRAPH, Los Angeles + 2005 :Output International Design Competition, Amsterdam, Netherlands + 2005 CiberArt: International Festival of New Technologies, Bilbao, Spain + 2004 Traffic, New Wight Gallery, UCLA, Los Angeles, CA. Collab w/Scott Hessels. + 2003 Sur(Face), Design Media Arts EDA, Los Angeles, CA + 2003 Eyberrations Digital Film Festival, Irvine, CA + 2002 Melbourne International Film Festival", Melbourne, Australia + 2002 Experimental Works On Paper, Paris, France + 2002 Experimental Works On Paper, Rennes, France + 2002 Jaquez Gallery Collection, Pont Aven, France. Permanent Collection. +
+ + **talks / conferences** + 2010 "Prototype" Resident Artist Symposium, Gray Area, San Francisco + 2004 Text + Architecture & Writing in Architecture, SCIARC, Los Angeles + 2003 narr@tive: Digital Storytelling, Hammer Museum, Los Angeles +
+ + **courses / lectures / workshops** -2010 Open Source: Visual Programming (BAVC, San Francisco) ++2011 Processing 101 (Certificate Program, Gray Area, San Francisco) ++2010 Open Source Coding (Youth Program, BAVC, San Francisco) + 2010 Creative Coding: An Introduction to Processing (Gray Area, San Francisco) + 2009 Creative Coding (Gray Area, San Francisco) + 2009 Creative Coding (Gray Area, San Francisco) + 2009 Introduction to Processing (Gray Area, San Francisco) + 2007 Processing (Makers Faire, San Mateo) + 2005 Programming and Design (UCLA student workshops, Los Angeles) + 2005 Video, (UCLA student workshops, Los Angeles) + 2004 Maya Workshop Series (UCLA, Los Angeles) + 2003 Typography Workshop Series (UCLA, Los Angeles) + 2003 Adobe Design Software Workshop (Rep, UCLA, Los Angeles) + 2002 Macromedia Design Student Workshops (UCLA, Los Angeles) +
+ ++ + **media** + 2009 Art College Radio (gdss) 2008 MIT Aerospace Annual + 2007 A'minima #17 + 2007 FOCUS Italia, May Issue + 2007 Discover Magazine + 2007 Wired + 2006 Adult Swim, Cartoon Network + 2006 Contemporary Art of Science and Technology + 2006 AD: Architectural Digest + 2005 HDRI +
+ ++ + **public collections** + New York Museum of Modern Art, NY + Jaquez Gallery Collection, Pont Aven, France +
+ ++ + **awards** + 2005 Creative Review Best in Show "Beck Girl" (Asst Visual Effects Supervisor, w/Motion Theory) + 2004 Type Directors Award "Nike Golf" (Designer, Developer, w/Motion Theory) + 2004 AIGA "HP It Consolidates" (Designer, Animator w/Motion Theory) + 2004 AICP "HP Hands" (Designer, Animator w/Motion Theory) + 2003 Screen Network Australia Best in Show + 2002 Shorttakes Film Festival, Best Visual Effects +
+ - - -**residencies / collaborations** -2011 Collaboration, Studio Vishal Dar -2009—2010 Artist in Residence, Gray Area Foundation for the Arts +
++ ++**credentials** ++Adobe A.C.E. Certified in Photoshop, Illustrator +
++ ++ ++ + **professional activity** -2010—current Educator, Bay Area Video Coalition. 'Digital Pathways: Open Source' Instructor ++2005—     Tessellated Group: Designer ++2010—     Bay Area Video Coalition, NextGen Youth Instructor ++2009—2010 Gray Area Foundation for the Arts: Studio Director + 2007—2008 Stamen Design: Designer, Developer + 2007—2008 Google, Inc: Designer, Developer -2005—current Tessellated Group: Designer + 2004—2006 Motion Theory: Designer, Animator +
+
-
- - - - - diff --cc pages/index index 0000000,0000000..dd7ee2a new file mode 100644 --- /dev/null +++ b/pages/index @@@ -1,0 -1,0 +1,10 @@@ ++title = index ++-- ++ ++ diff --cc templates/default.html.tpl index 1973392,d240512..51ffbe1 --- a/templates/default.html.tpl +++ b/templates/default.html.tpl @@@ -11,16 -11,15 +11,15 @@@ include_template('nav.html.tpl') ?>
- + - more →

'; - - - $this->include_template('entry.html.tpl', array('data' => $entry)); - - + + $this->include_template('entry.html.tpl', array('data' => $entry)); - ++ ?> diff --cc templates/entry.html.tpl index cd68910,198cd7f..c1848e8 --- a/templates/entry.html.tpl +++ b/templates/entry.html.tpl @@@ -1,22 -1,25 +1,22 @@@
-
--

- - --

-- -
-
-
-
    - -
  • #
    • - -
++
++

++ ++

++
+
+ -
-
- + +
- posted - in -
+
    + +
  • #
    • + +
-
++
diff --cc templates/head-inc.html.tpl index fc6f1a7,2d505c1..facb303 --- a/templates/head-inc.html.tpl +++ b/templates/head-inc.html.tpl @@@ -1,31 -1,22 +1,14 @@@ - - ++ - - - - -- + + + - - diff --cc templates/nav.html.tpl index b17cb3a,5fc61da..527b8a6 --- a/templates/nav.html.tpl +++ b/templates/nav.html.tpl @@@ -1,35 -1,10 +1,12 @@@ - ++