Optimisation of the interface: moved toolbar, search menu, sort menu and right profile menu
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@6 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
024b3074be
commit
639d8e15db
4 changed files with 26 additions and 12 deletions
20
scuttle.css
20
scuttle.css
|
@ -346,10 +346,14 @@ form {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
form#search {
|
form#search {
|
||||||
background: #FFF;
|
margin-right: 0.75em;
|
||||||
color: #555;
|
color: #CCC;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
margin-bottom: 1em;
|
float: right;
|
||||||
|
margin: 0;
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
top: 6.4em;
|
||||||
}
|
}
|
||||||
form label,
|
form label,
|
||||||
form td,
|
form td,
|
||||||
|
@ -376,16 +380,16 @@ p {
|
||||||
margin: 1em;
|
margin: 1em;
|
||||||
}
|
}
|
||||||
p#sort {
|
p#sort {
|
||||||
color: #CCC;
|
/*color: #CCC;*/
|
||||||
font-size: small;
|
font-size: small;
|
||||||
float: right;
|
/*float: right;*/
|
||||||
margin: 0;
|
/*margin: 0;*/
|
||||||
position: absolute;
|
/*position: absolute;*/
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 7em;
|
top: 7em;
|
||||||
}
|
}
|
||||||
html > body p#sort {
|
html > body p#sort {
|
||||||
margin-right: 0.75em;
|
/*margin-right: 0.75em;*/
|
||||||
}
|
}
|
||||||
p#sort a {
|
p#sort a {
|
||||||
background: #AAA;
|
background: #AAA;
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td><input type="text" name="terms" size="50" value="<?php echo filter($terms); ?>" /></td>
|
<td><input type="text" name="terms" size="30" value="<?php echo filter($terms); ?>" /></td>
|
||||||
<td><input type="submit" value="<?php echo T_('Search' /* Submit button */); ?>" /></td>
|
<td><input type="submit" value="<?php echo T_('Search' /* Submit button */); ?>" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
<?php
|
<?php
|
||||||
|
// Menu moved to toolbar.inc.php
|
||||||
|
|
||||||
|
/*
|
||||||
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
||||||
if (utf8_strlen($userinfo['name']) > 0) {
|
if (utf8_strlen($userinfo['name']) > 0) {
|
||||||
$name = $userinfo['name'];
|
$name = $userinfo['name'];
|
||||||
} else {
|
} else {
|
||||||
$name = $userinfo['username'];
|
$name = $userinfo['username'];
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
||||||
<h2><?php echo $name; ?></h2>
|
<h2><?php echo $name; ?></h2>
|
||||||
<div id="profile">
|
<div id="profile">
|
||||||
<ul>
|
<ul>
|
||||||
|
@ -14,3 +18,6 @@ if (utf8_strlen($userinfo['name']) > 0) {
|
||||||
<li><a href="<?php echo createURL('watchlist', $user); ?>"><?php echo T_('Watchlist'); ?></a> →</li>
|
<li><a href="<?php echo createURL('watchlist', $user); ?>"><?php echo T_('Watchlist'); ?></a> →</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
*/
|
||||||
|
?>
|
||||||
|
|
|
@ -2,14 +2,17 @@
|
||||||
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
||||||
if ($userservice->isLoggedOn()) {
|
if ($userservice->isLoggedOn()) {
|
||||||
$cUser = $userservice->getCurrentUser();
|
$cUser = $userservice->getCurrentUser();
|
||||||
|
$cUserId = $userservice->getCurrentUserId();
|
||||||
$cUsername = $cUser[$userservice->getFieldName('username')];
|
$cUsername = $cUser[$userservice->getFieldName('username')];
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<ul id="navigation">
|
<ul id="navigation">
|
||||||
<li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><?php echo T_('Bookmarks'); ?></a></li>
|
<li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><?php echo T_('Bookmarks'); ?></a></li>
|
||||||
|
<li><a href="<?php echo createURL('alltags', $cUsername); ?>"><?php echo T_('Tags'); ?></a></li>
|
||||||
<li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><?php echo T_('Watchlist'); ?></a></li>
|
<li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><?php echo T_('Watchlist'); ?></a></li>
|
||||||
|
<li><a href="<?php echo $userservice->getProfileUrl($cUserId, $cUsername); ?>"><?php echo T_('Profile'); ?></a></li>
|
||||||
<li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><?php echo T_('Add a Bookmark'); ?></a></li>
|
<li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><?php echo T_('Add a Bookmark'); ?></a></li>
|
||||||
<li class="access"><a href="<?php echo $GLOBALS['root']; ?>?action=logout"><?php echo T_('Log Out'); ?></a></li>
|
<li class="access"><?php echo $cUsername?><a href="<?php echo $GLOBALS['root']; ?>?action=logout">(<?php echo T_('Log Out'); ?>)</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
Loading…
Reference in a new issue