From c98b91f5149d53f522a19ec0f69b4d4727d34896 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 17 Aug 2016 18:19:36 -0400 Subject: Stash changes for merge with dev --- view/pdl/mod_webpages.pdl | 1 + view/tpl/website_export_tools.tpl | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 view/tpl/website_export_tools.tpl (limited to 'view') diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index b62ec6e7c..292d6791c 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -1,4 +1,5 @@ [region=aside] [widget=design_tools][/widget] [widget=website_import_tools][/widget] +[widget=website_export_tools][/widget] [/region] \ No newline at end of file diff --git a/view/tpl/website_export_tools.tpl b/view/tpl/website_export_tools.tpl new file mode 100644 index 000000000..36f5c8e24 --- /dev/null +++ b/view/tpl/website_export_tools.tpl @@ -0,0 +1,14 @@ +
+

{{$title}}

+ +
-- cgit v1.2.3 From f2e87a204d0a257edb501dfedaad867700c58842 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 17 Aug 2016 21:25:50 -0400 Subject: Progress implementing zip file export --- view/pdl/mod_webpages.pdl | 3 +- view/tpl/webpage_export_list.tpl | 21 +++++++++++++ view/tpl/website_export_tools.tpl | 14 --------- view/tpl/website_import_tools.tpl | 37 ----------------------- view/tpl/website_portation_tools.tpl | 58 ++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 53 deletions(-) create mode 100644 view/tpl/webpage_export_list.tpl delete mode 100644 view/tpl/website_export_tools.tpl delete mode 100644 view/tpl/website_import_tools.tpl create mode 100644 view/tpl/website_portation_tools.tpl (limited to 'view') diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index 292d6791c..9e4d604ba 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -1,5 +1,4 @@ [region=aside] [widget=design_tools][/widget] -[widget=website_import_tools][/widget] -[widget=website_export_tools][/widget] +[widget=website_portation_tools][/widget] [/region] \ No newline at end of file diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl new file mode 100644 index 000000000..4ee14359d --- /dev/null +++ b/view/tpl/webpage_export_list.tpl @@ -0,0 +1,21 @@ +
+
+ +
+
+ +
+

{{$title}}

+
+
+
+
+ +
+
+ +
+
+
+
+ diff --git a/view/tpl/website_export_tools.tpl b/view/tpl/website_export_tools.tpl deleted file mode 100644 index 36f5c8e24..000000000 --- a/view/tpl/website_export_tools.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
-

{{$title}}

- -
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 @@ -
-

{{$title}}

-
    -
  • - {{$import_label}} -
    • -
  • - -
    • -
-
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl new file mode 100644 index 000000000..d9ebed179 --- /dev/null +++ b/view/tpl/website_portation_tools.tpl @@ -0,0 +1,58 @@ +
+
    +
  • + {{$import_label}} +
    • +
  • + +
    • +
+ +
-- cgit v1.2.3 From 40a7d3821098c095a01e2a30b2b49c53bb38e2cf Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 19 Aug 2016 19:32:52 -0400 Subject: Pages populate the available-to-export list. New checkbox class for smaller boxes. --- view/css/mod_webpages.css | 74 ++++++++++++++++++++++++++++++++++++++++ view/tpl/webpage_export_list.tpl | 42 +++++++++++++++++++---- 2 files changed, 110 insertions(+), 6 deletions(-) (limited to 'view') 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/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index 4ee14359d..1b943ace8 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -9,13 +9,43 @@
-
- -
-
- +
+ +
+ +
+

Pages

+
+ + + {{foreach $pages as $page}} + + + + + + + {{/foreach}} +
Export?Page TitlePage LinkType
+
+ + +
+ 		+
+ {{$page.title}}
+
+ 		+
+ {{$page.pagetitle}}
+
+ 		+
+ {{$page.mimetype}}
+
+
+
-
-- cgit v1.2.3 From 80ed05d45d0e9f7f23848919a3a8af388988fdd9 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 20 Aug 2016 15:22:30 -0400 Subject: Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages. --- view/tpl/webpage_export_list.tpl | 6 ++++-- view/tpl/website_portation_tools.tpl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index 1b943ace8..d980ea981 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -17,7 +17,9 @@

Pages

- + + + {{foreach $pages as $page}} diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl index d9ebed179..2f68a7393 100644 --- a/view/tpl/website_portation_tools.tpl +++ b/view/tpl/website_portation_tools.tpl @@ -46,7 +46,7 @@
- +
-- cgit v1.2.3 From 2d42d587388aeaedf8b53b2b56b3b4ccda37af03 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 20 Aug 2016 16:05:27 -0400 Subject: Layouts list and are selectable for export to the zip file --- view/tpl/webpage_export_list.tpl | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'view') diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index d980ea981..faffbf8c6 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -47,6 +47,41 @@ {{/foreach}}
Export?Page TitlePage LinkType
Export?Page TitlePage LinkType
@@ -27,7 +29,7 @@ -
+
{{$page.title}}
+ +
+

