Merge https://github.com/redmatrix/redmatrix into pending_merge

author: redmatrix <redmatrix@redmatrix.me> 2015-07-10 14:20:38 -0700
committer: redmatrix <redmatrix@redmatrix.me> 2015-07-10 14:20:38 -0700
commit: 4bf7e4a34d166a52a10939ab0bb26ac05652f59c (patch)
tree: 2324fd2c13717a3d2fb7fe0b0d7de8eb1e268d37 /view
parent: ae6541cf74a0940131d6fdb937539effe5b27e3e (diff)
parent: 6e30ccdd2210c1a3e8f4ff571110b9bbae895dc1 (diff)
download: volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.gz
volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.bz2
volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.zip
16 files changed, 467 insertions, 382 deletions
diff --git a/view/css/default.css b/view/css/default.css
index fb6705894..e1edc2cbf 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -17,12 +17,11 @@ main {
 aside {
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 7px 0px 7px;
+
 }
 
 section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 7px 200px 7px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 63c380c75..5b6e8aeb9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -39,7 +39,7 @@
 	padding: 5px;
 	width: 100%;
 	resize: vertical;
-	height: 150px;
+	height: 250px;
 }
 
 /* saved searches */
diff --git a/view/nl/messages.po b/view/nl/messages.po
index fc3148bce..45d5eba67 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-26 00:05-0700\n"
-"PO-Revision-Date: 2015-06-29 22:19+0000\n"
+"POT-Creation-Date: 2015-07-03 00:04-0700\n"
+"PO-Revision-Date: 2015-07-10 19:44+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/p/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -307,7 +307,7 @@ msgid "remove from file"
 msgstr "uit map verwijderen"
 
 #: ../../include/text.php:1498 ../../include/text.php:1509
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:667
 msgid "Click to open/close"
 msgstr "Klik om te openen of te sluiten"
 
@@ -335,7 +335,7 @@ msgstr "Opmaaktype pagina"
 msgid "Select an alternate language"
 msgstr "Kies een andere taal"
 
-#: ../../include/text.php:1888 ../../include/diaspora.php:2101
+#: ../../include/text.php:1888 ../../include/diaspora.php:2115
 #: ../../include/conversation.php:120 ../../mod/like.php:346
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 #: ../../mod/tagger.php:43
@@ -347,10 +347,9 @@ msgstr "foto"
 msgid "event"
 msgstr "gebeurtenis"
 
-#: ../../include/text.php:1894 ../../include/diaspora.php:2101
+#: ../../include/text.php:1894 ../../include/diaspora.php:2115
 #: ../../include/conversation.php:148 ../../mod/like.php:346
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
 msgid "status"
 msgstr "bericht"
 
@@ -400,30 +399,31 @@ msgstr "map"
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../include/diaspora.php:2130 ../../include/conversation.php:164
+#: ../../include/diaspora.php:2144 ../../include/conversation.php:164
 #: ../../mod/like.php:394
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s leuk"
 
-#: ../../include/diaspora.php:2476
+#: ../../include/diaspora.php:2490
 msgid "Please choose"
 msgstr "Maak een keuze"
 
-#: ../../include/diaspora.php:2478
+#: ../../include/diaspora.php:2492
 msgid "Agree"
 msgstr "Eens"
 
-#: ../../include/diaspora.php:2480
+#: ../../include/diaspora.php:2494
 msgid "Disagree"
 msgstr "Oneens"
 
-#: ../../include/diaspora.php:2482
+#: ../../include/diaspora.php:2496
 msgid "Abstain"
 msgstr "onthouding"
 
-#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515
-#: ../../include/enotify.php:59 ../../mod/p.php:46
+#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../mod/p.php:46
 msgid "$projectname"
 msgstr "$projectname"
 
@@ -440,11 +440,11 @@ msgstr "gaf een reactie op een bericht van %s"
 msgid "No username found in import file."
 msgstr "Geen gebruikersnaam in het importbestand gevonden."
 
-#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
 
-#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504
 msgid "Import completed."
 msgstr "Import voltooid."
 
@@ -526,7 +526,7 @@ msgid "Registration request at %s"
 msgstr "Registratiebevestiging voor %s"
 
 #: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
 msgid "Administrator"
 msgstr "Beheerder"
 
@@ -754,8 +754,8 @@ msgid "Finishes:"
 msgstr "Einde:"
 
 #: ../../include/event.php:47 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:879 ../../mod/directory.php:296
-#: ../../mod/events.php:647
+#: ../../include/identity.php:879 ../../mod/events.php:647
+#: ../../mod/directory.php:295
 msgid "Location:"
 msgstr "Plaats:"
 
@@ -837,7 +837,7 @@ msgstr "Omschrijving (optioneel)"
 #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
-#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211
+#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211
 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
@@ -848,9 +848,10 @@ msgstr "Omschrijving (optioneel)"
 #: ../../mod/settings.php:692 ../../mod/settings.php:718
 #: ../../mod/settings.php:746 ../../mod/settings.php:769
 #: ../../mod/settings.php:854 ../../mod/settings.php:1050
-#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679
-#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68
-#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
+#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688
+#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108
+#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
+#: ../../view/theme/apw/php/config.php:256
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
@@ -1028,7 +1029,7 @@ msgstr "Laatst gewijzigd"
 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062
 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225
 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113
-#: ../../mod/settings.php:651 ../../mod/connedit.php:543
+#: ../../mod/settings.php:651 ../../mod/connedit.php:549
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1049,6 +1050,23 @@ msgstr "Bladwijzers van %1$s"
 msgid "view full size"
 msgstr "volledige grootte tonen"
 
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
 #: ../../include/features.php:38
 msgid "General Features"
 msgstr "Algemene functies"
