Merge branch 'master' of https://github.com/redmatrix/redmatrix

8 files changed, 301 insertions, 232 deletions

diff --git a/include/comanche.php b/include/comanche.php
index 7115b5635..f385f3c5a 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -101,11 +101,22 @@ function comanche_parser(&$a, $s, $pass = 0) {
 }
 
 
-function comanche_menu($name, $class = '') {
+function comanche_menu($s, $class = '') {
+
 	$channel_id = comanche_get_channel_id();
+	$name = $s;
+
+	$cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$var[$mtch[1]] = $mtch[2];
+			$name = str_replace($mtch[0], '', $name);
+		}
+	}
+
 	if($channel_id) {
 		$m = menu_fetch($name,$channel_id, get_observer_hash());
-		return menu_render($m, $class);
+		return menu_render($m, $class, $edit = false, $var);
 	}
 }
 
@@ -168,6 +179,33 @@ function comanche_block($s, $class = '') {
 	return $o;
 }
 
+function comanche_js($s) {
+
+	switch($s) {
+		case 'jquery':
+			$path = 'view/js/jquery.js';
+			break;
+		case 'bootstrap':
+			$path = 'library/bootstrap/js/bootstrap.min.js';
+			break;
+	}
+
+	return '<script src="' . z_root() . '/' . $path . '" ></script>';
+
+}
+
+function comanche_css($s) {
+
+	switch($s) {
+		case 'bootstrap':
+			$path = 'library/bootstrap/css/bootstrap.min.css';
+			break;
+	}
+
+	return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">';
+
+}
+
 // This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
 // We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
 // For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
@@ -246,6 +284,19 @@ function comanche_region(&$a, $s) {
 		}
 	}
 
+	$cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0],comanche_js(trim($mtch[1])),$s);
+		}
+	}
+
+	$cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0],comanche_css(trim($mtch[1])),$s);
+		}
+	}
 	// need to modify this to accept parameters
 
 	$cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
diff --git a/include/menu.php b/include/menu.php
index b4f4555a5..a2e91f7ed 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -24,7 +24,7 @@ function menu_fetch($name,$uid,$observer_xchan) {
 	return null;
 }
 	
-function menu_render($menu, $class='', $edit = false) {
+function menu_render($menu, $class='', $edit = false, $var = '') {
 
 	if(! $menu)
 		return '';
@@ -37,12 +37,15 @@ function menu_render($menu, $class='', $edit = false) {
 		$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
 	}
 
+	$wrap = (($var['wrap'] === 'none') ? false : true);
+
 	return replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
 		'$class' => $class,
 		'$edit' => (($edit) ? t("Edit") : ''),
 		'$id' => $menu['menu']['menu_id'],
-		'$items' => $menu['items']
+		'$items' => $menu['items'],
+		'$wrap' => $wrap
 	));
 }
 
diff --git a/include/nav.php b/include/nav.php
index 1134d1b48..77287c021 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -124,7 +124,7 @@ EOT;
 
 	if($observer) {
 			$userinfo = array(
-			'icon' => $observer['xchan_photo_s'],
+			'icon' => $observer['xchan_photo_m'],
 			'name' => $observer['xchan_addr'],
 		);
 	}
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index ffc288962..1d3c329ec 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -26,12 +26,12 @@ nav i {
 }
 
 nav ul li {
-	max-height: 49px;
+	max-height: 50px;
 }
 
 nav img {
-	height: 48px;
-	width: 48px;
+	height: 49px;
+	width: 49px;
 	margin-top: 1px;
 }
 
diff --git a/view/nl/messages.po b/view/nl/messages.po
index 2365ac4fa..13bca342f 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-24 00:03-0700\n"
-"PO-Revision-Date: 2015-05-02 16:21+0000\n"
+"POT-Creation-Date: 2015-05-01 00:03-0700\n"
+"PO-Revision-Date: 2015-05-07 12:20+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -261,25 +261,25 @@ msgstr "Nieuwe pagina"
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
 #: ../../include/apps.php:254 ../../include/menu.php:43
-#: ../../mod/settings.php:644 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/editlayout.php:139
+#: ../../mod/settings.php:644 ../../mod/webpages.php:179
+#: ../../mod/thing.php:227 ../../mod/connections.php:382
+#: ../../mod/connections.php:395 ../../mod/connections.php:414
+#: ../../mod/blocks.php:152 ../../mod/editlayout.php:139
 #: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/webpages.php:179
-#: ../../mod/editblock.php:140 ../../mod/blocks.php:148
-#: ../../mod/layouts.php:174
+#: ../../mod/menu.php:100 ../../mod/editblock.php:140
+#: ../../mod/layouts.php:182
 msgid "Edit"
 msgstr "Bewerken"
 
 #: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
