Skip to content

Commit

Permalink
Imágenes estáticas para los parlamentos
Browse files Browse the repository at this point in the history
  • Loading branch information
@VictoriaQ
VictoriaQ committed Nov 23, 2011
1 parent 8a78a22 commit 46e3070
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 47 deletions.
2 changes: 1 addition & 1 deletion content/short/reforma3conclusions2-2011.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
El reparto es parecio al que resultaría de un sistema con circunscripción única, el cual mostramos a continuación a efectos comparativos. La principal diferencia es la mayoría absoluta y la presencia de GBAI, como en el sistema actual. Ello se debe a que el método trata de ser fiel a tres aspectos: representatividad, proporcionalidad y gobernabilidad.
El reparto es parecido al que resultaría de un sistema con circunscripción única, el cual mostramos a continuación a efectos comparativos. La principal diferencia es la mayoría absoluta y la presencia de GBAI, como en el sistema actual. Ello se debe a que el método trata de ser fiel a tres aspectos: representatividad, proporcionalidad y gobernabilidad.
2 changes: 1 addition & 1 deletion content/short/reforma3conclusions3-2011.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
La configuración del Congreso es muy parecida a la de la propuesta 3. Es posible solucionar el problema de proporcionalidad incluso sin tocar el tamaño de la circunscripción (que implicaría un -teóricamente complicado- cambio en la Constitución).

Tanto en la circunscripción única como en las propuestas, si comparamos con 2008, entra un número mayor de partidos en el congreso. Ello se debe a que muchos más votantes se han inclinado en estas elecciones por partidos minoritarios. En 2008 tan solo 9 partidos superaron los 70.000 votos, mientras que en 2011 han sido 15 los que han rebasado esta cifra.
Tanto en la circunscripción única como en las propuestas, si comparamos con 2008, vemos que entra un número mayor de partidos en el congreso. El motivo es que muchos más votantes se han inclinado en estas elecciones por partidos minoritarios. En 2008 tan solo 9 partidos superaron los 70.000 votos, mientras que en 2011 han sido 16 los que han rebasado esta cifra.
Binary file added web/imgs/parliament1-2011.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/imgs/parliament2-2011.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/imgs/parliament3-2011.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/imgs/parliament4-2011.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/imgs/parliament5-2011.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 23 additions & 45 deletions web/js/le2011.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,7 @@ $(document).ready(function(){
$('#notes2-2011').fadeIn(1500);

});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
var that = this;

