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

r191 - trunk/wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 22:43:17 +0100 (Tue, 13 Mar 2012) New Revision: 191 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 21:33:56 UTC (rev 190) +++ trunk/wp-theme/mc2-form.php 2012-03-13 21:43:17 UTC (rev 191) @@ -61,7 +61,7 @@ <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> </div> </div> - <div style="float: left;width: 490px;background-color: yellow;"> + <div style="float: left;width: 490px;height: 154px;"> </div> </div> @@ -81,6 +81,8 @@ <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;"> + </div> </div> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> @@ -106,6 +108,8 @@ <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;"> + </div> </div> <div class="mc-cat-group-d-v2" id="mc-cat-group-d"> @@ -123,6 +127,8 @@ <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: 490px;height: 154px;"> </div> </div> <!--

1 0

r190 - in trunk: src wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 22:33:56 +0100 (Tue, 13 Mar 2012) New Revision: 190 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-13 17:17:50 UTC (rev 189) +++ trunk/src/mc.css 2012-03-13 21:33:56 UTC (rev 190) @@ -95,7 +95,7 @@ .mc-form-category-group-v2 { padding: 20px 20px 0 20px; - width: 840px; + width: 350px; } .mc-form-category-group-ba { Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 17:17:50 UTC (rev 189) +++ trunk/wp-theme/mc2-form.php 2012-03-13 21:33:56 UTC (rev 190) @@ -61,6 +61,8 @@ <img id="mc-form-icon-np" alt="np" src="/mc/0.1/images/np60.png" /> </div> </div> + <div style="float: left;width: 490px;background-color: yellow;"> + </div> </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b">

1 0

r189 - trunk/src
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 18:17:50 +0100 (Tue, 13 Mar 2012) New Revision: 189 Modified: trunk/src/mc-dia-form2.js Log: Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-13 16:31:24 UTC (rev 188) +++ trunk/src/mc-dia-form2.js 2012-03-13 17:17:50 UTC (rev 189) @@ -39,12 +39,12 @@ function () { $(cat_id).addClass("mc-form-descbox-high"); - if ($('#mc-form-less-link-'+$id).is(':hidden')) - $("#mc-form-more-link-"+$id).show(); + //if ($('#mc-form-less-link-'+$id).is(':hidden')) + // $("#mc-form-more-link-"+$id).show(); }, function () { $(cat_id).removeClass("mc-form-descbox-high"); - if ($('#mc-form-less-link-'+$id).is(':hidden')) - $("#mc-form-more-link-"+$id).hide(); + //if ($('#mc-form-less-link-'+$id).is(':hidden')) + // $("#mc-form-more-link-"+$id).hide(); }); };

1 0

r188 - in trunk/src: . images
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 17:31:24 +0100 (Tue, 13 Mar 2012) New Revision: 188 Added: trunk/src/images/button_cancel.png Modified: trunk/src/mc-dia-form2.js Log: Added: trunk/src/images/button_cancel.png =================================================================== (Binary files differ) Property changes on: trunk/src/images/button_cancel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2012-03-13 14:34:02 UTC (rev 187) +++ trunk/src/mc-dia-form2.js 2012-03-13 16:31:24 UTC (rev 188) @@ -220,10 +220,10 @@ function conf_link($id) { var nid = "n" + $id; - hover_more_link($id); - hover_more_link(nid); - hover_less_link(nid); - hover_less_link(nid); + //hover_more_link($id); + //hover_more_link(nid); + //hover_less_link(nid); + //hover_less_link(nid); hide_initial($id); hide_initial(nid); click_more_link($id);

1 0

r187 - in trunk: src wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 15:34:02 +0100 (Tue, 13 Mar 2012) New Revision: 187 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-13 14:25:24 UTC (rev 186) +++ trunk/src/mc.css 2012-03-13 14:34:02 UTC (rev 187) @@ -122,7 +122,7 @@ /*border-bottom: 1px solid #b7c4c8;*/ border-left: 2px solid #b7c4c8; border-top: 2px solid #b7c4c8; - border-right: 1px solid #b7c4c8; + border-right: 2px solid #b7c4c8; border-radius-topleft: 10px; -o-border-radius-topleft: 10px; -icab-border-radius-topleft: 10px; @@ -155,7 +155,7 @@ /*border-bottom: 1px solid #b7c4c8;*/ border-left: 2px solid #b7c4c8; border-top: 2px solid #b7c4c8; - border-right: 1px solid #b7c4c8; + border-right: 2px solid #b7c4c8; heigth: 300px; background-color: #f9f9f9; } @@ -172,7 +172,7 @@ .mc-form-category-group-d-v2 { border-bottom: 2px solid #b7c4c8; border-left: 2px solid #b7c4c8; - /*border-top: 1px solid #b7c4c8;*/ + border-top: 2px solid #b7c4c8; border-right: 1px solid #b7c4c8; border-radius-bottomright: 10px; -o-border-radius-bottomright: 10px; Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 14:25:24 UTC (rev 186) +++ trunk/wp-theme/mc2-form.php 2012-03-13 14:34:02 UTC (rev 187) @@ -110,7 +110,7 @@ <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-d-v2 float-left" id="mc-form-category-group-d"> <img src="/mc/0.1/images/step4.png" alt="step2" class="mc-steps-number" /> <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-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> + <div id="mc-form-gr" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> <div id="mc-form-more-link-gr" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> <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>

1 0

r186 - trunk/wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 15:25:24 +0100 (Tue, 13 Mar 2012) New Revision: 186 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 13:11:29 UTC (rev 185) +++ trunk/wp-theme/mc2-form.php 2012-03-13 14:25:24 UTC (rev 186) @@ -105,36 +105,42 @@ </div> </div> </div> + + <div class="mc-cat-group-d-v2" id="mc-cat-group-d"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-d-v2 float-left" id="mc-form-category-group-d"> + <img src="/mc/0.1/images/step4.png" alt="step2" class="mc-steps-number" /> + <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-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> + <div id="mc-form-more-link-gr" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> + <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"> + <?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>  + </div> + --> - - - - <div class="mc-cat-group-d-v2" id="mc-cat-group-d"> - </div> </div> </div> <div class="mc-clean"></div>

1 0

r185 - trunk/wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 14:11:29 +0100 (Tue, 13 Mar 2012) New Revision: 185 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 13:06:44 UTC (rev 184) +++ trunk/wp-theme/mc2-form.php 2012-03-13 13:11:29 UTC (rev 185) @@ -46,7 +46,7 @@ <div style="position: relative;float: left;width: 100%;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> - <div class="mc-form-rounded mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>"> @@ -64,7 +64,7 @@ </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> - <div class="mc-form-rounded mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number" /> <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"); ?>"> @@ -82,7 +82,7 @@ </div> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> - <div class="mc-form-rounded mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>">

1 0

r184 - in trunk: src wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 14:06:44 +0100 (Tue, 13 Mar 2012) New Revision: 184 Modified: trunk/src/mc.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/mc.css =================================================================== --- trunk/src/mc.css 2012-03-13 12:58:42 UTC (rev 183) +++ trunk/src/mc.css 2012-03-13 13:06:44 UTC (rev 184) @@ -148,6 +148,7 @@ -moz-border-top-right-radius: 10px; -webkit-border-top-right-radius: 10px; heigth: 300px; + background-color: #FEFBFD; } .mc-form-category-group-b-v2 { @@ -156,6 +157,7 @@ border-top: 2px solid #b7c4c8; border-right: 1px solid #b7c4c8; heigth: 300px; + background-color: #f9f9f9; } .mc-form-category-group-c-v2 { @@ -164,6 +166,7 @@ border-top: 2px solid #b7c4c8; border-right: 2px solid #b7c4c8; heigth: 300px; + background-color: #FEFBFD; } .mc-form-category-group-d-v2 { @@ -196,6 +199,7 @@ -moz-border-bottom-left-radius: 10px; -webkit-border-bottom-left-radius: 10px; heigth: 300px; + background-color: #f9f9f9; } .mc-form-category-group-a { Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 12:58:42 UTC (rev 183) +++ trunk/wp-theme/mc2-form.php 2012-03-13 13:06:44 UTC (rev 184) @@ -46,7 +46,7 @@ <div style="position: relative;float: left;width: 100%;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> - <div class="mc-form-rounded mc-form-category-group-a mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> + <div class="mc-form-rounded mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>"> @@ -64,7 +64,7 @@ </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> - <div class="mc-form-rounded mc-form-category-group-b mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> + <div class="mc-form-rounded mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number" /> <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"); ?>"> @@ -82,7 +82,7 @@ </div> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> - <div class="mc-form-rounded mc-form-category-group-a mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> + <div class="mc-form-rounded mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>">

1 0

r183 - trunk/wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 13:58:42 +0100 (Tue, 13 Mar 2012) New Revision: 183 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 12:50:23 UTC (rev 182) +++ trunk/wp-theme/mc2-form.php 2012-03-13 12:58:42 UTC (rev 183) @@ -46,7 +46,7 @@ <div style="position: relative;float: left;width: 100%;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> + <div class="mc-form-rounded mc-form-category-group-a mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>"> @@ -64,7 +64,7 @@ </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> + <div class="mc-form-rounded mc-form-category-group-b mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number" /> <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"); ?>"> @@ -82,10 +82,10 @@ </div> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> + <div class="mc-form-rounded mc-form-category-group-a mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number" /> <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-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> + <div id="mc-form-rc" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>"> <div id="mc-form-more-link-rc" class="mc-form-link"><?php _e("What is this?", "mc"); ?></div> <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>

1 0

r182 - trunk/wp-theme
by Mario Gallegos 13 Mar '12

13 Mar '12

Author: mgallegos Date: 2012-03-13 13:50:23 +0100 (Tue, 13 Mar 2012) New Revision: 182 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-13 12:45:06 UTC (rev 181) +++ trunk/wp-theme/mc2-form.php 2012-03-13 12:50:23 UTC (rev 182) @@ -46,7 +46,7 @@ <div style="position: relative;float: left;width: 100%;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Click on those you think corespond to your initiative:", "mc"); ?></label> <div class="mc-cat-group-a-v2" id="mc-cat-group-a"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-a float-left" id="mc-form-category-group-a"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-a-v2 float-left" id="mc-form-category-group-a"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number" /> <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" title="<?php _e("Click to select", "mc"); ?>"> @@ -64,7 +64,7 @@ </div> <div class="mc-cat-group-b-v2" id="mc-cat-group-b"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-b float-left" id="mc-form-category-group-b"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-b-v2 float-left" id="mc-form-category-group-b"> <img src="/mc/0.1/images/step2.png" alt="step2" class="mc-steps-number" /> <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"); ?>"> @@ -82,7 +82,7 @@ </div> <div class="mc-cat-group-c-v2" id="mc-cat-group-c"> - <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-a float-left" id="mc-form-category-group-c"> + <div class="mc-form-rounded mc-form-category-group-v2 mc-form-category-group-c-v2 float-left" id="mc-form-category-group-c"> <img src="/mc/0.1/images/step3.png" alt="step3" class="mc-steps-number" /> <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-rp" class="mc-form-rounded mc-form-descbox mc-form-descbox-a" title="<?php _e("Click to select", "mc"); ?>">

1 0