-#: ../../mod/blocks.php:154 ../../mod/layouts.php:178
+#: ../../mod/blocks.php:158 ../../mod/layouts.php:187
 msgid "View"
 msgstr "Weergeven"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1153 ../../mod/events.php:653
-#: ../../mod/photos.php:970 ../../mod/editwebpage.php:214
-#: ../../mod/editpost.php:149 ../../mod/webpages.php:186
+#: ../../include/conversation.php:1155 ../../mod/webpages.php:186
+#: ../../mod/events.php:653 ../../mod/photos.php:970
+#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:149
 #: ../../mod/editblock.php:176
 msgid "Preview"
 msgstr "Voorvertoning"
@@ -297,12 +297,12 @@ msgid "Title"
 msgstr "Titel"
 
 #: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
-#: ../../mod/blocks.php:145
+#: ../../mod/blocks.php:149 ../../mod/layouts.php:180
 msgid "Created"
 msgstr "Aangemaakt"
 
 #: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:146
+#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
 msgid "Edited"
 msgstr "Bewerkt"
 
@@ -551,7 +551,7 @@ msgstr "timeago.numbers"
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2479
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
 msgid "Collection"
 msgstr "map"
 
@@ -592,7 +592,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr "%1$s van %2$s gebruikt (%3$s&#37;)"
 
 #: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1606 ../../include/apps.php:135
+#: ../../include/conversation.php:1609 ../../include/apps.php:135
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Bestanden"
@@ -606,9 +606,9 @@ msgid "Shared"
 msgstr "Gedeeld"
 
 #: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:104
-#: ../../mod/webpages.php:178 ../../mod/blocks.php:147
-#: ../../mod/layouts.php:170 ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:178
+#: ../../mod/blocks.php:151 ../../mod/menu.php:104 ../../mod/layouts.php:174
+#: ../../mod/new_channel.php:121
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -638,10 +638,11 @@ msgstr "Laatst gewijzigd"
 
 #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
 #: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
-#: ../../mod/photos.php:1050 ../../mod/editwebpage.php:225
-#: ../../mod/webpages.php:181 ../../mod/admin.php:817 ../../mod/admin.php:948
-#: ../../mod/editblock.php:113 ../../mod/blocks.php:150
+#: ../../mod/settings.php:645 ../../mod/webpages.php:181
+#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:154
+#: ../../mod/photos.php:1050 ../../mod/editlayout.php:107
+#: ../../mod/editwebpage.php:225 ../../mod/admin.php:817
+#: ../../mod/admin.php:948 ../../mod/editblock.php:113
 #: ../../mod/connedit.php:543
 msgid "Delete"
 msgstr "Verwijderen"
@@ -924,7 +925,7 @@ msgstr "Apps"
 msgid "System"
 msgstr "Systeem"
 
-#: ../../include/widgets.php:94 ../../include/conversation.php:1501
+#: ../../include/widgets.php:94 ../../include/conversation.php:1504
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -1455,13 +1456,13 @@ msgid "I abstain"
 msgstr "Onthouding"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1674 ../../mod/photos.php:1003
+#: ../../include/conversation.php:1677 ../../mod/photos.php:1003
 #: ../../mod/photos.php:1015
 msgid "View all"
 msgstr "Toon alles"
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1698 ../../include/identity.php:1133
+#: ../../include/conversation.php:1701 ../../include/identity.php:1133
 #: ../../mod/photos.php:1007
 msgctxt "noun"
 msgid "Like"
@@ -1469,7 +1470,7 @@ msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1701
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
 #: ../../mod/photos.php:1012
 msgctxt "noun"
 msgid "Dislike"
@@ -1600,7 +1601,7 @@ msgid "Close"
 msgstr "Sluiten"
 
 #: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1206 ../../mod/photos.php:950
+#: ../../include/conversation.php:1209 ../../mod/photos.php:950
 #: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
 #: ../../mod/editpost.php:130 ../../mod/editblock.php:155
 #: ../../mod/mail.php:241 ../../mod/mail.php:356
@@ -1612,31 +1613,31 @@ msgstr "Even wachten"
 msgid "This is you"
 msgstr "Dit ben jij"
 
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1179
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
 #: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
 #: ../../mod/editpost.php:114 ../../mod/editblock.php:141
 msgid "Bold"
 msgstr "Vet"
 
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1180
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
 #: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
 #: ../../mod/editpost.php:115 ../../mod/editblock.php:142
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1181
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
 #: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
 #: ../../mod/editpost.php:116 ../../mod/editblock.php:143
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1182
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
 #: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
 #: ../../mod/editpost.php:117 ../../mod/editblock.php:144
 msgid "Quote"
 msgstr "Citeren"
 
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1183
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
 #: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
 #: ../../mod/editpost.php:118 ../../mod/editblock.php:145
 msgid "Code"
