aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/Comanche.md4
-rw-r--r--doc/comanche.bb4
-rw-r--r--include/conversation.php2
-rw-r--r--mod/blocks.php1
-rw-r--r--mod/editlayout.php3
-rw-r--r--mod/editwebpage.php2
-rw-r--r--mod/layouts.php3
-rw-r--r--mod/webpages.php3
-rw-r--r--view/tpl/blocklist.tpl2
9 files changed, 19 insertions, 5 deletions
diff --git a/doc/Comanche.md b/doc/Comanche.md
index 56bf68457..147988938 100644
--- a/doc/Comanche.md
+++ b/doc/Comanche.md
@@ -88,6 +88,10 @@ This places the menu called "mymenu" at this location on the page, which must be
This places a block named "contributors" in this region.
+ [block][var=wrap]none[/var]contributors[/block]
+
+The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.
+
**Widgets**
diff --git a/doc/comanche.bb b/doc/comanche.bb
index 19a74833e..3afe14489 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -108,6 +108,10 @@ This places the menu called "mymenu" at this location on the page, whi
[/code]
This places a block named "contributors" in this region.
+[code]
+ [block][var=wrap]none[/var]contributors[/block]
+[/code]
+The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.
[b]Widgets[/b]
diff --git a/include/conversation.php b/include/conversation.php
index 8c9029a43..fb012667e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1095,6 +1095,8 @@ function status_editor($a, $x, $popup = false) {
// $plaintext = false;
$voting = feature_enabled(local_channel(), 'consensus_tools');
+ if(x($x, 'novoting'))
+ $voting = false;
$mimeselect = '';
if(array_key_exists('mimetype', $x) && $x['mimetype']) {
diff --git a/mod/blocks.php b/mod/blocks.php
index 23a66f8d9..56da9caf7 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -95,6 +95,7 @@ function blocks_content(&$a) {
'ptlabel' => t('Block Name'),
'profile_uid' => intval($owner),
'expanded' => true,
+ 'novoting' => true
);
if($_REQUEST['title'])
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 5c9b62cbb..706720667 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -161,8 +161,9 @@ function editlayout_content(&$a) {
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
- '$placeholdertitle' => t('Title (optional)'),
+ '$placeholdertitle' => t('Layout Description (Optional)'),
'$pagetitle' => $layout_title,
+ '$placeholdpagetitle' => t('Layout Name'),
'$category' => '',
'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index a1918741b..cdf5d8c20 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -188,7 +188,7 @@ function editwebpage_content(&$a) {
'$video' => t('Insert Vorbis [.ogg] video'),
'$audio' => t('Insert Vorbis [.ogg] audio'),
'$setloc' => t('Set your location'),
- '$noloc' => t('Clear browser location'),
+ '$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
'$ptyp' => $itm[0]['type'],
diff --git a/mod/layouts.php b/mod/layouts.php
index b1e4cd345..2e45362ba 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -121,7 +121,8 @@ function layouts_content(&$a) {
'ptlabel' => t('Layout Name'),
'profile_uid' => intval($owner),
'expanded' => true,
- 'placeholdertitle' => t('Layout Description')
+ 'placeholdertitle' => t('Layout Description (Optional)'),
+ 'novoting' => true
);
if($_REQUEST['title'])
diff --git a/mod/webpages.php b/mod/webpages.php
index 24d7b88b3..859c93fde 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -113,7 +113,8 @@ function webpages_content(&$a) {
'profile_uid' => intval($owner),
'mimetype' => $mimetype,
'layout' => $layout,
- 'expanded' => true
+ 'expanded' => true,
+ 'novoting' => true
);
if($_REQUEST['title'])
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index f653ef59d..85e4865ea 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -29,7 +29,7 @@
<tr id="block-list-item-{{$item.url}}">
<td>
{{if $view}}
- <a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.name}}</a>
+ <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
{{else}}
{{$item.name}}
{{/if}}