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

r622 - in trunk: src wp-theme
by Mario Gallegos 21 Mar '13

21 Mar '13

Author: mgallegos Date: 2013-03-21 03:25:30 +0100 (Thu, 21 Mar 2013) New Revision: 622 Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form.php Log: FEEDBACK - Enhancement #488:Save registrations in CSV or similar Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 23:30:05 UTC (rev 621) +++ trunk/src/mc-dia-form2.js 2013-03-21 02:25:30 UTC (rev 622) @@ -552,9 +552,9 @@ if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcec60.png') reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>NATURE COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcbo60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>BODY HEALTH COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>BODY/HEALTH COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcto60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN COMMUNITY SOCIETY COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN/COMMUNITY/SOCIETY COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>DIGITAL COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; }else{ Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-20 23:30:05 UTC (rev 621) +++ trunk/wp-theme/mc2-form.php 2013-03-21 02:25:30 UTC (rev 622) @@ -414,7 +414,7 @@ <div id="progress_text">0% Complete</div> </div> -<img id="loader" src="/mc/0.1/images/spinner.gif" style="display: none;"/> +<img id="loader" src="/mc/0.1/images/spinner.gif" style="display: none;z-index: 1003;position: fixed;"/> <map id="step1_image_map" name="step1_image_map">

1 0

r621 - in trunk: . src
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-21 00:30:05 +0100 (Thu, 21 Mar 2013) New Revision: 621 Modified: trunk/DEV_GUIDE trunk/src/mc-dia-form2.js Log: FEEDBACK - Enhancement #488:Save registrations in CSV or similar Modified: trunk/DEV_GUIDE =================================================================== --- trunk/DEV_GUIDE 2013-03-20 22:32:36 UTC (rev 620) +++ trunk/DEV_GUIDE 2013-03-20 23:30:05 UTC (rev 621) @@ -32,9 +32,41 @@ - trunk/src/mc-dia-form2.css - trunk/src/mc-dia-form2.js - trunk/wp-theme/mc2-form.php +- trunk/wp-theme/mc2-form-controller.php It uses JQuery JS/CSS and images from trunk/src/images. +** CVS data file +The file "initiatives.txt" contains all initiatives data, you can access it through the following URL: + +http://movecommons.org/initiatives.txt + +The data is saved in the following order: + +0 ------> Name of the initiative (if the user typed a comma, it will be replaced by a pipe symbol) {slide 1} +1 ------> Initiative web address {slide 1} +2 ------> Languages (separated by pipes in case the user typed more than one) {slide 1} +3 ------> Keywords (separated by pipes in case the user typed more than one) {slide 1} +4 ------> Location +5 ------> Is your initiative Non-Profit? Possible values: Yes or No {slide 2} +6 ------> We are officially registered. Possible values: webpage URL or empty {slide 2} +7 ------> We have a webpage where our accounting is public (Open-accounting). Possible values: webpage URL or empty {slide 2} +8 ------> We have a webpage to receive online donations. Possible values: webpage URL or empty {slide 2} +9 ------> Is your initiative Reproducible? Possible values: Yes or No {slide 3} +10 ------> We have Terms of Use of our contents. Possible values: webpage URL or empty {slide 3} +11 ------> We use this license for sharing our contents: Creative Commons. Possible values: webpage URL or empty {slide 3} +12 ------> We use this license for sharing our contents: Other license. Possible values: webpage URL or empty {slide 3} +13 ------> We provide public documentation about: Our organization. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative Reproducible?") {slide 3} +14 ------> We provide public documentation about: Our internal procedures. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative Reproducible?") {slide 3} +15 ------> We provide public documentation about: Our list of members. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative Reproducible?") {slide 3} +16 ------> We provide public documentation about: Our funding sources. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative Reproducible?") {slide 3} +17 ------> Is your initiative driven by horizontal collective decisions? Possible values: Yes or No {slide 4} +18 ------> We take decisions mainly through general assemblies. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative driven by horizontal collective decisions?") {slide 4} +19 ------> We have representatives chosen democratically. Possible values: Yes, No or empty (it will be empty in case user chose "No" in "Is your initiative driven by horizontal collective decisions?") {slide 4} +20 ------> We take decisions through. Possible values: Majority voting, Consensus or empty (it will be empty in case user chose "No" in "Is your initiative driven by horizontal collective decisions?" or if the user didn't chose any of the options available) {slide 4} +21 ------> Does your initiative Reinforce the Commons? Possible values: Yes or No {slide 5} +22 ------> Which area is the main focus of your initiative?. Possible values: NATURE COMMONS, BODY HEALTH COMMONS, TOWN COMMUNITY SOCIETY COMMONS, DIGITAL COMMONS, or empty (it will be empty in case user chose "No" in "Does your initiative Reinforce the Commons?") {slide 5} + ** Deployment instructions For deployment you will need fabric: apt-get install fabric Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 22:32:36 UTC (rev 620) +++ trunk/src/mc-dia-form2.js 2013-03-20 23:30:05 UTC (rev 621) @@ -554,7 +554,7 @@ else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcbo60.png') reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>BODY HEALTH COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcto60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN COMMUNITY SOCIETY_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN COMMUNITY SOCIETY COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>DIGITAL COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; }else{