@@ -1654,7 +1655,7 @@ msgstr "Link invoegen"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1233
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
 #: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
@@ -1933,96 +1934,96 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: ../../include/text.php:1236
+#: ../../include/text.php:1244
 msgid "unknown.???"
 msgstr "onbekend.???"
 
-#: ../../include/text.php:1237
+#: ../../include/text.php:1245
 msgid "bytes"
 msgstr "bytes"
 
-#: ../../include/text.php:1273
+#: ../../include/text.php:1281
 msgid "remove category"
 msgstr "categorie verwijderen"
 
-#: ../../include/text.php:1348
+#: ../../include/text.php:1356
 msgid "remove from file"
 msgstr "uit map verwijderen"
 
-#: ../../include/text.php:1424 ../../include/text.php:1435
+#: ../../include/text.php:1436 ../../include/text.php:1447
 #: ../../mod/connedit.php:661
 msgid "Click to open/close"
 msgstr "Klik om te openen of te sluiten"
 
-#: ../../include/text.php:1591 ../../mod/events.php:444
+#: ../../include/text.php:1609 ../../mod/events.php:444
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../include/text.php:1612 ../../include/text.php:1683
+#: ../../include/text.php:1630 ../../include/text.php:1701
 msgid "default"
 msgstr "standaard"
 
-#: ../../include/text.php:1620
+#: ../../include/text.php:1638
 msgid "Page layout"
-msgstr "Lay-out pagina"
+msgstr "Pagina-lay-out"
 
-#: ../../include/text.php:1620
+#: ../../include/text.php:1638
 msgid "You can create your own with the layouts tool"
 msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
 
-#: ../../include/text.php:1661
+#: ../../include/text.php:1679
 msgid "Page content type"
 msgstr "Opmaaktype pagina"
 
-#: ../../include/text.php:1695
+#: ../../include/text.php:1713
 msgid "Select an alternate language"
 msgstr "Kies een andere taal"
 
-#: ../../include/text.php:1814 ../../include/conversation.php:120
+#: ../../include/text.php:1832 ../../include/conversation.php:120
 #: ../../include/diaspora.php:2081 ../../mod/like.php:346
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 #: ../../mod/tagger.php:43
 msgid "photo"
 msgstr "foto"
 
-#: ../../include/text.php:1817 ../../include/conversation.php:123
+#: ../../include/text.php:1835 ../../include/conversation.php:123
 #: ../../mod/like.php:348 ../../mod/tagger.php:47
 msgid "event"
 msgstr "gebeurtenis"
 
-#: ../../include/text.php:1820 ../../include/conversation.php:148
+#: ../../include/text.php:1838 ../../include/conversation.php:148
 #: ../../include/diaspora.php:2081 ../../mod/like.php:346
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 #: ../../mod/tagger.php:51
 msgid "status"
 msgstr "bericht"
 
-#: ../../include/text.php:1822 ../../include/conversation.php:150
+#: ../../include/text.php:1840 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "reactie"
 
-#: ../../include/text.php:1827
+#: ../../include/text.php:1845
 msgid "activity"
 msgstr "activiteit"
 
-#: ../../include/text.php:2122
+#: ../../include/text.php:2140
 msgid "Design Tools"
 msgstr "Ontwerp-hulpmiddelen"
 
-#: ../../include/text.php:2125 ../../mod/blocks.php:143
+#: ../../include/text.php:2143 ../../mod/blocks.php:146
 msgid "Blocks"
 msgstr "Blokken"
 
-#: ../../include/text.php:2126 ../../mod/menu.php:95
+#: ../../include/text.php:2144 ../../mod/menu.php:95
 msgid "Menus"
 msgstr "Menu's"
 
-#: ../../include/text.php:2127 ../../mod/layouts.php:169
+#: ../../include/text.php:2145 ../../mod/layouts.php:173
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../include/text.php:2128
+#: ../../include/text.php:2146
 msgid "Pages"
 msgstr "Pagina's"
 
@@ -2067,7 +2068,7 @@ msgstr "Profiel bewerken"
 msgid "Edit your profile"
 msgstr "Jouw profiel bewerken"
 
-#: ../../include/nav.php:97 ../../include/conversation.php:1597
+#: ../../include/nav.php:97 ../../include/conversation.php:1600
 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto's"
