Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

4 files changed, 202 insertions, 7 deletions

diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index b54a4f3c3..c87b9ac79 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -9,7 +9,7 @@
 	</td>
 	{{/if}}
 	<td class="abook-me">
-		{{if $self || !$field.5}}
+		{{if $self || !$field.5 || $twocol }}
 		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
 		{{/if}}
 		{{if $notself && $field.5}}
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 22af381e9..6f08ce971 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -17,13 +17,45 @@
 			<div class="settings-submit-wrapper form-group">
 				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 			</div>
-		</form>
-		<div class="descriptive-text">{{$desc2}}</div>
-		<ul>
-			<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-			<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
-		</ul>
 	</div>
+
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
+			<h3>
+				<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+				{{$permlbl}}
+				</a>
+			</h3>
+		</div>
+		<div id="perms-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="perms-tool">
+			<div class="section-content-tools-wrapper">
+				<div class="section-content-warning-wrapper">
+				{{$permnote}}
+				</div>
+
+				<table id="perms-tool-table" class=form-group>
+					<tr>
+						<td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td>
+					</tr>
+						{{foreach $perms as $prm}}
+						{{include file="field_acheckbox.tpl" field=$prm}}
+						{{/foreach}}
+				</table>
+
+				<div class="settings-submit-wrapper" >
+					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	</form>
+
+	<div class="descriptive-text">{{$desc2}}</div>
+	<ul>
+		<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+		<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+	</ul>
+
 	{{if $tokens}}
 	<div class="section-content-wrapper-np">
 		<table id="atoken-index">
diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
new file mode 100644
index 000000000..fdc983932
--- /dev/null
+++ b/view/tpl/webpage_import.tpl
@@ -0,0 +1,126 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="importselected">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button>
+			</div>
+			<h2>{{$title}}</h2>
+			<div class="clear"></div>
+		</div>
+		<div id="import-website-content-wrapper" class="section-content-wrapper">
+						<div class="pull-left">
+								<button id="toggle-select-all" class="btn btn-xs btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i>&nbsp;Toggle Select All</button>
+						</div>
+						<div class="clear"></div>
+						<h4>Scanned Pages</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+							<tr><td>Import?</td><td>Page</td><!--<td>Existing Page</td>--></tr>
+						{{foreach $pages as $page}}
+								<tr>
+									<td>
+										<div class='squaredTwo'>
+										<input type="checkbox" id="page_{{$page.pagelink}}" name="page[]" value="{{$page.pagelink}}">
+										<label for="page_{{$page.pagelink}}"></label>
+										</div>
+									</td>
+									<td>
+										<div class='desc'>
+											Page Link: {{$page.pagelink}}<br>
+											Layout: {{$page.layout}}<br>
+											Title: {{$page.title}}<br>
+											Content File: {{$page.contentfile}}<br>
+											Type: {{$page.type}}<br>
+										</div>
+									</td>
+								<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+									<td>
+										<div class='desc'>
+											Name: {{$page.curpage.pagelink}}<br>
+											Layout: {{$page.curpage.layout}}<br>
+											Title: {{$page.curpage.title}}<br>
+											Last edit: {{$page.curpage.edited}}<br>
+											Type: {{$page.curpage.type}}<br>
+										</div>
+									</td>
+								-->
+								</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+
+						<h4>Scanned Layouts</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Layout</td><!--<td>Existing Layout</td>--></tr>
+						{{foreach $layouts as $layout}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="layout_{{$layout.name}}" name="layout[]" value="{{$layout.name}}">
+														<label for="layout_{{$layout.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$layout.name}}<br>
+																Description: {{$layout.description}}<br>
+																Content File: {{$layout.contentfile}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$layout.curblock.name}}<br>
+																Title: {{$layout.curblock.description}}<br>
+																Last edit: {{$layout.curblock.edited}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+
+						<h4>Scanned Blocks</h4>
+						<div>
+						<table class="table-striped table-responsive table-hover" style="width: 100%;">
+								<tr><td>Import?</td><td>Block</td><!--<td>Existing Block</td>--></tr>
+						{{foreach $blocks as $block}}
+										<tr>
+												<td>
+														<div class='squaredTwo'>
+														<input type="checkbox" id="block_{{$block.name}}" name="block[]" value="{{$block.name}}">
+														<label for="block_{{$block.name}}"></label>
+														</div>
+												</td>
+												<td>
+														<div class='desc'>
+																Name: {{$block.name}}<br>
+																Title: {{$block.title}}<br>
+																Content File: {{$block.contentfile}}<br>
+																Type: {{$block.type}}<br>
+														</div>
+												</td>
+												<!-- TODO: Retrieve existing element information to avoid accidental overwriting
+												<td>
+														<div class='desc'>
+																Name: {{$block.curblock.name}}<br>
+																Title: {{$block.curblock.title}}<br>
+																Last edit: {{$block.curblock.edited}}<br>
+																Type: {{$block.curblock.type}}<br>
+														</div>
+												</td>
+												-->
+										</tr>
+						{{/foreach}}
+						</table>
+						</div>
+				
+		</div>
+		<div class="clear"></div>
+		</form>
+</div>
+
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
new file mode 100644
index 000000000..cb3e6b524
--- /dev/null
+++ b/view/tpl/website_import_tools.tpl
@@ -0,0 +1,37 @@
+<div id="website-import-tools" class="widget">
+		<h3>{{$title}}</h3>
+		<ul class="nav nav-pills nav-stacked">
+				<li>
+						<a href="#" onclick="openClose('import-form');
+					return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+				</li>
+				<li>
+						<form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+
+								<input type="hidden" name="action" value="scan">
+								
+								<p style="margin-top: 20px;" class="descriptive-text">{{$file_import_text}}</p>
+								<div class="form-group">
+										<div class="input-group">
+												<input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+
+								<!-- Or upload a zipped file containing the website -->
+								<p class="descriptive-text">{{$file_upload_text}}</p>
+								<div class="form-group">
+
+										<div class="input-group">
+												<input class="widget-input" type="file" name="zip_file" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="w_upload" value="w_upload"><i class="fa fa-file-archive-o generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+						</form>
+				</li>
+		</ul>
+</div>