diff options
| -rw-r--r-- | images/rhash-32.png | bin | 0 -> 1322 bytes | |||
| -rw-r--r-- | images/rhash-64.png | bin | 0 -> 3115 bytes | |||
| -rw-r--r-- | images/rhash.xcf | bin | 0 -> 94324 bytes | |||
| -rw-r--r-- | include/api.php | 4 | ||||
| -rw-r--r-- | util/Doxyfile | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/images/rhash-32.png b/images/rhash-32.png Binary files differnew file mode 100644 index 000000000..564556d48 --- /dev/null +++ b/images/rhash-32.png diff --git a/images/rhash-64.png b/images/rhash-64.png Binary files differnew file mode 100644 index 000000000..2e8396760 --- /dev/null +++ b/images/rhash-64.png diff --git a/images/rhash.xcf b/images/rhash.xcf Binary files differnew file mode 100644 index 000000000..960552290 --- /dev/null +++ b/images/rhash.xcf diff --git a/include/api.php b/include/api.php index ca43abcce..c2de7a704 100644 --- a/include/api.php +++ b/include/api.php @@ -220,7 +220,7 @@ require_once('include/security.php'); 'updated' => api_date(null), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'language' => $user_info['language'], - 'logo' => $a->get_baseurl()."/images/friendica-32.png", + 'logo' => $a->get_baseurl()."/images/rhash-64.png", ); return $arr; @@ -1524,7 +1524,7 @@ require_once('include/security.php'); $name = get_config('system','sitename'); $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/r!.png'; + $logo = $a->get_baseurl() . '/images/rhash-64.png'; $email = get_config('system','admin_email'); $closed = ((get_config('system','register_policy') == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((get_config('system','block_public')) ? 'true' : 'false'); diff --git a/util/Doxyfile b/util/Doxyfile index d03af29e2..edb8a8464 100644 --- a/util/Doxyfile +++ b/util/Doxyfile @@ -1,7 +1,7 @@ INPUT = boot.php mod include setup util view RECURSIVE = YES PROJECT_NAME = "The Red Matrix" -PROJECT_LOGO = images/r!-64.png +PROJECT_LOGO = images/rhash-64.png EXCLUDE = .htconfig.php library doc .git EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test* OUTPUT_DIRECTORY = doc diff --git a/version.inc b/version.inc index 0f58d0007..8c35d8fd7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-05-10.309 +2013-05-11.310 diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 18f7132db..30f91730d 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -12,7 +12,7 @@ <body> <table style="border:1px solid #ccc"> <tbody> - <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rhash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index d6a06775e..78e911213 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -17,7 +17,7 @@ {{$head_js}} -<link rel="shortcut icon" href="{{$baseurl}}/images/r!.png" /> +<link rel="shortcut icon" href="{{$baseurl}}/images/rhash-32.png" /> <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" |
