commit latest to dispy-dark. fixes in html css and js

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 5bcbfd0b02e147aa32b81f2c86988fbc14d0dd09..7cd02f16486eb38ea54f5bbe54408fc1982936ef 100755 (executable)
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -18,8 +18,8 @@
                        </div>
                {{ endif }}
        </div>
-                               
-       
+
+
        {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
        <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 

diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl
index fbf354b47566cf1184155d5093e0e42accd7d88c..04968bd07d2206eedcbe121190ee7a67b9b16d16 100644 (file)
--- a/view/theme/dispy-dark/contact_template.tpl
+++ b/view/theme/dispy-dark/contact_template.tpl
@@ -20,9 +20,11 @@
        </div>
        <div class="contact-entry-photo-end" ></div>
                <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>{{ endif }}
        <div class="contact-entry-details" id="contact-entry-url-$contact.id" >
                <a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
        <div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
        <div class="contact-entry-end" ></div>
 </div>
+

diff --git a/view/theme/dispy-dark/group_side.tpl b/view/theme/dispy-dark/group_side.tpl
index 516d70d5b4c1a1ac24c5a3b1b0c28b3dc04b3f1b..10ecec2e8536c22ae944b5c010ca6b38364b3a7c 100644 (file)
--- a/view/theme/dispy-dark/group_side.tpl
+++ b/view/theme/dispy-dark/group_side.tpl
@@ -1,5 +1,5 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
 
 <div id="sidebar-group-list">
        <ul id="sidebar-group-ul">
@@ -9,7 +9,7 @@
                                {{ if $group.edit }}
                                        <a 
                         class="groupsideedit"
-                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
                                {{ endif }}
                                {{ if $group.cid }}
                                        <input type="checkbox" 

diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index 793af6fd2dbd93ecc2771f9899f848ed15da0d0e..f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf 100644 (file)
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -74,25 +74,6 @@
                }
        }
 
-    $(document).ready(function() {
-        function toggleToolbar() {
-            if ( $('#nav-floater').is(':visible') ) {
-                $('#nav-floater').slideUp('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-210px -60px' 
-                });
-            } else {
-                $('#nav-floater').slideDown('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-190px -60px'
-                });
-            }
-        };
-        $('.floaterflip').click(function() {
-            toggleToolbar();
-            return false;
-        });
-    });
 
 </script>
 

diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 43dcdbb8415d4c115e87b8a22d5e4cde77d1d38b..4c8f59d7969bd2348ebbacf1d3daa26da4f6f4e2 100644 (file)
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -114,6 +114,7 @@ function enableOnUser(){
        $(this).val("");
        initEditor();
 }
+
 </script>
 <script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
 <script type="text/javascript">
