Merge pull request #793 from fabrixxm/quattrofixs

Small updates to quattro theme

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;
 }

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;
 }

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"); }

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;
 }

view/theme/quattro/quattro.less

@@ -216,6 +216,10 @@ 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-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; }
 }
 

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>

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">
+			    {{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}}

view/theme/quattro/theme.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Quattro
- * Version: 0.5
+ * Version: 0.6
  * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
  * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
@@ -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");
+		}
+		
     });
 });