From c95c13e06982b642d903c61474b239f013c17e4a Mon Sep 17 00:00:00 2001 From: Erwan TERTRAIS Date: Sat, 9 Dec 2017 13:55:49 +0100 Subject: [PATCH 1/4] =?UTF-8?q?bouton=20edit=20=C3=A0=20droite=20du=20nom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tpl/part/vote_table_date.tpl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 7723b17..957d794 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -102,9 +102,11 @@ + + {$k=0} {foreach $slots as $slot} {foreach $slot->moments as $moment} @@ -149,8 +151,18 @@ {* Voted line *} - {$vote->name|html} + {$vote->name|html} + + + {__('Generic', 'Edit')} + + + + + + + {$k=0} {foreach $slots as $slot} {foreach $slot->moments as $moment} From 2b25d8c301974843d1677e58f34476987e82187e Mon Sep 17 00:00:00 2001 From: Erwan TERTRAIS Date: Mon, 11 Dec 2017 11:32:45 +0100 Subject: [PATCH 2/4] edit button if slot >7 --- tpl/part/vote_table_date.tpl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 957d794..9688163 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -152,12 +152,13 @@ {* Voted line *} {$vote->name|html} + {if $slots gt 7} - - {__('Generic', 'Edit')} - + + {__('Generic', 'Edit')} + - + {/if} From 95c4737953e83e3f7fd6184928ab3cd131f1057a Mon Sep 17 00:00:00 2001 From: Erwan TERTRAIS Date: Wed, 13 Dec 2017 10:40:10 +0100 Subject: [PATCH 3/4] edit button classic poll --- tpl/part/vote_table_classic.tpl | 10 +++++++++- tpl/part/vote_table_date.tpl | 10 +++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl index fe6a43e..bcd4cf2 100644 --- a/tpl/part/vote_table_classic.tpl +++ b/tpl/part/vote_table_classic.tpl @@ -96,7 +96,15 @@ {elseif !$hidden} {* Voted line *} - {$vote->name|html} + {$vote->name|html} + {if $slots gt 4} + + + {__('Generic', 'Edit')} + + + {/if} + {$id=0} {foreach $slots as $slot} diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 9688163..63d4b62 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -152,11 +152,11 @@ {* Voted line *} {$vote->name|html} - {if $slots gt 7} - - - {__('Generic', 'Edit')} - + {if $slots gt 4} + + + {__('Generic', 'Edit')} + {/if} From 70f296377f4fde71e0ddf0a803a5a93661a6cf18 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 20 Feb 2018 12:42:27 +0100 Subject: [PATCH 4/4] Move some style to css files Signed-off-by: Thomas Citharel --- css/style.css | 30 +++++++++++++++++++++--------- tpl/part/vote_table_classic.tpl | 22 +++++++++++----------- tpl/part/vote_table_date.tpl | 30 +++++++++++++++--------------- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/css/style.css b/css/style.css index ee0a47d..9f3f3d3 100644 --- a/css/style.css +++ b/css/style.css @@ -37,6 +37,10 @@ body { margin: 15px auto 30px; } +.hide { + display: none; +} + /* Commentaires */ div.comment{ margin-bottom: 10px; @@ -69,10 +73,10 @@ header h1 { margin-top: 0; } .container { - padding:30px; + padding: 30px; } .container .jumbotron { - padding:20px 20px; + padding: 20px 20px; border-radius: 2px; } .container .jumbotron p { @@ -115,7 +119,7 @@ header h1 { /* Description du sondage */ /* studs.php et adminstuds.php */ header .lead { - padding:10px 0; + padding: 10px 0; margin:0; } @@ -240,7 +244,7 @@ table.results tbody td { table.results thead th { text-align:center; border:2px solid white; - padding:5px; + padding: 5px; min-width:40px; font-size:12px; max-width:100px; @@ -249,8 +253,8 @@ table.results thead th { } table.results thead .btn { - margin:0 auto; - display:block; + margin: 0 auto; + display: block; } table.results th.rbd.day, @@ -333,7 +337,15 @@ table.results .btn-link.btn-sm { } .choice label { - cursor:pointer; + cursor: pointer; +} + +td.btn-edit { + padding: 5px; +} + +span.edit-username-left { + float: right; } .yes .btn, .ifneedbe .btn, .no .btn { @@ -398,7 +410,7 @@ table.results .btn-link.btn-sm { table.results .bg-danger .glyphicon { opacity:0; - + -moz-animation-name: hideNoIcon; -moz-animation-iteration-count: 1; -moz-animation-timing-function: ease-in; @@ -505,4 +517,4 @@ table.results > tbody > tr:hover > td .glyphicon { #password-form .btn-cancel { float: right; -} \ No newline at end of file +} diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl index bcd4cf2..0ccdcae 100644 --- a/tpl/part/vote_table_classic.tpl +++ b/tpl/part/vote_table_classic.tpl @@ -50,7 +50,7 @@ {if $editingVoteId === $vote->uniqId && !$expired} - +
@@ -82,7 +82,7 @@ {__('Generic', 'No')} -
  • +
    • @@ -91,14 +91,14 @@ {$id=$id + 1} {/foreach} - + {elseif !$hidden} {* Voted line *} {$vote->name|html} {if $slots gt 4} - + {__('Generic', 'Edit')} @@ -154,7 +154,7 @@ {if $active && $editingVoteId === 0 && !$expired && $accessGranted} - +
    @@ -181,7 +181,7 @@ {__('Generic', 'No')} -
  • +
    • @@ -234,10 +234,10 @@ $('#showChart') .after("

    {__('Poll results', 'Chart')}

    ") .remove(); - + var resIfneedbe = []; var resYes = []; - + $('#addition').find('td').each(function () { var inbCountText = $(this).find('.inb-count').text(); if(inbCountText != '' && inbCountText != undefined) { @@ -255,7 +255,7 @@ }); var cols = [ {foreach $slots as $id=>$slot} - $('
    ').html('{$slot->title|markdown:true}').text(), + $('
    ').html('{$slot->title|markdown:true}').text(), {/foreach} ]; @@ -290,7 +290,7 @@ }); }); - + {/if} @@ -312,7 +312,7 @@ {$i = 0} -
      +
        {foreach $slots as $slot} {if $best_choices['y'][$i] == $max}
      • {$slot->title|markdown:true}
        • diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 63d4b62..6384b87 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -97,12 +97,12 @@ {if $editingVoteId === $vote->uniqId && !$expired} - +
        - +
        @@ -133,7 +133,7 @@ {__('Generic', 'No')} -
      • +
      @@ -143,7 +143,7 @@ {/foreach} {/foreach} - + {elseif !$hidden} @@ -153,7 +153,7 @@ {$vote->name|html} {if $slots gt 4} - + {__('Generic', 'Edit')} @@ -161,9 +161,9 @@ {/if} - - - + + + {$k=0} {foreach $slots as $slot} {foreach $slot->moments as $moment} @@ -213,7 +213,7 @@ {if $active && $editingVoteId === 0 && !$expired && $accessGranted} - +
      @@ -242,7 +242,7 @@ {__('Generic', 'No')} -
    • +
    @@ -297,10 +297,10 @@ $('#showChart') .after("

    {__('Poll results', 'Chart')}

    ") .remove(); - + var resIfneedbe = []; var resYes = []; - + $('#addition').find('td').each(function () { var inbCountText = $(this).find('.inb-count').text(); if(inbCountText != '' && inbCountText != undefined) { @@ -318,7 +318,7 @@ var cols = [ {foreach $slots as $slot} {foreach $slot->moments as $moment} - $('
    ').html('{$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}').text(), + $('
    ').html('{$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}').text(), {/foreach} {/foreach} ]; @@ -354,7 +354,7 @@ }); }); - + {/if} {if !$hidden} @@ -374,7 +374,7 @@ {$i = 0} -
      +
        {foreach $slots as $slot} {foreach $slot->moments as $moment} {if $best_choices['y'][$i] == $max}