Merge pull request #8 from redmatrix/master

get fresh code from HZ base

25 files changed, 113 insertions, 51 deletions

diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
index 518ad1d29..c9b51a63b 100755
--- a/view/tpl/404.tpl
+++ b/view/tpl/404.tpl
@@ -1 +1,3 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$message}}</h1>
+</div>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 0a7cf2d4d..1ed3baafa 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -33,8 +33,13 @@
 		{{/foreach}}
 		<div class="section-content-info-wrapper">
 			<div>
-				{{$addr_text}} <strong>'{{$addr}}'</strong>
+				{{$addr_text}} <strong>'{{$addr}}'</strong>			
 			</div>
+			{{if $locstr}}
+			<div>
+				{{$loc_text}} {{$locstr}}
+			</div>
+			{{/if}}
 			{{if $last_update}}
 			<div>
 				{{$lastupdtext}} {{$last_update}}
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e8b779622..a873457fe 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -6,22 +6,32 @@
 				<h4 class="modal-title">{{$aclModalTitle}}</h4>
 			</div>
 			<div class="modal-body">
+				{{if $jotnets}}
+				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
+         	       <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
+                </div>
+				<div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select">
+				{{$jotnets}}
+				<div class="clear"></div>
+				</div>
+				{{/if}}
+
 				<div id="acl-wrapper">
 					<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
 					<input type="text" id="acl-search" placeholder="&#xf002;">
+
 					<div id="acl-list">
 						<div id="acl-list-content"></div>
+
 					</div>
 					<span id="acl-fields"></span>
 				</div>
+
 				<div class="acl-list-item" rel="acl-template" style="display:none">
 					<img data-src="{0}"><p>{1}</p>
 					<button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
 					<button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
 				</div>
-				{{if $jotnets}}
-				{{$jotnets}}
-				{{/if}}
 			</div>
 			<div class="modal-footer clear">
 				<button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
index 85b476266..56b70bbee 100644
--- a/view/tpl/admin_queue.tpl
+++ b/view/tpl/admin_queue.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$banner}}</h3>
 
 {{if $hasentries}}
@@ -11,4 +12,4 @@
 
 </table>
 
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 26434b20a..4add59a0d 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -49,7 +49,9 @@
     {{include file="field_input.tpl" field=$frontpage}}
     {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
     {{include file="field_checkbox.tpl" field=$login_on_homepage}}
-
+	{{if $directory_server}}
+		{{include file="field_select.tpl" field=$directory_server}}
+	{{/if}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 9f95d2999..18576fd56 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,11 +1,5 @@
-<h1>{{$room_name}}</h1>
-<div id="chatContainer">
-
-    <div id="chatTopBar">
-    	<div id="chatLineHolder"></div>
-	</div>
+<div class="generic-content-wrapper-styled">
 
-	<div id="chatSide">
 	{{if $is_owner}} 
 	<div id="chatDrop">
 	<form id="chat-destroy" method="post" action="chat">
@@ -13,9 +7,20 @@
 		<input type="hidden" name="action" value="drop" />
         <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/>
 	</form>
-	</div><br />		
+	</div>		
 	{{/if}}
 
+<h1>{{$room_name}}</h1>
+
+
+<div id="chatContainer">
+
+    <div id="chatTopBar">
+    	<div id="chatLineHolder"></div>
+	</div>
+
+	<div id="chatSide">
+
     <div id="chatUsers"></div><br />
 	</div>
 	<div class="clear"></div>
@@ -24,14 +29,15 @@
 
         <form id="chat-form" method="post" action="#">
 			<input type="hidden" name="room_id" value="{{$room_id}}" />
-            <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br />
+            <textarea id="chatText" name="chat_text" rows=3></textarea><br />
             <input type="submit" name="submit" value="{{$submit}}" />
         </form>
 
-		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
-
     </div>
-
+	<div id="chatOptionsBar">
+		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
+	</div>
+</div>
 </div>
 
 <script>
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 1317b672b..c64f21c97 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 
 <form action="chat" method="post" >
@@ -10,5 +11,4 @@
 <br />
 <input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
-
-
+</div>
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index 836923231..570aef1c7 100644
--- a/view/tpl/chatrooms.tpl
+++ b/view/tpl/chatrooms.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$header}}</h2>
 
 {{if $is_owner}}
