Merge remote-tracking branch 'friendica/master'

5 files changed, 63 insertions, 3 deletions

diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 0216e31d3..49751c42b 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -5,6 +5,7 @@
 				<input type="hidden" name="parent" value="$parent" />
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 
 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
@@ -15,6 +16,8 @@
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
 					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" style="display:none;"></div>
 				</div>
 
 				<div class="comment-edit-end"></div>
diff --git a/view/nets.tpl b/view/nets.tpl
new file mode 100644
index 000000000..b0cb8890c
--- /dev/null
+++ b/view/nets.tpl
@@ -0,0 +1,10 @@
+<div id="nets-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
+	<ul class="nets-ul">
+	{{ for $nets as $net }}
+	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	{{ endfor }}
+	</ul>
+</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 2f9691cad..48fa05368 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -306,7 +306,7 @@ div.wall-item-content-wrapper.shiny {
 	margin-bottom: 10px;
 }
 
-.group-selected {
+.group-selected, .nets-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
@@ -1842,6 +1842,21 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
+.nets-ul {
+	list-style-type: none;
+}
+
+.nets-ul li {
+	margin-top: 10px;
+}
+
+.nets-link {
+	margin-left: 24px;
+}
+.nets-all {
+	margin-left: 42px;
+}
+
 #search-save {
 	margin-left: 5px;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 6b8aef500..ff31a7807 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -164,7 +164,7 @@ blockquote:before {
     margin-bottom: 10px;
 }
 
-.group-selected {
+.group-selected, .nets-selected {
     padding: 3px;
     border: 1px solid #CCCCCC;
     background: #F8F8F8;
@@ -1901,6 +1901,21 @@ a.mail-list-link {
 	width: 12px;
 }
 
+.nets-ul {
+	list-style-type: none;
+}
+
+.nets-ul li {
+	margin-top: 10px;
+}
+
+.nets-link {
+	margin-left: 24px;
+}
+.nets-all {
+	margin-left: 42px;
+}
+
 #search-save {
     margin-left: 5px;
 }
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 3a5d9f178..54bbdeb98 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -630,7 +630,7 @@ h3#search:before {
 	top:1px;
 }
 
-.group-selected {
+.group-selected, .nets-selected {
 	padding-bottom: 0px;
 	padding-left: 2px;
 	padding-right: 2px;
@@ -668,6 +668,23 @@ ul .sidebar-group-li .icon{
 	width: 12px;
 }
 
+
+.nets-ul {
+	list-style-type: none;
+}
+
+.nets-ul li {
+	margin-top: 10px;
+}
+
+.nets-link {
+	margin-left: 24px;
+}
+.nets-all {
+	margin-left: 42px;
+}
+
+
 .widget h3{
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
 	background:-moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );