From b36b8e3afb94e3bbd3eaf7503520cccb9cd2cb04 Mon Sep 17 00:00:00 2001
From: Thomas Keller <me@thomaskeller.biz>
Date: Wed, 27 Apr 2011 00:03:44 +0200
Subject: [PATCH] Final adjustions to the project logo code - remove the
 question mark from the default logo for simplification,   add a soft drop
 shadow to make the logo more visible on not so light   backgrounds - display
 the project logo and the lock icon in the project list dropdown - re-position
 the project title and display the lock icon (if needed)   on top of the main
 logo The code now works best with uploaded logos of 32x32px^2; smaller logos
 will be downsampled and repositioned on a best breed basis.

---
 logo/no_logo.svg                     | 167 ++++++++++++++++++++-------
 src/IDF/templates/idf/base-full.html |   2 +-
 src/IDF/templates/idf/base.html      |   2 +-
 src/IDF/templates/idf/main-menu.html |   3 +-
 www/media/idf/css/style.css          |  44 +++++--
 www/media/idf/img/no_logo.png        | Bin 1248 -> 1438 bytes
 6 files changed, 165 insertions(+), 53 deletions(-)

diff --git a/logo/no_logo.svg b/logo/no_logo.svg
index 80c206b..3149dd1 100644
--- a/logo/no_logo.svg
+++ b/logo/no_logo.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="no_logo.svg"
-   inkscape:version="0.48.0 r9654"
+   inkscape:version="0.47 r22583"
    id="svg2985"
    height="32"
    width="32"
    version="1.1"
-   inkscape:export-filename="/home/www/indefero/logo/no_logo.png"
+   inkscape:export-filename="/Users/tommyd/Entwicklung/indefero/www/media/idf/img/no_logo.png"
    inkscape:export-xdpi="89.989998"
    inkscape:export-ydpi="89.989998">
   <sodipodi:namedview
@@ -27,19 +27,71 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="723"
+     inkscape:window-width="1440"
+     inkscape:window-height="852"
      id="namedview9"
      showgrid="false"
-     inkscape:zoom="11.357903"
-     inkscape:cx="2.6416758"
-     inkscape:cy="13.063247"
+     inkscape:zoom="16.0625"
+     inkscape:cx="8.5507561"
+     inkscape:cy="16.122403"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g2847"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,25.836575"
+       id="guide3752" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-18.677042,16"
+       id="guide3754" />
+  </sodipodi:namedview>
   <defs
-     id="defs2987" />
+     id="defs2987">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective13" />
+    <inkscape:perspective
+       id="perspective2863"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3676"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3717"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3816"
+       x="-0.14434362"
+       width="1.2886872"
+       y="-0.11562817"
+       height="1.2312563">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1799243"
+         id="feGaussianBlur3818" />
+    </filter>
+  </defs>
   <metadata
      id="metadata2990">
     <rdf:RDF>
@@ -53,38 +105,69 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1">
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="shadow"
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
-       id="g3838" />
-    <g
-       inkscape:export-ydpi="12.330909"
-       inkscape:export-xdpi="12.330909"
-       inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
-       style="fill:#e6e6e6;stroke:#a0a0a0;stroke-width:2.40000010000000019;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1;stroke-opacity:1"
-       transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
-       id="g2401">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.40000010000000019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
-         id="path2383" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.40000010000000019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
-         id="path2391" />
+       transform="translate(0.44042901,0.78704792)"
+       id="g2847-8"
+       style="opacity:0.79710143;fill:#000000;stroke:#000000;stroke-opacity:1;filter:url(#filter3816)">
+      <g
+         id="g3838-0"
+         style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+      <g
+         id="g2401-2"
+         transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
+         inkscape:export-xdpi="12.330909"
+         inkscape:export-ydpi="12.330909">
+        <path
+           id="path2383-4"
+           d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path2391-8"
+           d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="logo"
+     style="display:inline">
+    <g
+       id="layer1"
+       transform="translate(-0.06540759,0.09444087)">
+      <g
+         id="g2847">
+        <g
+           id="g3838" />
+        <g
+           id="g2401"
+           transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
+           style="fill:#e6e6e6;fill-opacity:1;stroke:#a0a0a0;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
+           inkscape:export-xdpi="12.330909"
+           inkscape:export-ydpi="12.330909">
+          <path
+             id="path2383"
+             d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
+             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path2391"
+             d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
+             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
     </g>
