Update WEBSITE and DOCs.

- Attempt to implement image rendering.

doc/Features.txt

@@ -3,70 +3,70 @@
 SFLphone feature map
 --------------------
 
-  * SIP features
-    - transfer: [done] and tested
-    - reinvite: [done] and tested
-    - play DTMF sipinfo: [done] and tested
-    - receive text message: [done] and tested with sipsak
-    - SFLphone to snom (asterisk): [done] and tested
-    - SFLphone to SFLphone (IP and no proxy): [done] and tested
-    - conference: [not done] yet
-    - send text message: [not done] yet
-  * IAX support: [not done] yet
-  * Audio devices:
-    - OSS: [done] and tested (portaudio)
-    - ALSA: [done] and tested (portaudio)
-    - ALSA with dmix: [not tested]
-    - JACK: [partial], portaudio has problems to open it
-    - ASIO on windows: in portaudio, [not tested]
-    - on MacOSX: we can't use portaudio in 8kHz. libsamplerate was added to convert from 44,1kHz to 8kHz.
-  * Codecs:
-    - G711a/PCM: [done] and tested
-    - G711u: [done] and tested
-    - GSM: [done] and tested
-    - Speex codec 8khz: [not tested] but integrated
-    - ILBc: [notdone]
-  * Video support:
-    - video integration in SIP: [not done]
-    - video integration in IAX: [not done]
-    - integration in QT: not done
-  * Zeroconf:
-    - sflphone-d: partially
-    - sflphone-qt: not done
-  * SFLphone Client:
-    - QT3: done and tested on linux
-    - QT4: not tested
-    - GTK: not done
-    - Command Line Interface (in C): partially done
-    - Command Line Interface (in python): not done
-  * MacOSX port:
-    - compilation: done
-    - 44,1khz to 8khz conversion (with libsamplerate): not tested
-  * Windows port:
-    - compilation of sflphoned: not done
-    - compilation of sflphone-qt (qt3): not done
-    - compilation of sflphone-qt (qt4): not done
-  * Desktop Integration:
-    - firefox sip: handling: open sflphone, not integrated in install process
-    - konqueror sip: handling: open sflphone, not integrated in install process
-    - addressbook: open sflphone and call, not integrated in install process
-    - inter-process communication: [not done]
-    - tray icon: [not done]
-    - menu icon (.desktop): only in fedora rpm
-    - LDAP enterprise directory support: [not done]
-  * Packaging:
-    - Remove libeXosip2 from package: [not done]
-    - Remove portaudio final from package: [not done]
-    - Fedora Core 4 packages: [done]
-    - Suse 9.3 packages: [done]
-    - .tar.gz publication: [done]
-    - Debian packages: [not done]
-    - Suse 10 packages: [not done]
+ * SIP features
+   - transfer: [done] and tested
+   - reinvite: [done] and tested
+   - play DTMF sipinfo: [done] and tested
+   - receive text message: [done] and tested with sipsak
+   - SFLphone to snom (asterisk): [done] and tested
+   - SFLphone to SFLphone (IP and no proxy): [done] and tested
+   - conference: [not done] yet
+   - send text message: [not done] yet
+ * IAX support: [not done] yet
+ * Audio devices:
+   - OSS: [done] and tested (portaudio)
+   - ALSA: [done] and tested (portaudio)
+   - ALSA with dmix: [not tested]
+   - JACK: [partial], portaudio has problems to open it
+   - ASIO on windows: in portaudio, [not tested]
+   - on MacOSX: we can't use portaudio in 8kHz. libsamplerate was added to convert from 44,1kHz to 8kHz.
+ * Codecs:
+   - G711a/PCM: [done] and tested
+   - G711u: [done] and tested
+   - GSM: [done] and tested
+   - Speex codec 8khz: [not tested] but integrated
+   - ILBc: [notdone]
+ * Video support:
+   - video integration in SIP: [not done]
+   - video integration in IAX: [not done]
+   - integration in QT: not done
+ * Zeroconf:
+   - sflphone-d: partially
+   - sflphone-qt: not done
+ * SFLphone Client:
+   - QT3: done and tested on linux
+   - QT4: not tested
+   - GTK: not done
+   - Command Line Interface (in C): partially done
+   - Command Line Interface (in python): not done
+ * MacOSX port:
+   - compilation: done
+   - 44,1khz to 8khz conversion (with libsamplerate): not tested
+ * Windows port:
+   - compilation of sflphoned: not done
+   - compilation of sflphone-qt (qt3): not done
+   - compilation of sflphone-qt (qt4): not done
+ * Desktop Integration:
+   - firefox sip: handling: open sflphone, not integrated in install process
+   - konqueror sip: handling: open sflphone, not integrated in install process
+   - addressbook: open sflphone and call, not integrated in install process
+   - inter-process communication: [not done]
+   - tray icon: [not done]
+   - menu icon (.desktop): only in fedora rpm
+   - LDAP enterprise directory support: [not done]
+ * Packaging:
+   - Remove libeXosip2 from package: [not done]
+   - Remove portaudio final from package: [not done]
+   - Fedora Core 4 packages: [done]
+   - Suse 9.3 packages: [done]
+   - .tar.gz publication: [done]
+   - Debian packages: [not done]
+   - Suse 10 packages: [not done]
 
 SFLphone-qt (linux)
 
