quattro theme update:

icon and notification for introductions
icon and notification for private messages
correct link to edit profile with single profile enabled

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 02d18d23755bd595549c95ad2f428a32bb547674..e72e557038b602618d6ffa6df8b106e8621037bc 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -19,6 +19,12 @@
 .icon.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -83,6 +89,12 @@
 .icon.s10.notify {
   background-image: url("../../../images/icons/10/notify_off.png");
 }
+.icon.s10.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s10.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s10.gear {
   background-image: url("../../../images/icons/10/gear.png");
 }
@@ -147,6 +159,12 @@
 .icon.s16.notify {
   background-image: url("../../../images/icons/16/notify_off.png");
 }
+.icon.s16.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s16.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s16.gear {
   background-image: url("../../../images/icons/16/gear.png");
 }
@@ -211,6 +229,12 @@
 .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.s22.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s22.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s22.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -275,6 +299,12 @@
 .icon.s48.notify {
   background-image: url("../../../images/icons/48/notify_off.png");
 }
+.icon.s48.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s48.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s48.gear {
   background-image: url("../../../images/icons/48/gear.png");
 }
@@ -589,6 +619,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,
 nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_on.png");
 }
+nav #nav-introductions-link.on .icon.s22.intro,
+nav #nav-introductions-link.selected .icon.s22.intro {
+  background-image: url("icons/contacts_on.png");
+}
+nav #nav-messages-link.on .icon.s22.mail,
+nav #nav-messages-link.selected .icon.s22.mail {
+  background-image: url("icons/messages_on.png");
+}
 nav #nav-apps-link.selected {
   background-color: #364e59;
 }

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 1f1d85e80600edfb2dc63fb79e711ce11d00285e..8e6a020b8ae9f02e5c91e1b86420ab23a9214d32 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -19,6 +19,12 @@
 .icon.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -83,6 +89,12 @@
 .icon.s10.notify {
   background-image: url("../../../images/icons/10/notify_off.png");
 }
+.icon.s10.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s10.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s10.gear {
   background-image: url("../../../images/icons/10/gear.png");
 }
@@ -147,6 +159,12 @@
 .icon.s16.notify {
   background-image: url("../../../images/icons/16/notify_off.png");
 }
+.icon.s16.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s16.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s16.gear {
   background-image: url("../../../images/icons/16/gear.png");
 }
@@ -211,6 +229,12 @@
 .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.s22.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s22.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s22.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -275,6 +299,12 @@
 .icon.s48.notify {
   background-image: url("../../../images/icons/48/notify_off.png");
 }
+.icon.s48.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s48.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s48.gear {
   background-image: url("../../../images/icons/48/gear.png");
 }
@@ -589,6 +619,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,
 nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_on.png");
 }
+nav #nav-introductions-link.on .icon.s22.intro,
+nav #nav-introductions-link.selected .icon.s22.intro {
+  background-image: url("icons/contacts_on.png");
+}
+nav #nav-messages-link.on .icon.s22.mail,
+nav #nav-messages-link.selected .icon.s22.mail {
+  background-image: url("icons/messages_on.png");
+}
 nav #nav-apps-link.selected {
   background-color: #364e59;
 }

diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index f9be4cc7237a722d4390733c56ae062c18b913ff..13a2b49bbab5603e51e205933ad215c72a2c4508 100644 (file)
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -3,6 +3,8 @@
 
 .icons(@size: 22) {
        &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); }
+       &.intro  { background-image: url("icons/contacts_off.png"); }
+       &.mail   { background-image: url("icons/messages_off.png"); }
        &.gear   { background-image: url("../../../images/icons/@{size}/gear.png"); }
        
     &.like      { background-image: url("icons/like.png"); }

diff --git a/view/theme/quattro/icons/contacts3.png b/view/theme/quattro/icons/contacts3.png
new file mode 100644 (file)
index 0000000..8a3e69e
Binary files /dev/null and b/view/theme/quattro/icons/contacts3.png differ

diff --git a/view/theme/quattro/icons/contacts_off.png b/view/theme/quattro/icons/contacts_off.png
new file mode 100644 (file)
index 0000000..4345d47
Binary files /dev/null and b/view/theme/quattro/icons/contacts_off.png differ

diff --git a/view/theme/quattro/icons/contacts_on.png b/view/theme/quattro/icons/contacts_on.png
new file mode 100644 (file)
index 0000000..e7f2a39
Binary files /dev/null and b/view/theme/quattro/icons/contacts_on.png differ

diff --git a/view/theme/quattro/icons/messages_off.png b/view/theme/quattro/icons/messages_off.png
new file mode 100644 (file)
index 0000000..70ab1c7
Binary files /dev/null and b/view/theme/quattro/icons/messages_off.png differ

diff --git a/view/theme/quattro/icons/messages_on.png b/view/theme/quattro/icons/messages_on.png
new file mode 100644 (file)
index 0000000..f831813
Binary files /dev/null and b/view/theme/quattro/icons/messages_on.png differ

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 2dce3ee1a306f619e3b08dfe94339539b24e8063..d35ad52ed092920fce8ef4f8c41f97e3e22e8f48 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -19,6 +19,12 @@
 .icon.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -83,6 +89,12 @@
 .icon.s10.notify {
   background-image: url("../../../images/icons/10/notify_off.png");
 }
