From 6eafe49eb9afad21b0ce2069489ef1dfc1daf941 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 15 Oct 2016 17:01:37 +0200 Subject: [PATCH] Import/export templates and minor fixes --- tpl/default/css/shaarli.css | 17 +++++++ tpl/default/export.html | 73 ++++++++++++++++++++++++++++++ tpl/default/import.html | 87 ++++++++++++++++++++++++++++++++++++ tpl/default/js/shaarli.js | 5 ++- tpl/default/loginform.html | 4 +- tpl/default/page.footer.html | 2 +- tpl/default/page.header.html | 26 ++++++----- 7 files changed, 197 insertions(+), 17 deletions(-) create mode 100644 tpl/default/export.html create mode 100644 tpl/default/import.html diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 22c173b1..4b1be7e2 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -789,6 +789,11 @@ pre { content:"\a\a"; white-space: pre; } + + .page-form-complete .radio-buttons { + text-align: left; + padding: 5px 15px; + } } @@ -970,3 +975,15 @@ pre { border-top-style: none; } } + + +/** + * IMPORT + */ +#import-field { + margin: 15px 0; +} + +@media screen and (max-width: 64em) { + +} \ No newline at end of file diff --git a/tpl/default/export.html b/tpl/default/export.html new file mode 100644 index 00000000..f6419763 --- /dev/null +++ b/tpl/default/export.html @@ -0,0 +1,73 @@ + + + + {include="includes"} + + +{include="page.header"} + +{$ratioLabel='5-12'} +{$ratioLabelMobile='7-8'} +{$ratioInput='7-12'} +{$ratioInputMobile='1-8'} + +
+
+
+
+
+

{"Export Database"|t}

+
+ + + +
+
+
+ +
+
+
+
+
+ + {'All'|t} +
+
+ + {'Private'|t} +
+
+ + {'Public'|t} +
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +{include="page.footer"} + + diff --git a/tpl/default/import.html b/tpl/default/import.html new file mode 100644 index 00000000..3e770110 --- /dev/null +++ b/tpl/default/import.html @@ -0,0 +1,87 @@ + + + + {include="includes"} + + +{include="page.header"} + +{$ratioLabel='5-12'} +{$ratioLabelMobile='7-8'} +{$ratioInput='7-12'} +{$ratioInputMobile='1-8'} + +
+
+
+
+
+

{"Import Database"|t}

+
+ + +
+ + +
+ +
+
+
+ +
+
+
+
+
+ + Use values from the imported file, default to public +
+
+ + Import all bookmarks as private +
+
+ + Import all bookmarks as public +
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +{include="page.footer"} + + diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index e5425486..53ec20c5 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -166,9 +166,10 @@ if (hiddenReturnurl != null) { hiddenReturnurl.value = window.location.href; } - +/** + * Autofocus text fields + */ var autofocusElements = document.querySelector('.autofocus'); -console.log(autofocusElements); if (autofocusElements != null) { autofocusElements.focus(); } \ No newline at end of file diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 21923606..28c92f3e 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html @@ -28,8 +28,8 @@
- - + +
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index f5a92382..b9d4389b 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -3,7 +3,7 @@
-
-
- - -
- - + {if="!isLoggedIn()"} + +
+ + +
+ + +
+ + +
- - - -
- + + {/if} {if="!empty($newVersion) || !empty($versionError)"}
-- 2.41.0