Update English page, add collage and info about 0.2.0.

diff --git a/plansplant.svg b/plansplant.svg
new file mode 100644 (file)
index 0000000..ed597ae
--- /dev/null
+++ b/plansplant.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!-- Created with Inkscape (http://www.inkscape.org/) -->\r
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" xmlns:dc="http://purl.org/dc/elements/1.1/">\r
+ <title>Plans Plant system icon</title>\r
+ <defs>\r
+  <linearGradient id="linearGradient3592">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </linearGradient>\r
+  <linearGradient id="linearGradient3592-0">\r
+   <stop stop-color="#f6e7b8" offset="0"/>\r
+   <stop stop-color="#a07800" offset="1"/>\r
+  </linearGradient>\r
+  <radialGradient id="radialGradient3729" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.02592978,0.03860307,-0.05670262,0.02822547,41.253344,1005.8695)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3734" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,39.231609,995.59706)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3750" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.00744098,0.01107779,-0.01627176,0.00809977,43.577386,1000.2618)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3756" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)" r="205.71">\r
+   <stop stop-color="#f6e7b8" offset="0"/>\r
+   <stop stop-color="#a07800" offset="1"/>\r
+  </radialGradient>\r
+ </defs>\r
+ <metadata>\r
+  <rdf:RDF>\r
+   <cc:Work rdf:about="">\r
+    <dc:format>image/svg+xml</dc:format>\r
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>\r
+    <dc:title>Plans Plant system icon</dc:title>\r
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by/3.0/"/>\r
+    <dc:creator>\r
+     <cc:Agent>\r
+      <dc:title>Николай Слободской (Nick Slobodsky)</dc:title>\r
+     </cc:Agent>\r
+    </dc:creator>\r
+   </cc:Work>\r
+   <cc:License rdf:about="http://creativecommons.org/licenses/by/3.0/">\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>\r
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>\r
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>\r
+   </cc:License>\r
+  </rdf:RDF>\r
+ </metadata>\r
+ <g transform="translate(0,-1004.3622)">\r
+  <path d="m19.685,1009.8c-3.2832,0.018-6.4013,1.5034-8.4475,3.6847-3.9976,4.1919-4.345,10.647-0.97118,15.214,1.8017,2.4858,4.7991,4.3954,8.2076,4.7678,3.1083,0.3804,6.3321-0.5836,8.6329-2.4055,3.2908-2.5473,4.8766-6.5082,4.5718-10.299-0.26511-3.7547-2.4421-7.4816-6.1468-9.5115-1.7349-0.9565-3.7839-1.4822-5.8467-1.45z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.24997331" fill="url(#radialGradient3734)"/>\r
+  <g transform="matrix(0.52083334,0,0,0.52083334,21.18765,492.58613)">\r
+   <path d="m23.689,1004.6c-6.5665,0.035-12.803,3.0068-16.895,7.3695-7.9953,8.3838-8.69,21.294-1.9424,30.428,3.6035,4.9716,9.5983,8.7908,16.415,9.5357,6.2166,0.7608,12.664-1.1673,17.266-4.8111,6.5815-5.0945,9.7532-13.016,9.1436-20.599-0.53022-7.5095-4.8842-14.963-12.294-19.023-3.4699-1.913-7.5679-2.9643-11.693-2.9z" stroke="#483600" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.49994662" fill="url(#radialGradient3756)"/>\r
+  </g>\r
+  <path d="m20.078,1021.3c-3.5568,0.019-6.9348,1.6287-9.1515,3.9918-4.3308,4.5412-4.7071,11.534-1.0521,16.482,1.9519,2.693,5.1991,4.7617,8.8916,5.1651,3.3674,0.4121,6.8598-0.6322,9.3523-2.6059,3.565-2.7596,5.283-7.0506,4.9528-11.158-0.2872-4.0676-2.6456-8.1051-6.6591-10.304-1.8795-1.0362-4.0993-1.6057-6.3339-1.5709z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.27080444" fill="url(#radialGradient3729)"/>\r
+  <path d="m36.75,3.0625c-3.76-0.068578-8.1769,0.96575-12.844,3.0938,0.56499,0.20519,1.1079,0.4649,1.625,0.75,0.19836,0.10869,0.40421,0.19434,0.59375,0.3125,2.8385-1.1589,5.5553-1.7906,7.9688-1.9062,4.9648-0.238,9.3799,1.1624,10.457,5.2197,1.9151,7.2128-4.5357,16.449-14.763,24.23-10.02,7.625-22.998,7.232-24.913,0.019-1.0103-3.805,0.541-8.724,3.7812-13.469-0.3989-1.116-0.6028-2.265-0.6562-3.437-5.6778,6.35-8.8624,13.502-7.8125,19.094,1.696,9.033,14.088,11.802,27.228,4.612s22.092-21.61,20.396-30.643c-0.953-5.0815-5.211-7.769-11.062-7.8755z" fill-opacity="0.50813007" transform="translate(0,1004.3622)" fill="#467dd4"/>\r
+  <path d="m37.501,1004.7c-1.0207,0.01-1.99,0.4674-2.6262,1.1455-1.2428,1.3032-1.3508,3.31-0.30192,4.7297,0.56013,0.7728,1.492,1.3665,2.5516,1.4823,0.96632,0.1182,1.9685-0.1814,2.6838-0.7478,1.023-0.7919,1.516-2.0233,1.4213-3.202-0.08242-1.1672-0.7592-2.3258-1.9109-2.9569-0.53936-0.2973-1.1764-0.4607-1.8176-0.4508z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.07771183" fill="url(#radialGradient3750)"/>\r
+  <g transform="matrix(0.20788647,0,0,0.20788647,5.8476493,833.57961)">\r
+   <path d="m23.689,1004.6c-6.5665,0.035-12.803,3.0068-16.895,7.3695-7.9953,8.3838-8.69,21.294-1.9424,30.428,3.6035,4.9716,9.5983,8.7908,16.415,9.5357,6.2166,0.7608,12.664-1.1673,17.266-4.8111,6.5815-5.0945,9.7532-13.016,9.1436-20.599-0.53022-7.5095-4.8842-14.963-12.294-19.023-3.4699-1.913-7.5679-2.9643-11.693-2.9z" stroke="#483600" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.49994662" fill="url(#radialGradient3756)"/>\r
+  </g>\r
+ </g>\r
+</svg>\r

diff --git a/www/index.html b/www/index.html
index 14d0a62..cc28b6b 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -3,16 +3,32 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; Charset=utf-8">
 <TITLE>Plans Plant</TITLE>
 <STYLE TYPE="text/css">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; Charset=utf-8">
 <TITLE>Plans Plant</TITLE>
 <STYLE TYPE="text/css">

-  IMG.screenshot { float: left; margin-right: 1em; margin-bottom: 1em; clear: both; }
+  IMG.screenshot { float: left; margin-right: 1em; margin-bottom: 1em; clear: both; border: none; }

   H2, H3 { clear: both; }
 </STYLE>
 </HEAD><BODY>
     <P STYLE="margin-top: 0em; margin-bottom: 0"><A HREF="index.ru.html">Русская страница</A> содержит дополнительную информацию в менее кос<SMALL>т</SMALL>ноязычной форме.</P><HR>
   H2, H3 { clear: both; }
 </STYLE>
 </HEAD><BODY>
     <P STYLE="margin-top: 0em; margin-bottom: 0"><A HREF="index.ru.html">Русская страница</A> содержит дополнительную информацию в менее кос<SMALL>т</SMALL>ноязычной форме.</P><HR>

-    <H1><OBJECT DATA="plansplant.svg" TYPE="image/svg+xml"><IMG SRC="plansplant.png"></OBJECT>Plans Plant</H1>
-    <P>It's a small application for planning a hierarchy of tasks. Current version is 0.1.2. It's available for Nokia N900 mobile computer from extras-testing repository and desktop computers with Microsoft Windows and Ubuntu Linux 'lucid' 10.4 operating systems.
-    <P>See <A HREF="index.ru.html">Russian page</A> for screenshots from Ubuntu and MS Windows (only in Russian at this time, English will be soon).
+    <H1><OBJECT DATA="plansplant.svg" WIDTH=48 HEIGHT=48 TYPE="image/svg+xml"><IMG SRC="plansplant.png"></OBJECT>Plans Plant</H1>
+    <P>It's a small application for planning a hierarchy of tasks with subtasks and dependencies. Current version is 0.1.3. It's available for Nokia N900 mobile computer from extras-testing repository and desktop computers with Microsoft Windows and Linux operating systems (Ubuntu, openSUSE and MeeGo for netbooks). Port to Symbian^3 platform is in progress, but it isn't ready yet.
+    <P><A HREF="ru/images/collage-full.png"><IMG CLASS="screenshot" SRC="ru/images/collage.jpg"></A>
+    <P STYLE="clear: both;">See <A HREF="index.ru.html">Russian page</A> for more screenshots from MeeGo, Ubuntu and MS Windows (only in Russian at this time, English will be soon).
+    <H3>Development version</H3>It has a lot of bugs and some new features:
+      <UL>
+       <LI>List of tasks, sorted by the planned time.</LI>
+       <LI>Tasks priorities.</LI>
+       <LI>Search tasks by names, descriptions or comments.</LI>
+       <LI>Time tracking for the tasks.</LI>
+      </UL>
+    <P>It's available for some platforms:
+      <UL>
+       <li>Maemo - from the extras-devel. </li>
+       <li>Ubuntu - in the author's PPA. To add this repository use command <code>sudo add-apt-repository ppa:wholeman/wholeman</code>.</li>
+       <li>Installer for MS Windows is available <a href="index.php?option=com_jdownloads&amp;Itemid=25&amp;task=finish&amp;cid=29&amp;catid=23&amp;m=0">here</a>. It contains all shared libriries and that's why it is relatively large (~5M).</li>
+      </UL>
+      <HR>

       <H3>Tasks tree</H3>
       <IMG CLASS="screenshot" NAME="tasks_tree_screenshot" SRC="en/images/maemo/tasks_tree.png">
       <H3>Tasks tree</H3>
       <IMG CLASS="screenshot" NAME="tasks_tree_screenshot" SRC="en/images/maemo/tasks_tree.png">

+      <P>This is the main part of the application. You can add tasks, dependencies and change tasks and their order here.

       <H3>Task dialog</H3>
       <IMG CLASS="screenshot" NAME="task_dialog_full_screenshot" SRC="en/images/maemo/task_dialog_full.png">
       <P>The main part of this form can be scrolled if it's not fit into the window. The image for Nokia N900 has been composed from three screenshots to make the full dialog.
       <H3>Task dialog</H3>
       <IMG CLASS="screenshot" NAME="task_dialog_full_screenshot" SRC="en/images/maemo/task_dialog_full.png">
       <P>The main part of this form can be scrolled if it's not fit into the window. The image for Nokia N900 has been composed from three screenshots to make the full dialog.

@@ -23,10 +39,11 @@
       <IMG CLASS="screenshot" NAME="dependencies_dialog_screenshot" SRC="en/images/maemo/dependencies_dialog.png">
       <H2>Download</H2>
     <UL>
       <IMG CLASS="screenshot" NAME="dependencies_dialog_screenshot" SRC="en/images/maemo/dependencies_dialog.png">
       <H2>Download</H2>
     <UL>

-      <LI>N900 users can install this application from "extras-testing" repository.
+      <LI>N900 users can install this application from the "extras-testing" repository.

       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=27&catid=22&m=0">Installer for MS Windows (32-bit)</A>
       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=28&catid=22&m=0">Tarball for <B>32-bit</B> Ubuntu Linux 10.4</A>. Unpack and run <CODE>install.sh</CODE> if you don't know what to do with it.
       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=26&catid=22&m=0">Tarball for <B>64-bit</B> Ubuntu Linux 10.4</A>. See above.
       <LI><A HREF="https://garage.maemo.org/frs/download.php/8918/plansplant-0.1.3.tar.bz2">Sources are in the Maemo garage</A>.
       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=27&catid=22&m=0">Installer for MS Windows (32-bit)</A>
       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=28&catid=22&m=0">Tarball for <B>32-bit</B> Ubuntu Linux 10.4</A>. Unpack and run <CODE>install.sh</CODE> if you don't know what to do with it.
       <LI><A HREF="http://www.slobodsky.ru/index.php?option=com_jdownloads&Itemid=25&task=finish&cid=26&catid=22&m=0">Tarball for <B>64-bit</B> Ubuntu Linux 10.4</A>. See above.
       <LI><A HREF="https://garage.maemo.org/frs/download.php/8918/plansplant-0.1.3.tar.bz2">Sources are in the Maemo garage</A>.

+      <LI>Git repository is at the <a href="http://gitorious.org/plansplant">http://gitorious.org/plansplant</a>.

     </UL>
 </BODY></HTML>
     </UL>
 </BODY></HTML>

diff --git a/www/index.ru.html b/www/index.ru.html
index cebac9f..dbaae5a 100644 (file)
--- a/www/index.ru.html
+++ b/www/index.ru.html
@@ -37,7 +37,7 @@
 <li>Список задач, отсортированных по плановому времени. </li>
 <li>Приоритеты задач. </li>
 <li>Поиск задач по тексту в названии, описании или примечании. </li>
 <li>Список задач, отсортированных по плановому времени. </li>
 <li>Приоритеты задач. </li>
 <li>Поиск задач по тексту в названии, описании или примечании. </li>

-<li>Сдвиг данных на указанный интервал времени. </li>
+<li>Сдвиг планов на указанный интервал времени. </li>

 <li>Возможность учёта времени, затраченного на выполнение задачи.</li>
 </ul>
 <p>Новая версия работает на большом числе платформ:</p>
 <li>Возможность учёта времени, затраченного на выполнение задачи.</li>
 </ul>
 <p>Новая версия работает на большом числе платформ:</p>

diff --git a/www/plansplant.svg b/www/plansplant.svg
index 7ee04b7..ed597ae 100644 (file)
--- a/www/plansplant.svg
+++ b/www/plansplant.svg
@@ -1,364 +1,65 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="plansplant.svg"
-   inkscape:export-filename="/home/nick/sbhome/projects/small/plansplant/lib/images/plansplant.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <title
-     id="title3769">Plans Plant system icon</title>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3592">
-      <stop
-         style="stop-color:#b8f6c8;stop-opacity:1;"
-         offset="0"
-         id="stop3594" />
-      <stop
-         style="stop-color:#00a029;stop-opacity:1;"
-         offset="1"
-         id="stop3596" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3600"
-       cx="155.95126"
-       cy="524.44501"
-       fx="155.95126"
-       fy="524.44501"
-       r="205.71428"
-       gradientTransform="matrix(0.36111105,0.66666666,-0.9241668,0.50059026,594.07324,77.291172)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787033,0.07127481,-0.1046817,0.05211413,62.778783,976.19488)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.390692,1002.2813)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       r="205.71428"
-       fy="510.9357"
-       fx="181.79073"
-       cy="510.9357"
-       cx="181.79073"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3606-4"
-       xlink:href="#linearGradient3592-0"
-       inkscape:collect="always" />
-    <radialGradient
-       r="205.71428"
-       fy="510.9357"
-       fx="181.79073"
-       cy="510.9357"
-       cx="181.79073"
-       gradientTransform="matrix(0.04787033,0.07127481,-0.1046817,0.05211413,62.778783,976.19488)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3604-5"
-       xlink:href="#linearGradient3592-0"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36111105,0.66666666,-0.9241668,0.50059026,594.07324,77.291172)"
-       r="205.71428"
-       fy="524.44501"
-       fx="155.95126"
-       cy="524.44501"
-       cx="155.95126"
-       id="radialGradient3600-4"
-       xlink:href="#linearGradient3592-0"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective10-0"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient3592-0">
-      <stop
-         id="stop3594-3"
-         offset="0"
-         style="stop-color:#f6e7b8;stop-opacity:1;" />
-      <stop
-         id="stop3596-0"
-         offset="1"
-         style="stop-color:#a07800;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592-0"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3692"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.984847,990.24967)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3700"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.984847,990.24967)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592-0"
-       id="radialGradient3702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3704"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.390692,1002.2813)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3722"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.984847,990.24967)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592-0"
-       id="radialGradient3724"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3726"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,43.390692,1002.2813)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3729"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02592978,0.03860307,-0.05670262,0.02822547,41.253344,1005.8695)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3734"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,39.231609,995.59706)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592"
-       id="radialGradient3750"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.00744098,0.01107779,-0.01627176,0.00809977,43.577386,1000.2618)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592-0"
-       id="radialGradient3756"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3592-0"
-       id="radialGradient3765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)"
-       cx="181.79073"
-       cy="510.9357"
-       fx="181.79073"
-       fy="510.9357"
-       r="205.71428" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="0.55260949"
-     inkscape:cy="19.720925"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Plans Plant system icon</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Николай Слободской (Nick Slobodsky)</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       id="path3690"
-       d="m 19.685441,1009.8044 c -3.283241,0.018 -6.401326,1.5034 -8.447543,3.6847 -3.9976396,4.1919 -4.3450036,10.6472 -0.971185,15.2139 1.801743,2.4858 4.799128,4.3954 8.207598,4.7678 3.108325,0.3804 6.332133,-0.5836 8.63287,-2.4055 3.290768,-2.5473 4.876612,-6.5082 4.571794,-10.2994 -0.265111,-3.7547 -2.442108,-7.4816 -6.146816,-9.5115 -1.734944,-0.9565 -3.783948,-1.4822 -5.846718,-1.45 z"
-       style="fill:url(#radialGradient3734);fill-opacity:1;stroke:#084800;stroke-width:0.24997331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <g
-       id="layer1-9"
-       inkscape:label="Layer 1"
-       transform="matrix(0.52083334,0,0,0.52083334,21.18765,492.58613)">
-      <path
-         id="path2818-9"
-         d="m 23.689048,1004.615 c -6.566482,0.035 -12.802652,3.0068 -16.8950855,7.3695 -7.9952803,8.3838 -8.6900085,21.2943 -1.9423709,30.4277 3.6034875,4.9716 9.5982574,8.7908 16.4151954,9.5357 6.21665,0.7608 12.664266,-1.1673 17.26574,-4.8111 6.581537,-5.0945 9.753225,-13.0164 9.143588,-20.5987 -0.530221,-7.5095 -4.884215,-14.9633 -12.293632,-19.0231 -3.469888,-1.913 -7.567896,-2.9643 -11.693435,-2.9 z"
-         style="fill:url(#radialGradient3765);fill-opacity:1;stroke:#483600;stroke-width:0.49994662;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       style="fill:url(#radialGradient3729);fill-opacity:1;stroke:#084800;stroke-width:0.27080444;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 20.07833,1021.2607 c -3.556845,0.019 -6.93477,1.6287 -9.151505,3.9918 -4.3307765,4.5412 -4.7070875,11.5345 -1.0521169,16.4817 1.9518879,2.693 5.1990549,4.7617 8.8915639,5.1651 3.367352,0.4121 6.859811,-0.6322 9.352276,-2.6059 3.564999,-2.7596 5.282996,-7.0506 4.952777,-11.1577 -0.287204,-4.0676 -2.645617,-8.1051 -6.659051,-10.3041 -1.879522,-1.0362 -4.099277,-1.6057 -6.333944,-1.5709 z"
-       id="path2818" />
-    <path
-       style="fill:#467dd4;fill-opacity:0.50813007;stroke:none"
-       d="m 36.75,3.0625 c -3.759961,-0.068578 -8.176913,0.9657547 -12.84375,3.09375 0.564986,0.2051882 1.107867,0.464897 1.625,0.75 0.198361,0.1086869 0.404207,0.1943392 0.59375,0.3125 2.838526,-1.1588525 5.555283,-1.790625 7.96875,-1.90625 4.964846,-0.238 9.379885,1.1623699 10.457107,5.21967 1.915061,7.2128 -4.535691,16.449156 -14.762563,24.230393 C 19.767806,42.38677 6.7900614,41.99415 4.875,34.78125 3.8647325,30.976224 5.4160439,26.057378 8.65625,21.3125 8.257327,20.195635 8.0534098,19.046591 8,17.875 2.3221899,24.225218 -0.86234653,31.37718 0.1875,36.96875 1.8834928,46.00175 14.276307,48.771187 27.416053,41.581187 40.5558,34.391287 49.508493,19.9706 47.8125,10.9375 46.858504,5.8565 42.600862,3.169 36.75,3.0625 z"
-       transform="translate(0,1004.3622)"
-       id="path3629"
-       sodipodi:nodetypes="ccscssssccsssc" />
-    <path
-       id="path3748"
-       d="m 37.500865,1004.6786 c -1.020696,0.01 -1.990048,0.4674 -2.626177,1.1455 -1.242788,1.3032 -1.350777,3.31 -0.301922,4.7297 0.560127,0.7728 1.491955,1.3665 2.551582,1.4823 0.966318,0.1182 1.968537,-0.1814 2.683791,-0.7478 1.023036,-0.7919 1.516043,-2.0233 1.421281,-3.202 -0.08242,-1.1672 -0.759204,-2.3258 -1.910924,-2.9569 -0.539361,-0.2973 -1.176356,-0.4607 -1.817631,-0.4508 z"
-       style="fill:url(#radialGradient3750);fill-opacity:1;stroke:#084800;stroke-width:0.07771183;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <g
-       transform="matrix(0.20788647,0,0,0.20788647,5.8476493,833.57961)"
-       inkscape:label="Layer 1"
-       id="g3752">
-      <path
-         style="fill:url(#radialGradient3756);fill-opacity:1;stroke:#483600;stroke-width:0.49994662;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 23.689048,1004.615 c -6.566482,0.035 -12.802652,3.0068 -16.8950855,7.3695 -7.9952803,8.3838 -8.6900085,21.2943 -1.9423709,30.4277 3.6034875,4.9716 9.5982574,8.7908 16.4151954,9.5357 6.21665,0.7608 12.664266,-1.1673 17.26574,-4.8111 6.581537,-5.0945 9.753225,-13.0164 9.143588,-20.5987 -0.530221,-7.5095 -4.884215,-14.9633 -12.293632,-19.0231 -3.469888,-1.913 -7.567896,-2.9643 -11.693435,-2.9 z"
-         id="path3754" />
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!-- Created with Inkscape (http://www.inkscape.org/) -->\r
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" xmlns:dc="http://purl.org/dc/elements/1.1/">\r
+ <title>Plans Plant system icon</title>\r
+ <defs>\r
+  <linearGradient id="linearGradient3592">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </linearGradient>\r
+  <linearGradient id="linearGradient3592-0">\r
+   <stop stop-color="#f6e7b8" offset="0"/>\r
+   <stop stop-color="#a07800" offset="1"/>\r
+  </linearGradient>\r
+  <radialGradient id="radialGradient3729" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.02592978,0.03860307,-0.05670262,0.02822547,41.253344,1005.8695)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3734" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.02393518,0.0356336,-0.05234088,0.02605428,39.231609,995.59706)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3750" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.00744098,0.01107779,-0.01627176,0.00809977,43.577386,1000.2618)" r="205.71">\r
+   <stop stop-color="#b8f6c8" offset="0"/>\r
+   <stop stop-color="#00a029" offset="1"/>\r
+  </radialGradient>\r
+  <radialGradient id="radialGradient3756" gradientUnits="userSpaceOnUse" cy="510.94" cx="181.79" gradientTransform="matrix(0.04787036,0.07126721,-0.10468176,0.05210857,62.781384,976.20049)" r="205.71">\r
+   <stop stop-color="#f6e7b8" offset="0"/>\r
+   <stop stop-color="#a07800" offset="1"/>\r
+  </radialGradient>\r
+ </defs>\r
+ <metadata>\r
+  <rdf:RDF>\r
+   <cc:Work rdf:about="">\r
+    <dc:format>image/svg+xml</dc:format>\r
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>\r
+    <dc:title>Plans Plant system icon</dc:title>\r
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by/3.0/"/>\r
+    <dc:creator>\r
+     <cc:Agent>\r
+      <dc:title>Николай Слободской (Nick Slobodsky)</dc:title>\r
+     </cc:Agent>\r
+    </dc:creator>\r
+   </cc:Work>\r
+   <cc:License rdf:about="http://creativecommons.org/licenses/by/3.0/">\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>\r
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>\r
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>\r
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>\r
+   </cc:License>\r
+  </rdf:RDF>\r
+ </metadata>\r
+ <g transform="translate(0,-1004.3622)">\r
+  <path d="m19.685,1009.8c-3.2832,0.018-6.4013,1.5034-8.4475,3.6847-3.9976,4.1919-4.345,10.647-0.97118,15.214,1.8017,2.4858,4.7991,4.3954,8.2076,4.7678,3.1083,0.3804,6.3321-0.5836,8.6329-2.4055,3.2908-2.5473,4.8766-6.5082,4.5718-10.299-0.26511-3.7547-2.4421-7.4816-6.1468-9.5115-1.7349-0.9565-3.7839-1.4822-5.8467-1.45z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.24997331" fill="url(#radialGradient3734)"/>\r
+  <g transform="matrix(0.52083334,0,0,0.52083334,21.18765,492.58613)">\r
+   <path d="m23.689,1004.6c-6.5665,0.035-12.803,3.0068-16.895,7.3695-7.9953,8.3838-8.69,21.294-1.9424,30.428,3.6035,4.9716,9.5983,8.7908,16.415,9.5357,6.2166,0.7608,12.664-1.1673,17.266-4.8111,6.5815-5.0945,9.7532-13.016,9.1436-20.599-0.53022-7.5095-4.8842-14.963-12.294-19.023-3.4699-1.913-7.5679-2.9643-11.693-2.9z" stroke="#483600" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.49994662" fill="url(#radialGradient3756)"/>\r
+  </g>\r
+  <path d="m20.078,1021.3c-3.5568,0.019-6.9348,1.6287-9.1515,3.9918-4.3308,4.5412-4.7071,11.534-1.0521,16.482,1.9519,2.693,5.1991,4.7617,8.8916,5.1651,3.3674,0.4121,6.8598-0.6322,9.3523-2.6059,3.565-2.7596,5.283-7.0506,4.9528-11.158-0.2872-4.0676-2.6456-8.1051-6.6591-10.304-1.8795-1.0362-4.0993-1.6057-6.3339-1.5709z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.27080444" fill="url(#radialGradient3729)"/>\r
+  <path d="m36.75,3.0625c-3.76-0.068578-8.1769,0.96575-12.844,3.0938,0.56499,0.20519,1.1079,0.4649,1.625,0.75,0.19836,0.10869,0.40421,0.19434,0.59375,0.3125,2.8385-1.1589,5.5553-1.7906,7.9688-1.9062,4.9648-0.238,9.3799,1.1624,10.457,5.2197,1.9151,7.2128-4.5357,16.449-14.763,24.23-10.02,7.625-22.998,7.232-24.913,0.019-1.0103-3.805,0.541-8.724,3.7812-13.469-0.3989-1.116-0.6028-2.265-0.6562-3.437-5.6778,6.35-8.8624,13.502-7.8125,19.094,1.696,9.033,14.088,11.802,27.228,4.612s22.092-21.61,20.396-30.643c-0.953-5.0815-5.211-7.769-11.062-7.8755z" fill-opacity="0.50813007" transform="translate(0,1004.3622)" fill="#467dd4"/>\r
+  <path d="m37.501,1004.7c-1.0207,0.01-1.99,0.4674-2.6262,1.1455-1.2428,1.3032-1.3508,3.31-0.30192,4.7297,0.56013,0.7728,1.492,1.3665,2.5516,1.4823,0.96632,0.1182,1.9685-0.1814,2.6838-0.7478,1.023-0.7919,1.516-2.0233,1.4213-3.202-0.08242-1.1672-0.7592-2.3258-1.9109-2.9569-0.53936-0.2973-1.1764-0.4607-1.8176-0.4508z" stroke="#084800" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.07771183" fill="url(#radialGradient3750)"/>\r
+  <g transform="matrix(0.20788647,0,0,0.20788647,5.8476493,833.57961)">\r
+   <path d="m23.689,1004.6c-6.5665,0.035-12.803,3.0068-16.895,7.3695-7.9953,8.3838-8.69,21.294-1.9424,30.428,3.6035,4.9716,9.5983,8.7908,16.415,9.5357,6.2166,0.7608,12.664-1.1673,17.266-4.8111,6.5815-5.0945,9.7532-13.016,9.1436-20.599-0.53022-7.5095-4.8842-14.963-12.294-19.023-3.4699-1.913-7.5679-2.9643-11.693-2.9z" stroke="#483600" stroke-dasharray="none" stroke-miterlimit="4" stroke-width="0.49994662" fill="url(#radialGradient3756)"/>\r
+  </g>\r
+ </g>\r
+</svg>\r

diff --git a/www/ru/images/collage-full.png b/www/ru/images/collage-full.png
new file mode 100644 (file)
index 0000000..a17cd36
Binary files /dev/null and b/www/ru/images/collage-full.png differ

diff --git a/www/ru/images/collage.jpg b/www/ru/images/collage.jpg
new file mode 100644 (file)
index 0000000..c4ff013
Binary files /dev/null and b/www/ru/images/collage.jpg differ

diff --git a/www/ru/images/collage.png b/www/ru/images/collage.png
index dc12701..38cd00b 100644 (file)
Binary files a/www/ru/images/collage.png and b/www/ru/images/collage.png differ