From 8f1dde701ab92d13a3037fc3987c495d66ae8918 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 19 Apr 2014 02:45:44 +0200 Subject: Bootstrapify item tools Only show the like buttons and the delete button permanently hide everything else in a drop down. This will break non bootstrap themes. So may be we also want to move this into the red basic folder. It still a little bit work in progress. Allignment is not 100% correct. May be we want to add text into the drop down. --- view/css/conversation.css | 6 +++- view/tpl/conv_item.tpl | 84 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 7e439137e..3c4665cdc 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -217,7 +217,11 @@ padding: 5px 10px; margin-left: 60px; } - +.wall-item-tools-bs { +clear: both; + //padding: 5px 5px; + //margin-left: 40px; +} .comment .wall-item-tools { margin-left: 0; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 31e3cad85..20c426495 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -58,45 +58,101 @@ {{/if}} -
+ +
+ {{if $item.like}} + {{/if}} + {{if $item.dislike}}{{/if}} + {{if $item.drop.dropping}}{{/if}} + +
+ +
    +
  • {{if $item.share}} + + {{/if}}
    • +
  • {{if $item.plink}} + + {{/if}}
    • +
  • {{if $item.edpost}} + + {{/if}}
    • +
  • {{if $item.tagger}} + + {{/if}}
    • +
  • {{if $item.filer}} + + {{/if}}
    • +
  • {{if $item.bookmark}} + + {{/if}}
    • +
  • {{if $item.star}} + + {{/if}} +
    • + + +
+
+
+
- {{if $item.drop.dropping}}{{/if}} +
{{if $item.drop.pagedrop}}{{/if}}
{{$item.showdislike}}
-
+
-- cgit v1.2.3 From b9ffc2ef44965bf3cb58715ae74d93fbe14d9043 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 19 Apr 2014 03:16:26 +0200 Subject: Move javascript calls to button tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit because otherwise it didn’t work in Firefox --- view/tpl/conv_item.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 20c426495..425151c82 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -95,15 +95,15 @@ -->
{{if $item.like}} - {{/if}} - {{if $item.dislike}}{{/if}} - {{if $item.drop.dropping}}{{/if}} + {{if $item.drop.dropping}}{{/if}} + {{if $item.drop.dropping}}{{/if}}
{{if $item.drop.pagedrop}}{{/if}}
-- cgit v1.2.3 From 4c950dc38aaed9985c1b70332cd9881df22fa515 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 19 Apr 2014 04:13:15 +0200 Subject: More work --- view/tpl/conv_item.tpl | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dccce8d75..1e277c0b2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -38,7 +38,7 @@ {{if $item.lock}} {{/if}}{{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
{{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}}
-
+
{{$item.title}}
{{$item.body}} @@ -58,40 +58,35 @@ {{/if}}
-
{{if $item.like}} @@ -153,7 +148,7 @@
{{$item.showdislike}}
-
+
-- cgit v1.2.3 From 2ecf3f33952dcdf83d9b3fb07185371d0831f609 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 20 Apr 2014 02:06:24 +0200 Subject: Add descriptions to drop down --- view/tpl/conv_item.tpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 1e277c0b2..b217e70ff 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -112,25 +112,25 @@
  • {{if $item.share}} - + {{$item.share.0}} {{/if}}
  • {{if $item.plink}} - + {{$item.plink.title}} {{/if}}
  • {{if $item.edpost}} - + {{$item.edpost.1}} {{/if}}
  • {{if $item.tagger}} - + {{$item.tagger.tagit}} {{/if}}
  • {{if $item.filer}} - + {{$item.filer}} {{/if}}
  • {{if $item.bookmark}} - + {{$item.bookmark}} {{/if}}
  • {{if $item.star}} - + {{$item.star.toggle}} {{/if}}
    • -- cgit v1.2.3 From 3b2840a2fe3fbe123663731c32e6f40057cae6cb Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 20 Apr 2014 02:53:04 +0200 Subject: ok we need that div --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b217e70ff..a3148f657 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -148,7 +148,7 @@
    {{$item.showdislike}}
    - +
-- cgit v1.2.3 From 886d9018b7e1150215205406db512d1fbe0f1bd6 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 20 Apr 2014 03:43:01 +0200 Subject: css --- view/css/conversation.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 3c4665cdc..74a83628e 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -219,13 +219,16 @@ } .wall-item-tools-bs { clear: both; - //padding: 5px 5px; - //margin-left: 40px; + padding: 5px 10px; + margin-left: 40px; } .comment .wall-item-tools { margin-left: 0; } - +.comment .wall-item-tools-bs { + padding: 0px 0px; + margin-left: 30px; +} .item-tool { float: left; margin-right: 8px; -- cgit v1.2.3