Merge remote branch 'upstream/master'

14 files changed, 49 insertions, 6 deletions

diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
index 061821beb..5dbd871a8 100644
--- a/view/categories_widget.tpl
+++ b/view/categories_widget.tpl
@@ -1,4 +1,3 @@
-<div class="clear"></div>
 <div id="categories-sidebar" class="widget">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
index eb46c6c43..a79648712 100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -9,3 +9,4 @@
 		</div>
 {{ endif }}
 </div>
+<div class="clear"></div>
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index eeedda3a4..c68ca7f1d 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -17,6 +17,9 @@
 			<ul>
 				<li><div id="contact-edit-rel">$relation_text</div></li>
 				<li><div id="contact-edit-nettype">$nettype</div></li>
+				{{ if $lost_contact }}
+					<li><div id="lost-contact-message">$lost_contact</div></li>
+				{{ endif }}
 				{{ if $insecure }}
 					<li><div id="insecure-message">$insecure</div></li>
 				{{ endif }}
diff --git a/view/conversation.tpl b/view/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/posted_date_widget.tpl b/view/posted_date_widget.tpl
new file mode 100644
index 000000000..3e2ee5a3e
--- /dev/null
+++ b/view/posted_date_widget.tpl
@@ -0,0 +1,9 @@
+<div id="datebrowse-sidebar" class="widget">
+	<h3>$title</h3>
+<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size">
+{{ for $dates as $d }}
+<option value="$url/$d.1/$d.2" >$d.0</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 22314d88a..47f34685f 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index c49cdf26b..ca1b560a6 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div class="delete-checked">
 <a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index ab660888f..be755d411 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1608,7 +1608,7 @@ input#dfrn-url {
 .contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
-#block-message, #ignore-message, #archive-message {
+#block-message, #ignore-message, #archive-message, #lost-contact-message {
 	color: #FF0000;
 }
 
@@ -3226,3 +3226,7 @@ ul.menu-popup {
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
 .autocomplete .selected { background:#F0F0F0; }
 .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
+
+#datebrowse-sidebar select {
+	margin-left: 25px;
+}
diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index 7bb7cd2fd..7ca3daea7 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -1,6 +1,8 @@
 {{ for $threads as $thread }}
 <div id="tread-wrapper-$thread.id" class="tread-wrapper">
 	{{ for $thread.items as $item }}
+        {{if $mode == display}}
+        {{ else }}
 		{{if $item.comment_firstcollapsed}}
 			<div class="hide-comments-outer">
 			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
@@ -8,7 +10,8 @@
 			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
 		{{endif}}
 		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
+        {{ endif }}
+        
 		{{ if $item.type == tag }}
 			{{ inc wall_item_tag.tpl }}{{ endinc }}
 		{{ else }}
@@ -19,6 +22,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <a href="#" onclick="deleteCheckedItems();return false;">
 	<span class="icon s22 delete text">$dropping</span>
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index aa4d4b800..8a8f8c726 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -88,6 +88,20 @@ nav #site-location {
 	box-shadow: 4px 4px 3px 0 #444444;
 }
 
+#datebrowse-sidebar select {
+	margin-left: 25px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+#datebrowse-sidebar select:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/theme/testbubble/conversation.tpl
+++ b/view/theme/testbubble/conversation.tpl
@@ -16,6 +16,8 @@
 </div>
 {{ endfor }}
 
+<div id="conversation-end"></div>
+
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index a3a79598e..a6a96d879 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info" id="wall-item-info-$item.id">
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 1044f7ae4..37e56ee8b 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,4 +1,4 @@
-<a name="$item.id" />
+<a name="$item.id" ></a>
 <div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">