From 515ef6eaa6eefb80f7b348ed0cdc202d7e8fff34 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 13:58:46 +0100 Subject: Part of bug #3436624: Fix delicious URL in template and translation base file --- data/templates/default/importDelicious.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/templates/default') diff --git a/data/templates/default/importDelicious.tpl.php b/data/templates/default/importDelicious.tpl.php index bc4d892..0f53cde 100644 --- a/data/templates/default/importDelicious.tpl.php +++ b/data/templates/default/importDelicious.tpl.php @@ -30,7 +30,7 @@ $this->includeTemplate($GLOBALS['top_include']);

    -
  1. export page at del.icio.us'); ?>.
    2. +
  2. export page at del.icio.us'); ?>.
  3. XML file to your computer'); ?>.
  4. Browse... to find this file on your computer. The maximum size the file can be is 1MB'); ?>.
  5. .
    6. -- cgit v1.2.3-54-g00ecf From cf80b6c5b8eef1761d1e9063e44b7449a63ad2d0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 14:54:54 +0100 Subject: Part of bug #3463481: Add atom self url to rss feed --- data/templates/default/rss.tpl.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data/templates/default') diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php index 6be5425..6b489d5 100644 --- a/data/templates/default/rss.tpl.php +++ b/data/templates/default/rss.tpl.php @@ -1,10 +1,13 @@ \n"; ?> - + <?php echo $feedtitle; ?> + -- cgit v1.2.3-54-g00ecf From 87f495d31b8f40375a6a1bf05a6d2bc9860029c3 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 14:58:16 +0100 Subject: Part of bug #3463481: add guid to items --- data/templates/default/rss.tpl.php | 1 + www/rss.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'data/templates/default') diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php index 6b489d5..fd5bdbf 100644 --- a/data/templates/default/rss.tpl.php +++ b/data/templates/default/rss.tpl.php @@ -17,6 +17,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; <?php echo htmlspecialchars($bookmark['title']); ?> + diff --git a/www/rss.php b/www/rss.php index 46c0ffd..3628a2e 100644 --- a/www/rss.php +++ b/www/rss.php @@ -137,6 +137,7 @@ $bookmarks_tmp = filter($bookmarks['bookmarks']); $bookmarks_tpl = array(); $latestdate = null; +$guidBaseUrl = addProtocolToUrl(ROOT) . '#'; foreach ($bookmarks_tmp as $key => $row) { $_link = $row['bAddress']; // Redirection option @@ -154,7 +155,8 @@ foreach ($bookmarks_tmp as $key => $row) { 'description' => $row['bDescription'], 'creator' => SemanticScuttle_Model_UserArray::getName($row), 'pubdate' => $_pubdate, - 'tags' => $row['tags'] + 'tags' => $row['tags'], + 'guid' => $guidBaseUrl . $row['bId'], ); } unset($bookmarks_tmp); -- cgit v1.2.3-54-g00ecf From f8b7d0243ca17506aeda80f2f0e3608b382da6aa Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:03:29 +0100 Subject: Fully fix bug #3463481: use proper self URL, different page url --- data/templates/default/rss.tpl.php | 2 +- doc/ChangeLog | 1 + www/rss.php | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'data/templates/default') diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php index fd5bdbf..4aba277 100644 --- a/data/templates/default/rss.tpl.php +++ b/data/templates/default/rss.tpl.php @@ -6,7 +6,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; > <?php echo $feedtitle; ?> - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 67da85e..d52787c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -13,6 +13,7 @@ ChangeLog for SemantiScuttle - Fix bug #3407728: Can't delete users from admin page - Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3436624: Wrong URL for Delicious API when importing +- Fix bug #3463481: RSS feed show warnings in feedvalidator.org - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) diff --git a/www/rss.php b/www/rss.php index 3628a2e..1f88944 100644 --- a/www/rss.php +++ b/www/rss.php @@ -124,7 +124,8 @@ if ($cat) { } $tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); -$tplVars['feedlink'] = addProtocolToUrl(ROOT); +$tplVars['pagelink'] = addProtocolToUrl(ROOT); +$tplVars['feedlink'] = addProtocolToUrl(ROOT) . 'rss?sort=' . getSortOrder(); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $bookmarks = $bookmarkservice->getBookmarks( -- cgit v1.2.3-54-g00ecf From d8ee343473c23d856f1b148067060e9edd0aa9b0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:09:39 +0100 Subject: Fix bug #3384416: Use URL with protocol in bookmarklet --- data/templates/default/bookmarklet.inc.php | 8 ++++---- doc/ChangeLog | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'data/templates/default') diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php index 9867745..c93f581 100644 --- a/data/templates/default/bookmarklet.inc.php +++ b/data/templates/default/bookmarklet.inc.php @@ -45,7 +45,7 @@ if (browser == "Opera") { + '' - + '
  6. <\/a><\/li>' + + '
  7. <\/a><\/li>' + '
  8. ' + '' + '' + '' diff --git a/doc/ChangeLog b/doc/ChangeLog index d52787c..13fc747 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -14,6 +14,7 @@ ChangeLog for SemantiScuttle - Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3436624: Wrong URL for Delicious API when importing - Fix bug #3463481: RSS feed show warnings in feedvalidator.org +- Fix bug #3384416: Use URL with protocol in bookmarklet - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) -- cgit v1.2.3-54-g00ecf From 645f21b1a90b7369218913eea8fba711e12f9d20 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 20 Jan 2012 15:20:16 +0100 Subject: Fix bug: Invalid HTML when website thumbnails are activated --- data/templates/default/bookmarks-thumbnail.inc.tpl.php | 2 +- doc/ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'data/templates/default') diff --git a/data/templates/default/bookmarks-thumbnail.inc.tpl.php b/data/templates/default/bookmarks-thumbnail.inc.tpl.php index 200b8f7..77cc67f 100644 --- a/data/templates/default/bookmarks-thumbnail.inc.tpl.php +++ b/data/templates/default/bookmarks-thumbnail.inc.tpl.php @@ -13,6 +13,6 @@ $thumbnailHash = md5( $address . $GLOBALS['thumbnailsUserId'] . $GLOBALS['thumbnailsKey'] ); //echo ''; -echo ''; +echo ''; ?> \ No newline at end of file diff --git a/doc/ChangeLog b/doc/ChangeLog index 13fc747..3f93289 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,6 +15,7 @@ ChangeLog for SemantiScuttle - Fix bug #3436624: Wrong URL for Delicious API when importing - Fix bug #3463481: RSS feed show warnings in feedvalidator.org - Fix bug #3384416: Use URL with protocol in bookmarklet +- Fix bug: Invalid HTML when website thumbnails are activated - Implement request #3403609: fr_CA translation update - Implement patch #3476011: PostgreSQL tables can not be initialized (Frédéric Fauberteau [triaxx]) -- cgit v1.2.3-54-g00ecf