@@ -2088,7 +2089,7 @@ msgstr "Chatten"
 msgid "Your chatrooms"
 msgstr "Jouw chatkanalen"
 
-#: ../../include/nav.php:109 ../../include/conversation.php:1632
+#: ../../include/nav.php:109 ../../include/conversation.php:1635
 #: ../../include/apps.php:129
 msgid "Bookmarks"
 msgstr "Bladwijzers"
@@ -2097,7 +2098,7 @@ msgstr "Bladwijzers"
 msgid "Your bookmarks"
 msgstr "Jouw bladwijzers"
 
-#: ../../include/nav.php:113 ../../include/conversation.php:1642
+#: ../../include/nav.php:113 ../../include/conversation.php:1645
 #: ../../include/apps.php:136 ../../mod/webpages.php:176
 msgid "Webpages"
 msgstr "Webpagina's"
@@ -2140,7 +2141,7 @@ msgid "Create an account"
 msgstr "Maak een account aan"
 
 #: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:171
+#: ../../mod/help.php:72 ../../mod/layouts.php:175
 msgid "Help"
 msgstr "Hulp"
 
@@ -2338,17 +2339,17 @@ msgstr "Bezoek het %2$s van %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:735
-#: ../../include/bbcode.php:738 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:749
-#: ../../include/bbcode.php:752 ../../include/bbcode.php:757
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:743
+#: ../../include/bbcode.php:746 ../../include/bbcode.php:751
+#: ../../include/bbcode.php:754 ../../include/bbcode.php:757
 #: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:771
-#: ../../include/bbcode.php:774
+#: ../../include/bbcode.php:768 ../../include/bbcode.php:773
+#: ../../include/bbcode.php:776 ../../include/bbcode.php:779
+#: ../../include/bbcode.php:782
 msgid "Image/photo"
 msgstr "Afbeelding/foto"
 
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:785
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
 msgid "Encrypted content"
 msgstr "Versleutelde inhoud"
 
@@ -2369,15 +2370,15 @@ msgstr "%1$s schreef het volgende %2$s %3$s"
 msgid "post"
 msgstr "bericht"
 
-#: ../../include/bbcode.php:485
+#: ../../include/bbcode.php:493
 msgid "Different viewers will see this text differently"
 msgstr "Deze tekst wordt per persoon anders weergeven."
 
-#: ../../include/bbcode.php:696
+#: ../../include/bbcode.php:704
 msgid "$1 spoiler"
 msgstr "$1 spoiler"
 
-#: ../../include/bbcode.php:723
+#: ../../include/bbcode.php:731
 msgid "$1 wrote:"
 msgstr "$1 schreef:"
 
@@ -2440,33 +2441,34 @@ msgstr "Item niet gevonden."
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
 #: ../../mod/achievements.php:30 ../../mod/manage.php:6
 #: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/thing.php:241 ../../mod/thing.php:256 ../../mod/thing.php:290
-#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/photos.php:68 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
-#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
-#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/webpages.php:69
-#: ../../mod/profiles.php:188 ../../mod/profiles.php:576
-#: ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
+#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256
+#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219
+#: ../../mod/group.php:9 ../../mod/setup.php:207 ../../mod/common.php:35
+#: ../../mod/connections.php:169 ../../mod/blocks.php:69
+#: ../../mod/blocks.php:76 ../../mod/photos.php:68 ../../mod/pdledit.php:21
+#: ../../mod/authtest.php:13 ../../mod/editlayout.php:63
+#: ../../mod/editlayout.php:87 ../../mod/chat.php:90 ../../mod/chat.php:95
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
 #: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/mood.php:111 ../../mod/connedit.php:331 ../../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 ../../mod/network.php:12 ../../mod/page.php:28
-#: ../../mod/page.php:79 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
+#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:331
+#: ../../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
+#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79
+#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100
 #: ../../mod/channel.php:219 ../../mod/channel.php:262
 #: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
 #: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
@@ -2807,301 +2809,299 @@ msgstr "%s vinden dit leuk."
 msgid "%s don't like this."
 msgstr "%s vinden dit niet leuk."
 
-#: ../../include/conversation.php:1138
+#: ../../include/conversation.php:1140
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Voor <strong>iedereen</strong> zichtbaar"
 
-#: ../../include/conversation.php:1139 ../../mod/mail.php:174
+#: ../../include/conversation.php:1141 ../../mod/mail.php:174
 #: ../../mod/mail.php:289
 msgid "Please enter a link URL:"
 msgstr "Vul een internetadres/URL in:"
 
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1142
 msgid "Please enter a video link/URL:"
 msgstr "Vul een videolink/URL in:"
 