Layouts

+
+ + + + + {{foreach $layouts as $layout}} + + + + + + + {{/foreach}} +
Export?Layout NameLayout DescriptionType
+
+ + +
+ 		+
+ {{$layout.name}}
+
+ 		+
+ {{$layout.description}}
+
+ 		+
+ {{$layout.mimetype}}
+
+
+
-- cgit v1.2.3 From 1c61e316b477460f05b263b9a01cc5d37b5e8cb6 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 20 Aug 2016 21:08:15 -0400 Subject: Block export and re-import works. Fixed bug where layout content was not being imported properly. --- view/tpl/webpage_export_list.tpl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'view') diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index faffbf8c6..1df4586b0 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -82,6 +82,42 @@ {{/foreach}} + +
+

Blocks

+
+ + + + + {{foreach $blocks as $block}} + + + + + + + {{/foreach}} +
Export?Block TitleBlock NameType
+
+ + +
+ 		+
+ {{$block.title}}
+
+ 		+
+ {{$block.name}}
+
+ 		+
+ {{$block.mimetype}}
+
+
+
+ -- cgit v1.2.3 From d39cf23b2f15ed94048ea7596d7581be7ef8c001 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 21 Aug 2016 06:53:19 -0400 Subject: Visual improvements to the export element table --- view/tpl/webpage_export_list.tpl | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'view') diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index 1df4586b0..1d28f62df 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -12,33 +12,33 @@
-
-

Pages

+
+
- + {{foreach $pages as $page}} - - - -
Export?Page TitlePage LinkType
Page LinkPage TitleType
+
+
- {{$page.title}}
+ {{$page.pagetitle}}
 +
- {{$page.pagetitle}}
+ {{$page.title}}
 +
{{$page.mimetype}}
@@ -47,33 +47,33 @@ {{/foreach}}
- +
-

Layouts

+
- + {{foreach $layouts as $layout}} - - - -
Export?Layout NameLayout DescriptionType
Layout NameLayout DescriptionType
+
+
{{$layout.name}}
 +
{{$layout.description}}
 +
{{$layout.mimetype}}
@@ -82,33 +82,33 @@ {{/foreach}}
- +
-

Blocks

+
- + {{foreach $blocks as $block}} - - - -
Export?Block TitleBlock NameType
Block NameBlock TitleType
+
+
- {{$block.title}}
+ {{$block.name}}
 +
- {{$block.name}}
+ {{$block.title}}
 +
{{$block.mimetype}}
-- cgit v1.2.3 From 305e0538d293ff4ad72f30b11998ae3b06efa4ea Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 23 Aug 2016 06:55:26 -0400 Subject: Website export to cloud files works. Created new recursive copy function in attach.php. --- view/tpl/website_portation_tools.tpl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl index 2f68a7393..10468b64e 100644 --- a/view/tpl/website_portation_tools.tpl +++ b/view/tpl/website_portation_tools.tpl @@ -35,7 +35,7 @@
  • - {{$export_label}}
  • @@ -53,6 +53,20 @@ +
-- cgit v1.2.3 From b775a1aa0e36a74f0f937d85f458fd12af18a264 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 30 Aug 2016 21:43:33 -0700 Subject: The 'save to folder' modal dialog looked like crap. Now it only looks like dung. --- view/css/conversation.css | 8 ++++++++ view/tpl/field_combobox.tpl | 10 +++++----- view/tpl/filer_dialog.tpl | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 6c5171545..677198149 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -319,3 +319,11 @@ img.smiley.emoji:hover { width: 32px; height: 32px; } + +.combobox { + padding: 15px; +} + +#filer_save { + margin-left: 15px; +} \ 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 @@ -
+
- {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill + {{* {{foreach $field.4 as $opt=>$val}} *}} + *}} - - + 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 @@ +
{{include file="field_combobox.tpl"}}
+
-- cgit v1.2.3 From 2b9322fc7d879fecbe334083bbd028538c985c54 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 31 Aug 2016 09:38:47 +0200 Subject: provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox --- view/css/conversation.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 6c5171545..fe89e2536 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -319,3 +319,8 @@ img.smiley.emoji:hover { width: 32px; height: 32px; } + +input.listcheckbox { + margin: 0px; + vertical-align: middle; +} -- cgit v1.2.3