diff options
| author | friendica <info@friendica.com> | 2014-02-02 17:54:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-02 17:54:36 -0800 |
| commit | ee1580427e9a1bc4e2b86906f7b42d3071ed516d (patch) | |
| tree | 979443bd249ed89fddcf93fcab6a6f67866be6d9 /view/tpl | |
| parent | 732a4b898afc7bc4d5b96f1b0f50f866c2068e06 (diff) | |
| download | volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.tar.gz volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.tar.bz2 volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.zip | |
don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use.
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 37 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 |
2 files changed, 24 insertions, 16 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 590213fd3..265a1a953 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -31,6 +31,22 @@ + +{{if $is_pending}} +<div class="abook-pending-contact"> +{{include file="field_checkbox.tpl" field=$unapproved}} +</div> +{{/if}} + +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} + <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> @@ -38,20 +54,16 @@ <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -{{if $noperms}} +{{* {{if $noperms}} <div id="noperm-msg" class="warning-text">{{$noperms}}</div> <div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> {{/if}} +*}} -{{if $is_pending}} -<div class="abook-pending-contact"> -{{include file="field_checkbox.tpl" field=$unapproved}} -</div> -{{/if}} <br /> -<b>{{$quick}}</b> +<h3>{{$quick}}</h3> <ul> {{if $self}} <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li> @@ -62,6 +74,9 @@ <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li> </ul> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> + + <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> <div id="abook-advanced-panel" style="display: block;"> @@ -76,14 +91,6 @@ </div> -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b1a4f956d..ab5bb02cc 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,7 +25,7 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -<div id="settings-privacy-macros">{{$lbl_pmacro}}</div> +<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> <ul> <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> @@ -34,6 +34,7 @@ </ul> +<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3> <div id="settings-permissions-wrapper"> {{foreach $permiss_arr as $permit}} |