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
This commit is contained in:
mensonge
parent
3b79d6b9cc
commit
791f149247
15 changed files with 64 additions and 49 deletions
|
|
@ -117,7 +117,7 @@ if ($loggedon && isset($_POST['submitted'])) {
|
|||
if ($GLOBALS['useredir']) {
|
||||
$address = $GLOBALS['url_redir'] . $address;
|
||||
}
|
||||
header('Location: '. $address);
|
||||
//header('Location: '. $address); // not useful
|
||||
}
|
||||
} else {
|
||||
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Scuttle\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-04-21 17:36+0200\n"
|
||||
"PO-Revision-Date: 2008-04-21 17:37+0100\n"
|
||||
"POT-Creation-Date: 2008-04-24 09:43+0200\n"
|
||||
"PO-Revision-Date: 2008-04-24 09:47+0100\n"
|
||||
"Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
|
||||
"Language-Team: fr-FR <toony.sf@chezouam.net>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -21,7 +21,7 @@ msgstr ""
|
|||
|
||||
#: ../../../about.php:25
|
||||
#: ../../../templates/toolbar.inc.php:16
|
||||
#: ../../../templates/toolbar.inc.php:24
|
||||
#: ../../../templates/toolbar.inc.php:25
|
||||
msgid "About"
|
||||
msgstr "À propos"
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recom
|
|||
|
||||
#: ../../../login.php:48
|
||||
#: ../../../templates/login.tpl.php:26
|
||||
#: ../../../templates/toolbar.inc.php:25
|
||||
#: ../../../templates/toolbar.inc.php:26
|
||||
msgid "Log In"
|
||||
msgstr "Se connecter"
|
||||
|
||||
|
|
@ -318,6 +318,7 @@ msgstr "Mot de passe oublié"
|
|||
#: ../../../templates/sidebar.block.common.php:9
|
||||
#: ../../../templates/sidebar.block.popular.php:15
|
||||
#: ../../../templates/sidebar.block.recent.php:30
|
||||
#: ../../../templates/toolbar.inc.php:24
|
||||
msgid "Popular Tags"
|
||||
msgstr "Tags populaires"
|
||||
|
||||
|
|
@ -385,7 +386,7 @@ msgstr "Enregistrement raté. Veuillez rééssayer."
|
|||
|
||||
#: ../../../register.php:66
|
||||
#: ../../../templates/register.tpl.php:41
|
||||
#: ../../../templates/toolbar.inc.php:26
|
||||
#: ../../../templates/toolbar.inc.php:27
|
||||
msgid "Register"
|
||||
msgstr "S'enregistrer"
|
||||
|
||||
|
|
@ -986,18 +987,13 @@ msgstr "Question antispam"
|
|||
msgid "Linked Tags"
|
||||
msgstr "Tags structurés"
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:44
|
||||
#: ../../../templates/sidebar.block.menu.php:31
|
||||
msgid "all tags"
|
||||
msgstr "Tous les tags"
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:55
|
||||
#: ../../../templates/sidebar.block.menu.php:42
|
||||
#: ../../../templates/sidebar.block.menu.php:40
|
||||
msgid "Add new link"
|
||||
msgstr "Créer un lien"
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:56
|
||||
#: ../../../templates/sidebar.block.menu.php:43
|
||||
#: ../../../templates/sidebar.block.menu.php:41
|
||||
msgid "Delete link"
|
||||
msgstr "Supprimer un lien"
|
||||
|
||||
|
|
@ -1010,9 +1006,13 @@ msgstr "Tags inclus dans le tag '%s'"
|
|||
msgid "Menu Tags"
|
||||
msgstr "Menu Tags"
|
||||
|
||||
#: ../../../templates/sidebar.block.menu.php:31
|
||||
msgid "See all tags"
|
||||
msgstr "Tous les tags"
|
||||
#: ../../../templates/sidebar.block.menu.php:60
|
||||
msgid "See all your tags"
|
||||
msgstr "Voir tous vos tags"
|
||||
|
||||
#: ../../../templates/sidebar.block.menu.php:60
|
||||
msgid "all your tags"
|
||||
msgstr "Tous vos tags"
|
||||
|
||||
#: ../../../templates/sidebar.block.recent.php:15
|
||||
msgid "Recent Tags"
|
||||
|
|
@ -1062,7 +1062,7 @@ msgstr "Synonymes :"
|
|||
#: ../../../templates/tag2tagadd.tpl.php:10
|
||||
#, php-format
|
||||
msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box"
|
||||
msgstr "Note inclure une tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu"
|
||||
msgstr "Note : inclure un tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu"
|
||||
|
||||
#: ../../../templates/tag2tagadd.tpl.php:13
|
||||
msgid "Create new link:"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-04-21 17:36+0200\n"
|
||||
"POT-Creation-Date: 2008-04-24 09:43+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -18,7 +18,7 @@ msgstr ""
|
|||
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
||||
|
||||
#: ../../../about.php:25 ../../../templates/toolbar.inc.php:16
|
||||
#: ../../../templates/toolbar.inc.php:24
|
||||
#: ../../../templates/toolbar.inc.php:25
|
||||
msgid "About"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -244,7 +244,7 @@ msgid "The details you have entered are incorrect. Please try again."
|
|||
msgstr ""
|
||||
|
||||
#: ../../../login.php:48 ../../../templates/login.tpl.php:26
|
||||
#: ../../../templates/toolbar.inc.php:25
|
||||
#: ../../../templates/toolbar.inc.php:26
|
||||
msgid "Log In"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -300,6 +300,7 @@ msgstr ""
|
|||
#: ../../../templates/sidebar.block.common.php:9
|
||||
#: ../../../templates/sidebar.block.popular.php:15
|
||||
#: ../../../templates/sidebar.block.recent.php:30
|
||||
#: ../../../templates/toolbar.inc.php:24
|
||||
msgid "Popular Tags"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -364,7 +365,7 @@ msgid "Registration failed. Please try again."
|
|||
msgstr ""
|
||||
|
||||
#: ../../../register.php:66 ../../../templates/register.tpl.php:41
|
||||
#: ../../../templates/toolbar.inc.php:26
|
||||
#: ../../../templates/toolbar.inc.php:27
|
||||
msgid "Register"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -980,18 +981,13 @@ msgstr ""
|
|||
msgid "Linked Tags"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:44
|
||||
#: ../../../templates/sidebar.block.menu.php:31
|
||||
msgid "all tags"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:55
|
||||
#: ../../../templates/sidebar.block.menu.php:42
|
||||
#: ../../../templates/sidebar.block.menu.php:40
|
||||
msgid "Add new link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.linked.php:56
|
||||
#: ../../../templates/sidebar.block.menu.php:43
|
||||
#: ../../../templates/sidebar.block.menu.php:41
|
||||
msgid "Delete link"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1004,8 +1000,12 @@ msgstr ""
|
|||
msgid "Menu Tags"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.menu.php:31
|
||||
msgid "See all tags"
|
||||
#: ../../../templates/sidebar.block.menu.php:60
|
||||
msgid "See all your tags"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.menu.php:60
|
||||
msgid "all your tags"
|
||||
msgstr ""
|
||||
|
||||
#: ../../../templates/sidebar.block.recent.php:15
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class SearchHistoryService {
|
|||
}
|
||||
}
|
||||
|
||||
function getAllSearches($range = NULL, $uId = NULL, $nb = NULL, $start = NULL, $distinct = false) {
|
||||
function getAllSearches($range = NULL, $uId = NULL, $nb = NULL, $start = NULL, $distinct = false, $withResults = false) {
|
||||
$sql = 'SELECT DISTINCT(shTerms), shId, shRange, shNbResults, shDatetime, uId';
|
||||
$sql.= ' FROM '. $this->getTableName();
|
||||
$sql.= ' WHERE 1=1';
|
||||
|
|
@ -55,6 +55,9 @@ class SearchHistoryService {
|
|||
if($uId != NULL) {
|
||||
$sql.= ' AND uId = '.$uId;
|
||||
}
|
||||
if($withResults = true) {
|
||||
$sql.= ' AND shNbResults > 0';
|
||||
}
|
||||
if($distinct) {
|
||||
$sql.= ' GROUP BY shTerms';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -235,7 +235,19 @@ window.onload = playerLoad;
|
|||
$bnext = '<a href="'. sprintf($nav_url, $user, $currenttag, '?page=') . $next . $sortAmp .'">'. T_('Next') .'</a>';
|
||||
$blast = '<a href="'. sprintf($nav_url, $user, $currenttag, '?page=') . $totalpages . $sortAmp .'">'. T_('Last') ."</a>\n";
|
||||
}
|
||||
echo '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) ."</p>\n";
|
||||
|
||||
// RSS
|
||||
$brss = '';
|
||||
$size = count($rsschannels);
|
||||
for ($i = 0; $i < $size; $i++) {
|
||||
$brss = '<a style="background:#FFFFFF" href="'. $rsschannels[$i][1] .'" title="'. $rsschannels[$i][0] .'"><img src="'. $GLOBALS['root'] .'rss.gif" width="16" height="16" alt="'. $rsschannels[$i][0] .'" /></a>';
|
||||
}
|
||||
|
||||
echo '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ." </p>\n";
|
||||
|
||||
|
||||
|
||||
|
||||
} else {
|
||||
echo '<p class="error">'.T_('No bookmarks available').'</p>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ if (window.getSelection) {
|
|||
}
|
||||
document.write('<ul>');
|
||||
document.write('<li><a href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&address=\'+a+\'&title=\'+t+\'&description=\'+d;void 0;"><?php echo sprintf(T_('Post to %s'), $GLOBALS['sitename']); ?><\/a><\/li>');
|
||||
document.write('<li><a href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');open(\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'<?php echo $GLOBALS['sitename']; ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=730,height=465,left=\'+(screen.width-730)/2+\',top=\'+(screen.height-425)/2);void 0;"><?php echo sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename']); ?><\/a><\/li>');
|
||||
document.write('<li><a href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');open(\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'<?php echo $GLOBALS['sitename']; ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2);void 0;"><?php echo sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename']); ?><\/a><\/li>');
|
||||
document.write('<\/ul>');
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ if(($logged_on_userid != null) && ($userid === $logged_on_userid)) {
|
|||
echo T_('Linked Tags').' ';
|
||||
//if($userid != null) {
|
||||
$cUser = $userservice->getUser($userid);
|
||||
echo '<small><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
|
||||
//echo '<small><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
|
||||
//}
|
||||
?>
|
||||
</h2>
|
||||
|
|
|
|||
|
|
@ -21,14 +21,12 @@ if(strlen($user)==0) {
|
|||
}
|
||||
|
||||
$menuTags = $tag2tagservice->getMenuTags($userid);
|
||||
if (sizeof($menuTags) > 0) {
|
||||
if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) {
|
||||
?>
|
||||
|
||||
<h2>
|
||||
<?php
|
||||
echo '<span title="'.sprintf(T_('Tags included into the tag \'%s\''), $GLOBALS['menuTag']).'">'.T_('Menu Tags').'</span> ';
|
||||
$cUser = $userservice->getUser($userid);
|
||||
echo '<small span title="'.T_('See all tags').'"><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
|
||||
//}
|
||||
?>
|
||||
</h2>
|
||||
|
|
@ -39,8 +37,8 @@ if (sizeof($menuTags) > 0) {
|
|||
<?php
|
||||
if($editingMode) {
|
||||
echo '<tr><td></td><td>';
|
||||
echo ' (<a href="'. createURL('tag2tagadd','') .'" rel="tag">'.T_('Add new link').'</a>) ';
|
||||
echo ' (<a href="'. createURL('tag2tagdelete','') .'" rel="tag">'.T_('Delete link').'</a>)';
|
||||
echo ' (<a href="'. createURL('tag2tagadd','menu') .'" rel="tag">'.T_('Add new link').'</a>) ';
|
||||
echo ' (<a href="'. createURL('tag2tagdelete','menu') .'" rel="tag">'.T_('Delete link').'</a>)';
|
||||
echo '</td></tr>';
|
||||
}
|
||||
|
||||
|
|
@ -57,6 +55,10 @@ if (sizeof($menuTags) > 0) {
|
|||
}
|
||||
?>
|
||||
</table>
|
||||
|
||||
<?php $cUser = $userservice->getUser($userid); ?>
|
||||
<p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all your tags')?>"><?php echo T_('all your tags'); ?></a> →</p>
|
||||
|
||||
</div>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if ($recentTags && count($recentTags) > 0) {
|
|||
}
|
||||
echo $contents ."</p>\n";
|
||||
?>
|
||||
<p><a href="<?php echo createURL('populartags'); ?>"><?php echo T_('Popular Tags'); ?></a> →</p>
|
||||
<p style="text-align:right"><a href="<?php echo createURL('populartags'); ?>"><?php echo T_('Popular Tags'); ?></a> →</p>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ if ($logged_on_userid === false) {
|
|||
$logged_on_userid = NULL;
|
||||
}
|
||||
|
||||
$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true);
|
||||
$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true, true);
|
||||
|
||||
if ($lastSearches && count($lastSearches) > 0) {
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -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 '<p><a href="'. $rsschannels[$i][1] .'" title="'. $rsschannels[$i][0] .'"><img src="'. $GLOBALS['root'] .'rss.gif" width="16" height="16" alt="'. $rsschannels[$i][0] .'" /></a></p>';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ $this->includeTemplate($GLOBALS['top_include']);
|
|||
<p align=right" style="float:right">
|
||||
<small style="text-align:right"><?php echo T_('Note: use "=" to make synonym two tags. e.g.: france=frenchcountry')?></small><br/>
|
||||
<small style="text-align:right"><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?></small><br/>
|
||||
<small style="text-align:right"><?php echo sprintf(T_('Note: include a tag into \'%s\' tag (e.g. %s>countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?></small>
|
||||
</p>
|
||||
|
||||
<p><?php echo T_('Create new link:')?></p>
|
||||
|
|
@ -16,8 +15,9 @@ $this->includeTemplate($GLOBALS['top_include']);
|
|||
<input type="text" name="linkType" value=">" size="1" maxlength="1"/>
|
||||
<input type="text" name="tag2" />
|
||||
</p>
|
||||
|
||||
|
||||
<p>
|
||||
<small style="text-align:right"><?php echo sprintf(T_('Note: include a tag into \'%s\' tag (e.g. %s>countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?></small>
|
||||
</p>
|
||||
<!--p><?php echo T_('Are you sure?'); ?></p-->
|
||||
<p>
|
||||
<input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" />
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ if ($userservice->isLoggedOn()) {
|
|||
?>
|
||||
|
||||
<ul id="navigation">
|
||||
<li><a href="<?php echo createURL('populartags', $cUsername); ?>"><?php echo T_('Popular Tags'); ?></a></li>
|
||||
<li><a href="<?php echo createURL('about'); ?>"><?php echo T_('About'); ?></a></li>
|
||||
<li class="access"><a href="<?php echo createURL('login'); ?>"><?php echo T_('Log In'); ?></a></li>
|
||||
<li class="access"><a href="<?php echo createURL('register'); ?>"><?php echo T_('Register'); ?></a></li>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@ if(isset($_GET['popup'])) {
|
|||
$this->includeTemplate('toolbar.inc');
|
||||
}
|
||||
?>
|
||||
<? if(!isset($_GET['popup'])):?>
|
||||
<span id="welcome"><?php echo $GLOBALS['welcomeMessage'];?></span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
Loading…
Reference in a new issue