From b01bd0e7ba91af88a2fe866dbddaee5f402310ba Mon Sep 17 00:00:00 2001
From: Otto Zaiser <zaisero@nic.ar>
Date: Tue, 8 Oct 2019 11:15:30 -0300
Subject: [PATCH] Makeup y deprecated code
---
web/_src/scss/general/_general.scss | 5 +
web/_src/scss/general/_vote.scss | 4 +
web/dist/css/main.css | 2 +-
web/dist/index.html | 28 +-
web/dist/js/vendor/ballot.js | 469 +++++++++---------
.../{smartNewvote.html => nueva/index.html} | 28 +-
.../{smartVotar.html => votar/index.html} | 148 +++---
7 files changed, 350 insertions(+), 334 deletions(-)
rename web/dist/{smartNewvote.html => nueva/index.html} (95%)
rename web/dist/{smartVotar.html => votar/index.html} (62%)
diff --git a/web/_src/scss/general/_general.scss b/web/_src/scss/general/_general.scss
index 62adc37..6611dfe 100644
--- a/web/_src/scss/general/_general.scss
+++ b/web/_src/scss/general/_general.scss
@@ -190,3 +190,8 @@ button.toggle-button{
height: 10px;
width: 10px;
}
+
+
+.hash {
+ word-wrap: break-word;
+}
\ No newline at end of file
diff --git a/web/_src/scss/general/_vote.scss b/web/_src/scss/general/_vote.scss
index 408242c..2d434e1 100644
--- a/web/_src/scss/general/_vote.scss
+++ b/web/_src/scss/general/_vote.scss
@@ -30,6 +30,10 @@
.navbar-vote.navbar-fondo {
.vote-status {
margin-top: 8px;
+
+ @media (max-width: 375px){
+ margin-top: 15px;
+ }
}
}
diff --git a/web/dist/css/main.css b/web/dist/css/main.css
index 6d27744..678c350 100644
--- a/web/dist/css/main.css
+++ b/web/dist/css/main.css
@@ -1 +1 @@
-@import url(https://fonts.googleapis.com/css?family=Raleway:300,300i,400,400i,700,700i,800,800i);footer h2{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}html{font-size:1.125em}body{font-family:Raleway,Arial,sans-serif;font-size:1.125em;font-weight:300;background-color:#fff;line-height:1.45;color:#333;margin-top:0}.alert{display:none}p{margin-bottom:1.3em}h1,h2,h3,h4{margin:1em 0 .5em;font-weight:700;line-height:1.2}h1{margin-top:0;font-size:2.441em}h2{font-size:1.953em}h3{font-size:1.563em}h4{font-size:1.25em}.breadcrumb,.font_small,small{font-size:.8em}@media (max-width:662px){.breadcrumb,.font_small,small{font-size:1em}}@media (max-width:620px){h2{font-size:1.563em}body,html{font-size:1em}}.breadcrumb{background:0 0;padding:10px 0;margin-top:20px}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"\00bb"}.fa{vertical-align:middle}.btn-primary{background-color:#0094d4;color:#fff;border-color:#0094d4;border-radius:50px;border-width:2px;font-weight:700;-webkit-transition:all .2s ease;transition:all .2s ease}.btn-primary:active,.btn-primary:active:hover,.btn-primary:focus,.btn-primary:hover{background-color:#fff;color:#0094d4;border-color:#0094d4}.btn-default{color:#0094d4;background-color:transparent;border-color:#0094d4;border-width:2px;border-style:solid;-webkit-border-image:initial;-o-border-image:initial;border-image:initial;padding:10px 16px;border-radius:50px;margin-top:2px}.btn-default:focus,.btn-default:hover{color:#fff;background-color:#0094d4;border-color:#0094d4}.modal-open .navbar-fixed-bottom,.modal-open .navbar-fixed-top{margin-right:15px}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;opacity:.65;border-color:#999;background-color:#999}.btn.disabled:hover,.btn[disabled]:hover,fieldset[disabled] .btn:hover{color:#fff;border-color:#999;background-color:#999}.visually-hidden{position:absolute!important;clip:rect(1px,1px,1px,1px);overflow:hidden;height:1px;width:1px;word-wrap:normal}.visually-hidden.focusable:active,.visually-hidden.focusable:focus{position:fixed!important;clip:auto;overflow:visible;height:auto;width:100%}a.skip-link{padding:20px;margin:0 auto;background-color:#0094d4;text-align:center;z-index:8000;color:#fff}button.toggle-button{background:0 0;border:0;height:30px}button.toggle-button:hover{color:#0094d4}.form-footer{margin:40px 0}.form-footer p{margin:0;margin-top:8px}@media (max-width:768px){.form-footer{text-align:center}}.form-required:after{background-image:url(../images/required.svg);background-size:10px 10px;content:"";display:inline-block;line-height:1;height:10px;width:10px}.navbar-header .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media (min-width:768px){.navbar-header .logo{margin-right:0;padding-left:0}}.navbar-header .logo img{height:100px;width:140px}.navbar-header .logo img:hover{opacity:.9}.navbar-default{background-color:transparent;border-color:transparent;padding-top:30px;-webkit-transition:padding .2s ease;transition:padding .2s ease}.navbar-default .navbar-nav li>a{color:#0094d4;font-weight:400}@media (min-width:768px){.navbar-default .navbar-nav li>a{color:#fff;padding-bottom:8px;padding-left:4px;padding-right:4px;margin-left:20px;border-bottom:2px solid transparent}}@media (max-width:768px){.navbar-default .navbar-nav li>a:focus,.navbar-default .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-default .navbar-nav li>a:focus,.navbar-default .navbar-nav li>a:hover{color:#fff;border-bottom:2px solid #fff}}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#fff;background-color:transparent;border-bottom:2px solid #fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#fff;background-color:transparent}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#fff}.navbar-default .navbar-toggle:focus .icon-bar,.navbar-default .navbar-toggle:hover .icon-bar{background-color:#2e2f30}@media (max-width:768px){.navbar-default{padding-top:0}.navbar-default .sin-toggle{position:absolute;margin-top:30px;top:0;right:20px}.navbar-default .navbar-collapse{-webkit-box-shadow:0 5px 5px 0 rgba(0,0,0,.2);box-shadow:0 5px 5px 0 rgba(0,0,0,.2);background-color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#0094d4}}@media (min-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu{padding:0;border:none;left:20px;margin-top:16px;border-radius:4px}.navbar-default .menu{margin-top:40px}}.navbar-default .navbar-nav li ul.dropdown-menu li a{border:none;padding:12px 18px;white-space:normal;background-color:#fff;color:#0094d4;margin-left:0}@media (min-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu li a{font-size:1.125em}}.navbar-default .navbar-nav li ul.dropdown-menu li a:hover{border:none;text-decoration:underline}.navbar-default .navbar-nav li ul.dropdown-menu li a.is-active{color:#2e2f30;text-decoration:underline}@media (max-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu li a{padding-left:50px}}.navbar-content{background:#fff;border-color:#e7e7e7}.navbar-content .navbar-toggle{border-color:#0094d4}.navbar-content .navbar-toggle .icon-bar{background-color:#0094d4}.navbar-content .navbar-toggle:focus,.navbar-content .navbar-toggle:hover{background-color:#0094d4}.navbar-content .navbar-toggle:focus .icon-bar,.navbar-content .navbar-toggle:hover .icon-bar{background-color:#fff}.navbar-content .navbar-nav li>a{color:#0094d4}@media (max-width:768px){.navbar-content .navbar-nav li>a:focus,.navbar-content .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-content .navbar-nav li>a:focus,.navbar-content .navbar-nav li>a:hover{color:#0094d4;border-bottom:2px solid #0094d4}}.navbar-content .navbar-nav>.active>a,.navbar-content .navbar-nav>.active>a:focus,.navbar-content .navbar-nav>.active>a:hover{color:#2e2f30;background-color:transparent;border-bottom:2px solid #2e2f30}@media (max-width:768px){.navbar-content .navbar-nav>.active>a,.navbar-content .navbar-nav>.active>a:focus,.navbar-content .navbar-nav>.active>a:hover{border-bottom:none}}.navbar-content .navbar-nav>.open>a,.navbar-content .navbar-nav>.open>a:focus,.navbar-content .navbar-nav>.open>a:hover{color:#0094d4}.navbar-content .navbar-nav>.open>a,.navbar-content .navbar-nav>.open>a:focus,.navbar-content .navbar-nav>.open>a:hover{color:#0094d4}.navbar-content .navbar-nav li ul.dropdown-menu{border-top:1px solid #0094d4;border-top-left-radius:0;border-top-right-radius:0}@media (min-width:768px){.navbar-content .navbar-nav li ul.dropdown-menu{margin-top:31px}}.navbar-content .navbar-nav li ul.dropdown-menu:before{border:none}.navbar-fondo{background:#fff;border-color:#e7e7e7;padding-top:0}.navbar-fondo .logo img{height:75px!important;margin-top:0}.navbar-fondo .navbar-toggle{border-color:#0094d4}.navbar-fondo .navbar-toggle .icon-bar{background-color:#0094d4}.navbar-fondo .navbar-toggle:focus,.navbar-fondo .navbar-toggle:hover{background-color:#0094d4}.navbar-fondo .navbar-toggle:focus .icon-bar,.navbar-fondo .navbar-toggle:hover .icon-bar{background-color:#fff}.navbar-fondo .menu{margin-top:25px}@media (min-width:768px){.navbar-fondo .menu{margin-top:20px}}.navbar-fondo .navbar-nav li>a{color:#0094d4}@media (max-width:768px){.navbar-fondo .navbar-nav li>a:focus,.navbar-fondo .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-fondo .navbar-nav li>a:focus,.navbar-fondo .navbar-nav li>a:hover{color:#0094d4;border-bottom:2px solid #0094d4}}.navbar-fondo .navbar-nav>.active>a,.navbar-fondo .navbar-nav>.active>a:focus,.navbar-fondo .navbar-nav>.active>a:hover{color:#2e2f30;background-color:transparent;border-bottom:2px solid #2e2f30}.navbar-fondo .navbar-nav>.open>a,.navbar-fondo .navbar-nav>.open>a:focus,.navbar-fondo .navbar-nav>.open>a:hover{color:#0094d4;background-color:transparent}.navbar-fondo .navbar-nav li ul.dropdown-menu{border-top:1px solid #0094d4;border-top-left-radius:0;border-top-right-radius:0}@media (min-width:768px){.navbar-fondo .navbar-nav li ul.dropdown-menu{margin-top:26px}}@media (max-width:768px){.navbar-fondo .sin-toggle{margin-top:0}}.navbar-fondo .navbar-nav li ul.dropdown-menu:before{border:none}.navbar-fondo .navbar-nav li ul.dropdown-menu li:last-child>a:focus,.navbar-fondo .navbar-nav li ul.dropdown-menu li:last-child>a:hover{background-color:transparent;color:#0094d4}.navbar-fondo .navbar-nav>.open>a,.navbar-fondo .navbar-nav>.open>a:focus,.navbar-fondo .navbar-nav>.open>a:hover{color:#0094d4}@media (max-width:992px){.navbar-default .navbar-nav li>a{margin-left:10px;font-size:.9em}}.navbar-default .navbar-nav li ul.dropdown-menu li.logout a{background-color:#d9534f;color:#fff}.navbar-default .navbar-nav li ul.dropdown-menu li.logout a:hover{background-color:#d9534f;color:#fff}footer{color:#fff;background-color:#2e2f30;text-align:center;padding:80px 0 60px 0;height:264px}footer ul{list-style:none;padding-left:0;margin-bottom:30px}footer ul li{position:relative;display:inline-block;margin:0 10px}footer ul li a{color:#2e2f30;font-size:16px;display:inline-block;background-color:#fff;border-radius:60px;width:50px;height:50px;padding:.55em 0;vertical-align:middle;-webkit-transition:all .2s ease;transition:all .2s ease}footer ul li a:focus,footer ul li a:hover{color:rgba(255,255,255,.8);color:#fff;background-color:#0094d4;-webkit-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2)}article .field--name-body{margin-bottom:50px;margin-left:auto;margin-right:auto;max-width:700px}article ol,article ul{margin-top:20px}article ol li,article ul li{margin-bottom:20px}article ol li ol,article ol li ul,article ul li ol,article ul li ul{margin-bottom:40px}article img{display:block;max-width:100%;height:auto;margin:30px auto;clear:both;border-radius:4px}article a img{border:1px solid #999}article a:focus img,article a:hover img{border:1px solid #2e2f30;-webkit-box-shadow:0 3px 0 0 #999;box-shadow:0 3px 0 0 #999}article .field--name-field-image img{margin-top:0;margin-bottom:50px;border-bottom:10px solid #0094d4}article .field--name-field-fecha{float:left;padding:10px}article .field--name-field-categoria{float:left;color:#fff;background-color:#0094d4;padding:10px}article .field--name-field-categoria a{color:#fff}.feedback,main form{margin:0 auto;margin-bottom:50px;max-width:700px}.feedback .btn-primary,main form .btn-primary{padding:10px 16px;font-size:18px;line-height:1.3333333}.feedback{text-align:center}.feedback img{margin-top:-30px}.feedback h1{margin-top:-30px}.feedback p{width:70%;margin:0 auto;margin-top:20px;margin-bottom:30px}#edit-preview{display:none}main section{margin-top:35px;padding:0 10px}main section section{margin-top:0}@media (max-width:768px){main section{margin-top:0}}main{margin-top:30px;margin-bottom:50px;padding:0 20px;min-height:-webkit-calc(100vh - 504px);min-height:calc(100vh - 504px)}main a{text-decoration:underline}main a.btn{text-decoration:none}main h2{position:relative;margin-bottom:50px}main h2:after{background-color:#755293;content:"";display:block;height:5px;left:0;bottom:-15px;position:absolute;width:50px}main h3{color:#755293;padding-left:1.5em;background-image:url(../images/bullet.svg);background-repeat:no-repeat;background-position:0}.diagonal-header{height:160px;content:"";background:url(../images/pattern.png),#3b76ba;background:url(../images/pattern.png),-webkit-gradient(linear,left top,left bottom,from(#3b76ba),color-stop(130%,#7dd2d9));background:url(../images/pattern.png),-webkit-linear-gradient(top,#3b76ba 0,#7dd2d9 130%);background:url(../images/pattern.png),linear-gradient(to bottom,#3b76ba 0,#7dd2d9 130%);-webkit-transform:skewY(1.5deg);-ms-transform:skewY(1.5deg);transform:skewY(1.5deg);-webkit-transform-origin:top left;-ms-transform-origin:top left;transform-origin:top left}@media (max-width:768px){.diagonal-header{height:130px}}table[role=presentation] img{margin:0}.navbar-vote .navbar-header{width:100%}.navbar-vote .vote-status{float:right;text-align:right;font-size:.75em;font-weight:700;border:1px solid #eee;border-radius:4px;padding:15px;margin-top:30px}@media (max-width:620px){.navbar-vote .vote-status{max-width:175px;font-size:.6em;padding:10px}}@media (max-width:375px){.navbar-vote .vote-status{max-width:130px;font-size:.5em;padding:8px}}@media (max-width:620px){.navbar-vote{margin-left:0}}.navbar-vote.navbar-fondo .vote-status{margin-top:8px}.loading-status{-webkit-animation:spin 4s linear infinite;animation:spin 4s linear infinite}@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.vote .btn-header{float:right;margin-top:-80px}.vote .btn-address{font-size:.6em}.btn-form{margin-left:3em}.btn-delete{position:absolute;display:none;right:20px;margin-top:8px;padding:5px 10px;font-size:.6em;border-color:#d9534f;background-color:#fff;color:#d9534f}.btn-delete:focus,.btn-delete:hover{background-color:#d9534f;border-color:#d9534f;color:#fff}legend{font-weight:700}form li input.form-control{display:inline-block;position:relative;margin-bottom:15px}form li:last-child input.form-control{margin-bottom:0}input[type=checkbox],input[type=radio]{height:15px;width:15px}.radio-inline+.radio-inline{margin-top:0;margin-left:20px}.votar .checkbox label,.votar .radio label{padding:15px;padding-left:60px;width:100%;background:#f5f5f5;border-radius:5px;border:1px solid #ccc}.votar .checkbox input:checked~label,.votar .radio input:checked~label{color:#fff;background-color:#0094d4;border-color:#0094d4}.votar .checkbox input[type=checkbox],.votar .checkbox input[type=radio],.votar .radio input[type=checkbox],.votar .radio input[type=radio]{width:20px;height:20px;margin-top:20px;margin-left:20px}.resultados,p.max-container{margin:0 auto;margin-bottom:30px;max-width:700px}.panel-avanzado{margin-top:15px}.panel-avanzado .panel-heading{padding:0}.panel-avanzado .panel-heading a{padding:10px 20px;position:relative;display:block;width:100%;text-decoration:none;color:#333}.panel-avanzado .panel-heading a:focus,.panel-avanzado .panel-heading a:hover{background-color:#0094d4;color:#fff}.panel-avanzado .panel-heading a .fa-chevron-down{position:absolute;right:15px;top:15px;-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg);-webkit-transition:all .2s ease;transition:all .2s ease}.panel-avanzado .panel-heading a.collapsed .fa-chevron-down{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);-webkit-transition:all .2s ease;transition:all .2s ease}
\ No newline at end of file
+@import url(https://fonts.googleapis.com/css?family=Raleway:300,300i,400,400i,700,700i,800,800i);footer h2{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}html{font-size:1.125em}body{font-family:Raleway,Arial,sans-serif;font-size:1.125em;font-weight:300;background-color:#fff;line-height:1.45;color:#333;margin-top:0}.alert{display:none}p{margin-bottom:1.3em}h1,h2,h3,h4{margin:1em 0 .5em;font-weight:700;line-height:1.2}h1{margin-top:0;font-size:2.441em}h2{font-size:1.953em}h3{font-size:1.563em}h4{font-size:1.25em}.breadcrumb,.font_small,small{font-size:.8em}@media (max-width:662px){.breadcrumb,.font_small,small{font-size:1em}}@media (max-width:620px){h2{font-size:1.563em}body,html{font-size:1em}}.breadcrumb{background:0 0;padding:10px 0;margin-top:20px}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"\00bb"}.fa{vertical-align:middle}.btn-primary{background-color:#0094d4;color:#fff;border-color:#0094d4;border-radius:50px;border-width:2px;font-weight:700;-webkit-transition:all .2s ease;transition:all .2s ease}.btn-primary:active,.btn-primary:active:hover,.btn-primary:focus,.btn-primary:hover{background-color:#fff;color:#0094d4;border-color:#0094d4}.btn-default{color:#0094d4;background-color:transparent;border-color:#0094d4;border-width:2px;border-style:solid;-webkit-border-image:initial;-o-border-image:initial;border-image:initial;padding:10px 16px;border-radius:50px;margin-top:2px}.btn-default:focus,.btn-default:hover{color:#fff;background-color:#0094d4;border-color:#0094d4}.modal-open .navbar-fixed-bottom,.modal-open .navbar-fixed-top{margin-right:15px}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;opacity:.65;border-color:#999;background-color:#999}.btn.disabled:hover,.btn[disabled]:hover,fieldset[disabled] .btn:hover{color:#fff;border-color:#999;background-color:#999}.visually-hidden{position:absolute!important;clip:rect(1px,1px,1px,1px);overflow:hidden;height:1px;width:1px;word-wrap:normal}.visually-hidden.focusable:active,.visually-hidden.focusable:focus{position:fixed!important;clip:auto;overflow:visible;height:auto;width:100%}a.skip-link{padding:20px;margin:0 auto;background-color:#0094d4;text-align:center;z-index:8000;color:#fff}button.toggle-button{background:0 0;border:0;height:30px}button.toggle-button:hover{color:#0094d4}.form-footer{margin:40px 0}.form-footer p{margin:0;margin-top:8px}@media (max-width:768px){.form-footer{text-align:center}}.form-required:after{background-image:url(../images/required.svg);background-size:10px 10px;content:"";display:inline-block;line-height:1;height:10px;width:10px}.hash{word-wrap:break-word}.navbar-header .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media (min-width:768px){.navbar-header .logo{margin-right:0;padding-left:0}}.navbar-header .logo img{height:100px;width:140px}.navbar-header .logo img:hover{opacity:.9}.navbar-default{background-color:transparent;border-color:transparent;padding-top:30px;-webkit-transition:padding .2s ease;transition:padding .2s ease}.navbar-default .navbar-nav li>a{color:#0094d4;font-weight:400}@media (min-width:768px){.navbar-default .navbar-nav li>a{color:#fff;padding-bottom:8px;padding-left:4px;padding-right:4px;margin-left:20px;border-bottom:2px solid transparent}}@media (max-width:768px){.navbar-default .navbar-nav li>a:focus,.navbar-default .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-default .navbar-nav li>a:focus,.navbar-default .navbar-nav li>a:hover{color:#fff;border-bottom:2px solid #fff}}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#fff;background-color:transparent;border-bottom:2px solid #fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#fff;background-color:transparent}.navbar-default .navbar-toggle{border-color:#fff}.navbar-default .navbar-toggle .icon-bar{background-color:#fff}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#fff}.navbar-default .navbar-toggle:focus .icon-bar,.navbar-default .navbar-toggle:hover .icon-bar{background-color:#2e2f30}@media (max-width:768px){.navbar-default{padding-top:0}.navbar-default .sin-toggle{position:absolute;margin-top:30px;top:0;right:20px}.navbar-default .navbar-collapse{-webkit-box-shadow:0 5px 5px 0 rgba(0,0,0,.2);box-shadow:0 5px 5px 0 rgba(0,0,0,.2);background-color:#fff}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#0094d4}}@media (min-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu{padding:0;border:none;left:20px;margin-top:16px;border-radius:4px}.navbar-default .menu{margin-top:40px}}.navbar-default .navbar-nav li ul.dropdown-menu li a{border:none;padding:12px 18px;white-space:normal;background-color:#fff;color:#0094d4;margin-left:0}@media (min-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu li a{font-size:1.125em}}.navbar-default .navbar-nav li ul.dropdown-menu li a:hover{border:none;text-decoration:underline}.navbar-default .navbar-nav li ul.dropdown-menu li a.is-active{color:#2e2f30;text-decoration:underline}@media (max-width:768px){.navbar-default .navbar-nav li ul.dropdown-menu li a{padding-left:50px}}.navbar-content{background:#fff;border-color:#e7e7e7}.navbar-content .navbar-toggle{border-color:#0094d4}.navbar-content .navbar-toggle .icon-bar{background-color:#0094d4}.navbar-content .navbar-toggle:focus,.navbar-content .navbar-toggle:hover{background-color:#0094d4}.navbar-content .navbar-toggle:focus .icon-bar,.navbar-content .navbar-toggle:hover .icon-bar{background-color:#fff}.navbar-content .navbar-nav li>a{color:#0094d4}@media (max-width:768px){.navbar-content .navbar-nav li>a:focus,.navbar-content .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-content .navbar-nav li>a:focus,.navbar-content .navbar-nav li>a:hover{color:#0094d4;border-bottom:2px solid #0094d4}}.navbar-content .navbar-nav>.active>a,.navbar-content .navbar-nav>.active>a:focus,.navbar-content .navbar-nav>.active>a:hover{color:#2e2f30;background-color:transparent;border-bottom:2px solid #2e2f30}@media (max-width:768px){.navbar-content .navbar-nav>.active>a,.navbar-content .navbar-nav>.active>a:focus,.navbar-content .navbar-nav>.active>a:hover{border-bottom:none}}.navbar-content .navbar-nav>.open>a,.navbar-content .navbar-nav>.open>a:focus,.navbar-content .navbar-nav>.open>a:hover{color:#0094d4}.navbar-content .navbar-nav>.open>a,.navbar-content .navbar-nav>.open>a:focus,.navbar-content .navbar-nav>.open>a:hover{color:#0094d4}.navbar-content .navbar-nav li ul.dropdown-menu{border-top:1px solid #0094d4;border-top-left-radius:0;border-top-right-radius:0}@media (min-width:768px){.navbar-content .navbar-nav li ul.dropdown-menu{margin-top:31px}}.navbar-content .navbar-nav li ul.dropdown-menu:before{border:none}.navbar-fondo{background:#fff;border-color:#e7e7e7;padding-top:0}.navbar-fondo .logo img{height:75px!important;margin-top:0}.navbar-fondo .navbar-toggle{border-color:#0094d4}.navbar-fondo .navbar-toggle .icon-bar{background-color:#0094d4}.navbar-fondo .navbar-toggle:focus,.navbar-fondo .navbar-toggle:hover{background-color:#0094d4}.navbar-fondo .navbar-toggle:focus .icon-bar,.navbar-fondo .navbar-toggle:hover .icon-bar{background-color:#fff}.navbar-fondo .menu{margin-top:25px}@media (min-width:768px){.navbar-fondo .menu{margin-top:20px}}.navbar-fondo .navbar-nav li>a{color:#0094d4}@media (max-width:768px){.navbar-fondo .navbar-nav li>a:focus,.navbar-fondo .navbar-nav li>a:hover{color:#0094d4;text-decoration:underline}}@media (min-width:768px){.navbar-fondo .navbar-nav li>a:focus,.navbar-fondo .navbar-nav li>a:hover{color:#0094d4;border-bottom:2px solid #0094d4}}.navbar-fondo .navbar-nav>.active>a,.navbar-fondo .navbar-nav>.active>a:focus,.navbar-fondo .navbar-nav>.active>a:hover{color:#2e2f30;background-color:transparent;border-bottom:2px solid #2e2f30}.navbar-fondo .navbar-nav>.open>a,.navbar-fondo .navbar-nav>.open>a:focus,.navbar-fondo .navbar-nav>.open>a:hover{color:#0094d4;background-color:transparent}.navbar-fondo .navbar-nav li ul.dropdown-menu{border-top:1px solid #0094d4;border-top-left-radius:0;border-top-right-radius:0}@media (min-width:768px){.navbar-fondo .navbar-nav li ul.dropdown-menu{margin-top:26px}}@media (max-width:768px){.navbar-fondo .sin-toggle{margin-top:0}}.navbar-fondo .navbar-nav li ul.dropdown-menu:before{border:none}.navbar-fondo .navbar-nav li ul.dropdown-menu li:last-child>a:focus,.navbar-fondo .navbar-nav li ul.dropdown-menu li:last-child>a:hover{background-color:transparent;color:#0094d4}.navbar-fondo .navbar-nav>.open>a,.navbar-fondo .navbar-nav>.open>a:focus,.navbar-fondo .navbar-nav>.open>a:hover{color:#0094d4}@media (max-width:992px){.navbar-default .navbar-nav li>a{margin-left:10px;font-size:.9em}}.navbar-default .navbar-nav li ul.dropdown-menu li.logout a{background-color:#d9534f;color:#fff}.navbar-default .navbar-nav li ul.dropdown-menu li.logout a:hover{background-color:#d9534f;color:#fff}footer{color:#fff;background-color:#2e2f30;text-align:center;padding:80px 0 60px 0;height:264px}footer ul{list-style:none;padding-left:0;margin-bottom:30px}footer ul li{position:relative;display:inline-block;margin:0 10px}footer ul li a{color:#2e2f30;font-size:16px;display:inline-block;background-color:#fff;border-radius:60px;width:50px;height:50px;padding:.55em 0;vertical-align:middle;-webkit-transition:all .2s ease;transition:all .2s ease}footer ul li a:focus,footer ul li a:hover{color:rgba(255,255,255,.8);color:#fff;background-color:#0094d4;-webkit-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2)}article .field--name-body{margin-bottom:50px;margin-left:auto;margin-right:auto;max-width:700px}article ol,article ul{margin-top:20px}article ol li,article ul li{margin-bottom:20px}article ol li ol,article ol li ul,article ul li ol,article ul li ul{margin-bottom:40px}article img{display:block;max-width:100%;height:auto;margin:30px auto;clear:both;border-radius:4px}article a img{border:1px solid #999}article a:focus img,article a:hover img{border:1px solid #2e2f30;-webkit-box-shadow:0 3px 0 0 #999;box-shadow:0 3px 0 0 #999}article .field--name-field-image img{margin-top:0;margin-bottom:50px;border-bottom:10px solid #0094d4}article .field--name-field-fecha{float:left;padding:10px}article .field--name-field-categoria{float:left;color:#fff;background-color:#0094d4;padding:10px}article .field--name-field-categoria a{color:#fff}.feedback,main form{margin:0 auto;margin-bottom:50px;max-width:700px}.feedback .btn-primary,main form .btn-primary{padding:10px 16px;font-size:18px;line-height:1.3333333}.feedback{text-align:center}.feedback img{margin-top:-30px}.feedback h1{margin-top:-30px}.feedback p{width:70%;margin:0 auto;margin-top:20px;margin-bottom:30px}#edit-preview{display:none}main section{margin-top:35px;padding:0 10px}main section section{margin-top:0}@media (max-width:768px){main section{margin-top:0}}main{margin-top:30px;margin-bottom:50px;padding:0 20px;min-height:-webkit-calc(100vh - 504px);min-height:calc(100vh - 504px)}main a{text-decoration:underline}main a.btn{text-decoration:none}main h2{position:relative;margin-bottom:50px}main h2:after{background-color:#755293;content:"";display:block;height:5px;left:0;bottom:-15px;position:absolute;width:50px}main h3{color:#755293;padding-left:1.5em;background-image:url(../images/bullet.svg);background-repeat:no-repeat;background-position:0}.diagonal-header{height:160px;content:"";background:url(../images/pattern.png),#3b76ba;background:url(../images/pattern.png),-webkit-gradient(linear,left top,left bottom,from(#3b76ba),color-stop(130%,#7dd2d9));background:url(../images/pattern.png),-webkit-linear-gradient(top,#3b76ba 0,#7dd2d9 130%);background:url(../images/pattern.png),linear-gradient(to bottom,#3b76ba 0,#7dd2d9 130%);-webkit-transform:skewY(1.5deg);-ms-transform:skewY(1.5deg);transform:skewY(1.5deg);-webkit-transform-origin:top left;-ms-transform-origin:top left;transform-origin:top left}@media (max-width:768px){.diagonal-header{height:130px}}table[role=presentation] img{margin:0}.navbar-vote .navbar-header{width:100%}.navbar-vote .vote-status{float:right;text-align:right;font-size:.75em;font-weight:700;border:1px solid #eee;border-radius:4px;padding:15px;margin-top:30px}@media (max-width:620px){.navbar-vote .vote-status{max-width:175px;font-size:.6em;padding:10px}}@media (max-width:375px){.navbar-vote .vote-status{max-width:130px;font-size:.5em;padding:8px}}@media (max-width:620px){.navbar-vote{margin-left:0}}.navbar-vote.navbar-fondo .vote-status{margin-top:8px}@media (max-width:375px){.navbar-vote.navbar-fondo .vote-status{margin-top:15px}}.loading-status{-webkit-animation:spin 4s linear infinite;animation:spin 4s linear infinite}@-webkit-keyframes spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.vote .btn-header{float:right;margin-top:-80px}.vote .btn-address{font-size:.6em}.btn-form{margin-left:3em}.btn-delete{position:absolute;display:none;right:20px;margin-top:8px;padding:5px 10px;font-size:.6em;border-color:#d9534f;background-color:#fff;color:#d9534f}.btn-delete:focus,.btn-delete:hover{background-color:#d9534f;border-color:#d9534f;color:#fff}legend{font-weight:700}form li input.form-control{display:inline-block;position:relative;margin-bottom:15px}form li:last-child input.form-control{margin-bottom:0}input[type=checkbox],input[type=radio]{height:15px;width:15px}.radio-inline+.radio-inline{margin-top:0;margin-left:20px}.votar .checkbox label,.votar .radio label{padding:15px;padding-left:60px;width:100%;background:#f5f5f5;border-radius:5px;border:1px solid #ccc}.votar .checkbox input:checked~label,.votar .radio input:checked~label{color:#fff;background-color:#0094d4;border-color:#0094d4}.votar .checkbox input[type=checkbox],.votar .checkbox input[type=radio],.votar .radio input[type=checkbox],.votar .radio input[type=radio]{width:20px;height:20px;margin-top:20px;margin-left:20px}.resultados,p.max-container{margin:0 auto;margin-bottom:30px;max-width:700px}.panel-avanzado{margin-top:15px}.panel-avanzado .panel-heading{padding:0}.panel-avanzado .panel-heading a{padding:10px 20px;position:relative;display:block;width:100%;text-decoration:none;color:#333}.panel-avanzado .panel-heading a:focus,.panel-avanzado .panel-heading a:hover{background-color:#0094d4;color:#fff}.panel-avanzado .panel-heading a .fa-chevron-down{position:absolute;right:15px;top:15px;-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg);-webkit-transition:all .2s ease;transition:all .2s ease}.panel-avanzado .panel-heading a.collapsed .fa-chevron-down{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);-webkit-transition:all .2s ease;transition:all .2s ease}
\ No newline at end of file
diff --git a/web/dist/index.html b/web/dist/index.html
index 4a4e6cf..3ee4ca7 100644
--- a/web/dist/index.html
+++ b/web/dist/index.html
@@ -33,24 +33,24 @@
<div id="voterow" class="row hide">
<section>
<h1 class="page-header">Votación</h1>
- <a class="btn-default btn btn-lg btn-header btn-new" aria-label="Crear nueva votación" href="smartNewvote.html">
+ <a class="btn-default btn btn-lg btn-header btn-new" aria-label="Crear nueva votación" href="./nueva/">
<span class="hidden-xs">Crear nueva votación</span>
<span class="visible-xs">
<i class="fas fa-plus" aria-hidden="true"></i>
</span>
</a>
- <form action="smartVotar.html">
- <div class="alert alert-danger" role="alert" id="errorForm">
+ <form action="./votar/">
+ <div class="alert alert-danger" style="display: none" role="alert" id="errorForm">
<p>Comprobá los siguientes errores del formulario:</p>
<ul></ul>
</div>
<div class="form-group form-group-lg col-sm-12">
- <label for="input_address" class="form-required">Dirección de la votación</label>
- <input class="form-control" type="text" id="input_address" name="input_address" value="" size="40"
+ <label for="vote_address" class="form-required">Dirección de la votación</label>
+ <input class="form-control" type="text" id="vote_address" name="vote_address" value="" size="40"
minlength="42" maxlength="42" required="required" aria-required="true" placeholder="42 caracteres hex (debe empezar con 0x)">
</div>
<div class="form-group col-sm-6 col-sm-push-6">
- <button class="btn-primary btn btn-block" type="submit" id="submit">Ver votación</button>
+ <button class="btn-primary btn btn-lg btn-block" type="submit" id="submit">Ver votación</button>
</div>
</form>
</section>
@@ -66,8 +66,6 @@
<h2>Redes Sociales</h2>
<div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">
<ul>
- <li><a href="https://www.facebook.com/bfa.ar" target="_blank"><i class="fab fa-facebook-f fa-2x"
- aria-hidden="true"></i><span class="sr-only">Facebook</span></a></li>
<li><a href="https://www.twitter.com/bfa_ar" target="_blank"><i class="fab fa-twitter fa-2x"
aria-hidden="true"></i><span class="sr-only">Twitter</span></a></li>
<li><a href="https://www.instagram.com/bfa_ar" target="_blank"><i class="fab fa-instagram fa-2x"
@@ -109,20 +107,20 @@
unhighlight: function (element) {
$(element).closest('.form-group').removeClass('has-error');
},
- submitHandler: function (form) {
- // do other things for a valid form
- form.submit();
- //ver_votacion('');
- },
+ // submitHandler: function (form) {
+ // // do other things for a valid form
+ // form.submit();
+ // //ver_votacion2('');
+ // },
messages: {
- input_address: {
+ vote_address: {
required: "Ingresá una dirección válida",
minlength: "La dirección debe tener 42 caractéres incluidos el 0x.",
maxlength: "La dirección debe tener 42 caractéres incluidos el 0x."
}
},
rules: {
- input_address: {
+ vote_address: {
required: true,
minlength: 42,
maxlength: 42
diff --git a/web/dist/js/vendor/ballot.js b/web/dist/js/vendor/ballot.js
index b1c8c3e..5d8789f 100644
--- a/web/dist/js/vendor/ballot.js
+++ b/web/dist/js/vendor/ballot.js
@@ -15,73 +15,76 @@ var netnames = {
"3": 'ropsten test',
"4": 'Rinkeby test',
'42': 'Kovan test',
- '5445': 'BFA test',
+ '5445': 'BFA test', //Red que no está sellando
+ '55555000000': 'BFA test2',
'47525974938': 'Blockchain Federal Argentina',
'5777': 'Ganache - Local'
};
var mainaddr = {
- '5445': '0xe5bf7c3e8aa529e42fbd99428137b68db75d85f9',
- '47525974938': '0xe3e08934b6fa0b68972c08e0f545cee31ed039c6',
+ '5445': '0xe5bf7c3e8aa529e42fbd99428137b68db75d85f9',
+ '55555000000': '0xe5bf7c3e8aa529e42fbd99428137b68db75d85f9', // Smart contract
+ '47525974938': '0xe3e08934b6fa0b68972c08e0f545cee31ed039c6',
'5777': '0xB1427B0147175ea6c6e35eA8c258b7e844ECa66A'
};
var contract_event;
-// Deprecated
+/// DEPRECATED ///
var ballot_keccak3 = '0x27fdf9b1c0d27b6143d49147cf30b3f7f09ac1c2cb2b7115a1633e0b8551c6a9';
window.addEventListener('load', page_loaded);
-function addchild(parent, childtype, childText, attributes) {
- var childNode = document.createElement(childtype);
- if (typeof childText == 'string') {
- var childTextNode = document.createTextNode(childText);
- childNode.appendChild(childTextNode);
- }
- if (attributes) {
- for (var att in attributes)
- childNode.setAttribute(att, attributes[att]);
- }
- parent.appendChild(childNode);
- return childNode;
-}
-
+/// DEPRECATED ///
+// function addchild(parent, childtype, childText, attributes) {
+// var childNode = document.createElement(childtype);
+// if (typeof childText == 'string') {
+// var childTextNode = document.createTextNode(childText);
+// childNode.appendChild(childTextNode);
+// }
+// if (attributes) {
+// for (var att in attributes)
+// childNode.setAttribute(att, attributes[att]);
+// }
+// parent.appendChild(childNode);
+// return childNode;
+// }
+// DEPRECATED
function ask_about_contract_address() {
document.getElementById('status').classList.remove("hide");
document.getElementById('voterow').classList.remove("hide");
}
-
-function update_create_new_ballot() {
- // Find our div (if it exists).
- var div = document.getElementById('div_create_ballot');
- if (!div)
- return;
- // Don't change anything, if we are in the middle of creating a new contract.
- if (document.getElementById('newcontract'))
- return;
- // See if we already have the form inside the div
- if (!document.getElementById('nueva_link')) {
- addchild(div, 'span', 'o tal vez querés ');
- addchild(div, 'a', 'crear una votación nueva', {
- 'href': 'javascript:ask_for_ballot_details()',
- 'id': 'nueva_link'
- });
- addchild(div, 'span', '?');
- }
- if (mainaddr[netid] == undefined) {
- // if we do not have the address of the mother contract, we will
- // not present the user with a choice to create a new form.
- div.setAttribute('class', 'hidden');
- return;
- }
- div.removeAttribute('class');
-}
+// DEPRECATED
+// function update_create_new_ballot() {
+// // Find our div (if it exists).
+// var div = document.getElementById('div_create_ballot');
+// if (!div)
+// return;
+// // Don't change anything, if we are in the middle of creating a new contract.
+// if (document.getElementById('newcontract'))
+// return;
+// // See if we already have the form inside the div
+// if (!document.getElementById('nueva_link')) {
+// addchild(div, 'span', 'o tal vez querés ');
+// addchild(div, 'a', 'crear una votación nueva', {
+// 'href': 'javascript:ask_for_ballot_details()',
+// 'id': 'nueva_link'
+// });
+// addchild(div, 'span', '?');
+// }
+// if (mainaddr[netid] == undefined) {
+// // if we do not have the address of the mother contract, we will
+// // not present the user with a choice to create a new form.
+// div.setAttribute('class', 'hidden');
+// return;
+// }
+// div.removeAttribute('class');
+// }
async function page_loaded() {
- var body = document.getElementsByTagName("body")[0];
- rootdiv = addchild(body, 'div', undefined, {
- 'id': 'root'
- });
+ // var body = document.getElementsByTagName("body")[0];
+ // rootdiv = addchild(body, 'div', undefined, {
+ // 'id': 'root'
+ // });
const Web3 = require('web3');
// post Nov 2018 this works
if (window.ethereum) {
@@ -110,7 +113,7 @@ async function page_loaded() {
}
// wow, all okay
// add more UI elements
- console.log('window.web3.version.api is ' + window.web3.version.api);
+ //console.log('window.web3.version.api is ' + window.web3.version.api);
ask_about_contract_address();
//addchild( rootdiv, 'hr', undefined, {'width':'20%'} );
@@ -121,22 +124,23 @@ async function page_loaded() {
});
- addchild(rootdiv, 'div', undefined, {
- 'id': 'div_create_ballot',
- 'class': 'hidden'
- });
- update_create_new_ballot();
+ // addchild(rootdiv, 'div', undefined, {
+ // 'id': 'div_create_ballot',
+ // 'class': 'hidden'
+ // });
+ // update_create_new_ballot();
get_status();
timer = setInterval(get_status, 1000);
}
-function deleteAllChildren(node) {
- node.children.forEach(
- function (item, idx) {
- node.removeChild(item);
- }
- );
-}
+/// DEPRECATED ///
+// function deleteAllChildren(node) {
+// node.children.forEach(
+// function (item, idx) {
+// node.removeChild(item);
+// }
+// );
+// }
async function get_netid() {
window.web3.version.getNetwork(
@@ -202,7 +206,7 @@ function update_status_display() {
div.parent.removeChild(div);
} else
div.innerHTML = info.join('<br/>');
- update_create_new_ballot()
+ //update_create_new_ballot()
}
function api_version() {
@@ -235,168 +239,171 @@ function setup_existing_instance(abi, addr) {
return;
}
-function add_proposal(pos) {
- var div = document.getElementById('newtable');
- if (!div)
- return;
- var len = div.children.length;
- //
- var newnode = document.createElement('tr');
- newnode.setAttribute('class', 'proposal');
- // We add/adjust text and attribs afterwards
- var td1 = addchild(newnode, 'td');
- var td2 = addchild(newnode, 'td');
- addchild(td2, 'input');
- var idx = 0;
- for (var i = 0; i < div.children.length; i++) {
- if (div.children[i].getAttribute('class') == 'proposal') {
- idx++;
- if (newnode) {
- if (pos == idx) {
- div.insertBefore(newnode, div.children[i - 1]);
- newnode = undefined;
- }
- }
- }
- }
- if (newnode && idx < 10)
- div.insertBefore(newnode, div.lastChild);
- // Fix numbering
- idx = 0;
- for (var i = 0; i < div.children.length; i++) {
- if (div.children[i].getAttribute('class') == 'proposal') {
- idx++;
- div.children[i].children[0].innerHTML = 'Proposal ' + idx;
- div.children[i].children[1].children[0].setAttribute('name', 'proposal' + idx);
- }
- }
-}
-
-async function ask_for_ballot_details() {
- if (mainaddr[netid] == undefined)
- return;
- if (abiNew == undefined)
- return
- if (abiNew == '')
- return;
- //
- var otherdiv;
- if (otherdiv = document.getElementById('div_create_ballot'))
- otherdiv.setAttribute('class', 'hidden');
- //
- // Our territory starts here
- //
- var newdiv = addchild(rootdiv, 'div', undefined, {
- 'id': 'newcontract'
- });
- // Create form.
- var form = addchild(newdiv, 'form', undefined, {
- 'id': 'form_create_new_ballot',
- 'action': 'javascript:nueva_votacion()'
- });
- var table = addchild(form, 'table', undefined, {
- 'id': 'newtable'
- });
- // Title
- var tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Title');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'title'
- }
- );
- // Vote Starts
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Vote starts');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'voteStarts'
- }
- );
- // Vote Before
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Vote before');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'voteBefore'
- }
- );
- // % of registered voters req to be valid
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Percent of registered voters must vote for the result to be valid');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'percentOfRegisteredVotersReqToBeValid',
- 'value': '0.000001'
- }
- );
- // % of votes cast to win
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Percent of votes cast to win');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'percentOfVotesCastToWin',
- 'value': '50.000001'
- }
- );
- // Count non-votes as blanks
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Count non-votes as blanks');
- var select = addchild(
- addchild(tr, 'td'),
- 'select', undefined, {
- 'name': 'countNonvotesAsBlanks'
- }
- );
- addchild(select, 'option', undefined, {
- 'value': 'Yes'
- }).innerHTML = 'Si / Yes';
- addchild(select, 'option', undefined, {
- 'value': 'No'
- }).innerHTML = 'No';
- // Max votes per voter
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Maximum number of votes per voter');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'maxVotesPerVoter',
- 'value': '1'
- }
- );
- // Max votes per proposal
- tr = addchild(table, 'tr');
- addchild(tr, 'td', 'Maximum number of votes per proposal');
- addchild(
- addchild(tr, 'td'),
- 'input', undefined, {
- 'name': 'maxVotesPerProposal',
- 'value': '1'
- }
- );
- // more mas extra
- tr = addchild(table, 'tr');
- addchild(
- addchild(tr, 'td', undefined, {
- 'colspan': '2'
- }),
- 'a', '[ + extra proposal ]', {
- 'href': 'javascript:add_proposal(999)'
- });
- // Proposals
- add_proposal(1);
- //
- // submit button to create a new ballot
- addchild(form, 'input', undefined, {
- 'type': 'submit',
- 'value': 'Crear nueva'
- });
-}
+/// DEPRECATED ///
+// function add_proposal(pos) {
+// var div = document.getElementById('newtable');
+// if (!div)
+// return;
+// var len = div.children.length;
+// //
+// var newnode = document.createElement('tr');
+// newnode.setAttribute('class', 'proposal');
+// // We add/adjust text and attribs afterwards
+// var td1 = addchild(newnode, 'td');
+// var td2 = addchild(newnode, 'td');
+// addchild(td2, 'input');
+// var idx = 0;
+// for (var i = 0; i < div.children.length; i++) {
+// if (div.children[i].getAttribute('class') == 'proposal') {
+// idx++;
+// if (newnode) {
+// if (pos == idx) {
+// div.insertBefore(newnode, div.children[i - 1]);
+// newnode = undefined;
+// }
+// }
+// }
+// }
+// if (newnode && idx < 10)
+// div.insertBefore(newnode, div.lastChild);
+// // Fix numbering
+// idx = 0;
+// for (var i = 0; i < div.children.length; i++) {
+// if (div.children[i].getAttribute('class') == 'proposal') {
+// idx++;
+// div.children[i].children[0].innerHTML = 'Proposal ' + idx;
+// div.children[i].children[1].children[0].setAttribute('name', 'proposal' + idx);
+// }
+// }
+// }
+
+
+/// DEPRECATED ///
+// async function ask_for_ballot_details() {
+// if (mainaddr[netid] == undefined)
+// return;
+// if (abiNew == undefined)
+// return
+// if (abiNew == '')
+// return;
+// //
+// var otherdiv;
+// if (otherdiv = document.getElementById('div_create_ballot'))
+// otherdiv.setAttribute('class', 'hidden');
+// //
+// // Our territory starts here
+// //
+// var newdiv = addchild(rootdiv, 'div', undefined, {
+// 'id': 'newcontract'
+// });
+// // Create form.
+// var form = addchild(newdiv, 'form', undefined, {
+// 'id': 'form_create_new_ballot',
+// 'action': 'javascript:nueva_votacion()'
+// });
+// var table = addchild(form, 'table', undefined, {
+// 'id': 'newtable'
+// });
+// // Title
+// var tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Title');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'title'
+// }
+// );
+// // Vote Starts
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Vote starts');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'voteStarts'
+// }
+// );
+// // Vote Before
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Vote before');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'voteBefore'
+// }
+// );
+// // % of registered voters req to be valid
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Percent of registered voters must vote for the result to be valid');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'percentOfRegisteredVotersReqToBeValid',
+// 'value': '0.000001'
+// }
+// );
+// // % of votes cast to win
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Percent of votes cast to win');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'percentOfVotesCastToWin',
+// 'value': '50.000001'
+// }
+// );
+// // Count non-votes as blanks
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Count non-votes as blanks');
+// var select = addchild(
+// addchild(tr, 'td'),
+// 'select', undefined, {
+// 'name': 'countNonvotesAsBlanks'
+// }
+// );
+// addchild(select, 'option', undefined, {
+// 'value': 'Yes'
+// }).innerHTML = 'Si / Yes';
+// addchild(select, 'option', undefined, {
+// 'value': 'No'
+// }).innerHTML = 'No';
+// // Max votes per voter
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Maximum number of votes per voter');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'maxVotesPerVoter',
+// 'value': '1'
+// }
+// );
+// // Max votes per proposal
+// tr = addchild(table, 'tr');
+// addchild(tr, 'td', 'Maximum number of votes per proposal');
+// addchild(
+// addchild(tr, 'td'),
+// 'input', undefined, {
+// 'name': 'maxVotesPerProposal',
+// 'value': '1'
+// }
+// );
+// // more mas extra
+// tr = addchild(table, 'tr');
+// addchild(
+// addchild(tr, 'td', undefined, {
+// 'colspan': '2'
+// }),
+// 'a', '[ + extra proposal ]', {
+// 'href': 'javascript:add_proposal(999)'
+// });
+// // Proposals
+// add_proposal(1);
+// //
+// // submit button to create a new ballot
+// addchild(form, 'input', undefined, {
+// 'type': 'submit',
+// 'value': 'Crear nueva'
+// });
+// }
async function nueva_votacion(arguments, proposals, voters) {
if (mainaddr[netid] == undefined)
@@ -406,9 +413,9 @@ async function nueva_votacion(arguments, proposals, voters) {
proposals[i] = web3.fromAscii(proposals[i]);
}
- alertarLoading('Trying to access your account.');
+ alertarLoading('Tratando de acceder a tu cuenta.');
await access_accounts();
- alertarLoading('Creating new voting contract.');
+ alertarLoading('Creando un nuevo contrato de votación.');
var contract = setup_existing_contract(abiNew, mainaddr[netid]);
if (!contract)
@@ -446,7 +453,7 @@ async function ver_votacion(addr) {
if (addr == "")
addr =
document
- .getElementById('input_address')
+ .getElementById('vote_address')
.value;
alertarLoading('Cargando detalles del contrato...');
if (addr && addr.length == 40)
@@ -463,13 +470,17 @@ async function ver_votacion(addr) {
async function ver_votacion2(addr, code) {
console.log('Contract code', code);
if (code == '0x') {
- alertar('No existe un contrato con esa dirección');
+ alertar('No existe un contrato con esa dirección');
+ $('#titulo_votacion').text('Error');
+
return;
+ }else{
+ document.getElementById('vote-content').classList.add("show");
}
var keccak3 = window.web3.sha3(code, {
'encoding': 'hex'
});
- console.log('keccak3: ', keccak3);
+ //console.log('keccak3: ', keccak3);
/*if (keccak3 != ballot_keccak3) {
alertar('No hay una votación en esa dirección.');
return;
diff --git a/web/dist/smartNewvote.html b/web/dist/nueva/index.html
similarity index 95%
rename from web/dist/smartNewvote.html
rename to web/dist/nueva/index.html
index 334f35c..da7ef61 100644
--- a/web/dist/smartNewvote.html
+++ b/web/dist/nueva/index.html
@@ -5,12 +5,12 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Nueva Votación | Blockchain Federal Argentina</title>
- <link rel="shortcut icon" href="favicon.ico" />
+ <link rel="shortcut icon" href="../favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">
- <link rel="stylesheet" type="text/css" media="screen" href="css/vendor.css" />
- <link rel="stylesheet" type="text/css" media="screen" href="css/main.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/vendor.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/main.css" />
</head>
<body>
@@ -20,7 +20,7 @@
<div class="navbar-header">
<div class="region region-navigation">
<a class="logo navbar-btn pull-left" href="https://bfa.ar/" rel="home">
- <img id="logo" src="./images/logo.svg" alt="Blockchain Federal Argentina">
+ <img id="logo" src="../images/logo.svg" alt="Blockchain Federal Argentina">
</a>
<div class="vote-status hide" id="status"></div>
</div>
@@ -34,7 +34,7 @@
<section>
<h1 class="page-header">Nueva Votación</h1>
<form action="" id="form_create_new_ballot">
- <div class="alert alert-danger" role="alert" id="errorForm">
+ <div class="alert alert-danger" style="display: none" role="alert" id="errorForm">
<p>Comprobá los siguientes errores del formulario:</p>
<ul></ul>
</div>
@@ -160,10 +160,10 @@
</div>
<div class="row">
<div class="form-group col-sm-6 col-sm-push-6 form-footer">
- <button class="btn-primary btn btn-block" type="submit" id="submit">Crear votación</button>
+ <button class="btn-primary btn btn-lg btn-block" type="submit" id="submit">Crear votación</button>
</div>
<div class="form-group form-group-lg col-sm-6 col-sm-pull-6 font_small form-footer">
- <a class="btn-default btn btn-lg btn-block" href="smartVote.html">Cancelar</a>
+ <a class="btn-default btn btn-lg btn-block" href="../">Cancelar</a>
</div>
</div>
</form>
@@ -180,8 +180,6 @@
<h2>Redes Sociales</h2>
<div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">
<ul>
- <li><a href="https://www.facebook.com/bfa.ar" target="_blank"><i class="fab fa-facebook-f fa-2x"
- aria-hidden="true"></i><span class="sr-only">Facebook</span></a></li>
<li><a href="https://www.twitter.com/bfa_ar" target="_blank"><i class="fab fa-twitter fa-2x"
aria-hidden="true"></i><span class="sr-only">Twitter</span></a></li>
<li><a href="https://www.instagram.com/bfa_ar" target="_blank"><i class="fab fa-instagram fa-2x"
@@ -201,12 +199,12 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>
- <script src="js/vendor/font-awesome531.js"></script>
- <script src="js/vendor/jquery.validate.js"></script>
- <script src="js/main.js"></script>
- <script src="js/vendor/web3.js"></script>
- <script src="js/vendor/abi.js"></script>
- <script src="js/vendor/ballot.js"></script>
+ <script src="../js/vendor/font-awesome531.js"></script>
+ <script src="../js/vendor/jquery.validate.js"></script>
+ <script src="../js/main.js"></script>
+ <script src="../js/vendor/web3.js"></script>
+ <script src="../js/vendor/abi.js"></script>
+ <script src="../js/vendor/ballot.js"></script>
<script>
diff --git a/web/dist/smartVotar.html b/web/dist/votar/index.html
similarity index 62%
rename from web/dist/smartVotar.html
rename to web/dist/votar/index.html
index 414c31c..517cf43 100644
--- a/web/dist/smartVotar.html
+++ b/web/dist/votar/index.html
@@ -5,12 +5,12 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Votar | Blockchain Federal Argentina</title>
- <link rel="shortcut icon" href="favicon.ico" />
+ <link rel="shortcut icon" href="../favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">
- <link rel="stylesheet" type="text/css" media="screen" href="css/vendor.css" />
- <link rel="stylesheet" type="text/css" media="screen" href="css/main.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/vendor.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="../css/main.css" />
</head>
<body>
@@ -20,7 +20,7 @@
<div class="navbar-header">
<div class="region region-navigation">
<a class="logo navbar-btn pull-left" href="https://bfa.ar/" rel="home">
- <img id="logo" src="./images/logo.svg" alt="Blockchain Federal Argentina">
+ <img id="logo" src="../images/logo.svg" alt="Blockchain Federal Argentina">
</a>
<div class="vote-status hide" id="status"></div>
</div>
@@ -32,65 +32,67 @@
<div id="alert-wrapper"></div>
<div id="voterow" class="row hide">
<section>
- <h1 class="page-header" id="titulo_votacion">TÃtulo de la votación</h1>
- <p class="max-container"><b>Dirección:</b> <span id="contract_address">0xe3e08934b6fa0b68972c08e0f545cee31ed039</span>
- <a class="btn-default btn btn-lg btn-address" aria-label="Cambiar dirección" href="index.html">
+ <h1 class="page-header" id="titulo_votacion"></h1>
+ <p class="max-container"><b>Dirección:</b> <span id="contract_address" class="hash"></span>
+ <a class="btn-default btn btn-lg btn-address" aria-label="Cambiar dirección" href="../">
Cambiar
</a>
</p>
- <p class="max-container">
- <b>Comienza:</b> <span id="comienza_votacion"></span><br />
- <b>Termina:</b> <span id="termina_votacion"></span>
- </p>
- <div class="resultados" style="display: none;" id="results">
- <h2>Resultados</h2>
-
- <!--<h2>Detalle de la votación</h2>
- <table class="table table-hover">
- <thead>
- <tr>
- <th>#</th>
- <th>Nombre</th>
- <th>Correo</th>
- <th>Opción votada</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th scope="row">1</th>
- <td>Mark</td>
- <td>mark@bfa.ar</td>
- <td>1</td>
- </tr>
- <tr>
- <th scope="row">2</th>
- <td>Clara</td>
- <td>Clara@bfa.ar</td>
- <td>1</td>
- </tr>
- <tr>
- <th scope="row">3</th>
- <td>David</td>
- <td>David@bfa.ar</td>
- <td>1</td>
- </tr>
- </tbody>
-
- </table>-->
+ <div id="vote-content" style="display: none;">
+ <p class="max-container">
+ <b>Comienza:</b> <span id="comienza_votacion"></span><br />
+ <b>Termina:</b> <span id="termina_votacion"></span>
+ </p>
+ <div class="resultados" style="display: none;" id="results">
+ <h2>Resultados</h2>
+
+ <!--<h2>Detalle de la votación</h2>
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>Nombre</th>
+ <th>Correo</th>
+ <th>Opción votada</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th scope="row">1</th>
+ <td>Mark</td>
+ <td>mark@bfa.ar</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <th scope="row">2</th>
+ <td>Clara</td>
+ <td>Clara@bfa.ar</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <th scope="row">3</th>
+ <td>David</td>
+ <td>David@bfa.ar</td>
+ <td>1</td>
+ </tr>
+ </tbody>
+
+ </table>-->
- </div>
- <form action="" id="form_votacion">
- <div class="alert alert-danger" role="alert" id="errorForm">
- <p>Comprobá los siguientes errores del formulario:</p>
- <ul></ul>
</div>
- <fieldset class="form-group votar" id="proposals">
- <legend>Opciones para votar</legend>
- </fieldset>
- <div class="form-group col-sm-6 col-sm-push-6">
- <button class="btn-primary btn btn-block" type="submit" id="submit">Votar</button>
- </div>
- </form>
+ <form action="" id="form_votacion">
+ <div class="alert alert-danger" style="display: none" role="alert" id="errorForm">
+ <p>Comprobá los siguientes errores del formulario:</p>
+ <ul></ul>
+ </div>
+ <fieldset class="form-group votar" id="proposals">
+ <legend>Opciones para votar</legend>
+ </fieldset>
+ <div class="form-group col-sm-6 col-sm-push-6">
+ <button class="btn-primary btn btn-block" type="submit" id="submit">Votar</button>
+ </div>
+ </form>
+ </div>
<div class="clearfix"></div>
</section>
</div>
@@ -105,8 +107,6 @@
<h2>Redes Sociales</h2>
<div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">
<ul>
- <li><a href="https://www.facebook.com/bfa.ar" target="_blank"><i class="fab fa-facebook-f fa-2x"
- aria-hidden="true"></i><span class="sr-only">Facebook</span></a></li>
<li><a href="https://www.twitter.com/bfa_ar" target="_blank"><i class="fab fa-twitter fa-2x"
aria-hidden="true"></i><span class="sr-only">Twitter</span></a></li>
<li><a href="https://www.instagram.com/bfa_ar" target="_blank"><i class="fab fa-instagram fa-2x"
@@ -126,12 +126,12 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>
- <script src="js/vendor/font-awesome531.js"></script>
- <script src="js/vendor/jquery.validate.js"></script>
- <script src="js/main.js"></script>
- <script src="js/vendor/web3.js"></script>
- <script src="js/vendor/abi.js"></script>
- <script src="js/vendor/ballot.js"></script>
+ <script src="../js/vendor/font-awesome531.js"></script>
+ <script src="../js/vendor/jquery.validate.js"></script>
+ <script src="../js/main.js"></script>
+ <script src="../js/vendor/web3.js"></script>
+ <script src="../js/vendor/abi.js"></script>
+ <script src="../js/vendor/ballot.js"></script>
<script>
@@ -139,21 +139,21 @@
var url = new URL(window.location.href);
- var input_address = url.searchParams.get("input_address");
- if(typeof input_address != "undefined" && input_address != ""){
- $("#contract_address").text(input_address);
- ver_votacion(input_address);
+ var vote_address = url.searchParams.get("vote_address");
+ if(typeof vote_address != "undefined" && vote_address != ""){
+ $("#contract_address").text(vote_address);
+ ver_votacion(vote_address);
//TEST showing the results bargraph
//$(".resultados").show();
- //resultados(input_address);
+ //resultados(vote_address);
}
function viewVotacion(){
$("form").hide();
$(".resultados").show();
- resultados(input_address);
+ resultados(vote_address);
}
async function sendVotacion(){
@@ -163,9 +163,9 @@
try{
- if(typeof input_address != "undefined" && input_address != ""){
+ if(typeof vote_address != "undefined" && vote_address != ""){
var proposal = $("input[name='votacion']:checked").val();
- let resultado = await votar(input_address, proposal);
+ let resultado = await votar(vote_address, proposal);
console.log("resultado: ");
console.log(resultado.toString(10));
--
GitLab