Merge pull request #1985 from annando/1510-vier-optimize-touch

Vier: The usability with a touch device is improved

diff --git a/boot.php b/boot.php
index 20c243c2406bdbf19646e7a11cc71ed7c1ae8fc1..c9c0d4404e6f66cc308b28d533903d91c4fe33d2 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -163,7 +163,8 @@ define ( 'NETWORK_TWITTER',          'twit');    // Twitter
 define ( 'NETWORK_DIASPORA2',        'dspc');    // Diaspora connector
 define ( 'NETWORK_STATUSNET',        'stac');    // Statusnet connector
 define ( 'NETWORK_APPNET',           'apdn');    // app.net
-
+define ( 'NETWORK_NEWS',             'nntp');    // Network News Transfer Protocol
+define ( 'NETWORK_ICALENDAR',        'ical');    // iCalendar
 define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
 
 /**
@@ -189,7 +190,9 @@ $netgroup_ids = array(
        NETWORK_TWITTER  => (-14),
        NETWORK_DIASPORA2 => (-15),
        NETWORK_STATUSNET => (-16),
-       NETWORK_APPNET => (-17),
+       NETWORK_APPNET    => (-17),
+       NETWORK_NEWS      => (-18),
+       NETWORK_ICALENDAR => (-19),
 
        NETWORK_PHANTOM  => (-127),
 );

diff --git a/mod/contacts.php b/mod/contacts.php
index 0ecc5a76dbbefe0f04a6f68bcf36447565498f6c..934472b39ff9c4172db531056b1d8ce551efdbef 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -27,6 +27,9 @@ function contacts_init(&$a) {
        require_once('include/group.php');
        require_once('include/contact_widgets.php');
 
+       if ($_GET['nets'] == "all")
+       $_GET['nets'] = "";
+
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
@@ -35,29 +38,30 @@ function contacts_init(&$a) {
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
                                '$name' => htmlentities($a->data['contact']['name']),
                                '$photo' => $a->data['contact']['photo'],
-                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
+                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
                        ));
+                       $finpeople_widget = '';
                        $follow_widget = '';
+                       $networks_widget = '';
        }
        else {
                $vcard_widget = '';
+               $networks_widget .= networks_widget('contacts',$_GET['nets']);
                if (isset($_GET['add']))
                        $follow_widget = follow_widget($_GET['add']);
                else
                        $follow_widget = follow_widget();
-       }
 
-       if ($_GET['nets'] == "all")
-               $_GET['nets'] = "";
+               $findpeople_widget .= findpeople_widget();
+       }
 
        $groups_widget .= group_side('contacts','group',false,0,$contact_id);
-       $findpeople_widget .= findpeople_widget();
-       $networks_widget .= networks_widget('contacts',$_GET['nets']);
+       
        $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
                '$vcard_widget' => $vcard_widget,
+               '$findpeople_widget' => $findpeople_widget,
                '$follow_widget' => $follow_widget,
                '$groups_widget' => $groups_widget,
-               '$findpeople_widget' => $findpeople_widget,
                '$networks_widget' => $networks_widget
        ));
 
@@ -810,6 +814,7 @@ function contacts_content(&$a) {
                '$cmd' => $a->cmd,
                '$contacts' => $contacts,
                '$contact_drop_confirm' => t('Do you really want to delete this contact?'),
+               'multiselect' => 1,
                '$batch_actions' => array(
                        'contacts_batch_update' => t('Update'),
                        'contacts_batch_block' => t('Block')."/".t("Unblock"),

diff --git a/mod/directory.php b/mod/directory.php
index 6fd99256f0a80c06586c0f80b583ed150494526a..ef80b082a42bb989dc73365cc10a48478a1926ec 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -8,6 +8,8 @@ function directory_init(&$a) {
 
                $a->page['aside'] .= findpeople_widget();
 
+               $a->page['aside'] .= follow_widget();
+
        }
        else {
                unset($_SESSION['theme']);
@@ -31,7 +33,7 @@ function directory_content(&$a) {
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || 
-                (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
+               (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
@@ -44,27 +46,12 @@ function directory_content(&$a) {
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       $tpl = get_markup_template('directory_header.tpl');
-
-       $globaldir = '';
-       $gdirpath = get_config('system','directory');
-       if(strlen($gdirpath)) {
-               $globaldir = '<ul><li><div id="global-directory-link"><a href="'
-               . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
+       $gdirpath = '';
+       $dirurl = get_config('system','directory');
+       if(strlen($dirurl)) {
+               $gdirpath = zrl($dirurl,true);
        }
 
-       $admin = '';
-
-       $o .= replace_macros($tpl, array(
-               '$search' => $search,
-               '$globaldir' => $globaldir,
-               '$desc' => t('Find on this site'),
-               '$admin' => $admin,
-               '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-               '$sitedir' => t('Site Directory'),
-               '$submit' => t('Find')
-       ));
-
        if($search) {
                $search = dbesc($search);
 
@@ -159,8 +146,6 @@ function directory_content(&$a) {
 
                        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-                       $tpl = get_markup_template('directory_item.tpl');
-
                        if($a->theme['template_engine'] === 'internal') {
                                $location_e = template_escape($location);
                        }
@@ -168,23 +153,23 @@ function directory_content(&$a) {
                                $location_e = $location;
                        }
 
-                       $entry = replace_macros($tpl,array(
-                               '$id' => $rr['id'],
-                               '$profile_link' => $profile_link,
-                               '$photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
-                               '$alt_text' => $rr['name'],
-                               '$name' => $rr['name'],
-                               '$details' => $pdesc . $details,
-                               '$page_type' => $page_type,
-                               '$profile' => $profile,
-                               '$location' => $location_e,
-                               '$gender'   => $gender,
-                               '$pdesc'        => $pdesc,
-                               '$marital'  => $marital,
-                               '$homepage' => $homepage,
-                               '$about' => $about,
-
-                       ));
+                       $entry = array(
+                               'id' => $rr['id'],
+                               'url' => $profile_link,
+                               'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+                               'img_hover' => $rr['name'],
+                               'name' => $rr['name'],
+                               'details' => $pdesc . $details,
+                               'page_type' => $page_type,
+                               'profile' => $profile,
+                               'location' => $location_e,
+                               'gender'   => $gender,
+                               'pdesc' => $pdesc,
+                               'marital'  => $marital,
+                               'homepage' => $homepage,
+                               'about' => $about,
+
+                       );
 
                        $arr = array('contact' => $rr, 'entry' => $entry);
 
@@ -193,12 +178,27 @@ function directory_content(&$a) {
                        unset($profile);
                        unset($location);
 
-                       $o .= $entry;
+                       if(! $arr['entry'])
+                               continue;
+
+                       $entries[] = $arr['entry'];
 
                }
 
-               $o .= "<div class=\"directory-end\" ></div>\r\n";
-               $o .= paginate($a);
+               $tpl = get_markup_template('directory_header.tpl');
+
+               $o .= replace_macros($tpl, array(
+                       '$search' => $search,
+                       '$globaldir' => t('Global Directory'),
+                       '$gdirpath' => $gdirpath,
+                       '$desc' => t('Find on this site'),
+                       '$contacts' => $entries,
+                       '$finding' => t('Finding:'),
+                       '$findterm' => (strlen($search) ? $search : ""),
+                       '$title' => t('Site Directory'),
+                       '$submit' => t('Find'),
+                       '$paginate' => paginate($a),
+               ));
 
        }
        else

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 95f9bf53a8890052a264ae701d911dca765cee57..492f39d5a60a7d9e832ac498c03f4d8e88a7ec43 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -2,6 +2,7 @@
 require_once('include/contact_widgets.php');
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
+require_once('include/contact_selectors.php');
 
 function dirfind_init(&$a) {
 
@@ -13,9 +14,9 @@ function dirfind_init(&$a) {
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
 
-       $a->page['aside'] .= follow_widget();
-
        $a->page['aside'] .= findpeople_widget();
+
+       $a->page['aside'] .= follow_widget();
 }
 
 
@@ -38,10 +39,6 @@ function dirfind_content(&$a, $prefix = "") {
 
        $o = '';
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => sprintf( t('People Search - %s'), $search)
-       ));
-
        if($search) {
 
                if ($local) {
@@ -61,7 +58,7 @@ function dirfind_content(&$a, $prefix = "") {
                                        dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
                                        dbesc(escape_tags($search)), dbesc(escape_tags($search)));
 
-                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`keywords`
+                       $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords`
                                        FROM `gcontact`
                                        LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
                                                AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
@@ -80,7 +77,7 @@ function dirfind_content(&$a, $prefix = "") {
                        $j = new stdClass();
                        $j->total = $count[0]["total"];
                        $j->items_page = $perpage;
-                       $j->page = $a->pager['page'];
+                       $j->page = $a->pager['page'];                   
                        foreach ($results AS $result) {
                                if (poco_alternate_ostatus_url($result["url"]))
                                         continue;
@@ -96,6 +93,7 @@ function dirfind_content(&$a, $prefix = "") {
                                $objresult->url = $result["url"];
                                $objresult->photo = $result["photo"];
                                $objresult->tags = $result["keywords"];
+                               $objresult->network = $result["network"];
 
                                $j->results[] = $objresult;
                        }
@@ -121,7 +119,6 @@ function dirfind_content(&$a, $prefix = "") {
 
                        $id = 0;
 
-                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
 
                                // If We already know this contact then don't show the "connect" button
@@ -143,17 +140,29 @@ function dirfind_content(&$a, $prefix = "") {
 
                                $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-                               $o .= replace_macros($tpl,array(
-                                       '$url' => zrl($jj->url),
-                                       '$name' => htmlentities($jj->name),
-                                       '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-                                       '$tags' => $jj->tags,
-                                       '$conntxt' => $conntxt,
-                                       '$connlnk' => $connlnk,
-                                       '$photo_menu' => $photo_menu,
-                                       '$id' => ++$id,
-                               ));
+                               $entry = array(
+                                       'url' => zrl($jj->url),
+                                       'itemurl' => $jj->url,
+                                       'name' => htmlentities($jj->name),
+                                       'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                       'img_hover' => $jj->tags,
+                                       'conntxt' => $conntxt,
+                                       'connlnk' => $connlnk,
+                                       'photo_menu' => $photo_menu,
+                                       'network' => network_to_name($jj->network, $jj->url),
+                                       'id' => ++$id,
+                               );
+                               $entries[] = $entry;
                        }
+
+               $tpl = get_markup_template('viewcontact_template.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       'title' => sprintf( t('People Search - %s'), $search),
+                       '$contacts' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
                }
                else {
                        info( t('No matches') . EOL);
@@ -161,7 +170,5 @@ function dirfind_content(&$a, $prefix = "") {
 
        }
 
-       $o .= '<div class="clear"></div>';
-       $o .= paginate($a);
        return $o;
 }

diff --git a/mod/manage.php b/mod/manage.php
index 5513ebe08d70b1c48475bb4d643833d1f9d085bf..bfa4d1475c891f3de026fd48d8fa8e14c0acc4d5 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -98,8 +98,16 @@ function manage_content(&$a) {
        }
 
        $identities = $a->identities;
-       foreach($identities as $key=>$id) {
-               $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : '');
+
+       //getting additinal information for each identity
+       foreach ($identities as $key=>$id) {
+               $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = '%s' AND `self` = 1",
+                       dbesc($id['uid'])
+               );
+
+               $identities[$key][thumb] = $thumb[0][thumb];
+
+               $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
        }
 
        $o = replace_macros(get_markup_template('manage.tpl'), array(

diff --git a/mod/match.php b/mod/match.php
index f31b0f67a44fd82cc2a1140a2581ce443a16aae7..bbf1a6c6342fe42bf9e99b8df877146d382b292f 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -4,21 +4,26 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 require_once('mod/proxy.php');
 
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @param App &$a
+ * @return void|string
+ */
 function match_content(&$a) {
 
        $o = '';
        if(! local_user())
                return;
 
-       $a->page['aside'] .= follow_widget();
        $a->page['aside'] .= findpeople_widget();
+       $a->page['aside'] .= follow_widget();
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Profile Match')
-       ));
-
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
@@ -27,7 +32,6 @@ function match_content(&$a) {
        if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
                notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
-
        }
 
        $params = array();
