From e2b79c34bc0c1dc5f48295c1cca7261e8cb648fb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 14 Jan 2016 13:50:47 +0100 Subject: some work on connections --- include/widgets.php | 2 +- mod/connections.php | 33 ++++++--- view/css/mod_connections.css | 154 ++------------------------------------- view/tpl/connection_template.tpl | 21 ++++-- view/tpl/connections.tpl | 59 +++++++++------ 5 files changed, 79 insertions(+), 190 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index 444ce55d6..033ba44fe 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -171,7 +171,7 @@ function widget_follow($args) { return replace_macros(get_markup_template('follow.tpl'),array( '$connect' => t('Add New Connection'), '$desc' => t('Enter channel address'), - '$hint' => t('Examples: bob@example.com, https://example.com/channel/barbara'), + '$hint' => t('Examples: bob@example.com, https://example.com/barbara'), '$follow' => t('Connect'), '$abook_usage_message' => $abook_usage_message )); diff --git a/mod/connections.php b/mod/connections.php index 2060ca85e..915d14b77 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -121,53 +121,60 @@ function connections_content(&$a) { $search = ((x($_REQUEST,'search')) ? notags(trim($_REQUEST['search'])) : ''); $tabs = array( + /* array( 'label' => t('Suggestions'), 'url' => z_root() . '/suggest', 'sel' => '', 'title' => t('Suggest new connections'), ), - array( + */ + + 'pending' => array( 'label' => t('New Connections'), 'url' => z_root() . '/connections/pending', 'sel' => ($pending) ? 'active' : '', 'title' => t('Show pending (new) connections'), ), - array( + + 'all' => array( 'label' => t('All Connections'), 'url' => z_root() . '/connections/all', 'sel' => ($all) ? 'active' : '', 'title' => t('Show all connections'), ), + + /* array( 'label' => t('Unblocked'), 'url' => z_root() . '/connections', 'sel' => (($unblocked) && (! $search) && (! $nets)) ? 'active' : '', 'title' => t('Only show unblocked connections'), ), + */ - array( + 'blocked' => array( 'label' => t('Blocked'), 'url' => z_root() . '/connections/blocked', 'sel' => ($blocked) ? 'active' : '', 'title' => t('Only show blocked connections'), ), - array( + 'ignored' => array( 'label' => t('Ignored'), 'url' => z_root() . '/connections/ignored', 'sel' => ($ignored) ? 'active' : '', 'title' => t('Only show ignored connections'), ), - array( + 'archived' => array( 'label' => t('Archived'), 'url' => z_root() . '/connections/archived', 'sel' => ($archived) ? 'active' : '', 'title' => t('Only show archived connections'), ), - array( + 'hidden' => array( 'label' => t('Hidden'), 'url' => z_root() . '/connections/hidden', 'sel' => ($hidden) ? 'active' : '', @@ -184,8 +191,8 @@ function connections_content(&$a) { ); - $tab_tpl = get_markup_template('common_tabs.tpl'); - $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); + //$tab_tpl = get_markup_template('common_tabs.tpl'); + //$t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); $searching = false; if($search) { @@ -224,6 +231,7 @@ function connections_content(&$a) { $contacts[] = array( 'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']), 'edit_hover' => t('Edit connection'), + 'delete_hover' => t('Delete connection'), 'id' => $rr['abook_id'], 'alt_text' => $alt_text, 'dir_icon' => $dir_icon, @@ -232,7 +240,9 @@ function connections_content(&$a) { 'username' => $rr['xchan_name'], 'classes' => (intval($rr['abook_archived']) ? 'archived' : ''), 'link' => z_root() . '/connedit/' . $rr['abook_id'], + 'deletelink' => z_root() . '/connedit/' . $rr['abook_id'] . '/drop', 'edit' => t('Edit'), + 'delete' => t('Delete'), 'url' => chanlink_url($rr['xchan_url']), 'network' => network_to_name($rr['network']), ); @@ -257,12 +267,13 @@ function connections_content(&$a) { else { $o .= ""; $o .= replace_macros(get_markup_template('connections.tpl'),array( - '$header' => t('Connections') . (($head) ? ' - ' . $head : ''), - '$tabs' => $t, + '$header' => t('Connections') . (($head) ? ': ' . $head : ''), + '$tabs' => $tabs, '$total' => $total, '$search' => $search_hdr, + '$label' => t('Search'), '$desc' => t('Search your connections'), - '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""), + '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""), '$submit' => t('Find'), '$edit' => t('Edit'), '$cmd' => $a->cmd, diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index d5c9b3d4f..d8a50d540 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -1,151 +1,13 @@ -.search-input { - padding: 4px 12px; - margin: 3px; +#contacts-search-form { + display: none; } -.field_abook_help { - color: #000; -} -.abook-them { - margin-left: 375px; - margin-bottom: 15px; -} -.abook-me { - margin-left: 36px; - margin-bottom: 15px; -} -.acheckbox { - margin-bottom: 5px !important; -} - -.abook-pending-contact { - background: orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; -} - -#contact-slider { - width: 600px !important; -} - -.abook-edit-them, .abook-edit-me { - float: left; - width: 100px !important; -} -.field_abook_help { - float: left; -} - -#contacts-main { - margin-top: 20px; - margin-bottom: 20px; -} - - - -#contact-edit-wrapper { - margin-top: 10px; -} - -#contact-edit-banner-name { - font-size: 1.4em; - font-weight: bold; -} - -#contact-edit-poll-wrapper { - margin-top: 15px; -} - -#contact-edit-poll-text { - margin-top: 15px; - margin-bottom: 5px; -} - -#contact-edit-update-now { - margin-top: 15px; -} - -#contact-edit-links{ - clear: both; -} - -#contact-edit-links ul { - list-style: none; - list-style-type: none; - margin-left: 0px; - padding-left: 0px; -} - -#contact-edit-links li { - margin-top: 5px; -} - -#contact-edit-drop-link { - float: right; - margin-right: 20px; -} - -#contact-edit-nav-end { - clear: both; -} - -#contact-edit-wrapper { - width: 100%; -} - -#contact-edit-end { - clear: both; - margin-top: 15px; -} - -#contact-profile-selector { - width: 175px; - margin-left: 175px; -} - -.contact-edit-submit { - margin-top: 20px; -} - -.contact-entry-wrapper { - float: left; - width: auto; - height: auto; - padding: 10px; - margin: 8px 10px 0 0; - border-top: 1px solid #eee; - border-left: 2px solid #eee; -} - -#contacts-search { - font-size: 1em; - width: 300px; -} - -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-photo-end { - clear: both; -} - -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - margin-bottom: 10px; - width: 147px; - height: auto; - overflow: hidden; - white-space: nowrap; -} - -.contact-entry-name-end { - clear:both; +.section-subtitle-wrapper .btn-xs { + margin-top: -2px; } -.contact-entry-end { - clear: both; +.contact-search { + height: 22px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; } diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 35e97f3e9..aca6aa991 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,10 +1,15 @@ -
-
- {{$contact.name}} +
+
+
+ {{$contact.delete}} + {{$contact.edit}} +
+

{{$contact.name}}

+
+
+
+ {{$contact.name}} +
-
-
{{$contact.name}}
 -
-
{{$contact.edit}}
-
+ diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 8e5266978..fdd269602 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,27 +1,38 @@ -
- -

{{$header}}{{if $total}} ({{$total}}){{/if}}

- -{{if $finding}}

{{$finding}}

{{/if}} - -
-
-{{$desc}} - - -
-
-
- -{{$tabs}} - -
-{{foreach $contacts as $contact}} - {{include file="connection_template.tpl"}} -{{/foreach}} -
-
-
+
+
+
+ + + +
+ {{if $finding}}

{{$finding}}

{{else}}

{{$header}}{{if $total}} ({{$total}}){{/if}}

{{/if}} +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ {{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} + {{/foreach}} +
+
-- cgit v1.2.3