From 257ea4ff6e8825f4b1ccefacae8dbaed8ccaf30a Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 4 Jul 2011 18:05:33 +0200
Subject: make rST rendering work fully

---
 build.xml | 53 ++++++++++++++---------------------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index d0637c7..83e5c70 100644
--- a/build.xml
+++ b/build.xml
@@ -30,7 +30,8 @@
   <property name="sffilepath"  value="s/se/semanticscuttle/" />
   <property name="svnpath"     value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" />
 
-  <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
+  <taskdef name="rST" classname="phing.tasks.ext.rSTTask" />
+  <taskdef name="d51pearpkg2" classname="phing.tasks.ext.d51PearPkg2Task" />
 
   <target name="zip" depends="check"
    description="Create zip file for release"
@@ -209,47 +210,21 @@
 
   <!-- you need to have the python docutils package installed, since
        we use the rst2html tool -->
-  <target name="build-docs">
-   <foreach param="fname" absparam="abs-fname" target="build-doc-file">
-     <fileset dir=".">
-      <include name="doc/ChangeLog"/>
-      <include name="doc/**.txt"/>
-      <include name="doc/**.rst"/>
-      <include name="doc/**/*.rst"/>
-      <exclude name="doc/LICENSE.txt"/>
-      <exclude name="doc/developers/TODO.rst"/>
-     </fileset>
-   </foreach>
+  <target name="build-docs" description="render documentation">
+   <rST format="html" uptodate="true">
+    <fileset dir="doc">
+     <include name="ChangeLog"/>
+     <include name="**.txt"/>
+     <include name="**.rst"/>
+     <include name="**/*.rst"/>
+     <exclude name="LICENSE.txt"/>
+     <exclude name="developers/TODO.rst"/>
+    </fileset>
+    <mapper type="regexp" from="^doc/(.+?)(.rst|.txt)?$" to="dist/docs/\1.html"/>
+   </rST>
   </target>
 
 
-  <target name="build-doc-file" depends="check"
-   description="Builds a single documentation file. Pass file path as $fname"
-  >
-   <echo msg="${fname}"/>
-   <php function="preg_replace" returnProperty="outfile">
-    <param value="/^(.+)(.rst|.txt)$/"/>
-    <param value="dist/\1.html"/>
-    <param value="${fname}"/>
-   </php>
-
-   <!-- only render file if the doc file is newer than the html file -->
-   <property name="isuptodate" value="false"/>
-   <uptodate property="isuptodate" srcfile="${fname}" targetfile="${outfile}" />
-   <if>
-    <not><istrue value="${isuptodate}"/></not>
-    <then>
-     <exec
-      command="rst2html --exit-status=2 ${fname} ${outfile}"
-      checkreturn="1"
-      />
-    </then>
-   </if>
-
-  </target>
-
-
-
   <target name="release" depends="check,zip,package,deploy-sf"
    description="Release the version on sourceforge"
    >
-- 
cgit v1.2.3-54-g00ecf


From ae86aa2b5685f0e4f4c6cce9ee3511e60dff7dda Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 4 Jul 2011 18:25:15 +0200
Subject: doc directories are created automatically

---
 build.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 83e5c70..7b9229d 100644
--- a/build.xml
+++ b/build.xml
@@ -333,8 +333,6 @@
     <fail unless="sffilepath" message="Sourceforge project file path not defined!" />
 
     <mkdir dir="dist" />
-    <mkdir dir="dist/doc" />
-    <mkdir dir="dist/doc/developers" />
   </target>
 
 </project>
-- 
cgit v1.2.3-54-g00ecf


From 651d5df1f90985a28a4e7a47cf54292e6f7fefb2 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 5 Jul 2011 06:46:51 +0200
Subject: add stylesheet to docs

---
 build.xml          | 13 ++++++++++---
 res/docs/style.css | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 res/docs/style.css

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 7b9229d..ef57fb4 100644
--- a/build.xml
+++ b/build.xml
@@ -208,10 +208,10 @@
   </target>
 
 
-  <!-- you need to have the python docutils package installed, since
-       we use the rst2html tool -->
   <target name="build-docs" description="render documentation">
-   <rST format="html" uptodate="true">
+   <rST format="html" uptodate="false"
+        toolparam="--stylesheet=res/docs/style.css"
+        >
     <fileset dir="doc">
      <include name="ChangeLog"/>
      <include name="**.txt"/>
@@ -221,6 +221,13 @@
      <exclude name="developers/TODO.rst"/>
     </fileset>
     <mapper type="regexp" from="^doc/(.+?)(.rst|.txt)?$" to="dist/docs/\1.html"/>
+<!--
+    <filterchain>
+     <replacetokenswithfile dir="res/docs">
+      <
+     </replacetokenswithfile>
+    </filterchain>
+-->
    </rST>
   </target>
 
