Merge pull request #72 from Silvus/dev

Style de l'écran de connexion
author: Nicolas Lœuillet <nicolas@loeuillet.org> 2013-04-22 23:04:18 -0700
committer: Nicolas Lœuillet <nicolas@loeuillet.org> 2013-04-22 23:04:18 -0700
commit: 2761de0184d03ad85f69589c379c94049bb43d24 (patch)
tree: c28cb3df3f1069934ec1be771e344879a7d09222 /tpl
parent: d3607de9297d1af9a788c90b1297e644ce882ca7 (diff)
parent: d2beefd27c814acdfa248e4ca469e6cad06288a4 (diff)
download: wallabag-2761de0184d03ad85f69589c379c94049bb43d24.tar.gz
wallabag-2761de0184d03ad85f69589c379c94049bb43d24.tar.zst
wallabag-2761de0184d03ad85f69589c379c94049bb43d24.zip
2 files changed, 24 insertions, 22 deletions
diff --git a/tpl/home.html b/tpl/home.html
index ad881997..e99e1680 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,6 +1,6 @@
    <body class="light-style">
        <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
        </header>
        <div id="main">
            <ul id="links">
@@ -10,7 +10,7 @@
                <li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>
                <li><a href="?logout" title="Logout">logout</a></li>
            </ul>
-            {if condition="isset($entries)"} 
+            {if condition="isset($entries)"}
            <ul id="sort">
                <li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>
                <li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>
diff --git a/tpl/login.html b/tpl/login.html
index 12927692..66dac99b 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,31 +1,33 @@
 {include="head"}
    <body class="light-style">
        <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
        </header>
        <div id="main">
            <form method="post" action="?login" name="loginform">
-                <fieldset>
+                <fieldset class="w500p center">
-                    <h2>login to your poche</h2>
+                    <h2 class="mbs txtcenter">login to your poche</h2>
-                    <ul id="login">
+                                        <div class="row">
-                        <li>
+                                                <label class="col w150p" for="login">Login</label>
-                            <label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1">
+                                                <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
-                        </li>
+                                        </div>
-                        <li>
+                                        <div class="row">
-                            <label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2">
+                                                <label class="col w150p" for="password" >Password</label>
-                        </li>
+                                                <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
-                        <li>
+                                        </div>
-                            <label><input type="checkbox" name="longlastingsession" tabindex="3">&nbsp;Stay signed in (Do not check on public computers)</label>
+                                        <div class="row">
-                        </li>
+                                                <label class="col w150p">Stay signed in</label>
-                        <li>
+                                                <div class="col">
-                            <button type="submit" tabindex="4">Sign in</button>
+                                                        <input type="checkbox" name="longlastingsession" tabindex="3">
-                        </li>
+                                                        <small class="inbl">(Do not check on public computers)</small>
-                    </ul>
+                                                </div>
+                                        </div>
+                                        <div class="row mts txtcenter">
+                                                <button class="bouton" type="submit" tabindex="4">Sign in</button>
+                                        </div>
                </fieldset>
                <input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
                <input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
            </form>
-            <script type="text/javascript">
-            window.onload = document.loginform.login.focus();
-            </script>
 {include="footer"}
author	Nicolas Lœuillet <nicolas@loeuillet.org>	2013-04-22 23:04:18 -0700
committer	Nicolas Lœuillet <nicolas@loeuillet.org>	2013-04-22 23:04:18 -0700
commit	2761de0184d03ad85f69589c379c94049bb43d24 (patch)
tree	c28cb3df3f1069934ec1be771e344879a7d09222 /tpl
parent	d3607de9297d1af9a788c90b1297e644ce882ca7 (diff)
parent	d2beefd27c814acdfa248e4ca469e6cad06288a4 (diff)
download	wallabag-2761de0184d03ad85f69589c379c94049bb43d24.tar.gz wallabag-2761de0184d03ad85f69589c379c94049bb43d24.tar.zst wallabag-2761de0184d03ad85f69589c379c94049bb43d24.zip

diff --git a/tpl/home.html b/tpl/home.html index ad881997..e99e1680 100644 --- a/tpl/home.html +++ b/tpl/home.html
@@ -1,6 +1,6 @@
1	<body class="light-style">	1	<body class="light-style">
2	<header>	2	<header>
3	<h1><img src="./img/logo.png" alt="logo poche" />poche</h1>	3	<h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
4	</header>	4	</header>
5	<div id="main">	5	<div id="main">
6	<ul id="links">	6	<ul id="links">
@@ -10,7 +10,7 @@
10	<li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>	10	<li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>
11	<li><a href="?logout" title="Logout">logout</a></li>	11	<li><a href="?logout" title="Logout">logout</a></li>
12	</ul>	12	</ul>
13	{if condition="isset($entries)"}	13	{if condition="isset($entries)"}
14	<ul id="sort">	14	<ul id="sort">
15	<li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>	15	<li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>
16	<li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>	16	<li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>


diff --git a/tpl/login.html b/tpl/login.html index 12927692..66dac99b 100644 --- a/tpl/login.html +++ b/tpl/login.html
@@ -1,31 +1,33 @@
1	{include="head"}	1	{include="head"}
2	<body class="light-style">	2	<body class="light-style">
3	<header>	3	<header>
4	<h1><img src="./img/logo.png" alt="logo poche" />poche</h1>	4	<h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
5	</header>	5	</header>
6	<div id="main">	6	<div id="main">
7	<form method="post" action="?login" name="loginform">	7	<form method="post" action="?login" name="loginform">
8	<fieldset>	8	<fieldset class="w500p center">
9	<h2>login to your poche</h2>	9	<h2 class="mbs txtcenter">login to your poche</h2>
10	<ul id="login">	10	<div class="row">
11	<li>	11	<label class="col w150p" for="login">Login</label>
12	<label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1">	12	<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
13	</li>	13	</div>
14	<li>	14	<div class="row">
15	<label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2">	15	<label class="col w150p" for="password" >Password</label>
16	</li>	16	<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
17	<li>	17	</div>
18	<label><input type="checkbox" name="longlastingsession" tabindex="3"> Stay signed in (Do not check on public computers)</label>	18	<div class="row">
19	</li>	19	<label class="col w150p">Stay signed in</label>
20	<li>	20	<div class="col">
21	<button type="submit" tabindex="4">Sign in</button>	21	<input type="checkbox" name="longlastingsession" tabindex="3">
22	</li>	22	<small class="inbl">(Do not check on public computers)</small>
23	</ul>	23	</div>
		24	</div>
		25	<div class="row mts txtcenter">
		26	<button class="bouton" type="submit" tabindex="4">Sign in</button>
		27	</div>
24	</fieldset>	28	</fieldset>
25	<input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">	29	<input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
26	<input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">	30	<input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
27	</form>	31	</form>
28	<script type="text/javascript">	32
29	window.onload = document.loginform.login.focus();
30	</script>
31	{include="footer"}	33	{include="footer"}