@@ -1236,63 +1254,71 @@ msgid "Filter stream activity by depth of relationships"
 msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"
 
 #: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "Connectie-filters"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud"
+
+#: ../../include/features.php:75
 msgid "Suggest Channels"
 msgstr "Kanalen voorstellen"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Show channel suggestions"
 msgstr "Voor jou mogelijk interessante kanalen voorstellen"
 
-#: ../../include/features.php:79
+#: ../../include/features.php:80
 msgid "Post/Comment Tools"
 msgstr "Bericht- en reactiehulpmiddelen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Tagging"
 msgstr "Taggen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Ability to tag existing posts"
 msgstr "Mogelijkheid om bestaande berichten te taggen"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Post Categories"
 msgstr "Categorieën berichten"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Add categories to your posts"
 msgstr "Voeg categorieën toe aan je berichten"
 
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
 #: ../../include/contact_widgets.php:57
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to file posts under folders"
 msgstr "Mogelijkheid om berichten in mappen op te slaan"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Dislike Posts"
 msgstr "Vind berichten niet leuk"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to dislike posts/comments"
 msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Star Posts"
 msgstr "Geef berichten een ster"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Tag Cloud"
 msgstr "Tagwolk"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
@@ -1324,7 +1350,7 @@ msgstr "Persoonlijke app bewerken"
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:828 ../../mod/directory.php:310
+#: ../../include/identity.php:828 ../../mod/directory.php:309
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Verbinden"
@@ -1375,11 +1401,11 @@ msgstr "Alles"
 msgid "Archives"
 msgstr "Archieven"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:427 ../../mod/connedit.php:578
 msgid "Me"
 msgstr "Ik"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:428 ../../mod/connedit.php:579
 msgid "Family"
 msgstr "Familie"
 
@@ -1388,16 +1414,16 @@ msgstr "Familie"
 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
 #: ../../mod/settings.php:349 ../../mod/settings.php:350
 #: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:574
+#: ../../mod/connedit.php:580
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:430 ../../mod/connedit.php:581
 msgid "Acquaintances"
 msgstr "Kennissen"
 
 #: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../mod/connections.php:246 ../../mod/connedit.php:582
 msgid "All"
 msgstr "Alles"
 
@@ -1433,7 +1459,7 @@ msgstr "Verbonden applicaties"
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:530 ../../mod/connedit.php:659
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
@@ -1488,19 +1514,6 @@ msgstr "Bekijk beoordelingen"
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/enotify.php:58
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -2077,7 +2090,7 @@ msgid "Your posts and conversations"
 msgstr "Jouw berichten en conversaties"
 
 #: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../mod/connedit.php:500 ../../mod/connedit.php:666
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
@@ -2991,47 +3004,47 @@ msgstr "Toegang geweigerd"
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: ../../include/items.php:1249
+#: ../../include/items.php:1304
 msgid "Visible to anybody on the internet."
 msgstr "Voor iedereen op het internet zichtbaar."
 
-#: ../../include/items.php:1251
+#: ../../include/items.php:1306
 msgid "Visible to you only."
 msgstr "Alleen voor jou zichtbaar."
 
-#: ../../include/items.php:1253
+#: ../../include/items.php:1308
 msgid "Visible to anybody in this network."
 msgstr "Voor iedereen in dit netwerk zichtbaar."
 
-#: ../../include/items.php:1255
+#: ../../include/items.php:1310
 msgid "Visible to anybody authenticated."
 msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
 
-#: ../../include/items.php:1257
+#: ../../include/items.php:1312
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/items.php:1259
+#: ../../include/items.php:1314
 msgid "Visible to all connections."
 msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/items.php:1261
+#: ../../include/items.php:1316
 msgid "Visible to approved connections."
 msgstr "Voor alle goedgekeurde connecties zichtbaar."
 
-#: ../../include/items.php:1263
+#: ../../include/items.php:1318
 msgid "Visible to specific connections."
 msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/items.php:4076 ../../mod/thing.php:74
+#: ../../include/items.php:4195 ../../mod/thing.php:74
 #: ../../mod/display.php:36 ../../mod/filestorage.php:27
 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025
 #: ../../mod/admin.php:1225
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../include/items.php:4149 ../../include/attach.php:137
+#: ../../include/items.php:4268 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3061,7 +3074,7 @@ msgstr "Item niet gevonden."
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/editblock.php:65 ../../mod/register.php:72
 #: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331
+#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337
 #: ../../mod/mail.php:114 ../../mod/notifications.php:66
 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66
@@ -3074,26 +3087,26 @@ msgstr "Item niet gevonden."
 msgid "Permission denied."
 msgstr "Toegang geweigerd"
 
-#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr "Collectie niet gevonden."
 
-#: ../../include/items.php:4567
+#: ../../include/items.php:4686
 msgid "Collection is empty."
 msgstr "Collectie is leeg"
 
-#: ../../include/items.php:4574
+#: ../../include/items.php:4693
 #, php-format
 msgid "Collection: %s"
 msgstr "Collectie: %s"
 
-#: ../../include/items.php:4584
+#: ../../include/items.php:4703
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../include/items.php:4586
+#: ../../include/items.php:4705
 msgid "Connection not found."
 msgstr "Connectie niet gevonden."
 
@@ -3105,7 +3118,7 @@ msgstr "Datapakket ongeldig"
 msgid "Unable to verify channel signature"
 msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/zot.php:2109
