From e858ac27768ae7b5cc1f76d356c66f8872bfc666 Mon Sep 17 00:00:00 2001 From: nicosomb Date: Mon, 22 Apr 2013 08:32:30 +0200 Subject: [PATCH 1/7] login & password dans le readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0bcce53..6700415 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Abandon Pocket, Instapaper and other Readability service : adopt poche. It is th The website of poche is [inthepoche.com](http://inthepoche.com). +To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche). + To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog). [![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system) From d3607de9297d1af9a788c90b1297e644ce882ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 22 Apr 2013 20:27:23 +0300 Subject: [PATCH 2/7] Update style.css coquille pour l'affichage des liens sur la page view --- css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 36ebf85..b8327c3 100644 --- a/css/style.css +++ b/css/style.css @@ -117,7 +117,7 @@ input[type=submit].delete { text-align: left; } -#article.tools ul li{ +#article .tools ul li{ display: inline; } @@ -214,4 +214,4 @@ body.article { .messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; } .messages.information, .messages.info { background: #DFEBFB; border: 1px solid #82AEE7; } .messages.information p, .messages.info p { background: url(../img/messages/help.png ) no-repeat 0px 50%; color: #064393; } -.messages.information a { text-decoration: underline; } \ No newline at end of file +.messages.information a { text-decoration: underline; } From 9acfade8294755cce6c1170364f2669cb73edbbe Mon Sep 17 00:00:00 2001 From: silvus Date: Mon, 22 Apr 2013 22:58:07 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Reprise=20du=20style=20de=20l'=C3=A9cran=20?= =?UTF-8?q?de=20connexion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style-light.css | 10 ++++++++++ css/style.css | 12 +++++------- tpl/home.html | 2 +- tpl/login.html | 40 +++++++++++++++++++++------------------- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/css/style-light.css b/css/style-light.css index 5b9c6c1..926a5cc 100644 --- a/css/style-light.css +++ b/css/style-light.css @@ -8,6 +8,16 @@ a, a:hover, a:visited { color: #000; } +.bouton { + background-color: #000; + color: #fff; + border: none; +} +.bouton:hover { + background-color: #040707; + color: #F1F1F1; +} + #main ul#links li a.current { background-color: #000; color: #fff; diff --git a/css/style.css b/css/style.css index b8327c3..9fadfa9 100644 --- a/css/style.css +++ b/css/style.css @@ -4,11 +4,14 @@ body { margin: 10px; } - header { text-align: center; } +.bouton { + border-radius: 2px; +} + #main ul#links { padding: 0; list-style-type: none; @@ -56,11 +59,6 @@ footer { text-align: right; } -/*** ***/ -/*** LOGIN FORM ***/ -ul#login li { - list-style-type: none; -} /*** ***/ /*** LINKS DISPLAY ***/ @@ -208,7 +206,7 @@ body.article { .messages p { margin: 3px 0 3px 10px !important; padding: 0 10px 0 23px !important; font-size: 14px; line-height: 16px; } .messages.error { border: 1px solid #C42608; color: #c00 !important; background: #FFF0EF; } .messages.error p { background: url(../img/messages/cross.png ) no-repeat 0px 50%; color:#c00 !important; } -.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; } +.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; } .messages.success p { background: url(../img/messages/tick.png) no-repeat 0px 50%; color: #2B6301 !important; } .messages.warning { background: #FFFCD3; border: 1px solid #EBCD41; color: #000; } .messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; } diff --git a/tpl/home.html b/tpl/home.html index ad88199..75367e2 100644 --- a/tpl/home.html +++ b/tpl/home.html @@ -10,7 +10,7 @@
  • config
  • logout
  • - {if condition="isset($entries)"} + {if condition="isset($entries)"}
    • by date
    • by title
    • diff --git a/tpl/login.html b/tpl/login.html index 1292769..3f77e37 100644 --- a/tpl/login.html +++ b/tpl/login.html @@ -5,27 +5,29 @@
      -
      -

      login to your poche

      -
        -
      • - -
      • -
      • - -
      • -
      • - -
      • -
      • - -
      • -
      +
      +

      login to your poche

      +
      + + +
      +
      + + +
      +
      + +
      + + (Do not check on public computers) +
      +
      +
      + +
      - + {include="footer"} From 8af1077265829b1f10623c5c1348089bada9c775 Mon Sep 17 00:00:00 2001 From: silvus Date: Mon, 22 Apr 2013 23:02:04 +0200 Subject: [PATCH 4/7] Le logo poche renvoie vers l'accueil --- tpl/home.html | 2 +- tpl/login.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/home.html b/tpl/home.html index 75367e2..e99e168 100644 --- a/tpl/home.html +++ b/tpl/home.html @@ -1,6 +1,6 @@
      -

      logo pochepoche

      +

      logo pochepoche