diff options
18 files changed, 21 insertions, 10 deletions
diff --git a/include/enotify.php b/include/enotify.php index 1918f26df..8385bdec5 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -5,6 +5,12 @@ function notification($params) { logger('notification: entry', LOGGER_DEBUG); $a = get_app(); + + // from here on everything is in the recipients language + + push_lang($params['language']); + + $banner = t('Friendica Notification'); $product = FRIENDICA_PLATFORM; $siteurl = z_path(); @@ -180,9 +186,6 @@ function notification($params) { $hsitelink = $h['hsitelink']; $itemlink = $h['itemlink']; - // from here on everything is in the recipients language - - push_lang($params['language']); require_once('include/html2bbcode.php'); @@ -234,8 +237,10 @@ function notification($params) { ); if($r) $notify_id = $r[0]['id']; - else + else { + pop_lang(); return; + } $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); @@ -246,7 +251,6 @@ function notification($params) { ); - // send email notification if notification preferences permit require_once('bbcode.php'); diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index fc1a3d47b..417578a32 100755..100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -63,7 +63,7 @@ <div id="contact-edit-info-wrapper"> <h4>$lbl_info1</h4> - <textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea> + <textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea> <input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> </div> <div id="contact-edit-info-end"></div> diff --git a/view/theme/clean/screenshot.jpg b/view/theme/clean/screenshot.jpg Binary files differnew file mode 100644 index 000000000..8d9d772f4 --- /dev/null +++ b/view/theme/clean/screenshot.jpg diff --git a/view/theme/comix/screenshot.jpg b/view/theme/comix/screenshot.jpg Binary files differnew file mode 100644 index 000000000..5ad46cd8b --- /dev/null +++ b/view/theme/comix/screenshot.jpg diff --git a/view/theme/darkness/screenshot.jpg b/view/theme/darkness/screenshot.jpg Binary files differnew file mode 100644 index 000000000..aec866e99 --- /dev/null +++ b/view/theme/darkness/screenshot.jpg diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 5bae06178..f1714a436 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -2,6 +2,7 @@ <h3 style="margin-top:0px;">Help or @NewHere ?</h3> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br> +<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a> <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a> {{ endif }} diff --git a/view/theme/diabook-blue/screenshot.png b/view/theme/diabook-blue/screenshot.png Binary files differnew file mode 100644 index 000000000..b1c890285 --- /dev/null +++ b/view/theme/diabook-blue/screenshot.png diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 1ba9ad081..23c26c910 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -2,7 +2,8 @@ <h3 style="margin-top:0px;">Help or @NewHere ?</h3> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br> -<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a> +<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a> +<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a> {{ endif }} {{ if $lastusers_title }} diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png Binary files differnew file mode 100755 index 000000000..a46e88ea5 --- /dev/null +++ b/view/theme/diabook/icons/expand.png diff --git a/view/theme/diabook/screenshot.jpg b/view/theme/diabook/screenshot.jpg Binary files differdeleted file mode 100644 index abc31e329..000000000 --- a/view/theme/diabook/screenshot.jpg +++ /dev/null diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png Binary files differnew file mode 100644 index 000000000..2826f4261 --- /dev/null +++ b/view/theme/diabook/screenshot.png diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 00856c8d2..ba43c78c2 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -111,6 +111,7 @@ .icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} + .camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } @@ -1169,6 +1170,12 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +.icon.expand { + background-image: url("../../../view/theme/diabook/icons/expand.png"); + float: right; + cursor: pointer; + } + /* wall item */ .tread-wrapper { border-bottom: 1px solid #D2D2D2; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index e4af9d3f3..8064fb7e7 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -251,9 +251,7 @@ $a->page['htmlhead'] .= <<< EOT $(function() { $('a.lightbox').fancybox(); // Select all links with lightbox class }); - - - + </script> EOT; diff --git a/view/theme/goldenrod/screenshot.jpg b/view/theme/goldenrod/screenshot.jpg Binary files differnew file mode 100644 index 000000000..357e00ae2 --- /dev/null +++ b/view/theme/goldenrod/screenshot.jpg diff --git a/view/theme/loozah/screenshot.jpg b/view/theme/loozah/screenshot.jpg Binary files differnew file mode 100644 index 000000000..41d6929ca --- /dev/null +++ b/view/theme/loozah/screenshot.jpg diff --git a/view/theme/purplezero/screenshot.jpg b/view/theme/purplezero/screenshot.jpg Binary files differnew file mode 100644 index 000000000..c1d346bb5 --- /dev/null +++ b/view/theme/purplezero/screenshot.jpg diff --git a/view/theme/shady/screenshot.jpg b/view/theme/shady/screenshot.jpg Binary files differnew file mode 100644 index 000000000..79a9162a0 --- /dev/null +++ b/view/theme/shady/screenshot.jpg diff --git a/view/theme/three-d/screenshot.jpg b/view/theme/three-d/screenshot.jpg Binary files differnew file mode 100644 index 000000000..c3f8e85dc --- /dev/null +++ b/view/theme/three-d/screenshot.jpg |
