CC-1724:Phone home statistics

Temp commit
This commit is contained in:
james 2011-06-15 17:51:44 -04:00
parent 0263278bc2
commit 5adfb79981
12 changed files with 451 additions and 103 deletions

View file

@ -50,8 +50,8 @@ class LoginController extends Zend_Controller_Action
$authStorage = $auth->getStorage(); $authStorage = $auth->getStorage();
$authStorage->write($userInfo); $authStorage->write($userInfo);
$this->refer_sess = new Zend_Session_Namespace("referrer"); $tempSess = new Zend_Session_Namespace("referrer");
$this->refer_sess->referrer = 'login'; $tempSess->referrer = 'login';
$this->_redirect('Nowplaying'); $this->_redirect('Nowplaying');
} }

View file

@ -21,7 +21,8 @@ class NowplayingController extends Zend_Controller_Action
//popup if previous page was login //popup if previous page was login
$refer_sses = new Zend_Session_Namespace('referrer'); $refer_sses = new Zend_Session_Namespace('referrer');
if($refer_sses->referrer == 'login'){ if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp()
&& !Application_Model_Preference::GetSupportFeedback()){
//unset session //unset session
Zend_Session::namespaceUnset('referrer'); Zend_Session::namespaceUnset('referrer');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');

View file

@ -56,28 +56,7 @@ class PreferenceController extends Zend_Controller_Action
$this->view->statusMsg = "<div class='success'>Preferences updated.</div>"; $this->view->statusMsg = "<div class='success'>Preferences updated.</div>";
}else{ }
$errors = $form->getErrors();
$firstElementWithError = '';
foreach($errors as $section => $error){
foreach($error as $name => $er){
if(count($er) > 0){
$firstElementWithError = $name;
break;
}
}
if($section == "preferences_general"){
$this->view->errorGeneral = true;
}elseif($section == "preferences_soundcloud"){
$this->view->errorSoundCloud = true;
}elseif($section == "preferences_support"){
$this->view->errorSupport = true;
}
}
}
} }
$this->view->supportFeedback = Application_Model_Preference::GetSupportFeedback(); $this->view->supportFeedback = Application_Model_Preference::GetSupportFeedback();
@ -109,6 +88,41 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetRemindMeDate($now); Application_Model_Preference::SetRemindMeDate($now);
die(); die();
} }
public function registersubmitAction(){
$request = $this->getRequest();
$baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
$this->view->statusMsg = "";
$form = new Application_Form_RegisterAirtime();
var_dump($request->getPost());
var_dump($form->isValid($request->getPost()));
var_dump($form->getMessages());
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
$values = $form->getValues();
var_dump($values);
Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view);
Application_Model_Preference::SetPhone($values["Phone"]);
Application_Model_Preference::SetEmail($values["Email"]);
Application_Model_Preference::SetStationWebSite($values["StationWebSite"]);
Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]);
Application_Model_Preference::SetPublicise($values["Publicise"]);
$imagePath = $form->Logo->getFileName();
Application_Model_Preference::SetStationCountry($values["Country"]);
Application_Model_Preference::SetStationCity($values["City"]);
Application_Model_Preference::SetStationDescription($values["Description"]);
Application_Model_Preference::SetStationLogo($imagePath);
}
}
$this->_redirect('Nowplaying');
}
} }

View file

