More start here page work, importing bookmarks from mozilla now should

2003-01-08  Marco Pesenti Gritti  <marco@it.gnome.org>

	* TODO:
	* data/starthere/Makefile.am:
	* data/starthere/index.xml.in:
	* data/starthere/section.xsl:
	* data/starthere/smartbookmarks.xml.in:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_class_init):
	* embed/ephy-embed-shell.h:
	* embed/mozilla/StartHereProtocolHandler.cpp:
	* po/POTFILES.in:
	* src/ephy-shell.c: (ephy_shell_command_cb), (ephy_shell_init):

	More start here page work, importing bookmarks from mozilla
	now should work.

4 files changed, 40 insertions, 4 deletions

diff --git a/data/starthere/Makefile.am b/data/starthere/Makefile.am
index 77b723f8b..1cdf7815f 100644
--- a/data/starthere/Makefile.am
+++ b/data/starthere/Makefile.am
@@ -1,7 +1,7 @@
 @INTLTOOL_XML_RULE@
 
 xmldir = $(pkgdatadir)/starthere
-xml_in_files = index.xml.in
+xml_in_files = index.xml.in smartbookmarks.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
 pagedir = $(pkgdatadir)/starthere
diff --git a/data/starthere/index.xml.in b/data/starthere/index.xml.in
index dd8a0f9a8..7427ab1ee 100644
--- a/data/starthere/index.xml.in
+++ b/data/starthere/index.xml.in
@@ -8,7 +8,9 @@
 <_title>The web browser</_title>
 <_paragraph>
 You can start browsing web pages either by typing a location (example: www.google.com) 
-or a keyword (example: best computer shop) in the toolbar text entry.
+or a keyword (example: best computer shop) in the toolbar text entry and then pressing
+the Enter key. You can remember important visited pages using bookmarks or browse all of
+them with the history dialog.
 </_paragraph>
 <_title>Getting started</_title>
 <_paragraph>
@@ -18,6 +20,6 @@ click on one of the links below:
 </_paragraph>
 <_paragraph>
 If your internet connection requires it, make sure to setup your proxy in the
-desktop wide <_action>configuration dialog</_action>.
+desktop wide <action id="configure-network" param="">configuration dialog</action>.
 </_paragraph>
 </section>
diff --git a/data/starthere/section.xsl b/data/starthere/section.xsl
index 62bdcf598..fb19cded3 100644
--- a/data/starthere/section.xsl
+++ b/data/starthere/section.xsl
@@ -55,10 +55,16 @@
 </xsl:template>
 
 <xsl:template match="action">
-<a href="action:{@id}?{@param}">
+<a href="start-here:{@id}?{@param}">
   <xsl:apply-templates/>
 </a>
 </xsl:template>
 
+<xsl:template match="smartbookmark">
+<a type="text/smartbookmark" href="{@normal}" rel="{@smart}" title="{@title}">
+  <xsl:apply-templates/>
+</a><br/>
+</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/data/starthere/smartbookmarks.xml.in b/data/starthere/smartbookmarks.xml.in
new file mode 100644
index 000000000..7eed310eb
--- /dev/null
+++ b/data/starthere/smartbookmarks.xml.in
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="section.xsl"?>
+<section>
+<bar>
+<item section="start-here:">Start Here</item>
+<item section="start-here:smartbookmarks">Smart Bookmarks</item>
+</bar>
+<content>
+<_title>Smart Bookmarks</_title>
+<_paragraph>
+Smart bookmarks allows to perform searches and similar actions directly from
+the location entry.
+</_paragraph>
+<_paragraph>
+Right click the icon and choose "Add Bookmark" from the menu list.
+When you will type a word in the toolbar entry, a list of your smart
+bookmarks will be displayed. Just choose one of them to perform the search.
+The next time you type a word, just pressing the Enter key will be enough to
+perform the same action.
+</_paragraph>
+<smartbookmark normal="http://www.google.com/" smart="http://www.google.com/search?q=%s" title="Search the web - Google">
+Search the web - Google
+</smartbookmark>
+<smartbookmark normal="http://images.google.com/" smart="http://images.google.com/images?q=%s" title="Search images - Google">
+Search images - Google
+</smartbookmark>
+</content>
+</section>