diff --git a/res/docs/style.css b/res/docs/style.css
new file mode 100644
index 0000000..a49b9c1
--- /dev/null
+++ b/res/docs/style.css
@@ -0,0 +1,25 @@
+/* SemanticScuttle improvements */
+h1.title {
+    background-image: url("data:image/png;base64,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");
+    background-repeat: no-repeat;
+    padding-left: 64px;
+    padding-top: 0.2em;
+    margin-bottom: 00px;
+    height: 60px;
+    border-bottom: 3px solid #666;
+}
+h2 {
+    margin-top: 1.5em;
+   
+}
+pre {
+    padding: 1em;
+    background-color: #EEE;
+    border: 1px solid #BBB;
+    width: auto;
+}
+
+tt, code {
+    background-color: #DDD;
+    padding: 0.2ex;
+}
-- 
cgit v1.2.3-54-g00ecf


From 846e3a38cf049266a33cb3e553fcacbcbdc0bfa3 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 5 Jul 2011 19:55:01 +0200
Subject: allinone file, which we do not use for now

---
 build.xml        |  3 ++-
 doc/allinone.rst | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 doc/allinone.rst

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index ef57fb4..54456e3 100644
--- a/build.xml
+++ b/build.xml
@@ -209,7 +209,7 @@
 
 
   <target name="build-docs" description="render documentation">
-   <rST format="html" uptodate="false"
+   <rST format="html" uptodate="true"
         toolparam="--stylesheet=res/docs/style.css"
         >
     <fileset dir="doc">
@@ -219,6 +219,7 @@
      <include name="**/*.rst"/>
      <exclude name="LICENSE.txt"/>
      <exclude name="developers/TODO.rst"/>
+     <exclude name="allinone.rst"/>
     </fileset>
     <mapper type="regexp" from="^doc/(.+?)(.rst|.txt)?$" to="dist/docs/\1.html"/>
 <!--
diff --git a/doc/allinone.rst b/doc/allinone.rst
new file mode 100644
index 0000000..e5ca3c7
--- /dev/null
+++ b/doc/allinone.rst
@@ -0,0 +1,31 @@
+=============================
+SemanticScuttle documentation
+=============================
+
+.. contents::
+
+First reads
+===========
+.. include:: README.rst
+.. include:: INSTALL.txt
+.. include:: UPGRADE.txt
+
+
+
+Features
+========
+.. include:: authentication.rst
+.. include:: ssl-client-certificates.rst
+.. include:: themes.rst
+
+
+
+Developer documentation
+=======================
+.. include:: developers/rules.rst
+.. include:: developers/api.rst
+.. include:: developers/debugging.rst
+.. include:: developers/release-new-version.rst
+.. include:: developers/running-unit-tests.rst
+.. include:: developers/translation.rst
+.. include:: ChangeLog
-- 
cgit v1.2.3-54-g00ecf


From 83714e3889d846639c24c3e6401eb026969230b8 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 21 Jul 2011 22:28:42 +0200
Subject: make release docs more readable, update version to 0.98, update pear
 package changelog, fix pear package inclusion files

---
 build.xml                              | 62 +++++++++++++++++++++-------------
 data/templates/default/about.tpl.php   |  2 +-
 doc/ChangeLog                          |  1 +
 doc/developers/release-new-version.rst | 12 +++----
 4 files changed, 47 insertions(+), 30 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 54456e3..202b3b8 100644
--- a/build.xml
+++ b/build.xml
@@ -9,18 +9,31 @@
   <property file="build.properties" />
   <property file="html.properties" />
 
-  <property name="version-m"  value="0.97" />
-  <property name="version"    value="0.97.0" />
+  <property name="version-m"  value="0.98" />
+  <property name="version"    value="0.98.0" />
   <property name="stability"  value="beta" />
