harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only show jotnets when posting conversation items

Browse Source
This commit is contained in:
friendica 2014-06-14 20:16:40 -07:00
parent b67c8ec8b9
commit 0f6c321e3f
13 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/home.html
View File

@ -92,8 +92,8 @@ var r = 0;
var g = 0;
var b = 0;
var speed = 2;
var delay = 1000;
var speed = 10;
var delay = 150;
var timer = null;
var holdid = 0;
@ -113,7 +113,7 @@ function update_element() {
var id = document.getElementById(element);
id.innerHTML = curr;
timer = setTimeout('fadein();',5);
timer = setTimeout('fadein();',3);
}
function fadeout() {
@ -124,7 +124,7 @@ function fadeout() {
b = (((b + speed) < 255) ? b + speed : 255);
if((r != 255) && (g != 255) && (b != 255)) {
timer = setTimeout('fadeout();',10);
timer = setTimeout('fadeout();',5);
}
else
update_element();
@ -138,7 +138,7 @@ function fadein() {
b = (((b - speed) > 0) ? b - speed : 0);
if(r && g && b) {
timer = setTimeout('fadein();',10);
timer = setTimeout('fadein();',5);
}
else {
timer = setTimeout('fadeout();',delay);

1
doc/To-Do-Code.md
View File

@ -40,6 +40,7 @@ We need much more than this, but here are areas where developers can help. Pleas
* Uploads - integrate https://github.com/blueimp/jQuery-File-Upload
* App taxonomy
* replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.

2
doc/to_do_code.bb
View File

@ -40,6 +40,8 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
[li]App taxonomy[/li]
[li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our &quot;enhanced bbcode&quot;, but start with images, links, bold and highlight and work from there.[/li]
[li]Photos module - turn photos into normal conversations and fix tagging[/li]

6
include/acl_selectors.php
View File

@ -211,7 +211,7 @@ function fixacl(&$item) {
$item = str_replace(array('<','>'),array('',''),$item);
}
function populate_acl($defaults = null,$unused = false) {
function populate_acl($defaults = null,$show_jotnets = true) {
$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
@ -231,7 +231,9 @@ function populate_acl($defaults = null,$unused = false) {
}
$jotnets = '';
call_hooks('jot_networks', $jotnets);
if($show_jotnets) {
call_hooks('jot_networks', $jotnets);
}
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(

2
mod/chat.php
View File

@ -207,7 +207,7 @@ function chat_content(&$a) {
'$header' => t('New Chatroom'),
'$name' => array('room_name',t('Chatroom Name'),'', ''),
'$permissions' => t('Permissions'),
'$acl' => populate_acl($channel_acl),
'$acl' => populate_acl($channel_acl,false),
'$submit' => t('Submit')
));
return $o;

2
mod/display.php
View File

@ -55,7 +55,7 @@ function display_content(&$a, $update = 0, $load = false) {
'nickname' => $channel['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl, false),
'acl' => populate_acl($channel_acl),
'bang' => '',
'visitor' => true,
'profile_uid' => local_user(),

2
mod/editwebpage.php
View File

@ -157,7 +157,7 @@ function editwebpage_content(&$a) {
'$baseurl' => $a->get_baseurl(),
'$defloc' => $itm[0]['location'],
'$visitor' => ($is_owner) ? true : false,
'$acl' => populate_acl($itm[0]),
'$acl' => populate_acl($itm[0],false),
'$showacl' => ($is_owner) ? true : false,
'$public' => t('Public post'),
'$jotnets' => $jotnets,

2
mod/events.php
View File

@ -488,7 +488,7 @@ function events_content(&$a) {
'$t_orig' => $t_orig,
'$sh_text' => t('Share this event'),
'$sh_checked' => $sh_checked,
'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults))),
'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)),
'$submit' => t('Submit')
));

2
mod/filestorage.php
View File

@ -111,7 +111,7 @@ function filestorage_content(&$a) {
$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
$aclselect_e = populate_acl($f);
$aclselect_e = populate_acl($f,false);
$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');

4
mod/mitem.php
View File

@ -132,7 +132,7 @@ function mitem_content(&$a) {
'$menu_id' => $a->data['menu']['menu_id'],
'$permissions' => t('Menu Item Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults),
'$aclselect' => populate_acl($perm_defaults,false),
'$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'),
'$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'),
'$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''),
@ -175,7 +175,7 @@ function mitem_content(&$a) {
'$menu_id' => $a->data['menu']['menu_id'],
'$permissions' => t('Menu Item Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($mitem),
'$aclselect' => populate_acl($mitem,false),
'$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
'$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'),

2
mod/photos.php
View File

@ -591,7 +591,7 @@ function photos_content(&$a) {
}
$albumselect_e = $albumselect;
$aclselect_e = (($_is_owner) ? populate_acl($channel_acl) : '');
$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
$tpl = get_markup_template('photos_upload.tpl');
$o .= replace_macros($tpl,array(

2
mod/settings.php
View File

@ -957,7 +957,7 @@ function settings_content(&$a) {
'$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
'$permissions' => t('Default Post Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults),
'$aclselect' => populate_acl($perm_defaults,false),
'$suggestme' => $suggestme,
'$group_select' => $group_select,

2
mod/webpages.php
View File

@ -84,7 +84,7 @@ function webpages_content(&$a) {
'nickname' => $a->profile['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''),
'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl,false) : ''),
'visitor' => true,
'profile_uid' => intval($owner),
'mimetype' => $mimetype,