diff options
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 1 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 24 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 2 |
6 files changed, 19 insertions, 16 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 2b524096f..a1268510d 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -514,7 +514,7 @@ class Connedit extends \Zotlabs\Web\Controller { $contact_id = \App::$poi['abook_id']; $contact = \App::$poi; - $buttons = array( + $tools = array( 'view' => array( 'label' => t('View Profile'), @@ -711,7 +711,8 @@ class Connedit extends \Zotlabs\Web\Controller { '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), - '$buttons' => (($self) ? '' : $buttons), + '$tools_label' => t('Connection Tools'), + '$tools' => (($self) ? '' : $tools), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating'), '$lbl_rating_label' => t('Slide to adjust your rating'), diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 00a577847..ce350666f 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1231,6 +1231,7 @@ class Photos extends \Zotlabs\Web\Controller { $o .= replace_macros($photo_tpl, array( '$id' => $ph[0]['id'], '$album' => $album_e, + '$tools_label' => t('Photo Tools'), '$tools' => $tools, '$lock' => $lockstate[1], '$photo' => $photo, diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 30ec337f8..72edf396f 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -691,6 +691,7 @@ class Profiles extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$viewprof' => t('View this profile'), '$editvis' => t('Edit visibility'), + '$tools_label' => t('Profile Tools'), '$coverpic' => t('Change cover photo'), '$profpic' => t('Change profile photo'), '$cr_prof' => t('Create a new profile using these settings'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 4fa810cb4..74ba6072d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -3,18 +3,18 @@ {{if $notself}} <div class="dropdown pull-right"> <button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu" aria-labelledby="dLabel"> - <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li> - <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li> + <li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li> + <li><a href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a></li> <li class="divider"></li> - <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li> - <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li> - <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li> - <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li> - <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li> - <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li> + <li><a href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a></li> + <li><a href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a></li> + <li><a href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a></li> + <li><a href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a></li> + <li><a href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a></li> + <li><a href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a></li> </ul> </div> {{/if}} @@ -22,11 +22,11 @@ </div> <div class="section-content-wrapper-np"> {{if $notself}} - {{foreach $buttons as $b}} - {{if $b.info}} + {{foreach $tools as $tool}} + {{if $tool.info}} <div class="section-content-danger-wrapper"> <div> - {{$b.info}} + {{$tool.info}} </div> </div> {{/if}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 254733622..ca2b5e090 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -5,7 +5,7 @@ {{if $tools || $map || $edit}} <div class="btn-group"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu"> {{if $tools}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a02323e45..4908646b9 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="dropdown pull-right" id="profile-edit-links"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu"> <li class="nav-item"> |