@@ -52,35 +56,50 @@ function match_content(&$a) {
 
                if(count($j->results)) {
 
+                       $id = 0;
 
-
-                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
                                $match_nurl = normalise_link($jj->url);
                                $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
                                        intval(local_user()),
                                        dbesc($match_nurl));
+
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-                                       $o .= replace_macros($tpl,array(
-                                               '$url' => zrl($jj->url),
-                                               '$name' => $jj->name,
-                                               '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-                                               '$inttxt' => ' ' . t('is interested in:'),
-                                               '$conntxt' => t('Connect'),
-                                               '$connlnk' => $connlnk,
-                                               '$tags' => $jj->tags
-                                       ));
+                                       $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+                                       $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+
+                                       $entry = array(
+                                               'url' => zrl($jj->url),
+                                               'itemurl' => $jj->url,
+                                               'name' => $jj->name,
+                                               'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                               'inttxt' => ' ' . t('is interested in:'),
+                                               'conntxt' => t('Connect'),
+                                               'connlnk' => $connlnk,
+                                               'img_hover' => $jj->tags,
+                                               'photo_menu' => $photo_menu,
+                                               'id' => ++$id,
+                                       );
+                                       $entries[] = $entry;
                                }
                        }
-               } else {
+
+               $tpl = get_markup_template('viewcontact_template.tpl');
+
+               $o .= replace_macros($tpl,array(
+                       '$title' => t('Profile Match'),
+                       '$contacts' => $entries,
+                       '$paginate' => paginate($a),
+               ));
+
+               }
+               else {
                        info( t('No matches') . EOL);
                }
 
        }
 