@ -1,10 +1,13 @@
<?php <?php
class Application_Form_RegisterAirtime extends Zend_Form_SubForm class Application_Form_RegisterAirtime extends Zend_Form
{ {
public function init() public function init()
{ {
$this->setAction('/Preference/registersubmit');
$this->setMethod('post');
$country_list = Application_Model_Preference::GetCountryList(); $country_list = Application_Model_Preference::GetCountryList();
$this->setDecorators(array( $this->setDecorators(array(
@ -12,6 +15,14 @@ class Application_Form_RegisterAirtime extends Zend_Form_SubForm
array('File', array('viewScript' => 'form/register-dialog.phtml', 'placement' => false))) array('File', array('viewScript' => 'form/register-dialog.phtml', 'placement' => false)))
); );
// Station Name
$stnName = new Zend_Form_Element_Text("stnName");
$stnName->setLabel("Station Name:")
->setRequired(true)
->setValue(Application_Model_Preference::GetStationName())
->setDecorators(array('ViewHelper'));
$this->addElement($stnName);
// Phone number // Phone number
$this->addElement('text', 'Phone', array( $this->addElement('text', 'Phone', array(
'class' => 'input_text', 'class' => 'input_text',
@ -105,14 +116,15 @@ class Application_Form_RegisterAirtime extends Zend_Form_SubForm
)); ));
// checkbox for publicise // checkbox for publicise
$this->addElement('checkbox', 'Publicise', array( $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
'label' => 'Publicise my station on Sourcefabric.org', $checkboxPublicise->setLabel('Publicise my station on Sourcefabric.org')
'required' => false, ->setRequired(false)
'value' => Application_Model_Preference::GetPublicise(), ->setDecorators(array('ViewHelper'))
'decorators' => array( ->setValue(Application_Model_Preference::GetPublicise());
'ViewHelper' if(!Application_Model_Preference::GetSupportFeedback()){
) $checkboxPublicise->setAttrib("disabled", "disabled");
)); }
$this->addElement($checkboxPublicise);
// text area for sending detail // text area for sending detail
$this->addElement('textarea', 'SendInfo', array( $this->addElement('textarea', 'SendInfo', array(

View file

@ -16,7 +16,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
$this->addElement('text', 'Phone', array( $this->addElement('text', 'Phone', array(
'class' => 'input_text', 'class' => 'input_text',
'label' => 'Phone:', 'label' => 'Phone:',
'required' => false, 'required' => true,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'value' => Application_Model_Preference::GetPhone(), 'value' => Application_Model_Preference::GetPhone(),
'decorators' => array( 'decorators' => array(
@ -28,7 +28,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
$this->addElement('text', 'Email', array( $this->addElement('text', 'Email', array(
'class' => 'input_text', 'class' => 'input_text',
'label' => 'Email:', 'label' => 'Email:',
'required' => false, 'required' => true,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'value' => Application_Model_Preference::GetEmail(), 'value' => Application_Model_Preference::GetEmail(),
'decorators' => array( 'decorators' => array(
@ -50,7 +50,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
// county list dropdown // county list dropdown
$this->addElement('select', 'Country', array( $this->addElement('select', 'Country', array(
'label' => 'Country:', 'label' => 'Country:',
'required' => false, 'required' => true,
'value' => Application_Model_Preference::GetStationCountry(), 'value' => Application_Model_Preference::GetStationCountry(),
'multiOptions' => $country_list, 'multiOptions' => $country_list,
'decorators' => array( 'decorators' => array(
@ -61,7 +61,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
// Station city // Station city
$this->addElement('text', 'City', array( $this->addElement('text', 'City', array(
'label' => 'City:', 'label' => 'City:',
'required' => false, 'required' => true,
'class' => 'input_text', 'class' => 'input_text',
'value' => Application_Model_Preference::GetStationCity(), 'value' => Application_Model_Preference::GetStationCity(),
'decorators' => array( 'decorators' => array(
@ -72,7 +72,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
// Station Description // Station Description
$this->addElement('textarea', 'Description', array( $this->addElement('textarea', 'Description', array(
'label' => 'Station Description:', 'label' => 'Station Description:',
'required' => false, 'required' => true,
'class' => 'input_text_area', 'class' => 'input_text_area',
'value' => Application_Model_Preference::GetStationDescription(), 'value' => Application_Model_Preference::GetStationDescription(),
'decorators' => array( 'decorators' => array(
@ -105,14 +105,15 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
)); ));
// checkbox for publicise // checkbox for publicise
$this->addElement('checkbox', 'Publicise', array( $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
'label' => 'Publicise my station on Sourcefabric.org', $checkboxPublicise->setLabel('Publicise my station on Sourcefabric.org')
'required' => false, ->setRequired(false)
'value' => Application_Model_Preference::GetPublicise(), ->setDecorators(array('ViewHelper'))
'decorators' => array( ->setValue(Application_Model_Preference::GetPublicise());
'ViewHelper' if(Application_Model_Preference::GetSupportFeedback() == '0'){
) $checkboxPublicise->setAttrib("disabled", "disabled");
)); }
$this->addElement($checkboxPublicise);
// text area for sending detail // text area for sending detail
$this->addElement('textarea', 'SendInfo', array( $this->addElement('textarea', 'SendInfo', array(

View file

@ -117,4 +117,12 @@ class Application_Model_Nowplaying
return array("currentShow"=>Show_DAL::GetCurrentShow($timeNow), "rows"=>$data); return array("currentShow"=>Show_DAL::GetCurrentShow($timeNow), "rows"=>$data);
} }
public static function ShouldShowPopUp(){
$today = mktime(0, 0, 0, date("m") , date("d"), date("Y"));
$remindDate = Application_Model_Preference::GetRemindMeDate();
if($remindDate == NULL || $today >= $remindDate){
return true;
}
}
} }

View file

@ -331,7 +331,12 @@ class Application_Model_Preference
public static function SetRemindMeDate($now){ public static function SetRemindMeDate($now){
$weekAfter = mktime(0, 0, 0, date("m") , date("d")+7, date("Y")); $weekAfter = mktime(0, 0, 0, date("m") , date("d")+7, date("Y"));
Application_Model_Preference::SetValue('remindme', $weekAfter); Application_Model_Preference::SetValue("remindme", $weekAfter);
} }
public static function GetRemindMeDate(){
return Application_Model_Preference::GetValue("remindme");
}
} }

View file

@ -1,16 +1,10 @@
<div class="dialogPopup register-dialog" title="Register Airtime"> <div class="dialogPopup register-dialog" title="Register Airtime">
<div class="info-text"> <form id="register-form" method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="multipart/form-data">
<p>Help Airtime improve by letting us know you are using it. This info
will be collected once per month and is anonymous unless you chose to
advertise your station on sourcefabric.org</p>
</div>
<form method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="application/x-www-form-urlencoded">
<dl class="zend_form"> <dl class="zend_form">
<?php if($this->element->getView()->supportFeedback === '0'){?> <div class="info-text">
<div class="info-text"><p>Be more awesome by selecting "Support feedback" below. You will be helping Airtim improve!</p></div> <p>Help Airtime improve by letting us know you are using it. This info
<?php }?> will be collected regularly in order to improve your user experience.</p>
</div>
<dd id="SupportFeedback-element"> <dd id="SupportFeedback-element">
<label class="optional" for="SupportFeedback"> <label class="optional" for="SupportFeedback">
<?php echo $this->element->getElement('SupportFeedback') ?> <?php echo $this->element->getElement('SupportFeedback') ?>
@ -24,6 +18,9 @@
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<div class="info-text">
<p>Click the box below to advertise your station on Sourcefabric.org.</p>
</div>
<dd id="publicize-element"> <dd id="publicize-element">
<label class="optional" for="Publicise"> <label class="optional" for="Publicise">
<?php echo $this->element->getElement('Publicise') ?> <?php echo $this->element->getElement('Publicise') ?>
@ -38,6 +35,21 @@
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to publicise your station, "Send support feedback" must be enabled</p></div> <div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to publicise your station, "Send support feedback" must be enabled</p></div>
<div id="public-info" style="display:none;">
<dt id="stnName-label" class="block-display">
<label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?></label>
</dt>
<dd id="stnName-element" class="block-display">
<?php echo $this->element->getElement('stnName') ?>
<?php if($this->element->getElement('stnName')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('stnName')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<dt id="Phone-label" class="block-display"> <dt id="Phone-label" class="block-display">
<label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label> <label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
</dt> </dt>
@ -133,7 +145,7 @@
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
</div>
</dl> </dl>
<h3 class="collapsible-header"> <h3 class="collapsible-header">
<span class="arrow-icon"></span>Show me what I am sending <span class="arrow-icon"></span>Show me what I am sending

View file

@ -1,6 +1,6 @@
#Note: project.home is automatically generated by the propel-install script. #Note: project.home is automatically generated by the propel-install script.
#Any manual changes to this value will be overwritten. #Any manual changes to this value will be overwritten.
project.home = /home/martin/workspace/airtime project.home = /home/james/src/airtime/airtime_mvc
project.build = ${project.home}/build project.build = ${project.home}/build
#Database driver #Database driver

View file

@ -1 +1,240 @@
INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin')); INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin'));
INSERT INTO cc_country (iso_code, name) VALUES ('AFG', 'Afghanistan ');
INSERT INTO cc_country (iso_code, name) VALUES ('ALA', 'Åland Islands');
INSERT INTO cc_country (iso_code, name) VALUES ('ALB', 'Albania ');
INSERT INTO cc_country (iso_code, name) VALUES ('DZA', 'Algeria ');
INSERT INTO cc_country (iso_code, name) VALUES ('ASM', 'American Samoa ');
INSERT INTO cc_country (iso_code, name) VALUES ('AND', 'Andorra ');
INSERT INTO cc_country (iso_code, name) VALUES ('AGO', 'Angola ');
INSERT INTO cc_country (iso_code, name) VALUES ('AIA', 'Anguilla ');
INSERT INTO cc_country (iso_code, name) VALUES ('ATG', 'Antigua and Barbuda ');
INSERT INTO cc_country (iso_code, name) VALUES ('ARG', 'Argentina ');
INSERT INTO cc_country (iso_code, name) VALUES ('ARM', 'Armenia ');
INSERT INTO cc_country (iso_code, name) VALUES ('ABW', 'Aruba ');
INSERT INTO cc_country (iso_code, name) VALUES ('AUS', 'Australia ');
INSERT INTO cc_country (iso_code, name) VALUES ('AUT', 'Austria ');
INSERT INTO cc_country (iso_code, name) VALUES ('AZE', 'Azerbaijan ');
INSERT INTO cc_country (iso_code, name) VALUES ('BHS', 'Bahamas ');
INSERT INTO cc_country (iso_code, name) VALUES ('BHR', 'Bahrain ');
INSERT INTO cc_country (iso_code, name) VALUES ('BGD', 'Bangladesh ');
INSERT INTO cc_country (iso_code, name) VALUES ('BRB', 'Barbados ');
INSERT INTO cc_country (iso_code, name) VALUES ('BLR', 'Belarus ');
INSERT INTO cc_country (iso_code, name) VALUES ('BEL', 'Belgium ');
INSERT INTO cc_country (iso_code, name) VALUES ('BLZ', 'Belize ');
INSERT INTO cc_country (iso_code, name) VALUES ('BEN', 'Benin ');
INSERT INTO cc_country (iso_code, name) VALUES ('BMU', 'Bermuda ');
INSERT INTO cc_country (iso_code, name) VALUES ('BTN', 'Bhutan ');
INSERT INTO cc_country (iso_code, name) VALUES ('BOL', 'Bolivia (Plurinational State of) ');
INSERT INTO cc_country (iso_code, name) VALUES ('BES', 'Bonaire, Saint Eustatius and Saba');
INSERT INTO cc_country (iso_code, name) VALUES ('BIH', 'Bosnia and Herzegovina ');
INSERT INTO cc_country (iso_code, name) VALUES ('BWA', 'Botswana ');
INSERT INTO cc_country (iso_code, name) VALUES ('BRA', 'Brazil ');
INSERT INTO cc_country (iso_code, name) VALUES ('VGB', 'British Virgin Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('BRN', 'Brunei Darussalam ');
INSERT INTO cc_country (iso_code, name) VALUES ('BGR', 'Bulgaria ');
INSERT INTO cc_country (iso_code, name) VALUES ('BFA', 'Burkina Faso ');
INSERT INTO cc_country (iso_code, name) VALUES ('BDI', 'Burundi ');
INSERT INTO cc_country (iso_code, name) VALUES ('KHM', 'Cambodia ');
INSERT INTO cc_country (iso_code, name) VALUES ('CMR', 'Cameroon ');
INSERT INTO cc_country (iso_code, name) VALUES ('CAN', 'Canada ');
INSERT INTO cc_country (iso_code, name) VALUES ('CPV', 'Cape Verde ');
INSERT INTO cc_country (iso_code, name) VALUES ('CYM', 'Cayman Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('CAF', 'Central African Republic ');
INSERT INTO cc_country (iso_code, name) VALUES ('TCD', 'Chad ');
INSERT INTO cc_country (iso_code, name) VALUES ('CHL', 'Chile ');
INSERT INTO cc_country (iso_code, name) VALUES ('CHN', 'China ');
INSERT INTO cc_country (iso_code, name) VALUES ('HKG', 'China, Hong Kong Special Administrative Region');
INSERT INTO cc_country (iso_code, name) VALUES ('MAC', 'China, Macao Special Administrative Region');
INSERT INTO cc_country (iso_code, name) VALUES ('COL', 'Colombia ');
INSERT INTO cc_country (iso_code, name) VALUES ('COM', 'Comoros ');
INSERT INTO cc_country (iso_code, name) VALUES ('COG', 'Congo ');
INSERT INTO cc_country (iso_code, name) VALUES ('COK', 'Cook Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('CRI', 'Costa Rica ');
INSERT INTO cc_country (iso_code, name) VALUES ('CIV', 'Côte d''Ivoire ');
INSERT INTO cc_country (iso_code, name) VALUES ('HRV', 'Croatia ');
INSERT INTO cc_country (iso_code, name) VALUES ('CUB', 'Cuba ');
INSERT INTO cc_country (iso_code, name) VALUES ('CUW', 'Curaçao');
INSERT INTO cc_country (iso_code, name) VALUES ('CYP', 'Cyprus ');
INSERT INTO cc_country (iso_code, name) VALUES ('CZE', 'Czech Republic ');
INSERT INTO cc_country (iso_code, name) VALUES ('PRK', 'Democratic People''s Republic of Korea ');
INSERT INTO cc_country (iso_code, name) VALUES ('COD', 'Democratic Republic of the Congo ');
INSERT INTO cc_country (iso_code, name) VALUES ('DNK', 'Denmark ');
INSERT INTO cc_country (iso_code, name) VALUES ('DJI', 'Djibouti ');
INSERT INTO cc_country (iso_code, name) VALUES ('DMA', 'Dominica ');
INSERT INTO cc_country (iso_code, name) VALUES ('DOM', 'Dominican Republic ');
INSERT INTO cc_country (iso_code, name) VALUES ('ECU', 'Ecuador ');
INSERT INTO cc_country (iso_code, name) VALUES ('EGY', 'Egypt ');
INSERT INTO cc_country (iso_code, name) VALUES ('SLV', 'El Salvador ');
INSERT INTO cc_country (iso_code, name) VALUES ('GNQ', 'Equatorial Guinea ');
INSERT INTO cc_country (iso_code, name) VALUES ('ERI', 'Eritrea ');
INSERT INTO cc_country (iso_code, name) VALUES ('EST', 'Estonia ');
INSERT INTO cc_country (iso_code, name) VALUES ('ETH', 'Ethiopia ');
INSERT INTO cc_country (iso_code, name) VALUES ('FRO', 'Faeroe Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('FLK', 'Falkland Islands (Malvinas) ');
INSERT INTO cc_country (iso_code, name) VALUES ('FJI', 'Fiji ');
INSERT INTO cc_country (iso_code, name) VALUES ('FIN', 'Finland ');
INSERT INTO cc_country (iso_code, name) VALUES ('FRA', 'France ');
INSERT INTO cc_country (iso_code, name) VALUES ('GUF', 'French Guiana ');
INSERT INTO cc_country (iso_code, name) VALUES ('PYF', 'French Polynesia ');
INSERT INTO cc_country (iso_code, name) VALUES ('GAB', 'Gabon ');
INSERT INTO cc_country (iso_code, name) VALUES ('GMB', 'Gambia ');
INSERT INTO cc_country (iso_code, name) VALUES ('GEO', 'Georgia ');
INSERT INTO cc_country (iso_code, name) VALUES ('DEU', 'Germany ');
INSERT INTO cc_country (iso_code, name) VALUES ('GHA', 'Ghana ');
INSERT INTO cc_country (iso_code, name) VALUES ('GIB', 'Gibraltar ');
INSERT INTO cc_country (iso_code, name) VALUES ('GRC', 'Greece ');
INSERT INTO cc_country (iso_code, name) VALUES ('GRL', 'Greenland ');
INSERT INTO cc_country (iso_code, name) VALUES ('GRD', 'Grenada ');
INSERT INTO cc_country (iso_code, name) VALUES ('GLP', 'Guadeloupe ');
INSERT INTO cc_country (iso_code, name) VALUES ('GUM', 'Guam ');
INSERT INTO cc_country (iso_code, name) VALUES ('GTM', 'Guatemala ');
INSERT INTO cc_country (iso_code, name) VALUES ('GGY', 'Guernsey');
INSERT INTO cc_country (iso_code, name) VALUES ('GIN', 'Guinea ');
INSERT INTO cc_country (iso_code, name) VALUES ('GNB', 'Guinea-Bissau ');
INSERT INTO cc_country (iso_code, name) VALUES ('GUY', 'Guyana ');
INSERT INTO cc_country (iso_code, name) VALUES ('HTI', 'Haiti ');
INSERT INTO cc_country (iso_code, name) VALUES ('VAT', 'Holy See ');
INSERT INTO cc_country (iso_code, name) VALUES ('HND', 'Honduras ');
INSERT INTO cc_country (iso_code, name) VALUES ('HUN', 'Hungary ');
INSERT INTO cc_country (iso_code, name) VALUES ('ISL', 'Iceland ');
INSERT INTO cc_country (iso_code, name) VALUES ('IND', 'India ');
INSERT INTO cc_country (iso_code, name) VALUES ('IDN', 'Indonesia ');
INSERT INTO cc_country (iso_code, name) VALUES ('IRN', 'Iran (Islamic Republic of)');
INSERT INTO cc_country (iso_code, name) VALUES ('IRQ', 'Iraq ');
INSERT INTO cc_country (iso_code, name) VALUES ('IRL', 'Ireland ');
INSERT INTO cc_country (iso_code, name) VALUES ('IMN', 'Isle of Man ');
INSERT INTO cc_country (iso_code, name) VALUES ('ISR', 'Israel ');
INSERT INTO cc_country (iso_code, name) VALUES ('ITA', 'Italy ');
INSERT INTO cc_country (iso_code, name) VALUES ('JAM', 'Jamaica ');
INSERT INTO cc_country (iso_code, name) VALUES ('JPN', 'Japan ');
INSERT INTO cc_country (iso_code, name) VALUES ('JEY', 'Jersey');
INSERT INTO cc_country (iso_code, name) VALUES ('JOR', 'Jordan ');
INSERT INTO cc_country (iso_code, name) VALUES ('KAZ', 'Kazakhstan ');
INSERT INTO cc_country (iso_code, name) VALUES ('KEN', 'Kenya ');
INSERT INTO cc_country (iso_code, name) VALUES ('KIR', 'Kiribati ');
INSERT INTO cc_country (iso_code, name) VALUES ('KWT', 'Kuwait ');
INSERT INTO cc_country (iso_code, name) VALUES ('KGZ', 'Kyrgyzstan ');
INSERT INTO cc_country (iso_code, name) VALUES ('LAO', 'Lao People''s Democratic Republic ');
INSERT INTO cc_country (iso_code, name) VALUES ('LVA', 'Latvia ');
INSERT INTO cc_country (iso_code, name) VALUES ('LBN', 'Lebanon ');
INSERT INTO cc_country (iso_code, name) VALUES ('LSO', 'Lesotho ');
INSERT INTO cc_country (iso_code, name) VALUES ('LBR', 'Liberia ');
INSERT INTO cc_country (iso_code, name) VALUES ('LBY', 'Libyan Arab Jamahiriya ');
INSERT INTO cc_country (iso_code, name) VALUES ('LIE', 'Liechtenstein ');
INSERT INTO cc_country (iso_code, name) VALUES ('LTU', 'Lithuania ');
INSERT INTO cc_country (iso_code, name) VALUES ('LUX', 'Luxembourg ');
INSERT INTO cc_country (iso_code, name) VALUES ('MDG', 'Madagascar ');
INSERT INTO cc_country (iso_code, name) VALUES ('MWI', 'Malawi ');
INSERT INTO cc_country (iso_code, name) VALUES ('MYS', 'Malaysia ');
INSERT INTO cc_country (iso_code, name) VALUES ('MDV', 'Maldives ');
INSERT INTO cc_country (iso_code, name) VALUES ('MLI', 'Mali ');
INSERT INTO cc_country (iso_code, name) VALUES ('MLT', 'Malta ');
INSERT INTO cc_country (iso_code, name) VALUES ('MHL', 'Marshall Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('MTQ', 'Martinique ');
INSERT INTO cc_country (iso_code, name) VALUES ('MRT', 'Mauritania ');
INSERT INTO cc_country (iso_code, name) VALUES ('MUS', 'Mauritius ');
INSERT INTO cc_country (iso_code, name) VALUES ('MYT', 'Mayotte');
INSERT INTO cc_country (iso_code, name) VALUES ('MEX', 'Mexico ');
INSERT INTO cc_country (iso_code, name) VALUES ('FSM', 'Micronesia (Federated States of)');
INSERT INTO cc_country (iso_code, name) VALUES ('MCO', 'Monaco ');
INSERT INTO cc_country (iso_code, name) VALUES ('MNG', 'Mongolia ');
INSERT INTO cc_country (iso_code, name) VALUES ('MNE', 'Montenegro');
INSERT INTO cc_country (iso_code, name) VALUES ('MSR', 'Montserrat ');
INSERT INTO cc_country (iso_code, name) VALUES ('MAR', 'Morocco ');
INSERT INTO cc_country (iso_code, name) VALUES ('MOZ', 'Mozambique ');
INSERT INTO cc_country (iso_code, name) VALUES ('MMR', 'Myanmar ');
INSERT INTO cc_country (iso_code, name) VALUES ('NAM', 'Namibia ');
INSERT INTO cc_country (iso_code, name) VALUES ('NRU', 'Nauru ');
INSERT INTO cc_country (iso_code, name) VALUES ('NPL', 'Nepal ');
INSERT INTO cc_country (iso_code, name) VALUES ('NLD', 'Netherlands ');
INSERT INTO cc_country (iso_code, name) VALUES ('NCL', 'New Caledonia ');
INSERT INTO cc_country (iso_code, name) VALUES ('NZL', 'New Zealand ');
INSERT INTO cc_country (iso_code, name) VALUES ('NIC', 'Nicaragua ');
INSERT INTO cc_country (iso_code, name) VALUES ('NER', 'Niger ');
INSERT INTO cc_country (iso_code, name) VALUES ('NGA', 'Nigeria ');
INSERT INTO cc_country (iso_code, name) VALUES ('NIU', 'Niue ');
INSERT INTO cc_country (iso_code, name) VALUES ('NFK', 'Norfolk Island ');
INSERT INTO cc_country (iso_code, name) VALUES ('MNP', 'Northern Mariana Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('NOR', 'Norway ');
INSERT INTO cc_country (iso_code, name) VALUES ('PSE', 'Occupied Palestinian Territory ');
INSERT INTO cc_country (iso_code, name) VALUES ('OMN', 'Oman ');
INSERT INTO cc_country (iso_code, name) VALUES ('PAK', 'Pakistan ');
INSERT INTO cc_country (iso_code, name) VALUES ('PLW', 'Palau ');
INSERT INTO cc_country (iso_code, name) VALUES ('PAN', 'Panama ');
INSERT INTO cc_country (iso_code, name) VALUES ('PNG', 'Papua New Guinea ');
INSERT INTO cc_country (iso_code, name) VALUES ('PRY', 'Paraguay ');
INSERT INTO cc_country (iso_code, name) VALUES ('PER', 'Peru ');
INSERT INTO cc_country (iso_code, name) VALUES ('PHL', 'Philippines ');
INSERT INTO cc_country (iso_code, name) VALUES ('PCN', 'Pitcairn ');
INSERT INTO cc_country (iso_code, name) VALUES ('POL', 'Poland ');
INSERT INTO cc_country (iso_code, name) VALUES ('PRT', 'Portugal ');
INSERT INTO cc_country (iso_code, name) VALUES ('PRI', 'Puerto Rico ');
INSERT INTO cc_country (iso_code, name) VALUES ('QAT', 'Qatar ');
INSERT INTO cc_country (iso_code, name) VALUES ('KOR', 'Republic of Korea ');
INSERT INTO cc_country (iso_code, name) VALUES ('MDA', 'Republic of Moldova');
INSERT INTO cc_country (iso_code, name) VALUES ('REU', 'Réunion ');
INSERT INTO cc_country (iso_code, name) VALUES ('ROU', 'Romania ');
INSERT INTO cc_country (iso_code, name) VALUES ('RUS', 'Russian Federation ');
INSERT INTO cc_country (iso_code, name) VALUES ('RWA', 'Rwanda ');
INSERT INTO cc_country (iso_code, name) VALUES ('BLM', 'Saint-Barthélemy');
INSERT INTO cc_country (iso_code, name) VALUES ('SHN', 'Saint Helena ');
INSERT INTO cc_country (iso_code, name) VALUES ('KNA', 'Saint Kitts and Nevis ');
INSERT INTO cc_country (iso_code, name) VALUES ('LCA', 'Saint Lucia ');
INSERT INTO cc_country (iso_code, name) VALUES ('MAF', 'Saint-Martin (French part)');
INSERT INTO cc_country (iso_code, name) VALUES ('SPM', 'Saint Pierre and Miquelon ');
INSERT INTO cc_country (iso_code, name) VALUES ('VCT', 'Saint Vincent and the Grenadines ');
INSERT INTO cc_country (iso_code, name) VALUES ('WSM', 'Samoa ');
INSERT INTO cc_country (iso_code, name) VALUES ('SMR', 'San Marino ');
INSERT INTO cc_country (iso_code, name) VALUES ('STP', 'Sao Tome and Principe ');
INSERT INTO cc_country (iso_code, name) VALUES ('SAU', 'Saudi Arabia ');
INSERT INTO cc_country (iso_code, name) VALUES ('SEN', 'Senegal ');
INSERT INTO cc_country (iso_code, name) VALUES ('SRB', 'Serbia ');
INSERT INTO cc_country (iso_code, name) VALUES ('SYC', 'Seychelles ');
INSERT INTO cc_country (iso_code, name) VALUES ('SLE', 'Sierra Leone ');
INSERT INTO cc_country (iso_code, name) VALUES ('SGP', 'Singapore ');
INSERT INTO cc_country (iso_code, name) VALUES ('SXM', 'Sint Maarten (Dutch part)');
INSERT INTO cc_country (iso_code, name) VALUES ('SVK', 'Slovakia ');
INSERT INTO cc_country (iso_code, name) VALUES ('SVN', 'Slovenia ');
INSERT INTO cc_country (iso_code, name) VALUES ('SLB', 'Solomon Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('SOM', 'Somalia ');
INSERT INTO cc_country (iso_code, name) VALUES ('ZAF', 'South Africa ');
INSERT INTO cc_country (iso_code, name) VALUES ('ESP', 'Spain ');
INSERT INTO cc_country (iso_code, name) VALUES ('LKA', 'Sri Lanka ');
INSERT INTO cc_country (iso_code, name) VALUES ('SDN', 'Sudan ');
INSERT INTO cc_country (iso_code, name) VALUES ('SUR', 'Suriname ');
INSERT INTO cc_country (iso_code, name) VALUES ('SJM', 'Svalbard and Jan Mayen Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('SWZ', 'Swaziland ');
INSERT INTO cc_country (iso_code, name) VALUES ('SWE', 'Sweden ');
INSERT INTO cc_country (iso_code, name) VALUES ('CHE', 'Switzerland ');
INSERT INTO cc_country (iso_code, name) VALUES ('SYR', 'Syrian Arab Republic ');
INSERT INTO cc_country (iso_code, name) VALUES ('TJK', 'Tajikistan ');
INSERT INTO cc_country (iso_code, name) VALUES ('THA', 'Thailand ');
INSERT INTO cc_country (iso_code, name) VALUES ('MKD', 'The former Yugoslav Republic of Macedonia ');
INSERT INTO cc_country (iso_code, name) VALUES ('TLS', 'Timor-Leste');
INSERT INTO cc_country (iso_code, name) VALUES ('TGO', 'Togo ');
INSERT INTO cc_country (iso_code, name) VALUES ('TKL', 'Tokelau ');
INSERT INTO cc_country (iso_code, name) VALUES ('TON', 'Tonga ');
INSERT INTO cc_country (iso_code, name) VALUES ('TTO', 'Trinidad and Tobago ');
INSERT INTO cc_country (iso_code, name) VALUES ('TUN', 'Tunisia ');
INSERT INTO cc_country (iso_code, name) VALUES ('TUR', 'Turkey ');
INSERT INTO cc_country (iso_code, name) VALUES ('TKM', 'Turkmenistan ');
INSERT INTO cc_country (iso_code, name) VALUES ('TCA', 'Turks and Caicos Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('TUV', 'Tuvalu ');
INSERT INTO cc_country (iso_code, name) VALUES ('UGA', 'Uganda ');
INSERT INTO cc_country (iso_code, name) VALUES ('UKR', 'Ukraine ');
INSERT INTO cc_country (iso_code, name) VALUES ('ARE', 'United Arab Emirates ');
INSERT INTO cc_country (iso_code, name) VALUES ('GBR', 'United Kingdom of Great Britain and Northern Ireland');
INSERT INTO cc_country (iso_code, name) VALUES ('TZA', 'United Republic of Tanzania ');
INSERT INTO cc_country (iso_code, name) VALUES ('USA', 'United States of America');
INSERT INTO cc_country (iso_code, name) VALUES ('VIR', 'United States Virgin Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('URY', 'Uruguay ');
INSERT INTO cc_country (iso_code, name) VALUES ('UZB', 'Uzbekistan ');
INSERT INTO cc_country (iso_code, name) VALUES ('VUT', 'Vanuatu ');
INSERT INTO cc_country (iso_code, name) VALUES ('VEN', 'Venezuela (Bolivarian Republic of)');
INSERT INTO cc_country (iso_code, name) VALUES ('VNM', 'Viet Nam ');
INSERT INTO cc_country (iso_code, name) VALUES ('WLF', 'Wallis and Futuna Islands ');
INSERT INTO cc_country (iso_code, name) VALUES ('ESH', 'Western Sahara ');
INSERT INTO cc_country (iso_code, name) VALUES ('YEM', 'Yemen ');
INSERT INTO cc_country (iso_code, name) VALUES ('ZMB', 'Zambia ');
INSERT INTO cc_country (iso_code, name) VALUES ('ZWE', 'Zimbabwe ');

View file

@ -421,6 +421,24 @@ CREATE TABLE "cc_subjs"
COMMENT ON TABLE "cc_subjs" IS ''; COMMENT ON TABLE "cc_subjs" IS '';
SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_country
-----------------------------------------------------------------------------
DROP TABLE "cc_country" CASCADE;
CREATE TABLE "cc_country"
(
"isocode" CHAR(3) NOT NULL,
"name" VARCHAR(255) NOT NULL,
PRIMARY KEY ("isocode")
);
COMMENT ON TABLE "cc_country" IS '';
SET search_path TO public; SET search_path TO public;
ALTER TABLE "cc_access" ADD CONSTRAINT "cc_access_owner_fkey" FOREIGN KEY ("owner") REFERENCES "cc_subjs" ("id"); ALTER TABLE "cc_access" ADD CONSTRAINT "cc_access_owner_fkey" FOREIGN KEY ("owner") REFERENCES "cc_subjs" ("id");

View file

@ -1,57 +1,95 @@
$(document).ready(function(){ $(document).ready(function(){
$.get("/Preference/register", {format:"json"}, function(json){ $.get("/Preference/register", {format:"json"}, function(json){
var dialog = $(json.dialog); var dialog = $(json.dialog);
dialog.dialog({
autoOpen: false,
width: 450,
resizable: false,
modal: true,
position:'center',
buttons: {
"Remind me in 1 week": function() {
var url = '/Preference/remindme';
$.ajax({
url: url,
});
$(this).dialog("close");
},
"Yes, help Airtime": function() {
$(this).dialog("close");
}
}
});
dialog.dialog('open'); dialog.dialog({
}) autoOpen: false,
width: 450,
$('.collapsible-header').live('click',function() { resizable: false,
modal: true,
position:'center',
buttons: {
"Remind me in 1 week": function() {
var url = '/Preference/remindme';
$.ajax({
url: url,
});
$(this).dialog("close");
},
"Yes, help Airtime": function() {
$("#register-form").submit();
/*$.ajax({
type: 'post',
dataType: 'html',
url: '/Preference/registersubmit',
async: false,
data: $("#register-form").serialize(),
success: function (response, status, xml) {
//Check for error here
if (error) {
$("#register-form").parent().html('').html(response);
}
else {
$(this).dialog('close');
}
}
});*/
$(this).dialog("close");
}
}
});
dialog.dialog('open');
})
$('.collapsible-header').live('click',function() {
$(this).next().toggle('fast'); $(this).next().toggle('fast');
$(this).toggleClass("close"); $(this).toggleClass("close");
return false; return false;
}).next().hide(); }).next().hide();
})
$("#SupportFeedback").live('click', function(){
var pub = $("#Publicise");
if( !$(this).is(':checked') ){
pub.removeAttr("checked");
pub.attr("disabled", true);
$("#public-info").hide();
}else{
pub.removeAttr("disabled");
}
});
$("#Publicise").live('click', function(){
if($(this).is(':checked')){
$("#public-info").show();
}else{
$("#public-info").hide();
}
});
});
function resizeImg(ele){ function resizeImg(ele){
var img = $(ele);
var img = $(ele);
var width = ele.width;
var width = ele.width;
var height = ele.height; var height = ele.height;
// resize img proportionaly // resize img proportionaly
if( width > height && width > 430){ if( width > height && width > 430){
var ratio = 430/width; var ratio = 430/width;
img.css("width", "430px"); img.css("width", "430px");
var newHeight = height * ratio; var newHeight = height * ratio;
img.css("height", newHeight ); img.css("height", newHeight );
}else if( width < height && height > 430){ }else if( width < height && height > 430){
var ratio = 430/height; var ratio = 430/height;
img.css("height", "430px"); img.css("height", "430px");
var newWidth = width * ratio; var newWidth = width * ratio;
img.css("width", newWidth ); img.css("width", newWidth );
}else if( width == height && width > 430){ }else if( width == height && width > 430){
img.css("height", "430px"); img.css("height", "430px");
img.css("width", "430px" ); img.css("width", "430px" );
} }
} }