aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-05 22:20:33 -0700
committerFriendika <info@friendika.com>2010-11-05 22:20:33 -0700
commit05cd91129ee58ddd228762cd394978b89c1c927e (patch)
tree1dacad12b21a5c412b6b1a64dfb77f9b6608fc01
parentce28d219d4cd16cb6477dfe554dc468f3ccb3230 (diff)
downloadvolse-hubzilla-05cd91129ee58ddd228762cd394978b89c1c927e.tar.gz
volse-hubzilla-05cd91129ee58ddd228762cd394978b89c1c927e.tar.bz2
volse-hubzilla-05cd91129ee58ddd228762cd394978b89c1c927e.zip
branding
-rw-r--r--images/ff-128.jpgbin0 -> 4497 bytes
-rw-r--r--images/ff-16.jpgbin0 -> 644 bytes
-rw-r--r--images/ff-256.jpgbin0 -> 2733 bytes
-rw-r--r--images/ff-32.jpgbin0 -> 1626 bytes
-rw-r--r--images/ff-64.jpgbin0 -> 2897 bytes
-rw-r--r--images/ff.xcfbin0 -> 11045 bytes
-rw-r--r--include/nav.php2
-rw-r--r--view/dfrn_request.tpl4
-rw-r--r--view/head.tpl2
-rw-r--r--view/theme/default/ff-16.jpgbin0 -> 644 bytes
-rw-r--r--view/theme/default/style.css2
11 files changed, 5 insertions, 5 deletions
diff --git a/images/ff-128.jpg b/images/ff-128.jpg
new file mode 100644
index 000000000..eaa0a7e67
--- /dev/null
+++ b/images/ff-128.jpg
Binary files differ
diff --git a/images/ff-16.jpg b/images/ff-16.jpg
new file mode 100644
index 000000000..3621f5914
--- /dev/null
+++ b/images/ff-16.jpg
Binary files differ
diff --git a/images/ff-256.jpg b/images/ff-256.jpg
new file mode 100644
index 000000000..f80ba07f8
--- /dev/null
+++ b/images/ff-256.jpg
Binary files differ
diff --git a/images/ff-32.jpg b/images/ff-32.jpg
new file mode 100644
index 000000000..7f3099916
--- /dev/null
+++ b/images/ff-32.jpg
Binary files differ
diff --git a/images/ff-64.jpg b/images/ff-64.jpg
new file mode 100644
index 000000000..b9cecf7c5
--- /dev/null
+++ b/images/ff-64.jpg
Binary files differ
diff --git a/images/ff.xcf b/images/ff.xcf
new file mode 100644
index 000000000..a15425669
--- /dev/null
+++ b/images/ff.xcf
Binary files differ
diff --git a/include/nav.php b/include/nav.php
index b102064fb..7f15ec805 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -56,6 +56,6 @@ else {
$banner = get_config('system','banner');
if($banner === false)
- $banner = '<span style="color:red;">@</span> Friendika';
+ $banner = '<img src="images/ff-32.jpg" alt="logo" /> Friendika';
$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index bee42c50e..4dd8c0489 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -5,8 +5,8 @@
You may request a connection with this member if you have a valid profile address<br />
on one of the following social networks:<br />
<ul id="dfrn-request-networks">
-<li><a href="http://dfrn.org">Friendika/Mistpark</a> (fully supported)</li>
-<li><a href="http://ostatus.org">StatusNet/GNU-social/Federation</a> (limited - experimental)</li>
+<li><a href="http://friendika.com" title="Private (secure) network">Friendika</a> <img src="images/lock_icon.gif" alt="Private (secure) network" title="Private (secure) network" /></li>
+<li><a href="http://ostatus.org" title="Public (insecure) network" >StatusNet/Federated Social Web</a> <img src="images/unlock_icon.gif" alt="Public (insecure) network" title="Public (insecure) network"/></li>
</ul>
</p>
diff --git a/view/head.tpl b/view/head.tpl
index 7a962cc26..50dd9cab6 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,7 +1,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="$baseurl" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika32.ico">
+<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg">
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/theme/default/ff-16.jpg b/view/theme/default/ff-16.jpg
new file mode 100644
index 000000000..3621f5914
--- /dev/null
+++ b/view/theme/default/ff-16.jpg
Binary files differ
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 42da72d6a..1f09501c1 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -385,7 +385,7 @@ footer {
input#dfrn-url {
float: left;
- background: url(friendika16.gif) no-repeat;
+ background: url(ff-16.jpg) no-repeat;
background-position: 2px center;
font-size: 17px;
padding-left: 21px;