keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1932 from annando/1510-vier-2

Browse source 
Small optical changes in "vier"
This commit is contained in:
Tobias Diekershoff 2015-10-04 17:01:25 +02:00
commit 18e8d0de59
4 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
view/theme/vier/config.php
View file

@ -17,12 +17,12 @@ function theme_content(&$a){
if ($style == "") if ($style == "")
$style = "plus"; $style = "plus";
$show_pages = get_vier_config('show_pages', true); $show_pages = get_vier_config('show_pages', true);
$show_profiles = get_vier_config('show_profiles', true); $show_profiles = get_vier_config('show_profiles', true);
$show_helpers = get_vier_config('show_helpers', true); $show_helpers = get_vier_config('show_helpers', true);
$show_services = get_vier_config('show_services', true); $show_services = get_vier_config('show_services', true);
$show_friends = get_vier_config('show_friends', true); $show_friends = get_vier_config('show_friends', true);
$show_lastusers = get_vier_config('show_lastusers', true); $show_lastusers = get_vier_config('show_lastusers', true);
return vier_form($a,$style, $show_pages, $show_profiles, $show_helpers, return vier_form($a,$style, $show_pages, $show_profiles, $show_helpers,
$show_services, $show_friends, $show_lastusers); $show_services, $show_friends, $show_lastusers);
@ -34,12 +34,12 @@ function theme_post(&$a){
if (isset($_POST['vier-settings-submit'])){ if (isset($_POST['vier-settings-submit'])){
set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']); set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']);
set_pconfig(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']); set_pconfig(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
set_pconfig(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']); set_pconfig(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
set_pconfig(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']); set_pconfig(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
set_pconfig(local_user(), 'vier', 'show_services', $_POST['vier_show_services']); set_pconfig(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
set_pconfig(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']); set_pconfig(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
set_pconfig(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']); set_pconfig(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
} }
} }
@ -57,12 +57,12 @@ function theme_admin(&$a){
'$helperlist' => array('vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''), '$helperlist' => array('vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''),
)); ));
$show_pages = get_vier_config('show_pages', true, true); $show_pages = get_vier_config('show_pages', true, true);
$show_profiles = get_vier_config('show_profiles', true, true); $show_profiles = get_vier_config('show_profiles', true, true);
$show_helpers = get_vier_config('show_helpers', true, true); $show_helpers = get_vier_config('show_helpers', true, true);
$show_services = get_vier_config('show_services', true, true); $show_services = get_vier_config('show_services', true, true);
$show_friends = get_vier_config('show_friends', true, true); $show_friends = get_vier_config('show_friends', true, true);
$show_lastusers = get_vier_config('show_lastusers', true, true); $show_lastusers = get_vier_config('show_lastusers', true, true);
$o .= vier_form($a,$style, $show_pages, $show_profiles, $show_helpers, $show_services, $o .= vier_form($a,$style, $show_pages, $show_profiles, $show_helpers, $show_services,
$show_friends, $show_lastusers); $show_friends, $show_lastusers);
@ -73,11 +73,11 @@ function theme_admin_post(&$a){
if (isset($_POST['vier-settings-submit'])){ if (isset($_POST['vier-settings-submit'])){
set_config('vier', 'style', $_POST['vier_style']); set_config('vier', 'style', $_POST['vier_style']);
set_config('vier', 'show_pages', $_POST['vier_show_pages']); set_config('vier', 'show_pages', $_POST['vier_show_pages']);
set_config('vier', 'show_profiles', $_POST['vier_show_profiles']); set_config('vier', 'show_profiles', $_POST['vier_show_profiles']);
set_config('vier', 'show_helpers', $_POST['vier_show_helpers']); set_config('vier', 'show_helpers', $_POST['vier_show_helpers']);
set_config('vier', 'show_services', $_POST['vier_show_services']); set_config('vier', 'show_services', $_POST['vier_show_services']);
set_config('vier', 'show_friends', $_POST['vier_show_friends']); set_config('vier', 'show_friends', $_POST['vier_show_friends']);
set_config('vier', 'show_lastusers', $_POST['vier_show_lastusers']); set_config('vier', 'show_lastusers', $_POST['vier_show_lastusers']);
set_config('vier', 'helperlist', $_POST['vier_helperlist']); set_config('vier', 'helperlist', $_POST['vier_helperlist']);
} }
} }
@ -93,7 +93,7 @@ function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $sho
"flat"=>"Flat" "flat"=>"Flat"
); );
$show_or_not = array('0'=>t("don't show"), '1'=>t("show"),); $show_or_not = array('0'=>t("don't show"), '1'=>t("show"),);
$t = get_markup_template("theme_settings.tpl"); $t = get_markup_template("theme_settings.tpl");
$o .= replace_macros($t, array( $o .= replace_macros($t, array(
@ -102,11 +102,11 @@ function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $sho
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$style' => array('vier_style',t ('Set style'),$style,'',$styles), '$style' => array('vier_style',t ('Set style'),$style,'',$styles),
'$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not), '$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not),
'$show_profiles' => array('vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not), '$show_profiles' => array('vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not),
'$show_helpers' => array('vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not), '$show_helpers' => array('vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not),
'$show_services' => array('vier_show_services', t('Connect Services'), $show_services, '', $show_or_not), '$show_services' => array('vier_show_services', t('Connect Services'), $show_services, '', $show_or_not),
'$show_friends' => array('vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not), '$show_friends' => array('vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not),
'$show_lastusers' => array('vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not) '$show_lastusers' => array('vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not)
)); ));
return $o; return $o;
} }

2
view/theme/vier/style.css
View file

@ -874,7 +874,7 @@ ul.menu-popup .empty {
right_aside { right_aside {
width: 0px; width: 0px;
top: 32px; top: 32px;
display: block; display: none;
} }
/* aside */ /* aside */

3
view/theme/vier/theme.php
View file

@ -130,7 +130,8 @@ function vier_community_info() {
foreach($r as $rr) { foreach($r as $rr) {
$entry = replace_macros($tpl,array( $entry = replace_macros($tpl,array(
'$id' => $rr['id'], '$id' => $rr['id'],
'$profile_link' => zrl($rr['url']), //'$profile_link' => zrl($rr['url']),
'$profile_link' => $a->get_baseurl().'/follow/?url='.urlencode($rr['url']),
'$photo' => proxy_url($rr['photo']), '$photo' => proxy_url($rr['photo']),
'$alt_text' => $rr['name'], '$alt_text' => $rr['name'],
)); ));

2
view/theme/vier/wide.css
View file

@ -39,7 +39,7 @@ right_aside img.directory-photo-img {
} }
right_aside #right_services img { right_aside #right_services img {
width: 32px; width: 34px;
} }
right_aside #lastusers-wrapper, right_aside #lastusers-wrapper,