-#: ../../include/conversation.php:1141
+#: ../../include/conversation.php:1143
 msgid "Please enter an audio link/URL:"
 msgstr "Vul een audiolink/URL in:"
 
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1144
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1143 ../../mod/filer.php:49
+#: ../../include/conversation.php:1145 ../../mod/filer.php:49
 msgid "Save to Folder:"
 msgstr "Bewaar in map: "
 
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1146
 msgid "Where are you right now?"
 msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
 #: ../../mod/mail.php:175 ../../mod/mail.php:290
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
-#: ../../include/conversation.php:1172 ../../mod/photos.php:949
-#: ../../mod/editlayout.php:197 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:149 ../../mod/layouts.php:175
+#: ../../include/conversation.php:1174 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:153 ../../mod/photos.php:949 ../../mod/layouts.php:183
 msgid "Share"
 msgstr "Delen"
 
-#: ../../include/conversation.php:1174
+#: ../../include/conversation.php:1176
 msgid "Page link name"
 msgstr "Linknaam pagina"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1179
 msgid "Post as"
 msgstr "Bericht plaatsen als"
 
-#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
+#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
 #: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
 #: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
 msgid "Upload photo"
 msgstr "Foto uploaden"
 
-#: ../../include/conversation.php:1185
+#: ../../include/conversation.php:1187
 msgid "upload photo"
 msgstr "foto uploaden"
 
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
 #: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
 #: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1189
 msgid "attach file"
 msgstr "bestand toevoegen"
 
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
 #: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
 #: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1191
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1192
 msgid "Insert video link"
 msgstr "Videolink invoegen"
 
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1193
 msgid "video link"
 msgstr "videolink"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1194
 msgid "Insert audio link"
 msgstr "Audiolink invoegen"
 
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1195
 msgid "audio link"
 msgstr "audiolink"
 
-#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
+#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
 #: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
 #: ../../mod/editblock.php:153
 msgid "Set your location"
 msgstr "Locatie instellen"
 
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1197
 msgid "set location"
 msgstr "locatie instellen"
 
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
 msgid "Toggle voting"
 msgstr "Stemmen in- of uitschakelen"
 
-#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
+#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
 #: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
 #: ../../mod/editblock.php:154
 msgid "Clear browser location"
 msgstr "Locatie van webbrowser wissen"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1202
 msgid "clear location"
 msgstr "locatie wissen"
 
-#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:141
-#: ../../mod/editblock.php:167
+#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
+#: ../../mod/editpost.php:141 ../../mod/editblock.php:167
 msgid "Title (optional)"
 msgstr "Titel (optioneel)"
 
-#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
+#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
 #: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
 #: ../../mod/editblock.php:170
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
-#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
+#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
 #: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
 #: ../../mod/editblock.php:156
 msgid "Permission settings"
 msgstr "Permissies"
 
-#: ../../include/conversation.php:1208
+#: ../../include/conversation.php:1211
 msgid "permissions"
 msgstr "permissies"
 
-#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
+#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
 #: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
 #: ../../mod/editblock.php:164
 msgid "Public post"
 msgstr "Openbaar bericht"
 
-#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
+#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
 #: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
 #: ../../mod/editblock.php:171
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
 
-#: ../../include/conversation.php:1231 ../../mod/editlayout.php:177
+#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
 #: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
 #: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
-#: ../../include/conversation.php:1235 ../../mod/events.php:637
+#: ../../include/conversation.php:1238 ../../mod/events.php:637
 #: ../../mod/editpost.php:159
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1236 ../../mod/settings.php:583
+#: ../../include/conversation.php:1239 ../../mod/settings.php:583
 #: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/events.php:636 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1481
 msgid "Discover"
 msgstr "Ontdekken"
 
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1484
 msgid "Imported public streams"
 msgstr "Openbare streams importeren"
 
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1489
 msgid "Commented Order"
 msgstr "Nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1492
 msgid "Sort by Comment Date"
 msgstr "Berichten met nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1493
+#: ../../include/conversation.php:1496
 msgid "Posted Order"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1499
 msgid "Sort by Post Date"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1507
 msgid "Posts that mention or involve you"
 msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
 
-#: ../../include/conversation.php:1510 ../../mod/connections.php:212
+#: ../../include/conversation.php:1513 ../../mod/connections.php:212
 #: ../../mod/connections.php:225 ../../mod/menu.php:102
 msgid "New"
 msgstr "Nieuw"
 
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1516
 msgid "Activity Stream - by date"
 msgstr "Activiteitenstroom - volgens datum"
 
