Merge pull request #404 from git-marijus/master

bootstrapify aclselector

include/acl_selectors.php

@@ -230,15 +230,21 @@ function populate_acl($defaults = null,$unused = false) {
 		array_walk($deny_gid,'fixacl');
 	}
 	
+	$jotnets = '';
+	call_hooks('jot_networks', $jotnets);
+
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
 		'$showall'=> t("Visible to everybody"),
-		'$show'		 => t("show"),
-		'$hide'		 => t("don't show"),
+		'$show'		 => t("Show"),
+		'$hide'		 => t("Don't show"),
 		'$allowcid' => json_encode($allow_cid),
 		'$allowgid' => json_encode($allow_gid),
 		'$denycid' => json_encode($deny_cid),
 		'$denygid' => json_encode($deny_gid),
+		'$jotnets' => $jotnets,
+		'$aclModalTitle' => t('Permissions'),
+		'$aclModalDismiss' => t('Close')
 	));
 	
 	

include/conversation.php

@@ -1153,7 +1153,7 @@ function status_editor($a,$x,$popup=false) {
 		'$encrypt' => t('Encrypt text'),
 		'$cipher' => $cipher,
 		'$expiryModalOK' => t('OK'),
-		'$expiryModalCANCEL' => t('Cancel'),
+		'$expiryModalCANCEL' => t('Cancel')
 	));