Merge pull request #50 from annando/master

massive changes in mail and design updates in "vier"

7 files changed, 624 insertions, 350 deletions

diff --git a/view/theme/vier/colors.less b/view/theme/vier/colors.less
index 5314b5284..18d0fc620 100644
--- a/view/theme/vier/colors.less
+++ b/view/theme/vier/colors.less
@@ -1,6 +1,7 @@
 // Quattro Theme LESS file
 
 // "Echo" palette from Inkscape
+@Yellow1 : #fce94f;
 @Blue1:rgb(25,174,255);
 @Blue2:rgb(0,132,200);
 @Blue3:rgb(0,92,148);
@@ -71,6 +72,7 @@
 @NoticeBackgroundColor: #511919;
 
 @ThreadBackgroundColor: #f6f7f8;
+@ShinyBorderColor: @Yellow1;
 
 @CommentBoxEmptyColor: @Grey3;
 @CommentBoxEmptyBorderColor: @Grey3;
@@ -91,4 +93,4 @@
 @JotPermissionUnlockBackgroundColor: @Grey2;
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
-
+@JotPreviewBackgroundColor: @Yellow1;
diff --git a/view/theme/vier/icons.less b/view/theme/vier/icons.less
index f87327703..e314fba1f 100644
--- a/view/theme/vier/icons.less
+++ b/view/theme/vier/icons.less
@@ -13,6 +13,11 @@
 	&.link		{ background-image: url("../../../images/icons/@{size}/link.png"); }
 	&.lock		{ background-image: url("../../../images/icons/@{size}/lock.png"); }
 	&.unlock	{ background-image: url("../../../images/icons/@{size}/unlock.png"); }
+	&.type-unkn	{ background-image: url("../../../images/icons/@{size}/zip.png"); }
+	&.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); }
+	&.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); }
+	&.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); }
+	&.type-text	{ background-image: url("../../../images/icons/@{size}/text.png"); }
 	
 }
 
diff --git a/view/theme/vier/quattro.less b/view/theme/vier/quattro.less
index 671577303..9d2608261 100644
--- a/view/theme/vier/quattro.less
+++ b/view/theme/vier/quattro.less
@@ -3,7 +3,7 @@
 /* global */
 body {
 	font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
-	font-size: 10px;
+	font-size: 11px;
 	background-color: @BodyBackground;
 	color: @BodyColor;
 	margin: 50px 0px 0px 0px;
@@ -44,6 +44,9 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 .hidden { display: none; }
 .clear { clear: both; }
 
+.fakelink { color: @Link; text-decoration: none; cursor:pointer; }
+.fakelink:hover { color: @LinkHover; text-decoration: underline; }
+
 code {
 	font-family: Courier, monospace;
 	white-space: pre;
@@ -55,6 +58,23 @@ code {
 	padding: 10px;
 	margin-top: 20px; 
 }
+
+#panel {
+	position: absolute;
+	width: 10em;
+	background: @MenuBg;
+	color: @Menu;
+	margin: 0px;
+	padding: 1em;
+	list-style: none;
+	border: 3px solid @MenuBorder;
+	z-index: 100000;
+	
+	.shadow();	
+}
+
+
+
 /* tool */
 
 .tool {
@@ -234,7 +254,8 @@ ul.menu-popup {
 
 
 #nav-notifications-menu {
-	width: 400px;
+	width: 400px; max-height: 550px;
+	overflow: auto;
 	img { float: left; margin-right: 5px; }
 	.contactname { font-weight: bold; }
 	.notif-when { font-size: 10px; color: @MenuItemDetail; display: block; }
@@ -288,16 +309,99 @@ aside {
 	.allcontact-link { float: right; margin: 5px 0px; }
 	.contact-block-content {
 		clear: both;
-		overflow: auto;	height: auto;
+		overflow: hidden;
+		height: auto;
 	}
+	/*.contact-block-div { width:60px; height: 60px; }*/
 	.contact-block-link {
 		float: left;
 		margin: 0px 2px 2px 0px;
-		img { widht: 48px; height: 58px; }
+		img { width: 48px; height: 48px; }
 	}
 }
+/* mail view */
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
 
+.mail-conv-delete-icon {
+	border: none;
+}
 
+/* group member */
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
+	float: right;
+	margin-right: 50px;
+        .drophide {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            opacity: 0.3;
+            position: relative;
+            top: -50px;
+        }
+        .drop {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            position: relative;
+            top: -50px;
+        }
+}
+/*
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-members-end {
+	clear: both;
+}
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+.contact-block-div {
+	float: left;
+	width: 60px;
+	height: 60px;
+}*/
+ 
 /* widget */
 .widget {
 	margin-bottom: 2em;
@@ -431,6 +535,28 @@ section {
 	}
 }
 
+.comment-edit-preview {
+	width: 710px;
+	border: 1px solid @Grey5;
+	margin-top: 10px;
+	
+	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
+		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+	}	
+	.contact-photo-menu-button {
+		top: 15px !important;
+		left: 15px !important;
+	}
+	.wall-item-links { padding-left: 12px; }
+
+	.wall-item-container { width: 700px; }
+	.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
+
+
+}
+
+.shiny { border-right:10px solid @ShinyBorderColor; }
+#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
 
 
 .wall-item-tags { padding-top: 5px; }
@@ -445,7 +571,31 @@ section {
 	}
 }
 
