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

add randprof app and do away with the universally hated chanview-iframe mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix.

Browse Source
This commit is contained in:
friendica 2014-05-23 15:30:22 -07:00
parent 5519f402d6
commit 059b6cd411
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/randprof.apd Normal file
View File

@ -0,0 +1,5 @@
url: $baseurl/randprof
name: Random Channel
target: randprof

16
mod/chanview.php
View File

@ -84,15 +84,17 @@ function chanview_content(&$a) {
$url = zid($url);
// let somebody over-ride the iframed viewport presentation
// or let's just declare this a failed experiment.
if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full')))
goaway($url);
// if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full')))
goaway($url);
$o = replace_macros(get_markup_template('chanview.tpl'),array(
'$url' => $url,
'$full' => t('toggle full screen mode')
));
// $o = replace_macros(get_markup_template('chanview.tpl'),array(
// '$url' => $url,
// '$full' => t('toggle full screen mode')
// ));
return $o;
// return $o;
}

7
mod/settings.php
View File

@ -150,12 +150,12 @@ function settings_post(&$a) {
set_pconfig(local_user(),'system','mobile_theme',$mobile_theme);
}
$chanview_full = ((x($_POST,'chanview_full')) ? intval($_POST['chanview_full']) : 0);
// $chanview_full = ((x($_POST,'chanview_full')) ? intval($_POST['chanview_full']) : 0);
set_pconfig(local_user(),'system','update_interval', $browser_update);
set_pconfig(local_user(),'system','itemspage', $itemspage);
set_pconfig(local_user(),'system','no_smilies',$nosmile);
set_pconfig(local_user(),'system','chanview_full',$chanview_full);
// set_pconfig(local_user(),'system','chanview_full',$chanview_full);
if ($theme == $a->channel['channel_theme']){
@ -736,7 +736,7 @@ function settings_content(&$a) {
$nosmile = get_pconfig(local_user(),'system','no_smilies');
$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
$chanview = intval(get_pconfig(local_user(),'system','chanview_full'));
// $chanview = intval(get_pconfig(local_user(),'system','chanview_full'));
$theme_config = "";
if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){
@ -757,7 +757,6 @@ function settings_content(&$a) {
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
'$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
'$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
'$chanview_full' => array('chanview_full', t('Do not view remote profiles in frames'), $chanview, t('By default open in a sub-window of your own site')),
'$layout_editor' => t('System Page Layout Editor - (advanced)'),
'$theme_config' => $theme_config,
));

2
view/tpl/apps.tpl
View File

@ -2,7 +2,7 @@
{{foreach $apps as $ap}}
<div class="app-container">
<a href="{{$ap.url}}" {{if $ap.hover}}title="{{$ap.hover}}"{{/if}}><img src="{{$ap.photo}}" width="80" height="80" />
<a href="{{$ap.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $ap.hover}}title="{{$ap.hover}}"{{/if}}><img src="{{$ap.photo}}" width="80" height="80" />
<div class="app-name">{{$ap.name}}</div>
</a>
</div>

1
view/tpl/settings_display.tpl
View File

@ -9,7 +9,6 @@
{{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}}
{{include file="field_checkbox.tpl" field=$nosmile}}
{{include file="field_checkbox.tpl" field=$chanview_full}}
<div class="settings-submit-wrapper" >