diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 05059e335..48f2fb005 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -7,7 +7,7 @@ function contact_profile_assign($current,$foreign_net) { $disabled = (($foreign_net) ? ' disabled="true" ' : ''); - $o .= "\r\n"; $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); diff --git a/include/conversation.php b/include/conversation.php index 05c41e6d2..bc227d977 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -800,6 +800,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $tmp_item = array( 'template' => $tpl, 'id' => (($preview) ? 'P0' : $item['item_id']), + 'guid' => (($preview) ? 'Q0' : $item['guid']), 'network' => $item['item_network'], 'network_name' => network_to_name($item['item_network'], $profile_link), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), diff --git a/mod/contacts.php b/mod/contacts.php index a129a665d..93013972f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -871,7 +871,7 @@ function contacts_tab($a, $contact_id, $active_tab) { 'url' => "contacts/".$contact_id, 'sel' => (($active_tab == 2)?'active':''), 'title' => t('Profile Details'), - 'id' => 'status-tab', + 'id' => 'profile-tab', 'accesskey' => 'o', ) ); diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl index 72228a1c2..6b880ed99 100644 --- a/view/templates/field_radio.tpl +++ b/view/templates/field_radio.tpl @@ -1,5 +1,5 @@
- - {{$field.3}} + + {{$field.3}}
diff --git a/view/templates/photo_albums.tpl b/view/templates/photo_albums.tpl index 0a086751e..934e818ec 100644 --- a/view/templates/photo_albums.tpl +++ b/view/templates/photo_albums.tpl @@ -1,6 +1,6 @@ @@ -88,26 +88,26 @@ {{* The jot text field in which the post text is inserted *}}
- +
@@ -121,7 +121,7 @@ - {{if $content}}{{/if}} + {{if $content}}{{/if}} @@ -141,7 +141,7 @@ can load different content into the jot moadl (e.g. the item edit jot) - - - diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 3a0da9c5f..2fab62353 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -23,56 +23,56 @@ @@ -238,11 +238,11 @@
diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications.tpl index 126001e93..dcea0b85f 100644 --- a/view/theme/frio/templates/notifications.tpl +++ b/view/theme/frio/templates/notifications.tpl @@ -29,7 +29,7 @@ {{* Since only the DIV's inside the notification-list are marked with the class "unseen", we need some js to transfer this class to the parent li list-elements *}} - + diff --git a/view/theme/frio/templates/photo_item.tpl b/view/theme/frio/templates/photo_item.tpl index 27cd5219f..935e6288b 100644 --- a/view/theme/frio/templates/photo_item.tpl +++ b/view/theme/frio/templates/photo_item.tpl @@ -8,11 +8,11 @@ {{* Dropdown menu with actions (e.g. delete comment) *}} {{if $drop.dropping }}
  • - +
    • @@ -23,7 +23,7 @@
    - {{$name}} + {{$name}}
    @@ -38,7 +38,7 @@
    {{* comment content *}} -
    +
    {{if $title}}
    {{$title}}
    {{/if}} diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl index 17edb858b..fd47097a5 100644 --- a/view/theme/frio/templates/photo_view.tpl +++ b/view/theme/frio/templates/photo_view.tpl @@ -19,7 +19,7 @@
    {{* The photo *}}
    - + {{$photo.filename}}
    {{* Overlay buttons for previous and next photo *}} diff --git a/view/theme/frio/templates/photos_recent.tpl b/view/theme/frio/templates/photos_recent.tpl index 683ef544a..894121fab 100644 --- a/view/theme/frio/templates/photos_recent.tpl +++ b/view/theme/frio/templates/photos_recent.tpl @@ -17,4 +17,4 @@ {{$paginate}}
    - + diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl index 0e20bf213..12ec57037 100644 --- a/view/theme/frio/templates/profile_edit.tpl +++ b/view/theme/frio/templates/profile_edit.tpl @@ -6,25 +6,25 @@