<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>themes/default/sidebar.twig</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,6 @@
 .DS_Store
 .htaccess
 feathers/photo/lib/cache/*
-upload/*
+uploads/*
 includes/config.yaml.php
 includes/database.yaml.php</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -48,54 +48,8 @@ ${ trigger.call(&quot;head&quot;) }
 					&lt;p&gt;&lt;a href=&quot;{% url &quot;feed/&quot; %}&quot;&gt;Feed&lt;/a&gt; / theme &amp;copy; &lt;a href=&quot;http://lofisoami.com/&quot;&gt;Aaron MacDonald&lt;/a&gt; 2007&lt;/p&gt;
 					&lt;span&gt;${ &quot;Powered by &lt;a href=\&quot;http://chyrp.net/\&quot;&gt;Chyrp&lt;/a&gt;&quot; | translate }&lt;/span&gt;
 				&lt;/div&gt;
-		    &lt;/div&gt;
-		    &lt;div class=&quot;sidebar&quot;&gt;
-				&lt;form action=&quot;{% url &quot;search/&quot; %}&quot; method=&quot;get&quot; accept-charset=&quot;utf-8&quot;&gt;
-					&lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;search&quot; id=&quot;action&quot; /&gt;
-					&lt;input type=&quot;text&quot; id=&quot;search&quot; name=&quot;query&quot; /&gt;
-				&lt;/form&gt;
-				&lt;h1&gt;${ &quot;Pages&quot; | translate }&lt;/h1&gt;
-$page_list
-				&lt;h1&gt;${ &quot;Welcome, %s!&quot; | translate | format(visitor.login | fallback(&quot;Guest&quot; | translate)) }&lt;/h1&gt;
-				&lt;ul&gt;
-{% if visitor.logged_in %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;controls/&quot; %}&quot;&gt;${ &quot;User Controls&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-{% if visitor.group.can(&quot;add_post&quot;, &quot;add_page&quot;, &quot;view_draft&quot;, &quot;change_settings&quot;) %}
-					&lt;li&gt;&lt;a class=&quot;toggle_admin&quot; href=&quot;{% url &quot;toggle_admin/&quot; %}&quot;&gt;${ &quot;Toggle Admin Bar&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-{% endif %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;logout/&quot; %}&quot;&gt;${ &quot;Log Out&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-{% else %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;login/&quot; %}&quot;&gt;${ &quot;Log In&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-{% if site.can_register %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;register/&quot; %}&quot;&gt;${ &quot;Register&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;lost_password/&quot; %}&quot;&gt;${ &quot;Lost Password?&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-{% endif %}
-{% endif %}
-				&lt;/ul&gt;
-${ trigger.call(&quot;sidebar&quot;) }
-{% if tags %}
-				&lt;h1&gt;${ &quot;Tags&quot; | translate }&lt;/h1&gt;
-				&lt;ul id=&quot;tags_list&quot;&gt;
-{% for tag in tags %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;tag/&quot; ~ tag.url ~ &quot;/&quot; %}&quot;&gt;$tag.name&lt;/a&gt; &lt;span class=&quot;sub&quot;&gt;($tag.popularity)&lt;/span&gt;&lt;/li&gt;
-{% endfor %}
-					&lt;li&gt;&lt;a href=&quot;{% url &quot;tags/&quot; %}&quot;&gt;${ &quot;All &amp;rarr;&quot; | translate }&lt;/a&gt;&lt;/li&gt;
-				&lt;/ul&gt;
-{% endif %}
-{% if archive_list %}
-				&lt;h1&gt;${ &quot;Archives&quot; | translate }&lt;/h1&gt;
-				&lt;ul&gt;
-{% for archive in archive_list %}
-					&lt;li&gt;&lt;a href=&quot;$archive.url&quot;&gt;${ archive.when | date(&quot;F Y&quot;) }&lt;/a&gt; &lt;span class=&quot;sub&quot;&gt;($archive.count)&lt;/span&gt;&lt;/li&gt;
-{% endfor %}
-				&lt;/ul&gt;
-{% endif %}
-				&lt;h1&gt;${ &quot;Stats&quot; | translate }&lt;/h1&gt;
-				&lt;ul&gt;
-					&lt;li&gt;${ &quot;Queries:&quot; | translate } $stats.queries&lt;/li&gt;
-					&lt;li&gt;${ &quot;Load time:&quot; | translate } $stats.load&lt;/li&gt;
-				&lt;/ul&gt;
 			&lt;/div&gt;
+			{% include &quot;sidebar.twig&quot; %}
 		&lt;/div&gt;
 ${ trigger.call(&quot;end_content&quot;) }
 		&lt;script type=&quot;text/javascript&quot;&gt;</diff>
      <filename>themes/default/layouts/default.twig</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>208cc0bbc388ff2b0e3991ba49b9bd1ac0298f2a</id>
    </parent>
  </parents>
  <author>
    <name>Alex Suraci</name>
    <email>i.am@toogeneric.com</email>
  </author>
  <url>http://github.com/vito/chyrp-site/commit/2b5b2ba43c9e73481ffb215994cc5bd0ae85173c</url>
  <id>2b5b2ba43c9e73481ffb215994cc5bd0ae85173c</id>
  <committed-date>2008-06-11T12:36:03-07:00</committed-date>
  <authored-date>2008-06-11T12:36:03-07:00</authored-date>
  <message>Split sidebar into its own file.</message>
  <tree>3b92c0b46de69f27658a6970fbfc4a7ade5a0333</tree>
  <committer>
    <name>Alex Suraci</name>
    <email>i.am@toogeneric.com</email>
  </committer>
</commit>
