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

Merge pull request #1118 from tugelbend/master

Browse source 
bug fix #1115: settings were hidden on "social network" and "plugin" page
This commit is contained in:
fabrixxm 2014-09-07 11:37:55 +02:00
commit a58e990cfc
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
view/templates/settings-head.tpl
View file

@ -20,10 +20,10 @@
}).trigger('change'); }).trigger('change');
$('.settings-block').hide(); $('.settings-content-block').hide();
$('.settings-heading').click(function(){ $('.settings-heading').click(function(){
$('.settings-block').hide(); $('.settings-content-block').hide();
$(this).next('.settings-block').toggle(); $(this).next('.settings-content-block').toggle();
}); });
}); });

12
view/templates/settings.tpl
View file

@ -6,7 +6,7 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<h3 class="settings-heading">{{$h_pass}}</h3> <h3 class="settings-heading">{{$h_pass}}</h3>
<div class="settings-block"> <div class="settings-content-block">
{{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}} {{include file="field_password.tpl" field=$password2}}
{{include file="field_password.tpl" field=$password3}} {{include file="field_password.tpl" field=$password3}}
@ -21,7 +21,7 @@
</div> </div>
<h3 class="settings-heading">{{$h_basic}}</h3> <h3 class="settings-heading">{{$h_basic}}</h3>
<div class="settings-block"> <div class="settings-content-block">
{{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$username}}
{{include file="field_input.tpl" field=$email}} {{include file="field_input.tpl" field=$email}}
@ -38,7 +38,7 @@
<h3 class="settings-heading">{{$h_prv}}</h3> <h3 class="settings-heading">{{$h_prv}}</h3>
<div class="settings-block"> <div class="settings-content-block">
<input type="hidden" name="visibility" value="{{$visibility}}" /> <input type="hidden" name="visibility" value="{{$visibility}}" />
@ -110,7 +110,7 @@
<h3 class="settings-heading">{{$h_not}}</h3> <h3 class="settings-heading">{{$h_not}}</h3>
<div class="settings-block"> <div class="settings-content-block">
<div id="settings-notifications"> <div id="settings-notifications">
<div id="settings-activity-desc">{{$activity_options}}</div> <div id="settings-activity-desc">{{$activity_options}}</div>
@ -142,7 +142,7 @@
<h3 class="settings-heading">{{$h_advn}}</h3> <h3 class="settings-heading">{{$h_advn}}</h3>
<div class="settings-block"> <div class="settings-content-block">
<div id="settings-pagetype-desc">{{$h_descadvn}}</div> <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
{{$pagetype}} {{$pagetype}}
@ -153,7 +153,7 @@
</div> </div>
<h3 class="settings-heading">{{$relocate}}</h3> <h3 class="settings-heading">{{$relocate}}</h3>
<div class="settings-block"> <div class="settings-content-block">
<div id="settings-pagetype-desc">{{$relocate_text}}</div> <div id="settings-pagetype-desc">{{$relocate_text}}</div>
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >

2
view/templates/settings_features.tpl
View file

@ -7,7 +7,7 @@
{{foreach $features as $f}} {{foreach $features as $f}}
<h3 class="settings-heading">{{$f.0}}</h3> <h3 class="settings-heading">{{$f.0}}</h3>
<div class="settings-block"> <div class="settings-content-block">
{{foreach $f.1 as $fcat}} {{foreach $f.1 as $fcat}}
{{include file="field_yesno.tpl" field=$fcat}} {{include file="field_yesno.tpl" field=$fcat}}

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

@ -30,7 +30,6 @@ else if ($style == "plus")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n";
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script type="text/javascript" src="$baseurl/view/theme/vier/js/jquery.divgrow-1.3.1.f1.min.js"></script>
<script> <script>
function collapseHeight(elems) { function collapseHeight(elems) {