aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-27 13:27:19 -0700
committerredmatrix <git@macgirvin.com>2016-04-27 13:27:19 -0700
commitd4eb5e7c6d4ca944b523125b2e3e10160e50ac94 (patch)
tree4dd69437f377d73d64355601bed5ac1578cefc03
parent8e8df26066d806c663e3eecc7d869d611e311f81 (diff)
parentc91e43af343557afd2e4769a538106689776a3f5 (diff)
downloadvolse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.tar.gz
volse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.tar.bz2
volse-hubzilla-d4eb5e7c6d4ca944b523125b2e3e10160e50ac94.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Module/Editblock.php17
-rw-r--r--Zotlabs/Module/Editwebpage.php15
-rw-r--r--doc/context/en/admin/logs/help.html8
-rw-r--r--doc/context/en/admin/queue/help.html4
-rw-r--r--doc/context/en/admin/security/help.html7
-rw-r--r--doc/context/en/chat/help.html8
-rw-r--r--doc/context/en/connections/help.html8
-rw-r--r--doc/context/en/connections/ifpending/help.html8
-rw-r--r--doc/context/en/events/help.html8
-rw-r--r--view/css/conversation.css2
-rwxr-xr-xview/tpl/jot.tpl33
11 files changed, 78 insertions, 40 deletions
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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>This page allows you to adjust log settings and to view and existing log.</dd>
+ <dt>Log Settings</dt>
+ <dd>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.</dd>
+ <dt>Log Level</dt>
+ <dd>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.</dd>
+</dl> \ 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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>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.</dd>
+</dl> \ 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 @@
-<h3>Security Settings</h3>
-<p>This page contains various administrator settings related to security.</p>
-<p>To save any changes you make to these settings, you must press the Submit button.</p> \ No newline at end of file
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.</dd>
+</dl> \ 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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.</dd>
+ <dt>Create new chat room</dt>
+ <dd>Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.</dd>
+ <dt>Chatting</dt>
+ <dd>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.</dd>
+</dl> \ 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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
+ <dt>Connection Details</dt>
+ <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
+ <dt>Connection Status</dt>
+ <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
+</dl> \ 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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
+ <dt>Connection Details</dt>
+ <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
+ <dt>Connection Status</dt>
+ <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
+</dl> \ 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 @@
+<dl class="dl-horizontal">
+ <dt>General</dt>
+ <dd>This page displays a calendar of events both owned by you and shared with you from other channels.</dd>
+ <dt><a href='#' onclick='contextualHelpFocus("#title", 0); return false;' title="Click to highlight element...">Calendar View</a></dt>
+ <dd>The calendar can be displayed in month, week, or day mode using the options in the side panel.</dd>
+ <dt>Export/Import</dt>
+ <dd>Export or import calendar events using standard iCalendar format (.ics) files.</dd>
+</dl> \ 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 @@
</div>
{{/if}}
{{if $visitor}}
- <div class="btn-group hidden-xs">
+ <div class="btn-group hidden-xs hidden-sm">
{{if $writefiles}}
<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
<i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
</button>
{{/if}}
+ {{if $weblink}}
<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
<i id="profile-link" class="icon-link jot-icons"></i>
</button>
+ {{/if}}
</div>
<div class="btn-group hidden-xs hidden-sm">
+ {{if $setloc}}
<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
<i id="profile-location" class="icon-globe jot-icons"></i>
</button>
+ {{/if}}
{{if $noloc}}
<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
</button>
{{/if}}
{{else}}
- <div class="btn-group hidden-xs">
+ <div class="btn-group hidden-xs hidden-sm">
{{/if}}
{{if $feature_expire}}
<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
@@ -111,42 +115,45 @@
</button>
{{/if}}
</div>
+ {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}}
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
</button>
<ul class="dropdown-menu dropdown-menu" role="menu">
- <li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i>&nbsp;{{$preview}}</a></li>
{{if $visitor}}
- <li class="divider visible-xs"></li>
{{if $writefiles}}
- <li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
+ <li><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
+ {{/if}}
+ {{if $weblink}}
+ <li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
+ {{/if}}
+i {{if $setloc}}
+ <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
{{/if}}
- <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
- <li class="divider visible-xs"></li>
- <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
{{if $noloc}}
- <li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li>
+ <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li>
{{/if}}
{{/if}}
{{if $feature_expire}}
- <li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
+ <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
{{/if}}
{{if $feature_encrypt}}
- <li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+ <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
{{if $feature_voting}}
- <li class="visible-xs visible-sm"><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i>&nbsp;{{$voting}}</a></li>
+ <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i>&nbsp;{{$voting}}</a></li>
{{/if}}
</ul>
</div>
+ {{/if}}
</div>
<div id="profile-rotator-wrapper">
<div id="profile-rotator"></div>
</div>
<div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $preview}}
- <button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}">
+ <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
<i class="icon-eye-open jot-icons" ></i>
</button>
{{/if}}