| Index: trunk/extensions/Storyboard/storyboard.sql |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | story_author_location VARCHAR(255) NOT NULL, |
| 10 | 10 | story_author_occupation VARCHAR(255) NOT NULL, |
| 11 | 11 | story_author_image VARCHAR(255) NULL, -- TODO: find out if this is an acceptible way to refer to an image |
| 12 | | - story_author_contact VARCHAR(255) NOT NULL, -- TODO: confirm with erik this is a mandatory field |
| | 12 | + story_author_email VARCHAR(255) NOT NULL, |
| 13 | 13 | story_hit_count INT(8) unsigned NOT NULL default '0', |
| 14 | 14 | story_title VARCHAR(255) NOT NULL, |
| 15 | 15 | story_text MEDIUMBLOB NOT NULL, |
| Index: trunk/extensions/Storyboard/Storyboard.i18n.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | 'storyboard-authorname' => 'Author name', |
| 37 | 37 | 'storyboard-authorlocation' => 'Author location', |
| 38 | 38 | 'storyboard-authoroccupation' => 'Author occupation', |
| 39 | | - 'storyboard-authorcontact' => 'Author contact information', |
| | 39 | + 'storyboard-authoremail' => 'Author email address', |
| 40 | 40 | 'storyboard-thestory' => 'The story', |
| 41 | 41 | |
| 42 | 42 | // Special:StorySubmission |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | 'storyboard-occupation' => 'Your occupation', |
| 58 | 58 | 'storyboard-story' => 'Your story', |
| 59 | 59 | 'storyboard-photo' => 'Have a photo of yourself? Why not share it?', |
| 60 | | - 'storyboard-contact' => 'Your E-mail address or telephone number', |
| | 60 | + 'storyboard-email' => 'Your E-mail address', |
| 61 | 61 | 'storyboard-storytitle' => 'A short, descriptive title', |
| 62 | 62 | 'storyboard-agreement' => 'I agree with the publication and use of this story under the terms of the [http://creativecommons.org/licenses/by-sa/3.0/ Creative Commons Attribution/Share-Alike License].', |
| 63 | 63 | 'storyboard-charsleft' => '($1 {{PLURAL:$1|character|characters}} left)', |
| Index: trunk/extensions/Storyboard/tags/Storysubmission/Storysubmission_body.php |
| — | — | @@ -75,9 +75,13 @@ |
| 76 | 76 | $formBody = "<table width='$width'>"; |
| 77 | 77 | |
| 78 | 78 | $defaultName = ''; |
| | 79 | + $defaultEmail = ''; |
| | 80 | + |
| 79 | 81 | if ( $wgUser->isLoggedIn() ) { |
| 80 | 82 | $defaultName = $wgUser->getRealName() !== '' ? $wgUser->getRealName() : $wgUser->getName(); |
| | 83 | + $defaultEmail = $wgUser->getEmail(); |
| 81 | 84 | } |
| | 85 | + |
| 82 | 86 | $formBody .= '<tr>' . |
| 83 | 87 | Html::element( 'td', array( 'width' => '100%' ), wfMsg( 'storyboard-yourname' ) ) . |
| 84 | 88 | '<td>' . |
| — | — | @@ -95,8 +99,8 @@ |
| 96 | 100 | ) . '</td></tr>'; |
| 97 | 101 | |
| 98 | 102 | $formBody .= '<tr>' . |
| 99 | | - Html::element( 'td', array( 'width' => '100%' ), wfMsg( 'storyboard-contact' ) ) . |
| 100 | | - '<td>' . Html::input( 'contact', '', 'text', array( 'size' => $fieldSize ) |
| | 103 | + Html::element( 'td', array( 'width' => '100%' ), wfMsg( 'storyboard-email' ) ) . |
| | 104 | + '<td>' . Html::input( 'email', $defaultEmail, 'text', array( 'size' => $fieldSize ) |
| 101 | 105 | ) . '</td></tr>'; |
| 102 | 106 | |
| 103 | 107 | $formBody .= '<tr>' . |
| Index: trunk/extensions/Storyboard/specials/Story/Story_body.php |
| — | — | @@ -85,7 +85,7 @@ |
| 86 | 86 | 'story_author_name', |
| 87 | 87 | 'story_author_location', |
| 88 | 88 | 'story_author_occupation', |
| 89 | | - 'story_author_contact', |
| | 89 | + 'story_author_email', |
| 90 | 90 | 'story_author_image', |
| 91 | 91 | 'story_image_hidden', |
| 92 | 92 | 'story_title', |
| — | — | @@ -254,9 +254,9 @@ |
| 255 | 255 | ) . '</td></tr>'; |
| 256 | 256 | |
| 257 | 257 | $formBody .= '<tr>' . |
| 258 | | - Html::element( 'td', array( 'width' => '100%' ), wfMsg( 'storyboard-authorcontact' ) ) . |
| | 258 | + Html::element( 'td', array( 'width' => '100%' ), wfMsg( 'storyboard-authoremail' ) ) . |
| 259 | 259 | '<td>' . Html::input( |
| 260 | | - 'contact', |
| | 260 | + 'email', |
| 261 | 261 | $story->story_author_contact, |
| 262 | 262 | 'text', |
| 263 | 263 | array( |
| — | — | @@ -388,7 +388,7 @@ |
| 389 | 389 | 'story_author_name' => $wgRequest->getText( 'name' ), |
| 390 | 390 | 'story_author_location' => $wgRequest->getText( 'location' ), |
| 391 | 391 | 'story_author_occupation' => $wgRequest->getText( 'occupation' ), |
| 392 | | - 'story_author_contact' => $wgRequest->getText( 'contact' ), |
| | 392 | + 'story_author_email' => $wgRequest->getText( 'email' ), |
| 393 | 393 | 'story_title' => $wgRequest->getText( 'storytitle' ), |
| 394 | 394 | 'story_text' => $wgRequest->getText( 'storytext' ), |
| 395 | 395 | 'story_modified' => $dbw->timestamp( time() ), |
| Index: trunk/extensions/Storyboard/specials/StorySubmission/StorySubmission_body.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | 'story_author_name' => $wgRequest->getText( 'name' ), |
| 47 | 47 | 'story_author_location' => $wgRequest->getText( 'location' ), |
| 48 | 48 | 'story_author_occupation' => $wgRequest->getText( 'occupation' ), |
| 49 | | - 'story_author_contact' => $wgRequest->getText( 'contact' ), |
| | 49 | + 'story_author_email' => $wgRequest->getText( 'email' ), |
| 50 | 50 | 'story_title' => $title, |
| 51 | 51 | 'story_text' => $wgRequest->getText( 'storytext' ), |
| 52 | 52 | 'story_created' => $dbw->timestamp( time() ), |