broke 'find similar' matches content into a tpl in core, added an extended tpl to...

diff --git a/mod/match.php b/mod/match.php
index 5dd80fe3efad761e90757e6e34ef31595e076d5d..eea2dad4ffc490a99b892512614e68e206273a5b 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -22,6 +22,7 @@ function match_content(&$a) {
 
        $params = array();
        $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
+       
        if($tags) {
                $params['s'] = $tags;
                if($a->pager['page'] != 1)
@@ -40,15 +41,17 @@ function match_content(&$a) {
                }
 
                if(count($j->results)) {
+                       
+                       $tpl = get_markup_template('match.tpl');
                        foreach($j->results as $jj) {
-
-                               $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
-                               $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->tags . ']' . '" /></a></div>';
-                               $o .= '<div class="profile-match-break"></div>';
-                               $o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>';
-                               $o .= '<div class="profile-match-end"></div></div>';
+                               
+                               $o .= replace_macros($tpl,array(
+                                       '$url' => $jj->url,
+                                       '$name' => $jj->name,
+                                       '$photo' => $jj->photo,
+                                       '$tags' => $jj->tags
+                               ));
                        }
-                       $o .= '<div id="profile-match-wrapper-end"></div>';
                }
                else {
                        info( t('No matches') . EOL);

diff --git a/view/match.tpl b/view/match.tpl
new file mode 100644 (file)
index 0000000..330245a
--- /dev/null
+++ b/view/match.tpl
@@ -0,0 +1,12 @@
+<div class="profile-match-wrapper">
+       <div class="profile-match-photo">
+               <a href="$url">
+                       <img src="$photo" alt="$name" title="$name[$tags]" />
+               </a>
+       </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>
+</div>
\ No newline at end of file

diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
new file mode 100644 (file)
index 0000000..49c3c81
--- /dev/null
+++ b/view/theme/testbubble/match.tpl
@@ -0,0 +1,10 @@
+<div class="profile-match-wrapper">
+       <div class="profile-match-photo">
+               <a href="$url">
+                       <img src="$photo" alt="$name" />
+               </a>
+       </div>
+       <span><a href="$url">$name</a> is interested in:<br />$tags</span>
+       <div class="profile-match-break"></div>
+       <div class="profile-match-end"></div>
+</div>
\ No newline at end of file

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 8ef2b6619754c5e54e0df307bcba48d937dc06f0..a468296fb2095539118d5f05cef0eb71316d15aa 100644 (file)
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -841,11 +841,10 @@ profile-jot-banner-wrapper {
 /* ========= */
 
 .wall-item-outside-wrapper {
-       max-width: 85%;
+       max-width: 83%;
        border-bottom: 1px solid #dedede;
        margin-top: 20px;
        padding-right: 10px;
-       overflow: hidden;
 }
 
 .wall-item-outside-wrapper-end { clear: both;}
@@ -1251,14 +1250,26 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 .profile-match-wrapper {
-       width: 300px;
-       padding: 5px;
+       width: 80%;
+       padding: 15px;
        margin-bottom:10px;
+       margin-left: 20px;
        background-color: #f6f6f6;
        border: 1px solid #dddddd;
        -moz-box-shadow: 3px 3px 4px #959494;
        -webkit-box-shadow: 3px 3px 4px #959494;
-       box-shadow: 3px 3px 4px #959494;        
+       box-shadow: 3px 3px 4px #959494;
+       clear: both;    
+}
+
+.profile-match-end {
+       clear: both;
+}
+
+.profile-match-photo {
+       float: left;
+       margin-right: 10px;
+       margin-bottom: 5px;
 }
 
 /* ========== */
@@ -1717,48 +1728,6 @@ margin-left: 0px;
        border: 1px solid #dddddd;
 }
 
-/* ================= */
-/* = Notifications = */
-/* ================= */
-
-/*#notification-show-hide-wrapper {
-       width: 160px;
-       -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-       -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-       box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-       background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-       background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-       filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-       background-color:#bdbdbd;
-       -moz-border-radius:5px;
-       -webkit-border-radius:5px;
-       border-radius:5px;
-       padding: 5px 10px 5px 10px;
-       margin-right: 5px;
-       margin-top: 10px;
-       font-style: bold;
-       color: #efefef;
-       text-align: center;
-}
-
-#notification-show-hide-wrapper:hover {
-       color: #efefef;
-       background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
-       background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
-       filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
-       background-color:#b20202;
-}
-
-#notification-show-hide-wrapper:active {
-       background-color: #b20202;
-       position:relative;
-       top:1px;
-}
-
-#notification-show-hide-wrapper a {
-       color: #efefef;
-}*/
-
 /* ============ */
 /* = Contacts = */
 /* ============ */