aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-30 17:53:47 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-30 17:53:47 -0700
commit9fc87d43c9a38b3ba1079412fde81ef0f5190fed (patch)
tree678814e4037551388050c3afb1eb8cae39615b92 /mod
parent097002910ead3ec263f723eb66e659f0469b8bb6 (diff)
parente8d2dd7204b2ae80819905075de1a036c2be9aa6 (diff)
downloadvolse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.tar.gz
volse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.tar.bz2
volse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'mod')
-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
5 files changed, 8 insertions, 4 deletions
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'])