summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar mensonge2009-02-03 14:15:34 +0000
committerGravatar mensonge2009-02-03 14:15:34 +0000
commit4aaef1823e5e37f02bc18078ccb67217b8cdbcb7 (patch)
tree1c955727c1e67bbb53c955839c3d59b1b446d564
parent5402e624e249c19a4b1424a6802103752c85a31e (diff)
downloadscuttle-4aaef1823e5e37f02bc18078ccb67217b8cdbcb7.tar.gz
scuttle-4aaef1823e5e37f02bc18078ccb67217b8cdbcb7.zip
Interface fix: correct visual bug under IE
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@246 b3834d28-1941-0410-a4f8-b48e95affb8f
-rw-r--r--images/bg_admin.pngbin0 -> 1212 bytes
-rw-r--r--images/logo_24.gifbin0 -> 1530 bytes
-rw-r--r--images/logo_24.pngbin1729 -> 0 bytes
-rw-r--r--scuttle.css11
-rw-r--r--templates/bookmarks.tpl.php21
5 files changed, 24 insertions, 8 deletions
diff --git a/images/bg_admin.png b/images/bg_admin.png
new file mode 100644
index 0000000..c707779
--- /dev/null
+++ b/images/bg_admin.png
Binary files differ
diff --git a/images/logo_24.gif b/images/logo_24.gif
new file mode 100644
index 0000000..d5af64d
--- /dev/null
+++ b/images/logo_24.gif
Binary files differ
diff --git a/images/logo_24.png b/images/logo_24.png
deleted file mode 100644
index f450b78..0000000
--- a/images/logo_24.png
+++ /dev/null
Binary files differ
diff --git a/scuttle.css b/scuttle.css
index 5c9aba6..28377e0 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -116,7 +116,7 @@ html > body h1 {
padding-left: 75px;
}
html > body div#header.popup h1 {
- background: url('images/logo_24.png') no-repeat 10px;
+ background: url('images/logo_24.gif') no-repeat 10px;
padding: 0.5em 0.5em 0.5em 50px;
}
/*html > body div#header #welcome {
@@ -193,11 +193,12 @@ html > body ol#bookmarks {
margin: 0 1em;
padding: 0;
}
-img.thumbnail {
+img.thumbnail {
float: left;
padding: 1px;
margin-right: 6px;
margin-bottom:4px;
+ cursor:pointer;
border:1px solid #AAA;
}
div.link a {
@@ -513,11 +514,15 @@ ul {
}
.adminBackground {
- background: #FFFFFF url(http://127.0.0.6/SemanticScuttle/trunk/images/logo_24.png) repeat-y scroll top right;
+ /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/
/*border-top: 1px solid;
border-color: #CC9900;*/
}
+.adminBackground {
+ background: #FFF url('images/bg_admin.png') repeat-y top right;
+}
+
/* DOJO Style */
/* DOJO Style */
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 6203d33..182f65e 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -23,7 +23,7 @@ include('search.inc.php');
<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?>
<div style="width:70%;text-align:center;">
-<img src="<?php echo ROOT ?>images/logo_24.png" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT ?>images/logo_24.png" width="12px"/>
+<img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?><img src="<?php echo ROOT ?>images/logo_24.gif" width="12px"/>
</div>
<?php endif?>
@@ -196,16 +196,27 @@ if($currenttag!= '') {
if ($GLOBALS['useredir']) {
$address = $GLOBALS['url_redir'] . $address;
}
+
+ // Admin specific design
+ if($userservice->isAdmin($row['uId'])) {
+ $adminBgClass = 'class="adminBackground"';
+ $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
+ } else {
+ $adminBgClass = '';
+ $adminStar = '';
+ }
// Output
- echo '<li class="xfolkentry'. $access .'">'."\n";
+ echo '<li class="xfolkentry'. $access .'" >'."\n";
if ($GLOBALS['enableWebsiteThumbnails']) {
$thumbnailHash = md5($address.$GLOBALS['thumbnailsUserId'].$GLOBALS['thumbnailsKey']);
- echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" /> ';
+ //echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />';
+ echo '<img class="thumbnail" onclick="window.location.href=\''.$address.'\'" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />';
}
- echo '<div>';
+
+ echo '<div '.$adminBgClass.' >';;
- echo '<div class="link"><a href="'. $address .'"'. $rel .' class="taggedlink">'. filter($row['bTitle']) ."</a></div>\n";
+ echo '<div class="link"><a href="'. $address .'"'. $rel .' class="taggedlink">'. filter($row['bTitle']) ."</a>" . $adminStar . "</div>\n";
if ($row['bDescription'] == '') {
$bkDescription = '-';
} else {