diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 90016952e..2821b3fe0 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -143,16 +143,11 @@ class Editblock extends \Zotlabs\Web\Controller { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), - '$upload' => t('Upload photo'), + '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$wait' => t('Please wait'), + '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false), + '$setloc' => false, + '$noloc' => false, '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], '$mimeselect' => $mimeselect, @@ -160,7 +155,7 @@ class Editblock extends \Zotlabs\Web\Controller { '$post_id' => $post_id, '$baseurl' => z_root(), '$defloc' => $channel['channel_location'], - '$visitor' => false, + '$visitor' => true, '$public' => t('Public post'), '$jotnets' => $jotnets, '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), @@ -177,8 +172,6 @@ class Editblock extends \Zotlabs\Web\Controller { '$jotplugins' => $jotplugins, '$sourceapp' => $itm[0]['app'], '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 01d9e8aad..d3b031db2 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -176,7 +176,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$webpage' => ITEM_TYPE_WEBPAGE, '$placeholdpagetitle' => t('Page link title'), '$pagetitle' => $page_title, - '$writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_storage'), + '$writefiles' => (($mimetype == 'text/bbcode') ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false), '$action' => 'item', '$share' => t('Edit'), '$bold' => t('Bold'), @@ -184,15 +184,10 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$upload' => t('Upload photo'), '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''), - '$wait' => t('Please wait'), + '$weblink' => (($mimetype == 'text/bbcode') ? t('Insert web link') : false), + '$setloc' => false, //t('Set your location'), + '$noloc' => false, //((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''), '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], '$content' => undo_post_tagging($itm[0]['body']), @@ -218,8 +213,6 @@ class Editwebpage extends \Zotlabs\Web\Controller { '$jotplugins' => $jotplugins, '$sourceapp' => \App::$sourcename, '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), '$bbcode' => (($mimetype == 'text/bbcode') ? true : false) )); diff --git a/doc/context/en/admin/logs/help.html b/doc/context/en/admin/logs/help.html new file mode 100644 index 000000000..708ec9bde --- /dev/null +++ b/doc/context/en/admin/logs/help.html @@ -0,0 +1,8 @@ +
+
General
+
This page allows you to adjust log settings and to view and existing log.
+
Log Settings
+
When you enable the Debugging option, system log information will begin appending to the file specified in the "Log File" box (path is relative to the hub root, for example /var/www). Note that this file must be writable by the web server.
+
Log Level
+
The log level option allows you to set how much information is appended to the log file. Warning: Increasing this level can quickly inflate the size of the log file to >100MB, especially on hubs with more than a few members.
+
\ No newline at end of file diff --git a/doc/context/en/admin/queue/help.html b/doc/context/en/admin/queue/help.html new file mode 100644 index 000000000..28885a154 --- /dev/null +++ b/doc/context/en/admin/queue/help.html @@ -0,0 +1,4 @@ +
+
General
+
The queue statistics display how many posts are in the queue for delivery to other hubs. The priority is related to how many times the delivery has been unsuccessfully attempted.
+
\ No newline at end of file diff --git a/doc/context/en/admin/security/help.html b/doc/context/en/admin/security/help.html index e9a741a5e..bfe81b132 100644 --- a/doc/context/en/admin/security/help.html +++ b/doc/context/en/admin/security/help.html @@ -1,3 +1,4 @@ -

Security Settings

-

This page contains various administrator settings related to security.

-

To save any changes you make to these settings, you must press the Submit button.

\ No newline at end of file +
+
General
+
This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.
+
\ No newline at end of file diff --git a/doc/context/en/chat/help.html b/doc/context/en/chat/help.html new file mode 100644 index 000000000..cc71686d8 --- /dev/null +++ b/doc/context/en/chat/help.html @@ -0,0 +1,8 @@ +
+
General
+
Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.
+
Create new chat room
+
Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.
+
Chatting
+
Enter your message in the message box and press Submit. You can set a status by selecting the chat room menu button beside the Submit button. Other people "in the room" are visible in the side panel in the "Chat Members" panel.
+
\ No newline at end of file diff --git a/doc/context/en/connections/help.html b/doc/context/en/connections/help.html new file mode 100644 index 000000000..0f95fde63 --- /dev/null +++ b/doc/context/en/connections/help.html @@ -0,0 +1,8 @@ +
+
General
+
This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
+
Connection Details
+
Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
+
Connection Status
+
A connection can be in different states:
+
\ No newline at end of file diff --git a/doc/context/en/connections/ifpending/help.html b/doc/context/en/connections/ifpending/help.html new file mode 100644 index 000000000..0f95fde63 --- /dev/null +++ b/doc/context/en/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
+
General
+
This page displays a list of all this channel's connections. The list can be sorted and filtered using the menu button beside the search button.
+
Connection Details
+
Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.
+
Connection Status
+
A connection can be in different states:
+
\ No newline at end of file diff --git a/doc/context/en/events/help.html b/doc/context/en/events/help.html new file mode 100644 index 000000000..8c0b1d4ab --- /dev/null +++ b/doc/context/en/events/help.html @@ -0,0 +1,8 @@ +
+
General
+
This page displays a calendar of events both owned by you and shared with you from other channels.
+
Calendar View
+
The calendar can be displayed in month, week, or day mode using the options in the side panel.
+
Export/Import
+
Export or import calendar events using standard iCalendar format (.ics) files.
+
\ No newline at end of file diff --git a/view/css/conversation.css b/view/css/conversation.css index 0ecec039f..e5eb575bf 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -77,7 +77,7 @@ code { } #profile-rotator { - margin: 16px; + padding: 15px 0px 0px 15px; } .profile-jot-net { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 44e010e77..9c5ddc620 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -68,27 +68,31 @@ {{/if}} {{if $visitor}} -