+#: ../../include/zot.php:2126
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
@@ -3157,12 +3170,12 @@ msgstr "Verbinden/volgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373
-#: ../../mod/directory.php:378 ../../mod/connections.php:413
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
+#: ../../mod/directory.php:372 ../../mod/directory.php:377
 msgid "Find"
 msgstr "Vinden"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr "Voorgestelde kanalen"
@@ -3420,7 +3433,7 @@ msgstr "F j"
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1163 ../../mod/directory.php:291
+#: ../../include/identity.php:1163 ../../mod/directory.php:290
 msgid "Age:"
 msgstr "Leeftijd:"
 
@@ -3433,7 +3446,7 @@ msgstr "voor %1$d %2$s"
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1179 ../../mod/directory.php:307
+#: ../../include/identity.php:1179 ../../mod/directory.php:306
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
@@ -3450,7 +3463,7 @@ msgstr "Politieke overtuigingen:"
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1187 ../../mod/directory.php:309
+#: ../../include/identity.php:1187 ../../mod/directory.php:308
 msgid "About:"
 msgstr "Over:"
 
@@ -3844,7 +3857,7 @@ msgstr "QR-code"
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s schreef het volgende %2$s %3$s"
 
-#: ../../include/bbcode.php:264
+#: ../../include/bbcode.php:264 ../../mod/tagger.php:51
 msgid "post"
 msgstr "bericht"
 
@@ -3944,75 +3957,6 @@ msgstr "%d nieuwe connectieverzoeken"
 msgid "Delegated Channels"
 msgstr "Uitbestede kanalen"
 
-#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13
-#: ../../mod/display.php:13 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Openbare toegang geweigerd."
-
-#: ../../mod/directory.php:227
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d beoordeling"
-msgstr[1] "%d beoordelingen"
-
-#: ../../mod/directory.php:238
-msgid "Gender: "
-msgstr "Geslacht:"
-
-#: ../../mod/directory.php:240
-msgid "Status: "
-msgstr "Status: "
-
-#: ../../mod/directory.php:242
-msgid "Homepage: "
-msgstr "Homepagina: "
-
-#: ../../mod/directory.php:302 ../../mod/events.php:645
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: ../../mod/directory.php:311
-msgid "Public Forum:"
-msgstr "Openbaar forum:"
-
-#: ../../mod/directory.php:314
-msgid "Keywords: "
-msgstr "Trefwoorden: "
-
-#: ../../mod/directory.php:317
-msgid "Don't suggest"
-msgstr "Niet voorstellen"
-
-#: ../../mod/directory.php:319
-msgid "Common connections:"
-msgstr "Gemeenschappelijke connecties:"
-
-#: ../../mod/directory.php:368
-msgid "Global Directory"
-msgstr "Volledige kanalengids"
-
-#: ../../mod/directory.php:368
-msgid "Local Directory"
-msgstr "Lokale kanalengids"
-
-#: ../../mod/directory.php:374
-msgid "Finding:"
-msgstr "Gezocht naar:"
-
-#: ../../mod/directory.php:379
-msgid "next page"
-msgstr "volgende pagina"
-
-#: ../../mod/directory.php:379
-msgid "previous page"
-msgstr "vorige pagina"
-
-#: ../../mod/directory.php:395
-msgid "No entries (some entries may be hidden)."
-msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
-
 #: ../../mod/xchan.php:6
 msgid "Xchan Lookup"
 msgstr "Xchan opzoeken"
@@ -4439,6 +4383,10 @@ msgid ""
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
+#: ../../mod/events.php:645 ../../mod/directory.php:301
+msgid "Description:"
+msgstr "Omschrijving:"
+
 #: ../../mod/events.php:649
 msgid "Title:"
 msgstr "Titel:"
@@ -4694,11 +4642,11 @@ msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
 msgid "Could not locate selected profile."
 msgstr "Kon het gekozen profiel niet vinden."
 
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
+#: ../../mod/connections.php:94 ../../mod/connedit.php:220
 msgid "Connection updated."
 msgstr "Connectie bijgewerkt."
 
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
+#: ../../mod/connections.php:96 ../../mod/connedit.php:222
 msgid "Failed to update connection record."
 msgstr "Bijwerken van connectie-gegevens mislukt."
 
@@ -4787,10 +4735,70 @@ msgstr "Bloknaam"
 msgid "Block Title"
 msgstr "Bloktitel"
 
-#: ../../mod/tagger.php:96
+#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/display.php:13 ../../mod/ratings.php:82
+#: ../../mod/viewconnections.php:17
+msgid "Public access denied."
+msgstr "Openbare toegang geweigerd."
+
+#: ../../mod/directory.php:227
 #, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d beoordeling"
+msgstr[1] "%d beoordelingen"
+
+#: ../../mod/directory.php:238
+msgid "Gender: "
+msgstr "Geslacht:"
+
+#: ../../mod/directory.php:240
+msgid "Status: "
+msgstr "Status: "
+
+#: ../../mod/directory.php:242
+msgid "Homepage: "
+msgstr "Homepagina: "
+
+#: ../../mod/directory.php:310
+msgid "Public Forum:"
+msgstr "Openbaar forum:"
+
+#: ../../mod/directory.php:313
+msgid "Keywords: "
+msgstr "Trefwoorden: "
+
+#: ../../mod/directory.php:316
+msgid "Don't suggest"
+msgstr "Niet voorstellen"
+
+#: ../../mod/directory.php:318
+msgid "Common connections:"
+msgstr "Gemeenschappelijke connecties:"
+
+#: ../../mod/directory.php:367
+msgid "Global Directory"
+msgstr "Volledige kanalengids"
+
+#: ../../mod/directory.php:367
+msgid "Local Directory"
+msgstr "Lokale kanalengids"
+
+#: ../../mod/directory.php:373
+msgid "Finding:"
+msgstr "Gezocht naar:"
+
+#: ../../mod/directory.php:378
+msgid "next page"
+msgstr "volgende pagina"
+
+#: ../../mod/directory.php:378
+msgid "previous page"
+msgstr "vorige pagina"
+
+#: ../../mod/directory.php:394
+msgid "No entries (some entries may be hidden)."
+msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
 
 #: ../../mod/cloud.php:120
 msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