-/* contacts menu */
+.wwto { 
+	position: absolute !important; 
+	width: 25px; height: 25px; 
+    background: #FFFFFF;
+    border: 2px solid @Metalic3;
+    height: 25px;
+    width: 25px;
+    overflow: hidden;
+    padding: 1px;
+    position: absolute !important;
+    top: 40px;
+    left: 30px;
+    
+    .shadow(0px, 0px)
+}
+.wwto .contact-photo { width: 25px; height: 25px; }
+
+
+#pause {
+ position: fixed;
+ bottom: 5px;
+ right: 5px;
+}
+
+
 .contact-photo-wrapper { position: relative; }
 .contact-photo { 
 	width: 48px; height: 48px;
@@ -462,8 +612,14 @@ section {
 
 .contact-wrapper {
 	float: left;
-	width: 90px;
+	width: 300px;
 	height: 90px;
+	padding-right: 10px;
+	margin: 0 10px 10px 0px;
+	.contact-photo-wrapper { 
+		float: left; 
+		margin-right: 10px;
+	}
 	.contact-photo { 
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
@@ -482,8 +638,12 @@ section {
 		img { width: 175px; height: 175px; }
 	}
 }
-.contact-name { text-align: center; font-weight: bold; }
-.contact-details { color: @Grey3;}
+.contact-name { font-weight: bold; padding-top: 15px; }
+.contact-details { 
+	color: @Grey3; white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 
 /* editor */
 .jothidden { display: none; }
@@ -794,6 +954,58 @@ ul.tabs {
 
 #profile-edit-links li {
 	list-style: none;
+        margin-top: 10px;
+}
+
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-with-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-gender-select,
+#profile-edit-homepage-label {
+	float: left;
+	width: 175px;
+        padding-top: 7px;
+}
+#profile-edit-profile-name,
+#profile-edit-name,
+#gender-select, 
+#profile-edit-pdesc,
+#profile-edit-gender,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#profile-edit-marital,
+#profile-edit-with,
+#profile-edit-sexual,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-edit-homepage {
+    margin-top: 5px;
 }
 
 /* oauth */
@@ -828,6 +1040,28 @@ ul.tabs {
 	margin: 0px 10px 10px 0px;
 }
 
+/* profile match wrapper */
+.profile-match-wrapper {
+	float: left;
+	width: 90px;
+	height: 90px;
+        margin-bottom: 20px;
+	.contact-photo { 
+		width: 80px; height: 80px;
+		img { width: 80px; height: 80px; }
+	}
+	.contact-photo-menu-button {
+		left: 0px;
+		top: 63px;
+	}	
+}
+
 
 /* page footer */
 footer { height: 100px; display: table-row; }
+
+.pager {
+    margin-top: 25px;
+    clear: both;
+}
+
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index 9cd3c8e2e..372e0d034 100755
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
@@ -1,7 +1,7 @@
 
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
+	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
 	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 </div>
 
@@ -25,6 +25,7 @@
 			<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
 			<span class="wall-item-ago">- &nbsp;
 				{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+				{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
 			</span>
 		</div>
 		<div class="wall-item-content">
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 89dd98146..39f4ffea4 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -334,11 +334,15 @@ h4 {
   font-size: 1.1em;
 }
 
-a {color: #3e3e8c;
-text-decoration: none;
+a {
+	color: #36C;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
 }
-a:hover {color: blue;
-text-decoration: underline}
 
 .wall-item-name-link {
 /*  float: left;*/
@@ -364,12 +368,13 @@ text-decoration: underline}
   clear: both;
 }
 .fakelink {
-  color: #3e3e8c;
+  color: #36c;
+  /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
 }
 .fakelink:hover {
-  color: blue;
+  /* color: blue; */
   /*color: #005c94; */
   text-decoration: underline;
 }
@@ -402,6 +407,12 @@ code {
 .tool {
   height: auto;
   overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
 }
 .tool .label {
   float: left;
@@ -409,6 +420,12 @@ code {
 .tool .action {
   float: right;
 }
+.tool a {
+  color: #000;
+}
+.tool a:hover {
+  text-decoration: none;
+}
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -496,7 +513,7 @@ nav ul {
 nav ul li {
   list-style: none;
   margin: 0px;
-  padding: 0px;
+  /* padding: 1px 1px 3px 1px; */
   float: left;
 }
 nav ul li .menu-popup {
@@ -536,7 +553,8 @@ nav .nav-menu.selected {
 nav .nav-notify {
   display: none;
   position: absolute;
-  background-color: #19aeff;
+  background-color: #36c;
+  /* background-color: #19aeff; */
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
@@ -571,10 +589,25 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 nav #nav-apps-link.selected {
   background-color: #364e59;
 }
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
 ul.menu-popup {
   position: absolute;
   display: none;
-  width: 10em;
+  width: 11em;
   background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
@@ -644,6 +677,15 @@ ul.menu-popup .empty {
   max-height: 550px;
   overflow: auto;
 }
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
 #nav-notifications-menu img {
   float: left;
   margin-right: 5px;
@@ -656,6 +698,13 @@ ul.menu-popup .empty {
   color: #9eabb0;
   display: block;
 }
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
 /* aside */
 aside {
   display: table-cell;
@@ -711,7 +760,8 @@ aside #dfrn-request-link {
 }
 aside #dfrn-request-link:hover {
   text-decoration: none;
-  background-color: #19aeff;
+  background-color: #36c;
+  /* background-color: #19aeff; */
 }
 aside #profiles-menu {
   width: 20em;
@@ -813,7 +863,7 @@ section {
   display: table-cell;
   vertical-align: top;
   width: 800px;
-  padding: 0px 20px 0px 10px;
+  padding: 0px 0px 0px 10px;
 }
 /* wall item */
 .tread-wrapper {
@@ -886,7 +936,7 @@ section {
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 710px;
+  max-width: 700px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -946,7 +996,7 @@ section {
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
-.wall-item-container.comment .contact-photo-menu-button {
+.wall-item-container.comment {
   top: 15px !important;
   left: 15px !important;
 }
@@ -985,7 +1035,7 @@ section {
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
-.comment-edit-preview .contact-photo-menu-button {
+.comment-edit-preview {
   top: 15px !important;
   left: 15px !important;
 }
@@ -1000,6 +1050,16 @@ section {
   padding: 0;
   margin: 10px 0;
 }
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+#jot-preview-content .tread-wrapper {
+  background-color: #fce94f;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;
@@ -1056,12 +1116,7 @@ section {
   width: 48px;
   height: 48px;
 }
-.contact-photo-menu-button {
-  display: none;
-  position: absolute;
-  left: -2px;
-  top: 31px;
-}
+
 .contact-wrapper {
   float: left;
   width: 90px;
@@ -1076,26 +1131,21 @@ section {
   width: 80px;
   height: 80px;
 }
-.contact-wrapper .contact-photo-menu-button {
+.contact-wrapper {
   left: 0px;
   top: 63px;
 }
-.directory-item {
-  float: left;
-  width: 200px;
-  height: 200px;
-}
-.directory-item .contact-photo {
-  width: 175px;
-  height: 175px;
+.contact-photo {
+  width: 48px;
+  height: 48px;
 }
-.directory-item .contact-photo img {
-  width: 175px;
-  height: 175px;
+.contact-photo img {
+  width: 48px;
+  height: 48px;
 }
 .contact-name {
-  text-align: center;
-  font-weight: bold;
+  /* text-align: center; */
+  /*font-weight: bold;*/
   font-size: 12px;
 }
 .contact-details {
@@ -1459,7 +1509,8 @@ ul.tabs li .active {
 }
 /* contacts */
 .contact-entry-wrapper {
-  width: 50px;
+  width: 120px;
+  height: 120px;
   float: left;
 }
 /* photo */
@@ -1482,10 +1533,48 @@ ul.tabs li .active {
   width: 80px;
   height: 80px;
 }
-.profile-match-wrapper .contact-photo-menu-button {
+.profile-match-wrapper {
   left: 0px;
   top: 63px;
 }
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
 /* page footer */
 footer {
   height: 100px;
@@ -1527,397 +1616,338 @@ blockquote {
 #prof-separator { display: none;}
 */
 
-#prvmail-wrapper, .mail-conv-detail, .mail-list-detail {
-        position: relative;
-        width: 500px;
-        padding: 50px;
-        margin: 20px auto;
-        background-color: #fff;
-        -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-        -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-        box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-}
-
-#prvmail-wrapper:before, #prvmail-wrapper:after, .mail-conv-detail:before, .mail-conv-detail:after, .mail-list-detail:before, .mail-list-detail:after {
-        position: absolute;
-        width: 40%;
-        height: 10px;
-        content: ' ';
-        left: 12px;
-        bottom: 12px;
-        background: transparent;
-        -webkit-transform: skew(-5deg) rotate(-5deg);
-        -moz-transform: skew(-5deg) rotate(-5deg);
-        -ms-transform: skew(-5deg) rotate(-5deg);
-        -o-transform: skew(-5deg) rotate(-5deg);
-        transform: skew(-5deg) rotate(-5deg);
-        -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-        -moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-        box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-        z-index: -1;
-}
-
-#prvmail-wrapper:after, .mail-conv-detail:after, .mail-list-detail:after {
-        left: auto;
-        right: 12px;
-        -webkit-transform: skew(5deg) rotate(5deg);
-        -moz-transform: skew(5deg) rotate(5deg);
-        -ms-transform: skew(5deg) rotate(5deg);
-        -o-transform: skew(5deg) rotate(5deg);
-        transform: skew(5deg) rotate(5deg);
-}
-
-.prvmail-text {
-        width: 100%;
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
 }
 
-.mail-list-outside-wrapper {
-        margin-top: 20px;
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
 }
 
-.mail-list-sender {
-        float: left;
-        padding: 5px;
-        background-color: #efefef;
-        border: 2px dotted #eeeeee;
-        -moz-box-shadow: 3px 3px 4px #959494;
-        -webkit-box-shadow: 3px 3px 4px #959494;
-        box-shadow: 3px 3px 4px #959494;
+#prvmail-end {
+	clear: both;
 }
 
+.mail-list-sender,
 .mail-list-detail {
-        margin-left: 100px;
-        width: 300px;
-        min-height: 70px;
-        padding: 20px;
-        padding-top:10px;
-        border: 1px solid #dddddd;
-        }
-        
-.mail-list-sender-name {
-        font-size: 1.1em;
-        display: inline;
-        font-variant:small-caps;
+	float: left;
 }
-
-.mail-list-date {
-        float: right;
-        clear: block;
-        display: inline;
-        font-size: 0.9em;
-        padding-left: 10px;
-        font-stretch:ultra-condensed;
-        font-variant:small-caps;
+.mail-list-detail {
+	margin-left: 20px;
 }
 
 .mail-list-subject {
-        clear: block;
-        font-size: 1.2em;
-        padding-top: 20px;
-        padding-right: 50px;
+	font-size: 1.1em;
+	margin-top: 10px;
 }
-
-.mail-list-subject a {
-        color: #626262;
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
 }
 
-.mail-list-delete-wrapper { float: right;}
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
 .mail-list-outside-wrapper-end {
-        clear: both;
+	clear: both;
 }
 
-.mail-conv-outside-wrapper {
-        margin-bottom: 10px;
+.mail-list-outside-wrapper {
+	margin-top: 30px;
 }
 
-.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
-.mail-conv-sender-photo {
-        width: 64px;
-        height: 64px;
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
 }
 
-.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
-.mail-conv-date { float: right; font-variant:small-caps; }
-.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
-.mail-conv-body {
-        clear: both;
+.mail-list-delete-icon {
+	border: none;
 }
 
+.mail-conv-sender,
 .mail-conv-detail {
-        width: 500px;
-        padding: 30px;
-        padding-bottom: 10px;
-        margin-left: 20px;
-        margin-bottom: 0px;
-        vertical-align: middle;
-        margin: auto;
-        border: 1px solid #dddddd;
-}
-.mail-conv-break { display: none; border: none;}
-.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
-
-/* ========== */
-/* = Events = */
-/* ========== */
- 
-.clear { clear: both; }
-.eventcal {
 	float: left;
-	font-size: 20px;
-	padding: 20px;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
 }
 
-.vevent {
-	position: relative;
-	width: 400px;
-	padding: 20px;
-	padding-top: 10px;
-	margin: 0 0px;
-	margin-bottom: 10px;
-	background-color: #fff;
-	-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-	-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-	box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-}
-
-.vevent:before, .vevent:after {
-	position: absolute;
-	width: 40%;
-	height: 10px;
-	content: ' ';
-	left: 12px;
-	bottom: 12px;
-	background: transparent;
-	-webkit-transform: skew(-5deg) rotate(-5deg);
-	-moz-transform: skew(-5deg) rotate(-5deg);
-	-ms-transform: skew(-5deg) rotate(-5deg);
-	-o-transform: skew(-5deg) rotate(-5deg);
-	transform: skew(-5deg) rotate(-5deg);
-	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-	box-shadow: 0 6px 12px rgba(0, 0, 0, 0.3);
-	z-index: -1;
-}
-
-.vevent:after {
-	left: auto;
-	right: 12px;
-	-webkit-transform: skew(5deg) rotate(5deg);
-	-moz-transform: skew(5deg) rotate(5deg);
-	-ms-transform: skew(5deg) rotate(5deg);
-	-o-transform: skew(5deg) rotate(5deg);
-	transform: skew(5deg) rotate(5deg);
-}
-
-.vevent .event-description {
-	margin-left: 10px;
-	margin-right: 10px;
-	text-align:center;
-	font-size: 1.2em;
-	font-weight:bolder;
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
 }
 
- .vevent .event-location{
-	margin-left: 10px;
-	margin-right: 10px;
-	font-size: 1em;
-	font-style: oblique;
-	text-align: center;
-	
+.mail-conv-outside-wrapper-end {
+	clear: both;
 }
 
-.vevent .event-start, .vevent .event-end  {
-	margin-left: 20px;
-	margin-right: 20px;
-	margin-bottom: 2px;
-	margin-top: 2px;
-	font-size: 0.9em;
-	font-variant: small-caps;
-	text-align: left;
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
 }
 
-#new-event-link{
-	width: 130px;
-	padding: 7px;
-	margin-bottom: 10px;
-	margin-left: 170px; ;
-	-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;
-	color: #efefef;
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
 }
 
-#new-event-link: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;
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
 }
 
-#new-event-link:active {
-	background-color: #b20202;
-	position:relative;
-	top:1px;
+.vevent {
+        border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
 }
 
-#new-event-link a {
-	color: #efefef;
-	text-align: center;
+#new-event-link {
+        margin-bottom: 10px;
 }
 
 .edit-event-link, .plink-event-link {
-	float: left;
-	margin-top: 4px;
-	margin-right: 4px;
-	margin-bottom: 15px;
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
 }
 
 .event-description:before {
-	content: url('calendar.png');
-	margin-right: 15px;
-	vertical-align: middle;
+        content: url('../../../images/calendar.png');
+        margin-right: 15px;
 }
 
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
 }
 
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+        float: right;
 }
 
 .event-list-date {
-	color: #626262;
-	margin-bottom: 10px;
-	font-variant:small-caps;
-	font-stretch:condensed;
+        margin-bottom: 10px;
 }
 
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
 }
-
 .event-calendar-end {
-	clear: both;
+        clear: both;
 }
 
+ 
 .calendar {
-	width: 300px;
-	font-family: Helvetica, Arial, sans-serif;
-	background-color: #f1f1f1;
-	border: 1px solid #dedede;
-	margin-bottom: 10px;
-	-moz-box-shadow: 5px 5px 8px #959494;
-	-webkit-box-shadow: 5px 5px 8px #959494;
-	box-shadow: 5px 5px 8px #959494;	
+        font-family: Courier, monospace;
+}
+.today {
+        font-weight: bold;
+        color: #FF0000;
 }
 
-.calendar caption{
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #d60808), color-stop(1, #b20202) );
-	background:-moz-linear-gradient( center top, #d60808 5%, #b20202 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#d60808', endColorstr='#b20202');
-	background-color: #b20202;
-	padding: 10px 0px 10px 0px;
-	width: 300px;
-	color: #ffffff;
-	font-weight: bold;
-	text-align:center;
-	font-variant:small-caps;
-	-moz-box-shadow: 5px 2px 8px #959494;
-	-webkit-box-shadow: 5px 2px 8px #959494;
-	box-shadow: 5px 2px 8px #959494;
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
 }
 
-tr {
-	border: 1px solid #eeeeee;
+.app-title {
+        margin: 10px;
 }
 
-.calendar td {
-	font-size: 14px;
-	text-align: center;
-	padding: 3px 0px;
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
 }
 
-.calendar td > a {
-	background-color: #cdcdcd;
-	padding: 2px;
-	color: #000;
+#identity-manage-choose {
+        margin-bottom: 15px;
 }
 
-.calendar th {
-	font-size: 16px;	
+#identity-submit {
+        margin-top: 20px;
 }
 
-.today {
-	font-weight: bold;
-	text-align: center;
-	background-color: #b20202;
-	color: #fff;
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
 }
- 
-#event-start-text, 
-#event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+
+#photo-photo {
+        float: left;
 }
 
-#event-nofinish-checkbox, 
-#event-nofinish-text, 
-#event-adjust-checkbox, 
-#event-adjust-text,
-#event-share-checkbox {
-	float: left;
+#photo-photo-end {
+        clear: both;
 }
 
-#event-datetime-break {
-	margin-bottom: 10px;
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
 }
 
-#event-nofinish-break, 
-#event-adjust-break,
-#event-share-break {
-	clear: both;
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
 }
 
-#event-desc-text, 
-#event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+.profile-match-break,
+.profile-match-end {
+        clear: both;
 }
 
-#event-submit {
-	margin-top: 10px;
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
 }
 
 /* ============= */
 /* = Directory = */
 /* ============= */
-
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: -2px;
+  top: -20px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
 .directory-item {
-	float: left;
-	margin: 50px 50px 0px 0px;
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: center;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+
+.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}
+#photo-top-end {
+        clear: both;
 }
 
-.directory-details {
-	font-size: 0.9em;
-	font-variant: small-caps;
-	width: 160px;
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
 }
 
-.directory-name {
-	font-size: 1em;
-	font-variant: small-caps;
-	width: 150px;	
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
 }
+
diff --git a/view/theme/vier/wall_item.tpl b/view/theme/vier/wall_item.tpl
index 03cbd4c0b..abd2862a1 100644
--- a/view/theme/vier/wall_item.tpl
+++ b/view/theme/vier/wall_item.tpl
@@ -1,7 +1,7 @@
 {{ if $indent }}{{ else }}
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
+	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
 	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 </div>
 {{ endif }}
@@ -23,8 +23,9 @@
 		</div>
 			<div class="wall-item-actions-author">
 				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">- &nbsp;
+			<span class="wall-item-ago">-
 			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
 			</span>
 			</div>
 		<div class="wall-item-content">
diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl
index 3357bd8e0..2301da1d1 100644
--- a/view/theme/vier/wallwall_item.tpl
+++ b/view/theme/vier/wallwall_item.tpl
@@ -1,7 +1,7 @@
 {{ if $indent }}{{ else }}
 <div class="wall-item-decor">
-	<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
-	{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
+	<span class="icon star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
+	{{ if $lock }}<span class="icon lock fakelink" onclick="lockview(event,$id);" title="$lock">$lock</span>{{ endif }}	
 	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 </div>
 {{ endif }}
@@ -32,6 +32,7 @@
 				$to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a>
 				 $vwall <span class="wall-item-ago">- &nbsp;
 					{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+					{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
 				</span>
 			</div>