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

r161 - trunk/wp-theme
by Mario Gallegos 11 Mar '12

11 Mar '12

Author: mgallegos Date: 2012-03-11 15:03:57 +0100 (Sun, 11 Mar 2012) New Revision: 161 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-11 13:55:57 UTC (rev 160) +++ trunk/wp-theme/mc2-form.php 2012-03-11 14:03:57 UTC (rev 161) @@ -37,11 +37,16 @@ <div id="mc-form-optional-boxes"> <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Choose your ...", "mc"); ?></label> - <div id="format"> + <div id="format" style="margin-top: 2em;"> + <input type="checkbox" id="check1" /><label for="check1">N</label> + <input type="checkbox" id="check2" /><label for="check2">R</label> + <input type="checkbox" id="check3" /><label for="check3">G</label> +  </div> </div> </div> @@ -53,6 +58,13 @@ </div> <div class="mc-clean"></div> + <div id="format2" style="margin-top: 2em;"> + <input type="checkbox" id="check5" /><label for="check1">Non-Profit</label> + <input type="checkbox" id="check6" /><label for="check2">Reproducible</label> + <input type="checkbox" id="check7" /><label for="check3">Grassroots</label> + <input type="checkbox" id="check8" /><label for="check4">Reinforcing the Commons</label> + </div> + <!-- <div class="mc-cat-group-a" id="mc-cat-group-a"> <div class="mc-form-rounded mc-form-category-group mc-form-category-group-a float-left mc-form-category-group-aa" id="mc-form-category-group-aa"> @@ -194,4 +206,5 @@ $j('#languages').tagsInput({width:'415px',defaultText:'Add a language'}); $j('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); $j( "#format" ).buttonset(); + $j( "#format2" ).buttonset(); </script> \ No newline at end of file

1 0

r160 - trunk/wp-theme
by Mario Gallegos 11 Mar '12

11 Mar '12

Author: mgallegos Date: 2012-03-11 14:55:57 +0100 (Sun, 11 Mar 2012) New Revision: 160 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-11 13:53:19 UTC (rev 159) +++ trunk/wp-theme/mc2-form.php 2012-03-11 13:55:57 UTC (rev 160) @@ -45,7 +45,6 @@ </div> </div> </div> - <div class="mc-clean"></div> <div class="mc-form-optional-info" id="mc-form-optional-location"> <div class="label"> <label id="mc-optional-title"><?php _e("Location", "mc"); ?></label>

1 0

r159 - trunk/wp-theme
by Mario Gallegos 11 Mar '12

11 Mar '12