@@ -5046,55 +5054,64 @@ msgstr "Niet in staat om gegevens van de oude hub te downloaden"
 msgid "Imported file is empty."
 msgstr "Geïmporteerde bestand is leeg"
 
-#: ../../mod/import.php:121
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr "De geïmporteerde gegevens zijn niet compatibel met dit project."
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
+
+#: ../../mod/import.php:135
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
 
-#: ../../mod/import.php:162
+#: ../../mod/import.php:176
 msgid "Channel clone failed. Import failed."
 msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 
-#: ../../mod/import.php:172
+#: ../../mod/import.php:186
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../mod/import.php:502
+#: ../../mod/import.php:516
 msgid "You must be logged in to use this feature."
 msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
 
-#: ../../mod/import.php:507
+#: ../../mod/import.php:521
 msgid "Import Channel"
 msgstr "Kanaal importeren"
 
-#: ../../mod/import.php:508
+#: ../../mod/import.php:522
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
 
-#: ../../mod/import.php:509
+#: ../../mod/import.php:523
 msgid "File to Upload"
 msgstr "Bestand om te uploaden"
 
-#: ../../mod/import.php:510
+#: ../../mod/import.php:524
 msgid "Or provide the old server/hub details"
 msgstr "Of vul de gegevens van de oude hub in"
 
-#: ../../mod/import.php:511
+#: ../../mod/import.php:525
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Jouw oude kanaaladres (xyz@example.com)"
 
-#: ../../mod/import.php:512
+#: ../../mod/import.php:526
 msgid "Your old login email address"
 msgstr "Het e-mailadres van je oude account"
 
-#: ../../mod/import.php:513
+#: ../../mod/import.php:527
 msgid "Your old login password"
 msgstr "Wachtwoord van jouw oude account"
 
-#: ../../mod/import.php:514
+#: ../../mod/import.php:528
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -5102,17 +5119,17 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
 
-#: ../../mod/import.php:515
+#: ../../mod/import.php:529
 msgid "Make this hub my primary location"
 msgstr "Stel deze hub als mijn primaire locatie in"
 
-#: ../../mod/import.php:516
+#: ../../mod/import.php:530
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van hoeveelheid geheugen hub)"
 
-#: ../../mod/import.php:517
+#: ../../mod/import.php:531
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -5295,11 +5312,12 @@ msgstr "Website:"
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
 
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161 ../../mod/connedit.php:669
 msgid "Rating (this information is public)"
 msgstr "Beoordeling (deze informatie is openbaar)"
 
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162 ../../mod/connedit.php:670
+#: ../../mod/connedit.php:674
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
 
@@ -6373,6 +6391,11 @@ msgstr "OpenID-protocolfout. Geen ID terugontvangen."
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
+
 #: ../../mod/uexport.php:33 ../../mod/uexport.php:34
 msgid "Export Channel"
 msgstr "Kanaal exporteren"
@@ -6965,13 +6988,13 @@ msgstr "Goedkeuren"
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../mod/admin.php:827 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:523
+#: ../../mod/connedit.php:729
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../mod/admin.php:828 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:523
+#: ../../mod/connedit.php:729
 msgid "Unblock"
 msgstr "Deblokkeren"
 
@@ -8167,161 +8190,174 @@ msgid ""
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:268
 msgid "is now connected to"
 msgstr "is nu verbonden met"
 
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:381
 msgid "Could not access address book record."
 msgstr "Kon geen toegang krijgen tot de record van de connectie."
 
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:395
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 
-#: ../../mod/connedit.php:396
+#: ../../mod/connedit.php:402
 msgid "Channel has been unblocked"
 msgstr "Kanaal is gedeblokkeerd"
 
-#: ../../mod/connedit.php:397
+#: ../../mod/connedit.php:403
 msgid "Channel has been blocked"
 msgstr "Kanaal is geblokkeerd"
 
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:407 ../../mod/connedit.php:419
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:443
+#: ../../mod/connedit.php:459
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../mod/connedit.php:408
+#: ../../mod/connedit.php:414
 msgid "Channel has been unignored"
 msgstr "Kanaal wordt niet meer genegeerd"
 
-#: ../../mod/connedit.php:409
+#: ../../mod/connedit.php:415
 msgid "Channel has been ignored"
 msgstr "Kanaal wordt genegeerd"
 
-#: ../../mod/connedit.php:420
+#: ../../mod/connedit.php:426
 msgid "Channel has been unarchived"
 msgstr "Kanaal is niet meer gearchiveerd"
 
-#: ../../mod/connedit.php:421
+#: ../../mod/connedit.php:427
 msgid "Channel has been archived"
 msgstr "Kanaal is gearchiveerd"
 
-#: ../../mod/connedit.php:432
+#: ../../mod/connedit.php:438
 msgid "Channel has been unhidden"
 msgstr "Kanaal is niet meer verborgen"
 
-#: ../../mod/connedit.php:433
+#: ../../mod/connedit.php:439
 msgid "Channel has been hidden"
 msgstr "Kanaal is verborgen"
 
