June 2012 - Movecommons-commits - lists.ourproject.org

r467 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:33:18 +0200 (Tue, 05 Jun 2012) New Revision: 467 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:31:33 UTC (rev 466) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:33:18 UTC (rev 467) @@ -294,7 +294,7 @@ </div> <div style="width: 100%;float: left;margin-bottom: 20px;"> <div class="label2" style="margin-left: 185px;float: left;"><?php _e("5. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div> - <div id="step4-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <div id="step5-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> <input type="radio" id="step5-yes" name="radio" /><label for="step5-yes" style="font-size: 14px;">Yes</label> <input type="radio" id="step5-no" name="radio" /><label for="step5-no" style="font-size: 14px;">No</label> </div>

1 0

r466 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:31:33 +0200 (Tue, 05 Jun 2012) New Revision: 466 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:30:21 UTC (rev 465) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:31:33 UTC (rev 466) @@ -32,7 +32,6 @@ --> <div id="containerSlides"> - <form action="#" method="post"> <div id="first_step" class="mc-form-category-group-a-v2">  <div class="progressLine"> <div class="complete" style="width: 19px;margin-top: 0"> @@ -367,7 +366,6 @@ </div> <div class="clear"></div> </div> -</form> </div>  <div id="progress_bar">

1 0

r465 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:30:21 +0200 (Tue, 05 Jun 2012) New Revision: 465 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:17:38 UTC (rev 464) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:30:21 UTC (rev 465) @@ -72,7 +72,7 @@ </div> <div style="width: 100%;float: left;margin-bottom: 20px;"> <div class="label2" style="margin-left: 185px;float: left;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> - <div id="step1-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <div id="step2-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes" style="font-size: 14px;">Yes</label> <input type="radio" id="step2-no" name="radio" /><label for="step2-no" style="font-size: 14px;">No</label> </div> @@ -140,6 +140,13 @@ <div class="marker" style="background-position: -52px 0;"></div> </div> </div> + <div style="width: 100%;float: left;margin-bottom: 20px;"> + <div class="label2" style="margin-left: 185px;float: left;"><?php _e("3. Is your initiative Reproducible?", "mc"); ?></div> + <div id="step3-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <input type="radio" id="step3-yes" name="radio" /><label for="step3-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step3-no" name="radio" /><label for="step3-no" style="font-size: 14px;">No</label> + </div> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rp" /> <div id="mc-form-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> @@ -224,6 +231,13 @@ <div class="marker" style="background-position: -78px 0;"></div> </div> </div> + <div style="width: 100%;float: left;margin-bottom: 20px;"> + <div class="label2" style="margin-left: 185px;float: left;"><?php _e("4. Does your initiative Reinforce the Commons?", "mc"); ?></div> + <div id="step4-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <input type="radio" id="step4-yes" name="radio" /><label for="step4-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step4-no" name="radio" /><label for="step4-no" style="font-size: 14px;">No</label> + </div> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" style="padding-top: 35px;" id="mc-form-category-group-c"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-rc" /> <div id="mc-form-rc" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> @@ -278,7 +292,14 @@ <div class="complete" style="width: 386px;"> <div class="marker" style="background-position: -104px 0;"></div> </div> - </div> + </div> + <div style="width: 100%;float: left;margin-bottom: 20px;"> + <div class="label2" style="margin-left: 185px;float: left;"><?php _e("5. Is your initiative driven by horizontal collective decisions?", "mc"); ?></div> + <div id="step4-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <input type="radio" id="step5-yes" name="radio" /><label for="step5-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step5-no" name="radio" /><label for="step5-no" style="font-size: 14px;">No</label> + </div> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-d"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-gr" /> <div id="mc-form-gr" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> @@ -339,6 +360,7 @@ <div class="marker" style="background-position: -130px 0;"></div> </div> </div> + <div class="label2" style="margin-left: 185px;float: left;"><?php _e("6. Show your principles in the web", "mc"); ?></div> <div style="width: 903px;height: 400px;"> </div> <div class="clear"></div> @@ -390,7 +412,10 @@ $j('#rc-checkbox').checkbox(); $j('#gr-checkbox').checkbox(); $j('button').button(); - $j( "#step1-radio").buttonset(); + $j( "#step2-radio").buttonset(); + $j( "#step3-radio").buttonset(); + $j( "#step4-radio").buttonset(); + $j( "#step5-radio").buttonset(); /* $j('#slider1').bxSlider({startingSlide:0}); $j('#fifth').remove();

1 0

r464 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:17:38 +0200 (Tue, 05 Jun 2012) New Revision: 464 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:09:19 UTC (rev 463) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:17:38 UTC (rev 464) @@ -70,11 +70,11 @@ <div class="marker" style="background-position: -26px 0;"></div> </div> </div> - <div> + <div style="width: 100%;float: left;margin-bottom: 20px;"> <div class="label2" style="margin-left: 185px;float: left;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> - <div id="step1-radio" style="float: left;"> - <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes">Yes</label> - <input type="radio" id="step2-no" name="radio" /><label for="step2-no">No</label> + <div id="step1-radio" style="float: left;margin-left: 10px;margin-top: 10px;"> + <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes" style="font-size: 14px;">Yes</label> + <input type="radio" id="step2-no" name="radio" /><label for="step2-no" style="font-size: 14px;">No</label> </div> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a">

1 0

r463 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:09:19 +0200 (Tue, 05 Jun 2012) New Revision: 463 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:06:16 UTC (rev 462) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:09:19 UTC (rev 463) @@ -70,11 +70,13 @@ <div class="marker" style="background-position: -26px 0;"></div> </div> </div> - <div class="label2" style="margin-left: 185px;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> - <div id="step1-radio"> - <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes">Yes</label> - <input type="radio" id="step2-no" name="radio" /><label for="step2-no">No</label> - </div> + <div> + <div class="label2" style="margin-left: 185px;float: left;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> + <div id="step1-radio" style="float: left;"> + <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes">Yes</label> + <input type="radio" id="step2-no" name="radio" /><label for="step2-no">No</label> + </div> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" /> <div id="mc-form-np" class="mc-form-rounded mc-form-descbox mc-form-descbox-a">

1 0

r462 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:06:16 +0200 (Tue, 05 Jun 2012) New Revision: 462 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 16:03:15 UTC (rev 461) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:06:16 UTC (rev 462) @@ -72,8 +72,8 @@ </div> <div class="label2" style="margin-left: 185px;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> <div id="step1-radio"> - <input type="radio" id="step2-yes" name="radio" /><label for="radio1">Yes</label> - <input type="radio" id="step2-no" name="radio" checked="checked" /><label for="radio2">No</label> + <input type="radio" id="step2-yes" name="radio" /><label for="step2-yes">Yes</label> + <input type="radio" id="step2-no" name="radio" /><label for="step2-no">No</label> </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" />

1 0

r461 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 18:03:15 +0200 (Tue, 05 Jun 2012) New Revision: 461 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 15:49:59 UTC (rev 460) +++ trunk/wp-theme/mc2-form.php 2012-06-05 16:03:15 UTC (rev 461) @@ -70,7 +70,11 @@ <div class="marker" style="background-position: -26px 0;"></div> </div> </div> - <div class="label2"><?php _e("2. Is your inititative Non-Profit?", "mc"); ?></div> + <div class="label2" style="margin-left: 185px;"><?php _e("2. Is your initiative Non-Profit?", "mc"); ?></div> + <div id="step1-radio"> + <input type="radio" id="step2-yes" name="radio" /><label for="radio1">Yes</label> + <input type="radio" id="step2-no" name="radio" checked="checked" /><label for="radio2">No</label> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" /> <div id="mc-form-np" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> @@ -384,6 +388,7 @@ $j('#rc-checkbox').checkbox(); $j('#gr-checkbox').checkbox(); $j('button').button(); + $j( "#step1-radio").buttonset(); /* $j('#slider1').bxSlider({startingSlide:0}); $j('#fifth').remove();

1 0

r460 - in trunk: src wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 17:49:59 +0200 (Tue, 05 Jun 2012) New Revision: 460 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-06-05 14:48:34 UTC (rev 459) +++ trunk/src/mc-dia-form2.css 2012-06-05 15:49:59 UTC (rev 460) @@ -129,9 +129,11 @@ .label2 { color: #666; - font-size: 12px; + font-size: 20px; font-weight: bold; - line-height: 14px; + line-height: 14px; + margin-top: 20px; + margin-left: 115px; } Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 14:48:34 UTC (rev 459) +++ trunk/wp-theme/mc2-form.php 2012-06-05 15:49:59 UTC (rev 460) @@ -39,7 +39,7 @@ <div class="marker"></div> </div> </div> - <span class="label2">1. Fill out the following form</span> + <div class="label2">1. Fill out the following form</div>  @@ -56,7 +56,7 @@ <label for="location"><?php _e("Location....", "mc"); ?></label> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_first" id="submit_first">Next</button> + <button class="submit" type="submit" name="submit_first" id="submit_first"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> <div class="clear"></div> @@ -69,7 +69,8 @@ <div class="complete" style="width: 111px;"> <div class="marker" style="background-position: -26px 0;"></div> </div> - </div> + </div> + <div class="label2"><?php _e("2. Is your inititative Non-Profit?", "mc"); ?></div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" /> <div id="mc-form-np" class="mc-form-rounded mc-form-descbox mc-form-descbox-a"> @@ -117,7 +118,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;">Next</button> + <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div> @@ -200,7 +201,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_third" id="submit_third" style="left: 750px;">Next</button> + <button class="submit" type="submit" name="submit_third" id="submit_third" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div> @@ -257,7 +258,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_fourth" id="submit_fourth" value="" style="left: 750px;">Next</button> + <button class="submit" type="submit" name="submit_fourth" id="submit_fourth" value="" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div> @@ -319,7 +320,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" value="" style="left: 750px;">Next</button> + <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" value="" style="left: 750px;"><?php _e("Next", "mc"); ?></button> <div class="clear"></div> </div> </div>

1 0

r459 - trunk/wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 16:48:34 +0200 (Tue, 05 Jun 2012) New Revision: 459 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 14:46:34 UTC (rev 458) +++ trunk/wp-theme/mc2-form.php 2012-06-05 14:48:34 UTC (rev 459) @@ -39,6 +39,7 @@ <div class="marker"></div> </div> </div> + <span class="label2">1. Fill out the following form</span>  @@ -68,8 +69,7 @@ <div class="complete" style="width: 111px;"> <div class="marker" style="background-position: -26px 0;"></div> </div> - </div> - <span class="label2">1. Fill out the following form</span> + </div> <div class="mc-form-rounded mc-form-category-group-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/cat-selected.png" alt="selected" class="mc-cat-selected mc-cat-selected-a" id="mc-cat-selected-np" /> <div id="mc-form-np" class="mc-form-rounded mc-form-descbox mc-form-descbox-a">

1 0

r458 - in trunk: src wp-theme
by Mario Gallegos 05 Jun '12

05 Jun '12

Author: mgallegos Date: 2012-06-05 16:46:34 +0200 (Tue, 05 Jun 2012) New Revision: 458 Modified: trunk/src/mc-dia-form2.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.css =================================================================== --- trunk/src/mc-dia-form2.css 2012-06-05 14:28:28 UTC (rev 457) +++ trunk/src/mc-dia-form2.css 2012-06-05 14:46:34 UTC (rev 458) @@ -96,7 +96,7 @@ height: 38px;*/ position: relative; bottom: 2px; - left: 655px; + left: 605px; padding: 0 25px; margin: 20px 0; float: left; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-06-05 14:28:28 UTC (rev 457) +++ trunk/wp-theme/mc2-form.php 2012-06-05 14:46:34 UTC (rev 458) @@ -117,7 +117,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 800px;">Next</button> + <button class="submit" type="submit" name="submit_second" id="submit_second" style="left: 750px;">Next</button> <div class="clear"></div> </div> </div> @@ -200,7 +200,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_third" id="submit_third" style="left: 800px;">Next</button> + <button class="submit" type="submit" name="submit_third" id="submit_third" style="left: 750px;">Next</button> <div class="clear"></div> </div> </div> @@ -257,7 +257,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_fourth" id="submit_fourth" value="" style="left: 800px;">Next</button> + <button class="submit" type="submit" name="submit_fourth" id="submit_fourth" value="" style="left: 750px;">Next</button> <div class="clear"></div> </div> </div> @@ -319,7 +319,7 @@ </div> </div> <div class="clear"></div> - <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" value="" style="left: 800px;">Next</button> + <button class="submit" type="submit" name="submit_fifth" id="submit_fifth" value="" style="left: 750px;">Next</button> <div class="clear"></div> </div> </div>

1 0