From: ArthurHoaro Date: Sun, 7 Aug 2016 13:57:47 +0000 (+0200) Subject: Configure page X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1b383041f63a231afdfe180acd9b73375a8890ed;p=github%2Fshaarli%2FShaarli.git Configure page --- diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 8e64064f..bc328daa 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html @@ -9,7 +9,7 @@

{"Shaare a new link"|t}

-
+
diff --git a/tpl/default/configure.html b/tpl/default/configure.html new file mode 100644 index 00000000..0d1bd6ff --- /dev/null +++ b/tpl/default/configure.html @@ -0,0 +1,185 @@ + + + + {include="includes"} + + +{include="page.header"} + +{$ratioLabel='5-12'} +{$ratioLabelMobile='7-8'} +{$ratioInput='7-12'} +{$ratioInputMobile='1-8'} + + +
+
+
+

{'Configure'|t}

+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ {ignore}FIXME! too hackish, needs to be fixed upstream{/ignore} +
{$timezone_form}
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +{include="page.footer"} + + + + + diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 2f2f142d..339ba300 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -15,6 +15,7 @@ body { .center { text-align: center; + margin: auto; } .label { @@ -597,7 +598,7 @@ pre { } /** - * Login page + * PAGE FORM */ .page-form { margin: 20px 0 0 0; @@ -617,14 +618,6 @@ pre { border-bottom: 1px solid #797979; } -.page-form div, .page-form p { - text-align: center; -} - -.page-form p { - color: #b0ddce; -} - .page-form input[type="text"], .page-form input[type="password"] { margin: 10px 0; padding: 5px 5px 3px 15px; @@ -643,12 +636,6 @@ pre { color: #b0ddce; } -#login-form .remember-me { - margin: 5px 0; - color: #b0ddce; - font-weight: bold; -} - .page-form input[type="submit"] { margin: 10px 0; height: 35px; @@ -662,10 +649,108 @@ pre { color: #b0ddce; } +.page-form select { + color: black; +} +/** + * PAGE FORM - LIGHT + */ +.page-form-light div, .page-form-light p { + text-align: center; +} + +.page-form-light p { + color: #b0ddce; +} + +/** + * PAGE FORM - COMPLETE + */ +.page-form-complete { + #background: #ddd; +} + +.page-form-complete div, .page-form-complete p { + color: #b0ddce; +} + +.page-form-complete .form-label, .page-form-complete .form-input { + position: relative; + height: 60px; +} + +.page-form-complete .form-label label, +.page-form-complete .form-input input, +.page-form-complete .timezone { + position: absolute; + top: 50%; + transform: translateY(-50%); +} + +.page-form-complete .form-label label { + text-align: right; + right: 0; + padding: 0 20px; +} + +.page-form-complete .label-name { + font-weight: bold; +} + +.page-form-complete .label-desc { + font-size: 0.7em; +} + +@media screen and (max-width: 64em) { + .page-form-complete .form-label { + height: inherit; + } + + .page-form-complete .form-label label, + .page-form-complete .form-input input, + .page-form-complete .timezone { + position: inherit; + top: inherit; + transform: translateY(0); + } + + .page-form-complete .form-input input[type="checkbox"] { + position: absolute; + top: 50%; + right: 50%; + transform: translateY(-50%); + } + + .page-form-complete .form-input { + text-align: center; + } + + .page-form-complete .form-label label { + display: block; + text-align: left; + margin: 10px 0 0 0; + } + + .timezone-continent:after { + content:"\a\a"; + white-space: pre; + } +} + + #page404 { color: #3f3f3f; } +/** + * LOGIN + */ +#login-form .remember-me { + margin: 5px 0; + color: #b0ddce; + font-weight: bold; +} + /** * CONTENT - LINKLIST ITEMS */ diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index f28e6a47..21923606 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html @@ -18,7 +18,7 @@ {else}
-
+

{'Login'|t}

diff --git a/tpl/default/tools.html b/tpl/default/tools.html index a2132bd5..96e7fb10 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -8,8 +8,8 @@
-
-

Settings

+
+

{'Settings'|t}

{'Configure your Shaarli'|t} @@ -52,13 +52,11 @@ {/loop}
- -
-
+

Bookmarklets

{'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, @@ -92,12 +90,11 @@

-
-
+

Firefox Social API

{'You need to browse your Shaarli over HTTPS to use this functionality.'|t}

@@ -108,12 +105,11 @@
-
-
+

{'3rd party'|t}