-#: ../../mod/connedit.php:448
+#: ../../mod/connedit.php:454
 msgid "Channel has been approved"
 msgstr "Connectie/kanaal is geaccepteerd"
 
-#: ../../mod/connedit.php:449
+#: ../../mod/connedit.php:455
 msgid "Channel has been unapproved"
 msgstr "Connectie/kanaal is afgewezen"
 
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:483
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:503
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s weergeven"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:507
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:510
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:514
 msgid "Recent Activity"
 msgstr "Recente activiteit"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:517
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:526
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:530 ../../mod/connedit.php:730
 #: ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:533
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:536
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:536
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:539
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:542
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:542
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:545
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:552
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:643 ../../mod/connedit.php:684
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:643
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../mod/connedit.php:653
+#: ../../mod/connedit.php:659
 #, php-format
 msgid "Connections: settings for %s"
 msgstr "Connecties: instellingen voor %s"
 
-#: ../../mod/connedit.php:654
+#: ../../mod/connedit.php:660
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../mod/connedit.php:658
+#: ../../mod/connedit.php:664
 msgid "Apply the permissions indicated on this page to all new connections."
 msgstr "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen."
 
-#: ../../mod/connedit.php:662
+#: ../../mod/connedit.php:668
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:672
+msgid "Only import posts with this text"
+msgstr "Importeer alleen berichten met deze tekst"
+
+#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+msgid ""
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren"
+
+#: ../../mod/connedit.php:673
+msgid "Do not import posts with this text"
+msgstr "Importeer geen berichten met deze tekst"
+
+#: ../../mod/connedit.php:680
 msgid ""
 "Default permissions for your channel type have (just) been applied. They "
 "have not yet been submitted. Please review the permissions on this page and "
@@ -8330,48 +8366,48 @@ msgid ""
 "install and apply the selected permissions."
 msgstr "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden."
 
-#: ../../mod/connedit.php:674
+#: ../../mod/connedit.php:683
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../mod/connedit.php:677
+#: ../../mod/connedit.php:686
 msgid "Connection has no individual permissions!"
 msgstr "Connectie heeft geen individuele permissies!"
 
-#: ../../mod/connedit.php:678
+#: ../../mod/connedit.php:687
 msgid ""
 "This may be appropriate based on your <a href=\"settings\">privacy "
 "settings</a>, though you may wish to review the \"Advanced Permissions\"."
 msgstr "Dit is mogelijk voldoende, wanneer er naar jouw <a href=\"settings\">privacy-instellingen</a> wordt gekeken.  Hoewel je wellicht de geavanceerde rechten wil nagaan."
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:689
 msgid "Profile Visibility"
 msgstr "Zichtbaarheid profiel"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:690
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:691
 msgid "Contact Information / Notes"
 msgstr "Informatie/aantekeningen over connectie"
 
-#: ../../mod/connedit.php:683
+#: ../../mod/connedit.php:692
 msgid "Edit contact notes"
 msgstr "Bewerk aantekeningen over contact"
 
-#: ../../mod/connedit.php:685
+#: ../../mod/connedit.php:694
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../mod/connedit.php:686
+#: ../../mod/connedit.php:695
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../mod/connedit.php:688
+#: ../../mod/connedit.php:697
 msgid ""
 "Default permissions for this channel type have (just) been applied. They "
 "have <em>not</em> been saved and there are currently no stored default "
@@ -8379,35 +8415,35 @@ msgid ""
 "finalize."
 msgstr "Voor dit kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog <em>niet</em> opgeslagen en er zijn momenteel geen standaard permissies aanwezig. Controleer/verander de permissies op deze pagina en klik op [Opslaan] om deze te activeren."
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:698
 msgid "Clear/Disable Automatic Permissions"
 msgstr "Verwijderen/uitschakelen automatische permissies"
 
-#: ../../mod/connedit.php:690
+#: ../../mod/connedit.php:699
 msgid "Forum Members"
 msgstr "Forumleden"
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:700
 msgid "Soapbox"
 msgstr "Zeepkist"
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:701
 msgid "Full Sharing (typical social network permissions)"
 msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)"
 
-#: ../../mod/connedit.php:693
+#: ../../mod/connedit.php:702
 msgid "Cautious Sharing "
 msgstr "Voorzichtig delen"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:703
 msgid "Follow Only"
 msgstr "Alleen volgen"
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:704
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:705
 msgid ""
 "Some permissions may be inherited from your channel <a "
 "href=\"settings\">privacy settings</a>, which have higher priority than "
@@ -8415,64 +8451,64 @@ msgid ""
 "have no effect."
 msgstr "Sommige permissies kunnen worden overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:706
 msgid "Advanced Permissions"
 msgstr "Geavanceerde permissies"
 
-#: ../../mod/connedit.php:698
+#: ../../mod/connedit.php:707
 msgid "Simple Permissions (select one and submit)"
 msgstr "Eenvoudige permissies (selecteer er één en opslaan)"
 
-#: ../../mod/connedit.php:702
+#: ../../mod/connedit.php:711
 #, php-format
 msgid "Visit %s's profile - %s"
 msgstr "Profiel van %s bezoeken - %s"
 
-#: ../../mod/connedit.php:703
+#: ../../mod/connedit.php:712
 msgid "Block/Unblock contact"
 msgstr "Connectie blokkeren/deblokkeren"
 
-#: ../../mod/connedit.php:704
+#: ../../mod/connedit.php:713
 msgid "Ignore contact"
 msgstr "Connectie negeren"
 
-#: ../../mod/connedit.php:705
+#: ../../mod/connedit.php:714
 msgid "Repair URL settings"
 msgstr "URL-instellingen repareren"
 