-#: ../../include/conversation.php:1519
+#: ../../include/conversation.php:1522
 msgid "Starred"
 msgstr "Met ster"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1525
 msgid "Favourite Posts"
 msgstr "Favoriete berichten"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1532
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1535
 msgid "Posts flagged as SPAM"
 msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/conversation.php:1576 ../../mod/admin.php:952
+#: ../../include/conversation.php:1579 ../../mod/admin.php:952
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../include/conversation.php:1579
+#: ../../include/conversation.php:1582
 msgid "Status Messages and Posts"
 msgstr "Berichten in dit kanaal"
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1591
 msgid "About"
 msgstr "Over"
 
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1594
 msgid "Profile Details"
 msgstr "Profiel"
 
-#: ../../include/conversation.php:1600 ../../include/photos.php:359
+#: ../../include/conversation.php:1603 ../../include/photos.php:359
 msgid "Photo Albums"
 msgstr "Fotoalbums"
 
-#: ../../include/conversation.php:1609
+#: ../../include/conversation.php:1612
 msgid "Files and Storage"
 msgstr "Bestanden en opslagruimte"
 
-#: ../../include/conversation.php:1619 ../../include/conversation.php:1622
+#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
 msgid "Chatrooms"
 msgstr "Chatkanalen"
 
-#: ../../include/conversation.php:1635
+#: ../../include/conversation.php:1638
 msgid "Saved Bookmarks"
 msgstr "Opgeslagen bladwijzers"
 
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1648
 msgid "Manage Webpages"
 msgstr "Webpagina's beheren"
 
-#: ../../include/conversation.php:1704
+#: ../../include/conversation.php:1707
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "aanwezig"
 msgstr[1] "aanwezig"
 
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1710
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "niet aanwezig"
 msgstr[1] "niet aanwezig"
 
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "nog niet beslist"
 msgstr[1] "nog niet beslist"
 
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1716
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "eens"
 msgstr[1] "eens"
 
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1719
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "oneens"
 msgstr[1] "oneens"
 
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1722
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -3340,11 +3340,11 @@ msgid "Requested channel is not available."
 msgstr "Opgevraagd kanaal is niet beschikbaar."
 
 #: ../../include/identity.php:677 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/connect.php:13
-#: ../../mod/hcard.php:8 ../../mod/editlayout.php:28
-#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
-#: ../../mod/webpages.php:29 ../../mod/editblock.php:29
-#: ../../mod/blocks.php:29 ../../mod/layouts.php:29
+#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
+#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
@@ -4518,6 +4518,10 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"
 
+#: ../../mod/webpages.php:189
+msgid "Page Title"
+msgstr "Paginatitel"
+
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr "Kanaal toegevoegd."
@@ -5570,22 +5574,13 @@ msgstr "Doorzoek jouw connecties"
 msgid "Finding: "
 msgstr "Zoeken naar: "
 
-#: ../../mod/impel.php:33
-msgid "webpage"
-msgstr "Webpagina"
-
-#: ../../mod/impel.php:38
-msgid "block"
-msgstr "blok"
-
-#: ../../mod/impel.php:43
-msgid "layout"
-msgstr "lay-out"
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:147
+msgid "Block Name"
+msgstr "Bloknaam"
 
-#: ../../mod/impel.php:117
-#, php-format
-msgid "%s element installed"
-msgstr "%s onderdeel geïnstalleerd"
+#: ../../mod/blocks.php:148
+msgid "Block Title"
+msgstr "Bloktitel"
 
 #: ../../mod/tagger.php:96
 #, php-format
@@ -5817,7 +5812,7 @@ msgstr "Lay-out niet gevonden."
 msgid "Module Name:"
 msgstr "Modulenaam:"
 
-#: ../../mod/pdledit.php:55 ../../mod/layouts.php:108
+#: ../../mod/pdledit.php:55
 msgid "Layout Help"
 msgstr "Lay-out-hulp"
 
@@ -5915,13 +5910,13 @@ msgstr "Stel deze hub als mijn primaire locatie in"
 msgid "Import existing posts if possible"
 msgstr "Importeer bestaande berichten (wanneer mogelijk)"
 
-#: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
+#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
 #: ../../mod/editpost.php:20 ../../mod/editblock.php:78
 #: ../../mod/editblock.php:94
 msgid "Item not found"
 msgstr "Item niet gevonden"
 
-#: ../../mod/editlayout.php:108
+#: ../../mod/editlayout.php:106
 msgid "Edit Layout"
 msgstr "Lay-out bewerken"
 
@@ -5944,9 +5939,14 @@ msgstr "Vorbis-video [.ogg] invoegen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis-audio [.ogg] invoegen"
 