@@ -8,3 +9,4 @@
 
 {{$rooms}}
 
+</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 44e4eb54c..81a586e75 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,4 +1,4 @@
-<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group">
+<div id="files-mkdir-tools" class="section-content-tools-wrapper">
 	<label for="files-mkdir">{{$folder_header}}</label>
 	<form method="post" action="">
 		<input type="hidden" name="sabreAction" value="mkcol">
@@ -7,7 +7,7 @@
 	</form>
 	<div class="clear"></div>
 </div>
-<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
+<div id="files-upload-tools" class="section-content-tools-wrapper">
 	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
 	<label for="files-upload">{{$upload_header}}</label>
 	<form method="post" action="" enctype="multipart/form-data">
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 760d64db0..0d375400c 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -69,11 +69,6 @@
 						<span class="tag">{{$item.folders}}</span>
 					</div>
 					{{/if}}
-					{{if $item.attachments}}
-					<div class="body-tags" id="item-attachments">
-						<span class='tag'>{{$item.attachments}}</span>
-					</div>
-					{{/if}}
 					<div class="clear"></div>
 				</div>
 				{{/if}}
@@ -157,9 +152,15 @@
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
-					{{if $item.responses }}
-					<div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}">
-					{{foreach $item.responses as $verb=>$response}}
+					{{if $item.responses || $item.attachments}}
+					<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count &&  $item.attachments)}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
+						{{foreach $item.responses as $verb=>$response}}
 						{{if $response.count}}
 						<div class="btn-group">
 							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
@@ -176,7 +177,7 @@
 											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 											<h4 class="modal-title">{{$response.title}}</h4>
 										</div>
-										<div class="modal-body">
+										<div class="modal-body response-list">
 										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 										</div>
 										<div class="modal-footer clear">
@@ -188,7 +189,7 @@
 							{{/if}}
 						</div>
 						{{/if}}
-					{{/foreach}}
+						{{/foreach}}
 					</div>
 					{{/if}}
 					<div class="clear"></div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index a3fb642ce..53f65bc78 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -66,11 +66,6 @@
 						<span class="tag">{{$item.folders}}</span>
 					</div>
 					{{/if}}
-					{{if $item.attachments}}
-					<div class="body-tags" id="item-attachments">
-						<span class='tag'>{{$item.attachments}}</span>
-					</div>
-					{{/if}}
 					<div class="clear"></div>
 				</div>
 				{{/if}}
@@ -151,7 +146,13 @@
 						</ul>
 					</div>
 					<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