-#: ../../mod/connedit.php:706
+#: ../../mod/connedit.php:715
 msgid "View conversations"
 msgstr "Conversaties weergeven"
 
-#: ../../mod/connedit.php:708
+#: ../../mod/connedit.php:717
 msgid "Delete contact"
 msgstr "Connectie verwijderen"
 
-#: ../../mod/connedit.php:712
+#: ../../mod/connedit.php:721
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
-#: ../../mod/connedit.php:714
+#: ../../mod/connedit.php:723
 msgid "Update public posts"
 msgstr "Openbare berichten updaten"
 
-#: ../../mod/connedit.php:716
+#: ../../mod/connedit.php:725
 msgid "Update now"
 msgstr "Nu updaten"
 
-#: ../../mod/connedit.php:722
+#: ../../mod/connedit.php:731
 msgid "Currently blocked"
 msgstr "Momenteel geblokkeerd"
 
-#: ../../mod/connedit.php:723
+#: ../../mod/connedit.php:732
 msgid "Currently ignored"
 msgstr "Momenteel genegeerd"
 
-#: ../../mod/connedit.php:724
+#: ../../mod/connedit.php:733
 msgid "Currently archived"
 msgstr "Momenteel gearchiveerd"
 
-#: ../../mod/connedit.php:725
+#: ../../mod/connedit.php:734
 msgid "Currently pending"
 msgstr "Moeten nog geaccepteerd of afgewezen worden"
 
@@ -8731,6 +8767,21 @@ msgstr "Bladwijzers van mijn connecties"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Configuratiebewerker"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
+
 #: ../../mod/suggest.php:35
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
diff --git a/view/nl/strings.php b/view/nl/strings.php
index a199b81af..a3aff3564 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -240,6 +240,10 @@ $a->strings["Create new folder"] = "Nieuwe map aanmaken";
 $a->strings["Upload file"] = "Bestand uploaden";
 $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
 $a->strings["view full size"] = "volledige grootte tonen";
+$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+$a->strings["Thank You,"] = "Bedankt,";
+$a->strings["%s Administrator"] = "Beheerder %s";
+$a->strings["No Subject"] = "Geen onderwerp";
 $a->strings["General Features"] = "Algemene functies";
 $a->strings["Content Expiration"] = "Inhoud laten verlopen";
 $a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
@@ -285,6 +289,8 @@ $a->strings["Network New Tab"] = "Nieuwe netwerktab";
 $a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
 $a->strings["Affinity Tool"] = "Verwantschapsfilter";
 $a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag";
+$a->strings["Connection Filtering"] = "Connectie-filters";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud";
 $a->strings["Suggest Channels"] = "Kanalen voorstellen";
 $a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
 $a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
@@ -344,9 +350,6 @@ $a->strings["photo/image"] = "foto/afbeelding";
 $a->strings["Rate Me"] = "Beoordeel mij";
 $a->strings["View Ratings"] = "Bekijk beoordelingen";
 $a->strings["Public Hubs"] = "Openbare hubs";
-$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-$a->strings["Thank You,"] = "Bedankt,";
-$a->strings["%s Administrator"] = "Beheerder %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -933,25 +936,6 @@ $a->strings["Make Default"] = "Als standaard instellen";
 $a->strings["%d new messages"] = "%d nieuwe berichten";
 $a->strings["%d new introductions"] = "%d nieuwe connectieverzoeken";
 $a->strings["Delegated Channels"] = "Uitbestede kanalen";
-$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
-$a->strings["%d rating"] = array(
-	0 => "%d beoordeling",
-	1 => "%d beoordelingen",
-);
-$a->strings["Gender: "] = "Geslacht:";
-$a->strings["Status: "] = "Status: ";
-$a->strings["Homepage: "] = "Homepagina: ";
-$a->strings["Description:"] = "Omschrijving:";
-$a->strings["Public Forum:"] = "Openbaar forum:";
-$a->strings["Keywords: "] = "Trefwoorden: ";
-$a->strings["Don't suggest"] = "Niet voorstellen";
-$a->strings["Common connections:"] = "Gemeenschappelijke connecties:";
-$a->strings["Global Directory"] = "Volledige kanalengids";
-$a->strings["Local Directory"] = "Lokale kanalengids";
-$a->strings["Finding:"] = "Gezocht naar:";
-$a->strings["next page"] = "volgende pagina";
-$a->strings["previous page"] = "vorige pagina";
-$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
 $a->strings["Xchan Lookup"] = "Xchan opzoeken";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
 $a->strings["Not found."] = "Niet gevonden.";
@@ -1049,6 +1033,7 @@ $a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd
 $a->strings["Event Finishes:"] = "Einde gebeurtenis:";
 $a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
+$a->strings["Description:"] = "Omschrijving:";
 $a->strings["Title:"] = "Titel:";
 $a->strings["Share this event"] = "Deel deze gebeurtenis";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s";
@@ -1132,7 +1117,24 @@ $a->strings["Search your connections"] = "Doorzoek jouw connecties";
 $a->strings["Finding: "] = "Zoeken naar: ";
 $a->strings["Block Name"] = "Bloknaam";
 $a->strings["Block Title"] = "Bloktitel";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
