From 05a13a99b2c89db5d01e205301888a8a5c90108a Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 28 May 2016 13:47:41 +0200
Subject: [PATCH 1/4] Frio: Location should look now similar everywhere
---
view/theme/frio/templates/wall_thread.tpl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 7ef178f838..ccc8f6967c 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -207,7 +207,12 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
<p class="text-muted">
- <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}} — ({{$item.location}}){{/if}}</small>
+ <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a></small>
+ {{if $item.location}}
+ <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
+ <small><span class="location">({{$item.location}})</span></small>
+ </div>
+ {{/if}}
</p>
</h5>
</div>
From 036ca6a6e19177eb405f9b54c08ebcf9a79946c9 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 May 2016 10:56:49 +0200
Subject: [PATCH 2/4] frio: Bugfix for linebreak of locations in comments
---
view/theme/frio/templates/wall_thread.tpl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index ccc8f6967c..070e0a702c 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -225,7 +225,10 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
<span class="text-muted">
- <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}} — ({{$item.location}}){{/if}}</small>
+ <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></small>
+ {{if $item.location}}
+ <small><span class="location">{{$item.location}}</span></small>
+ {{/if}}
</span>
</h5>
</div>
From c0ea78978609181b3b26d6839804dc56cd287f50 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 May 2016 15:33:36 +0200
Subject: [PATCH 3/4] Some location changes
---
view/theme/frio/css/style.css | 3 +--
view/theme/frio/templates/wall_thread.tpl | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 35c490738a..839bb9dcb2 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1206,8 +1206,7 @@ section #jotOpen {
font-weight: 500;
color: #555;
}
-.media .media-body .addional-info a,
-.media .media-body h5.media-heading a {
+.media .media-body .addional-info a, .media .media-body h5.media-heading > a {
display: block;
}
.media .contact-info-comment {
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 070e0a702c..ccc8f6967c 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -225,10 +225,7 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
<span class="text-muted">
- <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></small>
- {{if $item.location}}
- <small><span class="location">{{$item.location}}</span></small>
- {{/if}}
+ <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}} — ({{$item.location}}){{/if}}</small>
</span>
</h5>
</div>
From 3d3498af1b43fb82ec0a93503f8cb78c6c1d8541 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 May 2016 15:40:24 +0200
Subject: [PATCH 4/4] And some more
---
view/theme/frio/templates/wall_thread.tpl | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index ccc8f6967c..7ef178f838 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -207,12 +207,7 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
<p class="text-muted">
- <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a></small>
- {{if $item.location}}
- <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
- <small><span class="location">({{$item.location}})</span></small>
- </div>
- {{/if}}
+ <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}} — ({{$item.location}}){{/if}}</small>
</p>
</h5>
</div>