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

r598 - trunk/wp-theme
by Samer . 22 Jan '13

22 Jan '13

Author: shevek Date: 2013-01-22 18:52:21 +0100 (Tue, 22 Jan 2013) New Revision: 598 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-22 17:48:38 UTC (rev 597) +++ trunk/wp-theme/mc2-form.php 2013-01-22 17:52:21 UTC (rev 598) @@ -174,7 +174,7 @@ <div id="mc-form-optional-reproducible" style="width: 500px;">  <div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> - <label id="mc-optional-reproducible" style="color: #444;background-color: #F9F9F9;"><?php _e("Tick what applies (optional):", "mc"); ?></label> + <label id="mc-optional-reproducible" style="color: #444;background-color: #FEFBFD;"><?php _e("Tick what applies (optional):", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use" disabled="disabled"/> <?php _e("We have Terms of Use of our contents", "mc"); ?> @@ -269,7 +269,7 @@ <div id="mc-form-optional-grassroots" style="width: 500px;">  <div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 45px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-grassroots" style="color: #444;background-color: #F9F9F9;"><?php _e("Tick what applies (optional):", "mc"); ?></label> + <label id="mc-optional-grassroots" style="color: #444;background-color: #FEFBFD;"><?php _e("Tick what applies (optional):", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies" tabindex="22" disabled="disabled"/> <?php _e("We take decisions mainly through general assemblies", "mc"); ?>

1 0

r597 - trunk/wp-theme
by Samer . 22 Jan '13

22 Jan '13

Author: shevek Date: 2013-01-22 18:48:38 +0100 (Tue, 22 Jan 2013) New Revision: 597 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-22 14:47:50 UTC (rev 596) +++ trunk/wp-theme/mc2-form.php 2013-01-22 17:48:38 UTC (rev 597) @@ -174,7 +174,7 @@ <div id="mc-form-optional-reproducible" style="width: 500px;">  <div class="blockMe2" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;margin-bottom: 20px;"> - <label id="mc-optional-reproducible" style="color: #444;background-color: #F9F9F9;"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-reproducible" style="color: #444;background-color: #F9F9F9;"><?php _e("Tick what applies (optional):", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="terms-of-use" value="S" id="terms-of-use" disabled="disabled"/> <?php _e("We have Terms of Use of our contents", "mc"); ?> @@ -269,7 +269,7 @@ <div id="mc-form-optional-grassroots" style="width: 500px;">  <div class="blockMe4" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 45px;border: 1px solid #B7C4C8;"> - <label id="mc-optional-grassroots" style="color: #444;background-color: #F9F9F9;"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-grassroots" style="color: #444;background-color: #F9F9F9;"><?php _e("Tick what applies (optional):", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="decisions-general-assemblies" value="S" id="decisions-general-assemblies" tabindex="22" disabled="disabled"/> <?php _e("We take decisions mainly through general assemblies", "mc"); ?>

1 0

r596 - in trunk: . wp-theme
by Samer . 22 Jan '13

22 Jan '13

Author: shevek Date: 2013-01-22 15:47:50 +0100 (Tue, 22 Jan 2013) New Revision: 596 Modified: trunk/DEV_GUIDE trunk/wp-theme/mc2-form.php Log: Modified: trunk/DEV_GUIDE =================================================================== --- trunk/DEV_GUIDE 2013-01-21 19:37:31 UTC (rev 595) +++ trunk/DEV_GUIDE 2013-01-22 14:47:50 UTC (rev 596) @@ -1,5 +1,5 @@ * Move Commons Developer's Guide -NOTE: This document is best viewed with GNU Emacs Org-mode +NOTE: This document is best viewed with GNU Emacs Org-mode (open with Emacs, Alt+X org-mode) This is the Move Commons (MC) guide for developers. Move Commons is a simple tool for connecting potential volunteers and contributors to initiatives, collectives and NGOs. Check http://movecommons.org for more information. Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-21 19:37:31 UTC (rev 595) +++ trunk/wp-theme/mc2-form.php 2013-01-22 14:47:50 UTC (rev 596) @@ -101,7 +101,7 @@ <div id="mc-form-optional-non-profit" style="width: 500px;">  <div class="blockMe1" style="position: relative;float: left;width: 440px;font-size: 16px;margin-left: 10px;margin-top: 30px;border: 1px solid #B7C4C8;padding-bottom: 10px;"> - <label id="mc-optional-non-profit" style="color: #444;background-color: #FEFBFD;"><?php _e("Optional", "mc"); ?></label> + <label id="mc-optional-non-profit" style="color: #444;background-color: #FEFBFD;"><?php _e("Tick what applies (optional):", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit" disabled="disabled"/> <?php _e("We are officially registered", "mc"); ?>

1 0

r595 - trunk/wp-theme
by Samer . 21 Jan '13

21 Jan '13

Author: shevek Date: 2013-01-21 20:37:31 +0100 (Mon, 21 Jan 2013) New Revision: 595 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-21 18:23:13 UTC (rev 594) +++ trunk/wp-theme/mc2-form.php 2013-01-21 19:37:31 UTC (rev 595) @@ -45,15 +45,15 @@ --> <div class="form"> <input type="text" name="ininame" value="Name of your initiative" id="ininame" class="firstStepInput"/> - <label for="ininame"><span class="required-field">*</span><?php _e("Name of your initiative or collective", "mc"); ?></label> + <label for="ininame"><span class="required-field">*</span><?php _e("Name of your initiative, project, collective or organization", "mc"); ?></label> <input type="text" name="url" value="Web address" id="url" class="firstStepInput"/> - <label for="url"><span class="required-field">*</span><?php _e("Something like http://example.com", "mc"); ?></label> + <label for="url"><span class="required-field">*</span><?php _e("Something such as http://example.com", "mc"); ?></label> <input type="hidden" name="languages" id="languages" class="firstStepInput"/> - <label for="languages"><?php _e("Pendiente texto descriptivo... (press enter or comma to separate)", "mc"); ?></label> + <label for="languages"><?php _e("The languages that you use in your initiative (press enter or comma after each of them)", "mc"); ?></label> <input type="hidden" name="keywords" id="keywords"/> - <label for="keywords"><?php _e("keywords that define your project, for example: health, education, etc (press enter or comma to separate).", "mc"); ?></label> + <label for="keywords"><?php _e("Keywords that define your initiative, for example: education, children, etc (press enter or comma after each of them).", "mc"); ?></label> <input type="text" name="location" value="Location" id="location" class="firstStepInput"/> - <label for="location"><span class="required-field">*</span><?php _e("Pendiente texto descriptivo...", "mc"); ?></label> + <label for="location"><span class="required-field">*</span><?php _e("Main location where the initiative is located (city, region, country, etc)", "mc"); ?></label> </div> <div class="clear"></div> <button class="submit buttonn" type="submit" name="submit_first" id="submit_first" onblur="$j('#ininame').focus();"><?php _e("Next", "mc"); ?></button>

1 0

r594 - trunk
by Samer . 21 Jan '13

21 Jan '13

Author: shevek Date: 2013-01-21 19:23:13 +0100 (Mon, 21 Jan 2013) New Revision: 594 Removed: trunk/README Log: Deleted README after inclusion in DEV-GUIDE Deleted: trunk/README =================================================================== --- trunk/README 2013-01-21 18:22:23 UTC (rev 593) +++ trunk/README 2013-01-21 18:23:13 UTC (rev 594) @@ -1,29 +0,0 @@ -=README= - -==Deployment instructions== - -For deployment you will need fabric: - apt-get install fabric - -If your ourproject user is different for your system user put 'user = your-op-user' (without the quotes) in the file ~/.fabricrc - -And after some changes in the repo do something like: - fab deploy -to commit and update the MC website. - -For other options: - fab --list - -==Development instructions== - -The svn info is here: -http://ourproject.org/scm/?group_id=981 - -==i18n instructions== - -Translate with gettext tools wp-theme/languages/ - -If we need to generate the pots again (if we update our php file strings): - php makepot.php wp-theme . languages/mc.pot -makepot.php is here http://svn.automattic.com/wordpress-i18n/tools/trunk/ -

1 0

r593 - trunk
by Samer . 21 Jan '13

21 Jan '13

Author: shevek Date: 2013-01-21 19:22:23 +0100 (Mon, 21 Jan 2013) New Revision: 593 Added: trunk/DEV_GUIDE Log: Created DEV_GUIDE for MC, including README contents Added: trunk/DEV_GUIDE =================================================================== --- trunk/DEV_GUIDE (rev 0) +++ trunk/DEV_GUIDE 2013-01-21 18:22:23 UTC (rev 593) @@ -0,0 +1,63 @@ +* Move Commons Developer's Guide +NOTE: This document is best viewed with GNU Emacs Org-mode + +This is the Move Commons (MC) guide for developers. Move Commons is a simple tool for connecting potential volunteers and contributors to initiatives, collectives and NGOs. Check http://movecommons.org for more information. + +** General info +The community uses this SVN repository: +https://ourproject.org/scm/?group_id=981 +and this Redmine as Bug Tracking System: +http://redmine.ourproject.org/projects/movecommons/ + + +** Directory Structure +- movecommons/trunk (from now on "trunk") is the main tree +- trunk/audio contains audio for creating a video for MC: http://blip.tv/jpzafra/move-commons-for-humans-5578148 based on this old presentation: http://prezi.com/m2tim3hsyddh/move-commons/ +- trunk/gwt contains the deprecated draft of a form in GWT for integration in Kune (http://kune.ourproject.org) +- trunk/images contains images used for the video and presentations of MC +- trunk/src contains the source code of the MC form, the MC donate form, and other related source code for MC +- trunk/utils contains utilities related to the MC webpage +- trunk/wp-theme contains the Wordpress Theme used in the MC webpage (http://movecommons.org) + + +** Form development +The old form of MC is +http://movecommons.org/preview/ +The development version of the new form: +http://movecommons.org/test-form2/ + +trunk/src includes the source code of the old form and the new form. + +For modifications of the new form, focus on: +- trunk/src/mc-dia-form2.css +- trunk/src/mc-dia-form2.js +- trunk/wp-theme/mc2-form.php +It uses JQuery JS/CSS and images from trunk/src/images. + + +** Deployment instructions +For deployment you will need fabric: + apt-get install fabric + +If your ourproject-user is different for your system user, you should include 'user = your-op-user' (without the quotes) in the file ~/.fabricrc (create it if it doesn't exist). + +After performing changes in the repository, you should do something like: + fab deploy +to commit and update the MC website. + +For other options: + fab --list + +NOTE: After changes in the JavaScript, the "fab deploy" correctly deploys the source, but the wordpress website does not show correctly the new JS (it will show the old JS, before the deploy). This is due to the caching of the browser and of the wordpress site. In order to fix this, please delete your browser cache and log-in to the wordpress website, so the cache is not used. Afterwards, the correct last version will be shown. + + +** i18n instructions +Please translate with gettext tools. For the wordpress website http://movecommons.org, use: + trunk/wp-theme/languages/ + +If we need to generate the pots again (if we update our php file strings): + php makepot.php wp-theme . languages/mc.pot +makepot.php is here http://svn.automattic.com/wordpress-i18n/tools/trunk/ + +Concerning the form translation, check + trunk/wp-theme/mc-languages/

1 0

r592 - trunk
by Samer . 20 Jan '13

20 Jan '13

Author: shevek Date: 2013-01-20 19:42:12 +0100 (Sun, 20 Jan 2013) New Revision: 592 Modified: trunk/README Log: Modified: trunk/README =================================================================== --- trunk/README 2013-01-20 18:38:21 UTC (rev 591) +++ trunk/README 2013-01-20 18:42:12 UTC (rev 592) @@ -5,7 +5,7 @@ For deployment you will need fabric: apt-get install fabric -If your ourproject user is different for your system user put 'user = your-op-user' in the file ~/.fabricrc +If your ourproject user is different for your system user put 'user = your-op-user' (without the quotes) in the file ~/.fabricrc And after some changes in the repo do something like: fab deploy

1 0

r591 - in trunk: src wp-theme
by Samer . 20 Jan '13

20 Jan '13

Author: shevek Date: 2013-01-20 19:38:21 +0100 (Sun, 20 Jan 2013) New Revision: 591 Modified: trunk/src/mc-dia-form2.js trunk/wp-theme/mc2-form.php Log: Fixes subcategories of RP, including id names Modified: trunk/src/mc-dia-form2.js =================================================================== --- trunk/src/mc-dia-form2.js 2013-01-20 18:14:44 UTC (rev 590) +++ trunk/src/mc-dia-form2.js 2013-01-20 18:38:21 UTC (rev 591) @@ -27,9 +27,9 @@ $("#creative-commons").removeAttr("disabled"); $("#other-license").removeAttr("disabled"); $("#organization-structure").removeAttr("disabled"); - $("#projects-and-results").removeAttr("disabled"); - $("#methods-procedures").removeAttr("disabled"); - $("#documentation").removeAttr("disabled"); + $("#internal-procedures").removeAttr("disabled"); + $("#list-members").removeAttr("disabled"); + $("#funding-sources").removeAttr("disabled"); $j("#mc-form-optional-reproducible").effect("shake", { times:1 }, 200); } if(id=='gr'){ @@ -70,12 +70,12 @@ $('#other-license').attr('checked', false); $("#organization-structure").attr("disabled", "disabled"); $('#organization-structure').attr('checked', false); - $("#projects-and-results").attr("disabled", "disabled"); - $('#projects-and-results').attr('checked', false); - $("#methods-procedures").attr("disabled", "disabled"); - $('#methods-procedures').attr('checked', false); - $("#documentation").attr("disabled", "disabled"); - $('#documentation').attr('checked', false); + $("#internal-procedures").attr("disabled", "disabled"); + $('#internal-procedures').attr('checked', false); + $("#list-members").attr("disabled", "disabled"); + $('#list-members').attr('checked', false); + $("#funding-sources").attr("disabled", "disabled"); + $('#funding-sources').attr('checked', false); $j('#terms-of-use-website').hide(); $j('#infield-terms-of-use-website').hide(); $j('#creative-commons-website').hide(); Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-20 18:14:44 UTC (rev 590) +++ trunk/wp-theme/mc2-form.php 2013-01-20 18:38:21 UTC (rev 591) @@ -204,15 +204,15 @@ <?php _e("Our organization", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" disabled="disabled"/> + <input type="checkbox" name="internal-procedures" value="S" id="internal-procedures" disabled="disabled"/> <?php _e("Our internal procedures", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" disabled="disabled"/> + <input type="checkbox" name="list-members" value="S" id="list-members" disabled="disabled"/> <?php _e("Our list of members", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> - <input type="checkbox" name="documentation" value="S" id="documentation" disabled="disabled"/> + <input type="checkbox" name="funding-sources" value="S" id="funding-sources" disabled="disabled"/> <?php _e("Our funding sources", "mc"); ?> </label> </div>

1 0

r590 - trunk/wp-theme
by Samer . 20 Jan '13

20 Jan '13

Author: shevek Date: 2013-01-20 19:14:44 +0100 (Sun, 20 Jan 2013) New Revision: 590 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2013-01-20 16:40:10 UTC (rev 589) +++ trunk/wp-theme/mc2-form.php 2013-01-20 18:14:44 UTC (rev 590) @@ -197,23 +197,23 @@ <label id="infield-other-license-website" for="other-license-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> <input type="text" name="other-license-website" value="" id="other-license-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;" > <label class="optional-labels-fields"> - <?php _e("We have documentation about:", "mc"); ?> + <?php _e("We provide public documentation about:", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="organization-structure" value="S" id="organization-structure" disabled="disabled"/> - <?php _e("Organization structure", "mc"); ?> + <?php _e("Our organization", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="projects-and-results" value="S" id="projects-and-results" disabled="disabled"/> - <?php _e("Projects and results", "mc"); ?> + <?php _e("Our internal procedures", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="methods-procedures" value="S" id="methods-procedures" disabled="disabled"/> - <?php _e("Methods / Procedures", "mc"); ?> + <?php _e("Our list of members", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="documentation" value="S" id="documentation" disabled="disabled"/> - <?php _e("Documentation", "mc"); ?> + <?php _e("Our funding sources", "mc"); ?> </label> </div> </div>

1 0

r589 - trunk/wp-theme
by Samer . 20 Jan '13

20 Jan '13

Author: shevek Date: 2013-01-20 17:40:10 +0100 (Sun, 20 Jan 2013) New Revision: 589 Modified: trunk/wp-theme/mc2-form.php Log: Fixes in the form subcategories Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-12-13 18:00:47 UTC (rev 588) +++ trunk/wp-theme/mc2-form.php 2013-01-20 16:40:10 UTC (rev 589) @@ -104,7 +104,7 @@ <label id="mc-optional-non-profit" style="color: #444;background-color: #FEFBFD;"><?php _e("Optional", "mc"); ?></label> <label class="optional-labels-fields"> <input type="checkbox" name="registered-non-profit" value="S" id="registered-non-profit" disabled="disabled"/> - <?php _e("We are registered as Non-profit", "mc"); ?> + <?php _e("We are officially registered", "mc"); ?> </label> <label id="infield-non-profit-website" for="non-profit-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> <input type="text" name="non-profit-website" value="" id="non-profit-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;"> @@ -197,7 +197,7 @@ <label id="infield-other-license-website" for="other-license-website" style="position: absolute;display: none;margin: 8px 5px 5px 50px;padding: 0;font-size: 14px;"><?php _e("Check this website: http://example.com", "mc"); ?></label> <input type="text" name="other-license-website" value="" id="other-license-website" style="width: 330px;margin-left: 42px;margin-top: 5px;display: none;" > <label class="optional-labels-fields"> - <?php _e("We share:", "mc"); ?> + <?php _e("We have documentation about:", "mc"); ?> </label> <label class="optional-labels-fields" style="margin-left: 30px;"> <input type="checkbox" name="organization-structure" value="S" id="organization-structure" disabled="disabled"/> @@ -479,4 +479,4 @@ $j('#progress').css('width','0'); $j('#progress_text').html('0% Complete'); }); -</script> \ No newline at end of file +</script>

1 0