-  <property name="releasenotes" value="- Many SQL optimizations
-- SemanticScuttle shows bookmarks 4 times faster now
-- New config option to skip 'SET NAMES UTF8' call: $dbneedssetnames
-- Do not highlight admin bookmarks when $enableAdminColors is disabled
-- Add russian translation
-- Make HTML export follow the specifications a bit better
-- Fix bug #2953732: faulty error message for duplicate bookmarks
-- Fix bug #2960663: do not send content-type headers twice for ajax/api scripts
-- Fix bug #2976593: fr_FR locale is vietnamese
+  <property name="releasenotes" value="- Switch to jQuery and drop dojo
+- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton)
+- Implement request #3164348: Configurable default privacy (Brett Dee)
+- Implement request #1989987: Theming support
+- Implement request #3054906: Show user's full name instead of nickname
+- Implement patch #3059829: update ``FR_CA`` translation
+- Fix bug #3187177: Wrong URL / Export XML Bookmarks
+- Fix bug #3097187: Using opensearch with two tags does not work in Firefox
+- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks
+- Fix bug #3168521: Title of tag-filtered RSS Feed is broken
+- Fix bug #2853627: Javascript warning
+- Fix bug in ``getTagsForBookmarks()`` that fetched all tags
+- Fix privacy issue when fetching tags of several users
+- Fix Google custom search XML
+- Show error message on mysqli connection errors
+- Update php-gettext library to 1.0.10
+- ``api/posts/add`` respects the 'replace' parameter now
+- Only URLs with an allowed protocol may be added to the database
+- Support HTTPS connections when ``$root`` is not configured
+- SQL schema version table to ease future database upgrades
+- Documentation is written with rST (reStructuredText) now
+- Support per-host configuration files
 " />
   <property name="zipfile"     value="${phing.project.name}-${version}.zip" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
@@ -67,7 +80,6 @@
   <target name="package" depends="check"
    description="Creates the pear package"
   >
-   <!-- fixme: create package.xml with d51pearpkg2 -->
    <d51pearpkg2 dir="." baseinstalldir="/">
      <name>SemanticScuttle</name>
      <summary>A social bookmarking tool</summary>
@@ -109,30 +121,34 @@
      <ignore>**/.svn</ignore>
      <ignore>build*</ignore>
      <ignore>data/config.php</ignore>
+     <ignore>data/config.testing.php</ignore>
+     <ignore>data/config.testing-tmp.php</ignore>
      <ignore>data/locales/messages.po</ignore>
      <ignore>data/locales/*/LC_MESSAGES/messages.po</ignore>
      <ignore>dist/**</ignore>
-     <ignore>doc/developers/**</ignore>
      <ignore>scripts/**</ignore>
      <ignore>src/php-gettext/examples/**</ignore>
-     <ignore>src/php-gettext/bin/**</ignore>
-     <ignore>*.tgz</ignore>
+     <ignore>src/php-gettext/tests/**</ignore>
      <ignore>*.properties</ignore>
+     <ignore>*.sql</ignore>
+     <ignore>*.tgz</ignore>
 
-     <replacement
-      path="src/SemanticScuttle/header.php"
+     <replacement path="src/SemanticScuttle/header.php"
+      type="pear-config" from="@data_dir@" to="data_dir"
+      />
+     <replacement path="src/SemanticScuttle/header.php"
+      type="pear-config" from="@www_dir@" to="www_dir"
+      />
+     <replacement path="src/SemanticScuttle/Config.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
-     <replacement
-      path="src/SemanticScuttle/header.php"
+     <replacement path="src/SemanticScuttle/Config.php"
       type="pear-config" from="@www_dir@" to="www_dir"
       />
-     <replacement
-      path="www/www-header.php"
+     <replacement path="www/www-header.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
-     <replacement
-      path="tests/prepare.php"
+     <replacement path="tests/prepare.php"
       type="pear-config" from="@data_dir@" to="data_dir"
       />
 
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index 7bff98d..8a9b206 100644
--- a/data/templates/default/about.tpl.php
+++ b/data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.97.0</li>
+<li>SemanticScuttle v0.98.0</li>
 <?php endif ?>
 </ul>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 87c1b46..7ed1796 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -26,6 +26,7 @@ ChangeLog for SemantiScuttle
 - Support HTTPS connections when ``$root`` is not configured
 - SQL schema version table to ease future database upgrades
 - Documentation is written with rST (reStructuredText) now
+- Support per-host configuration files
 
 
 0.97.2 - 2011-02-17
diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst
index 4b2540a..a5e77dc 100644
--- a/doc/developers/release-new-version.rst
+++ b/doc/developers/release-new-version.rst
@@ -2,18 +2,18 @@ How to release a new version of SemanticScuttle
 ===============================================
 
 0. Run unit tests and verify that all of them pass
-1. Update doc/ChangeLog
-2. Update doc/UPGRADE.txt
-3. Update version in data/templates/about.tpl.php,
-   build.xml and doc/README.txt
+1. Update ``doc/ChangeLog``
+2. Update ``doc/UPGRADE.txt``
+3. Update version in ``data/templates/about.tpl.php``,
+   ``build.xml`` and ``doc/README.rst``
 4. Create a release zip file via the build script:
-   Just type "phing".
+   Just type "``phing``".
 5. Make a test installation from your zip file with a fresh
    database. Register a user, add bookmarks etc.
 6. When all is fine, it's time to release.
    The build script takes care for most of the
    tasks.
-   Run "phing release", and it will upload the release to
+   Run "``phing release``", and it will upload the release to
    sourceforge and create a svn tag.
 7. Write announcement mail to the SemanticScuttle mailing list
    semanticscuttle-devel@lists.sourceforge.net
-- 
cgit v1.2.3-54-g00ecf


From 62afbfc18412db7bc4b4ede0a46691b021ab7dea Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 21 Jul 2011 22:33:27 +0200
Subject: include sql files in pear package

---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 202b3b8..9627c01 100644
--- a/build.xml
+++ b/build.xml
@@ -66,11 +66,12 @@
         <exclude name="**/.gitignore/"/>
         <exclude name="**/.svn/"/>
         <exclude name="data/config.php"/>
