From 20378e7fb7dcb72ad7bb5affafccb01e21cde5a7 Mon Sep 17 00:00:00 2001 From: JosephK Date: Wed, 17 Jun 2015 23:13:44 +0200 Subject: [PATCH] No = fake btn unchecked in vote form + icon display onload and mouseover in results --- css/style.css | 70 +++++++++++++++++++++++++++++++-- js/app/studs.js | 12 +++++- tpl/part/vote_table_classic.tpl | 35 ++++++++--------- tpl/part/vote_table_date.tpl | 35 ++++++++--------- 4 files changed, 112 insertions(+), 40 deletions(-) diff --git a/css/style.css b/css/style.css index 9b4bfed..076ba7c 100644 --- a/css/style.css +++ b/css/style.css @@ -328,22 +328,25 @@ table.results .btn-link.btn-sm { color:#555; } -.yes .btn { +.yes .btn,.yes .btn:hover { border-bottom-right-radius:0 !important; border-bottom-left-radius:0 !important; margin-bottom:-1px !important; margin-top:4px !important; + color: #677835; } -.ifneedbe .btn { +.ifneedbe .btn,.ifneedbe .btn:hover { border-radius: 0; + color: #C48A1B; } -.no .btn{ +.no .btn,.no .btn:hover{ border-top-right-radius:0 !important; border-top-left-radius:0 !important; margin-bottom:4px !important; margin-top:-1px !important; + color: #AD220F; } .yes input[type="radio"]:checked + label { /* =.btn-success.active */ @@ -367,6 +370,67 @@ table.results .btn-link.btn-sm { box-shadow: 0 3px 5px rgba(0, 0, 0, 0.125) inset; } +/* Button and results "No" */ +.no .btn.startunchecked { + box-shadow:none !important; + color:#AD220F !important; + background:#fff !important; + border-color:#bdbdbd !important; +} + +.no .btn.startunchecked:hover { + background-color: #E0E0E0 !important; + border-color: #949494 !important; +} + +table.results .bg-danger .glyphicon { + opacity:0; + + -moz-animation-name: hideNoIcon; + -moz-animation-iteration-count: 1; + -moz-animation-timing-function: ease-in; + -moz-animation-duration: 2s; + + -webkit-animation-name: hideNoIcon; + -webkit-animation-iteration-count: 1; + -webkit-animation-timing-function: ease-in; + -webkit-animation-duration: 2s; + + animation-name: hideNoIcon; + animation-iteration-count: 1; + animation-timing-function: ease-in; + animation-duration: 2s; +} + +@-moz-keyframes hideNoIcon { + 0% { + opacity:1; + } + 100% { + opacity:0; + } +} +@-webkit-keyframes hideNoIcon { + 0% { + opacity:1; + } + 100% { + opacity:0; + } +} +@keyframes hideNoIcon { + 0% { + opacity:1; + } + 100% { + opacity:0; + } +} + +table.results > tbody > tr:hover > td .glyphicon { + opacity:1 +} + /* create_date_poll.php */ #selected-days .form-group { margin-left:0; diff --git a/js/app/studs.js b/js/app/studs.js index 0266c63..52fd102 100644 --- a/js/app/studs.js +++ b/js/app/studs.js @@ -35,4 +35,14 @@ $(document).ready(function () { } }); -}); \ No newline at end of file + $('.choice input:radio').on('change', function(){ + $(this).parent().parent().find('.startunchecked').removeClass('startunchecked'); + }); + $('.startunchecked').on('click', function(){ + $(this).removeClass('startunchecked'); + }); + $('.no input').on('focus', function(){ + $(this).next().removeClass('startunchecked'); + }); + +}); diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl index dc9730f..725c4c9 100644 --- a/tpl/part/vote_table_classic.tpl +++ b/tpl/part/vote_table_classic.tpl @@ -16,14 +16,14 @@ - {__('Generic', 'Remove')} + {__('Generic', 'Remove')} {/foreach} - {__('Poll results', 'Add a column')} + {__('Poll results', 'Add a column')} @@ -44,7 +44,7 @@
- +
@@ -57,19 +57,19 @@
    • @@ -85,11 +85,11 @@ {foreach $vote->choices as $id=>$choice} {if $choice==2} - {__('Generic', 'Yes')} + {__('Generic', 'Yes')} {elseif $choice==1} - (){__('Generic', 'Ifneedbe')} + (){__('Generic', 'Ifneedbe')} {else} - {__('Generic', 'No')} + {__('Generic', 'No')} {/if} {/foreach} @@ -97,13 +97,13 @@ {if $active && !$expired && ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL') or $admin)} - {__('Generic', 'Edit')} + {__('Generic', 'Edit')} {if $admin} - {__('Generic', 'Remove')} + {__('Generic', 'Remove')} {/if} @@ -120,7 +120,7 @@
    - +
    @@ -130,19 +130,19 @@
  • -
    • @@ -218,8 +218,7 @@ resIfneedbe.shift(); resIfneedbe.pop(); resYes.shift(); resYes.pop(); - console.log(resYes); - console.log(resIfneedbe); + var barChartData = { labels : cols, datasets : [ diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index c81906a..cf3f375 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -20,7 +20,7 @@ - {__('Generic', 'Remove')} + {__('Generic', 'Remove')} {$headersDCount = $headersDCount+1} @@ -29,7 +29,7 @@ - {__('Poll results', 'Add a column')} + {__('Poll results', 'Add a column')} @@ -92,7 +92,7 @@
    - +
    @@ -105,19 +105,19 @@
    • @@ -136,11 +136,11 @@ {foreach $vote->choices as $k=>$choice} {if $choice==2} - {__('Generic', 'Yes')} + {__('Generic', 'Yes')} {elseif $choice==1} - (){__('Generic', 'Ifneedbe')} + (){__('Generic', 'Ifneedbe')} {else} - {__('Generic', 'No')} + {__('Generic', 'No')} {/if} {/foreach} @@ -148,13 +148,13 @@ {if $active && !$expired && ($poll->editable == constant('Framadate\Editable::EDITABLE_BY_ALL') or $admin)} - {__('Generic', 'Edit')} + {__('Generic', 'Edit')} {if $admin} - {__('Generic', 'Remove')} + {__('Generic', 'Remove')} {/if} @@ -171,7 +171,7 @@
    - +
    @@ -183,19 +183,19 @@
  • -
    • @@ -275,8 +275,7 @@ resIfneedbe.shift(); resIfneedbe.pop(); resYes.shift(); resYes.pop(); - console.log(resYes); - console.log(resIfneedbe); + var barChartData = { labels : cols, datasets : [