diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-19 14:56:02 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-19 14:56:02 -0700 |
| commit | 9f424bb20881841926976417d7eea04c0c14bdb3 (patch) | |
| tree | 50d9406e0f8cd83ec9b7908fe438d282c674ff5d | |
| parent | 4e5b813aa8feb4b2bf65517b6c27a71ed025346d (diff) | |
| parent | 6a2c32bd23e8ac8361da2199f6d9473cd98b78c6 (diff) | |
| download | volse-hubzilla-9f424bb20881841926976417d7eea04c0c14bdb3.tar.gz volse-hubzilla-9f424bb20881841926976417d7eea04c0c14bdb3.tar.bz2 volse-hubzilla-9f424bb20881841926976417d7eea04c0c14bdb3.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | images/hz-white-16.png | bin | 0 -> 384 bytes | |||
| -rw-r--r-- | images/hz-white-32.png | bin | 0 -> 610 bytes | |||
| -rw-r--r-- | images/hz-white-64.png | bin | 0 -> 874 bytes | |||
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 |
6 files changed, 3 insertions, 3 deletions
diff --git a/doc/README.md b/doc/README.md index 90585a906..09503efd7 100644 --- a/doc/README.md +++ b/doc/README.md @@ -5,7 +5,7 @@ Hubzilla ###Websites. Redefined. - + **What are Hubs?** diff --git a/images/hz-white-16.png b/images/hz-white-16.png Binary files differnew file mode 100644 index 000000000..2f8f71c24 --- /dev/null +++ b/images/hz-white-16.png diff --git a/images/hz-white-32.png b/images/hz-white-32.png Binary files differnew file mode 100644 index 000000000..0549ca850 --- /dev/null +++ b/images/hz-white-32.png diff --git a/images/hz-white-64.png b/images/hz-white-64.png Binary files differnew file mode 100644 index 000000000..793a15789 --- /dev/null +++ b/images/hz-white-64.png diff --git a/include/notifier.php b/include/notifier.php index b7cea629d..385062f07 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -127,7 +127,7 @@ function notifier_run($argv, $argc){ if($s) { $perm_update = array('sender' => $s[0], 'recipient' => $r[0], 'success' => false, 'deliveries' => ''); - if($cmd == 'permission_create']) + if($cmd == 'permission_create') call_hooks('permissions_create',$perm_update); else call_hooks('permissions_update',$perm_update); diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index ae3e8c012..a2159c885 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:#026D0D; 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/ghash-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 colspan="2" style="background:#43488A; 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/hz-white-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> |
