Difference between revisions of "Team:Greece/human practices"

Revision as of 11:36, 6 September 2017 (view source)

Revision as of 12:02, 6 September 2017 (view source)

Line 115:

−

+

Line 122:

−

+

Line 130:

−

+

<tspan x="615" dy="1.6em" onclick="displayMe('c_t3')" id='t_circle_textA'>INTEGRATED</tspan>

Line 138:

−

+

<tspan x="1025" dy="2.3em" onclick="displayMe('c_t4')" id='fo_circle_textA'>PUBLIC</tspan>

Line 244:

}

−

#~~f_circle~~{ cx: -210 }

+

#c_t1{ cx: -210 }

−

#~~s_circle~~{ cx: 200 }

+

#c_t1 tspan{ x: -210; dy: 1em; }

−

#~~t_circle~~{ cx: 615 }

+

#c_t2{ cx: 200 }

+

#c_t2 tspan{ x: 200; dy: 0em; }

+

#c_t3{ cx: 615 }

+

#c_t3 tspan{ x: 615; dy: 0em; }

+

#c_t4 tspan{ dy: 0em; }

}

Line 288:

Line 293:

}

</style>

−

~~~~

−

~~<script>~~

−

~~/* Media Queries in JavaScript using nested if statements */~~

−

~~if(window.innerWidth > 1025){~~

−

~~if(window.innerWidth < 1367){~~

−

~~$('#f_circle_textA').attr({'x': '-210', 'dy': '1em' });~~

−

~~$('#f_circle_textB').attr({'x': '-210'});~~

−

~~$('#s_circle_textA').attr({'x': '200', 'dy': '0em' });~~

−

~~$('#s_circle_textB').attr({'x': '200'});~~

−

~~$('#s_circle_textC').attr({'x': '200'});~~

−

~~$('#t_circle_textA').attr({'x': '615', 'dy': '0em' });~~

−

~~$('#t_circle_textB').attr({'x': '615' });~~

−

~~$('#t_circle_textC').attr({'x': '615' });~~

−

~~$('#fo_circle_textA').attr({'dy': '1em' });~~

−

}

−

}

−

~~</script>~~

@@ Line 115: / Line 115: @@
 	<a href='#' onmouseover="onHoverChanges( $(this).children('circle:first').attr('id') )" onmouseleave="onHoverHide($(this).children('circle:first').attr('id'))">
-         <circle class='circlez' id='f_circle' cx="-230" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t1' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
+         <circle class='circlez' cx="-230" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t1' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
 	<text class='animate_text' id='t1' x='0' y='335' text-anchor='middle' fill='#000000'>
 		<tspan x="-230" dy="2.5em" onclick="displayMe('c_t1')" id='f_circle_textA'>O.S.I.R.I.S.</tspan>
@@ Line 122: / Line 122: @@
 	<a href='#' onmouseover="onHoverChanges( $(this).children('circle:first').attr('id') )" onmouseleave="onHoverHide($(this).children('circle:first').attr('id'))">
-         <circle class='circlez' id='s_circle' cx="190" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t2' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
+         <circle class='circlez' cx="190" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t2' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
 	<text class='animate_text' id='t2' x='0' y='335' text-anchor='middle' fill='#000000'>
 		<tspan x="195" dy="1.5em" onclick="displayMe('c_t2')" id='s_circle_textA'>RISK</tspan>
@@ Line 130: / Line 130: @@
 	<a href='#' onmouseover="onHoverChanges( $(this).children('circle:first').attr('id') )" onmouseleave="onHoverHide($(this).children('circle:first').attr('id'))">
-         <circle class='circlez' id='t_circle' cx="610" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t3' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
+         <circle class='circlez' cx="610" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t3' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
 	<text class='animate_text' id='t3' x='0' y='335' text-anchor='middle' fill='#000000'>
 		<tspan x="615" dy="1.6em" onclick="displayMe('c_t3')" id='t_circle_textA'>INTEGRATED</tspan>
@@ Line 138: / Line 138: @@
 	<a href='#' onmouseover="onHoverChanges( $(this).children('circle:first').attr('id') )" onmouseleave="onHoverHide($(this).children('circle:first').attr('id'))">
-         <circle class='circlez' id='fo_circle' cx="1020" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t4' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
+         <circle class='circlez' cx="1020" cy="365" r="135" stroke='#ffffff' stroke-width="0" fill="white" id='c_t4' onclick="displayMe(this.id)" onmouseover="onHoverChanges(this.id)" />
 	<text class='animate_text' id='t4' x='0' y='335' text-anchor='middle' fill='#000000'>
 		<tspan x="1025" dy="2.3em" onclick="displayMe('c_t4')" id='fo_circle_textA'>PUBLIC</tspan>
@@ Line 244: / Line 244: @@
 	}
-         #f_circle{ cx: -210 }
+         #c_t1{ cx: -210 }
-         #s_circle{ cx: 200 }
+         #c_t1 tspan{ x: -210; dy: 1em; }
-         #t_circle{ cx: 615 }
+        #c_t2{ cx: 200 }
+         #c_t2 tspan{ x: 200; dy: 0em; }
+        #c_t3{ cx: 615 }
+        #c_t3 tspan{ x: 615; dy: 0em; }
+        #c_t4 tspan{ dy: 0em; }
 }
@@ Line 288: / Line 293: @@
 }
 </style>
-<!-- This script exists due to the innability of changing the <x> attribute of <tspan> in circles -->
-<script>
-/* Media Queries in JavaScript using nested if statements */
-if(window.innerWidth > 1025){
-  if(window.innerWidth < 1367){
-    $('#f_circle_textA').attr({'x': '-210', 'dy': '1em' });
-    $('#f_circle_textB').attr({'x': '-210'});
-    $('#s_circle_textA').attr({'x': '200', 'dy': '0em' });
-    $('#s_circle_textB').attr({'x': '200'});
-    $('#s_circle_textC').attr({'x': '200'});
-    $('#t_circle_textA').attr({'x': '615', 'dy': '0em' });
-    $('#t_circle_textB').attr({'x': '615' });
-    $('#t_circle_textC').attr({'x': '615' });
-    $('#fo_circle_textA').attr({'dy': '1em' });
-  }
-}
-</script>
 <!--Styling script-->