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

move link to /locs to settings menu if we have more than one location and some template work on locs

Browse Source
This commit is contained in:
Mario Vavti 2016-03-26 18:43:38 +01:00
parent 0a14ac1f60
commit a507063174
8 changed files with 100 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/widgets.php
View File

@ -501,6 +501,12 @@ function widget_settings_menu($arr) {
if($abk)
$abook_self_id = $abk[0]['abook_id'];
$hublocs = q("select count(*) as total from hubloc where hubloc_hash = '%s'",
dbesc($channel['channel_hash'])
);
$hublocs = (($hublocs[0]['total'] > 1) ? true : false);
$tabs = array(
array(
'label' => t('Account settings'),
@ -536,11 +542,13 @@ function widget_settings_menu($arr) {
'selected' => ((argv(1) === 'display') ? 'active' : ''),
);
$tabs[] = array(
'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
);
if($hublocs) {
$tabs[] = array(
'label' => t('Manage locations'),
'url' => $a->get_baseurl(true) . '/locs',
'selected' => ((argv(1) === 'locs') ? 'active' : ''),
);
}
// IF can go away when UNO export and import is fully functional
if(! UNO) {

9
mod/locs.php
View File

@ -110,11 +110,12 @@ function locs_content(&$a) {
$o = replace_macros(get_markup_template('locmanage.tpl'), array(
'$header' => t('Manage Channel Locations'),
'$loc' => t('Location (address)'),
'$mkprm' => t('Primary Location'),
'$drop' => t('Drop location'),
'$loc' => t('Location'),
'$addr' => t('Address'),
'$mkprm' => t('Primary'),
'$drop' => t('Drop'),
'$submit' => t('Submit'),
'$sync' => t('Sync now'),
'$sync' => t('Sync Now'),
'$sync_text' => t('Please wait several minutes between consecutive operations.'),
'$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
'$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),

4
mod/manage.php
View File

@ -167,9 +167,7 @@ function manage_content(&$a) {
'$intros_format' => t('%d new introductions'),
'$channel_usage_message' => $channel_usage_message,
'$delegated_desc' => t('Delegated Channel'),
'$delegates' => $delegates,
'$locs' => t('Manage locations')
'$delegates' => $delegates
));
return $o;

33
view/css/mod_locs.css
View File

@ -1,3 +1,32 @@
td {
padding: 10px;
#locs-index {
width: 100%;
}
#locs-index th:nth-child(1),
#locs-index td:nth-child(1){
padding: 7px 3px 7px 10px;
}
#locs-index th:nth-child(3),
#locs-index td:nth-child(3){
padding: 7px 3px;
}
#locs-index th:nth-child(4),
#locs-index td:nth-child(4){
padding: 7px 10px 7px 7px;
}
.primehub,
.drophub {
font-size: 1.2em;
}
.primehub:hover {
cursor: pointer;
}
.drophub:hover {
cursor: pointer;
color: red;
}

4
view/pdl/mod_locs.pdl Normal file
View File

@ -0,0 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]

4
view/pdl/mod_uexport.pdl Normal file
View File

@ -0,0 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]

4
view/tpl/channel.tpl
View File

@ -44,10 +44,6 @@
<i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
</div>
<div class="channel-link">
<i class="icon-map-marker"></i>
<a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a>
</div>
{{/if}}
</div>
</div>

77
view/tpl/locmanage.tpl
View File

@ -1,38 +1,41 @@
<div class="generic-content-wrapper-styled">
<h2>{{$header}}</h2>
<script>
function primehub(id) {
$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
}
function drophub(id) {
$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
}
</script>
<div class="descriptive-text">{{$sync_text}}</div>
<br />
<div class="descriptive-text">{{$drop_text}}</div>
<div class="descriptive-text">{{$last_resort}}</div>
<br />
<table>
<tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr>
{{foreach $hubs as $hub}}
{{if ! $hub.deleted }}
<tr><td>
{{$hub.hubloc_url}} ({{$hub.hubloc_addr}})</td>
<td>
{{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}}
</td>
<td><button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button></td>
</tr>
{{/if}}
{{/foreach}}
</table>
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<script>
function primehub(id) {
$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
}
function drophub(id) {
$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
}
</script>
<button class="btn btn-success btn-xs pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="icon-refresh"></i>&nbsp;{{$sync}}</button>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper-np">
<div class="section-content-warning-wrapper">
{{$sync_text}}
</div>
<div class="section-content-info-wrapper">
{{$drop_text}}<br>
{{$last_resort}}
</div>
<table id="locs-index">
<tr>
<th>{{$loc}}</th>
<th>{{$addr}}</th>
<th>{{$mkprm}}</th>
<th>{{$drop}}</th>
</tr>
{{foreach $hubs as $hub}}
{{if ! $hub.deleted }}
<tr>
<td>{{$hub.hubloc_url}}</td>
<td>{{$hub.hubloc_addr}}</td>
<td>{{if $hub.primary}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
<td><i class="icon-trash drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
</tr>
{{/if}}
{{/foreach}}
</table>
</div>
</div>
<div class="clear"></div>
<button class="btn btn-std" onclick="window.location.href='/locs/f=&sync=1'; return false;">{{$sync}}</button>