summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/default/bookmarklet.inc.php35
-rw-r--r--data/templates/default/top.inc.php18
-rw-r--r--www/themes/default/images/logo-empty.pngbin0 -> 1639 bytes
-rw-r--r--www/themes/default/scuttle.css3
4 files changed, 53 insertions, 3 deletions
diff --git a/data/templates/default/bookmarklet.inc.php b/data/templates/default/bookmarklet.inc.php
index c93f581..b203735 100644
--- a/data/templates/default/bookmarklet.inc.php
+++ b/data/templates/default/bookmarklet.inc.php
@@ -115,3 +115,38 @@ echo jsEscTitle(htmlspecialchars($link));
}
//]]>
</script>
+
+
+<script type="text/javascript">
+function activateSocialApi(node) {
+ var baseurl = <?php echo json_encode(addProtocolToUrl(createURL())); ?>;
+ var socialApiData = {
+ // currently required
+ "name": <?php echo json_encode($GLOBALS['sitename']); ?>,
+ "iconURL": baseurl + "themes/default/images/logo.png",
+ "icon32URL": baseurl + "themes/default/images/logo.png",
+ "icon64URL": baseurl + "themes/default/images/logo.png",
+
+ "markURL": "<?php echo addProtocolToUrl(createURL('bookmarks', $GLOBALS['user'])); ?>?action=add&amp;popup=1&amp;width=800&amp;height=470&amp;address=%{url}&amp;title=%{title}&amp;description=%{description}%{text}",
+ "markedIcon": baseurl + "themes/default/images/logo.png",
+ "unmarkedIcon": baseurl + "themes/default/images/logo-empty.png",
+
+ // should be available for display purposes
+ "description": "Self-hosted bookmark manager",
+ "author": "Christian Weiske",
+ "homepageURL": "http://semanticscuttle.sf.net/",
+
+ // optional
+ "version": "0.0.3"
+ };
+
+ var event = new CustomEvent("ActivateSocialFeature");
+ node.setAttribute("data-service", JSON.stringify(socialApiData));
+ node.dispatchEvent(event);
+}
+</script>
+<p>
+ <button onclick="activateSocialApi(this)" title="activate semanticscuttle in firefox">
+ Add SemanticScuttle to Firefox
+ </button>
+</p>
diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index 240e5b2..55be4a7 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -30,11 +30,25 @@ if (isset($rsschannels)) {
<?php endif ?>
</head>
- <body>
+<?php
+$bodystyle = '';
+if (isset($_GET['popup'])) {
+ if (isset($_GET['height'])) {
+ $bodystyle .= 'height:' . intval($_GET['height']) . 'px;';
+ }
+ if (isset($_GET['width'])) {
+ $bodystyle .= 'width:' . intval($_GET['width']) . 'px;';
+ }
+ if ($bodystyle != '') {
+ $bodystyle = ' style="' . $bodystyle . '"';
+ }
+}
+?>
+ <body<?php echo $bodystyle; ?>>
<?php
$headerstyle = '';
-if(isset($_GET['popup'])) {
+if (isset($_GET['popup'])) {
$headerstyle = ' class="popup"';
}
?>
diff --git a/www/themes/default/images/logo-empty.png b/www/themes/default/images/logo-empty.png
new file mode 100644
index 0000000..4590098
--- /dev/null
+++ b/www/themes/default/images/logo-empty.png
Binary files differ
diff --git a/www/themes/default/scuttle.css b/www/themes/default/scuttle.css
index 12a88fc..c9d7293 100644
--- a/www/themes/default/scuttle.css
+++ b/www/themes/default/scuttle.css
@@ -110,7 +110,8 @@ html > body h1 {
padding-left: 75px;
}
html > body div#header.popup h1 {
- background: url('images/logo_24.gif') no-repeat 10px;
+ background: url('images/logo.png') no-repeat 10px;
+ background-size: 24px;
padding: 0.5em 0.5em 0.5em 50px;
}
/*html > body div#header #welcome {