-    <text
-       transform="scale(1.118034,0.89442719)"
-       sodipodi:linespacing="125%"
-       style="font-size:30.97047042999999888px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#828282;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       xml:space="preserve"
-       id="text3763"
-       y="28.666267"
-       x="8.1167412"><tspan
-         style="fill:#828282;fill-opacity:1"
-         id="tspan3765"
-         y="28.666267"
-         x="8.1167412">?</tspan></text>
   </g>
 </svg>
diff --git a/src/IDF/templates/idf/base-full.html b/src/IDF/templates/idf/base-full.html
index 51baf73..2d3440c 100644
--- a/src/IDF/templates/idf/base-full.html
+++ b/src/IDF/templates/idf/base-full.html
@@ -37,7 +37,7 @@
 <body>
 <div id="{block docid}doc3{/block}">
   <div id="hd">
-    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}
+    {if $project}<h1 class="project-title">{$project}<img class="logo" src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" />{if $project.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</h1>{/if}
     {include 'idf/main-menu.html'}
 <div id="header">
 <div id="main-tabs">
diff --git a/src/IDF/templates/idf/base.html b/src/IDF/templates/idf/base.html
index da4fdc2..6961cfd 100644
--- a/src/IDF/templates/idf/base.html
+++ b/src/IDF/templates/idf/base.html
@@ -37,7 +37,7 @@
 <body>
 <div id="{block docid}doc3{/block}" class="{block docclass}yui-t3{/block}">
   <div id="hd">
-    {if $project}<h1 class="project-title">{$project} <img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" /></h1>{/if}
+    {if $project}<h1 class="project-title">{$project}<img class="logo" src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" />{if $project.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</h1>{/if}
     {include 'idf/main-menu.html'}
 <div id="header">
 <div id="main-tabs">
diff --git a/src/IDF/templates/idf/main-menu.html b/src/IDF/templates/idf/main-menu.html
index 1afd4d2..defc97a 100644
--- a/src/IDF/templates/idf/main-menu.html
+++ b/src/IDF/templates/idf/main-menu.html
@@ -8,8 +8,7 @@
 {/if}<li id="project-list"><a href="{url 'IDF_Views::index'}">{trans 'Project List'} &#x25be;</a>
 {if $allProjects.count() != 0}
 <ul>{foreach $allProjects as $p}
-<li>{if $p.private}<img style="vertical-align: text-bottom;" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" /> {/if}
-<a href="{url 'IDF_Views_Project::home', array($p.shortname)}">{$p}</a></li>
+<li><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><img class="logo" src="{url 'IDF_Views_Project::logo', array($p.shortname)}" alt="{trans 'Project logo'}" />{if $p.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</a></li>
 {/foreach}</ul>
 {/if}</li>{if $isAdmin}<li><a href="{url 'IDF_Views_Admin::projects'}">{trans 'Forge Management'}</a></li>{/if}<li>
 <a href="{url 'IDF_Views::faq'}" title="{trans 'Help and accessibility features'}">{trans 'Help'}</a></li>
diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css
index a4d8431..2ccfa01 100644
--- a/www/media/idf/css/style.css
+++ b/www/media/idf/css/style.css
@@ -327,10 +327,27 @@ h1.title {
 }
 
 h1.project-title {
-  font-weight: normal;
   float: right;
+  font-weight: normal;
+  margin-top: 0.5em;
+  margin-bottom: 0;
+  text-align: right;
   z-index: 100;
-  margin: 0;
+  position: relative;
+  padding-right: 3px;
+}
+
+h1.project-title img.logo {
+  max-height: 22px;
+  vertical-align: text-bottom;
+  padding-left: 7px;
+}
+
+h1.project-title img.lock {
+  width: 12px;
+  position: absolute;
+  right: 1px;
+  top: 12px;
 }
 
 .note {
@@ -869,8 +886,21 @@ ol > li {
   margin: 7px;
   white-space: nowrap;
   font-size: 0.95em;
-  list-style-type: square;
-  list-style-position: inside;
+  list-style-type: none;
+  position: relative;
+}
+
+#project-list ul li img.logo {
+  max-height: 16px;
+  vertical-align: text-bottom;
+  padding-right: 5px;
+}
+
+#project-list ul li img.lock {
+  position: absolute;
+  width: 9px;
+  left: 9px;
+  top: 9px;
 }
 
 #project-list ul li:first-child {
