From 38330bfd65181d63609b9350324aa13f1e967bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Aug 2013 11:23:00 +0200 Subject: fix bug #112 link to shaarli --- tpl/css/style-light.css | 4 ++++ tpl/img/light/shaarli.png | Bin 0 -> 729 bytes tpl/view.twig | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 tpl/img/light/shaarli.png (limited to 'tpl') diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css index 9ea7955a..e2788a1c 100644 --- a/tpl/css/style-light.css +++ b/tpl/css/style-light.css @@ -44,6 +44,10 @@ a.twitter span { background: url('../img/light/twitter.png') no-repeat; } +a.shaarli span { + background: url('../img/light/shaarli.png') no-repeat; +} + a.email span { background: url('../img/light/envelop.png') no-repeat; } diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png new file mode 100644 index 00000000..1eb30f60 Binary files /dev/null and b/tpl/img/light/shaarli.png differ diff --git a/tpl/view.twig b/tpl/view.twig index 2cbb9ca9..ba0aae30 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -11,6 +11,7 @@
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %} @@ -32,6 +33,7 @@
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 096fb74bf1bd0065b464e74503b55f37a09ff3f8 Mon Sep 17 00:00:00 2001 From: NumEricR Date: Fri, 23 Aug 2013 12:12:05 +0200 Subject: CSS clean up on style.css file Syntax homogenization (spaces, lowercase for hexa, ...) Code refactoring Simplification of some selectors Simplification of "0px" and hexa values More detailed font stack Add cursor pointer on ".bouton" elements --- tpl/css/style.css | 120 +++++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 65 deletions(-) (limited to 'tpl') diff --git a/tpl/css/style.css b/tpl/css/style.css index e2a512f7..9b249989 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -1,7 +1,8 @@ body { font-size: 16px; - font-family: 'Roboto', sans-serif; + font-family: 'Roboto', Verdana, Geneva, sans-serif; margin: 10px; + color: #000; } header { @@ -12,52 +13,67 @@ header h1 { font-size: 1.3em; } +a, a:hover, a:visited { + color: #000; +} + .bouton { - border-radius: 2px; + background-color: #000; + color: #fff; + border: none; + border-radius: 2px; +} +.bouton:hover { + background-color: #222; + color: #f1f1f1; + cursor: pointer; } #main { margin: 0 auto; } -#main ul#links { +#main #links { padding: 0; list-style-type: none; text-align: center; font-size: 0.9em; } -#main ul#links li { +#main #links li { display: inline; } -#main ul#links li a.current { +#main #links li .current { + background-color: #000; + color: #fff; -webkit-border-radius: 2px; border-radius: 2px; } -#main ul#sort { +#main #sort { padding: 0; list-style-type: none; text-align: center; opacity: 0.5; } -#main ul#sort li { +#main #sort li { display: inline; font-size: 0.9em; } -#main ul#sort img:hover { +#main #sort img:hover { cursor: pointer; } - -#links a{ +#links a { text-decoration: none; padding: 5px 10px; } -#links a:hover{ +#links a:hover { + background-color: #040707; + color: #F1F1F1; -webkit-border-radius: 2px; border-radius: 2px; } @@ -65,7 +81,7 @@ header h1 { /*** ***/ /*** LINKS DISPLAY ***/ -#main a.tool { +#main .tool { text-decoration: none; cursor: pointer; } @@ -80,16 +96,18 @@ header h1 { } #main #content .entrie { - border-bottom: 1px dashed #222222; + border-bottom: 1px dashed #222; } -#main .entrie ul.tools { +#main .entrie .tools { list-style-type: none; } -#main .entrie ul.tools li { - /*display: inline;*/ +/* +#main .entrie .tools li { + display: inline; } +*/ .tools { float: right; @@ -98,7 +116,8 @@ header h1 { } .tools p { - font-size: 0.8em;} + font-size: 0.8em; +} /* .tools ul { @@ -110,16 +129,17 @@ header h1 { line-height: 20px; } -.tools a.tool { +.tools .tool { cursor: pointer; }*/ -#main .entrie .tools a.tool span, #article .tools a.tool span { +#main .entrie .tools .tool span, #article .tools .tool span { display: inline-block; width: 16px; height: 16px; } + /*** ***/ /*** ARTICLE PAGE ***/ @@ -136,7 +156,7 @@ header h1 { .vieworiginal a, .vieworiginal a:hover, .vieworiginal a:visited { text-decoration: none; - color: #888888; + color: #888; } .backhome { @@ -146,51 +166,21 @@ header h1 { #article .tools { position: relative; display: inline; - top: 0px; - right: 0px; + top: 0; + right: 0; width: 100%; } -#article .tools ul li{ +#article .tools ul li { display: inline; } -/*** GENERAL ***/ -body { - color: #000; -} - -a, a:hover, a:visited { - color: #000; -} - -.bouton { - background-color: #000; - color: #fff; - border: none; -} -.bouton:hover { - background-color: #222222; - color: #F1F1F1; -} - -#main ul#links li a.current { - background-color: #000; - color: #fff; -} - -#links a:hover{ - background-color: #040707; - color: #F1F1F1; -} - - /*** ***/ /*** ARTICLE PAGE ***/ #article header, #article article { - border-bottom: 1px solid #222222; + border-bottom: 1px solid #222; } @@ -202,33 +192,33 @@ a, a:hover, a:visited { text-align: right; } .pagination a { - border: 1px solid #D5D5D5; + border: 1px solid #d5d5d5; color: #333; font-size: 11px; font-weight: bold; height: 25px; padding: 4px 8px; text-decoration: none; - margin:2px; + margin: 2px; } .pagination a:hover, .pagination a:active { - background:#efefef; + background-color: #efefef; } -.pagination span.current { +.pagination .current { background-color: #ccc; - border: 1px solid #D5D5D5; + border: 1px solid #d5d5d5; color: #000; font-size: 11px; font-weight: bold; height: 25px; padding: 4px 8px; text-decoration: none; - margin:2px; + margin: 2px; } -.pagination span.disabled { - border: 1px solid #EEEEEE; - color: #DDDDDD; - margin:2px; +.pagination .disabled { + border: 1px solid #eee; + color: #ddd; + margin: 2px; padding: 4px 8px; font-size: 11px; font-weight: bold; @@ -240,4 +230,4 @@ footer { .reading-time { font-size: 0.8em; -} \ No newline at end of file +} -- cgit v1.2.3 From 00e4700abb8888344a8765ddb2067c4ed7a5c6b9 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 13:45:46 +0200 Subject: Fix #157 --- tpl/_head.twig | 1 + tpl/css/print.css | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tpl/css/print.css (limited to 'tpl') diff --git a/tpl/_head.twig b/tpl/_head.twig index 60ef8883..6a8258a2 100644 --- a/tpl/_head.twig +++ b/tpl/_head.twig @@ -6,6 +6,7 @@ + \ No newline at end of file diff --git a/tpl/css/print.css b/tpl/css/print.css new file mode 100644 index 00000000..a3b0a599 --- /dev/null +++ b/tpl/css/print.css @@ -0,0 +1,19 @@ +body > header, +body > footer, +a.top_link, +div.tools, +header div +{ + display: none !important; +} + +article +{ + border: none !important; +} + +div.vieworiginal a::after +{ + margin-left: 5px; + content: "("attr(href)")"; +} -- cgit v1.2.3 From 29773c9729038510728738908b58fd8a86ef943b Mon Sep 17 00:00:00 2001 From: NumEricR Date: Fri, 23 Aug 2013 18:10:42 +0200 Subject: Fix HTML code of tools lists --- tpl/home.twig | 10 ++++------ tpl/view.twig | 32 +++++++++++++------------------- 2 files changed, 17 insertions(+), 25 deletions(-) (limited to 'tpl') diff --git a/tpl/home.twig b/tpl/home.twig index 03f9f70d..8ef6adc0 100644 --- a/tpl/home.twig +++ b/tpl/home.twig @@ -15,12 +15,10 @@

    {{ entry.title|e }}

      -
    • -
      • -
      • -
      • -
    • {{ entry.content| getReadingTime }} min
      • - +
      • +
      • +
      • +
    • {{ entry.content| getReadingTime }} min

    {{ entry.content|striptags|slice(0, 300) }}...

    {{ entry.url | e | getDomain }}

    diff --git a/tpl/view.twig b/tpl/view.twig index ba0aae30..ead8d0cd 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -4,15 +4,12 @@
      -
    • -
      • - -
      • -
      • - {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
      • {% endif %} - +
      • +
      • +
      • +
      • + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %}
    @@ -25,16 +22,13 @@
      -
    • -
      • -
      • - -
      • -
      • - {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
      • {% endif %} - +
      • +
      • +
      • +
      • +
      • + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 4b4afc7322cef96575649a47e34b1621a5aab1fd Mon Sep 17 00:00:00 2001 From: NumEricR Date: Fri, 23 Aug 2013 18:45:34 +0200 Subject: Add textual content on tools links --- tpl/css/style.css | 4 ++++ tpl/home.twig | 6 +++--- tpl/view.twig | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 16 deletions(-) (limited to 'tpl') diff --git a/tpl/css/style.css b/tpl/css/style.css index 9b249989..85df6e95 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -137,6 +137,10 @@ a, a:hover, a:visited { display: inline-block; width: 16px; height: 16px; + /* Hide textual content */ + text-indent: -9999px; + text-align: left; + overflow: hidden; } diff --git a/tpl/home.twig b/tpl/home.twig index 8ef6adc0..6f6c17e1 100644 --- a/tpl/home.twig +++ b/tpl/home.twig @@ -15,9 +15,9 @@

    {{ entry.title|e }}

    {{ entry.content|striptags|slice(0, 300) }}...

    diff --git a/tpl/view.twig b/tpl/view.twig index ead8d0cd..78207e15 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -4,12 +4,12 @@
    @@ -22,13 +22,13 @@

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From ffc966d72fa2b5016e143d490994459ff4591571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 21:06:45 +0200 Subject: fix bug #151: HTML entities in titles are encoded twice --- tpl/home.twig | 2 +- tpl/view.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/home.twig b/tpl/home.twig index 03f9f70d..58586d7a 100644 --- a/tpl/home.twig +++ b/tpl/home.twig @@ -13,7 +13,7 @@ {{ page_links | raw }} {% for entry in entries %}
    -

    {{ entry.title|e }}

    +

    {{ entry.title|raw }}

      • diff --git a/tpl/view.twig b/tpl/view.twig index ba0aae30..0456471e 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -16,7 +16,7 @@
    -

    {{ entry.title|e }}

    +

    {{ entry.title|raw }}

    {{ entry.url | e | getDomain }}
    -- cgit v1.2.3 From 3008e36a3ec1b0998e44f2aba62435b54e2ac865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 22:01:17 +0200 Subject: fix bug #162 links to firefox / chrome / android apps --- tpl/config.twig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 5324cda7..8851c3dc 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -11,11 +11,17 @@ {% endblock %} {% block content %} -

    {% trans "Bookmarklet" %}

    -

    {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

    -

    {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

    -

    {% trans "poche it!" %}

    +

    {% trans "Poching a link" %}

    +

    You can poche a link by several methods: (?)

    +

    +

    +

    {% trans "Updating poche" %}

    • {% trans "your version" %} : {{ constant('POCHE_VERSION') }}
      • -- cgit v1.2.3 From cf9e886076a2ec10749268afa4c671dd9d6f3262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 22:04:09 +0200 Subject: encode url to share with twitter / email / shaarli --- tpl/view.twig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tpl') diff --git a/tpl/view.twig b/tpl/view.twig index 82d1fd2a..89ff1823 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -8,8 +8,9 @@
    • {% trans "toggle mark as read" %}
    • {% trans "toggle favorite" %}
    • {% trans "delete" %}
      • - {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
      • {% endif %}
    @@ -27,8 +28,9 @@
  • {% trans "toggle mark as read" %}
  • {% trans "toggle favorite" %}
  • {% trans "delete" %}
    • - {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 12c9c729840a1fa7fc674aa8685f282aac898470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 22:05:14 +0200 Subject: text in shaarli link --- tpl/view.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/view.twig b/tpl/view.twig index 89ff1823..99a98217 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,7 +10,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -30,7 +30,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 8413a63f7d9df2695653ab2ef1d77927da6ddc55 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 22:20:04 +0200 Subject: Clean markup in templates --- tpl/config.twig | 15 +++++++-------- tpl/home.twig | 12 ++++++------ tpl/layout.twig | 8 ++++---- tpl/view.twig | 26 +++++++++++++------------- 4 files changed, 30 insertions(+), 31 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 5324cda7..9f2fe5a4 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -14,15 +14,14 @@

    {% trans "Bookmarklet" %}

    {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

    {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

    -

    {% trans "poche it!" %}

    +

    {% trans "poche it!" %}

    {% trans "Updating poche" %}

    -

      + -

      {% trans "Change your password" %}

      @@ -46,11 +45,11 @@

      {% trans "Import" %}

      {% trans "Please execute the import script locally, it can take a very long time." %}

      {% trans "More infos in the official doc:" %} inthepoche.com

      -

      +

      {% trans "Export your poche datas" %}

      {% trans "Click here" %} {% trans "to export your poche datas." %}

      diff --git a/tpl/home.twig b/tpl/home.twig index 21910ae8..a2fa9a93 100644 --- a/tpl/home.twig +++ b/tpl/home.twig @@ -5,19 +5,19 @@ {% endblock %} {% block precontent %}
        -
      • {% trans {% trans "by date" %} {% trans
        • -
      • {% trans {% trans "by title" %} {% trans
        • +
      • {% trans {% trans "by date" %} {% trans
        • +
      • {% trans {% trans "by title" %} {% trans
      {% endblock %} {% block content %} {{ page_links | raw }} {% for entry in entries %}
      -

      {{ entry.title|raw }}

      +

      {{ entry.title|raw }}

      {{ entry.content|striptags|slice(0, 300) }}...

      diff --git a/tpl/layout.twig b/tpl/layout.twig index b86983da..7084a215 100644 --- a/tpl/layout.twig +++ b/tpl/layout.twig @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/tpl/view.twig b/tpl/view.twig index 82d1fd2a..4dee38c8 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -5,32 +5,32 @@

      {{ entry.title|raw }}

      -
      {{ entry.url | e | getDomain }}
      +
      {{ entry.url | e | getDomain }}
      -

      {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

      +

      {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

      {% endblock %} \ No newline at end of file -- cgit v1.2.3 From f3e4f109a3ae6cd58e0abc9e909ac823d5e3065a Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 22:23:55 +0200 Subject: Revert "Clean markup in templates" This reverts commit 8413a63f7d9df2695653ab2ef1d77927da6ddc55. --- tpl/config.twig | 15 ++++++++------- tpl/home.twig | 12 ++++++------ tpl/layout.twig | 8 ++++---- tpl/view.twig | 26 +++++++++++++------------- 4 files changed, 31 insertions(+), 30 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 9f2fe5a4..5324cda7 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -14,14 +14,15 @@

      {% trans "Bookmarklet" %}

      {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

      {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

      -

      {% trans "poche it!" %}

      +

      {% trans "poche it!" %}

      {% trans "Updating poche" %}

      -
        +

        +

        {% trans "Change your password" %}

        @@ -45,11 +46,11 @@

        {% trans "Import" %}

        {% trans "Please execute the import script locally, it can take a very long time." %}

        {% trans "More infos in the official doc:" %} inthepoche.com

        - +

        {% trans "Export your poche datas" %}

        {% trans "Click here" %} {% trans "to export your poche datas." %}

        diff --git a/tpl/home.twig b/tpl/home.twig index a2fa9a93..21910ae8 100644 --- a/tpl/home.twig +++ b/tpl/home.twig @@ -5,19 +5,19 @@ {% endblock %} {% block precontent %}
          -
        • {% trans {% trans "by date" %} {% trans
          • -
        • {% trans {% trans "by title" %} {% trans
          • +
        • {% trans {% trans "by date" %} {% trans
          • +
        • {% trans {% trans "by title" %} {% trans
        {% endblock %} {% block content %} {{ page_links | raw }} {% for entry in entries %}
        -

        {{ entry.title|raw }}

        +

        {{ entry.title|raw }}

        {{ entry.content|striptags|slice(0, 300) }}...

        diff --git a/tpl/layout.twig b/tpl/layout.twig index 7084a215..b86983da 100644 --- a/tpl/layout.twig +++ b/tpl/layout.twig @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/tpl/view.twig b/tpl/view.twig index 4dee38c8..82d1fd2a 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -5,32 +5,32 @@

        {{ entry.title|raw }}

        -
        {{ entry.url | e | getDomain }}
        +
        {{ entry.url | e | getDomain }}
        -

        {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

        +

        {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

        {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 6d7defc87cd6ce40910b66472168e3d86c362164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 22:24:41 +0200 Subject: new messages when update / install --- tpl/error.twig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tpl') diff --git a/tpl/error.twig b/tpl/error.twig index 84c3bc1c..14c49925 100644 --- a/tpl/error.twig +++ b/tpl/error.twig @@ -1,7 +1,6 @@ {% extends "layout.twig" %} -{% block title %}{% trans "error" %}{% endblock %} +{% block title %}{% trans "plop" %}{% endblock %} {% block content %} -

        error

        -

        {{ msg|raw }}

        + {{ msg|raw }}

        Don't forget the documentation.

        {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 258d7032bbc0608cffd00a42fff50ea99f59ff23 Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 22:38:14 +0200 Subject: Clean up the templates markup --- tpl/config.twig | 15 +++++++-------- tpl/home.twig | 12 ++++++------ tpl/layout.twig | 8 ++++---- tpl/view.twig | 26 +++++++++++++------------- 4 files changed, 30 insertions(+), 31 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 5324cda7..9f2fe5a4 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -14,15 +14,14 @@

        {% trans "Bookmarklet" %}

        {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

        {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

        -

        {% trans "poche it!" %}

        +

        {% trans "poche it!" %}

        {% trans "Updating poche" %}

        -

        {% endblock %} {% block content %} -

        {% trans "Bookmarklet" %}

        -

        {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

        -

        {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

        -

        {% trans "poche it!" %}

        +

        {% trans "Poching a link" %}

        +

        You can poche a link by several methods: (?)

        +

        {% trans "Updating poche" %}

          -- cgit v1.2.3 From d29b3e5f9e195b99d3891acd8537f8f4680e430f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 23:04:56 +0200 Subject: changes in md files --- tpl/layout.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tpl') diff --git a/tpl/layout.twig b/tpl/layout.twig index b86983da..22d08fca 100644 --- a/tpl/layout.twig +++ b/tpl/layout.twig @@ -7,7 +7,9 @@ + {% block title %}{% endblock %} - poche {% include '_head.twig' %} {% include '_bookmarklet.twig' %} -- cgit v1.2.3 From 0269cd821311500acffed61edb1bc168d3fb5ec8 Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 23:05:45 +0200 Subject: Add SHAARLI support to view template --- tpl/_bookmarklet.twig | 0 tpl/_footer.twig | 0 tpl/_head.twig | 0 tpl/_menu.twig | 0 tpl/_messages.twig | 0 tpl/_top.twig | 0 tpl/config.twig | 0 tpl/css/knacss.css | 0 tpl/css/print.css | 0 tpl/css/style-light.css | 0 tpl/css/style.css | 0 tpl/error.twig | 0 tpl/export.twig | 0 tpl/home.twig | 0 tpl/img/apple-touch-icon-144x144-precomposed.png | Bin tpl/img/apple-touch-icon-72x72-precomposed.png | Bin tpl/img/apple-touch-icon.png | Bin tpl/img/favicon.ico | Bin tpl/img/light/checkmark-off.png | Bin tpl/img/light/checkmark-on.png | Bin tpl/img/light/down.png | Bin tpl/img/light/remove.png | Bin tpl/img/light/shaarli.png | Bin tpl/img/light/star-off.png | Bin tpl/img/light/star-on.png | Bin tpl/img/logo.png | Bin tpl/install.twig | 0 tpl/js/jquery-2.0.3.min.js | 0 tpl/layout.twig | 0 tpl/login.twig | 0 tpl/view.twig | 2 ++ 31 files changed, 2 insertions(+) mode change 100644 => 100755 tpl/_bookmarklet.twig mode change 100644 => 100755 tpl/_footer.twig mode change 100644 => 100755 tpl/_head.twig mode change 100644 => 100755 tpl/_menu.twig mode change 100644 => 100755 tpl/_messages.twig mode change 100644 => 100755 tpl/_top.twig mode change 100644 => 100755 tpl/config.twig mode change 100644 => 100755 tpl/css/knacss.css mode change 100644 => 100755 tpl/css/print.css mode change 100644 => 100755 tpl/css/style-light.css mode change 100644 => 100755 tpl/css/style.css mode change 100644 => 100755 tpl/error.twig mode change 100644 => 100755 tpl/export.twig mode change 100644 => 100755 tpl/home.twig mode change 100644 => 100755 tpl/img/apple-touch-icon-144x144-precomposed.png mode change 100644 => 100755 tpl/img/apple-touch-icon-72x72-precomposed.png mode change 100644 => 100755 tpl/img/apple-touch-icon.png mode change 100644 => 100755 tpl/img/favicon.ico mode change 100644 => 100755 tpl/img/light/checkmark-off.png mode change 100644 => 100755 tpl/img/light/checkmark-on.png mode change 100644 => 100755 tpl/img/light/down.png mode change 100644 => 100755 tpl/img/light/remove.png mode change 100644 => 100755 tpl/img/light/shaarli.png mode change 100644 => 100755 tpl/img/light/star-off.png mode change 100644 => 100755 tpl/img/light/star-on.png mode change 100644 => 100755 tpl/img/logo.png mode change 100644 => 100755 tpl/install.twig mode change 100644 => 100755 tpl/js/jquery-2.0.3.min.js mode change 100644 => 100755 tpl/layout.twig mode change 100644 => 100755 tpl/login.twig mode change 100644 => 100755 tpl/view.twig (limited to 'tpl') diff --git a/tpl/_bookmarklet.twig b/tpl/_bookmarklet.twig old mode 100644 new mode 100755 diff --git a/tpl/_footer.twig b/tpl/_footer.twig old mode 100644 new mode 100755 diff --git a/tpl/_head.twig b/tpl/_head.twig old mode 100644 new mode 100755 diff --git a/tpl/_menu.twig b/tpl/_menu.twig old mode 100644 new mode 100755 diff --git a/tpl/_messages.twig b/tpl/_messages.twig old mode 100644 new mode 100755 diff --git a/tpl/_top.twig b/tpl/_top.twig old mode 100644 new mode 100755 diff --git a/tpl/config.twig b/tpl/config.twig old mode 100644 new mode 100755 diff --git a/tpl/css/knacss.css b/tpl/css/knacss.css old mode 100644 new mode 100755 diff --git a/tpl/css/print.css b/tpl/css/print.css old mode 100644 new mode 100755 diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css old mode 100644 new mode 100755 diff --git a/tpl/css/style.css b/tpl/css/style.css old mode 100644 new mode 100755 diff --git a/tpl/error.twig b/tpl/error.twig old mode 100644 new mode 100755 diff --git a/tpl/export.twig b/tpl/export.twig old mode 100644 new mode 100755 diff --git a/tpl/home.twig b/tpl/home.twig old mode 100644 new mode 100755 diff --git a/tpl/img/apple-touch-icon-144x144-precomposed.png b/tpl/img/apple-touch-icon-144x144-precomposed.png old mode 100644 new mode 100755 diff --git a/tpl/img/apple-touch-icon-72x72-precomposed.png b/tpl/img/apple-touch-icon-72x72-precomposed.png old mode 100644 new mode 100755 diff --git a/tpl/img/apple-touch-icon.png b/tpl/img/apple-touch-icon.png old mode 100644 new mode 100755 diff --git a/tpl/img/favicon.ico b/tpl/img/favicon.ico old mode 100644 new mode 100755 diff --git a/tpl/img/light/checkmark-off.png b/tpl/img/light/checkmark-off.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/checkmark-on.png b/tpl/img/light/checkmark-on.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/down.png b/tpl/img/light/down.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/remove.png b/tpl/img/light/remove.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/star-off.png b/tpl/img/light/star-off.png old mode 100644 new mode 100755 diff --git a/tpl/img/light/star-on.png b/tpl/img/light/star-on.png old mode 100644 new mode 100755 diff --git a/tpl/img/logo.png b/tpl/img/logo.png old mode 100644 new mode 100755 diff --git a/tpl/install.twig b/tpl/install.twig old mode 100644 new mode 100755 diff --git a/tpl/js/jquery-2.0.3.min.js b/tpl/js/jquery-2.0.3.min.js old mode 100644 new mode 100755 diff --git a/tpl/layout.twig b/tpl/layout.twig old mode 100644 new mode 100755 diff --git a/tpl/login.twig b/tpl/login.twig old mode 100644 new mode 100755 diff --git a/tpl/view.twig b/tpl/view.twig old mode 100644 new mode 100755 index 4dee38c8..219faa56 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,6 +10,7 @@
        • {% trans "delete" %}
          • {% if constant('SHARE_TWITTER') == 1 %}
          • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
          • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
        • {% trans "shaarli" %}
          • {% endif %}
        @@ -29,6 +30,7 @@
      • {% trans "delete" %}
        • {% if constant('SHARE_TWITTER') == 1 %}
        • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
        • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
      • {% trans "shaarli" %}
        • {% endif %}

      {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

      -- cgit v1.2.3 From fd99a8c02d7c625771656a5c5081560027d8e6e9 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 23:09:43 +0200 Subject: Revert "Add SHAARLI support to view template" This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8. --- tpl/_bookmarklet.twig | 0 tpl/_footer.twig | 0 tpl/_head.twig | 0 tpl/_menu.twig | 0 tpl/_messages.twig | 0 tpl/_top.twig | 0 tpl/config.twig | 0 tpl/css/knacss.css | 0 tpl/css/print.css | 0 tpl/css/style-light.css | 0 tpl/css/style.css | 0 tpl/error.twig | 0 tpl/export.twig | 0 tpl/home.twig | 0 tpl/img/apple-touch-icon-144x144-precomposed.png | Bin tpl/img/apple-touch-icon-72x72-precomposed.png | Bin tpl/img/apple-touch-icon.png | Bin tpl/img/favicon.ico | Bin tpl/img/light/checkmark-off.png | Bin tpl/img/light/checkmark-on.png | Bin tpl/img/light/down.png | Bin tpl/img/light/remove.png | Bin tpl/img/light/shaarli.png | Bin tpl/img/light/star-off.png | Bin tpl/img/light/star-on.png | Bin tpl/img/logo.png | Bin tpl/install.twig | 0 tpl/js/jquery-2.0.3.min.js | 0 tpl/layout.twig | 0 tpl/login.twig | 0 tpl/view.twig | 2 -- 31 files changed, 2 deletions(-) mode change 100755 => 100644 tpl/_bookmarklet.twig mode change 100755 => 100644 tpl/_footer.twig mode change 100755 => 100644 tpl/_head.twig mode change 100755 => 100644 tpl/_menu.twig mode change 100755 => 100644 tpl/_messages.twig mode change 100755 => 100644 tpl/_top.twig mode change 100755 => 100644 tpl/config.twig mode change 100755 => 100644 tpl/css/knacss.css mode change 100755 => 100644 tpl/css/print.css mode change 100755 => 100644 tpl/css/style-light.css mode change 100755 => 100644 tpl/css/style.css mode change 100755 => 100644 tpl/error.twig mode change 100755 => 100644 tpl/export.twig mode change 100755 => 100644 tpl/home.twig mode change 100755 => 100644 tpl/img/apple-touch-icon-144x144-precomposed.png mode change 100755 => 100644 tpl/img/apple-touch-icon-72x72-precomposed.png mode change 100755 => 100644 tpl/img/apple-touch-icon.png mode change 100755 => 100644 tpl/img/favicon.ico mode change 100755 => 100644 tpl/img/light/checkmark-off.png mode change 100755 => 100644 tpl/img/light/checkmark-on.png mode change 100755 => 100644 tpl/img/light/down.png mode change 100755 => 100644 tpl/img/light/remove.png mode change 100755 => 100644 tpl/img/light/shaarli.png mode change 100755 => 100644 tpl/img/light/star-off.png mode change 100755 => 100644 tpl/img/light/star-on.png mode change 100755 => 100644 tpl/img/logo.png mode change 100755 => 100644 tpl/install.twig mode change 100755 => 100644 tpl/js/jquery-2.0.3.min.js mode change 100755 => 100644 tpl/layout.twig mode change 100755 => 100644 tpl/login.twig mode change 100755 => 100644 tpl/view.twig (limited to 'tpl') diff --git a/tpl/_bookmarklet.twig b/tpl/_bookmarklet.twig old mode 100755 new mode 100644 diff --git a/tpl/_footer.twig b/tpl/_footer.twig old mode 100755 new mode 100644 diff --git a/tpl/_head.twig b/tpl/_head.twig old mode 100755 new mode 100644 diff --git a/tpl/_menu.twig b/tpl/_menu.twig old mode 100755 new mode 100644 diff --git a/tpl/_messages.twig b/tpl/_messages.twig old mode 100755 new mode 100644 diff --git a/tpl/_top.twig b/tpl/_top.twig old mode 100755 new mode 100644 diff --git a/tpl/config.twig b/tpl/config.twig old mode 100755 new mode 100644 diff --git a/tpl/css/knacss.css b/tpl/css/knacss.css old mode 100755 new mode 100644 diff --git a/tpl/css/print.css b/tpl/css/print.css old mode 100755 new mode 100644 diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css old mode 100755 new mode 100644 diff --git a/tpl/css/style.css b/tpl/css/style.css old mode 100755 new mode 100644 diff --git a/tpl/error.twig b/tpl/error.twig old mode 100755 new mode 100644 diff --git a/tpl/export.twig b/tpl/export.twig old mode 100755 new mode 100644 diff --git a/tpl/home.twig b/tpl/home.twig old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon-144x144-precomposed.png b/tpl/img/apple-touch-icon-144x144-precomposed.png old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon-72x72-precomposed.png b/tpl/img/apple-touch-icon-72x72-precomposed.png old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon.png b/tpl/img/apple-touch-icon.png old mode 100755 new mode 100644 diff --git a/tpl/img/favicon.ico b/tpl/img/favicon.ico old mode 100755 new mode 100644 diff --git a/tpl/img/light/checkmark-off.png b/tpl/img/light/checkmark-off.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/checkmark-on.png b/tpl/img/light/checkmark-on.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/down.png b/tpl/img/light/down.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/remove.png b/tpl/img/light/remove.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/star-off.png b/tpl/img/light/star-off.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/star-on.png b/tpl/img/light/star-on.png old mode 100755 new mode 100644 diff --git a/tpl/img/logo.png b/tpl/img/logo.png old mode 100755 new mode 100644 diff --git a/tpl/install.twig b/tpl/install.twig old mode 100755 new mode 100644 diff --git a/tpl/js/jquery-2.0.3.min.js b/tpl/js/jquery-2.0.3.min.js old mode 100755 new mode 100644 diff --git a/tpl/layout.twig b/tpl/layout.twig old mode 100755 new mode 100644 diff --git a/tpl/login.twig b/tpl/login.twig old mode 100755 new mode 100644 diff --git a/tpl/view.twig b/tpl/view.twig old mode 100755 new mode 100644 index 219faa56..4dee38c8 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,7 +10,6 @@
    • {% trans "delete" %}
      • {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
    • {% trans "shaarli" %}
      • {% endif %}
    @@ -30,7 +29,6 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From fa5f9764ae370d6eb5efd6b05bf8e257aae9899d Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 23:11:34 +0200 Subject: Add SHAARLI support to view template --- tpl/view.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tpl') diff --git a/tpl/view.twig b/tpl/view.twig index 4dee38c8..f78ac62e 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,6 +10,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -29,6 +30,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 5ae45084dc15adb0c7fc163e3803da780eda2fb4 Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sat, 24 Aug 2013 09:53:02 +0200 Subject: CSS clean up again --- tpl/css/style.css | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tpl') diff --git a/tpl/css/style.css b/tpl/css/style.css index 85df6e95..d4e6c12c 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -150,6 +150,11 @@ a, a:hover, a:visited { #article { margin: 0 auto; } + +#article header, #article article { + border-bottom: 1px solid #222; +} + #article header { text-align: left; } @@ -180,14 +185,6 @@ a, a:hover, a:visited { } -/*** ***/ -/*** ARTICLE PAGE ***/ - -#article header, #article article { - border-bottom: 1px solid #222; -} - - /* Pagination */ .pagination { clear: both; -- cgit v1.2.3 From 6a7d7790247fdf7fdb2992638de700f6ba7da366 Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sat, 24 Aug 2013 09:56:59 +0200 Subject: Fix issue on entries' height --- tpl/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tpl') diff --git a/tpl/css/style.css b/tpl/css/style.css index d4e6c12c..1ae3a601 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -103,6 +103,10 @@ a, a:hover, a:visited { list-style-type: none; } +#main .entrie .tools + p { + min-height: 5.5em; +} + /* #main .entrie .tools li { display: inline; -- cgit v1.2.3 From 06cf8fb9636d2fd1cc3b342b26d0fea2b404ce74 Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sat, 24 Aug 2013 10:27:33 +0200 Subject: Fix login button wording --- tpl/login.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/login.twig b/tpl/login.twig index 0ae130bc..b24674e2 100644 --- a/tpl/login.twig +++ b/tpl/login.twig @@ -23,7 +23,7 @@
    - +
    -- cgit v1.2.3 From db4767e22b9c130bdfe7102383d0f42a2eece490 Mon Sep 17 00:00:00 2001 From: EliasZ Date: Sat, 24 Aug 2013 16:03:49 +0200 Subject: config template its import section reflects defines --- tpl/config.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index e8563721..89d5bf84 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -50,9 +50,9 @@

    {% trans "Please execute the import script locally, it can take a very long time." %}

    {% trans "More infos in the official doc:" %} inthepoche.com

    {% trans "Export your poche datas" %}

    -- cgit v1.2.3 From d7e8dd590c741a8901a2cf1ac3cb8e096645cffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 25 Aug 2013 08:43:22 +0200 Subject: links to original article were wrong --- tpl/view.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl') diff --git a/tpl/view.twig b/tpl/view.twig index f78ac62e..97b76fee 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -15,11 +15,11 @@

    {{ entry.title|raw }}

    -
    {{ entry.url | e | getDomain }}
    +
    {{ entry.url | e | getDomain }}
      -- cgit v1.2.3 From 3044b21eb6db408c1e1981731040391829c80c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 25 Aug 2013 08:49:21 +0200 Subject: title page in article view was wrong --- tpl/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/view.twig b/tpl/view.twig index 97b76fee..28508772 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -1,5 +1,5 @@ {% extends "layout.twig" %} -{% block title %}{% trans "home" %}{% endblock %} +{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %}
      -- cgit v1.2.3 From a4990dd294c08e40c86123605fbfbc78bc930a6e Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sun, 25 Aug 2013 16:40:12 +0200 Subject: Externalize bookmarklet style --- tpl/config.twig | 2 +- tpl/css/style.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 89d5bf84..4c919221 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -17,7 +17,7 @@
    • firefox: download the extension
    • chrome: download the extension
    • android: download the application
      • -
    • bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
      • +
    • bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}

    {% trans "Updating poche" %}

    diff --git a/tpl/css/style.css b/tpl/css/style.css index 1ae3a601..3d3c5385 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -229,6 +229,13 @@ a, a:hover, a:visited { font-weight: bold; } +#bookmarklet { + padding: 5px; + border: 1px dashed #808080; + background: #fff; + cursor: move; +} + footer { clear: both; } -- cgit v1.2.3 From 8e1ed353bbd772da9002dd977fc0725c9d526c8c Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sun, 25 Aug 2013 16:41:20 +0200 Subject: Externalize top link style --- tpl/_head.twig | 2 +- tpl/css/style.css | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/_head.twig b/tpl/_head.twig index 6a8258a2..cab317a8 100644 --- a/tpl/_head.twig +++ b/tpl/_head.twig @@ -9,4 +9,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tpl/css/style.css b/tpl/css/style.css index 3d3c5385..7633534c 100644 --- a/tpl/css/style.css +++ b/tpl/css/style.css @@ -236,6 +236,20 @@ a, a:hover, a:visited { cursor: move; } +.top_link { + position: fixed; + right: 15px; + bottom: 15px; + display: none; + padding: 20px; + background: #ccc; + -moz-border-radius: 40px; + -webkit-border-radius: 40px; + border-radius: 40px; + opacity: 0.9; + z-index: 2000; +} + footer { clear: both; } -- cgit v1.2.3 From e6ba0359119e93f3659876a7b1a17294f2da2b0e Mon Sep 17 00:00:00 2001 From: NumEricR Date: Sun, 25 Aug 2013 16:57:37 +0200 Subject: Add bookmarklet id in config page --- tpl/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 4c919221..9517fc32 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -17,7 +17,7 @@
  • firefox: download the extension
  • chrome: download the extension
  • android: download the application
    • -
  • bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
    • +
  • bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}

    • {% trans "Updating poche" %}

    -- cgit v1.2.3 From fccd59e2e303cdbb45293365bf92921b831bf140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 25 Aug 2013 20:08:07 +0200 Subject: fix display message for import --- tpl/config.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tpl') diff --git a/tpl/config.twig b/tpl/config.twig index 89d5bf84..b41cd306 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -50,9 +50,9 @@

    {% trans "Please execute the import script locally, it can take a very long time." %}

    {% trans "More infos in the official doc:" %} inthepoche.com

    {% trans "Export your poche datas" %}

    -- cgit v1.2.3