-#: ../../mod/editlayout.php:182
-msgid "Delete Layout"
-msgstr "Lay-out verwijderen"
+#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+msgid "Layout Description (Optional)"
+msgstr "Lay-out-omschrijving (optioneel)"
+
+#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:178
+msgid "Layout Name"
+msgstr "Naam lay-out"
 
 #: ../../mod/chat.php:19 ../../mod/channel.php:25
 msgid "You must be logged in to see this page."
@@ -6273,7 +6273,7 @@ msgstr "Niet in staat om menu aan te maken."
 
 #: ../../mod/menu.php:86 ../../mod/menu.php:98
 msgid "Menu Name"
-msgstr "Naam menu"
+msgstr "Menunaam"
 
 #: ../../mod/menu.php:86
 msgid "Unique name (not visible on webpage) - required"
@@ -6281,7 +6281,7 @@ msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
 
 #: ../../mod/menu.php:87 ../../mod/menu.php:99
 msgid "Menu Title"
-msgstr "Titel menu"
+msgstr "Menutitel"
 
 #: ../../mod/menu.php:87
 msgid "Visible on webpage - leave empty for no title"
@@ -6460,9 +6460,22 @@ msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
 msgid "Visible To"
 msgstr "Zichtbaar voor"
 
-#: ../../mod/webpages.php:189
-msgid "Page Title"
-msgstr "Titel pagina"
+#: ../../mod/impel.php:33
+msgid "webpage"
+msgstr "Webpagina"
+
+#: ../../mod/impel.php:38
+msgid "block"
+msgstr "blok"
+
+#: ../../mod/impel.php:43
+msgid "layout"
+msgstr "lay-out"
+
+#: ../../mod/impel.php:117
+#, php-format
+msgid "%s element installed"
+msgstr "%s onderdeel geïnstalleerd"
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:174
 #: ../../mod/profiles.php:231 ../../mod/profiles.php:600
@@ -7868,9 +7881,17 @@ msgstr "Privacy-informatie op afstand niet beschikbaar."
 msgid "Visible to:"
 msgstr "Zichtbaar voor:"
 
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:144
-msgid "Block Name"
-msgstr "Bloknaam"
+#: ../../mod/layouts.php:175
+msgid "Comanche page description language help"
+msgstr "Hulp met de paginabeschrijvingstaal Comanche"
+
+#: ../../mod/layouts.php:179
+msgid "Layout Description"
+msgstr "Lay-out-omschrijving"
+
+#: ../../mod/layouts.php:184
+msgid "Download PDL file"
+msgstr "Download PDL-bestand"
 
 #: ../../mod/id.php:11
 msgid "First Name"
@@ -7952,18 +7973,6 @@ msgstr "Verwijder conversatie"
 msgid "D, d M Y - g:i A"
 msgstr "D, j M Y - G:i"
 
-#: ../../mod/layouts.php:111
-msgid "Help with this feature"
-msgstr "Hulp voor dit onderdeel"
-
-#: ../../mod/layouts.php:132
-msgid "Layout Name"
-msgstr "Naam lay-out"
-
-#: ../../mod/layouts.php:171
-msgid "Comanche page description language help"
-msgstr "Hulp met de paginabeschrijvingstaal Comanche"
-
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr "Noteer je huidige stemming en toon het aan je connecties"
diff --git a/view/nl/strings.php b/view/nl/strings.php
index c47844b2c..613268b8e 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -455,7 +455,7 @@ $a->strings["remove from file"] = "uit map verwijderen";
 $a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
 $a->strings["Link to Source"] = "Originele locatie";
 $a->strings["default"] = "standaard";
-$a->strings["Page layout"] = "Lay-out pagina";
+$a->strings["Page layout"] = "Pagina-lay-out";
 $a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
 $a->strings["Page content type"] = "Opmaaktype pagina";
 $a->strings["Select an alternate language"] = "Kies een andere taal";
@@ -1071,6 +1071,7 @@ $a->strings["Authorize application connection"] = "Geef toestemming voor applica
 $a->strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:";
 $a->strings["Please login to continue."] = "Inloggen om verder te kunnen gaan.";
 $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?";
+$a->strings["Page Title"] = "Paginatitel";
 $a->strings["Channel added."] = "Kanaal toegevoegd.";
 $a->strings["Tag removed"] = "Tag verwijderd";
 $a->strings["Remove Item Tag"] = "Verwijder item-tag";
@@ -1307,10 +1308,8 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Connectie bewerken";
 $a->strings["Search your connections"] = "Doorzoek jouw connecties";
 $a->strings["Finding: "] = "Zoeken naar: ";