@@ -1053,7 +1083,7 @@ div.p-list-img {
 
 div.p-list-prj {
     float: left;
-    margin: .5em 0 .5em 1em;
+    margin: .5em 0 .5em .8em;
 }
 
 div.p-list-prj p {
@@ -1061,7 +1091,7 @@ div.p-list-prj p {
 }
 
 div.p-list-private {
-    bottom: 10px;
-    right: -6px;
+    bottom: 16px;
+    right: -3px;
     position: relative;
 }
diff --git a/www/media/idf/img/no_logo.png b/www/media/idf/img/no_logo.png
index 142fc54cdad0fcfd1f14bd0ecec8bd461c0c923b..43e72e3094bf395a6d7c5f770b819b6504be87c2 100644
GIT binary patch
delta 1360
zcmV-W1+V(x37!j(JPNP?01dDKePvntkwzzf1sh33K~z|U#g|=3TW1)6pL0xNYBWx(
zM#WOCGLg0Z)P>CpFJuLKA-nO;UUs`Ej6yGlr7&o(1{PK*deO^{vd!&c9gJSoi$Vyo
zrIw6NaN3cH*54#Hnlu`7&iQt6PBcx<iRoI{2QLZ9ci#7T|Gw`%k`RLbbJ^aPB1w{e
zq|8_2Q-~tGlio)JBuSD18Qme-_*pTeAjmrd7{+Zt`IReI25M_-J03iEFy;6Amw*JY
z2Pl>hLWut?=;5}PmzUSwyLWGTW@cu0VPQeszkh%2>eZ`bKs!(kI5N)W>3Bx~8F1ac
zeS2(fZZ5sLx+*d<Gc&U{Ha7Mfa2lw8GNP0RA)7_zh>&NNY(${c<#P2@R#v`I(2b3a
zrCzW1vyqXJVW1Xpa#)}Tt7w2Mqc$U?87Xx*9F=Czw70jr1_uYf0Gfabz?Ri5#Q|g)
zb^zsNWo0$P!^6ETEiEU3<3NSoZZEfbzPY)%#_RQZfe#G$HvkHr0|spg;JkQ$@nTnh
zfB&_rs;ZBwtE;OvH#ZZHA3y&7=FOWAfl@0SEiEn1p`oGApFVx+12%wEQ2<%S%WmAb
zalz~Le$(06*&xe$&{|tt-N2V_xBI24stzkXHk*y6rlyld1e`!Zk|ZtDmW3i90nY2!
zuU{A#82GlWtt~IlZEbB;-QC@PeUc>E3+TaSvpE2_0gx%)gElhrUIrY!y}eDHot<Bs
z83%|)qssE~@==Z;%W?^D46x_g%mXk&F9WVimo9yG_UzdfE5%z|TguYXQc{-Xy!JA2
zC?jvene7McLqkI!o;r2v6Nkexy=-r9r-TqGyWL(=2w-=2cMnKo+zm&60RT7#1_nl&
zo13c(Dc;=NjQ8~PxSN`q%B=Qin#TJ2dK8GGcYvA=VFpkFIP2=_K6N^smc|o_1hccV
zi-UuMZT0o_mPHtiMzug7@CUFB>;eZJkOz?6dTzJ7!O}Vq3WZWWpYO$q6DR8JcIzgX
zo11&>_xpneKnl>Z|IdwoK&AkX$+B#nd|+*DZFgm5Wv8a5#<W8K!r`#`=+UEKJRV;*
z0Mfa8%u<j!?+aFTI2=xNbac2H8X8QGVNKKU`F!C!ckcWOyfgrcE<$oIjqH_9r-?)&
zug;t~Q(aqIn|BNgA@KYCiShCAN#F&r3M2tFcQ7$KKm?#9lgX5S$$tk1R8`&E*x1-i
zCX-r4Ma6+5ilQ(zHTCM&ty@3M&(8;de}FCY{O3(Yxc~yaP4*&@$g&Wk(JT-`2-4|v
zDi8?#83+Xa>gwuhwcG6_^YioZP$;xMK0f|)BocXUc)yN5mT9@(=K%;Igd|BS@H!X_
z{@&Nu_p!(0$vb3!G)+TMl)Y3c6}f!*@@RK=_i2~Q<?;Ldi<+iIffYl-z-tQ3gk~vF
zf!)c;$%p68o%_n;@p#N4peV{d5K~ok<=L}mi|7}PhCYbya5#|W<vn{@6=8a3XD8zG
z`F>bjT-?heR8`{fcpUv;i2_T&0`NC_#cyFzbj1J&^nQ(hO-xMuI6XZbjKyMV_J(LQ
zs)RzJm&U%7VJwm5by^5vn)4$8jE6Ks>B{Kn=(W3d?>-C$gFC9Kl1inRot=$7dGch|
zFsPsxShf`XvSImRVqBq4^ttb3UteGU`Sa(8_V@R-iHV6{VzJnB^sq;P{kJh%EP#YD
zcB4--$2puk?-S@19!0N%qTU1F3Lpm}dlWC>F!%dd^!IxKFagPk$jG}G2lyArNW>E;
S!9<q;0000<MNUMnLSTXdE1G=(

delta 1168
zcmV;B1aJGE3*ZTmJPOwU01ejxLMWSfkwzzf1YJo)K~z|U&6iC`BWD=L|8J6U%qB5S
zqhsA!zs-kHsbcCLMC!#olwA-%U|l~Dx)%>Ul!CMrafO~d)UuRXysQX|RzWFJmQdPL
z!NbxGG~+?twb9xou^Ka(F_Wwrr-!box=xHA#XhIx`TGCzyw5Oih@vRCO4D4a`u_oc
zKzCV<#>U1dv)SBCQItC#k56=TbS$P*M=oOrhK7bTH8nLqmX(#&8;wSKeSQ69Fc^Hy
zaoneagM<62YA<C1m6er!cDud7Y&KH>P+D4gone@dH5yGBfR<FXX-{BeWJE6r!Yu$z
zgpeDGqT~`n-Ujf}WHPZ1hr?#G*<dh#7?L$xTU(K(rKQi>+S<Ok5Ww*8uqhsouLF21
zRi0L>h0EnaU0odrApiiM&&Mq+EWE3B6lpyL{r&v{A>?}iVM54bnx?;^D5{ST(hA@c
znx;hnkYyP@pASBtFIk(Hmse`D*_zaPr@aG(g@vPLv)O7gnQmIG)`Fd#oxt{g_V%Ne
zmX-$|kLOM>7;IcyTLS=iy<SvRRe=x!tJSJE7!3CTc+Ne6+1c59`T6<Zx!vyDPN%ah
zCnqPvZnqaO40C^ceEb~%x{8X5Wd7dX9t1%E01!f;*Xtc>y-x+0o}O-IS@xmB;V3*f
z*8|JR$zk<+{Vf36Xf&Gi>vTGQ7>&l{cS1<!xd3KnW{g=`Szi<s6j)D+NB=QSQ51^f
zxTL?Nqy!qxzpV)&S~ZQ7JD}6)Mx9P)g<4z?gpeqTe=ILAm+?Fg0LabFMSXq!kvz>|
znsfmsCnvL6mVKY5X;r{TB*KTo;UDn&@hmDTLSthiwA!OTIFU$fof$xXr_<fd%gei=
z78e8oKA*1`z%>A<uC9jL?S3OqQ4~m$^y16_G)><&8ja+nSR#>t$KydFk+=o`H8nM;
zt*t$=Pb3nNB}tl7(@{Mey<X3%#r%Fh!r?Fgz+f=^r6vvl8yg#|vMfJ2GeD}v2?m47
z&kV!F)$(|rmw2B4wzIQ;Gje8tRA#YQkeQhoCWLrdmerq>qbLeiR#u+2wzhtms+Z~x
z5JFVp%FD~a^ZdLhijNqE`RRCke}5l~i;FLKp8qhFIFMoj@pxQNi@kn>z9NJKc6WFA
zV|DO)z0ZQdU{hCD*Ync=R3{LN#eUt}+k20qs5fGwC?XID*h8Uz&<7fg=1D9TYoKX5
zBNPh#E=kfavMfL7?(P;(6Hf^s2*T**=H^|NWslqeWLd`i{5&K{Y5>r%y1L45Zf;gs
zEEcM_x7VMJ=wVYmf}Wn9-vWWa>T$m)ijXAfu*)op;`Q^0rvw0iNF>td_xt}mqGmS3
z<#K@#5(N+e@b$oZz`)b<hy!U{$>!$fhDu6GK4KWga^MRD0#T0R?sRu||9oEIv;hEM
zYHI3Uc6RpX#l^)gMNwpq<DNA)H{S$s;X8fWx8jM339G?i=u{LXLs686?d|QaE-HQ|
ifd9&_{J-Iq1N;qIO{*SOIAj|D0000<MNUMnLSTZLpe;cF