1 0

r620 - in trunk: src src/images wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 23:32:36 +0100 (Wed, 20 Mar 2013) New Revision: 620 Added: trunk/src/images/spinner.gif Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form-controller.php trunk/wp-theme/mc2-form.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Added: trunk/src/images/spinner.gif =================================================================== (Binary files differ) Property changes on: trunk/src/images/spinner.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 21:57:26 UTC (rev 619) +++ trunk/src/mc-dia-form2.js 2013-03-20 22:32:36 UTC (rev 620) @@ -581,11 +581,12 @@ processData: false, contentType: "text/xml", beforeSend: function(){ - //$('#loader').show(); + $('#loader').show(); }, data: $j.createXML(xmlDoc), success: function(xmlData) { - alert("Dev msg: Your data has been successfully saved!!"); + $('#loader').hide(); + alert("Dev msg: Your data has been successfully saved!!"); } }); Modified: trunk/wp-theme/mc2-form-controller.php =================================================================== --- trunk/wp-theme/mc2-form-controller.php 2013-03-20 21:57:26 UTC (rev 619) +++ trunk/wp-theme/mc2-form-controller.php 2013-03-20 22:32:36 UTC (rev 620) @@ -23,7 +23,7 @@ $data .= $SimpleXMLElement->WE_TAKE_DECISIONS_THROUGH.","; $data .= $SimpleXMLElement->INITIATIVE_REINFORCE_THE_COMMONS.","; $data .= $SimpleXMLElement->MAIN_FOCUS_OF_THE_INITIATIVE."\n"; - $fp = fopen('initiatives.txt', 'w'); + $fp = fopen('initiatives.txt', 'a'); fwrite($fp, $data); fclose($fp); ?> \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-20 21:57:26 UTC (rev 619) +++ trunk/wp-theme/mc2-form.php 2013-03-20 22:32:36 UTC (rev 620) @@ -414,7 +414,9 @@ <div id="progress_text">0% Complete</div> </div> +<img id="loader" src="/mc/0.1/images/spinner.gif" style="display: none;"/> + <map id="step1_image_map" name="step1_image_map"> </map> @@ -485,5 +487,13 @@ $j("ul.qtrans_language_chooser").css("margin-left", "226px"); $j('#progress').css('width','0'); $j('#progress_text').html('0% Complete'); + windowWidth = document.documentElement.clientWidth; + windowHeight = document.documentElement.clientHeight; + ajaxHeight = 50; + ajaxWidth = 50; + $("#loader").css({ + "top": windowHeight/2-ajaxHeight/2, + "left": windowWidth/2-ajaxWidth/2 + }); }); </script>

1 0

r619 - in trunk: src wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 22:57:26 +0100 (Wed, 20 Mar 2013) New Revision: 619 Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 21:45:37 UTC (rev 618) +++ trunk/src/mc-dia-form2.js 2013-03-20 21:57:26 UTC (rev 619) @@ -565,9 +565,9 @@ +"<NAME>"+xmlReplaceInvalidCharacters($j("#ininame").val())+"</NAME>"+ "<WEB_ADDRESS>"+xmlReplaceInvalidCharacters($j("#url").val())+"</WEB_ADDRESS>"+ //"<LANGUAGES>"+xmlDynamicTags('LANGUAGE',$j("#languages").val())+"</LANGUAGES>"+ - "<LANGUAGES>"+commasToPipes('LANGUAGE',$j("#languages").val())+"</LANGUAGES>"+ + "<LANGUAGES>"+commasToPipes($j("#languages").val())+"</LANGUAGES>"+ //"<KEYWORDS>"+xmlDynamicTags('KEYWORD',$j("#keywords").val())+"</KEYWORDS>"+ - "<KEYWORDS>"+commasToPipes('KEYWORD',$j("#keywords").val())+"</KEYWORDS>"+ + "<KEYWORDS>"+commasToPipes($j("#keywords").val())+"</KEYWORDS>"+ "<LOCATION>"+xmlReplaceInvalidCharacters($j("#location").val())+"</LOCATION>"+ nonProfitXml+ reproducibleXml+ Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-20 21:45:37 UTC (rev 618) +++ trunk/wp-theme/mc2-form.php 2013-03-20 21:57:26 UTC (rev 619) @@ -397,7 +397,7 @@ </div> <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><?php _e("Include this code in the web of your collective:", "mc"); ?></div> <textarea style="margin-left: 185px;margin-top: 20px;margin-bottom: 20px;" rows="4" cols="68" onfocus="this.select()" class="mc-icon88x31-code" id="mc-intro-textarea"><div id="move-commons-badge"><div xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:mc="http://movecommons.org/ns#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" about="waveclick.com.sv" typeof="mc:Collective"></div><div property="foaf:name" content="Waveclick"></div><div rel="foaf:homepage" href="waveclick.com.sv"></div><div rel="mc:moveCommonsType" resource="[mc:NonProfit]"></div><div rel="mc:moveCommonsType" resource="[mc:Reproducible]"></div><div rel="mc:moveCommonsType" resource="[mc:ReinforcesOtherAims]"></div><div rel="mc:moveCommonsType" resource="[mc:Representative]"></div><div about="#dd" typeof="skos:Concept"></div><div about="#dd" typeof="skos:Concept"></div><a href="http://movecommons.org/en/np-rp-ro-rs/0.1/"><img src="http://movecommons.org/mc/0.1/images/np-rp-ro-rs-88x31-0.1.png" alt="Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative" /></a><p>Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative</p></div></textarea> - <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="http://movecommons.org/initiatives.txt">Click here to download the CVS file.</a></div> + <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="/initiatives.txt" target="_blank">Click here to download the CVS file.</a></div> <div class="clear"></div> <div> <button class="submit buttonp" style="left: 710px;" type="submit" name="p_submit_sixth" id="p_submit_sixth"><?php _e("Previous", "mc"); ?></button>

1 0

r618 - trunk/wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 22:45:37 +0100 (Wed, 20 Mar 2013) New Revision: 618 Modified: trunk/wp-theme/mc2-form-controller.php trunk/wp-theme/mc2-form.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/wp-theme/mc2-form-controller.php =================================================================== --- trunk/wp-theme/mc2-form-controller.php 2013-03-20 17:29:35 UTC (rev 617) +++ trunk/wp-theme/mc2-form-controller.php 2013-03-20 21:45:37 UTC (rev 618) @@ -23,7 +23,7 @@ $data .= $SimpleXMLElement->WE_TAKE_DECISIONS_THROUGH.","; $data .= $SimpleXMLElement->INITIATIVE_REINFORCE_THE_COMMONS.","; $data .= $SimpleXMLElement->MAIN_FOCUS_OF_THE_INITIATIVE."\n"; - $fp = fopen('/initiatives.txt', 'w'); + $fp = fopen('initiatives.txt', 'w'); fwrite($fp, $data); fclose($fp); ?> \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-20 17:29:35 UTC (rev 617) +++ trunk/wp-theme/mc2-form.php 2013-03-20 21:45:37 UTC (rev 618) @@ -398,8 +398,10 @@ <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><?php _e("Include this code in the web of your collective:", "mc"); ?></div> <textarea style="margin-left: 185px;margin-top: 20px;margin-bottom: 20px;" rows="4" cols="68" onfocus="this.select()" class="mc-icon88x31-code" id="mc-intro-textarea"><div id="move-commons-badge"><div xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:mc="http://movecommons.org/ns#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" about="waveclick.com.sv" typeof="mc:Collective"></div><div property="foaf:name" content="Waveclick"></div><div rel="foaf:homepage" href="waveclick.com.sv"></div><div rel="mc:moveCommonsType" resource="[mc:NonProfit]"></div><div rel="mc:moveCommonsType" resource="[mc:Reproducible]"></div><div rel="mc:moveCommonsType" resource="[mc:ReinforcesOtherAims]"></div><div rel="mc:moveCommonsType" resource="[mc:Representative]"></div><div about="#dd" typeof="skos:Concept"></div><div about="#dd" typeof="skos:Concept"></div><a href="http://movecommons.org/en/np-rp-ro-rs/0.1/"><img src="http://movecommons.org/mc/0.1/images/np-rp-ro-rs-88x31-0.1.png" alt="Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative" /></a><p>Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative</p></div></textarea> <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="http://movecommons.org/initiatives.txt">Click here to download the CVS file.</a></div> + <div class="clear"></div> <div> <button class="submit buttonp" style="left: 710px;" type="submit" name="p_submit_sixth" id="p_submit_sixth"><?php _e("Previous", "mc"); ?></button> + <div class="clear"></div> </div> <div class="clear"></div> </div>

1 0

r617 - trunk/src
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 18:29:35 +0100 (Wed, 20 Mar 2013) New Revision: 617 Modified: trunk/src/mc-dia-form2.js Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 17:14:00 UTC (rev 616) +++ trunk/src/mc-dia-form2.js 2013-03-20 17:29:35 UTC (rev 617) @@ -576,7 +576,7 @@ "</INITIATIVE>"; $j.ajax({ - url: "/wp-content/themes/mc/mc2-form-controller.php", + url: "/mc2-form-controller.php", type: "POST", processData: false, contentType: "text/xml",

1 0

r616 - trunk/wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 18:14:00 +0100 (Wed, 20 Mar 2013) New Revision: 616 Modified: trunk/wp-theme/mc2-form.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-20 17:00:16 UTC (rev 615) +++ trunk/wp-theme/mc2-form.php 2013-03-20 17:14:00 UTC (rev 616) @@ -397,7 +397,7 @@ </div> <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><?php _e("Include this code in the web of your collective:", "mc"); ?></div> <textarea style="margin-left: 185px;margin-top: 20px;margin-bottom: 20px;" rows="4" cols="68" onfocus="this.select()" class="mc-icon88x31-code" id="mc-intro-textarea"><div id="move-commons-badge"><div xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:mc="http://movecommons.org/ns#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" about="waveclick.com.sv" typeof="mc:Collective"></div><div property="foaf:name" content="Waveclick"></div><div rel="foaf:homepage" href="waveclick.com.sv"></div><div rel="mc:moveCommonsType" resource="[mc:NonProfit]"></div><div rel="mc:moveCommonsType" resource="[mc:Reproducible]"></div><div rel="mc:moveCommonsType" resource="[mc:ReinforcesOtherAims]"></div><div rel="mc:moveCommonsType" resource="[mc:Representative]"></div><div about="#dd" typeof="skos:Concept"></div><div about="#dd" typeof="skos:Concept"></div><a href="http://movecommons.org/en/np-rp-ro-rs/0.1/"><img src="http://movecommons.org/mc/0.1/images/np-rp-ro-rs-88x31-0.1.png" alt="Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative" /></a><p>Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative</p></div></textarea> - <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="http://movecommons.org/wp-content/themes/mc/initiatives.txt">Click here to download the CVS file.</a></div> + <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="http://movecommons.org/initiatives.txt">Click here to download the CVS file.</a></div> <div> <button class="submit buttonp" style="left: 710px;" type="submit" name="p_submit_sixth" id="p_submit_sixth"><?php _e("Previous", "mc"); ?></button> </div>

1 0

r615 - trunk/wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 18:00:16 +0100 (Wed, 20 Mar 2013) New Revision: 615 Modified: trunk/wp-theme/mc2-form-controller.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/wp-theme/mc2-form-controller.php =================================================================== --- trunk/wp-theme/mc2-form-controller.php 2013-03-20 04:46:42 UTC (rev 614) +++ trunk/wp-theme/mc2-form-controller.php 2013-03-20 17:00:16 UTC (rev 615) @@ -23,7 +23,7 @@ $data .= $SimpleXMLElement->WE_TAKE_DECISIONS_THROUGH.","; $data .= $SimpleXMLElement->INITIATIVE_REINFORCE_THE_COMMONS.","; $data .= $SimpleXMLElement->MAIN_FOCUS_OF_THE_INITIATIVE."\n"; - $fp = fopen('initiatives.txt', 'w'); + $fp = fopen('/initiatives.txt', 'w'); fwrite($fp, $data); fclose($fp); ?> \ No newline at end of file

1 0

r614 - in trunk: src wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 05:46:42 +0100 (Wed, 20 Mar 2013) New Revision: 614 Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form-controller.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-20 04:23:16 UTC (rev 613) +++ trunk/src/mc-dia-form2.js 2013-03-20 04:46:42 UTC (rev 614) @@ -459,6 +459,7 @@ str = str.replace(/>/g,'>'); str = str.replace(/"/g,'"'); str = str.replace(/'/g,'''); + str = str.replace(/,/g,'|'); return str; } Modified: trunk/wp-theme/mc2-form-controller.php =================================================================== --- trunk/wp-theme/mc2-form-controller.php 2013-03-20 04:23:16 UTC (rev 613) +++ trunk/wp-theme/mc2-form-controller.php 2013-03-20 04:46:42 UTC (rev 614) @@ -1,4 +1,29 @@ <?php - - + $SimpleXMLElement = new SimpleXMLElement(file_get_contents('php://input')); + $data = $SimpleXMLElement->NAME.","; + $data .= $SimpleXMLElement->WEB_ADDRESS.","; + $data .= $SimpleXMLElement->LANGUAGES.","; + $data .= $SimpleXMLElement->KEYWORDS.","; + $data .= $SimpleXMLElement->LOCATION.","; + $data .= $SimpleXMLElement->INITIATIVE_NON_PROFIT.","; + $data .= $SimpleXMLElement->WE_ARE_OFFICIALLY_REGISTERED.","; + $data .= $SimpleXMLElement->WE_HAVE_WEBPAGE_WHERE_OUR_ACCOUNTING_IS_PUBLIC.","; + $data .= $SimpleXMLElement->WE_HAVE_A_WEBPAGE_TO_RECEIVE_ONLINE_DONATIONS.","; + $data .= $SimpleXMLElement->INITIATIVE_REPRODUCIBLE.","; + $data .= $SimpleXMLElement->WE_HAVE_TERMS_OF_USE_OF_OUR_CONTENTS.","; + $data .= $SimpleXMLElement->CREATIVE_COMMONS_LICENSE_FOR_SHARING_OUR_CONTENT.","; + $data .= $SimpleXMLElement->OTHER_LICENSE_FOR_SHARING_OUR_CONTENT.","; + $data .= $SimpleXMLElement->OUR_ORGANIZATION.","; + $data .= $SimpleXMLElement->OUR_INTERNAL_PROCEDURES.","; + $data .= $SimpleXMLElement->OUR_LIST_OF_MEMBERS.","; + $data .= $SimpleXMLElement->OUR_FUNDING_SOURCES.","; + $data .= $SimpleXMLElement->INITIATIVE_GRASSROOTS.","; + $data .= $SimpleXMLElement->WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES.","; + $data .= $SimpleXMLElement->WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY.","; + $data .= $SimpleXMLElement->WE_TAKE_DECISIONS_THROUGH.","; + $data .= $SimpleXMLElement->INITIATIVE_REINFORCE_THE_COMMONS.","; + $data .= $SimpleXMLElement->MAIN_FOCUS_OF_THE_INITIATIVE."\n"; + $fp = fopen('initiatives.txt', 'w'); + fwrite($fp, $data); + fclose($fp); ?> \ No newline at end of file

1 0

r613 - in trunk: src wp-theme
by Mario Gallegos 20 Mar '13

20 Mar '13

Author: mgallegos Date: 2013-03-20 05:23:16 +0100 (Wed, 20 Mar 2013) New Revision: 613 Added: trunk/wp-theme/initiatives.txt trunk/wp-theme/mc2-form-controller.php Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form.php Log: IN PROGRESS - Enhancement #488:Save registrations in CSV or similar Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-03-15 23:22:33 UTC (rev 612) +++ trunk/src/mc-dia-form2.js 2013-03-20 04:23:16 UTC (rev 613) @@ -465,90 +465,129 @@ function xmlDynamicTags(tag,string){ var array = string.split(','),xml=''; $.each(array, function(index, value) { - xml+="<"+tag+">"+xmlReplaceInvalidCharacters(value)+"</"+tag+">\n"; + xml+="<"+tag+">"+xmlReplaceInvalidCharacters(value)+"</"+tag+">"; }); return xml; } + + function commasToPipes(string){ + var str = string; + str = str.replace(/,/g,'|'); + return str; + } function createInitiativeXml(){ if($j('#np-checkbox').val()=='S'){ - nonProfitXml="<INITIATIVE_NON_PROFIT>YES</INITIATIVE_NON_PROFIT>\n"; + nonProfitXml="<INITIATIVE_NON_PROFIT>YES</INITIATIVE_NON_PROFIT>"; if($j("#registered-non-profit").attr("checked")) - nonProfitXml+="<WE_ARE_OFFICIALLY_REGISTERED>"+xmlReplaceInvalidCharacters($j("#non-profit-website").val())+"</WE_ARE_OFFICIALLY_REGISTERED>\n"; + nonProfitXml+="<WE_ARE_OFFICIALLY_REGISTERED>"+xmlReplaceInvalidCharacters($j("#non-profit-website").val())+"</WE_ARE_OFFICIALLY_REGISTERED>"; if($j("#open-accounting").attr("checked")) - nonProfitXml+="<WE_HAVE_WEBPAGE_WHERE_OUR_ACCOUNTING_IS_PUBLIC>"+xmlReplaceInvalidCharacters($j("#open-accounting-website").val())+"</WE_HAVE_WEBPAGE_WHERE_OUR_ACCOUNTING_IS_PUBLIC>\n"; + nonProfitXml+="<WE_HAVE_WEBPAGE_WHERE_OUR_ACCOUNTING_IS_PUBLIC>"+xmlReplaceInvalidCharacters($j("#open-accounting-website").val())+"</WE_HAVE_WEBPAGE_WHERE_OUR_ACCOUNTING_IS_PUBLIC>"; if($j("#accept-donations").attr("checked")) - nonProfitXml+="<WE_HAVE_A_WEBPAGE_TO_RECEIVE_ONLINE_DONATIONS>"+xmlReplaceInvalidCharacters($j("#donation-website").val())+"</WE_HAVE_A_WEBPAGE_TO_RECEIVE_ONLINE_DONATIONS>\n"; + nonProfitXml+="<WE_HAVE_A_WEBPAGE_TO_RECEIVE_ONLINE_DONATIONS>"+xmlReplaceInvalidCharacters($j("#donation-website").val())+"</WE_HAVE_A_WEBPAGE_TO_RECEIVE_ONLINE_DONATIONS>"; }else{ - nonProfitXml="<INITIATIVE_NON_PROFIT>NO</INITIATIVE_NON_PROFIT>\n"; + nonProfitXml="<INITIATIVE_NON_PROFIT>NO</INITIATIVE_NON_PROFIT>"; } if($j('#rp-checkbox').val()=='S'){ - reproducibleXml="<INITIATIVE_REPRODUCIBLE>YES</INITIATIVE_REPRODUCIBLE>\n"; + reproducibleXml="<INITIATIVE_REPRODUCIBLE>YES</INITIATIVE_REPRODUCIBLE>"; if($j("#terms-of-use").attr("checked")) - reproducibleXml+="<WE_HAVE_TERMS_OF_USE_OF_OUR_CONTENTS>"+xmlReplaceInvalidCharacters($j("#terms-of-use-website").val())+"</WE_HAVE_TERMS_OF_USE_OF_OUR_CONTENTS>\n"; + reproducibleXml+="<WE_HAVE_TERMS_OF_USE_OF_OUR_CONTENTS>"+xmlReplaceInvalidCharacters($j("#terms-of-use-website").val())+"</WE_HAVE_TERMS_OF_USE_OF_OUR_CONTENTS>"; if($j("#creative-commons").attr("checked")) - reproducibleXml+="<CREATIVE_COMMONS_LICENSE_FOR_SHARING_OUR_CONTENT>"+xmlReplaceInvalidCharacters($j("#creative-commons-website").val())+"</CREATIVE_COMMONS_LICENSE_FOR_SHARING_OUR_CONTENT>\n"; + reproducibleXml+="<CREATIVE_COMMONS_LICENSE_FOR_SHARING_OUR_CONTENT>"+xmlReplaceInvalidCharacters($j("#creative-commons-website").val())+"</CREATIVE_COMMONS_LICENSE_FOR_SHARING_OUR_CONTENT>"; if($j("#other-license").attr("checked")) - reproducibleXml+="<OTHER_LICENSE_FOR_SHARING_OUR_CONTENT>"+xmlReplaceInvalidCharacters($j("#other-license-website").val())+"</OTHER_LICENSE_FOR_SHARING_OUR_CONTENT>\n"; - reproducibleXml+="<WE_PROVIDE_PUBLIC_DOCUMENTATION_ABOUT>\n"; + reproducibleXml+="<OTHER_LICENSE_FOR_SHARING_OUR_CONTENT>"+xmlReplaceInvalidCharacters($j("#other-license-website").val())+"</OTHER_LICENSE_FOR_SHARING_OUR_CONTENT>"; if($j("#organization-structure").attr("checked")) - reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_ORGANIZATION</PUBLIC_DOCUMENTATION>\n"; + reproducibleXml+="<OUR_ORGANIZATION>YES</OUR_ORGANIZATION>"; + else + reproducibleXml+="<OUR_ORGANIZATION>NO</OUR_ORGANIZATION>"; if($j("#internal-procedures").attr("checked")) - reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_INTERNAL_PROCEDURES</PUBLIC_DOCUMENTATION>\n"; + reproducibleXml+="<OUR_INTERNAL_PROCEDURES>YES</OUR_INTERNAL_PROCEDURES>"; + else + reproducibleXml+="<OUR_INTERNAL_PROCEDURES>NO</OUR_INTERNAL_PROCEDURES>"; if($j("#list-members").attr("checked")) - reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_LIST_OF_MEMBERS</PUBLIC_DOCUMENTATION>\n"; + reproducibleXml+="<OUR_LIST_OF_MEMBERS>YES</OUR_LIST_OF_MEMBERS>"; + else + reproducibleXml+="<OUR_LIST_OF_MEMBERS>NO</OUR_LIST_OF_MEMBERS>"; if($j("#funding-sources").attr("checked")) - reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_FUNDING_SOURCES</PUBLIC_DOCUMENTATION>\n"; - reproducibleXml+="</WE_PROVIDE_PUBLIC_DOCUMENTATION_ABOUT>\n"; + reproducibleXml+="<OUR_FUNDING_SOURCES>YES</OUR_FUNDING_SOURCES>"; + else + reproducibleXml+="<OUR_FUNDING_SOURCES>NO</OUR_FUNDING_SOURCES>"; + /*reproducibleXml+="<WE_PROVIDE_PUBLIC_DOCUMENTATION_ABOUT>"; + if($j("#organization-structure").attr("checked")) + reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_ORGANIZATION</PUBLIC_DOCUMENTATION>"; + if($j("#internal-procedures").attr("checked")) + reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_INTERNAL_PROCEDURES</PUBLIC_DOCUMENTATION>"; + if($j("#list-members").attr("checked")) + reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_LIST_OF_MEMBERS</PUBLIC_DOCUMENTATION>"; + if($j("#funding-sources").attr("checked")) + reproducibleXml+="<PUBLIC_DOCUMENTATION>OUR_FUNDING_SOURCES</PUBLIC_DOCUMENTATION>"; + reproducibleXml+="</WE_PROVIDE_PUBLIC_DOCUMENTATION_ABOUT>"; + */ }else{ - reproducibleXml="<INITIATIVE_REPRODUCIBLE>NO</INITIATIVE_REPRODUCIBLE>\n"; + reproducibleXml="<INITIATIVE_REPRODUCIBLE>NO</INITIATIVE_REPRODUCIBLE>"; } if($j('#gr-checkbox').val()=='S'){ - grassrootsXml="<INITIATIVE_GRASSROOTS>YES</INITIATIVE_GRASSROOTS>\n"; + grassrootsXml="<INITIATIVE_GRASSROOTS>YES</INITIATIVE_GRASSROOTS>"; if($j("#decisions-general-assemblies").attr("checked")) - grassrootsXml+="<WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>YES</WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>\n"; + grassrootsXml+="<WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>YES</WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>"; else - grassrootsXml+="<WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>NO</WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>\n"; + grassrootsXml+="<WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>NO</WE_TAKE_DECISIONS_MAINLY_THROUGH_GENERAL_ASSEMBLIES>"; if($j("#representatives-democratically").attr("checked")) - grassrootsXml+="<WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>YES</WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>\n"; + grassrootsXml+="<WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>YES</WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>"; else - grassrootsXml+="<WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>NO</WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>\n"; + grassrootsXml+="<WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>NO</WE_HAVE_REPRESENTATIVES_CHOSEN_DEMOCRATICALLY>"; if($j("#decisions-voting").attr("checked")) - grassrootsXml+="<WE_TAKE_DECISIONS_THROUGH>MAJORITY_VOTING</WE_TAKE_DECISIONS_THROUGH>\n"; + grassrootsXml+="<WE_TAKE_DECISIONS_THROUGH>MAJORITY_VOTING</WE_TAKE_DECISIONS_THROUGH>"; else if ($j("#decisions-consensus").attr("checked")) - grassrootsXml+="<WE_TAKE_DECISIONS_THROUGH>CONSENSUS</WE_TAKE_DECISIONS_THROUGH>\n"; + grassrootsXml+="<WE_TAKE_DECISIONS_THROUGH>CONSENSUS</WE_TAKE_DECISIONS_THROUGH>"; }else{ - grassrootsXml="<INITIATIVE_GRASSROOTS>NO</INITIATIVE_GRASSROOTS>\n"; + grassrootsXml="<INITIATIVE_GRASSROOTS>NO</INITIATIVE_GRASSROOTS>"; } if($j('#rc-checkbox').val()=='S'){ - reinforceCommonsXml="<INITIATIVE_REINFORCE_THE_COMMONS>YES</INITIATIVE_REINFORCE_THE_COMMONS>\n"; + reinforceCommonsXml="<INITIATIVE_REINFORCE_THE_COMMONS>YES</INITIATIVE_REINFORCE_THE_COMMONS>"; if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcec60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>NATURE_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>\n"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>NATURE COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcbo60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>BODY_HEALTH_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>\n"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>BODY HEALTH COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else if($j('#mc-form-icon-rc').attr('src')=='/mc/0.1/images/rcto60.png') - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN_COMMUNITY_SOCIETY_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>\n"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>TOWN COMMUNITY SOCIETY_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; else - reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>DIGITAL_COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>\n"; + reinforceCommonsXml+="<MAIN_FOCUS_OF_THE_INITIATIVE>DIGITAL COMMONS</MAIN_FOCUS_OF_THE_INITIATIVE>"; }else{ - reinforceCommonsXml="<INITIATIVE_REINFORCE_THE_COMMONS>NO</INITIATIVE_REINFORCE_THE_COMMONS>\n"; + reinforceCommonsXml="<INITIATIVE_REINFORCE_THE_COMMONS>NO</INITIATIVE_REINFORCE_THE_COMMONS>"; } - xmlDoc = "<INITIATIVE>\n" - +"<NAME>"+xmlReplaceInvalidCharacters($j("#ininame").val())+"</NAME>\n"+ - "<WEB_ADDRESS>"+xmlReplaceInvalidCharacters($j("#url").val())+"</WEB_ADDRESS>\n"+ - "<LANGUAGES>\n"+xmlDynamicTags('LANGUAGE',$j("#languages").val())+"</LANGUAGES>\n"+ - "<KEYWORDS>\n"+xmlDynamicTags('KEYWORD',$j("#keywords").val())+"</KEYWORDS>\n"+ - "<LOCATION>"+xmlReplaceInvalidCharacters($j("#location").val())+"</LOCATION>\n"+ + xmlDoc = "<INITIATIVE>" + +"<NAME>"+xmlReplaceInvalidCharacters($j("#ininame").val())+"</NAME>"+ + "<WEB_ADDRESS>"+xmlReplaceInvalidCharacters($j("#url").val())+"</WEB_ADDRESS>"+ + //"<LANGUAGES>"+xmlDynamicTags('LANGUAGE',$j("#languages").val())+"</LANGUAGES>"+ + "<LANGUAGES>"+commasToPipes('LANGUAGE',$j("#languages").val())+"</LANGUAGES>"+ + //"<KEYWORDS>"+xmlDynamicTags('KEYWORD',$j("#keywords").val())+"</KEYWORDS>"+ + "<KEYWORDS>"+commasToPipes('KEYWORD',$j("#keywords").val())+"</KEYWORDS>"+ + "<LOCATION>"+xmlReplaceInvalidCharacters($j("#location").val())+"</LOCATION>"+ nonProfitXml+ reproducibleXml+ grassrootsXml+ reinforceCommonsXml+ - "</INITIATIVE>"; - alert(xmlDoc); + "</INITIATIVE>"; + + $j.ajax({ + url: "/wp-content/themes/mc/mc2-form-controller.php", + type: "POST", + processData: false, + contentType: "text/xml", + beforeSend: function(){ + //$('#loader').show(); + }, + data: $j.createXML(xmlDoc), + success: function(xmlData) { + alert("Dev msg: Your data has been successfully saved!!"); + } + }); + } $j('#submit_first').click(function(){ Added: trunk/wp-theme/initiatives.txt =================================================================== Added: trunk/wp-theme/mc2-form-controller.php =================================================================== --- trunk/wp-theme/mc2-form-controller.php (rev 0) +++ trunk/wp-theme/mc2-form-controller.php 2013-03-20 04:23:16 UTC (rev 613) @@ -0,0 +1,4 @@ +<?php + + +?> \ No newline at end of file Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-03-15 23:22:33 UTC (rev 612) +++ trunk/wp-theme/mc2-form.php 2013-03-20 04:23:16 UTC (rev 613) @@ -397,6 +397,7 @@ </div> <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><?php _e("Include this code in the web of your collective:", "mc"); ?></div> <textarea style="margin-left: 185px;margin-top: 20px;margin-bottom: 20px;" rows="4" cols="68" onfocus="this.select()" class="mc-icon88x31-code" id="mc-intro-textarea"><div id="move-commons-badge"><div xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:mc="http://movecommons.org/ns#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" about="waveclick.com.sv" typeof="mc:Collective"></div><div property="foaf:name" content="Waveclick"></div><div rel="foaf:homepage" href="waveclick.com.sv"></div><div rel="mc:moveCommonsType" resource="[mc:NonProfit]"></div><div rel="mc:moveCommonsType" resource="[mc:Reproducible]"></div><div rel="mc:moveCommonsType" resource="[mc:ReinforcesOtherAims]"></div><div rel="mc:moveCommonsType" resource="[mc:Representative]"></div><div about="#dd" typeof="skos:Concept"></div><div about="#dd" typeof="skos:Concept"></div><a href="http://movecommons.org/en/np-rp-ro-rs/0.1/"><img src="http://movecommons.org/mc/0.1/images/np-rp-ro-rs-88x31-0.1.png" alt="Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative" /></a><p>Move Commons Non-Profit, Reproducible, Reinforcing Other Aims, Representative</p></div></textarea> + <div class="label2" style="margin-left: 185px;float: left;font-size: 14px;"><a href="http://movecommons.org/wp-content/themes/mc/initiatives.txt">Click here to download the CVS file.</a></div> <div> <button class="submit buttonp" style="left: 710px;" type="submit" name="p_submit_sixth" id="p_submit_sixth"><?php _e("Previous", "mc"); ?></button> </div>

1 0