Merge branch 'pull'

3 files changed, 24 insertions, 3 deletions

diff --git a/view/nav.tpl b/view/nav.tpl
index d0c640db1..d9255d86c 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -15,7 +15,7 @@
 					
 					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
 					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}					
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
 				</ul>
 			</li>
 		{{ endif }}
@@ -51,6 +51,8 @@
 		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+
 				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 235d38db5..5a7780a4c 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -348,7 +348,13 @@ section {
 		width: 60px;
 		
 		.wall-item-photo-wrapper { position: relative; }
-		.wall-item-photo { width: 48px; height: 48px; }		
+		.wall-item-photo { 
+			width: 48px; height: 48px;
+			overflow: hidden;
+			text-indent: -9999px;
+			display: block;
+			background: url(../../../images/icons/48/user.png) no-repeat center center;
+		 }		
 		
 		.wall-item-photo-menu-button {
 			display: none;
@@ -400,7 +406,9 @@ section {
 
 .wall-item-container.comment {
 	/*margin-top: 50px;*/
-	.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}	
+	.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;
+		background: url(../../../images/icons/22/user.png) no-repeat center center;
+	}	
 	.wall-item-photo-menu-button {
 		top: 13px !important;
 		left: 10px !important;
@@ -425,6 +433,9 @@ section {
 	}
 }
 
+
+
+.wall-item-tags { padding-top: 5px; }
 .tag {
 	background: url("../../../images/tag_b.png") no-repeat center left;
 	color: @TagColor;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index c13d21398..7a7a5fb63 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -643,6 +643,10 @@ section {
 .wall-item-container .wall-item-info .wall-item-photo {
   width: 48px;
   height: 48px;
+  overflow: hidden;
+  text-indent: -9999px;
+  display: block;
+  background: url(../../../images/icons/48/user.png) no-repeat center center;
 }
 .wall-item-container .wall-item-info .wall-item-photo-menu-button {
   display: none;
@@ -722,6 +726,7 @@ section {
   width: 32px;
   height: 32px;
   margin-left: 16px;
+  background: url(../../../images/icons/22/user.png) no-repeat center center;
 }
 .wall-item-container.comment .wall-item-photo-menu-button {
   top: 13px !important;
@@ -750,6 +755,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.wall-item-tags {
+  padding-top: 5px;
+}
 .tag {
   background: url("../../../images/tag_b.png") no-repeat center left;
   color: #ffffff;