-$a->strings["webpage"] = "Webpagina";
-$a->strings["block"] = "blok";
-$a->strings["layout"] = "lay-out";
-$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd";
+$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["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++";
 $a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
@@ -1395,7 +1394,8 @@ $a->strings["Delete layout?"] = "Lay-out verwijderen?";
 $a->strings["Insert YouTube video"] = "YouTube-video invoegen";
 $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
 $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
-$a->strings["Delete Layout"] = "Lay-out verwijderen";
+$a->strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
+$a->strings["Layout Name"] = "Naam lay-out";
 $a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
 $a->strings["Room not found"] = "Chatkanaal niet gevonden";
 $a->strings["Leave Room"] = "Chatkanaal verlaten";
@@ -1475,9 +1475,9 @@ $a->strings["Source removed"] = "Bron verwijderd";
 $a->strings["Unable to remove source."] = "Verwijderen bron mislukt.";
 $a->strings["Unable to update menu."] = "Niet in staat om menu aan te passen";
 $a->strings["Unable to create menu."] = "Niet in staat om menu aan te maken.";
-$a->strings["Menu Name"] = "Naam menu";
+$a->strings["Menu Name"] = "Menunaam";
 $a->strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)";
-$a->strings["Menu Title"] = "Titel menu";
+$a->strings["Menu Title"] = "Menutitel";
 $a->strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)";
 $a->strings["Allow Bookmarks"] = "Bladwijzers toestaan";
 $a->strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan";
@@ -1522,7 +1522,10 @@ $a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator";
 $a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel ";
 $a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen";
 $a->strings["Visible To"] = "Zichtbaar voor";
-$a->strings["Page Title"] = "Titel pagina";
+$a->strings["webpage"] = "Webpagina";
+$a->strings["block"] = "blok";
+$a->strings["layout"] = "lay-out";
+$a->strings["%s element installed"] = "%s onderdeel geïnstalleerd";
 $a->strings["Profile not found."] = "Profiel niet gevonden.";
 $a->strings["Profile deleted."] = "Profiel verwijderd.";
 $a->strings["Profile-"] = "Profiel-";
@@ -1863,7 +1866,9 @@ $a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw l
 $a->strings["[Embedded content - reload page to view]"] = "[Ingesloten inhoud - ververs pagina om te bekijken] ";
 $a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
 $a->strings["Visible to:"] = "Zichtbaar voor:";
-$a->strings["Block Name"] = "Bloknaam";
+$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
+$a->strings["Layout Description"] = "Lay-out-omschrijving";
+$a->strings["Download PDL file"] = "Download PDL-bestand";
 $a->strings["First Name"] = "Voornaam";
 $a->strings["Last Name"] = "Achternaam";
 $a->strings["Nickname"] = "Bijnaam";
@@ -1884,9 +1889,6 @@ $a->strings["Conversation removed."] = "Conversatie verwijderd";
 $a->strings["No messages."] = "Geen berichten";
 $a->strings["Delete conversation"] = "Verwijder conversatie";
 $a->strings["D, d M Y - g:i A"] = "D, j M Y - G:i";
-$a->strings["Help with this feature"] = "Hulp voor dit onderdeel";
-$a->strings["Layout Name"] = "Naam lay-out";
-$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
 $a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties";
 $a->strings["Total votes"] = "Totaal aantal stemmen";
 $a->strings["Average Rating"] = "Gemiddelde waardering";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a5e5dffdb..83b10b527 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -790,7 +790,7 @@ a.rateme, div.rateme {
 }
 
 nav .acpopup {
-	top: 49px !important;
+	top: 50px !important;
 	margin-left: -35px;
 	width: 290px;
 }
@@ -1231,7 +1231,7 @@ div.jGrowl div.jGrowl-notification {
 
 #nav-search-text-ac .autocomplete {
 	position: fixed;
-	top: 50px;
+	top: 51px;
 	border: 1px solid $nav_bd;
 	border-top: none;
 }
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 57caf25fc..7284826a2 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -1,13 +1,17 @@
+{{if $wrap}}
 <div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
+{{/if}}
 	{{if $menu.menu_desc}}
 	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
 	{{/if}}
 	{{if $items }}
-	<ul class="pmenu-body{{if !$class}} nav nav-pills nav-stacked{{/if}}">
+	<ul class="pmenu-body{{if $wrap && !$class}} nav nav-pills nav-stacked{{elseif !$wrap && $class}} {{$class}}{{/if}}">
 		{{foreach $items as $mitem }}
 		<li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li>
 		{{/foreach }}
 	</ul>
 	{{/if}}
+{{if $wrap}}
 	<div class="pmenu-end"></div>
 </div>
+{{/if}}