+.icon.s10.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s10.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s10.gear {
   background-image: url("../../../images/icons/10/gear.png");
 }
@@ -147,6 +159,12 @@
 .icon.s16.notify {
   background-image: url("../../../images/icons/16/notify_off.png");
 }
+.icon.s16.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s16.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s16.gear {
   background-image: url("../../../images/icons/16/gear.png");
 }
@@ -211,6 +229,12 @@
 .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_off.png");
 }
+.icon.s22.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s22.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s22.gear {
   background-image: url("../../../images/icons/22/gear.png");
 }
@@ -275,6 +299,12 @@
 .icon.s48.notify {
   background-image: url("../../../images/icons/48/notify_off.png");
 }
+.icon.s48.intro {
+  background-image: url("icons/contacts_off.png");
+}
+.icon.s48.mail {
+  background-image: url("icons/messages_off.png");
+}
 .icon.s48.gear {
   background-image: url("../../../images/icons/48/gear.png");
 }
@@ -589,6 +619,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,
 nav #nav-notifications-linkmenu.selected .icon.s22.notify {
   background-image: url("../../../images/icons/22/notify_on.png");
 }
+nav #nav-introductions-link.on .icon.s22.intro,
+nav #nav-introductions-link.selected .icon.s22.intro {
+  background-image: url("icons/contacts_on.png");
+}
+nav #nav-messages-link.on .icon.s22.mail,
+nav #nav-messages-link.selected .icon.s22.mail {
+  background-image: url("icons/messages_on.png");
+}
 nav #nav-apps-link.selected {
   background-color: #cbd38d;
 }

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f13ae9064768bddb601a1f262ea6737eb5773355..6287a05ef8f6d204bc1b509983ce03be7c838f83 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -215,7 +215,11 @@ nav {
                }
        
                #nav-notifications-linkmenu.on .icon.s22.notify,
-               #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") }
+               #nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
+        #nav-introductions-link.on .icon.s22.intro,
+               #nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
+               #nav-messages-link.on .icon.s22.mail,
+               #nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }              
                #nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index 2118c1e348d7cb8ea583b3109a5d1a32f52ef66f..2c646306ad3b2f014cbe8d3052f3ece7a8056342 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -1,8 +1,3 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <header>
        {{* {{$langselector}} *}}
 
@@ -44,6 +39,26 @@
                        </li>
                {{/if}}
                
+               {{if $nav.introductions}}
+                       <li id="nav-introductions-link" class="nav-menu-icon {{$sel.introductions}}">
+                               <a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
+                                   <span class="icon s22 intro">{{$nav.introductions.1}}</a>
+                               </a>
+                               <span id="intro-update" class="nav-notify"></span>
+                       </li>
+               {{/if}}
+               
+               {{if $nav.messages}}
+                       <li id="nav-messages-link" class="nav-menu-icon {{$sel.messages}}">
+                               <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+                                   <span class="icon s22 mail">{{$nav.messages.1}}</a>
+                               </a>
+                               <span id="mail-update" class="nav-notify"></span>
+                       </li>
+               {{/if}}
+
+
+               
                {{if $nav.notifications}}
                        <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
                                <span id="notify-update" class="nav-notify"></span>

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index 4b1ddb6e6ec637e28cf3017ee673ed119544d905..8213a108f77d983590b2c1f67f9e24ae3ebf857a 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -11,14 +11,21 @@
                        <div class="action">
                        <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                        <ul id="profiles-menu" class="menu-popup">
-                               {{foreach $profile.menu.entries as $e}}
-                               <li>
-                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-                               </li>
-                               {{/foreach}}
+                           {{if $profile.menu.entries}}
+                               {{foreach $profile.menu.entries as $e}}
+                               <li>
+                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+                               </li>
+                               {{/foreach}}
+                       {{else}}
+                               <li>
+                                       <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
+                               </li>
+                       {{/if}}
                                <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+                               {{if $profile.menu.cr_new }}
                                <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-                               
+                               {{/if}}
                        </ul>
                        </div>
                {{/if}}

diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index d89890da0bf934df08ff0ab17a003601407180b6..b770321fa086a8f4da14e829f6549026e3207dcb 100644 (file)
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -18,11 +18,29 @@ $a->page['htmlhead'] .= <<< EOT
 $(document).ready(function(){
     $('nav').bind('nav-update', function(e,data){
         var notifCount = $(data).find('notif').attr('count');
+        var intro = $(data).find('intro').text();
+        var mail = $(data).find('mail').text();
+        
+        console.log(intro,mail);
+        
         if (notifCount > 0 ) {
             Tinycon.setBubble(notifCount);
         } else {
             Tinycon.setBubble('');
         }
+        
+        if (intro>0){
+                       $("#nav-introductions-link").addClass("on");
+               } else {
+                       $("#nav-introductions-link").removeClass("on");
+               }
+               
+        if (mail>0){
+                       $("#nav-messages-link").addClass("on");
+               } else {
+                       $("#nav-messages-link").removeClass("on");
+               }
+               
     });
 });