Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

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) {