- Movecommons-commits - lists.ourproject.org

r211 - in trunk: src wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 01:17:49 +0100 (Thu, 15 Mar 2012) New Revision: 211 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-15 00:04:36 UTC (rev 210) +++ trunk/src/mc.css 2012-03-15 00:17:49 UTC (rev 211) @@ -294,6 +294,11 @@ margin: 10px 0; } +.mc-form-more-text-v2 { + font-size: 14px; + margin: 10px 0; +} + .mc-clean { clear: both; } @@ -326,9 +331,8 @@ -khtml-border-radius: 5px; border: 2px solid #b3b3b3; background-color: #fff; - cursor: pointer; - margin-right: 10px; - margin-left: 0px; + cursor: pointer; + margin-left: 50px; width: 340px; } Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-15 00:04:36 UTC (rev 210) +++ trunk/wp-theme/mc2-form.php 2012-03-15 00:17:49 UTC (rev 211) @@ -54,7 +54,7 @@ <div id="mc-form-less-link-np" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Non-Profit", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative does not seek economic benefit", "mc"); ?></div> - <div id="mc-form-more-text-np" class="mc-form-more-text"> + <div id="mc-form-more-text-np" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative does not seek economic benefit</li> <li>Any surplus funds of the initiative are used to help pursue its goals instead of distributing them to owners or shareholders.</li> </ul>", "mc"); ?> </div> </div> @@ -94,7 +94,7 @@ <div id="mc-form-less-link-rp" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reproducible", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is visible, open and transparent, which allows it to be adapted by others", "mc"); ?></div> - <div id="mc-form-more-text-rp" class="mc-form-more-text"> + <div id="mc-form-more-text-rp" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative is easily visible to anyone, providing the necessary online material</li> <li>The initiative has transparent procedures and results</li> <li>The initiative allows others to copy and adapt their procedures and materials, probably using <a href=\"http://creativecommons.org/\">Creative Commons</a> licenses for them</li> </ul>", "mc"); ?> </div> </div> @@ -156,7 +156,7 @@ <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> - <div id="mc-form-more-text-rc" class="mc-form-more-text"> + <div id="mc-form-more-text-rc" class="mc-form-more-text-v2"> <?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?> </div> </div> @@ -173,7 +173,7 @@  - <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec" style="margin-top: 15px;"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> @@ -197,7 +197,7 @@ <div id="mc-form-less-link-gr" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Grassroots", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is driven by horizontal collective decisions", "mc"); ?></div> - <div id="mc-form-more-text-gr" class="mc-form-more-text"> + <div id="mc-form-more-text-gr" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative follows collective decision-making procedures for tackling most issues</li> <li>The hierarchical structure is minimal or inexistent. That is, horizontal grassroots discussions of the members have a major weight when compared with vertical instructions from the board</li> </ul>", "mc"); ?> </div> </div> @@ -249,7 +249,7 @@ <div id="mc-form-less-link-np" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Non-Profit", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative does not seek economic benefit", "mc"); ?></div> - <div id="mc-form-more-text-np" class="mc-form-more-text"> + <div id="mc-form-more-text-np" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative does not seek economic benefit</li> <li>Any surplus funds of the initiative are used to help pursue its goals instead of distributing them to owners or shareholders.</li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-a"> @@ -263,7 +263,7 @@ <div class="mc-form-descbox-header"><?php _e("For-Profit", "mc"); ?></div> <div id="mc-form-less-link-nnp" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative seeks economic benefit", "mc"); ?></div> - <div id="mc-form-more-text-nnp" class="mc-form-more-text"> + <div id="mc-form-more-text-nnp" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative seeks both economic benefit and reaching their aims</li> <li>The initiative uses its surplus funds to reward its employees and/or shareholders </li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-b"> @@ -278,7 +278,7 @@ <div id="mc-form-less-link-nrp" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Exclusive", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative prefers to protect their work and not disclose it to others", "mc"); ?></div> - <div id="mc-form-more-text-nrp" class="mc-form-more-text"> + <div id="mc-form-more-text-nrp" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative protects its work, for instance with full copyright, not allowing others to copy it without permission</li> <li>The initiative's internal methods and mechanics are discrete and not disclosed to the public</li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-a"> @@ -291,7 +291,7 @@ <div id="mc-form-less-link-rp" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reproducible", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is visible, open and transparent, which allows it to be adapted by others", "mc"); ?></div> - <div id="mc-form-more-text-rp" class="mc-form-more-text"> + <div id="mc-form-more-text-rp" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative is easily visible to anyone, providing the necessary online material</li> <li>The initiative has transparent procedures and results</li> <li>The initiative allows others to copy and adapt their procedures and materials, probably using <a href=\"http://creativecommons.org/\">Creative Commons</a> licenses for them</li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-b"> @@ -309,7 +309,7 @@ <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> - <div id="mc-form-more-text-rc" class="mc-form-more-text"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> + <div id="mc-form-more-text-rc" class="mc-form-more-text-v2"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> @@ -330,7 +330,7 @@ <div id="mc-form-less-link-nrc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reinforcing Other Aims", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative focuses on other areas different than The Commons", "mc"); ?></div> - <div id="mc-form-more-text-nrc" class="mc-form-more-text"><?php _e("Your initiative prefers to tackle other issues not directly related to the protection/expansion of the Commons", "mc"); ?></div> + <div id="mc-form-more-text-nrc" class="mc-form-more-text-v2"><?php _e("Your initiative prefers to tackle other issues not directly related to the protection/expansion of the Commons", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-b"> <img id="mc-form-icon-nrc" alt="nrc" src="/mc/0.1/images/nrc60.png" /> @@ -344,7 +344,7 @@ <div id="mc-form-less-link-ngr" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Representative", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is driven by representatives", "mc"); ?></div> - <div id="mc-form-more-text-ngr" class="mc-form-more-text"> + <div id="mc-form-more-text-ngr" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative believes in their representatives for tackling most issues</li> <li>The division of tasks is structured with defined roles in different hierarchical levels</li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-a">/ @@ -359,7 +359,7 @@ <div id="mc-form-less-link-gr" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Grassroots", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is driven by horizontal collective decisions", "mc"); ?></div> - <div id="mc-form-more-text-gr" class="mc-form-more-text"> + <div id="mc-form-more-text-gr" class="mc-form-more-text-v2"> <?php _e("<ul> <li>The initiative follows collective decision-making procedures for tackling most issues</li> <li>The hierarchical structure is minimal or inexistent. That is, horizontal grassroots discussions of the members have a major weight when compared with vertical instructions from the board</li> </ul>", "mc"); ?></div> </div> <div class="mc-form-icon mc-form-icon-b">