-					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
+					<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+						{{if $item.attachments}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+						</div>
+						{{/if}}
 						<div class="wall-item-list-comments btn-group">
 							<button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">
 								{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
@@ -164,7 +165,6 @@
 							</button>
 						</div>
 						{{/if}}
-
 						{{if $item.responses }}
 						{{foreach $item.responses as $verb=>$response}}
 						{{if $response.count}}
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index f643a3597..0c808b9a5 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
 	<form action="follow" method="post" />
-		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+		<input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
 		<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
 	</form>
 	{{if $abook_usage_message}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 7638f39e7..67accc1ec 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,5 +1,5 @@
 {{if $attaches}}
 {{foreach $attaches as $a}}
-<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
 {{/foreach}}
 {{/if}}
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 4ace457ed..c94cf60a7 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$header}}</h2>
 
 <script>
@@ -9,6 +10,15 @@ function drophub(id) {
 }
 </script>
 
+<div class="descriptive-text">{{$sync_text}}</div>
+<br />
+<div class="descriptive-text">{{$drop_text}}</div>
+<div class="descriptive-text">{{$last_resort}}</div>
+<br />
+
+
+
+
 <table>
 <tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr>
 {{foreach $hubs as $hub}}
@@ -23,4 +33,6 @@ function drophub(id) {
 {{/if}}
 {{/foreach}}
 </table>
-
+</div>
+<div class="clear"></div>
+<button class="btn btn-std" onclick="window.location.href='/locs/f=&sync=1'; return false;">{{$sync}}</button>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 9472bd961..da38f3571 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 	<div id="login-main">
@@ -16,4 +17,5 @@
 		<input type="hidden" name="{{$k}}" value="{{$v}}" />
 	{{/foreach}}
 </form>
+</div>
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index ff2011181..f78a3fc2d 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
 <form action="new_channel" method="post" id="newchannel-form" class="stylish-select">
@@ -34,3 +35,4 @@
 	<div id="newchannel-submit-end" class="newchannel-field-end"></div>
 
 </form>
+</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 48a3c7f26..fbed32606 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
@@ -27,3 +28,4 @@
 <div id="profile-photo-link-select-wrapper">
 {{$select}}
 </div>
+</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b0ea8b753..20f5df39a 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -31,7 +31,7 @@
 
 				<div class="form-group">
 					<label for="prvmail-text">{{$yourmessage}}</label>
-					<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea>
+					<textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
 				</div>
 
 				<div id="prvmail-submit-wrapper" class="form-group">
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index d072a0b3c..4bd826484 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$header}}</h3>
 
 <div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
@@ -12,6 +13,7 @@
 <input type="hidden" name="target" value="{{$target}}" />
 
 <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+<br />
 <h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
 <textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
 
@@ -20,3 +22,4 @@
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
+</div>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index ed673031a..005b122cf 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
 <form action="register" method="post" id="register-form">
@@ -49,3 +50,4 @@
 	<div id="register-submit-end" class="register-field-end"></div>
 
 </form>
+</div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index ab62ede45..7c1f4578d 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -136,7 +136,7 @@
 					</div>
 				</div>
 			</div>
-			{{if $menus}}
+			
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
 					<h3>
@@ -146,8 +146,12 @@
 					</h3>
 				</div>
 				<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
-					<div class="section-content-wrapper">
-						<div class="form-group">
+					<div class="section-content-tools-wrapper">
+						<div class="ffsapilink">
+							<a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a>
+						</div>
+						{{if $menus}}
+						<div class="form-group channel-menu">
 							<label for="channel_menu">{{$menu_desc}}</label>
 							<select name="channel_menu" class="form-control">
 							{{foreach $menus as $menu }}
@@ -156,12 +160,12 @@
 							</select>
 						</div>
 						<div class="settings-submit-wrapper" >
-							<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
+					{{/if}}
 				</div>
 			</div>
-			{{/if}}
 		</div>
 	</form>
 </div>
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 0b16f5602..e50284b9c 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 <p></p>
 <p>{{$description}}</p>
@@ -22,3 +23,4 @@
    <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div>
 {{/if}}
 <p>{{$donate}}</p>
+</div>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index 34023e03f..a5b384ca3 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -15,7 +16,7 @@
 <br />
 <br />
 <a href="sources/{{$id}}/drop">{{$drop}}</a>
-
+</div>
 
 
 
diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
index 5fe50ba98..76be35b1a 100644
--- a/view/tpl/sources_list.tpl
+++ b/view/tpl/sources_list.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -12,4 +13,5 @@
 <li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
 {{/foreach}}
 </ul>
-{{/if}}
\ No newline at end of file
+{{/if}}
+</div>
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 3c6a4be30..3c8a54373 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$title}}</h1>
 
 <div class="descriptive-text">{{$desc}}</div>
@@ -11,5 +12,5 @@
 <input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
 </div>
 </form>
-
+</div>