resolve merge conflict

8 files changed, 286 insertions, 43 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index fe89e2536..6acca4b0d 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -324,3 +324,11 @@ input.listcheckbox {
 	margin: 0px;
 	vertical-align: middle;
 }
+
+.combobox {
+	padding: 15px;
+}
+
+#filer_save {
+	margin-left: 15px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index f72f632dd..805d95dc2 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -119,3 +119,77 @@
 	opacity: 1;
 }
 
+
+/* SQUARED THREE */
+.squaredThree {
+	width: 14px;
+	height: 14px;
+	background: #fcfff4;
+
+	background: -webkit-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -moz-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -o-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -ms-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfff4', endColorstr='#b3bead',GradientType=0 );
+	margin: 5px auto;
+
+	-webkit-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	-moz-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	position: relative;
+}
+
+.squaredThree label {
+	cursor: pointer;
+	position: absolute;
+	width: 10px;
+	height: 10px;
+	left: 2px;
+	top: 2px;
+
+	-webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+	-moz-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+	box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+
+	background: -webkit-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -moz-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -o-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -ms-linear-gradient(top, #222 0%, #45484d 100%);
+	background: linear-gradient(top, #222 0%, #45484d 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#222', endColorstr='#45484d',GradientType=0 );
+}
+
+.squaredThree label:after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	content: '';
+	position: absolute;
+	width: 9px;
+	height: 5px;
+	background: transparent;
+	top: 2px;
+	left: 2px;
+	border: 3px solid #fcfff4;
+	border-top: none;
+	border-right: none;
+
+	-webkit-transform: rotate(-45deg);
+	-moz-transform: rotate(-45deg);
+	-o-transform: rotate(-45deg);
+	-ms-transform: rotate(-45deg);
+	transform: rotate(-45deg);
+}
+
+.squaredThree label:hover::after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: 0.3;
+}
+
+.squaredThree input[type=checkbox]:checked + label:after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
\ No newline at end of file
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
index b62ec6e7c..9e4d604ba 100644
--- a/view/pdl/mod_webpages.pdl
+++ b/view/pdl/mod_webpages.pdl
@@ -1,4 +1,4 @@
 [region=aside]
 [widget=design_tools][/widget]
-[widget=website_import_tools][/widget]
+[widget=website_portation_tools][/widget]
 [/region]
\ No newline at end of file
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
index 337c60673..523595c0b 100755
--- a/view/tpl/field_combobox.tpl
+++ b/view/tpl/field_combobox.tpl
@@ -1,13 +1,13 @@
-	<div class='field combobox'>
+	<div class='field combobox input form-group'>
 		<label class="mainlabel" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
-		{{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill
+		{{*
 		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
 		<datalist id="data_{{$field.0}}" >
 		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
-		</datalist> *}}
+		</datalist>*}} 
 		
-		<input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
-		<select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
+		<input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}">
+		<select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())">
 			<option value="">{{$field.5}}</option>
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
 		</select>
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
index ae59ab713..71e075958 100755
--- a/view/tpl/filer_dialog.tpl
+++ b/view/tpl/filer_dialog.tpl
@@ -1,4 +1,6 @@
+<div class="item-filer-dialog">
 {{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
 	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl
new file mode 100644
index 000000000..1d28f62df
--- /dev/null
+++ b/view/tpl/webpage_export_list.tpl
@@ -0,0 +1,124 @@
+<div class="generic-content-wrapper">
+		<form action="" method="post" autocomplete="on" >
+		<input type="hidden" name="action" value="{{$action}}">
+		<div class="section-title-wrapper">
+			<div class="pull-right">				
+					<button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</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>
+				<hr>
+				<!--<h4>Pages</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th></th><th>Page Link</th><th>Page Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $pages as $page}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="page_{{$page.mid}}" name="page[]" value="{{$page.mid}}">
+										<label for="page_{{$page.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$page.pagetitle}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$page.title}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$page.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Layouts</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="20px"></th><th>Layout Name</th><th>Layout Description</th><th>Type</th></tr>
+						</thead>
+						{{foreach $layouts as $layout}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="layout_{{$layout.mid}}" name="layout[]" value="{{$layout.mid}}">
+										<label for="layout_{{$layout.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$layout.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$layout.description}}<br>
+										</div>
+									</td>
+									<td width="15%">
+										<div class='desc'>
+											{{$layout.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				<hr>
+				<div class="clear"></div>
+				<!--<h4>Blocks</h4>-->
+				<div>
+				<table class="table-striped table-responsive table-hover" style="width: 100%;">
+						<thead>
+								<tr><th width="30px"></th><th>Block Name</th><th>Block Title</th><th>Type</th></tr>
+						</thead>
+						{{foreach $blocks as $block}}
+								<tr>
+									<td width="30px" style="padding-right: 20px;">
+										<div class='squaredThree'>
+										<input type="checkbox" id="block_{{$block.mid}}" name="block[]" value="{{$block.mid}}">
+										<label for="block_{{$block.mid}}"></label>
+										</div>
+									</td>
+									<td width="30%">
+										<div class="desc">
+											{{$block.name}}<br>
+										</div>
+									</td>
+									<td width="55%">
+										<div class='desc'>
+											{{$block.title}}<br>
+										</div>
+									</td>
+									<td width=15%">
+										<div class='desc'>
+											{{$block.mimetype}}<br>
+										</div>
+									</td>
+								</tr>
+						{{/foreach}}
+				</table>
+				</div>
+				
+		</div>
+		</form>
+</div>
+
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
deleted file mode 100644
index cb3e6b524..000000000
--- a/view/tpl/website_import_tools.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<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>
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
new file mode 100644
index 000000000..10468b64e
--- /dev/null
+++ b/view/tpl/website_portation_tools.tpl
@@ -0,0 +1,72 @@
+<div id="website-portation-tools" class="widget">
+		<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 style="margin-left: 12px;" >
+						<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: 10px;" 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>
+		<ul class="nav nav-pills nav-stacked">
+				<li>
+						<a href="#" onclick="openClose('export-form'); openClose('export-cloud-form');
+					return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
+				</li>
+				<li style="margin-left: 12px;" >
+						<form id="export-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+								<input type="hidden" name="action" value="exportzipfile">
+								<!-- Or download a zipped file containing the website -->
+								<p style="margin-top: 10px;" class="descriptive-text">{{$file_download_text}}</p>
+								<div class="form-group">
+
+										<div class="input-group">
+												<input class="widget-input" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="w_download" value="w_download"><i class="fa fa-download generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+						</form>
+						<form id="export-cloud-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+								<input type="hidden" name="action" value="exportcloud">
+								<!-- Or export the website elements to a cloud files folder -->
+								<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
+								<div class="form-group">
+
+										<div class="input-group">
+												<input class="widget-input" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
+												<div class="input-group-btn">
+														<button class="btn btn-default btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}"><i class="fa fa-folder-open generic-icons"></i></button>
+												</div>
+										</div>
+								</div>
+						</form>
+				</li>
+		</ul>
+</div>