Skip to content
This repository has been archived by the owner on Aug 2, 2019. It is now read-only.

Commit

Permalink
Merge pull request #841 from liam-wiltshire/no-talk-claims
Browse files Browse the repository at this point in the history
Prevent talk claims on legacy site
  • Loading branch information
liam-wiltshire committed Feb 23, 2017
2 parents 564153d + 54792c1 commit ed9ece9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
4 changes: 0 additions & 4 deletions src/inc/js/talk.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ talk = function (){
resizable: false,
modal: true,
buttons: {
"Yes, Proceed": function() {
window.location.href = $('#claim_btn').attr('href');
$( this ).dialog( "close" );
},
Cancel: function() {
$( this ).dialog( "close" );
}
Expand Down
7 changes: 7 additions & 0 deletions src/system/application/controllers/talk.php
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,13 @@ function view($id, $add_act = null, $code = null)
*/
function claim($talkId, $claimId=null)
{
$errorData = array(
'msg' => 'Talk claims have moved to the new Joind.in site! ' .
'Please <a href="https://joind.in/">login to the new site</a> to claim';
);
$this->template->write_view('content', 'msg_error', $errorData);
$this->template->render();
return false;
if ($claimId == null) {
$claimId = $this->input->post('claim_name_select');
}
Expand Down
6 changes: 2 additions & 4 deletions src/system/application/views/talk/modules/_talk_buttons.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@
</p>

<div id="claim-dialog">
<p>By clicking this button you are declaring that you are the speaker responsible for it and a claim request will be sent to the administrator of the event.</p>
<p>If the claim is approved you will be able to edit the information for this talk.</p>
<p>Are you sure?</p>

<p>Talk claims have been moved to the new <a href="https://joind.in">Joind.in site</a>.</p>
<p>Please login to the new site to claim your talk</p>
</div>
<script type="text/javascript">
$('#claim_select_div').css('display','none');
Expand Down

0 comments on commit ed9ece9

Please sign in to comment.