Changeset 1445676
- Timestamp:
- 06/29/2016 11:52:47 AM (10 years ago)
- Location:
- oxford-debate
- Files:
-
- 2 added
- 3 deleted
- 5 edited
- 17 copied
-
tags/2.0.1 (copied) (copied from oxford-debate/trunk)
-
tags/2.0.1/assets/datetimepicker-master (copied) (copied from oxford-debate/trunk/assets/datetimepicker-master)
-
tags/2.0.1/assets/screenshot-1.png (copied) (copied from oxford-debate/trunk/assets/screenshot-1.png)
-
tags/2.0.1/css/bootstrap.min.css (deleted)
-
tags/2.0.1/css/grid12.css (added)
-
tags/2.0.1/css/style.css (copied) (copied from oxford-debate/trunk/css/style.css) (3 diffs)
-
tags/2.0.1/img (copied) (copied from oxford-debate/trunk/img)
-
tags/2.0.1/js/admin.js (copied) (copied from oxford-debate/trunk/js/admin.js)
-
tags/2.0.1/js/scripts.js (copied) (copied from oxford-debate/trunk/js/scripts.js)
-
tags/2.0.1/languages/oxd-es_ES.mo (copied) (copied from oxford-debate/trunk/languages/oxd-es_ES.mo)
-
tags/2.0.1/languages/oxd-es_ES.po (copied) (copied from oxford-debate/trunk/languages/oxd-es_ES.po)
-
tags/2.0.1/oxd-settings.php (copied) (copied from oxford-debate/trunk/oxd-settings.php)
-
tags/2.0.1/oxd.php (copied) (copied from oxford-debate/trunk/oxd.php) (6 diffs)
-
tags/2.0.1/readme.txt (copied) (copied from oxford-debate/trunk/readme.txt) (5 diffs)
-
tags/2.0.1/services (copied) (copied from oxford-debate/trunk/services)
-
tags/2.0.1/templates/comments-debate.php (copied) (copied from oxford-debate/trunk/templates/comments-debate.php) (2 diffs)
-
tags/2.0.1/templates/single-debate.php (copied) (copied from oxford-debate/trunk/templates/single-debate.php) (2 diffs)
-
tags/2.0.1/vote-process.php (copied) (copied from oxford-debate/trunk/vote-process.php)
-
tags/2.0.1/vote-update.php (copied) (copied from oxford-debate/trunk/vote-update.php)
-
trunk/css/bootstrap.min.css (deleted)
-
trunk/css/grid12.css (added)
-
trunk/css/style.css (modified) (3 diffs)
-
trunk/js/bootstrap.min.js (deleted)
-
trunk/oxd.php (modified) (6 diffs)
-
trunk/readme.txt (modified) (5 diffs)
-
trunk/templates/comments-debate.php (modified) (2 diffs)
-
trunk/templates/single-debate.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
oxford-debate/tags/2.0.1/css/style.css
r1445169 r1445676 11 11 } 12 12 #debate-section {margin-bottom: 10px;} 13 #postures-section {margin-bottom: 50px; }13 #postures-section {margin-bottom: 50px; padding-left: 0; padding-right: 0} 14 14 #votes-section {margin-bottom: 10px;} 15 15 #votes-title {font-weight: bold;text-transform: uppercase;} … … 74 74 background-color: white; 75 75 } 76 #postures-contents .row { 77 z-index: 1; 78 } 76 79 #postures-container-a {float: left; padding-right: 10px;} 77 80 #postures-container-b {float: right; padding-left: 10px;} … … 106 109 background-color: #333; 107 110 color: white; 111 padding: 6px 12px; 108 112 } 109 113 #vote-button-a a, #vote-button-b a, #vote-a a, #vote-b a { -
oxford-debate/tags/2.0.1/oxd.php
r1445163 r1445676 7 7 * the capabilities of both speakers and audience. The speakers may argue using web connectivity and multimedia, 8 8 * and the audience can also comment fixing its position on the proposals of the speakers or raising their own alternatives. 9 * Version: 2.0. 09 * Version: 2.0.1 10 10 * Author: Rafa Fernandez 11 11 * Author URI: http://cws-tech.com … … 98 98 //register our settings 99 99 register_setting( 'oxd-registration', 'key' ); 100 register_setting( 'oxd-settings-group', 'oxd_bootstrap' );101 100 102 101 } … … 218 217 function oxd_admin_page(){ 219 218 ?> 220 <div class="wrap">219 221 220 222 221 <form method="post" action="options.php"> 223 222 <?php settings_fields( 'oxd-registration' ); ?> 224 223 <?php do_settings_sections( 'oxd-registration' ); ?> 224 <div class="wrap"> 225 225 <table class="form-table"> 226 226 <tr valign="top"> … … 238 238 <?php submit_button(); ?> 239 239 240 </form>240 241 241 </div> 242 </form> 242 243 243 244 <div class="wrap"> … … 246 247 <?php settings_fields( 'oxd-settings-group' ); ?> 247 248 <?php do_settings_sections( 'oxd-settings-group' ); ?> 248 <table class="form-table">249 250 <tr valign="top">251 <th scope="row"><?php _e('Let the plugin load Bootstrap','oxd'); ?></th>252 <td>253 <select name="oxd_bootstrap" id="oxd_bootstrap">254 255 <?php if (get_option('oxd_bootstrap') == yes) { ?>256 <option value="yes" selected><?php _e('Yes','oxd'); ?></option>257 <option value="no"><?php _e('No','oxd'); ?></option>258 <?php } else { ?>259 <option value="yes"><?php _e('Yes','oxd'); ?></option>260 <option value="no" selected><?php _e('No','oxd'); ?></option>261 262 <?php } ?>263 264 </select>265 </td>266 267 </tr>268 269 270 </table>271 272 249 <?php submit_button(); ?> 273 250 … … 564 541 565 542 function enqueue_scripts() { 566 567 568 wp_enqueue_script( 'scripts', plugins_url( '/js/scripts.js', __FILE__ ), array('jquery','wp-color-picker'), '1.0', true); 569 if (get_option('oxd_bootstrap') == yes) { 570 wp_enqueue_script( 'bootstrap', plugins_url( '/js/bootstrap.min.js', __FILE__ ), array('jquery'), '1.0', true); 571 } 543 wp_enqueue_script( 'scripts', plugins_url( '/js/scripts.js', __FILE__ ), array('jquery','wp-color-picker'), '1.0', true); 544 } 545 546 function enqueue_styles() { 547 548 549 550 wp_register_style( 'register-style', plugins_url( '/oxford-debate/css/style.css' ) ); 551 wp_register_style( 'register-grid', plugins_url( '/oxford-debate/css/grid12.css' ) ); 552 wp_enqueue_style( 'register-style' ); 553 wp_enqueue_style( 'wp-color-picker' ); 554 wp_enqueue_style( 'register-grid' ); 572 555 573 574 }575 576 function enqueue_styles() {577 578 579 580 wp_register_style( 'register-style', plugins_url( '/oxford-debate/css/style.css' ) );581 wp_register_style( 'register-bootstrap', plugins_url( '/oxford-debate/css/bootstrap.min.css' ) );582 wp_enqueue_style( 'register-style' );583 wp_enqueue_style( 'wp-color-picker' );584 if (get_option('oxd_bootstrap') == yes) {585 wp_enqueue_style( 'register-bootstrap' );586 }587 556 588 557 -
oxford-debate/tags/2.0.1/readme.txt
r1445170 r1445676 1 1 === Oxford Debate === 2 Contributors: rafafc 2 Contributors: rafafc, 3 3 Donate link: 4 4 Tags: debate, social, vote, voting … … 13 13 == Description == 14 14 15 <p>Oxford Debate is a plugin that allows to incorporate Oxford-Style debates on your website. An Oxford-Style debate is a communication process in which participants argue for and against a given topic.</p>15 <p>Oxford Debate is a plugin that allows to incorporate Oxford-Style debates on your website.</p> 16 16 <p>An Oxford-Style debate is a communication process in which participants argue for and against a given topic. According to Wikipedia, physical Oxford-Style debate is a competitive debate format featuring a sharply framed motion that is proposed by one side and opposed by another. A winner is declared in an Oxford-Style debate either by the majority or by which team has swayed more audience members between the two votes. </p> 17 17 18 <p>The online version of the Oxford-style debates adaptes the physical model and makes it possible to expand the capabilities of both speakers and audience. </p> 19 20 <p>Moderator propose a topic with two opposite views and stimulate the debate. 21 Speakers defense their proposal with argument using web connectivity and multimedia. 22 Community can vote the proposals and comment fixing its position on the proposals of the speakers or raising their own alternatives.</p> 23 For more information see: 18 <p>The online version of the Oxford-style debates adaptes the physical model and makes it possible to expand the capabilities of both speakers and audience: </p> 24 19 25 20 <ul> 26 <li> Website: http://oxfordstyledebate.com/21 <li>Moderator propose a topic with two opposite views and stimulate the debate. 27 22 </li> 28 <li> Google Group link: https://groups.google.com/forum/#!forum/oxford-style-debate23 <li>Speakers defense their proposal with argument using web connectivity and multimedia. 29 24 </li> 25 <li>Community can vote the proposals and comment fixing its position on the proposals of the speakers or raising their own alternatives.</li> 26 </ul> 27 28 <p>For further information:</p> 29 30 <ul> 31 <li>Website: http://oxfordstyledebate.com/</li> 32 <li>Google Group link: https://goo.gl/4FJ2sM</li> 30 33 <li>Twitter profile: https://twitter.com/oxfdebate</li> 31 34 <li>Docs & resources: http://t.co/bqsUVUAXFe</li> … … 35 38 36 39 1. Download the Oxford Debate plugin archive and extract the files 37 2. Copy the resulting oxd directory into /wp-content/plugins/ with FTP. O R38 Go to WP admin > Plugins > Add New40 2. Copy the resulting oxd directory into /wp-content/plugins/ with FTP. Or 41 go to WP admin > Plugins > Add New 39 42 3. Type Oxford Debate in search box and hit enter and install plugin from there 40 43 4. Activate the plugin through the 'Plugins' menu of WordPress … … 65 68 == Screenshots == 66 69 67 1. This is a example of andebate page.70 1. Example of a debate page. 68 71 69 72 == Changelog == … … 71 74 New update of Oxford-style Debate! 72 75 Lately, we have worked to add new features to enrich your experience. We look forward to testing it. Happy debating! 76 77 = 2.0.1 = 78 * Removed: Bootstrap load option 79 * Fixed: Responsive style 73 80 74 81 = 2.0.0 = -
oxford-debate/tags/2.0.1/templates/comments-debate.php
r1445163 r1445676 10 10 ?> 11 11 12 <div id="comments" class="comments-area"> 12 <div id="comments" class="comments-area container-fluid"> 13 <div class="row"> 13 14 14 15 <?php // You can start editing here -- including this comment! ?> … … 85 86 comment_form($comment_args); 86 87 ?> 87 88 </div> 88 89 </div><!-- #comments .comments-area --> -
oxford-debate/tags/2.0.1/templates/single-debate.php
r1445163 r1445676 86 86 <input type="hidden" name="vote-update-url" id="vote-update-url" value="<?php echo plugins_url( '../vote-update.php' , __FILE__ ); ?>"/> 87 87 <article id="post-<?php get_the_ID()?>" class="debates-container"> 88 <div id="debate-header"> 88 <div id="debate-header" class="container-fluid"> 89 <div class="row"> 89 90 <button class="oxd-button" onclick="history.back(-1)">< 90 91 <?php _e('Back','oxd'); ?> … … 153 154 <?php } ?> 154 155 </div> 155 <div id="debate-section"> 156 <h1> 157 <?php echo $post->post_title; ?> 158 </h1> 159 <p id="debate-tags"># 160 <?php the_tags( ' ', ', ', '<br />' ); ?> 161 </p> 162 <hr class="debates-hr"> 163 <?php if ($plugin_purchased) { ?> 164 <div id="response-container"> 165 </div> 166 <?php } ?> 167 <p id="author_name"> 168 <?php the_author_meta( 'first_name' ); ?> 169 <?php the_author_meta( 'last_name' ); ?> 170 </p> 171 <p id="author_description"> 172 <?php the_author_meta( 'user_description' ); ?> 173 </p> 174 <hr class="debates-hr"> 175 <p> 176 <?php echo $post->post_content;?> 177 </p> 156 </div> 157 <div id="debate-section" class="container-fluid"> 158 <div class="row"> 159 <h1> 160 <?php echo $post->post_title; ?> 161 </h1> 162 <p id="debate-tags"># 163 <?php the_tags( ' ', ', ', '<br />' ); ?> 164 </p> 165 <hr class="debates-hr"> 166 <?php if ($plugin_purchased) { ?> 167 <div id="response-container"> 168 </div> 169 <?php } ?> 170 <p id="author_name"> 171 <?php the_author_meta( 'first_name' ); ?> 172 <?php the_author_meta( 'last_name' ); ?> 173 </p> 174 <p id="author_description"> 175 <?php the_author_meta( 'user_description' ); ?> 176 </p> 177 <hr class="debates-hr"> 178 <p> 179 <?php echo $post->post_content;?> 180 </p> 181 </div> 178 182 </div> 179 <div id="postures-section" >183 <div id="postures-section" class="container-fluid"> 180 184 <!-- content --> 181 <div id="postures-contents" class="container-fluid">182 185 <div class="row"> 186 <div id="postures-contents"> 187 183 188 <div class="postures-container col col-sm-6" id="postures-container-a"> 184 189 <div id="postures-title-container-a"> -
oxford-debate/trunk/css/style.css
r1445169 r1445676 11 11 } 12 12 #debate-section {margin-bottom: 10px;} 13 #postures-section {margin-bottom: 50px; }13 #postures-section {margin-bottom: 50px; padding-left: 0; padding-right: 0} 14 14 #votes-section {margin-bottom: 10px;} 15 15 #votes-title {font-weight: bold;text-transform: uppercase;} … … 74 74 background-color: white; 75 75 } 76 #postures-contents .row { 77 z-index: 1; 78 } 76 79 #postures-container-a {float: left; padding-right: 10px;} 77 80 #postures-container-b {float: right; padding-left: 10px;} … … 106 109 background-color: #333; 107 110 color: white; 111 padding: 6px 12px; 108 112 } 109 113 #vote-button-a a, #vote-button-b a, #vote-a a, #vote-b a { -
oxford-debate/trunk/oxd.php
r1445163 r1445676 7 7 * the capabilities of both speakers and audience. The speakers may argue using web connectivity and multimedia, 8 8 * and the audience can also comment fixing its position on the proposals of the speakers or raising their own alternatives. 9 * Version: 2.0. 09 * Version: 2.0.1 10 10 * Author: Rafa Fernandez 11 11 * Author URI: http://cws-tech.com … … 98 98 //register our settings 99 99 register_setting( 'oxd-registration', 'key' ); 100 register_setting( 'oxd-settings-group', 'oxd_bootstrap' );101 100 102 101 } … … 218 217 function oxd_admin_page(){ 219 218 ?> 220 <div class="wrap">219 221 220 222 221 <form method="post" action="options.php"> 223 222 <?php settings_fields( 'oxd-registration' ); ?> 224 223 <?php do_settings_sections( 'oxd-registration' ); ?> 224 <div class="wrap"> 225 225 <table class="form-table"> 226 226 <tr valign="top"> … … 238 238 <?php submit_button(); ?> 239 239 240 </form>240 241 241 </div> 242 </form> 242 243 243 244 <div class="wrap"> … … 246 247 <?php settings_fields( 'oxd-settings-group' ); ?> 247 248 <?php do_settings_sections( 'oxd-settings-group' ); ?> 248 <table class="form-table">249 250 <tr valign="top">251 <th scope="row"><?php _e('Let the plugin load Bootstrap','oxd'); ?></th>252 <td>253 <select name="oxd_bootstrap" id="oxd_bootstrap">254 255 <?php if (get_option('oxd_bootstrap') == yes) { ?>256 <option value="yes" selected><?php _e('Yes','oxd'); ?></option>257 <option value="no"><?php _e('No','oxd'); ?></option>258 <?php } else { ?>259 <option value="yes"><?php _e('Yes','oxd'); ?></option>260 <option value="no" selected><?php _e('No','oxd'); ?></option>261 262 <?php } ?>263 264 </select>265 </td>266 267 </tr>268 269 270 </table>271 272 249 <?php submit_button(); ?> 273 250 … … 564 541 565 542 function enqueue_scripts() { 566 567 568 wp_enqueue_script( 'scripts', plugins_url( '/js/scripts.js', __FILE__ ), array('jquery','wp-color-picker'), '1.0', true); 569 if (get_option('oxd_bootstrap') == yes) { 570 wp_enqueue_script( 'bootstrap', plugins_url( '/js/bootstrap.min.js', __FILE__ ), array('jquery'), '1.0', true); 571 } 543 wp_enqueue_script( 'scripts', plugins_url( '/js/scripts.js', __FILE__ ), array('jquery','wp-color-picker'), '1.0', true); 544 } 545 546 function enqueue_styles() { 547 548 549 550 wp_register_style( 'register-style', plugins_url( '/oxford-debate/css/style.css' ) ); 551 wp_register_style( 'register-grid', plugins_url( '/oxford-debate/css/grid12.css' ) ); 552 wp_enqueue_style( 'register-style' ); 553 wp_enqueue_style( 'wp-color-picker' ); 554 wp_enqueue_style( 'register-grid' ); 572 555 573 574 }575 576 function enqueue_styles() {577 578 579 580 wp_register_style( 'register-style', plugins_url( '/oxford-debate/css/style.css' ) );581 wp_register_style( 'register-bootstrap', plugins_url( '/oxford-debate/css/bootstrap.min.css' ) );582 wp_enqueue_style( 'register-style' );583 wp_enqueue_style( 'wp-color-picker' );584 if (get_option('oxd_bootstrap') == yes) {585 wp_enqueue_style( 'register-bootstrap' );586 }587 556 588 557 -
oxford-debate/trunk/readme.txt
r1445170 r1445676 1 1 === Oxford Debate === 2 Contributors: rafafc 2 Contributors: rafafc, 3 3 Donate link: 4 4 Tags: debate, social, vote, voting … … 13 13 == Description == 14 14 15 <p>Oxford Debate is a plugin that allows to incorporate Oxford-Style debates on your website. An Oxford-Style debate is a communication process in which participants argue for and against a given topic.</p>15 <p>Oxford Debate is a plugin that allows to incorporate Oxford-Style debates on your website.</p> 16 16 <p>An Oxford-Style debate is a communication process in which participants argue for and against a given topic. According to Wikipedia, physical Oxford-Style debate is a competitive debate format featuring a sharply framed motion that is proposed by one side and opposed by another. A winner is declared in an Oxford-Style debate either by the majority or by which team has swayed more audience members between the two votes. </p> 17 17 18 <p>The online version of the Oxford-style debates adaptes the physical model and makes it possible to expand the capabilities of both speakers and audience. </p> 19 20 <p>Moderator propose a topic with two opposite views and stimulate the debate. 21 Speakers defense their proposal with argument using web connectivity and multimedia. 22 Community can vote the proposals and comment fixing its position on the proposals of the speakers or raising their own alternatives.</p> 23 For more information see: 18 <p>The online version of the Oxford-style debates adaptes the physical model and makes it possible to expand the capabilities of both speakers and audience: </p> 24 19 25 20 <ul> 26 <li> Website: http://oxfordstyledebate.com/21 <li>Moderator propose a topic with two opposite views and stimulate the debate. 27 22 </li> 28 <li> Google Group link: https://groups.google.com/forum/#!forum/oxford-style-debate23 <li>Speakers defense their proposal with argument using web connectivity and multimedia. 29 24 </li> 25 <li>Community can vote the proposals and comment fixing its position on the proposals of the speakers or raising their own alternatives.</li> 26 </ul> 27 28 <p>For further information:</p> 29 30 <ul> 31 <li>Website: http://oxfordstyledebate.com/</li> 32 <li>Google Group link: https://goo.gl/4FJ2sM</li> 30 33 <li>Twitter profile: https://twitter.com/oxfdebate</li> 31 34 <li>Docs & resources: http://t.co/bqsUVUAXFe</li> … … 35 38 36 39 1. Download the Oxford Debate plugin archive and extract the files 37 2. Copy the resulting oxd directory into /wp-content/plugins/ with FTP. O R38 Go to WP admin > Plugins > Add New40 2. Copy the resulting oxd directory into /wp-content/plugins/ with FTP. Or 41 go to WP admin > Plugins > Add New 39 42 3. Type Oxford Debate in search box and hit enter and install plugin from there 40 43 4. Activate the plugin through the 'Plugins' menu of WordPress … … 65 68 == Screenshots == 66 69 67 1. This is a example of andebate page.70 1. Example of a debate page. 68 71 69 72 == Changelog == … … 71 74 New update of Oxford-style Debate! 72 75 Lately, we have worked to add new features to enrich your experience. We look forward to testing it. Happy debating! 76 77 = 2.0.1 = 78 * Removed: Bootstrap load option 79 * Fixed: Responsive style 73 80 74 81 = 2.0.0 = -
oxford-debate/trunk/templates/comments-debate.php
r1445163 r1445676 10 10 ?> 11 11 12 <div id="comments" class="comments-area"> 12 <div id="comments" class="comments-area container-fluid"> 13 <div class="row"> 13 14 14 15 <?php // You can start editing here -- including this comment! ?> … … 85 86 comment_form($comment_args); 86 87 ?> 87 88 </div> 88 89 </div><!-- #comments .comments-area --> -
oxford-debate/trunk/templates/single-debate.php
r1445163 r1445676 86 86 <input type="hidden" name="vote-update-url" id="vote-update-url" value="<?php echo plugins_url( '../vote-update.php' , __FILE__ ); ?>"/> 87 87 <article id="post-<?php get_the_ID()?>" class="debates-container"> 88 <div id="debate-header"> 88 <div id="debate-header" class="container-fluid"> 89 <div class="row"> 89 90 <button class="oxd-button" onclick="history.back(-1)">< 90 91 <?php _e('Back','oxd'); ?> … … 153 154 <?php } ?> 154 155 </div> 155 <div id="debate-section"> 156 <h1> 157 <?php echo $post->post_title; ?> 158 </h1> 159 <p id="debate-tags"># 160 <?php the_tags( ' ', ', ', '<br />' ); ?> 161 </p> 162 <hr class="debates-hr"> 163 <?php if ($plugin_purchased) { ?> 164 <div id="response-container"> 165 </div> 166 <?php } ?> 167 <p id="author_name"> 168 <?php the_author_meta( 'first_name' ); ?> 169 <?php the_author_meta( 'last_name' ); ?> 170 </p> 171 <p id="author_description"> 172 <?php the_author_meta( 'user_description' ); ?> 173 </p> 174 <hr class="debates-hr"> 175 <p> 176 <?php echo $post->post_content;?> 177 </p> 156 </div> 157 <div id="debate-section" class="container-fluid"> 158 <div class="row"> 159 <h1> 160 <?php echo $post->post_title; ?> 161 </h1> 162 <p id="debate-tags"># 163 <?php the_tags( ' ', ', ', '<br />' ); ?> 164 </p> 165 <hr class="debates-hr"> 166 <?php if ($plugin_purchased) { ?> 167 <div id="response-container"> 168 </div> 169 <?php } ?> 170 <p id="author_name"> 171 <?php the_author_meta( 'first_name' ); ?> 172 <?php the_author_meta( 'last_name' ); ?> 173 </p> 174 <p id="author_description"> 175 <?php the_author_meta( 'user_description' ); ?> 176 </p> 177 <hr class="debates-hr"> 178 <p> 179 <?php echo $post->post_content;?> 180 </p> 181 </div> 178 182 </div> 179 <div id="postures-section" >183 <div id="postures-section" class="container-fluid"> 180 184 <!-- content --> 181 <div id="postures-contents" class="container-fluid">182 185 <div class="row"> 186 <div id="postures-contents"> 187 183 188 <div class="postures-container col col-sm-6" id="postures-container-a"> 184 189 <div id="postures-title-container-a">
Note: See TracChangeset
for help on using the changeset viewer.