Merge branch 'master' of dev.sourcefabric.org:campcaster

Conflicts:
	public/css/styles.css
This commit is contained in:
Naomi 2011-02-11 18:59:27 -05:00
commit d9118fe2d0
14 changed files with 112 additions and 14 deletions

View File

@ -97,6 +97,7 @@
</controllerFile>
<controllerFile controllerName="Dashboard">
<actionMethod actionName="index"/>
<actionMethod actionName="help"/>
</controllerFile>
</controllersDirectory>
<formsDirectory>
@ -317,6 +318,9 @@
<viewControllerScriptsDirectory forControllerName="Dashboard">
<viewScriptFile forActionName="index"/>
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Dashboard">
<viewScriptFile forActionName="help"/>
</viewControllerScriptsDirectory>
</viewScriptsDirectory>
<viewHelpersDirectory/>
<viewFiltersDirectory enabled="false"/>

View File

@ -20,6 +20,7 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
->add(new Zend_Acl_Resource('api'))
->add(new Zend_Acl_Resource('nowplaying'))
->add(new Zend_Acl_Resource('search'))
->add(new Zend_Acl_Resource('dashboard'))
->add(new Zend_Acl_Resource('preference'));
/** Creating permissions */
@ -29,6 +30,7 @@ $ccAcl->allow('G', 'index')
->allow('G', 'nowplaying')
->allow('G', 'api')
->allow('G', 'schedule')
->allow('G', 'dashboard')
->allow('H', 'library')
->allow('H', 'search')
->allow('H', 'plupload')

View File

@ -54,7 +54,14 @@ $pages = array(
'resource' => 'user'
)
)
)
),
array(
'label' => 'Help',
'module' => 'default',
'controller' => 'dashboard',
'action' => 'help',
'resource' => 'dashboard'
)
);

View File

@ -13,10 +13,15 @@ class DashboardController extends Zend_Controller_Action
// action body
}
public function helpAction()
{
// action body
}
}

View File

@ -36,6 +36,9 @@ class UserController extends Zend_Controller_Action
if ($formdata['password'] != "xxxxxx")
$user->setPassword($formdata['password']);
$user->setType($formdata['type']);
$user->setEmail($formdata['email']);
$user->setSkype($formdata['skype']);
$user->setJabber($formdata['jabber']);
$user->save();
$form->reset();

View File

@ -47,6 +47,26 @@ class Application_Form_AddUser extends Zend_Form
$lastName->addValidator('NotEmpty');
$this->addElement($lastName);
$email = new Zend_Form_Element_Text('email');
$email->setLabel('Email:');
$email->setAttrib('class', 'input_text');
$email->addFilter('StringTrim');
$email->addValidator('EmailAddress');
$this->addElement($email);
$skype = new Zend_Form_Element_Text('skype');
$skype->setLabel('Skype:');
$skype->setAttrib('class', 'input_text');
$skype->addFilter('StringTrim');
$this->addElement($skype);
$jabber = new Zend_Form_Element_Text('jabber');
$jabber->setLabel('Jabber:');
$jabber->setAttrib('class', 'input_text');
$jabber->addFilter('StringTrim');
$jabber->addValidator('EmailAddress');
$this->addElement($jabber);
$select = new Zend_Form_Element_Select('type');
$select->setAttrib('class', 'input_select');
$select->setAttrib('style', 'width: 40%');

View File

@ -50,6 +50,21 @@ class User {
$user = $this->_userInstance;
$user->setDbType($type);
}
public function setEmail($email){
$user = $this->_userInstance;
$user->setDbEmail($email);
}
public function setSkype($skype){
$user = $this->_userInstance;
$user->setDbSkypeContact($skype);
}
public function setJabber($jabber){
$user = $this->_userInstance;
$user->setDbJabberContact($jabber);
}
public function getLogin(){
$user = $this->_userInstance;
@ -75,6 +90,22 @@ class User {
$user = $this->_userInstance;
return $user->getDbType();
}
public function getEmail(){
$user = $this->_userInstance;
return $user->getDbEmail();
}
public function getSkype(){
$user = $this->_userInstance;
return $user->getDbSkypeContact();
}
public function getJabber(){
$user = $this->_userInstance;
return $user->getDbJabberContact();
}
public function save(){
$this->_userInstance->save();
@ -132,7 +163,7 @@ class User {
public static function getUserData($id){
global $CC_DBC;
$sql = "SELECT login, first_name, last_name, type, id"
$sql = "SELECT login, first_name, last_name, type, id, email, skype_contact, jabber_contact"
." FROM cc_subjs"
." WHERE id = $id";

View File

@ -0,0 +1,16 @@
<img src="/css/images/big_gray_logo.png" width="287" height="109" alt="Airtime" class="gray-logo" />
<div class="text-content">
<h2>Welcome to Airtime!</h2>
<p>Here's how you can get started using Airtime to automate your broadcasts: </p>
<ol>
<li>Add your files to the library using the "Add Audio" button. You can drag and drop your files to this window too. </li>
<li>Create a show by going to "Schedule" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.</li>
<li>Create a playlist in the Playlist Builder menu using your audio files. </li>
<li>Add the playlist to the show by going to your show in the Schedule calendar, right-clicking on it and selecting "Schedule." </li>
<li>Select your playlist and drag and drop it to the "Items in this show" area.</li>
</ol>
<p><strong>Then you're good to go!</strong><br />
For more detailed help, read the <a href="http://www.sourcefabric.org/en/products/airtime_manuals/">user manual</a></p>
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

Before

Width:  |  Height:  |  Size: 948 B

After

Width:  |  Height:  |  Size: 948 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -1375,20 +1375,22 @@ ul.errors li {
overflow:auto;
}
.text-content {
padding:20px 10px 0 20px;
padding:20px 10px 40px 58px;
background: url(images/sf_arror.png) no-repeat 60% 0;
height:100%;
}
.text-content h2 {
font-size:2.8em;
color:#242424;
font-size:2.4em;
color:#1f1f1f;
}
.text-content p {
font-size:1.6em;
line-height:140%;
color:#242424;
color:#1f1f1f;
margin:0 0 1.4em 0;
}
.text-content a {
color:#cccccc;
color:#f2f2f2;
text-decoration:none;
}
.text-content a:hover {
@ -1396,12 +1398,17 @@ ul.errors li {
}
.text-content ol {
margin:0;
list-style-position:inside;
margin:0 0 22px 25px;
padding:0;
list-style-position:outside;
}
.text-content ol li {
margin:0 0 4px 0;
font-size:1.6em;
list-style-position:inside;
margin:0 0 6px 0;
font-size:1.7em;
display:list-item;
color:#1f1f1f;
}
.gray-logo {
margin:5px 0 0 20px;
}

View File

@ -8,6 +8,9 @@ function populateForm(entries){
$('#first_name').val(entries.first_name);
$('#last_name').val(entries.last_name);
$('#type').val(entries.type);
$('#email').val(entries.email);
$('#skype').val(entries.skype_contact);
$('#jabber').val(entries.jabber_contact);
if (entries.id.length != 0){
$('#login').attr('readonly', 'readonly');

View File

@ -99,7 +99,7 @@ function updateProgressBarValue(){
}
} else {
$('#on-air-info').attr("class", "on-air-info off");
$('#progress-show').attr("class", "progress-show-red");
$('#progress-show').attr("class", "progress-show-error");
}
$('#progress-bar').attr("style", "width:"+songPercentDone+"%");