+$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
+$a->strings["%d rating"] = array(
+	0 => "%d beoordeling",
+	1 => "%d beoordelingen",
+);
+$a->strings["Gender: "] = "Geslacht:";
+$a->strings["Status: "] = "Status: ";
+$a->strings["Homepage: "] = "Homepagina: ";
+$a->strings["Public Forum:"] = "Openbaar forum:";
+$a->strings["Keywords: "] = "Trefwoorden: ";
+$a->strings["Don't suggest"] = "Niet voorstellen";
+$a->strings["Common connections:"] = "Gemeenschappelijke connecties:";
+$a->strings["Global Directory"] = "Volledige kanalengids";
+$a->strings["Local Directory"] = "Lokale kanalengids";
+$a->strings["Finding:"] = "Gezocht naar:";
+$a->strings["next page"] = "volgende pagina";
+$a->strings["previous page"] = "vorige pagina";
+$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
 $a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++";
 $a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
 $a->strings["Album not found."] = "Album niet gevonden.";
@@ -1195,6 +1197,8 @@ $a->strings["Your service plan only allows %d channels."] = "Jouw abonnement sta
 $a->strings["Nothing to import."] = "Niets gevonden om te importeren";
 $a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden";
 $a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg";
+$a->strings["The data provided is not compatible with this project."] = "De geïmporteerde gegevens zijn niet compatibel met dit project.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter.";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
 $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
@@ -1501,6 +1505,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
 $a->strings["Export Channel"] = "Kanaal exporteren";
 $a->strings["Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een klein bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
 $a->strings["Export Content"] = "Inhoud exporteren";
@@ -1971,6 +1976,9 @@ $a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s"
 $a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
 $a->strings["Apply the permissions indicated on this page to all new connections."] = "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen.";
 $a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
+$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
+$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren";
+$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
 $a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden.";
 $a->strings["inherited"] = "geërfd";
 $a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele permissies!";
@@ -2065,6 +2073,9 @@ $a->strings["Bookmark added"] = "Bladwijzer toegevoegd";
 $a->strings["My Bookmarks"] = "Mijn bladwijzers";
 $a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
+$a->strings["Configuration Editor"] = "Configuratiebewerker";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer.";
 $a->strings["Poll"] = "Peiling";
 $a->strings["View Results"] = "Bekijk resultaten";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 716298845..a44cf331c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -28,12 +28,17 @@ aside#region_1 {
 	width: $aside_widthpx;
 	min-width: $aside_widthpx;
 	max-width: $aside_widthpx;
+	padding: 80px 7px 0px 7px;
 }
 
 main {
 	max-width: $main_widthpx;
 }
 
+section {
+	padding: 80px 7px 200px 7px;
+}
+
 h1, .h1, h2, .h2 {
 	font-size: 1.667em;
 }
@@ -264,12 +269,20 @@ footer {
 }
 
 /*TODO: we should use one class for all this. */
