diff options
| -rw-r--r-- | include/api.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 7 | ||||
| -rw-r--r-- | view/css/conversation.css | 6 | ||||
| -rw-r--r-- | view/js/acl.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 11 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
10 files changed, 23 insertions, 19 deletions
diff --git a/include/api.php b/include/api.php index f781987d1..f279b2aa3 100644 --- a/include/api.php +++ b/include/api.php @@ -742,6 +742,8 @@ require_once('include/api_auth.php'); } $user_info = api_get_user($a); +// logger('status_with_media: ' . print_r($_REQUEST,true), LOGGER_DEBUG); + $_REQUEST['type'] = 'wall'; $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; diff --git a/include/conversation.php b/include/conversation.php index 09a6d51d7..57dc9d2a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) - ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' + ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" />' . $name . '</a>' : '<a href="#" class="disabled">' . $name . '</a>' ); diff --git a/include/widgets.php b/include/widgets.php index 5a135ae52..fc6fee2ef 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1229,6 +1229,10 @@ function widget_album($args) { $owner_uid = get_app()->profile_uid; $sql_extra = permissions_sql($owner_uid); + + if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage')) + return ''; + if($args['album']) $album = $args['album']; if($args['title']) diff --git a/version.inc b/version.inc index 1cf2edada..b6659c788 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-16.1218 +2015-11-17.1219 diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index fa76fa2f2..19796679a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -61,13 +61,6 @@ aside .nav-pills > li > a { padding: 6px 10px; } -.dropdown-menu img { - float: left; - width: 36px; - height: 36px; - margin-right: 5px; -} - .dropdown-menu li a { overflow: hidden; text-overflow: ellipsis; diff --git a/view/css/conversation.css b/view/css/conversation.css index dc74dbbeb..6f1d4b899 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -246,9 +246,3 @@ a.wall-item-name-link { color: #FF0000; font-size: 1em !important; } - -.response-photo { - height: 18px !important; - width: 18px !important; -} - diff --git a/view/js/acl.js b/view/js/acl.js index 847997de0..a0c1c6c02 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -31,7 +31,7 @@ function ACL(backend_url, preset) { $("#acl-search").keypress(that.on_search); /* startup! */ - that.get(0,100); + that.get(0,1000); that.on_submit(); }); } @@ -60,7 +60,7 @@ ACL.prototype.on_submit = function() { ACL.prototype.search = function() { var srcstr = $("#acl-search").val(); that.list_content.html(""); - that.get(0, 100, srcstr); + that.get(0, 1000, srcstr); }; ACL.prototype.on_search = function(event) { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d747e9c3e..f089b8599 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1856,7 +1856,18 @@ nav .dropdown-menu { border-bottom-left-radius: $radiuspx; } +.dropdown-menu-img-sm { + float: left; + width: 36px; + height: 36px; + margin-right: 5px; +} +.dropdown-menu-img-xs { + height: 18px; + width: 18px; + margin-right: 5px; +} #usermenu-caret { color: $nav_icon_colour; diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index c3f0700f0..3770cb9a6 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> </ul> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index bea0d894f..c52c2cd81 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -6,7 +6,7 @@ <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> - <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> </li> {{/foreach}} <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> |