-  * audiodevice input/output selector: [not done]
-  * drag'n'drop over lcd screen: [done]
-  * paste with ctrl+v: [done]
-  * keyboard mapping: [partial], not completed
-  * keyboard shortcut: [partial], not completed
+ * audiodevice input/output selector: [not done]
+ * drag'n'drop over lcd screen: [done]
+ * paste with ctrl+v: [done]
+ * keyboard mapping: [partial], not completed
+ * keyboard shortcut: [partial], not completed

doc/Screenshots.txt

+// AsciiDoc file
+
+Screenshots
+-----------
+
+.Screenshot de 2007
+sflimage::images/SflphonePOuetpoUEt.png[SFLphone qt3]
+
+.Screenshot de SFLphone 0.7
+sflimage::images/sflphone0.7.png[SFLphone 0.7]
+
+

doc/asciidoc.conf

+
+
 #
 # Used in Features.txt
 #
@@ -17,3 +19,17 @@ ifdef::backend-xhtml11[]
 [sflink-inlinemacro]
 <a href="index.php?f={target}.txt">{0?{0}}{0!{target}}</a>
 endif::backend-xhtml11[]
+
+#
+# Image links (with "image:")
+#
+[sflimage-blockmacro]
+<div class="image">
+<a id="{id}"></a>
+<div class="content">
+<a class="image" href="{link#}">
+<img src="index.php?i={target}" alt="{1={target}}"{1? title="{1}"}{width? width="{width}"}{height? height="{height}"}/>
+{link#}</a>
+</div>
+<div class="image-title">{title}</div>
+</div>
\ No newline at end of file

www/index.php

@@ -9,14 +9,34 @@
 require_once('sflphone.funcs.php');
 
 
+// We've requested an image, fetch it, and send it.
+if (defined($_REQUEST['i'])) {
+  $img = $_REQUEST['i'];
+  switch(strtolower(substr($img, -3))) {
+  case 'jpg':
+    header("Content-Type: image/jpeg");
+    break;
+  case 'png':
+    header("Content-Type: image/png");
+    break;
+  case 'gif':
+    header("Content-Type: image/gif");
+    break;
+  default:
+    break;
+  }
+
+  show_page($img);
+}
 
-$module = '';
 
+
+$module = '';
 // Default module: home
-if (!$_REQUEST['l']) {
+if (!$_REQUEST['mod']) {
   $module = 'home';
 } else {
-  $module = $_REQUEST['l'];
+  $module = $_REQUEST['mod'];
 }
 
 

www/sflphone.funcs.php

@@ -20,7 +20,7 @@ require_once('config.inc.php');
 /**
  * Retrieve page, compile it if new, cache it.
  *
- * @param string File name (without the .txt) in the $PREFIX dir.
+ * @param string File name (including the extension) in the $PREFIX dir.
  * @return HTML content
  */
 function get_page($page) {
@@ -51,7 +51,7 @@ function get_page($page) {
 /**
  * Show page
  *
- * @param string File name (without the .txt) in the $PREFIX dir.
+ * @param string File name (including the ext.) in the $PREFIX dir.
  */
 function show_page($page) {
   print get_page($page);
@@ -170,7 +170,7 @@ function get_git_hash($file) {
 
   $output = array();
 
-  $cmd = "cd $GIT_REPOS; git-ls-tree $USE_BRANCH \"".git_filename($file).".txt\"";
+  $cmd = "cd $GIT_REPOS; git-ls-tree $USE_BRANCH \"".git_filename($file)."\"";
 
   $string = exec($cmd, $output);
 

www/templates/page_devel.php

 <h1>Source code</h1>
 
-<?php show_page('Git_Access'); ?>
+<?php show_page('Git_Access.txt'); ?>

www/templates/page_download.php

-<h1>Download</h2>
+<h1>Download</h1>
 
-<?php show_page('Download'); ?>
+<?php show_page('Download.txt'); ?>

www/templates/page_goals.php

 <h1>Goals</h1>
 
-<?php show_page('Goals'); ?>
+<?php show_page('Goals.txt'); ?>

www/templates/page_home.php

 
-<?php show_page('News'); ?>
+<?php show_page('News.txt'); ?>
 
 
-<?php show_page('About'); ?>
+<?php show_page('About.txt'); ?>
 
 
-<h1>Get started</h2>
+<h1>Get started</h1>
 
 <p>
 The project is ongoing well, but your help and contribution is needed to make this software even better!
@@ -13,20 +13,20 @@ The project is ongoing well, but your help and contribution is needed to make th
 <p>&nbsp;</p>
 <p>
 <img align="left" style="margin-right: 10px; margin-left: 5em;" src="images/info.png"/> 
-<a href="index.php?l=goals">Goals</a> - where do we want to be <br/>
-<a href="index.php?l=features">Features</a> - where we are <br/>
-<a href="index.php?l=screenshots">Screenshots</a> - we love them
+<a href="index.php?mod=goals">Goals</a> - where do we want to be <br/>
+<a href="index.php?mod=features">Features</a> - where we are <br/>
+<a href="index.php?mod=screenshots">Screenshots</a> - we love them
 </p>
 <br style="clear: both;"/>
 <p>
 <img align="left" style="margin-right: 10px; margin-left: 5em;" src="images/fetch.png"/>
-<a href="index.php?l=download">Download</a> - grab the latest source code<br/>
-<a href="index.php?l=build">Build</a> - build and installation instructions <br/>
+<a href="index.php?mod=download">Download</a> - grab the latest source code<br/>
+<a href="index.php?mod=build">Build</a> - build and installation instructions <br/>
 </p>
 <br style="clear: both;"/>
 <p>
 <img align="left" style="margin-right: 10px; margin-left: 5em;" src="images/devel.png"/>
 <a href="/mantis">File a bug</a> - report errors<br/>
-<a href="index.php?l=discuss">Discuss</a> - Subscribe to a mailing list or contact us <br/>
-<a href="index.php?l=devel">Develop</a> - Submit patches, work on the code, contribute
+<a href="index.php?mod=discuss">Discuss</a> - Subscribe to a mailing list or contact us <br/>
+<a href="index.php?mod=devel">Develop</a> - Submit patches, work on the code, contribute
 </p>
\ No newline at end of file

www/templates/page_screenshots.php

+<h1>Screenshots</h1>
+
+<?php show_page('Screenshots.txt'); ?>