1 0

r210 - trunk/wp-theme
by Mario Gallegos 15 Mar '12

15 Mar '12

Author: mgallegos Date: 2012-03-15 01:04:36 +0100 (Thu, 15 Mar 2012) New Revision: 210 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 23:58:25 UTC (rev 209) +++ trunk/wp-theme/mc2-form.php 2012-03-15 00:04:36 UTC (rev 210) @@ -158,11 +158,11 @@ <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> <div id="mc-form-more-text-rc" class="mc-form-more-text"> <?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?> - </div> - <div class="mc-form-icon mc-form-icon-a"> - <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> - </div> - </div> + </div> + </div> + <div class="mc-form-icon mc-form-icon-a"> + <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> + </div> </div> <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" />

1 0

r209 - trunk/wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-15 00:58:25 +0100 (Thu, 15 Mar 2012) New Revision: 209 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 23:37:58 UTC (rev 208) +++ trunk/wp-theme/mc2-form.php 2012-03-14 23:58:25 UTC (rev 209) @@ -55,11 +55,12 @@ <div class="mc-form-descbox-header"><?php _e("Non-Profit", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative does not seek economic benefit", "mc"); ?></div> <div id="mc-form-more-text-np" class="mc-form-more-text"> - <?php _e("<ul> <li>The initiative does not seek economic benefit</li> <li>Any surplus funds of the initiative are used to help pursue its goals instead of distributing them to owners or shareholders.</li> </ul>", "mc"); ?></div> - </div> - <div class="mc-form-icon mc-form-icon-a"> - <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> - </div> + <?php _e("<ul> <li>The initiative does not seek economic benefit</li> <li>Any surplus funds of the initiative are used to help pursue its goals instead of distributing them to owners or shareholders.</li> </ul>", "mc"); ?> + </div> + </div> + <div class="mc-form-icon mc-form-icon-a"> + <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> + </div> </div> <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> @@ -94,11 +95,12 @@ <div class="mc-form-descbox-header"><?php _e("Reproducible", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is visible, open and transparent, which allows it to be adapted by others", "mc"); ?></div> <div id="mc-form-more-text-rp" class="mc-form-more-text"> - <?php _e("<ul> <li>The initiative is easily visible to anyone, providing the necessary online material</li> <li>The initiative has transparent procedures and results</li> <li>The initiative allows others to copy and adapt their procedures and materials, probably using <a href=\"http://creativecommons.org/\">Creative Commons</a> licenses for them</li> </ul>", "mc"); ?></div> - </div> - <div class="mc-form-icon mc-form-icon-a"> - <img id="mc-form-icon-rp" alt="rp" src="/mc/0.1/images/rp60.png" /> - </div> + <?php _e("<ul> <li>The initiative is easily visible to anyone, providing the necessary online material</li> <li>The initiative has transparent procedures and results</li> <li>The initiative allows others to copy and adapt their procedures and materials, probably using <a href=\"http://creativecommons.org/\">Creative Commons</a> licenses for them</li> </ul>", "mc"); ?> + </div> + </div> + <div class="mc-form-icon mc-form-icon-a"> + <img id="mc-form-icon-rp" alt="rp" src="/mc/0.1/images/rp60.png" /> + </div> </div> <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> @@ -112,30 +114,30 @@ <label class="optional-labels-fields"> <?php _e("We use this license for sharing our contents:", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="creative-commons" value="S" id="creative-commons" /> <?php _e("Creative Commons, in this webpage:", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="other-license" value="S" id="other-license" /> <?php _e("Other license, in this webpage:", "mc"); ?> </label> <label class="optional-labels-fields"> <?php _e("We share:", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="organization-structure" value="S" id="organization-structure" /> <?php _e("Organization structure", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" /> <?php _e("Projects and results", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" /> <?php _e("Methods / Procedures", "mc"); ?> </label> - <label class="optional-labels-fields"> + <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="documentation" value="S" id="documentation" /> <?php _e("Documentation", "mc"); ?> </label> @@ -154,7 +156,9 @@ <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> - <div id="mc-form-more-text-rc" class="mc-form-more-text"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> + <div id="mc-form-more-text-rc" class="mc-form-more-text"> + <?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?> + </div> <div class="mc-form-icon mc-form-icon-a"> <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> </div> @@ -194,11 +198,12 @@ <div class="mc-form-descbox-header"><?php _e("Grassroots", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative is driven by horizontal collective decisions", "mc"); ?></div> <div id="mc-form-more-text-gr" class="mc-form-more-text"> - <?php _e("<ul> <li>The initiative follows collective decision-making procedures for tackling most issues</li> <li>The hierarchical structure is minimal or inexistent. That is, horizontal grassroots discussions of the members have a major weight when compared with vertical instructions from the board</li> </ul>", "mc"); ?></div> - </div> - <div class="mc-form-icon mc-form-icon-a"> - <img id="mc-form-icon-gr" alt="rp" src="/mc/0.1/images/gr60.png" /> - </div> + <?php _e("<ul> <li>The initiative follows collective decision-making procedures for tackling most issues</li> <li>The hierarchical structure is minimal or inexistent. That is, horizontal grassroots discussions of the members have a major weight when compared with vertical instructions from the board</li> </ul>", "mc"); ?> + </div> + </div> + <div class="mc-form-icon mc-form-icon-a"> + <img id="mc-form-icon-gr" alt="rp" src="/mc/0.1/images/gr60.png" /> + </div> </div> <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" />

1 0

r208 - trunk/wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-15 00:37:58 +0100 (Thu, 15 Mar 2012) New Revision: 208 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 23:29:20 UTC (rev 207) +++ trunk/wp-theme/mc2-form.php 2012-03-14 23:37:58 UTC (rev 208) @@ -61,10 +61,10 @@ <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> </div> </div> - <div style="float: left;width: 490px;"> + <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> - <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-non-profit"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> @@ -100,10 +100,10 @@ <img id="mc-form-icon-rp" alt="rp" src="/mc/0.1/images/rp60.png" /> </div> </div> - <div style="float: left;width: 490px;"> + <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> <div id="mc-form-optional-reproducible"> - <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-reproducible"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use"/> @@ -160,10 +160,10 @@ </div> </div> </div> - <div style="float: left;width: 490px;"> + <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> - <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-reinforcing"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <!-- @@ -200,10 +200,10 @@ <img id="mc-form-icon-gr" alt="rp" src="/mc/0.1/images/gr60.png" /> </div> </div> - <div style="float: left;width: 490px;"> + <div style="float: left;width: 500px;"> <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" /> <div id="mc-form-optional-grassroots"> - <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <div style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-grassroots"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies"/>

1 0

r207 - in trunk: src wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-15 00:29:20 +0100 (Thu, 15 Mar 2012) New Revision: 207 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-14 23:15:01 UTC (rev 206) +++ trunk/src/mc.css 2012-03-14 23:29:20 UTC (rev 207) @@ -319,6 +319,19 @@ margin-left: 0px; } +.mc-cat-rc-option-box-v2 { + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + border: 2px solid #b3b3b3; + background-color: #fff; + cursor: pointer; + margin-right: 10px; + margin-left: 0px; + width: 340px; +} + .mc-cat-rc-option-box-high { background-color: #f2f2f2; } Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 23:15:01 UTC (rev 206) +++ trunk/wp-theme/mc2-form.php 2012-03-14 23:29:20 UTC (rev 207) @@ -169,12 +169,12 @@  - <div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> + <div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> + <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> + <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> @@ -230,6 +230,7 @@ </div> </div> </div> + </div> </div> <div class="mc-clean"></div> @@ -304,12 +305,12 @@ <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> <div id="mc-form-more-text-rc" class="mc-form-more-text"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> - <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> -<?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> + <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> +<?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> -<?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> +<?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> -<?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> +<?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box-v2" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> </div>

1 0

r206 - in trunk: src wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-15 00:15:01 +0100 (Thu, 15 Mar 2012) New Revision: 206 Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-14 23:03:55 UTC (rev 205) +++ trunk/src/mc-dia-form2.js 2012-03-14 23:15:01 UTC (rev 206) @@ -19,16 +19,16 @@ // $("#mc-form-" + $id2).attr("title", click_to_select); $("#mc-form-more-text-" + $id2).slideUp(function() {adjustHeights();}); if (cat_id == "#mc-form-rc") { - $("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); - mc_rc="0"; - update_logo($id); + //$("#mc-cat-rc-options").slideDown(function() {adjustHeights();}); + mc_rc="0"; + update_logo($id); } else if (cat_id == "#mc-form-nrc") { - $("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); - reset_areas(); - update_logo($id); + //$("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); + reset_areas(); + update_logo($id); } else { - update_logo($id); - $("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); + update_logo($id); + //$("#mc-cat-rc-options").slideUp(function() {adjustHeights();}); } }); }; @@ -55,9 +55,9 @@ function (event) { event.stopPropagation(); $(this).hide(); - if ($id == "rc") { - $("#mc-cat-rc-options").slideDown(); - } + /*if ($id == "rc") { + $("#mc-cat-rc-options").slideDown(); + }*/ $("#mc-form-less-link-" + $id).show('slow'); $("#mc-form-more-text-" + $id).show('slow',function() {adjustHeights();}); @@ -69,12 +69,12 @@ function (event) { event.stopPropagation(); $(this).hide(); - if ($id == "rc") { - $("#mc-cat-rc-options").slideUp(); - } + /*if ($id == "rc") { + $("#mc-cat-rc-options").slideUp(); + }*/ $("#mc-form-more-link-" + $id).show('slow'); $("#mc-form-more-text-" + $id).slideUp(function() {adjustHeights();}); - if ($id == "rc") { $("#mc-cat-rc-options").slideUp(function() {adjustHeights();});} + //if ($id == "rc") { $("#mc-cat-rc-options").slideUp(function() {adjustHeights();});} }); }; @@ -314,7 +314,7 @@ confInputValidation("#ininame"); $("#mc-dia-continue-btn").addClass("mc-dia-continue-btn-disabled"); -$("#mc-cat-rc-options").hide(function() {adjustHeights();}); +//$("#mc-cat-rc-options").hide(function() {adjustHeights();}); $("#mc-form-icon-result").hide(); conf_click_continue(); $('#label1').labelOver('over-apply'); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 23:03:55 UTC (rev 205) +++ trunk/wp-theme/mc2-form.php 2012-03-14 23:15:01 UTC (rev 206) @@ -158,7 +158,8 @@ <div class="mc-form-icon mc-form-icon-a"> <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> </div> - </div> + </div> + </div> <div style="float: left;width: 490px;"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> @@ -179,9 +180,8 @@ </div> </div> - </div> </div> - </div> + </div> </div> <div class="mc-cat-group-d-v2" id="mc-cat-group-d">

1 0

r205 - trunk/wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-15 00:03:55 +0100 (Thu, 15 Mar 2012) New Revision: 205 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 22:56:24 UTC (rev 204) +++ trunk/wp-theme/mc2-form.php 2012-03-14 23:03:55 UTC (rev 205) @@ -166,9 +166,9 @@ <label id="mc-optional-reinforcing"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> <div class="mc-cat-rc-options" id="mc-cat-rc-options">  - <div class="mc-cat-rc-option-desc"> + <div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text">

1 0

r204 - in trunk: src wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-14 23:56:24 +0100 (Wed, 14 Mar 2012) New Revision: 204 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-14 21:15:04 UTC (rev 203) +++ trunk/src/mc.css 2012-03-14 22:56:24 UTC (rev 204) @@ -451,7 +451,7 @@ font-size: 16px; } -#mc-required-title-url, #mc-required-title-name, #mc-optional-title,#mc-optional-keywords,#mc-optional-languages,#mc-optional-optional-boxes,#mc-optional-location,#mc-optional-non-profit,#mc-optional-reproducible,#mc-form-optional-reinforcing,#mc-optional-grassroots{ +#mc-required-title-url, #mc-required-title-name, #mc-optional-title,#mc-optional-keywords,#mc-optional-languages,#mc-optional-optional-boxes,#mc-optional-location,#mc-optional-non-profit,#mc-optional-reproducible,#mc-optional-reinforcing,#mc-optional-grassroots{ position: absolute; top: -20px; font-weight: bold; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 21:15:04 UTC (rev 203) +++ trunk/wp-theme/mc2-form.php 2012-03-14 22:56:24 UTC (rev 204) @@ -154,16 +154,7 @@ <div id="mc-form-less-link-rc" class="mc-form-link"><?php _e("less info", "mc"); ?></div> <div class="mc-form-descbox-header"><?php _e("Reinforcing the Commons", "mc"); ?></div> <div class="mc-form-descbox-intro"><?php _e("Your initiative protectes/expands The Commons, resources that are collectively owned", "mc"); ?></div> - <div id="mc-form-more-text-rc" class="mc-form-more-text"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> - <div class="mc-cat-rc-options" id="mc-cat-rc-options"> <div class="mc-cat-rc-options-intro" id="mc-cat-rc-options-intro"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-ec"> <div class="mc-cat-rc-option-text"><?php _e("Nature Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> - <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> - <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> - <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> - <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> - </div> + <div id="mc-form-more-text-rc" class="mc-form-more-text"><?php _e("The Commons are those resources that are collectively owned or shared among populations. Thus, your initiative is promoting The Commons by focusing its work in protecting/expanding any of them in any particular area of action", "mc"); ?></div> <div class="mc-form-icon mc-form-icon-a"> <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> </div> @@ -172,8 +163,21 @@ <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> <div id="mc-form-optional-reinforcing"> <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-non-profit"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> - + <label id="mc-optional-reinforcing"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> + <div class="mc-cat-rc-options" id="mc-cat-rc-options"> +  + <div class="mc-cat-rc-option-desc"> + <?php _e("the natural environment: forests, seeds, the Moon", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-ec"><img src="/mc/0.1/images/rcec25.png" alt="ec" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-bo"> <div class="mc-cat-rc-option-text"> + <?php _e("Body/Health Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the human bodies: blood donation, smiles, non-alienation", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-bo"><img src="/mc/0.1/images/rcbo25.png" alt="bo" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-to"> <div class="mc-cat-rc-option-text"> + <?php _e("Town/Community/Society Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the socio-cultural spaces: language, music, streets, science", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-to"><img src="/mc/0.1/images/rcto25.png" alt="to" /></div><div class="mc-cat-rc-option-box" id="mc-cat-rc-option-box-di"> <div class="mc-cat-rc-option-text"> + <?php _e("Digital Commons", "mc"); ?></div><div class="mc-cat-rc-option-desc"> + <?php _e("the cyberspace: internet, cyber-rights, Wikipedia", "mc"); ?></div></div><div class="mc-cat-rc-option-icon" id="mc-cat-rc-option-icon-di"><img src="/mc/0.1/images/rcdi25.png" alt="di" /></div></div> + + </div> </div> </div> </div>

1 0

r203 - in trunk: src wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-14 22:15:04 +0100 (Wed, 14 Mar 2012) New Revision: 203 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-14 16:48:44 UTC (rev 202) +++ trunk/src/mc.css 2012-03-14 21:15:04 UTC (rev 203) @@ -451,7 +451,7 @@ font-size: 16px; } -#mc-required-title-url, #mc-required-title-name, #mc-optional-title,#mc-optional-keywords,#mc-optional-languages,#mc-optional-optional-boxes,#mc-optional-location,#mc-optional-non-profit{ +#mc-required-title-url, #mc-required-title-name, #mc-optional-title,#mc-optional-keywords,#mc-optional-languages,#mc-optional-optional-boxes,#mc-optional-location,#mc-optional-non-profit,#mc-optional-reproducible,#mc-form-optional-reinforcing,#mc-optional-grassroots{ position: absolute; top: -20px; font-weight: bold; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 16:48:44 UTC (rev 202) +++ trunk/wp-theme/mc2-form.php 2012-03-14 21:15:04 UTC (rev 203) @@ -61,21 +61,21 @@ <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> </div> </div> - <div style="float: left;width: 490px;height: 154px;"> + <div style="float: left;width: 490px;"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-non-profit"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> - <input type="checkbox" name="registered-non-profit" value="" id="registered-non-profit"/> + <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit"/> <?php _e("We are registered as Non-profit", "mc"); ?> </label> <label class="optional-labels-fields"> - <input type="checkbox" name="open-accounting" value="" id="open-accounting" /> + <input type="checkbox" name="open-accounting" value="S" id="open-accounting" /> <?php _e("We have Open-accounting", "mc"); ?> </label> <label class="optional-labels-fields"> - <input type="checkbox" name="accept-donations" value="" id="accept-donations" /> + <input type="checkbox" name="accept-donations" value="S" id="accept-donations" /> <?php _e("We accept donations", "mc"); ?> </label> </div> @@ -85,7 +85,7 @@ </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> - <div style="float: left;" class="mc-form-category-group-b-v2"> + <div style="float: left;" class="mc-form-category-group-b-v2"> <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" title="<?php _e("Click to select", "mc"); ?>"> @@ -100,9 +100,48 @@ <img id="mc-form-icon-rp" alt="rp" src="/mc/0.1/images/rp60.png" /> </div> </div> - <div style="float: left;width: 490px;height: 154px;"> - <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> - </div> + <div style="float: left;width: 490px;"> + <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number-v2" /> + <div id="mc-form-optional-reproducible"> + <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <label id="mc-optional-reproducible"><?php _e("Optional", "mc"); ?></label> + <label class="optional-labels-fields"> + <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use"/> + <?php _e("We have Terms of Use of our contents in this webpage:", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <?php _e("We use this license for sharing our contents:", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="creative-commons" value="S" id="creative-commons" /> + <?php _e("Creative Commons, in this webpage:", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="other-license" value="S" id="other-license" /> + <?php _e("Other license, in this webpage:", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <?php _e("We share:", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="organization-structure" value="S" id="organization-structure" /> + <?php _e("Organization structure", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" /> + <?php _e("Projects and results", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" /> + <?php _e("Methods / Procedures", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="documentation" value="S" id="documentation" /> + <?php _e("Documentation", "mc"); ?> + </label> + </div> + </div> + </div> </div> </div> @@ -129,8 +168,14 @@ <img id="mc-form-icon-rc" alt="rc" src="/mc/0.1/images/rc60.png" /> </div> </div> - <div style="float: left;width: 490px;height: 154px;"> - <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2"/> + <div style="float: left;width: 490px;"> + <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number-v2" /> + <div id="mc-form-optional-reinforcing"> + <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <label id="mc-optional-non-profit"><?php _e("Which area is the main focus of your initiative?", "mc"); ?></label> + + </div> + </div> </div> </div> </div> @@ -151,8 +196,33 @@ <img id="mc-form-icon-gr" alt="rp" src="/mc/0.1/images/gr60.png" /> </div> </div> - <div style="float: left;width: 490px;height: 154px;"> - <img src="/mc/0.1/images/step4.png" alt="step2" class="mc-steps-number-v2" /> + <div style="float: left;width: 490px;"> + <img src="/mc/0.1/images/step4.png" alt="step4" class="mc-steps-number-v2" /> + <div id="mc-form-optional-grassroots"> + <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> + <label id="mc-optional-grassroots"><?php _e("Optional", "mc"); ?></label> + <label class="optional-labels-fields"> + <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies"/> + <?php _e("We take decisions mainly through general assemblies", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="decisions-voting" value="S" id="decisions-voting" /> + <?php _e("We take decisions through majority voting", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="decisions-consensus" value="S" id="decisions-consensus" /> + <?php _e("We take decisions through consensus, instead of majority", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="representatives-democratically" value="S" id="representatives-democratically" /> + <?php _e("We have representatives chosen democratically", "mc"); ?> + </label> + <label class="optional-labels-fields"> + <input type="checkbox" name="meetings-transparent" value="S" id="meetings-transparent" /> + <?php _e("We have a board whose meetings are transparent", "mc"); ?> + </label> + </div> + </div> </div> </div> </div>

1 0

r202 - in trunk: src wp-theme
by Mario Gallegos 14 Mar '12

14 Mar '12

Author: mgallegos Date: 2012-03-14 17:48:44 +0100 (Wed, 14 Mar 2012) New Revision: 202 Modified: trunk/src/mc-dia-form2.js trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-14 16:40:09 UTC (rev 201) +++ trunk/src/mc-dia-form2.js 2012-03-14 16:48:44 UTC (rev 202) @@ -98,7 +98,7 @@ function hide_initial($id) { $("#mc-form-more-link-" + $id).hide(); - $("#mc-form-more-text-" + $id).hide(); + //$("#mc-form-more-text-" + $id).hide(); $("#mc-form-less-link-" + $id).hide(); }; @@ -224,8 +224,8 @@ //hover_more_link(nid); //hover_less_link(nid); //hover_less_link(nid); - //hide_initial($id); - //hide_initial(nid); + hide_initial($id); + hide_initial(nid); click_more_link($id); click_more_link(nid); click_less_link($id); Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-14 16:40:09 UTC (rev 201) +++ trunk/src/mc.css 2012-03-14 16:48:44 UTC (rev 202) @@ -700,10 +700,10 @@ } .optional-labels-fields{ - font-size: 16px; + font-size: 16px !important; margin-left: 10px; margin-top: 10px; - color: #444; + color: #444 !important; display: block; } \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-14 16:40:09 UTC (rev 201) +++ trunk/wp-theme/mc2-form.php 2012-03-14 16:48:44 UTC (rev 202) @@ -64,7 +64,7 @@ <div style="float: left;width: 490px;height: 154px;"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number-v2" /> <div id="mc-form-optional-non-profit"> - <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 20px;border: 1px solid #B7C4C8;"> + <div style="position: relative;float: left;width: 90%;font-size: 16px;margin-left: 10px;margin-top: 35px;border: 1px solid #B7C4C8;"> <label id="mc-optional-non-profit"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="" id="registered-non-profit"/>

1 0