-       $o .= cleardiv();
-       $o .= paginate($a);
        return $o;
 }

diff --git a/mod/suggest.php b/mod/suggest.php
index 8bf31ca8e591bf449d489064ad5ec84fa33c0d28..8870c65df8708152eab3681879ad441c8bec2245 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -61,13 +61,8 @@ function suggest_content(&$a) {
 
        $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-       $a->page['aside'] .= follow_widget();
        $a->page['aside'] .= findpeople_widget();
-
-
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Friend Suggestions')
-       ));
+       $a->page['aside'] .= follow_widget();
 
 
        $r = suggestion_query(local_user());
@@ -77,25 +72,41 @@ function suggest_content(&$a) {
                return $o;
        }
 
-       $tpl = get_markup_template('suggest_friends.tpl');
+       require_once 'include/contact_selectors.php';
 
        foreach($r as $rr) {
 
                $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-
-               $o .= replace_macros($tpl,array(
-                       '$url' => zrl($rr['url']),
-                       '$name' => $rr['name'],
-                       '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-                       '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
-                       '$ignid' => $rr['id'],
-                       '$conntxt' => t('Connect'),
-                       '$connlnk' => $connlnk,
-                       '$ignore' => t('Ignore/Hide')
-               ));
+               $ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+               $photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+               $photo_menu[] = array(t("Connect/Follow"), $connlnk);
+               $photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
+
+               $entry = array(
+                       'url' => zrl($rr['url']),
+                       'itemurl' => $rr['url'],
+                       'img_hover' => $rr['url'],
+                       'name' => $rr['name'],
+                       'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+                       'ignlnk' => $ignlnk,
+                       'ignid' => $rr['id'],
+                       'conntxt' => t('Connect'),
+                       'connlnk' => $connlnk,
+                       'photo_menu' => $photo_menu,
+                       'ignore' => t('Ignore/Hide'),
+                       'network' => network_to_name($rr['network'], $rr['url']),
+                       'id' => ++$id,
+               );
+               $entries[] = $entry;
        }
 
