aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-17 16:04:17 -0700
committerzotlabs <mike@macgirvin.com>2017-04-17 16:04:17 -0700
commit7a31c039fb1114e251a85c4888a305966945167b (patch)
treec1f1074e25d0f53bce797c5887f2c235b681694c /view/tpl
parent60d4b4c4f6ed9f41bdf2e8ec17e448f39f699096 (diff)
parent7cca2b7fb0fe716f669b854606fdd1329ccb77ad (diff)
downloadvolse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.tar.gz
volse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.tar.bz2
volse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/atom_feed.tpl10
-rwxr-xr-xview/tpl/connection_template.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl2
3 files changed, 7 insertions, 7 deletions
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index 37eaf954a..fb606af27 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -3,13 +3,13 @@
xmlns:thr="http://purl.org/syndication/thread/1.0"
xmlns:at="http://purl.org/atompub/tombstones/1.0"
xmlns:media="http://purl.org/syndication/atommedia"
- xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+ xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
xmlns:zot="http://purl.org/zot"
xmlns:as="http://activitystrea.ms/spec/1.0/"
- xmlns:georss="http://www.georss.org/georss"
- xmlns:poco="http://portablecontacts.net/spec/1.0"
- xmlns:ostatus="http://ostatus.org/schema/1.0"
- xmlns:statusnet="http://status.net/schema/api/1/" >
+ xmlns:georss="http://www.georss.org/georss"
+ xmlns:poco="http://portablecontacts.net/spec/1.0"
+ xmlns:ostatus="http://ostatus.org/schema/1.0"
+ xmlns:statusnet="http://status.net/schema/api/1/" >
<id>{{$feed_id}}</id>
<title>{{$feed_title}}</title>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 2a668d485..16915abda 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,5 +1,5 @@
<div id="contact-entry-wrapper-{{$contact.id}}">
- <div class="section-subtitle-wrapper">
+ <div class="section-subtitle-wrapper clearfix">
<div class="pull-right">
{{if $contact.approve && $contact.ignore}}
<form action="connedit/{{$contact.id}}" method="post" >
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 853146a17..1cc5a898a 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -420,7 +420,7 @@ function enableOnUser(){
});
getPhotoAlbumList();
$('#embedPhotoModalBodyAlbumDialog').off('click');
- $('#embedPhotoModal').modal();
+ $('#embedPhotoModal').modal('show');
};
var choosePhotoFromAlbum = function (album) {