aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/bbcode.php16
-rwxr-xr-xinclude/items.php43
-rw-r--r--include/menu.php24
-rw-r--r--mod/directory.php2
-rw-r--r--mod/impel.php57
-rw-r--r--mod/menu.php6
-rw-r--r--mod/mitem.php8
-rw-r--r--mod/profile_photo.php2
-rw-r--r--util/messages.po1565
-rw-r--r--version.inc2
-rw-r--r--view/css/mod_menu.css15
-rw-r--r--view/tpl/menuedit.tpl2
-rw-r--r--view/tpl/menulist.tpl18
-rw-r--r--view/tpl/mitemedit.tpl4
14 files changed, 973 insertions, 791 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 1239e5497..0415d8a73 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -193,6 +193,9 @@ function translate_design_element($type) {
case 'block':
$ret = t('block');
break;
+ case 'menu':
+ $ret = t('menu');
+ break;
}
return $ret;
@@ -994,3 +997,16 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
return $Text;
}
+
+/**
+ * This function exists as a short-term solution to folks linking to private images from their /cloud in
+ * their profiles, which brings up a login dialogue in the directory when that entry is viewed.
+ * The long term solution is to separate the web file browser from DAV so that you'll never see a
+ * login prompt (though the resource may return a permission denied).
+ */
+
+
+
+function strip_bbimage($s) {
+ $Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text);
+}
diff --git a/include/items.php b/include/items.php
index cc777788c..818e7f526 100755
--- a/include/items.php
+++ b/include/items.php
@@ -545,6 +545,7 @@ function get_feed_for($channel, $observer_hash, $params) {
'order' => 'post',
'top' => $params['top']
), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module);
+
$feed_template = get_markup_template('atom_feed.tpl');
@@ -4349,6 +4350,8 @@ function zot_feed($uid,$observer_hash,$arr) {
$mindate = null;
$message_id = null;
+ require_once('include/security.php');
+
if(array_key_exists('mindate',$arr)) {
$mindate = datetime_convert('UTC','UTC',$arr['mindate']);
}
@@ -4371,10 +4374,8 @@ function zot_feed($uid,$observer_hash,$arr) {
return $result;
}
- if(! is_sys_channel($uid)) {
- require_once('include/security.php');
+ if(! is_sys_channel($uid))
$sql_extra = item_permissions_sql($uid,$observer_hash);
- }
$limit = " LIMIT 100 ";
@@ -4839,3 +4840,39 @@ function comment_local_origin($item) {
return false;
}
+
+
+function i2asld($i) {
+
+ if(! $i)
+ return array();
+
+ $ret = array();
+
+ if($i['verb']) {
+ $ret['@context'] = dirname($i['verb']);
+ $ret['@type'] = ucfirst(basename($i['verb']));
+ }
+ $ret['@id'] = $i['plink'];
+ $ret['published'] = datetime_convert('UTC','UTC',$i['created'],ATOM_TIME);
+ if($i['title'])
+ $ret['title'] = $i['title'];
+ $ret['content'] = bbcode($i['body']);
+
+ $ret['actor'] = asencode_person($i['author']);
+ $ret['owner'] = asencode_person($i['owner']);
+
+
+ return $ret;
+
+}
+
+
+function asencode_person($p) {
+ $ret = array();
+ $ret['@type'] = 'Person';
+ $ret['@id'] = 'acct:' . $p['xchan_addr'];
+ $ret['displayName'] = $p['xchan_name'];
+
+ return $ret;
+}
diff --git a/include/menu.php b/include/menu.php
index 0e5fa3c99..d20df1d6e 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -28,10 +28,10 @@ function menu_element($menu) {
$arr = array();
$arr['type'] = 'menu';
- $arr['name'] = $menu['menu_name'];
- $arr['desc'] = $menu['menu_desc'];
- $arr['created'] = $menu['menu_created'];
- $arr['edited'] = $menu['menu_edited'];
+ $arr['pagetitle'] = $menu['menu']['menu_name'];
+ $arr['desc'] = $menu['menu']['menu_desc'];
+ $arr['created'] = $menu['menu']['menu_created'];
+ $arr['edited'] = $menu['menu']['menu_edited'];
$arr['baseurl'] = z_root();
if($menu['menu_flags']) {
@@ -66,13 +66,17 @@ function menu_element($menu) {
-function menu_render($menu, $class='', $edit = false, $var = '') {
+function menu_render($menu, $class='', $edit = false, $var = array()) {
if(! $menu)
return '';
$channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0);
+ if ((! $channel_id) && (local_channel()))
+ $channel_id = local_channel();
+
$menu_list = menu_list($channel_id);
+ $menu_names = array();
foreach($menu_list as $menus) {
if($menus['menu_name'] != $menu['menu']['menu_name'])
@@ -82,7 +86,7 @@ function menu_render($menu, $class='', $edit = false, $var = '') {
for($x = 0; $x < count($menu['items']); $x ++) {
if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) {
$m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash());
- $submenu = menu_render($m, 'dropdown-menu', $edit = false, $var = array('wrap' => 'none'));
+ $submenu = menu_render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none'));
$menu['items'][$x]['submenu'] = $submenu;
}
@@ -124,7 +128,6 @@ function menu_fetch_id($menu_id,$channel_id) {
function menu_create($arr) {
-
$menu_name = trim(escape_tags($arr['menu_name']));
$menu_desc = trim(escape_tags($arr['menu_desc']));
$menu_flags = intval($arr['menu_flags']);
@@ -150,14 +153,16 @@ function menu_create($arr) {
if($r)
return false;
+ $t = datetime_convert();
+
$r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited )
values( '%s', '%s', %d, %d, '%s', '%s' )",
dbesc($menu_name),
dbesc($menu_desc),
intval($menu_flags),
intval($menu_channel_id),
- dbesc(datetime_convert()),
- dbesc(datetime_convert())
+ dbesc(datetime_convert('UTC','UTC',(($arr['menu_created']) ? $arr['menu_created'] : $t))),
+ dbesc(datetime_convert('UTC','UTC',(($arr['menu_edited']) ? $arr['menu_edited'] : $t)))
);
if(! $r)
return false;
@@ -285,7 +290,6 @@ function menu_delete_id($menu_id, $uid) {
function menu_add_item($menu_id, $uid, $arr) {
-
$mitem_link = escape_tags($arr['mitem_link']);
$mitem_desc = escape_tags($arr['mitem_desc']);
$mitem_order = intval($arr['mitem_order']);
diff --git a/mod/directory.php b/mod/directory.php
index 3e94d6395..7c7f63037 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -242,7 +242,7 @@ function directory_content(&$a) {
$hometown = ((x($profile,'hometown') == 1) ? t('Hometown: ') . $profile['hometown'] : False);
- $about = ((x($profile,'about') == 1) ? t('About: ') . bbcode($profile['about']) : False);
+ $about = ((x($profile,'about') == 1) ? t('About: ') . bbcode(strip_bbimage($profile['about'])) : False);
$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
diff --git a/mod/impel.php b/mod/impel.php
index 711547624..ff154125b 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -2,6 +2,7 @@
// import page design element
+require_once('include/menu.php');
function impel_init(&$a) {
@@ -21,7 +22,6 @@ function impel_init(&$a) {
if(! $j)
json_return_and_die($ret);
-
$channel = $a->get_channel();
$arr = array();
@@ -57,15 +57,58 @@ function impel_init(&$a) {
logger('mod_impel: unrecognised element type' . print_r($j,true));
break;
}
- if($is_menu) {
-
-
-
-
-
+ if($is_menu) {
+ $m = array();
+ $m['menu_channel_id'] = local_channel();
+ $m['menu_name'] = $j['pagetitle'];
+ $m['menu_desc'] = $j['desc'];
+ if($j['created'])
+ $m['menu_created'] = datetime_convert($j['created']);
+ if($j['edited'])
+ $m['menu_edited'] = datetime_convert($j['edited']);
+
+ $m['menu_flags'] = 0;
+ if($j['flags']) {
+ if(in_array('bookmark',$j['flags']))
+ $m['menu_flags'] |= MENU_BOOKMARK;
+ if(in_array('system',$j['flags']))
+ $m['menu_flags'] |= MENU_SYSTEM;
+ }
+ $menu_id = menu_create($m);
+
+ if($menu_id) {
+ if(is_array($j['items'])) {
+ foreach($j['items'] as $it) {
+ $mitem = array();
+
+ $mitem['mitem_link'] = str_replace('[baseurl]',z_root(),$it['link']);
+ $mitem['mitem_desc'] = escape_tags($it['desc']);
+ $mitem['mitem_order'] = intval($it['order']);
+ if(is_array($it['flags'])) {
+ $mitem['mitem_flags'] = 0;
+ if(in_array('zid',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_ZID;
+ if(in_array('new-window',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN;
+ if(in_array('chatroom',$it['flags']))
+ $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM;
+ }
+ menu_add_item($menu_id,local_channel(),$mitem);
+ }
+ if($j['edited']) {
+ $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+ dbesc(datetime_convert('UTC','UTC',$j['edited'])),
+ intval($menu_id),
+ intval(local_channel())
+ );
+ }
+ }
+ $ret['success'] = true;
+ }
+ $x = $ret;
}
else {
$arr['uid'] = local_channel();
diff --git a/mod/menu.php b/mod/menu.php
index 63aeaa5e3..f46dc9471 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -102,6 +102,8 @@ function menu_content(&$a) {
'$desctitle' => t('Menu Title'),
'$edit' => t('Edit'),
'$drop' => t('Drop'),
+ '$created' => t('Created'),
+ '$edited' => t('Edited'),
'$new' => t('New'),
'$bmark' => t('Bookmarks allowed'),
'$hintnew' => t('Create'),
@@ -140,9 +142,9 @@ function menu_content(&$a) {
'$editcontents' => t('Edit menu contents'),
'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
- '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), ''),
+ '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))),
'$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
- '$submit' => t('Modify')
+ '$submit' => t('Submit and proceed')
));
return $o;
diff --git a/mod/mitem.php b/mod/mitem.php
index 0961e15ff..c4c293d1e 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -160,8 +160,8 @@ function mitem_content(&$a) {
'$aclselect' => populate_acl($perm_defaults,false),
'$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'),
'$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'),
- '$usezid' => array('usezid', t('Use magic-auth if available'), true, ''),
- '$newwin' => array('newwin', t('Open link in new window'), false,''),
+ '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))),
+ '$newwin' => array('newwin', t('Open link in new window'), false,'', array(t('No'), t('Yes'))),
'$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit and finish'),
'$submit_more' => t('Submit and continue'),
@@ -231,8 +231,8 @@ function mitem_content(&$a) {
'$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
'$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
- '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
- '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''),
+ '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), '', array(t('No'), t('Yes'))),
+ '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),'', array(t('No'), t('Yes'))),
'$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit'),
'$lockstate' => $lockstate,
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 9fe042500..79f84c690 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -329,7 +329,7 @@ function profile_photo_content(&$a) {
return;
}
- $ph = photo_factory($r[0]['data'], $r[0]['type']);
+ $ph = photo_factory(dbunescbin($r[0]['data']), $r[0]['type']);
// go ahead as if we have just uploaded a new photo to crop
profile_photo_crop_ui_head($a, $ph);
}
diff --git a/util/messages.po b/util/messages.po
index 2aea612b2..8be9f4977 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-05-22.1040\n"
+"Project-Id-Version: 2015-05-29.1047\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-22 00:03-0700\n"
+"POT-Creation-Date: 2015-05-29 00:04-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,360 +28,360 @@ msgstr ""
msgid "Profile Photos"
msgstr ""
-#: ../../include/text.php:329
+#: ../../include/text.php:395
msgid "prev"
msgstr ""
-#: ../../include/text.php:331
+#: ../../include/text.php:397
msgid "first"
msgstr ""
-#: ../../include/text.php:360
+#: ../../include/text.php:426
msgid "last"
msgstr ""
-#: ../../include/text.php:363
+#: ../../include/text.php:429
msgid "next"
msgstr ""
-#: ../../include/text.php:373
+#: ../../include/text.php:439
msgid "older"
msgstr ""
-#: ../../include/text.php:375
+#: ../../include/text.php:441
msgid "newer"
msgstr ""
-#: ../../include/text.php:768
+#: ../../include/text.php:834
msgid "No connections"
msgstr ""
-#: ../../include/text.php:782
+#: ../../include/text.php:848
#, php-format
msgid "%d Connection"
msgid_plural "%d Connections"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
+#: ../../include/text.php:861 ../../mod/viewconnections.php:104
msgid "View Connections"
msgstr ""
-#: ../../include/text.php:852 ../../include/text.php:864
+#: ../../include/text.php:918 ../../include/text.php:930
#: ../../include/nav.php:165 ../../include/apps.php:147
#: ../../mod/search.php:38
msgid "Search"
msgstr ""
-#: ../../include/text.php:853 ../../include/text.php:865
+#: ../../include/text.php:919 ../../include/text.php:931
#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1416
-#: ../../mod/admin.php:1436
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1448
+#: ../../mod/admin.php:1468
msgid "Save"
msgstr ""
-#: ../../include/text.php:928
+#: ../../include/text.php:994
msgid "poke"
msgstr ""
-#: ../../include/text.php:928 ../../include/conversation.php:243
+#: ../../include/text.php:994 ../../include/conversation.php:243
msgid "poked"
msgstr ""
-#: ../../include/text.php:929
+#: ../../include/text.php:995
msgid "ping"
msgstr ""
-#: ../../include/text.php:929
+#: ../../include/text.php:995
msgid "pinged"
msgstr ""
-#: ../../include/text.php:930
+#: ../../include/text.php:996
msgid "prod"
msgstr ""
-#: ../../include/text.php:930
+#: ../../include/text.php:996
msgid "prodded"
msgstr ""
-#: ../../include/text.php:931
+#: ../../include/text.php:997
msgid "slap"
msgstr ""
-#: ../../include/text.php:931
+#: ../../include/text.php:997
msgid "slapped"
msgstr ""
-#: ../../include/text.php:932
+#: ../../include/text.php:998
msgid "finger"
msgstr ""
-#: ../../include/text.php:932
+#: ../../include/text.php:998
msgid "fingered"
msgstr ""
-#: ../../include/text.php:933
+#: ../../include/text.php:999
msgid "rebuff"
msgstr ""
-#: ../../include/text.php:933
+#: ../../include/text.php:999
msgid "rebuffed"
msgstr ""
-#: ../../include/text.php:943
+#: ../../include/text.php:1009
msgid "happy"
msgstr ""
-#: ../../include/text.php:944
+#: ../../include/text.php:1010
msgid "sad"
msgstr ""
-#: ../../include/text.php:945
+#: ../../include/text.php:1011
msgid "mellow"
msgstr ""
-#: ../../include/text.php:946
+#: ../../include/text.php:1012
msgid "tired"
msgstr ""
-#: ../../include/text.php:947
+#: ../../include/text.php:1013
msgid "perky"
msgstr ""
-#: ../../include/text.php:948
+#: ../../include/text.php:1014
msgid "angry"
msgstr ""
-#: ../../include/text.php:949
+#: ../../include/text.php:1015
msgid "stupified"
msgstr ""
-#: ../../include/text.php:950
+#: ../../include/text.php:1016
msgid "puzzled"
msgstr ""
-#: ../../include/text.php:951
+#: ../../include/text.php:1017
msgid "interested"
msgstr ""
-#: ../../include/text.php:952
+#: ../../include/text.php:1018
msgid "bitter"
msgstr ""
-#: ../../include/text.php:953
+#: ../../include/text.php:1019
msgid "cheerful"
msgstr ""
-#: ../../include/text.php:954
+#: ../../include/text.php:1020
msgid "alive"
msgstr ""
-#: ../../include/text.php:955
+#: ../../include/text.php:1021
msgid "annoyed"
msgstr ""
-#: ../../include/text.php:956
+#: ../../include/text.php:1022
msgid "anxious"
msgstr ""
-#: ../../include/text.php:957
+#: ../../include/text.php:1023
msgid "cranky"
msgstr ""
-#: ../../include/text.php:958
+#: ../../include/text.php:1024
msgid "disturbed"
msgstr ""
-#: ../../include/text.php:959
+#: ../../include/text.php:1025
msgid "frustrated"
msgstr ""
-#: ../../include/text.php:960
+#: ../../include/text.php:1026
msgid "depressed"
msgstr ""
-#: ../../include/text.php:961
+#: ../../include/text.php:1027
msgid "motivated"
msgstr ""
-#: ../../include/text.php:962
+#: ../../include/text.php:1028
msgid "relaxed"
msgstr ""
-#: ../../include/text.php:963
+#: ../../include/text.php:1029
msgid "surprised"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Monday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Tuesday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Wednesday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Thursday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Friday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Saturday"
msgstr ""
-#: ../../include/text.php:1135
+#: ../../include/text.php:1201
msgid "Sunday"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "January"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "February"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "March"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "April"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "May"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "June"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "July"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "August"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "September"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "October"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "November"
msgstr ""
-#: ../../include/text.php:1139
+#: ../../include/text.php:1205
msgid "December"
msgstr ""
-#: ../../include/text.php:1244
+#: ../../include/text.php:1310
msgid "unknown.???"
msgstr ""
-#: ../../include/text.php:1245
+#: ../../include/text.php:1311
msgid "bytes"
msgstr ""
-#: ../../include/text.php:1281
+#: ../../include/text.php:1347
msgid "remove category"
msgstr ""
-#: ../../include/text.php:1356
+#: ../../include/text.php:1422
msgid "remove from file"
msgstr ""
-#: ../../include/text.php:1432 ../../include/text.php:1443
+#: ../../include/text.php:1498 ../../include/text.php:1509
#: ../../mod/connedit.php:661
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1599 ../../mod/events.php:444
+#: ../../include/text.php:1665 ../../mod/events.php:444
msgid "Link to Source"
msgstr ""
-#: ../../include/text.php:1620 ../../include/text.php:1691
+#: ../../include/text.php:1686 ../../include/text.php:1757
msgid "default"
msgstr ""
-#: ../../include/text.php:1628
+#: ../../include/text.php:1694
msgid "Page layout"
msgstr ""
-#: ../../include/text.php:1628
+#: ../../include/text.php:1694
msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/text.php:1669
+#: ../../include/text.php:1735
msgid "Page content type"
msgstr ""
-#: ../../include/text.php:1703
+#: ../../include/text.php:1769
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1822 ../../include/conversation.php:120
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../include/text.php:1888 ../../include/conversation.php:120
+#: ../../include/diaspora.php:2082 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:43
msgid "photo"
msgstr ""
-#: ../../include/text.php:1825 ../../include/conversation.php:123
+#: ../../include/text.php:1891 ../../include/conversation.php:123
#: ../../mod/like.php:348 ../../mod/tagger.php:47
msgid "event"
msgstr ""
-#: ../../include/text.php:1828 ../../include/conversation.php:148
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../include/text.php:1894 ../../include/conversation.php:148
+#: ../../include/diaspora.php:2082 ../../mod/like.php:346
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:51
msgid "status"
msgstr ""
-#: ../../include/text.php:1830 ../../include/conversation.php:150
+#: ../../include/text.php:1896 ../../include/conversation.php:150
#: ../../mod/tagger.php:53
msgid "comment"
msgstr ""
-#: ../../include/text.php:1835
+#: ../../include/text.php:1901
msgid "activity"
msgstr ""
-#: ../../include/text.php:2130
+#: ../../include/text.php:2196
msgid "Design Tools"
msgstr ""
-#: ../../include/text.php:2133 ../../mod/blocks.php:147
+#: ../../include/text.php:2199 ../../mod/blocks.php:147
msgid "Blocks"
msgstr ""
-#: ../../include/text.php:2134 ../../mod/menu.php:95
+#: ../../include/text.php:2200 ../../mod/menu.php:98
msgid "Menus"
msgstr ""
-#: ../../include/text.php:2135 ../../mod/layouts.php:174
+#: ../../include/text.php:2201 ../../mod/layouts.php:174
msgid "Layouts"
msgstr ""
-#: ../../include/text.php:2136
+#: ../../include/text.php:2202
msgid "Pages"
msgstr ""
-#: ../../include/text.php:2487 ../../include/RedDAV/RedBrowser.php:131
+#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131
msgid "Collection"
msgstr ""
@@ -404,15 +404,15 @@ msgstr ""
msgid "Install %s element: "
msgstr ""
-#: ../../include/bbcode.php:188 ../../mod/impel.php:33
+#: ../../include/bbcode.php:188 ../../mod/impel.php:37
msgid "webpage"
msgstr ""
-#: ../../include/bbcode.php:191 ../../mod/impel.php:43
+#: ../../include/bbcode.php:191 ../../mod/impel.php:47
msgid "layout"
msgstr ""
-#: ../../include/bbcode.php:194 ../../mod/impel.php:38
+#: ../../include/bbcode.php:194 ../../mod/impel.php:42
msgid "block"
msgstr ""
@@ -665,13 +665,13 @@ msgstr ""
#: ../../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:61
+#: ../../include/apps.php:254 ../../include/menu.php:103
#: ../../mod/settings.php:649 ../../mod/webpages.php:180
#: ../../mod/thing.php:227 ../../mod/connections.php:382
#: ../../mod/connections.php:395 ../../mod/connections.php:414
#: ../../mod/blocks.php:153 ../../mod/editlayout.php:139
#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/editblock.php:140
+#: ../../mod/menu.php:103 ../../mod/editblock.php:140
#: ../../mod/layouts.php:183
msgid "Edit"
msgstr ""
@@ -711,7 +711,7 @@ msgstr ""
msgid "Edited"
msgstr ""
-#: ../../include/api.php:1161
+#: ../../include/api.php:1193
msgid "Public Timeline"
msgstr ""
@@ -769,7 +769,7 @@ msgid "Finishes:"
msgstr ""
#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
+#: ../../include/identity.php:875 ../../mod/events.php:647
#: ../../mod/directory.php:234
msgid "Location:"
msgstr ""
@@ -853,18 +853,18 @@ msgstr ""
#: ../../mod/settings.php:766 ../../mod/settings.php:848
#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93
#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
-#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58
-#: ../../mod/import.php:504 ../../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/group.php:81 ../../mod/photos.php:565 ../../mod/photos.php:642
+#: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087
+#: ../../mod/pdledit.php:58 ../../mod/import.php:504 ../../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
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:446
-#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077
-#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../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
+#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327
+#: ../../mod/setup.php:367 ../../mod/admin.php:446 ../../mod/admin.php:810
+#: ../../mod/admin.php:977 ../../mod/admin.php:1109 ../../mod/admin.php:1303
+#: ../../mod/admin.php:1388 ../../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
#: ../../view/theme/redbasic/php/config.php:97
msgid "Submit"
@@ -1008,7 +1008,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:256
#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179
-#: ../../mod/blocks.php:152 ../../mod/menu.php:104 ../../mod/layouts.php:175
+#: ../../mod/blocks.php:152 ../../mod/menu.php:107 ../../mod/layouts.php:175
#: ../../mod/new_channel.php:121
msgid "Create"
msgstr ""
@@ -1020,7 +1020,7 @@ msgid "Upload"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589
-#: ../../mod/settings.php:615 ../../mod/admin.php:953
+#: ../../mod/settings.php:615 ../../mod/admin.php:985
#: ../../mod/sharedwithme.php:95
msgid "Name"
msgstr ""
@@ -1043,7 +1043,7 @@ msgstr ""
#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:155
#: ../../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/admin.php:979 ../../mod/editblock.php:113
#: ../../mod/connedit.php:543
msgid "Delete"
msgstr ""
@@ -1340,7 +1340,7 @@ msgstr ""
#: ../../include/widgets.php:136 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:823 ../../mod/match.php:64
+#: ../../include/identity.php:824 ../../mod/match.php:64
#: ../../mod/directory.php:302 ../../mod/suggest.php:52
msgid "Connect"
msgstr ""
@@ -1458,8 +1458,8 @@ msgid "Premium Channel Settings"
msgstr ""
#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
+#: ../../include/apps.php:134 ../../mod/admin.php:1070
+#: ../../mod/admin.php:1270
msgid "Settings"
msgstr ""
@@ -1508,8 +1508,8 @@ msgstr ""
msgid "$Projectname Notification"
msgstr ""
-#: ../../include/enotify.php:59 ../../include/diaspora.php:2461
-#: ../../include/diaspora.php:2472 ../../mod/p.php:46
+#: ../../include/enotify.php:59 ../../include/diaspora.php:2467
+#: ../../include/diaspora.php:2478 ../../mod/p.php:46
msgid "$projectname"
msgstr ""
@@ -1857,7 +1857,7 @@ msgid "View all"
msgstr ""
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1133
+#: ../../include/conversation.php:1701 ../../include/identity.php:1134
#: ../../mod/photos.php:1007
msgctxt "noun"
msgid "Like"
@@ -2109,7 +2109,7 @@ msgstr ""
msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/nav.php:95 ../../include/identity.php:846
+#: ../../include/nav.php:95 ../../include/identity.php:847
msgid "Edit Profile"
msgstr ""
@@ -2388,122 +2388,6 @@ msgstr ""
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
-#: ../../include/items.php:399 ../../mod/like.php:270
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
-msgstr ""
-
-#: ../../include/items.php:1020 ../../include/items.php:1066
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1234
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1236
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1238
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1240
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1242
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1244
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1246
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1248
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:4060 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
-#: ../../mod/admin.php:1184
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:4133 ../../include/photos.php:26
-#: ../../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 ../../include/attach.php:546
-#: ../../include/attach.php:618 ../../include/chat.php:131
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6
-#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../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/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:974 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
-#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../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:82 ../../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
-msgid "Permission denied."
-msgstr ""
-
-#: ../../include/items.php:4537 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
-msgstr ""
-
-#: ../../include/items.php:4553
-msgid "Collection is empty."
-msgstr ""
-
-#: ../../include/items.php:4560
-#, php-format
-msgid "Collection: %s"
-msgstr ""
-
-#: ../../include/items.php:4570
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../include/items.php:4572
-msgid "Connection not found."
-msgstr ""
-
#: ../../include/security.php:349
msgid ""
"The form security token was not correct. This probably happened because the "
@@ -2651,7 +2535,7 @@ msgstr ""
msgid "channel"
msgstr ""
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
+#: ../../include/conversation.php:164 ../../include/diaspora.php:2111
#: ../../mod/like.php:394
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -3017,7 +2901,7 @@ msgid "Posts that mention or involve you"
msgstr ""
#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
+#: ../../mod/connections.php:225 ../../mod/menu.php:105
msgid "New"
msgstr ""
@@ -3041,7 +2925,7 @@ msgstr ""
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1579 ../../mod/admin.php:952
+#: ../../include/conversation.php:1579 ../../mod/admin.php:984
msgid "Channel"
msgstr ""
@@ -3119,6 +3003,121 @@ msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
+#: ../../include/items.php:399 ../../mod/like.php:270
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:381
+msgid "Permission denied"
+msgstr ""
+
+#: ../../include/items.php:1020 ../../include/items.php:1066
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1234
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1236
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1238
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1240
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1242
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1244
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1246
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1248
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:4060 ../../mod/thing.php:74
+#: ../../mod/display.php:36 ../../mod/filestorage.php:27
+#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1016
+#: ../../mod/admin.php:1216
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:4133 ../../include/photos.php:26
+#: ../../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 ../../include/attach.php:546
+#: ../../include/attach.php:618 ../../include/chat.php:131
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6
+#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../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/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/setup.php:223
+#: ../../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:974 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../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:82 ../../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:182 ../../index.php:382
+msgid "Permission denied."
+msgstr ""
+
+#: ../../include/items.php:4535 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
+msgstr ""
+
+#: ../../include/items.php:4551
+msgid "Collection is empty."
+msgstr ""
+
+#: ../../include/items.php:4558
+#, php-format
+msgid "Collection: %s"
+msgstr ""
+
+#: ../../include/items.php:4568
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../include/items.php:4570
+msgid "Connection not found."
+msgstr ""
+
#: ../../include/photos.php:94
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
@@ -3148,7 +3147,7 @@ msgstr ""
msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/zot.php:2108
+#: ../../include/zot.php:2109
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""
@@ -3346,11 +3345,11 @@ msgstr ""
msgid "Default Profile"
msgstr ""
-#: ../../include/identity.php:630
+#: ../../include/identity.php:631
msgid "Requested channel is not available."
msgstr ""
-#: ../../include/identity.php:677 ../../mod/profile.php:16
+#: ../../include/identity.php:678 ../../mod/profile.php:16
#: ../../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
@@ -3359,192 +3358,192 @@ msgstr ""
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
+#: ../../include/identity.php:837 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:842
+#: ../../include/identity.php:843
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:842
+#: ../../include/identity.php:843
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
+#: ../../include/identity.php:844 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
+#: ../../include/identity.php:859 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:861
+#: ../../include/identity.php:862
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
+#: ../../include/identity.php:863 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:878 ../../include/identity.php:1117
+#: ../../include/identity.php:879 ../../include/identity.php:1118
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:879 ../../include/identity.php:1161
+#: ../../include/identity.php:880 ../../include/identity.php:1162
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:880 ../../include/identity.php:1172
+#: ../../include/identity.php:881 ../../include/identity.php:1173
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:881
+#: ../../include/identity.php:882
msgid "Online Now"
msgstr ""
-#: ../../include/identity.php:964 ../../include/identity.php:1042
+#: ../../include/identity.php:965 ../../include/identity.php:1043
#: ../../mod/ping.php:324
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:965 ../../include/identity.php:1043
+#: ../../include/identity.php:966 ../../include/identity.php:1044
msgid "F d"
msgstr ""
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
+#: ../../include/identity.php:1011 ../../include/identity.php:1083
#: ../../mod/ping.php:346
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:1021
+#: ../../include/identity.php:1022
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:1022
+#: ../../include/identity.php:1023
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:1075
+#: ../../include/identity.php:1076
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:1093
+#: ../../include/identity.php:1094
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:1094
+#: ../../include/identity.php:1095
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
+#: ../../include/identity.php:1108 ../../include/identity.php:1225
#: ../../include/apps.php:138 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
-#: ../../include/identity.php:1115 ../../mod/settings.php:1050
+#: ../../include/identity.php:1116 ../../mod/settings.php:1050
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:1122
+#: ../../include/identity.php:1123
msgid "Like this channel"
msgstr ""
-#: ../../include/identity.php:1146
+#: ../../include/identity.php:1147
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:1147
+#: ../../include/identity.php:1148
msgid "j F"
msgstr ""
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1155
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:1158
+#: ../../include/identity.php:1159
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:1167
+#: ../../include/identity.php:1168
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
+#: ../../include/identity.php:1171 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
+#: ../../include/identity.php:1175 ../../mod/profiles.php:693
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:1176
+#: ../../include/identity.php:1177
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
+#: ../../include/identity.php:1179 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1181
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:1182
+#: ../../include/identity.php:1183
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1184
+#: ../../include/identity.php:1185
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
+#: ../../include/identity.php:1187 ../../mod/profiles.php:697
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
+#: ../../include/identity.php:1189 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1190
+#: ../../include/identity.php:1191
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1192
+#: ../../include/identity.php:1193
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1195
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1196
+#: ../../include/identity.php:1197
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1198
+#: ../../include/identity.php:1199
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1200
+#: ../../include/identity.php:1201
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1202
+#: ../../include/identity.php:1203
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1205
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1207
msgid "School/education:"
msgstr ""
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1227
msgid "Like this thing"
msgstr ""
@@ -3862,19 +3861,19 @@ msgstr ""
msgid "Room is full"
msgstr ""
-#: ../../include/diaspora.php:2433
+#: ../../include/diaspora.php:2439
msgid "Please choose"
msgstr ""
-#: ../../include/diaspora.php:2435
+#: ../../include/diaspora.php:2441
msgid "Agree"
msgstr ""
-#: ../../include/diaspora.php:2437
+#: ../../include/diaspora.php:2443
msgid "Disagree"
msgstr ""
-#: ../../include/diaspora.php:2439
+#: ../../include/diaspora.php:2445
msgid "Abstain"
msgstr ""
@@ -3966,7 +3965,7 @@ msgid "Settings updated."
msgstr ""
#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/menu.php:91 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554
@@ -3974,7 +3973,7 @@ msgid "No"
msgstr ""
#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/menu.php:91 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554
@@ -4522,7 +4521,7 @@ msgstr ""
msgid "Lookup xchan beginning with (or webbie): "
msgstr ""
-#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/menu.php:152 ../../mod/mitem.php:120
msgid "Not found."
msgstr ""
@@ -4767,7 +4766,7 @@ msgid "Channel not found."
msgstr ""
#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:85 ../../index.php:241
+#: ../../mod/page.php:85 ../../index.php:230
msgid "Page not found."
msgstr ""
@@ -4875,7 +4874,7 @@ msgstr ""
msgid "Previous"
msgstr ""
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
+#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281
msgid "Next"
msgstr ""
@@ -5097,393 +5096,10 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:76 ../../index.php:238
+#: ../../mod/help.php:76 ../../index.php:227
msgid "Not Found"
msgstr ""
-#: ../../mod/setup.php:166
-msgid "$Projectname Server - Setup"
-msgstr ""
-
-#: ../../mod/setup.php:172
-msgid "Could not connect to database."
-msgstr ""
-
-#: ../../mod/setup.php:176
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr ""
-
-#: ../../mod/setup.php:183
-msgid "Could not create table."
-msgstr ""
-
-#: ../../mod/setup.php:189
-msgid "Your site database has been installed."
-msgstr ""
-
-#: ../../mod/setup.php:194
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr ""
-
-#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:662
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr ""
-
-#: ../../mod/setup.php:261
-msgid "System check"
-msgstr ""
-
-#: ../../mod/setup.php:266
-msgid "Check again"
-msgstr ""
-
-#: ../../mod/setup.php:289
-msgid "Database connection"
-msgstr ""
-
-#: ../../mod/setup.php:290
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../mod/setup.php:291
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../mod/setup.php:292
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../mod/setup.php:296
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../mod/setup.php:296
-msgid "Default is localhost"
-msgstr ""
-
-#: ../../mod/setup.php:297
-msgid "Database Port"
-msgstr ""
-
-#: ../../mod/setup.php:297
-msgid "Communication port number - use 0 for default"
-msgstr ""
-
-#: ../../mod/setup.php:298
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../mod/setup.php:299
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../mod/setup.php:300
-msgid "Database Name"
-msgstr ""
-
-#: ../../mod/setup.php:301
-msgid "Database Type"
-msgstr ""
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Website URL"
-msgstr ""
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr ""
-
-#: ../../mod/setup.php:307 ../../mod/setup.php:352
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../mod/setup.php:335
-msgid "Site settings"
-msgstr ""
-
-#: ../../mod/setup.php:395
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../mod/setup.php:396
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr ""
-
-#: ../../mod/setup.php:400
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../mod/setup.php:400
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../mod/setup.php:405
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../mod/setup.php:414
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../mod/setup.php:415
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../mod/setup.php:417
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../mod/setup.php:438
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../mod/setup.php:439
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../mod/setup.php:441
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../mod/setup.php:448
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:449
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:450
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:451
-msgid "mysqli or postgres PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:452
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:453
-msgid "mcrypt PHP module"
-msgstr ""
-
-#: ../../mod/setup.php:458 ../../mod/setup.php:460
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../mod/setup.php:458
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:464 ../../mod/setup.php:467
-msgid "proc_open"
-msgstr ""
-
-#: ../../mod/setup.php:464
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../mod/setup.php:472
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:476
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:480
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:484
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr ""
-
-#: ../../mod/setup.php:488
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:492
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr ""
-
-#: ../../mod/setup.php:508
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../mod/setup.php:509
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../mod/setup.php:510
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr ""
-
-#: ../../mod/setup.php:511
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../mod/setup.php:514
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../mod/setup.php:524
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../mod/setup.php:525
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr ""
-
-#: ../../mod/setup.php:526 ../../mod/setup.php:544
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../mod/setup.php:527
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../mod/setup.php:530
-#, php-format
-msgid "%s is writable"
-msgstr ""
-
-#: ../../mod/setup.php:543
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to "
-"have write access to the store directory under the Red top level folder"
-msgstr ""
-
-#: ../../mod/setup.php:547
-msgid "store is writable"
-msgstr ""
-
-#: ../../mod/setup.php:577
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
-msgstr ""
-
-#: ../../mod/setup.php:578
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr ""
-
-#: ../../mod/setup.php:579
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr ""
-
-#: ../../mod/setup.php:580
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr ""
-
-#: ../../mod/setup.php:581
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr ""
-
-#: ../../mod/setup.php:582
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
-msgstr ""
-
-#: ../../mod/setup.php:584
-msgid "SSL certificate validation"
-msgstr ""
-
-#: ../../mod/setup.php:590
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
-msgstr ""
-
-#: ../../mod/setup.php:592
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../mod/setup.php:602
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../mod/setup.php:625
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../mod/setup.php:660
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../mod/setup.php:661
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
#: ../../mod/common.php:10
msgid "No channel."
msgstr ""
@@ -5755,6 +5371,16 @@ msgstr ""
msgid "Recent Photos"
msgstr ""
+#: ../../mod/search.php:206
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../mod/search.php:208
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
#: ../../mod/match.php:22
msgid "Profile Match"
msgstr ""
@@ -6290,91 +5916,91 @@ msgstr ""
msgid "Unable to create menu."
msgstr ""
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
+#: ../../mod/menu.php:89 ../../mod/menu.php:101
msgid "Menu Name"
msgstr ""
-#: ../../mod/menu.php:86
+#: ../../mod/menu.php:89
msgid "Unique name (not visible on webpage) - required"
msgstr ""
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
+#: ../../mod/menu.php:90 ../../mod/menu.php:102
msgid "Menu Title"
msgstr ""
-#: ../../mod/menu.php:87
+#: ../../mod/menu.php:90
msgid "Visible on webpage - leave empty for no title"
msgstr ""
-#: ../../mod/menu.php:88
+#: ../../mod/menu.php:91
msgid "Allow Bookmarks"
msgstr ""
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
+#: ../../mod/menu.php:91 ../../mod/menu.php:143
msgid "Menu may be used to store saved bookmarks"
msgstr ""
-#: ../../mod/menu.php:89
+#: ../../mod/menu.php:92
msgid "Submit and proceed"
msgstr ""
-#: ../../mod/menu.php:101
+#: ../../mod/menu.php:104
msgid "Drop"
msgstr ""
-#: ../../mod/menu.php:103
+#: ../../mod/menu.php:106
msgid "Bookmarks allowed"
msgstr ""
-#: ../../mod/menu.php:105
+#: ../../mod/menu.php:108
msgid "Delete this menu"
msgstr ""
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
+#: ../../mod/menu.php:109 ../../mod/menu.php:140
msgid "Edit menu contents"
msgstr ""
-#: ../../mod/menu.php:107
+#: ../../mod/menu.php:110
msgid "Edit this menu"
msgstr ""
-#: ../../mod/menu.php:121
+#: ../../mod/menu.php:124
msgid "Menu could not be deleted."
msgstr ""
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
+#: ../../mod/menu.php:132 ../../mod/mitem.php:24
msgid "Menu not found."
msgstr ""
-#: ../../mod/menu.php:134
+#: ../../mod/menu.php:137
msgid "Edit Menu"
msgstr ""
-#: ../../mod/menu.php:136
+#: ../../mod/menu.php:139
msgid "Add or remove entries to this menu"
msgstr ""
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:141
msgid "Menu name"
msgstr ""
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:141
msgid "Must be unique, only seen by you"
msgstr ""
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:142
msgid "Menu title"
msgstr ""
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:142
msgid "Menu title as seen by others"
msgstr ""
-#: ../../mod/menu.php:140
+#: ../../mod/menu.php:143
msgid "Allow bookmarks"
msgstr ""
-#: ../../mod/menu.php:142
+#: ../../mod/menu.php:145
msgid "Modify"
msgstr ""
@@ -6479,12 +6105,16 @@ msgstr ""
msgid "Visible To"
msgstr ""
-#: ../../mod/impel.php:121
+#: ../../mod/impel.php:54
+msgid "menu"
+msgstr ""
+
+#: ../../mod/impel.php:186
#, php-format
msgid "%s element installed"
msgstr ""
-#: ../../mod/impel.php:124
+#: ../../mod/impel.php:189
#, php-format
msgid "%s element installation failed"
msgstr ""
@@ -6562,7 +6192,7 @@ msgstr ""
msgid "Interests"
msgstr ""
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
+#: ../../mod/profiles.php:447 ../../mod/admin.php:985
msgid "Address"
msgstr ""
@@ -6770,6 +6400,412 @@ msgstr ""
msgid "Source of Item"
msgstr ""
+#: ../../mod/setup.php:187
+msgid "$Projectname Server - Setup"
+msgstr ""
+
+#: ../../mod/setup.php:191
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../mod/setup.php:195
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr ""
+
+#: ../../mod/setup.php:202
+msgid "Could not create table."
+msgstr ""
+
+#: ../../mod/setup.php:207
+msgid "Your site database has been installed."
+msgstr ""
+
+#: ../../mod/setup.php:211
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr ""
+
+#: ../../mod/setup.php:212 ../../mod/setup.php:280 ../../mod/setup.php:730
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr ""
+
+#: ../../mod/setup.php:277
+msgid "System check"
+msgstr ""
+
+#: ../../mod/setup.php:282
+msgid "Check again"
+msgstr ""
+
+#: ../../mod/setup.php:304
+msgid "Database connection"
+msgstr ""
+
+#: ../../mod/setup.php:305
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../mod/setup.php:306
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../mod/setup.php:307
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../mod/setup.php:311
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../mod/setup.php:311
+msgid "Default is localhost"
+msgstr ""
+
+#: ../../mod/setup.php:312
+msgid "Database Port"
+msgstr ""
+
+#: ../../mod/setup.php:312
+msgid "Communication port number - use 0 for default"
+msgstr ""
+
+#: ../../mod/setup.php:313
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../mod/setup.php:314
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../mod/setup.php:315
+msgid "Database Name"
+msgstr ""
+
+#: ../../mod/setup.php:316
+msgid "Database Type"
+msgstr ""
+
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Website URL"
+msgstr ""
+
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Please use SSL (https) URL if available."
+msgstr ""
+
+#: ../../mod/setup.php:321 ../../mod/setup.php:363
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../mod/setup.php:348
+msgid "Site settings"
+msgstr ""
+
+#: ../../mod/setup.php:413
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: ../../mod/setup.php:414
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr ""
+
+#: ../../mod/setup.php:418
+msgid "PHP executable path"
+msgstr ""
+
+#: ../../mod/setup.php:418
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: ../../mod/setup.php:423
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../mod/setup.php:432
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: ../../mod/setup.php:433
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: ../../mod/setup.php:436
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../mod/setup.php:454
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr ""
+
+#: ../../mod/setup.php:459
+msgid "You can adjust these settings in the servers php.ini."
+msgstr ""
+
+#: ../../mod/setup.php:461
+msgid "PHP upload limits"
+msgstr ""
+
+#: ../../mod/setup.php:484
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: ../../mod/setup.php:485
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../mod/setup.php:488
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../mod/setup.php:500
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:501
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:502
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:503
+msgid "mysqli or postgres PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:504
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:505
+msgid "mcrypt PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:506
+msgid "xml PHP module"
+msgstr ""
+
+#: ../../mod/setup.php:510 ../../mod/setup.php:512
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../mod/setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:516 ../../mod/setup.php:519
+msgid "proc_open"
+msgstr ""
+
+#: ../../mod/setup.php:516
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr ""
+
+#: ../../mod/setup.php:524
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:528
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:532
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:536
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr ""
+
+#: ../../mod/setup.php:540
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:544
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:548
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr ""
+
+#: ../../mod/setup.php:566
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../mod/setup.php:567
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../mod/setup.php:568
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr ""
+
+#: ../../mod/setup.php:569
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../mod/setup.php:572
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../mod/setup.php:586
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../mod/setup.php:587
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr ""
+
+#: ../../mod/setup.php:588 ../../mod/setup.php:609
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: ../../mod/setup.php:589
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../mod/setup.php:592
+#, php-format
+msgid "%s is writable"
+msgstr ""
+
+#: ../../mod/setup.php:608
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to "
+"have write access to the store directory under the Red top level folder"
+msgstr ""
+
+#: ../../mod/setup.php:612
+msgid "store is writable"
+msgstr ""
+
+#: ../../mod/setup.php:645
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
+msgstr ""
+
+#: ../../mod/setup.php:646
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr ""
+
+#: ../../mod/setup.php:647
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr ""
+
+#: ../../mod/setup.php:648
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr ""
+
+#: ../../mod/setup.php:649
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr ""
+
+#: ../../mod/setup.php:650
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
+msgstr ""
+
+#: ../../mod/setup.php:652
+msgid "SSL certificate validation"
+msgstr ""
+
+#: ../../mod/setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
+msgstr ""
+
+#: ../../mod/setup.php:661
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../mod/setup.php:670
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../mod/setup.php:694
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../mod/setup.php:728
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../mod/setup.php:729
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
#: ../../mod/openid.php:26
msgid "OpenID protocol error. No ID returned."
msgstr ""
@@ -6884,15 +6920,15 @@ msgstr ""
msgid "Accounts"
msgstr ""
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:95 ../../mod/admin.php:976
msgid "Channels"
msgstr ""
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:96 ../../mod/admin.php:1068 ../../mod/admin.php:1108
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:97 ../../mod/admin.php:1268 ../../mod/admin.php:1302
msgid "Themes"
msgstr ""
@@ -6908,7 +6944,7 @@ msgstr ""
msgid "DB updates"
msgstr ""
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1387
msgid "Logs"
msgstr ""
@@ -6953,9 +6989,9 @@ msgid "Message queues"
msgstr ""
#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539
-#: ../../mod/admin.php:808 ../../mod/admin.php:944 ../../mod/admin.php:1035
-#: ../../mod/admin.php:1075 ../../mod/admin.php:1235 ../../mod/admin.php:1269
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:808 ../../mod/admin.php:975 ../../mod/admin.php:1067
+#: ../../mod/admin.php:1107 ../../mod/admin.php:1267 ../../mod/admin.php:1301
+#: ../../mod/admin.php:1386
msgid "Administration"
msgstr ""
@@ -7379,7 +7415,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:811 ../../mod/admin.php:978
msgid "select all"
msgstr ""
@@ -7441,171 +7477,196 @@ msgid ""
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:861
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channels censored/uncensored"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:870
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/admin.php:877
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:897
msgid "Channel not found"
msgstr ""
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:908
#, php-format
msgid "Channel '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:920
+#, php-format
+msgid "Channel '%s' censored"
+msgstr ""
+
+#: ../../mod/admin.php:920
#, php-format
msgid "Channel '%s' uncensored"
msgstr ""
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:931
#, php-format
-msgid "Channel '%s' censored"
+msgid "Channel '%s' code allowed"
msgstr ""
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:931
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr ""
+
+#: ../../mod/admin.php:980
msgid "Censor"
msgstr ""
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:981
msgid "Uncensor"
msgstr ""
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:982
+msgid "Allow Code"
+msgstr ""
+
+#: ../../mod/admin.php:983
+msgid "Disallow Code"
+msgstr ""
+
+#: ../../mod/admin.php:985
msgid "UID"
msgstr ""
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:987
msgid ""
"Selected channels will be deleted!\\n\\nEverything that was posted in these "
"channels on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:988
msgid ""
"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
"channel on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:1028
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1032
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:1042 ../../mod/admin.php:1240
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:1045 ../../mod/admin.php:1242
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:1069 ../../mod/admin.php:1269
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1279
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1280
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1205
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1261
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1307
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1308
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1332
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1389
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1395
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1396
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1396
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr ""
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1397
msgid "Log level"
msgstr ""
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1443
msgid "New Profile Field"
msgstr ""
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1444 ../../mod/admin.php:1464
msgid "Field nickname"
msgstr ""
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1444 ../../mod/admin.php:1464
msgid "System name of field"
msgstr ""
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1445 ../../mod/admin.php:1465
msgid "Input type"
msgstr ""
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1446 ../../mod/admin.php:1466
msgid "Field Name"
msgstr ""
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1446 ../../mod/admin.php:1466
msgid "Label on profile pages"
msgstr ""
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
msgid "Help text"
msgstr ""
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
msgid "Additional info (optional)"
msgstr ""
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1457
msgid "Field definition not found"
msgstr ""
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1463
msgid "Edit Profile Field"
msgstr ""
diff --git a/version.inc b/version.inc
index 57c90a3d0..bb5285ad8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-28.1046
+2015-05-31.1049
diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css
index 930bd834d..7f0f40246 100644
--- a/view/css/mod_menu.css
+++ b/view/css/mod_menu.css
@@ -2,7 +2,20 @@
width: 100%;
}
-#menu-list-table th:nth-child(2){
+#menu-list-table th:nth-child(2),
+#menu-list-table th:nth-child(3) {
+ white-space: nowrap;
+}
+
+#menu-list-table th:nth-child(7),
+#menu-list-table td:nth-child(7) {
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#menu-list-table th:nth-child(8),
+#menu-list-table td:nth-child(8) {
+ padding: 7px 10px 7px 7px;
white-space: nowrap;
}
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index da3172434..7fc17471c 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -22,7 +22,7 @@
{{include file="field_checkbox.tpl" field=$menu_bookmark}}
<div class="menuedit-submit-wrapper form-group pull-right" >
- <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="icon-caret-right"></i></button>
</div>
<div class="clear"></div>
</form>
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 1d3d70757..888dc6e6d 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -14,17 +14,23 @@
<tr>
<th width="1%"></th>
<th width="1%">{{$nametitle}}</th>
- <th width="96%">{{$desctitle}}</th>
+ <th width="93%">{{$desctitle}}</th>
<th width="1%"></th>
<th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%" class="hidden-xs">{{$created}}</th>
+ <th width="1%" class="hidden-xs">{{$edited}}</th>
</tr>
{{foreach $menus as $m }}
<tr id="menu-list-item-{{$m.menu_id}}">
- <td width="1%">{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
- <td width="1%"><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
- <td width="96%">{{$m.menu_desc}}</td>
- <td width="1%" class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
- <td width="1%" class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+ <td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+ <td>{{$m.menu_desc}}</td>
+ <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+ <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td>
+ <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td class="hidden-xs">{{$m.menu_created}}</td>
+ <td class="hidden-xs">{{$m.menu_edited}}</td>
</tr>
{{/foreach}}
</table>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 8b8afa24c..cdc022c5c 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -21,13 +21,13 @@
{{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 btn-group form-group">
+ <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 id="jot-perms-icon" class="icon-caret-right"></i></button>
+ <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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 18:12:00 +0000