+        <exclude name="data/config.testing.php"/>
+        <exclude name="data/config.testing-tmp.php"/>
         <exclude name="data/locales/messages.po"/>
         <exclude name="data/locales/*/LC_MESSAGES/messages.po"/>
-        <exclude name="doc/developers/"/>
         <exclude name="src/php-gettext/examples/" />
-        <exclude name="src/php-gettext/bin/"/>
+        <exclude name="src/php-gettext/tests/"/>
       </fileset>
     </zip>
   </target>
@@ -130,7 +131,7 @@
      <ignore>src/php-gettext/examples/**</ignore>
      <ignore>src/php-gettext/tests/**</ignore>
      <ignore>*.properties</ignore>
-     <ignore>*.sql</ignore>
+     <ignore>semanticscuttle-dump.sql</ignore>
      <ignore>*.tgz</ignore>
 
      <replacement path="src/SemanticScuttle/header.php"
-- 
cgit v1.2.3-54-g00ecf


From 6f93d0b0205cb6b5fe0741070e96e56f7739a25f Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 21 Jul 2011 23:10:53 +0200
Subject: task to copy docs to website dir

---
 build.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 9627c01..9ca4c74 100644
--- a/build.xml
+++ b/build.xml
@@ -283,8 +283,8 @@
 
 
 
-  <target name="deploy-sf-pear" depends="check,package"
-   description="Update PEAR channel on sourceforge"
+  <target name="deploy-sf-pear" depends="check,package,docs-to-website"
+   description="Update PEAR channel + website on sourceforge"
    >
     <available file="${websitedir}"
      type="dir" property="available.websitedir"
@@ -348,6 +348,16 @@
      />
   </target>
 
+  <target name="docs-to-website" depends="build-docs"
+          description="copy docs to website directory"
+  >
+   <copy todir="${websitedir}/docs">
+    <fileset dir="dist/docs">
+     <include name="**"/>
+    </fileset>
+   </copy>
+  </target>
+
 
   <target name="check"
    description="Check variables"
-- 
cgit v1.2.3-54-g00ecf


From d970754ff1e2a8cc416f90ef71f5848d788f9515 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 21 Jul 2011 23:15:18 +0200
Subject: doc deployment task

---
 build.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 9ca4c74..8997366 100644
--- a/build.xml
+++ b/build.xml
@@ -283,7 +283,7 @@
 
 
 
-  <target name="deploy-sf-pear" depends="check,package,docs-to-website"
+  <target name="deploy-sf-pear" depends="check,package"
    description="Update PEAR channel + website on sourceforge"
    >
     <available file="${websitedir}"
@@ -348,17 +348,27 @@
      />
   </target>
 
-  <target name="docs-to-website" depends="build-docs"
-          description="copy docs to website directory"
+
+  <target name="deploy-docs" depends="build-docs"
+          description="sync docs to sourceforge website"
   >
    <copy todir="${websitedir}/docs">
     <fileset dir="dist/docs">
      <include name="**"/>
     </fileset>
    </copy>
+
+   <exec
+     command="rsync -avP -e ssh . ${sfuser},${sfproject}@web.sourceforge.net:htdocs/docs"
+     dir="${websitedir}/docs"
+     escape="false" checkreturn="false"
+     passthru="true"
+     />
   </target>
 
 
+
+
   <target name="check"
    description="Check variables"
    >
-- 
cgit v1.2.3-54-g00ecf


From 7cb53eb4e55943aa59928a97391ad9507f907cbc Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 21 Jul 2011 23:22:29 +0200
Subject: task to deploy the demo to the website

---
 build.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 8997366..6bd5eb2 100644
--- a/build.xml
+++ b/build.xml
@@ -367,6 +367,18 @@
   </target>
 
 
+  <target name="deploy-demo"
+          description="sync demo to sourceforge website"
+  >
+   <exec
+     command="rsync -avP -e ssh . ${sfuser},${sfproject}@web.sourceforge.net:htdocs/demo"
+     dir="${websitedir}/demo"
+     escape="false" checkreturn="false"
+     passthru="true"
+     />
+  </target>
+
+
 
 
   <target name="check"
-- 
cgit v1.2.3-54-g00ecf