harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
zotlabs 2017-01-09 14:38:49 -08:00
commit 47bc573de5
4 changed files with 5513 additions and 5399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Zotlabs/Module/Connedit.php
View File

@ -645,6 +645,15 @@ class Connedit extends \Zotlabs\Web\Controller {
), ),
); );
$sections = [];
$sections['perms'] = [
'label' => t('Permissions'),
'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=perms',
'sel' => '',
'title' => t('Open Individual Permissions section by default'),
];
$self = false; $self = false;
@ -664,6 +673,13 @@ class Connedit extends \Zotlabs\Web\Controller {
$tpl = get_markup_template("abook_edit.tpl"); $tpl = get_markup_template("abook_edit.tpl");
if(feature_enabled(local_channel(),'affinity')) { if(feature_enabled(local_channel(),'affinity')) {
$sections['affinity'] = [
'label' => t('Affinity'),
'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=affinity',
'sel' => '',
'title' => t('Open Set Affinity section by default'),
];
$labels = [ $labels = [
t('Me'), t('Me'),
@ -693,6 +709,15 @@ class Connedit extends \Zotlabs\Web\Controller {
'$labels' => $label_str, '$labels' => $label_str,
)); ));
} }
if(feature_enabled(local_channel(),'connfilter')) {
$sections['filter'] = [
'label' => t('Filter'),
'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=filter',
'sel' => '',
'title' => t('Open Custom Filter section by default'),
];
}
$rating_val = 0; $rating_val = 0;
$rating_text = ''; $rating_text = '';
@ -794,6 +819,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
'$addr' => $contact['xchan_addr'], '$addr' => $contact['xchan_addr'],
'$section' => $section, '$section' => $section,
'$sections' => $sections,
'$vcard' => $vcard, '$vcard' => $vcard,
'$addr_text' => t('This connection\'s primary address is'), '$addr_text' => t('This connection\'s primary address is'),
'$loc_text' => t('Available locations:'), '$loc_text' => t('Available locations:'),

9223
view/es-es/hmessages.po
View File

File diff suppressed because it is too large Load Diff

1643
view/es-es/hstrings.php
View File

File diff suppressed because it is too large Load Diff

20
view/tpl/abook_edit.tpl
View File

@ -20,12 +20,14 @@
</div> </div>
{{if $abook_prev || $abook_next}} {{if $abook_prev || $abook_next}}
<div class="btn-group"> <div class="btn-group">
{{if $abook_prev}} <a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-backward"></i></a> <button class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
{{/if}} <a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
{{if $abook_next}} <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-forward"></i></a> {{foreach $sections as $s}}
{{/if}} <li><a href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a></li>
{{/foreach}}
</ul>
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -387,7 +389,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending || $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> <div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $slide}} {{if $slide}}
<div class="form-group"><strong>{{$lbl_slider}}</strong></div> <div class="form-group"><strong>{{$lbl_slider}}</strong></div>
@ -418,7 +420,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="fitert-tool-collapse" class="panel-collapse collapse{{if ( !$is_pending && !($slide || $multiprofs)) || $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> <div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$incl}}
{{include file="field_textarea.tpl" field=$excl}} {{include file="field_textarea.tpl" field=$excl}}
@ -442,7 +444,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="rating-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs) && !$connfilter}} in{{/if}}" role="tabpanel" aria-labelledby="rating-tool"> <div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
<div class="section-content-warning-wrapper"> <div class="section-content-warning-wrapper">
{{$rating_info}} {{$rating_info}}