diff --git a/object/Item.php b/object/Item.php index 9ec63b4f2..c807f7053 100644 --- a/object/Item.php +++ b/object/Item.php @@ -253,6 +253,7 @@ class Item extends BaseObject { 'vote' => $buttons, 'like' => $like, 'dislike' => $dislike, + 'switchcomment' => t('Comment'), 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 96903bba0..c7b6661b2 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -722,7 +722,7 @@ ul.menu-popup .empty { aside { display: table-cell; vertical-align: top; - width: 200px; + width: 185px; padding: 0px 10px 0px 20px; border-right: 1px solid #D2D2D2; /* background: #F1F1F1; */ @@ -779,6 +779,28 @@ aside #dfrn-request-link:hover { aside #profiles-menu { width: 20em; } + +aside #search-text { + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; + -moz-border-bottom-colors: #dbdbdb; + -moz-border-top-colors: #999; + -moz-border-left-colors: #999; + -moz-border-right-colors: #dbdbdb; +} + +.nets-ul { + margin-top: 0px; +} +.nets-all { + margin-left: 16px; +} + #contact-block { overflow: auto; height: auto; diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl index f6f4679cb..b422ae926 100644 --- a/view/theme/vier/wall_thread.tpl +++ b/view/theme/vier/wall_thread.tpl @@ -49,8 +49,16 @@ {{ endif }} -
$item.location
+
+ $item.name + {{ if $item.owner_url }}$item.to $item.owner_name {{ endif }} + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
{{ if $item.title }}

$item.title

{{ endif }} $item.body @@ -79,7 +87,8 @@ {{ if $item.plink }}$item.plink.title{{ endif }}
-
+
$item.location
+
+ {{ if $item.star }} $item.star.do $item.star.undo $item.star.tagger - {{ endif }} {{ if $item.filer }} $item.filer @@ -134,7 +145,7 @@ {{ if $item.threaded }}{{ if $item.comment }}
-
+
$item.comment
@@ -159,10 +170,11 @@ {{ endif }} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
$item.comment
+
$item.comment
{{ endif }}{{ endif }}{{ endif }} {{ if $item.flatten }} -
$item.comment
+ +
$item.comment
{{ endif }}