this.advance = function(){ return AppRouter.navigate("!votosescaño", true);};
Expand Down Expand Up @@ -1088,8 +1087,7 @@ $(document).ready(function(){
$('#notes2-2011').fadeOut(300, function(){
$('#notes2-2011').html(ContentStore.getByKey("conclusiones2011").get("value")).fadeIn(1500);
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
var that = this;

this.advance = function(){ return AppRouter.navigate("!propuestas", true);};
Expand Down Expand Up @@ -1122,8 +1120,7 @@ $(document).ready(function(){
$('#notes3').hide('fast', function(){
$('#notes3').html(ContentStore.getByKey("fin").get("value")).fadeIn(1500);
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
var that = this;

this.advance = function(){ return AppRouter.navigate("!reformaelectoral1", true);};
Expand Down Expand Up @@ -1156,13 +1153,11 @@ $(document).ready(function(){
$('#reform1').hide('fast', function(){
$('html, body').animate({scrollTop: $(document).height()}, 3000);
$('#reform1').html(ContentStore.getByKey("reforma1-2011").get("value")).fadeIn(500, function(){
//that.parliament2 = that.paper.image("imgs/parliament2.png", 450, 620, 500, 269);
that.parliament2 = that.paper.g.parliament(620, 930, 180, 40, that.parvalues2, {});
that.parliament2 = that.paper.image("imgs/parliament2-2011.png", 450, 670, 500, 280);
$('#reform1conclusions').html(ContentStore.getByKey("reforma1conclusions2011").get("value")).fadeIn(1500);
});
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);

this.advance = function(){ return AppRouter.navigate("!reformaelectoral2", true);};
this.goback = function(){ return AppRouter.navigate("!propuestas", true);};
Expand Down Expand Up @@ -1195,15 +1190,12 @@ $(document).ready(function(){
$('#reform2').hide('fast', function(){
$('html, body').animate({scrollTop: $(document).height()}, 3000);
$('#reform2').html(ContentStore.getByKey("reforma2-2011").get("value")).fadeIn(500, function(){
//that.parliament3 = that.paper.image("imgs/parliament3.png", 450, 1080, 500, 209);
that.parliament3 = that.paper.g.parliament(620, 1400, 180, 40, that.parvalues3, {});
that.parliament3 = that.paper.image("imgs/parliament3-2011.png", 450, 1130, 500, 280);
$('#reform2conclusions').html(ContentStore.getByKey("reforma2conclusions2011").get("value")).fadeIn(1500);
});
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
//this.parliament2 = this.paper.image("imgs/parliament2.png", 450, 620, 500, 269);
this.parliament2 = this.paper.g.parliament(620, 930, 180, 40, this.parvalues2, {});
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
this.parliament2 = this.paper.image("imgs/parliament2-2011.png", 450, 670, 500, 280);

this.advance = function(){ return AppRouter.navigate("!reformaelectoral3", true);};
this.goback = function(){ return AppRouter.navigate("!reformaelectoral1", true);};
Expand Down Expand Up @@ -1245,18 +1237,14 @@ $(document).ready(function(){
$('#reform3').hide('fast', function(){
$('html, body').animate({scrollTop: $(document).height()}, 3000);
$('#reform3').html(ContentStore.getByKey("reforma3-2011").get("value")).fadeIn(500,function(){
//that.parliament4 = that.paper.image("imgs/parliament4.png", 450, 1505, 500, 229);
that.parliament4 = that.paper.g.parliament(620, 1890, 180, 40, that.parvalues4, {}, 1.2125, 3.5);
that.parliament4 = that.paper.image("imgs/parliament4-2011.png", 450, 1605, 500, 315);
$('#reform3conclusions').html(ContentStore.getByKey("reforma3conclusions2011").get("value")).fadeIn(1500);
$('#reform3conclusions2-2011').html(ContentStore.getByKey("reforma3conclusions2-2011").get("value")).fadeIn(1500);
});
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
//this.parliament2 = this.paper.image("imgs/parliament2.png", 450, 620, 500, 269);
this.parliament2 = this.paper.g.parliament(620, 930, 180, 40, this.parvalues2, {});
//this.parliament3 = this.paper.image("imgs/parliament3.png", 450, 1080, 500, 209);
this.parliament3 = this.paper.g.parliament(620, 1400, 180, 40, this.parvalues3, {}, 1.2125, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
this.parliament2 = this.paper.image("imgs/parliament2-2011.png", 450, 670, 500, 280);
this.parliament3 = this.paper.image("imgs/parliament3-2011.png", 450, 1130, 500, 280);

this.advance = function(){ return AppRouter.navigate("!circunscripcionunica", true);};
this.goback = function(){ return AppRouter.navigate("!reformaelectoral2", true);};
Expand Down Expand Up @@ -1296,19 +1284,14 @@ $(document).ready(function(){
$('#reform4').hide('fast', function(){
$('html, body').animate({scrollTop: $(document).height()}, 3000);
$('#reform4').html(ContentStore.getByKey("reforma4-2011").get("value")).fadeIn(500, function(){
//that.parliament5 = that.paper.image("imgs/parliament5.png", 450, 1990, 500, 219);
that.parliament5 = that.paper.g.parliament(620, 2500, 180, 40, that.parvalues5, {}, 1.2125, 3.5);
that.parliament5 = that.paper.image("imgs/parliament5-2011.png", 450, 2210, 500, 315);
$('#reform3conclusions3-2011').html(ContentStore.getByKey("reforma3conclusions3-2011").get("value")).fadeIn(1500);
});
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
//this.parliament2 = this.paper.image("imgs/parliament2.png", 450, 620, 500, 269);
this.parliament2 = this.paper.g.parliament(620, 930, 180, 40, this.parvalues2, {});
//this.parliament3 = this.paper.image("imgs/parliament3.png", 450, 1080, 500, 209);
this.parliament3 = this.paper.g.parliament(620, 1400, 180, 40, this.parvalues3, {}, 1.2125, 3.5);
//this.parliament4 = this.paper.image("imgs/parliament4.png", 450, 1505, 500, 229);
this.parliament4 = this.paper.g.parliament(620, 1890, 180, 40, this.parvalues4, {}, 1.2125, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
this.parliament2 = this.paper.image("imgs/parliament2-2011.png", 450, 670, 500, 280);
this.parliament3 = this.paper.image("imgs/parliament3-2011.png", 450, 1130, 500, 280);
this.parliament4 = this.paper.image("imgs/parliament4-2011.png", 450, 1605, 500, 315);

this.advance = function(){ return AppRouter.navigate("!conclusiones", true);};
this.goback = function(){ return AppRouter.navigate("!reformaelectoral3", true);};
Expand Down Expand Up @@ -1344,23 +1327,18 @@ $(document).ready(function(){
$('#reform1conclusions').html(ContentStore.getByKey("reforma1conclusions2011").get("value"));
$('#reform2conclusions').html(ContentStore.getByKey("reforma2conclusions2011").get("value"));
$('#reform3conclusions').html(ContentStore.getByKey("reforma3conclusions2011").get("value"));
$('#reform3conclusions2').html(ContentStore.getByKey("reforma3conclusions2-2011").get("value"));
$('#reform3conclusions2-2011').html(ContentStore.getByKey("reforma3conclusions2-2011").get("value"));
$('#reform3conclusions3-2011').html(ContentStore.getByKey("reforma3conclusions3-2011").get("value"));
var that = this;
$('#conclusions').hide('fast', function(){
$('html, body').animate({scrollTop: $(document).height()}, 3000);
$('#conclusions').html(ContentStore.getByKey("finalconclusions").get("value")).fadeIn(500);
});
//this.parliament = this.paper.image("imgs/parliament1.png", 450, 263, 500, 229);
this.parliament = this.paper.g.parliament(620, 510, 180, 40, this.parvalues, {}, 1.3796875000000002, 3.5);
//this.parliament2 = this.paper.image("imgs/parliament2.png", 450, 620, 500, 269);
this.parliament2 = this.paper.g.parliament(620, 930, 180, 40, this.parvalues2, {});
//this.parliament3 = this.paper.image("imgs/parliament3.png", 450, 1080, 500, 209);
this.parliament3 = this.paper.g.parliament(620, 1400, 180, 40, this.parvalues3, {}, 1.2125, 3.5);
//this.parliament4 = this.paper.image("imgs/parliament4.png", 450, 1505, 500, 229);
this.parliament4 = this.paper.g.parliament(620, 1890, 180, 40, this.parvalues4, {}, 1.2125, 3.5);
//this.parliament5 = this.paper.image("imgs/parliament5.png", 450, 1990, 500, 219);
this.parliament5 = this.paper.g.parliament(620, 2500, 180, 40, this.parvalues5, {}, 1.2125, 3.5);
this.parliament = this.paper.image("imgs/parliament1-2011.png", 450, 263, 500, 245);
this.parliament2 = this.paper.image("imgs/parliament2-2011.png", 450, 670, 500, 280);
this.parliament3 = this.paper.image("imgs/parliament3-2011.png", 450, 1130, 500, 280);
this.parliament4 = this.paper.image("imgs/parliament4-2011.png", 450, 1605, 500, 315);
this.parliament5 = this.paper.image("imgs/parliament5-2011.png", 450, 2210, 500, 315);

this.advance = function(){ return AppRouter.navigate("!reformaelectoral4", true);};
this.goback = function(){ return AppRouter.navigate("!circunscripcionunica", true);};
Expand Down

0 comments on commit 46e3070

Please sign in to comment.