use modal for wall message

diff --git a/js/theme.js b/js/theme.js
index 57b67d2c7bdbd888386fe3d7f1970fe8eec63aaf..58fca68c89ea3cbbbbde5ab5608dd27f7452c255 100644 (file)
--- a/js/theme.js
+++ b/js/theme.js
@@ -56,22 +56,23 @@ $(document).ready(function(){
        // Loading remote bootstrap remote modals
        // This is uses to load tradional friendica pages into bootstrap modals
        // 
-       $('a[rel=modal]').on('click', function(evt) {
-               evt.preventDefault();
-               var modal = $('#modal').modal();
-               modal
-                       .find('#modal-body')
-                       .load($(this).attr("href"), function (responseText, textStatus) {
-                               if ( textStatus === 'success' || 
-                                       textStatus === 'notmodified') 
-                               {
-                                       modal.show();
-
-                                       //Get first h3 element and use it as title
-                                       loadModalTitle();
-                               }
-                       });
-       });
+       // commentent out because we actually don't use it anymore
+//     $('a[rel=modal]').on('click', function(evt) {
+//             evt.preventDefault();
+//             var modal = $('#modal').modal();
+//             modal
+//                     .find('#modal-body')
+//                     .load($(this).attr("href"), function (responseText, textStatus) {
+//                             if ( textStatus === 'success' || 
+//                                     textStatus === 'notmodified') 
+//                             {
+//                                     modal.show();
+//
+//                                     //Get first h3 element and use it as title
+//                                     loadModalTitle();
+//                             }
+//                     });
+//     });
 
        // Add Colorbox for viewing Network page images
        //var cBoxClasses = new Array();

diff --git a/templates/profile_vcard.tpl b/templates/profile_vcard.tpl
index 059a19e41a925d1442284043283dcab57ed3b8af..50b03bad117bd8a33eae589d83025aa2b7ead3c2 100644 (file)
--- a/templates/profile_vcard.tpl
+++ b/templates/profile_vcard.tpl
@@ -49,7 +49,7 @@
                                {{/if}}
                                {{if $wallmessage}}
                                <div id="wallmessage-link-botton">
-                                       <a id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" href="wallmessage/{{$profile.nickname}}">
+                                       <a id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('wallmessage/{{$profile.nickname}}')">
                                                <span class=""><i class="fa fa-envelope"></i></span>
                                                <span class="">{{$wallmessage}}</span>
                                        </a>