-/*
-.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
-	color: #444 !important;
-	text-decoration: none !important;
+
+.group-selected,
+.fileas-selected,
+.categories-selected,
+.search-selected,
+.active,
+.group-selected:hover,
+.fileas-selected:hover,
+.categories-selected:hover,
+.search-selected:hover,
+.active:hover {
+	color: $font_colour;
 }
-*/
+
 
 .fileas-all {
 	text-decoration: none !important;
@@ -347,7 +360,8 @@ footer {
 	word-wrap: break-word;
 }
 
-.vcard dl  {
+.vcard dl,
+.vcard .title {
 	margin-top: 10px;
 	margin-bottom: 0px;
 }
@@ -406,13 +420,14 @@ footer {
 
 
 #profile-photo-wrapper img {
-	padding: 10px;
-	width: 197px;
-	height: 197px;
+	width: 100%;
+	max-width: 300px;
+	height: auto;
 }
 
 #profile-photo-wrapper {
-	margin-top: 10px;
+	margin-top: -10px;
+	margin-bottom: 10px;
 }
 
 
@@ -571,7 +586,7 @@ footer {
 }
 
 .photo {
-    border: 1px solid #AAAAAA;
+    border: 1px solid #ccc;
 }
 
 .photo-top-photo, .photo-album-photo {
@@ -704,8 +719,8 @@ a.rateme, div.rateme {
 
 .contact-block-div {
 	float: left;
-	width: 49px;
-	height: 49px;
+	width: 50px;
+	height: 50px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -720,8 +735,8 @@ a.rateme, div.rateme {
 	float: left;
 }
 .contact-block-img {
-	width:47px;
-	height:47px;
+	width:48px;
+	height:48px;
 }
 
 #tag-remove {
@@ -1587,8 +1602,8 @@ img.mail-list-sender-photo {
 }
 
 .jothidden > input {
-	border: 1px solid $bgcolour;
-	background-color: $bgcolour;
+	border: 1px solid transparent;
+	background-color: transparent;
 }
 .jothidden > input:hover,
 .jothidden > input:focus {
@@ -2109,9 +2124,15 @@ nav .badge.mail-update:hover {
 }
 
 @media screen and (max-width: 767px) {
+
+	section {
+		padding: 65px 7px 200px 7px;
+	}
+
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
+		padding: 65px 7px 0px 7px;
 	}
 
 	main {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 68190778c..302efc365 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
 	if( $('#css3-calc').width() == 10) {
 		$(window).resize(function() {
 			if($(window).width() < 767) {
-				$('main').css('width', $(window).width() + 231 );
+				$('main').css('width', $(window).width() + 285 );
 			} else {
 				$('main').css('width', '100%' );
 			}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6e68d38d5..96dba59e5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
-	$aside_width = 231;
+	$aside_width = 285;
 
 	// left aside and right aside are is 231px + converse width
 	if($converse_center) {
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 3d64b8a7d..ea983ffc8 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -16,10 +16,6 @@
 	background-color: #fff;
 }
 
-#redbasic_converse_center_container {
-	display: none;
-}
-
 .wall-item-conv {
 	padding-top: 10px;
 	padding-left: 10px;
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index 4186c9f64..1f1963764 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -46,7 +46,7 @@ if (! $radius)
 if (! $shadow)
 	$shadow = "0";
 if (! $converse_width)
-	$converse_width = "656";
+	$converse_width = "790";
 if(! $top_photo)
 	$top_photo = '48px';
 if(! $comment_indent)
@@ -61,5 +61,3 @@ else {
 	$nav_float_min_opacity = (float) $nav_min_opacity;
 	$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
 }
-
-$converse_center = "1";
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index da5b1e859..4794c0b83 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -25,8 +25,8 @@
 		'croppa',
 		{
 			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
+			minWidth: 300,
+			minHeight: 300,
 			maxWidth: 640,
 			maxHeight: 640,
 			ratioDim: { x: 100, y:100 },
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 20e597909..3be40e978 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1,12 +1,14 @@
-<div class="section-title-wrapper">
-	{{if $delete}}
-	<div class="pull-right">
-		<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $delete}}
+		<div class="pull-right">
+			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
 	</div>
-	{{/if}}
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-<div id="webpage-editor" class="section-content-tools-wrapper">
-	{{$editor}}
 </div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 7fc17471c..0e5df2c47 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -1,4 +1,5 @@
 {{if $header}}
+<div class="generic-content-wrapper">
 <div class="section-title-wrapper">
 	{{if $menu_id}}
 	<div class="pull-right">
@@ -27,3 +28,6 @@
 		<div class="clear"></div>
 	</form>
 </div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index cdc022c5c..8715d6391 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,37 +1,42 @@
 {{if $header}}
-<div class="section-title-wrapper">
-	<h2>{{$header}}</h2>
-</div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
 {{/if}}
-<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-	<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
-		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-		{{if $mitem_id}}
-		<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-		{{/if}}
-		{{include file="field_input.tpl" field=$mitem_desc}}
-		{{include file="field_input.tpl" field=$mitem_link}}
-		{{if $menu_names}}
-		<datalist id="menu-names">
-			{{foreach $menu_names as $menu_name}}
-			<option value="{{$menu_name}}">
-			{{/foreach}}
-		</datalist>
-		{{/if}}
-		{{include file="field_input.tpl" field=$mitem_order}}
-		{{include file="field_checkbox.tpl" field=$usezid}}
-		{{include file="field_checkbox.tpl" field=$newwin}}
-		<div class="pull-right form-group">
-			<div class="btn-group">
-				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
-				</button>
-				{{if $submit_more}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
+			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+			{{if $mitem_id}}
+			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_desc}}
+			{{include file="field_input.tpl" field=$mitem_link}}
+			{{if $menu_names}}
+			<datalist id="menu-names">
+				{{foreach $menu_names as $menu_name}}
+				<option value="{{$menu_name}}">
+				{{/foreach}}
+			</datalist>
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_order}}
+			{{include file="field_checkbox.tpl" field=$usezid}}
+			{{include file="field_checkbox.tpl" field=$newwin}}
+			<div class="pull-right form-group">
+				<div class="btn-group">
+					<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+					</button>
+					{{if $submit_more}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
+					{{/if}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+				</div>
+				{{$aclselect}}
 			</div>
-			{{$aclselect}}
-		</div>
-	</form>
+			<div class="clear"></div>
+		</form>
+	</div>
+{{if $header}}
 </div>
+{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 4e606654f..8686d4204 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,35 +1,34 @@
-<div class="section-title-wrapper">
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+		<div class="clear"></div>
 	</div>
-	<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
-	<div class="clear"></div>
-</div>
 
-{{$create}}
+	{{$create}}
 
-{{if $mlist }}
-<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
-	<table id="mitem-list-table">
-		<tr>
-			<th width="1%">{{$nametitle}}</th>
-			<th width="96%">{{$targettitle}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-		</tr>
-		{{foreach $mlist as $m }}
-		<tr id="mitem-list-item-{{$m.mitem_id}}">
-			<td width="1%">{{$m.mitem_desc}}</td>
-			<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
-			<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-			<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
-			<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
-		</tr>
-		{{/foreach}}
-	</table>
+	{{if $mlist }}
+	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+		<table id="mitem-list-table">
+			<tr>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="96%">{{$targettitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $mlist as $m }}
+			<tr id="mitem-list-item-{{$m.mitem_id}}">
+				<td width="1%">{{$m.mitem_desc}}</td>
+				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
 </div>
-{{/if}}
-
- 
-
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 2964d9c4b..9eac48c6d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
 <div class="vcard">
-
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 	{{if $profile.edit}}
 	<div class="dropdown">
 	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -18,7 +18,6 @@
 	<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
 	{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
 
 
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ca0fe76be..2acbb24e4 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,6 +1,6 @@
 <div class="vcard">
-<div class="fn">{{$name}}</div>
 <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+<div class="fn">{{$name}}</div>
 </div>
author	redmatrix <redmatrix@redmatrix.me>	2015-07-10 14:20:38 -0700
committer	redmatrix <redmatrix@redmatrix.me>	2015-07-10 14:20:38 -0700
commit	4bf7e4a34d166a52a10939ab0bb26ac05652f59c (patch)
tree	2324fd2c13717a3d2fb7fe0b0d7de8eb1e268d37 /view
parent	ae6541cf74a0940131d6fdb937539effe5b27e3e (diff)
parent	6e30ccdd2210c1a3e8f4ff571110b9bbae895dc1 (diff)
download	volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.gz volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.tar.bz2 volse-hubzilla-4bf7e4a34d166a52a10939ab0bb26ac05652f59c.zip