MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown

Browse source
This commit is contained in:
Michael Vogel 2015-02-23 12:34:32 +01:00
parent b710c8bbfd eb1f21d1e5
commit 72cfb86773
5 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/contacts.php
View file

@ -482,6 +482,9 @@ function contacts_content(&$a) {
if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
$poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
if ($contact['network'] == NETWORK_DFRN)
$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$header' => t('Contact Editor'), '$header' => t('Contact Editor'),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
@ -509,7 +512,7 @@ function contacts_content(&$a) {
'$updpub' => t('Update public posts'), '$updpub' => t('Update public posts'),
'$last_update' => $last_update, '$last_update' => $last_update,
'$udnow' => t('Update now'), '$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)), '$profile_select' => $profile_select,
'$contact_id' => $contact['id'], '$contact_id' => $contact['id'],
'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),

2
mod/notifications.php
View file

@ -185,7 +185,7 @@ function notifications_content(&$a) {
'$intro_id' => $rr['intro_id'], '$intro_id' => $rr['intro_id'],
'$friend_selected' => $friend_selected, '$friend_selected' => $friend_selected,
'$fan_selected' => $fan_selected, '$fan_selected' => $fan_selected,
'$approve_as' => t('Approve as: '), '$approve_as' => t('Choose "Friend" to allow to read and to subscribe to their posts. Choose "Fan" to allow to read if you do not want to read their posts. Approve as: '),
'$as_friend' => t('Friend'), '$as_friend' => t('Friend'),
'$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
)); ));

5
view/templates/contact_edit.tpl
View file

@ -84,15 +84,14 @@
</div> </div>
<div id="contact-edit-info-end"></div> <div id="contact-edit-info-end"></div>
{{if $profile_select}}
<div id="contact-edit-profile-select-text"> <div id="contact-edit-profile-select-text">
<h4>{{$lbl_vis1}}</h4> <h4>{{$lbl_vis1}}</h4>
<p>{{$lbl_vis2}}</p> <p>{{$lbl_vis2}}</p>
</div> </div>
{{$profile_select}} {{$profile_select}}
<div id="contact-edit-profile-select-end"></div> <div id="contact-edit-profile-select-end"></div>
<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
{{/if}}
</form> </form>
</div> </div>

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

@ -14,6 +14,9 @@ function theme_content(&$a){
if ($style == "") if ($style == "")
$style = get_config('vier', 'style'); $style = get_config('vier', 'style');
if ($style == "")
$style = "plus";
return vier_form($a,$style); return vier_form($a,$style);
} }
@ -41,12 +44,12 @@ function theme_admin_post(&$a){
function vier_form(&$a, $style){ function vier_form(&$a, $style){
$styles = array( $styles = array(
"shadow"=>"Shadow",
"flat"=>"Flat",
"netcolour"=>"Coloured Networks",
"breathe"=>"Breathe",
"plus"=>"Plus", "plus"=>"Plus",
"dark"=>"Dark" "breathe"=>"Breathe",
"dark"=>"Dark",
"shadow"=>"Shadow",
"netcolour"=>"Coloured Networks",
"flat"=>"Flat"
); );
$t = get_markup_template("theme_settings.tpl" ); $t = get_markup_template("theme_settings.tpl" );
$o .= replace_macros($t, array( $o .= replace_macros($t, array(

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

@ -21,6 +21,9 @@ $style = get_pconfig(local_user(), 'vier', 'style');
if ($style == "") if ($style == "")
$style = get_config('vier', 'style'); $style = get_config('vier', 'style');
if ($style == "")
$style = "plus";
if ($style == "flat") if ($style == "flat")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
else if ($style == "netcolour") else if ($style == "netcolour")