strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'release/ui-improvements'

Browse source
This commit is contained in:
hauke 2014-09-06 17:02:25 +02:00
parent 0e9c8f6f1a 7dcf37f053
commit 5205756898
10 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/global.css
View file

@ -122,3 +122,7 @@ blockquote.shared_content {
color: #000; color: #000;
border: none; border: none;
} }
.settings-heading {
cursor: pointer;
}

2
view/templates/contacts-template.tpl
View file

@ -19,7 +19,7 @@
{{include file="contact_template.tpl"}} {{include file="contact_template.tpl"}}
{{/foreach}} {{/foreach}}
<div id="contact-edit-end"></div> <div id="contact-edit-end"></div>
<div id="contats-actions"> <div id="contacts-actions">
{{foreach $batch_actions as $n=>$l}} {{foreach $batch_actions as $n=>$l}}
<input class="batch-action" name="{{$n}}" value="{{$l}}" type="submit"> <input class="batch-action" name="{{$n}}" value="{{$l}}" type="submit">
{{/foreach}} {{/foreach}}

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

@ -20,6 +20,12 @@
}).trigger('change'); }).trigger('change');
$('.settings-block').hide();
$('.settings-heading').click(function(){
$('.settings-block').hide();
$(this).next('.settings-block').toggle();
});
}); });
</script> </script>

16
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">
{{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}}
@ -18,9 +18,10 @@
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>
</div>
<h3 class="settings-heading">{{$h_basic}}</h3> <h3 class="settings-heading">{{$h_basic}}</h3>
<div class="settings-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}}
@ -33,10 +34,11 @@
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>
</div>
<h3 class="settings-heading">{{$h_prv}}</h3> <h3 class="settings-heading">{{$h_prv}}</h3>
<div class="settings-block">
<input type="hidden" name="visibility" value="{{$visibility}}" /> <input type="hidden" name="visibility" value="{{$visibility}}" />
@ -102,10 +104,13 @@
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>
</div>
<h3 class="settings-heading">{{$h_not}}</h3> <h3 class="settings-heading">{{$h_not}}</h3>
<div class="settings-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>
@ -133,9 +138,11 @@
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>
</div>
<h3 class="settings-heading">{{$h_advn}}</h3> <h3 class="settings-heading">{{$h_advn}}</h3>
<div class="settings-block">
<div id="settings-pagetype-desc">{{$h_descadvn}}</div> <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
{{$pagetype}} {{$pagetype}}
@ -143,13 +150,16 @@
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
</div> </div>
</div>
<h3 class="settings-heading">{{$relocate}}</h3> <h3 class="settings-heading">{{$relocate}}</h3>
<div class="settings-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" >
<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" /> <input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
</div> </div>
</div>

5
view/templates/settings_features.tpl
View file

@ -7,15 +7,16 @@
{{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">
{{foreach $f.1 as $fcat}} {{foreach $f.1 as $fcat}}
{{include file="field_yesno.tpl" field=$fcat}} {{include file="field_yesno.tpl" field=$fcat}}
{{/foreach}} {{/foreach}}
{{/foreach}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
</div> </div>
</div>
{{/foreach}}
</form> </form>

2
view/theme/quattro/dark/style.css
View file

@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
.contact-photo:hover .contact-select { .contact-photo:hover .contact-select {
display: block; display: block;
} }
#contats-actions { #contacts-actions {
clear: both; clear: both;
} }
.contact-photo { .contact-photo {

2
view/theme/quattro/green/style.css
View file

@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
.contact-photo:hover .contact-select { .contact-photo:hover .contact-select {
display: block; display: block;
} }
#contats-actions { #contacts-actions {
clear: both; clear: both;
} }
.contact-photo { .contact-photo {

2
view/theme/quattro/lilac/style.css
View file

@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
.contact-photo:hover .contact-select { .contact-photo:hover .contact-select {
display: block; display: block;
} }
#contats-actions { #contacts-actions {
clear: both; clear: both;
} }
.contact-photo { .contact-photo {

2
view/theme/quattro/quattro.less
View file

@ -788,7 +788,7 @@ span[id^="showmore-wrap"] {
.contact-select { position: absolute; top:64px; left:64px; display:none; } .contact-select { position: absolute; top:64px; left:64px; display:none; }
.contact-select:checked, .contact-select:checked,
.contact-photo:hover .contact-select { display:block; } .contact-photo:hover .contact-select { display:block; }
#contats-actions { clear: both; } #contacts-actions { clear: both; }
.contact-photo { .contact-photo {
width: 48px; height: 48px; width: 48px; height: 48px;
img { width: 48px; height: 48px; } img { width: 48px; height: 48px; }

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

@ -246,6 +246,10 @@ div.pager {
float: left; float: left;
} }
#contacts-actions {
clear: both;
}
#contact-edit-drop-link-end { #contact-edit-drop-link-end {
/* clear: both; */ /* clear: both; */
} }
@ -2723,4 +2727,3 @@ a.mail-list-link {
.mail-conv-delete-icon { .mail-conv-delete-icon {
border: none; border: none;
} }