From 791f1492478e4497a554c2a3a1c8737c36d71821 Mon Sep 17 00:00:00 2001
From: mensonge
Date: Thu, 24 Apr 2008 08:48:57 +0000
Subject: Interface design: improve tags presentation, menu box, popup size,
redirection after adding a bookmark, RSS link position
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@118 b3834d28-1941-0410-a4f8-b48e95affb8f
---
templates/bookmarks.tpl.php | 14 +++++++++++++-
templates/editbookmark.tpl.php | 2 +-
templates/sidebar.block.linked.php | 2 +-
templates/sidebar.block.menu.php | 12 +++++++-----
templates/sidebar.block.recent.php | 2 +-
templates/sidebar.block.search.php | 2 +-
templates/sidebar.tpl.php | 5 -----
templates/tag2tagadd.tpl.php | 6 +++---
templates/toolbar.inc.php | 1 +
templates/top.inc.php | 2 ++
10 files changed, 30 insertions(+), 18 deletions(-)
(limited to 'templates')
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index dfcf1c7..9277083 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -235,7 +235,19 @@ window.onload = playerLoad;
$bnext = ''. T_('Next') .' ';
$blast = ''. T_('Last') ." \n";
}
- echo ''. $bfirst .' / '. $bprev .' / '. $bnext .' / '. $blast .' / '. sprintf(T_('Page %d of %d'), $page, $totalpages) ."
\n";
+
+ // RSS
+ $brss = '';
+ $size = count($rsschannels);
+ for ($i = 0; $i < $size; $i++) {
+ $brss = ' ';
+ }
+
+ echo ''. $bfirst .' / '. $bprev .' / '. $bnext .' / '. $blast .' / '. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ."
\n";
+
+
+
+
} else {
echo ''.T_('No bookmarks available').'
';
}
diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index 3101431..b4c74ba 100644
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -112,7 +112,7 @@ if (window.getSelection) {
}
document.write('
\n";
?>
- →
+ →
getAllSearches('all', NULL, 3, NULL, true);
+$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true, true);
if ($lastSearches && count($lastSearches) > 0) {
?>
diff --git a/templates/sidebar.tpl.php b/templates/sidebar.tpl.php
index 7ae1fa1..88915fc 100644
--- a/templates/sidebar.tpl.php
+++ b/templates/sidebar.tpl.php
@@ -6,10 +6,5 @@
for ($i = 0; $i < $size; $i++) {
$this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]);
}
-
- $size = count($rsschannels);
- for ($i = 0; $i < $size; $i++) {
- echo '
';
- }
?>
diff --git a/templates/tag2tagadd.tpl.php b/templates/tag2tagadd.tpl.php
index 84ee31a..5c82223 100644
--- a/templates/tag2tagadd.tpl.php
+++ b/templates/tag2tagadd.tpl.php
@@ -7,7 +7,6 @@ $this->includeTemplate($GLOBALS['top_include']);
" to include one tag in another. e.g.: europe>france>paris')?>
-countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?>
@@ -16,8 +15,9 @@ $this->includeTemplate($GLOBALS['top_include']);
-
-
+
+countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?>
+
diff --git a/templates/toolbar.inc.php b/templates/toolbar.inc.php
index 501222d..ab17bc5 100644
--- a/templates/toolbar.inc.php
+++ b/templates/toolbar.inc.php
@@ -21,6 +21,7 @@ if ($userservice->isLoggedOn()) {
?>
+
diff --git a/templates/top.inc.php b/templates/top.inc.php
index 28fa4fc..58eacb5 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -32,7 +32,9 @@ if(isset($_GET['popup'])) {
$this->includeTemplate('toolbar.inc');
}
?>
+ if(!isset($_GET['popup'])):?>
+