branding

diff --git a/images/ff-128.jpg b/images/ff-128.jpg
new file mode 100644 (file)
index 0000000..eaa0a7e
Binary files /dev/null and b/images/ff-128.jpg differ

diff --git a/images/ff-16.jpg b/images/ff-16.jpg
new file mode 100644 (file)
index 0000000..3621f59
Binary files /dev/null and b/images/ff-16.jpg differ

diff --git a/images/ff-256.jpg b/images/ff-256.jpg
new file mode 100644 (file)
index 0000000..f80ba07
Binary files /dev/null and b/images/ff-256.jpg differ

diff --git a/images/ff-32.jpg b/images/ff-32.jpg
new file mode 100644 (file)
index 0000000..7f30999
Binary files /dev/null and b/images/ff-32.jpg differ

diff --git a/images/ff-64.jpg b/images/ff-64.jpg
new file mode 100644 (file)
index 0000000..b9cecf7
Binary files /dev/null and b/images/ff-64.jpg differ

diff --git a/images/ff.xcf b/images/ff.xcf
new file mode 100644 (file)
index 0000000..a154256
Binary files /dev/null and b/images/ff.xcf differ

diff --git a/include/nav.php b/include/nav.php
index b102064fb5a45ab9e6b5500887d7a18a5718e765..7f15ec8056bf1d7fd888558dc32c6bde8e3cd9de 100644 (file)
--- 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 bee42c50ed8b3c932f289cff6dbee31de6b043df..4dd8c048996f354621286ccd968f6c24fb101ac8 100644 (file)
--- 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 7a962cc26d7a8544a95fe1df889500d6d414a754..50dd9cab6b8b9dafb10f6b9f961eb7d52a0a428c 100644 (file)
--- 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 (file)
index 0000000..3621f59
Binary files /dev/null and b/view/theme/default/ff-16.jpg differ

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 42da72d6a61dcaf6d9eb4ec5d29ea766500f22f3..1f09501c122b18690c0960c9991680a7416ddd43 100644 (file)
--- 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;