@@ -121,6 +122,7 @@ function enableOnUser(){
        var addtitle = '$addtitle';
 
        $(document).ready(function() {
+               
                /* enable tinymce on focus and click */
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
@@ -261,6 +263,18 @@ function enableOnUser(){
                }
        }
 
+       function itemFiler(id) {
+               reply = prompt("$fileas");
+               if(reply && reply.length) {
+                       commentBusy = true;
+                       $('body').css('cursor', 'wait');
+                       $.get('filer/' + id + '?term=' + reply);
+                       if(timer) clearTimeout(timer);
+                       timer = setTimeout(NavUpdate,3000);
+                       liking = 1;
+               }
+       }
+
        function jotClearLocation() {
                $('#jot-coord').val('');
                $('#profile-nolocation-wrapper').hide();

diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b0cb8890c546c228654d791c97bc3e77e2faf747..b322717ad107dc1f85485cf550c2a37aa2fa5df3 100644 (file)
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
        <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
        <ul class="nets-ul">
        {{ for $nets as $net }}
-       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
        {{ endfor }}
        </ul>
 </div>

diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 5cb567f5aff08a5ed6b09b5c7fe74edfea55c78d..6228e4f282aa5e4566b729737d55644c6a7f42f6 100644 (file)
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,30 +1,45 @@
 <div class="vcard">
 
        <div class="fn label">$profile.name</div>
-       
+
+               {{ if $profile.edit }}
+                       <div class="action">
+                       <span class="icon-profile-edit"></span>
+                       <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+                       <ul id="profiles-menu" class="menu-popup">
+                               {{ for $profile.menu.entries as $e }}
+                               <li>
+                                       <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+                               </li>
+                               {{ endfor }}
+                               <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+                               <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+                               
+                       </ul>
+                       </div>
+               {{ endif }}
+       </div>
+
        {{ if $pdesc }}
     <div class="title">$profile.pdesc</div>
     {{ endif }}
        <div id="profile-photo-wrapper">
-               <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
-               <div class="profile-edit-side-div">
-                       <a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
-               </div>
-               <div class="clear"></div>
+               <img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
     </div>
 
        {{ if $location }}
                <div class="location">
         <span class="location-label">$location</span>
-               <address class="adr">
+               <div class="adr">
                        {{ if $profile.address }}
             <div class="street-address">$profile.address</div>{{ endif }}
-                       <span class="city-state-zip">$profile.zip</span>
-            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-            <span class="region">$profile.region</span>
-            <span class="postal-code">$profile.postal-code</span>
+                       <span class="city-state-zip">
+                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+                               <span class="region">$profile.region</span>
+                               <span class="postal-code">$profile.postal-code</span>
+                       </span>
                        {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-               </address>
+               </div>
                </div>
        {{ endif }}
 

diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index e2aae1e77cd9b9474a652433a95388e2f528ba7f..63a85dda536cd44fedaf2f82358ee82c8dfdd0a3 100644 (file)
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,4 +1,4 @@
-<div class="widget" id="saved-search-list">
+<div id="saved-search-list" class="widget">
        <h3 id="search">$title</h3>
        $searchbox
        

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index c590042f11d87cddfdc09a96dcede78e7e4399ab..2dc21817a268326e7d14e9385c3a2e28b62bee83 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -195,14 +195,16 @@ input[type=submit] {
     color: #fff;
 }
 
+
 /**
  * global
  */
 /* .tool .action */
 .action {
-    float: right;
+       margin: 5px 0;
 }
 
+
 /**
  *     login
  */
@@ -210,9 +212,10 @@ input[type=submit] {
     margin-right: 20px;
 }
 
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
 nav {
        height: 60px;
        display: block;
@@ -690,7 +693,9 @@ aside #viewcontacts {
 #netsearch-box {
        margin: 30px 0px;
 }
-
+.ttright {
+       margin: 0px 0px 0px 5px;
+}
 
 /**
 * contacts block
@@ -916,7 +921,7 @@ aside #viewcontacts {
        clear: both;
 }
 #jot-title-desc {
-       color: #cccccc;
+       color: #ccc;
 }
 #profile-jot-desc {
        color: #ff2000;
@@ -1097,7 +1102,7 @@ section {
        clear: left;
        font-size: 0.8em;
        color: #878883;
-       margin: 20px 0 0 110px;
+       margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
        display: inline;
@@ -1744,26 +1749,40 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-       background: #2e2f2e;
-       border-radius: 5px 5px 0 0;
-       width: 175px;
-       height: 20px;
-       position: relative;
-    margin: -25px -30px 0px 0px;
-       display: none;
-}
-.profile-edit-side-div:hover {
+       /*background: #111;*/
+       /*border-radius: 5px 5px 0px 0px;*/
        /*margin: 0px 0px 0px 0px;*/
-       display: inline;
+       /*width: 100px;*/
+       /*height: 25px;*/
+       /*position: absolute;*/
+       display: none;
+       /*left: 35%;*/
+       /*top: 41%;*/
+       /*cursor: pointer;*/
 }
-.profile-edit-side-link {
-       margin: 0 0px 0px 155px;
-       /*float: right;*/
+/*.profile-edit-side-div:hover {*/
+       /*display: block;*/
+/*}*/
+/*.profile-edit-side-link {*/
+       /*margin: 3px 0px 0px 70px;*/
+/*}*/
+#profiles-menu-trigger {
+       width: 100px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
+.icon-profile-edit {
+    background: url("icons.png") no-repeat scroll -150px 0px transparent;
+    border: 0 none;
+    display: block;
+    float: right;
+    height: 20px;
+    margin: 0 0 -18px;
+    text-decoration: none;
+       cursor: pointer;
+}
 #profile-edit-links ul {
     margin: 20px 0;
     padding: 0;

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 6f8243058720a3b7dc6d1a0f9e0442302fbc02d0..c0611ce83daa3a517114c1c94e419641a49a2f52 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -74,16 +74,6 @@ $(document).ready(function() {
                event.stopPropagation();
        });
 
-       // usermenu
-       //$('html').click(function() {
-//             $('#user-menu-popup').css('display: none');
-               //document.getElementById("usermenu-popup").style.display = "none";
-       //});
-
-       //$('#user-menu').click(function(event) {
-       //      event.stopPropagation();
-       //});
-
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -106,11 +96,20 @@ $(document).ready(function() {
                $(this).css({color: '#eec'});
        });
 
-       $('#profile-photo-wrapper').mouseover(function() {
-               $('#profile-edit-side-div').css({display: 'block'});
+/*     $('#profile-photo-wrapper').mouseover(function() {
+               $('.profile-edit-side-div').css({display: 'block'});
        }).mouseout(function() {
-               $('#profile-edit-side-div').css({display: 'none'});
+               $('.profile-edit-side-div').css({display: 'none'});
+               return false;
        });
+
+       $('img.photo').mouseover(function() {
+               $('.profile-edit-side-div').css({display: 'block'});
+       }).mouseout(function() {
+               $('.profile-edit-side-div').css({display: 'none'});
+               return false;
+       });*/
+
 });
 </script>
 EOT;

diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index b013cfeef45966ed69a4af35550facc5d01b5936..c67a88635c54e47e76d455d7c702927a55e42b09 100644 (file)
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -26,11 +26,14 @@
                                <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                                <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
                        {{ endif }}
+                       
                        {{ if $item.vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
                                <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
                                <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               {{ if $item.vote.share }}
+                                       <a href="#" id="share-$item.id"
+                                       class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
                                <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
                        {{ endif }}

diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index 86453fad21afc41e8dafbc99bf8008d24c88508f..f251d7352bb1301cfc1bf676727b41d4dda2fea7 100644 (file)
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -31,11 +31,15 @@
                                <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                                <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
                        {{ endif }}
+                       
                        {{ if $item.vote }}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
                                <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
                                <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+
+                       {{ if $item.vote.share }}
+                               <a href="#"  id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
                                <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
                        {{ endif }}
@@ -63,6 +67,7 @@
                                                {{ endfor }}
                                        </div>                  
                        </div>
+                       
                </div>
                <div class="wall-item-author">
                        <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 75297290cd70c90bcd3529a30c4917e2c511c4ed..cbfcb09e675f416f9d00253559a320f109d2945a 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -111,6 +111,3 @@ $(document).ready(function() {
 });
 </script>
 EOT;
-
-$a->page['footer'] .= <<<EOFooter
-EOFooter;

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b79b00ef418f6ad62702a5da2538fe55892a1b6b..10ddb00909df6c754bfd9d9cda46475a47c21b1b 100755 (executable)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2615,12 +2615,12 @@ aside input[type='text'] {
        margin-top: 10px;
 }
 
-.body-tag, .filesavetags {
+.body-tag {
        opacity: 0.5;
        filter:alpha(opacity=50);
 }
 
-.body-tag:hover, .filesavetags:hover {
+.body-tag:hover {
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
 }

diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 6cb018b7bc37932398fd472d3c2e5d49d156aa45..2c88fc598ef914d6c64fed26b81eee8f834b09db 100755 (executable)
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -56,11 +56,9 @@
                        {{ if $item.star }}
                        <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                        <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
                        {{ endif }}
-                       {{ if $item.filer }}
-                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-                       {{ endif }}
-
+                       
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
                        </div>

diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index c37bcb4a28bb81f4e96b5b449fe25274ce05418d..211906c9343c995f5e0b8b7bd7ec3470e89f04a6 100755 (executable)
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -61,9 +61,6 @@
                        <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
                        <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
                        {{ endif }}
-                       {{ if $item.filer }}
-                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-                       {{ endif }}
                        
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}