Author: mgallegos Date: 2012-03-11 14:53:19 +0100 (Sun, 11 Mar 2012) New Revision: 159 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 23:44:16 UTC (rev 158) +++ trunk/wp-theme/mc2-form.php 2012-03-11 13:53:19 UTC (rev 159) @@ -34,6 +34,18 @@ <input type="text" name="keywords" value="" id="keywords" /> </div> </div> + <div id="mc-form-optional-boxes"> + <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> + <label id="mc-optional-title"><?php _e("Choose your ...", "mc"); ?></label> + <div id="format"> + <input type="checkbox" id="check1" /><label for="check1">Non-Profit</label> + <input type="checkbox" id="check2" /><label for="check2">Reproducible</label> + <input type="checkbox" id="check3" /><label for="check3">Grassroots</label> + <input type="checkbox" id="check4" /><label for="check4">Reinforcing the Commons</label> + </div> + </div> + </div> + <div class="mc-clean"></div> <div class="mc-form-optional-info" id="mc-form-optional-location"> <div class="label"> <label id="mc-optional-title"><?php _e("Location", "mc"); ?></label> @@ -41,6 +53,8 @@ </div> </div> <div class="mc-clean"></div> + +  <div class="mc-dia-continue-btn" id="mc-dia-continue-btn"><?php _e("Continue", "mc"); ?></div> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script> <script type="text/javascript" src="/mc/0.1/jquery.tagsinput.min.js"></script> @@ -179,4 +194,5 @@ <script type="text/javascript"> $j('#languages').tagsInput({width:'415px',defaultText:'Add a language'}); $j('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); + $j( "#format" ).buttonset(); </script> \ No newline at end of file

1 0

r158 - trunk/wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-08 00:44:16 +0100 (Thu, 08 Mar 2012) New Revision: 158 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 23:29:57 UTC (rev 157) +++ trunk/wp-theme/mc2-form.php 2012-03-07 23:44:16 UTC (rev 158) @@ -21,19 +21,25 @@ </div> <div id="mc-form-optional-keywords"> <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> - <label id="mc-optional-title"><?php _e("Language(s) (press tab or comma to separate)", "mc"); ?></label> + <label id="mc-optional-title"><?php _e("Language(s) (press enter or comma to separate)", "mc"); ?></label> <input type="text" name="languages" value="" id="languages" /> </div> </div> <div id="mc-form-optional-keywords"> <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> - <label id="mc-optional-title"><?php _e("Keywords (press tab or comma to separate)", "mc"); ?></label> + <label id="mc-optional-title"><?php _e("Keywords (press enter or comma to separate)", "mc"); ?></label>  <input type="text" name="keywords" value="" id="keywords" /> </div> - </div> + </div> + <div class="mc-form-optional-info" id="mc-form-optional-location"> + <div class="label"> + <label id="mc-optional-title"><?php _e("Location", "mc"); ?></label> + <input type="text" name="location" value="" id="location" /> + </div> + </div> <div class="mc-clean"></div> <div class="mc-cat-group-a" id="mc-cat-group-a"> <div class="mc-form-rounded mc-form-category-group mc-form-category-group-a float-left mc-form-category-group-aa" id="mc-form-category-group-aa">

1 0

r157 - in trunk: src wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-08 00:29:57 +0100 (Thu, 08 Mar 2012) New Revision: 157 Modified: trunk/src/jquery.tagsinput.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/jquery.tagsinput.css =================================================================== --- trunk/src/jquery.tagsinput.css 2012-03-07 23:15:47 UTC (rev 156) +++ trunk/src/jquery.tagsinput.css 2012-03-07 23:29:57 UTC (rev 157) @@ -1,7 +1,7 @@ -div.tagsinput { border:1px solid #B7C4C8; background: #FFF; padding:5px; width:415px; height:100px; overflow-y: auto;} +div.tagsinput { margin-bottom: 10px;border:1px solid #B7C4C8; background: #FFF; padding:5px; width:415px; height:100px; overflow-y: auto;} div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;} div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; } -div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; } +div.tagsinput input { width:115px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; } div.tagsinput div { display:block; float: left; } .tags_clear { clear: both; width: 100%; height: 0px; } .not_valid {background: #FBD8DB !important; color: #90111A !important;} Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 23:15:47 UTC (rev 156) +++ trunk/wp-theme/mc2-form.php 2012-03-07 23:29:57 UTC (rev 157) @@ -28,7 +28,9 @@ <div id="mc-form-optional-keywords"> <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Keywords (press tab or comma to separate)", "mc"); ?></label> +  <input type="text" name="keywords" value="" id="keywords" /> </div> </div> @@ -169,6 +171,6 @@ <script type="text/javascript" src="/mc/0.1/mc-dia-form.js"></script> <script type="text/javascript"> - $j('#languages').tagsInput({width:'415px',defaultText:'Add a new language'}); - $j('#keywords').tagsInput({width:'415px',defaultText:'Add a new keyword'}); + $j('#languages').tagsInput({width:'415px',defaultText:'Add a language'}); + $j('#keywords').tagsInput({width:'415px',defaultText:'Add a keyword'}); </script> \ No newline at end of file

1 0

r156 - trunk/wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-08 00:15:47 +0100 (Thu, 08 Mar 2012) New Revision: 156 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 23:01:23 UTC (rev 155) +++ trunk/wp-theme/mc2-form.php 2012-03-07 23:15:47 UTC (rev 156) @@ -25,8 +25,8 @@ <input type="text" name="languages" value="" id="languages" /> </div> </div> - <div class="mc-form-optional-info" id="mc-form-optional-keywords"> - <div class="label"> + <div id="mc-form-optional-keywords"> + <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Keywords (press tab or comma to separate)", "mc"); ?></label> <label class="pre" for="keywords"><?php _e("for ex: health, education, etc", "mc"); ?></label> <input type="text" name="keywords" value="" id="keywords" /> @@ -169,6 +169,6 @@ <script type="text/javascript" src="/mc/0.1/mc-dia-form.js"></script> <script type="text/javascript"> - $j('#languages').tagsInput({width:'415px'}); - $j('#keywords').tagsInput({width:'415px'}); + $j('#languages').tagsInput({width:'415px',defaultText:'Add a new language'}); + $j('#keywords').tagsInput({width:'415px',defaultText:'Add a new keyword'}); </script> \ No newline at end of file

1 0

r155 - trunk/wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-08 00:01:23 +0100 (Thu, 08 Mar 2012) New Revision: 155 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 22:17:58 UTC (rev 154) +++ trunk/wp-theme/mc2-form.php 2012-03-07 23:01:23 UTC (rev 155) @@ -19,8 +19,8 @@ <input type="text" name="url" value="" id="url" /> </div> </div> - <div class="mc-form-optional-info" id="mc-form-optional-keywords"> - <div class="label"> + <div id="mc-form-optional-keywords"> + <div style="position: relative;float: left;width: 420px;font-size: 16px;margin-right:23px;margin-top: 20px;"> <label id="mc-optional-title"><?php _e("Language(s) (press tab or comma to separate)", "mc"); ?></label> <input type="text" name="languages" value="" id="languages" /> </div>

1 0

r154 - trunk/wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-07 23:17:58 +0100 (Wed, 07 Mar 2012) New Revision: 154 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 22:15:19 UTC (rev 153) +++ trunk/wp-theme/mc2-form.php 2012-03-07 22:17:58 UTC (rev 154) @@ -31,10 +31,8 @@ <label class="pre" for="keywords"><?php _e("for ex: health, education, etc", "mc"); ?></label> <input type="text" name="keywords" value="" id="keywords" /> </div> - </div> -  <div class="mc-cat-group-a" id="mc-cat-group-a"> <div class="mc-form-rounded mc-form-category-group mc-form-category-group-a float-left mc-form-category-group-aa" id="mc-form-category-group-aa"> <img src="/mc/0.1/images/step1.png" alt="step1" class="mc-steps-number" />

1 0

r153 - in trunk: src wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-07 23:15:19 +0100 (Wed, 07 Mar 2012) New Revision: 153 Modified: trunk/src/jquery.tagsinput.css trunk/wp-theme/mc2-form.php Log: Modified: trunk/src/jquery.tagsinput.css =================================================================== --- trunk/src/jquery.tagsinput.css 2012-03-07 15:45:35 UTC (rev 152) +++ trunk/src/jquery.tagsinput.css 2012-03-07 22:15:19 UTC (rev 153) @@ -1,4 +1,4 @@ -div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;} +div.tagsinput { border:1px solid #B7C4C8; background: #FFF; padding:5px; width:415px; height:100px; overflow-y: auto;} div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;} div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; } div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; } Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 15:45:35 UTC (rev 152) +++ trunk/wp-theme/mc2-form.php 2012-03-07 22:15:19 UTC (rev 153) @@ -171,5 +171,6 @@ <script type="text/javascript" src="/mc/0.1/mc-dia-form.js"></script> <script type="text/javascript"> - $j('#languages').tagsInput({width:'auto'}); + $j('#languages').tagsInput({width:'415px'}); + $j('#keywords').tagsInput({width:'415px'}); </script> \ No newline at end of file

1 0

r152 - trunk/wp-theme
by Mario Gallegos 07 Mar '12

07 Mar '12

Author: mgallegos Date: 2012-03-07 16:45:35 +0100 (Wed, 07 Mar 2012) New Revision: 152 Modified: trunk/wp-theme/mc2-form.php Log: Modified: trunk/wp-theme/mc2-form.php =================================================================== --- trunk/wp-theme/mc2-form.php 2012-03-07 15:39:40 UTC (rev 151) +++ trunk/wp-theme/mc2-form.php 2012-03-07 15:45:35 UTC (rev 152) @@ -171,5 +171,5 @@ <script type="text/javascript" src="/mc/0.1/mc-dia-form.js"></script> <script type="text/javascript"> - $('#languages').tagsInput({width:'auto'}); + $j('#languages').tagsInput({width:'auto'}); </script> \ No newline at end of file

1 0