Merge remote-tracking branch 'mike/master' into dev

8 files changed, 67 insertions, 1 deletions

diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl
index 8353b4571..0bcdfdee3 100644
--- a/view/pdl/mod_search.pdl
+++ b/view/pdl/mod_search.pdl
@@ -1,5 +1,5 @@
 [region=aside]
-[comment][widget=sitesearch][/widget][/comment]
+[widget=sitesearch][/widget]
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index aea75df65..9f9ece7c3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1695,3 +1695,26 @@ dl.bb-dl > dd > li {
 #permcat-index {
 	margin: 10px;
 }
+
+.cloud-container {
+	float: left;
+	width: 80px;
+	height: 80px;
+	margin: 5px;
+}
+
+.cloud-icon i {
+	font-size: 48px;
+}
+
+.cloud-icon img {
+	width: 48px;
+	height: 48px;
+}
+
+.cloud-title {
+	width: 78px;
+	height: 36px;
+	overflow: hidden;
+}
+
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index d6ff34f93..6b39e844a 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -88,6 +88,7 @@
 	{{include file="field_input.tpl" field=$timeout}}
 	{{include file="field_input.tpl" field=$delivery_interval}}
 	{{include file="field_input.tpl" field=$delivery_batch_count}}
+	{{include file="field_input.tpl" field=$force_queue}}
 	{{include file="field_input.tpl" field=$poll_interval}}
 	{{include file="field_input.tpl" field=$maxloadavg}}
 	{{include file="field_input.tpl" field=$abandon_days}}
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index a76d4e549..bfe5c8a08 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -29,6 +29,7 @@
 	var bParam_dbegin = "{{$dbegin}}";
 	var bParam_mid = "{{$mid}}";
 	var bParam_verb = "{{$verb}}";
+	var bParam_net = "{{$net}}";
 
 	function buildCmd() {
 		var udargs = ((page_load) ? "/load" : "");
@@ -57,6 +58,7 @@
 		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
 		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
 		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
+		if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net;
 		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
 		return(bCmd);
 	}
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index e8ae6a590..40278661f 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,4 +1,38 @@
 <div id="cloud-drag-area" class="section-content-wrapper-np">
+	{{if $tiles}}
+
+	{{if $parentpath}}
+	<div class="cloud-container" >
+	<div class="cloud-icon"><a href="{{$parentpath.path}}">
+	<i class="fa fa-fw fa-level-up" ></i>
+	</a>
+	</div>
+	<div class="cloud-title"><a href="{{$parentpath.path}}">..</a>
+	</div>
+	</div>
+	{{/if}}
+
+	{{foreach $entries as $item}}
+	<div class="cloud-container">
+	<div class="cloud-icon"><a href="{{$item.fullPath}}">
+	{{if $item.photo_icon}}
+	<img src="photo/{{$item.photo_icon}}" title="{{$item.type}}" >
+	{{else}}
+	<i class="fa fa-fw {{$item.iconFromType}}" title="{{$item.type}}"></i>
+	{{/if}}
+	</a>
+	</div>
+	<div class="cloud-title"><a href="{{$item.fullPath}}">
+	{{$item.displayName}}
+	</a>
+	</div>
+	{{if $item.is_owner}}
+
+	{{/if}}
+	</div>
+	{{/foreach}}
+	<div class="clear"></div>
+	{{else}}
 	<table id="cloud-index">
 		<tr>
 			<th width="1%"></th>
@@ -42,4 +76,5 @@
 
 	{{/foreach}}
 	</table>
+	{{/if}}
 </div>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index c1e589341..468f2febc 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,6 +1,7 @@
 <div class="section-title-wrapper">
 	{{if $actionspanel}}
 	<div class="pull-right">
+		<a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-list-ul{{else}}fa-table{{/if}}"></i></a>
 		{{if $is_owner}}
 		<a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
 		{{/if}}
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
index 2ea89b6c1..66b8209c9 100644
--- a/view/tpl/pdledit.tpl
+++ b/view/tpl/pdledit.tpl
@@ -11,7 +11,10 @@
 <br />
 <br />
 
+<div class="descriptive-text">{{$original}}</div>
+<pre><code>{{$src}}</code></pre>
 
+<br />
 
 <form action="pdledit" method="post" >
 <input type="hidden" name="module" value="{{$module}}" />
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index d8c1ac7aa..d1e6e0609 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -64,6 +64,7 @@
 						{{include file="field_input.tpl" field=$channel_divmore_height}}
 						{{include file="field_input.tpl" field=$network_divmore_height}}
 						{{include file="field_checkbox.tpl" field=$nosmile}}
+						{{include file="field_checkbox.tpl" field=$channel_menu}}
 						{{include file="field_checkbox.tpl" field=$title_tosource}}
 						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
 						{{include file="field_checkbox.tpl" field=$network_list_mode}}