-       $o .= cleardiv();
-//     $o .= paginate($a);
+       $tpl = get_markup_template('viewcontact_template.tpl');
+
+       $o .= replace_macros($tpl,array(
+               '$title' => t('Friend Suggestions'),
+               '$contacts' => $entries,
+               
+       ));
+
        return $o;
 }

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index a6bf74b2885df20042a8de26186029a12db00917..927a597524adaa7b17565aea86e629e75b4a1128 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -48,7 +48,7 @@ function viewcontacts_content(&$a) {
                if($rr['self'])
                        continue;
 
-           $url = $rr['url'];
+               $url = $rr['url'];
 
                // route DFRN profiles through the redirect
 

diff --git a/view/global.css b/view/global.css
index 55f44ee51b9d66b5a7921c18f7df2a3d62af69b4..477f778d9a11aeffed52b9c5ca5cf62c9db2c4e9 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -213,6 +213,50 @@ a {
   border: 0;
 }
 
+.itentity-match-wrapper {
+  float: left;
+  padding: 10px;
+  width: 120px;
+  height: 140px;
+  margin-bottom: 20px;
+}
+
+.identity-match-photo {
+  float: left;
+  text-align: center;
+  width: 120px;
+}
+
+.identity-match-name {
+  text-align: center;
+}
+
+.identity-match-details {
+  float: left;
+  text-align: center;
+  width: 120px;
+  overflow: hidden;
+  font-size: 10px;
+  font-weight: 500;
+  color: #999999;
+}
+
+.identity-match-break, .identity-match-end {
+  clear: both;
+}
+
+.identity-match-photo button {
+  border: none;
+  padding: 0;
+  margin: 0;
+  background: none;
+  height: 80px;
+  width: 80px;
+}
+
+.selected-identity img {
+  border: 2px solid #ff0000;
+}
 /* poke */
 #poke-desc {
        margin: 5px 0 10px;

diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
index d4f65f70f91c77c51c3a0ece4555e528f7bee513..75f49653b0893cc1e055b8a33c66c2e09e2e405a 100644 (file)
--- a/view/templates/contact_template.tpl
+++ b/view/templates/contact_template.tpl
@@ -7,9 +7,10 @@
 
                        <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-                       {{if !$no_contacts_checkbox}}
+                       {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
                        {{/if}}
+
                        {{if $contact.photo_menu}}
                        <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
                        <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
@@ -27,8 +28,14 @@
                </div>
                        
        </div>
-       <div class="contact-entry-photo-end" ></div>
-       <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+
+       <div class="contact-entry-desc">
+               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+               {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+               {{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+               {{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+               {{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+       </div>
 
        <div class="contact-entry-end" ></div>
 </div>

diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
index 896f9af4c9f9d7f5fd7714d72556e06451a008a8..bec295924ee51952fca8fe2761367e72a8127fb8 100644 (file)
--- a/view/templates/contacts-template.tpl
+++ b/view/templates/contacts-template.tpl
@@ -1,5 +1,5 @@
 
-<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
+<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 

diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl
index 5c52f4329a3048f33deaf7c9a94a8e3cd978cd36..5b0610fcbd98f0b1a21d9c5a87fce3e13fe84b7a 100644 (file)
--- a/view/templates/contacts-widget-sidebar.tpl
+++ b/view/templates/contacts-widget-sidebar.tpl
@@ -1,7 +1,7 @@
 
 {{$vcard_widget}}
+{{$findpeople_widget}}
 {{$follow_widget}}
 {{$groups_widget}}
-{{$findpeople_widget}}
 {{$networks_widget}}
 

diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 2274f2e1f8ecd0ed71389466c2c9488dd51912c8..46f17de40e06849636fe3761d4e04ece19a8c12c 100644 (file)
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -1,17 +1,31 @@
 
-<h1>{{$sitedir}}</h1>
+{{include file="section_title.tpl"}}
 
-{{$globaldir}}
-{{$admin}}
+{{if $gdirpath}}
+       <ul>
+               <li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
+       </ul>
+{{/if}}
 
-{{$finding}}
 
 <div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">{{$desc}}</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-<input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
-</form>
+       <form id="directory-search-form" action="directory" method="get" >
+               <span class="dirsearch-desc">{{$desc}}</span>
+               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
+               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
+       </form>
 </div>
+
+{{if $findterm}}
+       <h4>{{$finding}} '{{$findterm}}'</h4>
+{{/if}}
+
 <div id="directory-search-end"></div>
 
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
+{{/foreach}}
+
+<div class="directory-end" ></div>
+
+{{$paginate}}

diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl
index b43fcd28cf8393f9549503a60f3c0af938c3d32a..4dbe8a951f5ecee53886a023f0fc80513e55929e 100644 (file)
--- a/view/templates/directory_item.tpl
+++ b/view/templates/directory_item.tpl
@@ -1,12 +1,14 @@
 
 
-<div class="directory-item lframe" id="directory-item-{{$id}}" >
-       <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
-               <div class="contact-photo" id="directory-photo-{{$id}}" >
-                       <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" /></a>
+<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
+       <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
+               <div class="contact-photo" id="directory-photo-{{$entry.id}}" >
+                       <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" >
+                               <img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alt_text}}" title="{{$entry.alt_text}}" />
+                       </a>
                </div>
        </div>
 
-       <div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
-       <div class="contact-details">{{$details}}</div>
+       <div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+       <div class="contact-details">{{$entry.details}}</div>
 </div>

diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
index 80477bc40b3aa956bf0d9d5ea68da3ff089857a0..8a7922d7be3149c357858fdbb13b236ee3ab7fd0 100644 (file)
--- a/view/templates/manage.tpl
+++ b/view/templates/manage.tpl
@@ -2,17 +2,30 @@
 <h3>{{$title}}</h3>
 <div id="identity-manage-desc">{{$desc}}</div>
 <div id="identity-manage-choose">{{$choose}}</div>
+
 <div id="identity-selector-wrapper">
        <form action="manage" method="post" >
-       <select name="identity" size="10" onchange="this.form.submit();" >
 
        {{foreach $identities as $id}}
-               <option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
-       {{/foreach}}
+               <div class="itentity-match-wrapper {{if $id.selected}}selected-identity{{/if}}" id="identity-match-{{$id.uid}}">
+                       <div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}">
+                               <button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
+                                       <img src="{{$id.thumb}}" alt="{{$id.username}}" />
+                               </button>
+                       </div>
 
-       </select>
-       <div id="identity-select-break"></div>
+                       <div class="identity-match-break"></div>
 
-       {{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
-</div></form>
+                       <div class="identity-match-desc">
+                               <div class="identity-match-name" id="identity-match-name-{{$id.uid}}">{{$id.username}}</div>
+                               <div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div>
+                       </div>
+
+                       <div class="identity-match-end"></div>
+               </div>
+       {{/foreach}}
 
+       </form>
+</div>
+       
+       
\ No newline at end of file

diff --git a/view/templates/match.tpl b/view/templates/match.tpl
deleted file mode 100644 (file)
index 3ebabf1..0000000
--- a/view/templates/match.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
-                onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')" 
-                onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
-               <a href="{{$url}}">
-                       <img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-               </a>
-               {{if $photo_menu}}
-                        <span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
-                        <div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
-                                <ul>
-                                        {{foreach $photo_menu as $k=>$c}}
-                                        {{if $c.2}}
-                                        <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{else}}
-                                        <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{/if}}
-                                        {{/foreach}}
-                                </ul>
-                        </div>
-                        {{/if}}
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-       </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-
-</div>

diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl
deleted file mode 100644 (file)
index a64c05d..0000000
--- a/view/templates/suggest_friends.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<div class="profile-match-wrapper">
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-       </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-</div>
\ No newline at end of file

diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
index ff33d65213195492b1b59763b4a60f91a6192969..455551c680acff6b2de283e32f4b42cb276ce127 100644 (file)
--- a/view/templates/viewcontact_template.tpl
+++ b/view/templates/viewcontact_template.tpl
@@ -1,5 +1,5 @@
 
-<h3>{{$title}}</h3>
+{{include file="section_title.tpl"}}
 
 {{foreach $contacts as $contact}}
        {{include file="contact_template.tpl"}}

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 16c01c6df4a3f4a00f6e5b68a1b4fd9869e12f05..62b248e8c4e1d93e24fc113f4c4a18b36798d4f3 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -876,8 +876,14 @@ input#dfrn-url {
 
 .contact-entry-wrapper {
        float: left;
-       width: 120px;
-       height: 120px;
+       min-width: 363px;
+       height: 90px;
+       padding-right: 10px;
+       margin: 0 10px 10px 0px;
+}
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+       float: left;
+       margin-right: 10px;
 }
 #contacts-search-end {
        margin-bottom: 10px;
@@ -891,15 +897,22 @@ input#dfrn-url {
 .contact-entry-photo img {
        border: none;
 }
+.contact-entry-photo a img {
+       width: 80px;
+       height: 80px;
+}
 .contact-entry-photo-end {
        clear: both;
 }
 .contact-entry-name {
-       float: left;
-       margin-left: 0px;
-       margin-right: 10px;
-       width: 120px;
+       font-weight: bold;
+}
+.contact-entry-details {
+       font-size: 13px;
+       color: #999999;
+       white-space: nowrap;
        overflow: hidden;
+       text-overflow: ellipsis;
 }
 .contact-entry-edit-links {
        margin-top: 6px;

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 5f78cfc4b70a25ee38cb6e2e287f4c488e841b30..f1901d1a169049fc60e2fc6f98a0a2fa064f410c 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -1110,8 +1110,13 @@ input#dfrn-url {
        height: 120px;*/\r
        padding-left: 15px;\r
        padding-right: 15px; \r
-       width: 95px;\r
-       height: 200px;\r
+       max-width: 262px;\r
+       height: 90px;\r
+       margin: 0 10px 10px 0px;\r
+}\r
+.contact-entry-wrapper .contact-entry-photo-wrapper {\r
+       float: left;\r
+       margin-right: 10px;\r
 }\r
 #contacts-search-end {\r
        margin-bottom: 10px;\r
@@ -1124,12 +1129,16 @@ input#dfrn-url {
 \r
 .contact-entry-photo img {\r
        border: none;\r
+       width: 80px;\r
+       height: 80px;\r
 }\r
 .contact-entry-photo-end {\r
        clear: both;\r
 }\r
+.contact-entry-desc {\r
+       overflow: hidden;\r
+}\r
 .contact-entry-name {\r
-       float: left;\r
        margin-left: 0px;\r
        margin-right: 10px;\r
        padding-bottom: 5px;\r
@@ -1141,6 +1150,9 @@ input#dfrn-url {
        font-style: italic;\r
        font-size: 10px;\r
        font-weight: 500;\r
+       white-space: nowrap;\r
+       overflow: hidden;\r
+       text-overflow: ellipsis;\r
 }\r
 .contact-entry-network {\r
        font-size: 10px;\r
@@ -2135,7 +2147,7 @@ input#profile-jot-email {
        border: 1px solid #AAA;\r
        background: #FFFFFF;\r
        position: absolute;\r
-       left: -30px; top: 80px;\r
+       /*left: -30px;*/ top: 80px;\r
        display: none;\r
        z-index: 101;\r
        -moz-box-shadow: 3px 3px 5px #555;\r
@@ -3250,17 +3262,49 @@ aside input[type='text'] {
        margin: 10px;\r
 }\r
 \r
-#identity-manage-desc {\r
-       margin-top:15px;\r
-       margin-bottom: 15px;\r
+.itentity-match-wrapper {\r
+       float: left;\r
+       padding: 10px;\r
+       width: 120px;\r
+       height: 140px;\r
+       margin-bottom: 20px;\r
 }\r
 \r
-#identity-manage-choose {\r
-       margin-bottom: 15px;\r
+.identity-match-photo {\r
+       float: left;\r
+       text-align: center;\r
+       width: 120px;\r
 }\r
 \r
-#identity-submit {\r
-       margin-top: 20px;\r
+.identity-match-name {\r
+       text-align: center;\r
+}\r
+\r
+.identity-match-details {\r
+       float: left;\r
+       text-align: center;\r
+       width: 120px;\r
+       overflow: hidden;\r
+       font-size: 10px;\r
+       font-weight: 500;\r
+       color: #999999;\r
+}\r
+\r
+.identity-match-break, .identity-match-end {\r
+       clear: both;\r
+}\r
+\r
+.identity-match-photo button {\r
+       border: none;\r
+       padding: 0;\r
+       margin: 0;\r
+       background: none;\r
+       height: 80px;\r
+       width: 80px;\r
+}\r
+\r
+.selected-identity img {\r
+       border: 2px solid #ff0000;\r
 }\r
 \r
 #photo-nav {\r

diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl
index a2506fc17e83c667b34fd012c98cbef11829037a..198b24746f6173d91dce3921803112444ea082d9 100644 (file)
--- a/view/theme/frost-mobile/templates/contact_template.tpl
+++ b/view/theme/frost-mobile/templates/contact_template.tpl
@@ -28,10 +28,14 @@
                </div>
                        
        </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-       <div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+       <div class="contact-entry-desc">
+               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+               {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+               {{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+               {{if $contact.network}}<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+               {{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+       </div>
 
        <div class="contact-entry-end" ></div>
 </div>

diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl
index 94e9afbe56b090615cd484c60eeb68506d355b7f..f776222f328a060ef2295c569a15794517f54a7d 100644 (file)
--- a/view/theme/frost-mobile/templates/contacts-template.tpl
+++ b/view/theme/frost-mobile/templates/contacts-template.tpl
@@ -15,11 +15,10 @@
 {{$tabs}}
 
 
-<div id="contacts-display-wrapper">
+
 {{foreach $contacts as $contact}}
        {{include file="contact_template.tpl"}}
 {{/foreach}}
-</div>
 <div id="contact-edit-end"></div>
 
 {{$paginate}}

diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
deleted file mode 100644 (file)
index e39cca6..0000000
--- a/view/theme/frost-mobile/templates/suggest_friends.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-       </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 396f32cf97091fb05fbe5d02f2b8ad16bc152815..74b5dde0b6d94ade777feb4822229b032d0376dc 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -1074,12 +1074,14 @@ input#dfrn-url {
 
 .contact-entry-wrapper {
        float: left;
-/*     width: 120px;
-       height: 120px;*/
-       padding-left: 8px;
-       padding-right: 8px; 
-       width: 95px;
-       height: 170px;
+       width: 262px;
+       height: 90px;
+       padding-right: 10px;
+       margin: 0 10px 10px 0px;
+}
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+       float: left;
+       margin-right: 10px;
 }
 #contacts-search-end {
        margin-bottom: 10px;
@@ -1093,15 +1095,22 @@ input#dfrn-url {
 .contact-entry-photo img {
        border: none;
 }
+.contact-entry-photo a img {
+       width: 80px;
+       height: 80px;
+}
 .contact-entry-photo-end {
        clear: both;
 }
+.contact-entry-desc {
+       overflow: hidden;
+}
 .contact-entry-name {
-       float: left;
+       /*float: left;*/
        margin-left: 0px;
        margin-right: 10px;
        padding-bottom: 5px;
-       width: 120px;
+       /*width: 120px;*/
        font-weight: 600;
        overflow: hidden;
 }
@@ -1109,6 +1118,9 @@ input#dfrn-url {
        font-style: italic;
        font-size: 10px;
        font-weight: 500;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
 }
 .contact-entry-network {
        font-size: 10px;
@@ -3022,17 +3034,49 @@ aside input[type='text'] {
        margin: 10px;
 }
 
-#identity-manage-desc {
-       margin-top:15px;
-       margin-bottom: 15px;
+.itentity-match-wrapper {
+       float: left;
+       padding: 10px;
+       width: 120px;
+       height: 140px;
+       margin-bottom: 20px;
 }
 
-#identity-manage-choose {
-       margin-bottom: 15px;
+.identity-match-photo {
+       float: left;
+       text-align: center;
+       width: 120px;
 }
 
-#identity-submit {
-       margin-top: 20px;
+.identity-match-name {
+       text-align: center;
+}
+
+.identity-match-details {
+       float: left;
+       text-align: center;
+       width: 120px;
+       overflow: hidden;
+       font-size: 10px;
+       font-weight: 500;
+       color: #999999;
+}
+
+.identity-match-break, .identity-match-end {
+       clear: both;
+}
+
+.identity-match-photo button {
+       border: none;
+       padding: 0;
+       margin: 0;
+       background: none;
+       height: 80px;
+       width: 80px;
+}
+
+.selected-identity img {
+       border: 2px solid #ff0000;
 }
 
 #photo-prev-link, #photo-next-link {

diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl
index 7a29bd0455bfd4cb17dfac304098dc9e28873b07..777ed501790bec2d01b57f9edeb428ab404e3acc 100644 (file)
--- a/view/theme/frost/templates/contact_template.tpl
+++ b/view/theme/frost/templates/contact_template.tpl
@@ -10,8 +10,8 @@
 
                        {{if $contact.photo_menu}}
                        <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
+               <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                       <ul>
                                                {{foreach $contact.photo_menu as $c}}
                                                {{if $c.2}}
                                                <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
@@ -19,16 +19,20 @@
                                                <li><a href="{{$c.1}}">{{$c.0}}</a></li>
                                                {{/if}}
                                                {{/foreach}}
-                    </ul>
-                </div>
+                       </ul>
+               </div>
                        {{/if}}
                </div>
                        
        </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-       <div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+       <div class="contact-entry-desc">
+               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+               {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+               {{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+               {{if $contact.network}}<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+               {{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+       </div>
 
        <div class="contact-entry-end" ></div>
 </div>

diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
deleted file mode 100644 (file)
index e39cca6..0000000
--- a/view/theme/frost/templates/suggest_friends.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<div class="profile-match-wrapper">
-       <div class="profile-match-photo">
-               <a href="{{$url}}">
-                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
-               </a>
-       </div>
-       <div class="profile-match-break"></div>
-       <div class="profile-match-name">
-               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
-       </div>
-       <div class="profile-match-end"></div>
-       {{if $connlnk}}
-       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-       {{/if}}
-       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-</div>

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1eda67de13a7343325f7759811fa891284532251..b0489af80838a3222d666f88db12324fb9d3e5b7 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 71569971e5ac6b2ea50068e7dd6820fbc29b3285..0c7050045d0d1d254b6c6726b6daf0eecfddbc1c 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 55b81e5dafaad6e60c413cdc2cad54373d32468b..c5f655427ad9e010382f137cf4a695f5750309aa 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 3c9915576f6b671cc6e8df659bc52599072e8739..cd604b656a42bbdc4772cf16c966b378e3c214ae 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -877,6 +877,27 @@ span[id^="showmore-wrap"] {
                left: 0px;
                top: 63px;
        }
+       .drop {
+               background-image: url('../../../images/icons/22/delete.png');
+               display: block; width: 22px; height: 22px;
+               position: relative;
+               top: 10px;
+               left: -10px;
+               z-index: 99;
+       }
+       .drophide {
+               background-image: url('../../../images/icons/22/delete.png');
+               display: block; width: 22px; height: 22px;
+               opacity: 0.3;
+               position: relative;
+               top: 10px;
+               left: -10px;
+               z-index: 99;
+       }
+       .contact-entry-connect {
+               padding-top: 5px;
+               font-weight: bold;
+       }
 }
 .directory-item {
        float: left;

diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
index 0f0207b2bf602aecc3a6a6fc8c24e4fc0310579c..7060505e9fcce4edbbecaa30c0878f13c6f9d634 100644 (file)
--- a/view/theme/quattro/templates/contact_template.tpl
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -1,5 +1,6 @@
 
 <div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
+       {{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
        <div class="contact-photo-wrapper" >
                <div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
                onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
@@ -7,7 +8,7 @@
 
                        <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-                       {{if !$no_contacts_checkbox}}
+                       {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
                        {{/if}}
                        {{if $contact.photo_menu}}
@@ -27,8 +28,13 @@
        </div>
        <div class="contact-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
        {{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-       <div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
-       <div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+       {{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+       {{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+       {{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+
+       {{if $contact.connlnk}}
+       <div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
+       {{/if}}
 
 
 </div>

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index bcb47367f943b2f9fbe6a0fc4f27541ad62f3eb2..2553c57a9ea622c71d3c60ac9a3beb8ab45c3cc7 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -115,6 +115,10 @@ input[type=submit]:active {
 #search-save {
 }
 
+#directory-search-end {
+       clear: both;
+}
+
 .dirsearch-desc {
 }
 
@@ -2760,11 +2764,10 @@ margin-left: 0px;
 .view-contact-wrapper,
 .contact-entry-wrapper {
        float: left;
-       margin-right: 30px;
-       margin-bottom: 20px;
-       width: 88px;
+       padding-right: 10px;
+       width: 345px;
        height: 120px;
-       position: relative;
+       margin: 0 10px 10px 0px;
 }
 
 #view-contact-end {
@@ -2775,6 +2778,10 @@ margin-left: 0px;
        margin-top: 15px;
 }
 
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+       float: left;
+       margin-right: 10px;
+}
 .contact-entry-direction-wrapper {
        position: absolute;
        top: 20px;
@@ -2791,17 +2798,27 @@ margin-left: 0px;
        font-weight: bold;
 }
 
-.contact-entry-name {
-       width: 100px;
+.contact-entry-desc {
+       overflow: hidden;
+}
+
+.contact-entry-name, .contact-entry-connect {
        overflow: hidden;
        font: #999;
        font-size: 12px;
-       text-align: center;
        font-weight: bold;
        margin-top: 5px;
 }
 
-.contact-entry-photo {
+.contact-entry-details {
+       font-size: 13px;
+       color: #999999;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
+}
+
+.contact-entry-photo-wrapper {
        position: relative;
        /*border: 1px solid #7C7D7B;
        border-radius: 3px;
@@ -2812,6 +2829,15 @@ margin-left: 0px;
                -webkit-box-shadow: 0 0 8px #BDBDBD;*/
 }
 
+.contact-entry-photo {
+       width: 80px;
+}
+
+.contact-entry-photo a img {
+       width: 80px;
+       height: 80px;
+}
+
 .contact-entry-edit-links .icon {      
        border: 1px solid #babdb6;
        border-radius: 3px;

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index eed93b7ed9723137cc63165962f8d5ce72765a2e..a041eb3f1a3720f7f0b8f233f54331c47a9805d9 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -351,7 +351,7 @@ code {
   margin: 0px;
   padding: 1em;
   list-style: none;
-  border: 3px solid #364e59;
+  /*border: 3px solid #364e59;*/
   z-index: 100000;
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
@@ -2269,18 +2269,50 @@ aside #id_password {
   float: left;
 }
 /* contacts */
-.contact-entry-wrapper {
+/*.contact-entry-wrapper {
   width: 120px;
   height: 130px;
   float: left;
-/*  overflow: hidden; */
+  overflow: hidden; 
   margin-left: 5px;
+}*/
+
+.contact-entry-wrapper {
+  float: left;
+  width: 363px;
+  height: 90px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+  float: left;
+  margin-right: 10px;
+}
+.contact-entry-photo-wrapper {
+  position: relative;
+}
+.contact-entry-desc {
+  overflow: hidden;
+}
+.contact-entry-name {
+  font-weight: bold;
+}
+.contact-entry-details {
+  font-size: 13px;
+  color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 /* photo */
 .lframe {
   float: left;
   margin: 0px 10px 10px 0px;
 }
+.contact-entry-photo a img {
+  width: 80px;
+  height: 80px;
+}
 /* profile match wrapper */
 .profile-match-wrapper {
   float: left;
@@ -2318,14 +2350,15 @@ aside #id_password {
 }
 .contact-photo-menu {
         width: 11em;
-        border: 3px solid #364e59;
+        /*border: 3px solid #364e59;*/
        color: #2d2d2d;
         background: #FFFFFF;
-/*        position: absolute;*/
-        position: relative;
-        left: 0px; top: 0px;
+        position: absolute;
+        /*position: relative;*/
+        left: 0px; /*top: 0px;*/
         display: none;
         z-index: 10000;
+       box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
 .contact-photo-menu li a {

diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl
index 5271112d834480daf37988abf550aed490ed10c6..add2eff5c19f5e2a32cea5937323aee42e22a926 100644 (file)
--- a/view/theme/vier/templates/contact_template.tpl
+++ b/view/theme/vier/templates/contact_template.tpl
@@ -7,18 +7,18 @@
 
                        <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-                       {{if !$no_contacts_checkbox}}
+                       {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
                        {{/if}}
                        {{if $contact.photo_menu}}
                        <!-- <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span> -->
                        <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                               <ul>
+                               <ul role="menu" aria-haspopup="true">
                                        {{foreach $contact.photo_menu as $k=>$c}}
                                        {{if $c.2}}
-                                       <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li role="menuitem"><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{else}}
-                                       <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li role="menuitem"><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{/if}}
                                        {{/foreach}}
                                </ul>
@@ -28,7 +28,15 @@
                        
        </div>
        <div class="contact-entry-photo-end" ></div>
-       <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+       
+       <div class="contact-entry-desc">
+               <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+               {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+               {{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+               {{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+               {{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+       </div>
+
 
        <div class="contact-entry-end" ></div>
 </div>