From ccaeb00973b776270de3959b2e567cc1a45ff670 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 8 Aug 2015 22:30:43 +0200 Subject: [PATCH] Better link descriptions. --- include/conversation.php | 2 +- include/group.php | 8 +++--- include/text.php | 7 +++-- view/global.css | 31 +++++++++++++++++------ view/templates/acl_selector.tpl | 6 ++--- view/templates/group_side.tpl | 2 +- view/theme/vier/style.css | 11 -------- view/theme/vier/templates/wall_thread.tpl | 6 ++--- 8 files changed, 40 insertions(+), 33 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index ca31fd8a02..5a84ca42a6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -892,7 +892,7 @@ function item_photo_menu($item){ foreach($menu as $k=>$v){ if(strpos($v,'javascript:') === 0) { $v = substr($v,11); - $o .= "
  • $k
    • \n"; + $o .= "
  • $k
    • \n"; } elseif ($v!="") $o .= "
  • $k
    • \n"; } diff --git a/include/group.php b/include/group.php index bbfac7ac1d..b7e1963bf3 100644 --- a/include/group.php +++ b/include/group.php @@ -263,8 +263,8 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 ); } } - - + + $tpl = get_markup_template("group_side.tpl"); $o = replace_macros($tpl, array( '$title' => t('Groups'), @@ -276,8 +276,8 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 '$groups' => $groups, '$add' => t('add'), )); - - + + return $o; } diff --git a/include/text.php b/include/text.php index 829e37c2ce..510db01bf1 100644 --- a/include/text.php +++ b/include/text.php @@ -1676,11 +1676,14 @@ function get_plink($item) { //'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'], 'href' => $a->get_baseurl()."/display/".$item['guid'], 'orig' => $a->get_baseurl()."/display/".$item['guid'], - 'title' => t('link to source'), + 'title' => t('local thread'), + 'orig_title' => t('local thread'), ); - if (x($item,'plink')) + if (x($item,'plink')) { $ret["href"] = $item['plink']; + $ret["title"] = t('link to source'); + } } elseif (x($item,'plink') && ($item['private'] != 1)) $ret = array( diff --git a/view/global.css b/view/global.css index 0033418b86..94896ea232 100644 --- a/view/global.css +++ b/view/global.css @@ -180,15 +180,30 @@ span.oembed, h4 { /* plain text editor upload/select popup */ - -.fbrowser .path a { padding: 5px; } + +.fbrowser .path a { padding: 5px; } .fbrowser .path a:before { content: "/"; padding-right: 5px;} .fbrowser .folders ul { list-style-type: none; padding-left: 10px;} -.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; } -.fbrowser.image .photo-album-image-wrapper { float: left; } +.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; } +.fbrowser.image .photo-album-image-wrapper { float: left; } .fbrowser.image a img { height: 48px; } -.fbrowser.image a p { display: none;} -.fbrowser.file .photo-album-image-wrapper { float:none; white-space: nowrap; } -.fbrowser.file img { display: inline; } +.fbrowser.image a p { display: none;} +.fbrowser.file .photo-album-image-wrapper { float:none; white-space: nowrap; } +.fbrowser.file img { display: inline; } .fbrowser.file p { display: inline; white-space: nowrap; } -.fbrowser .upload { clear: both; padding-top: 1em;} +.fbrowser .upload { clear: both; padding-top: 1em;} + +a { + cursor: pointer; +} + +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index c1220bc1e3..bf9470b64e 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -1,7 +1,7 @@
    - {{$showall}} + {{$showall}}
    @@ -11,8 +11,8 @@ {{if $networks}} diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl index 2acb00ae9b..c7e1aa895e 100644 --- a/view/templates/group_side.tpl +++ b/view/templates/group_side.tpl @@ -13,7 +13,7 @@ /> {{/if}} {{if $group.edit}} - + {{$edittext}} {{/if}} {{$group.text}} diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index f2830aae90..26b0aa3626 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2938,14 +2938,3 @@ a.mail-list-link { /* upload/select popup */ .fbrowser.image .photo-album-image-wrapper { margin-left: 10px; } - -.sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0,0,0,0); - border: 0; -} diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index f4632cab30..41c978942b 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -44,7 +44,7 @@ - menu + @@ -95,14 +95,14 @@
    - {{if $item.plink}}{{$item.plink.title}}{{/if}} + {{if $item.plink}}{{$item.plink.orig_title}}{{/if}}
    {{if $item.threaded}} {{/if}} {{if $item.comment}} - {{$item.switchcomment}} + {{$item.switchcomment}} {{/if}} {{if $item.vote}} {{if $item.vote.like}}