Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

This commit is contained in:
denise 2012-10-30 15:04:08 -04:00
commit 5f03a38262
18 changed files with 4589 additions and 4589 deletions

View File

@ -1,3 +1,3 @@
<?php <?php
echo $status; echo $status;

View File

@ -1,182 +1,182 @@
<div id="register_popup" class="dialogPopup register-dialog" title="Register Airtime" style="display: none;"> <div id="register_popup" class="dialogPopup register-dialog" title="Register Airtime" style="display: none;">
<form id="register-form" method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="multipart/form-data"> <form id="register-form" method="<?php echo $this->element->getMethod() ?>" action="<?php echo $this->element->getAction() ?>" enctype="multipart/form-data">
<fieldset> <fieldset>
<dl class="zend_form"> <dl class="zend_form">
<dt class="block-display info-text"> <dt class="block-display info-text">
Help Airtime improve by letting us know how you are using it. This info Help Airtime improve by letting us know how you are using it. This info
will be collected regularly in order to enhance your user experience. will be collected regularly in order to enhance your user experience.
<br /><br /> <br /><br />
Click "Yes, help Airtime" and we'll make sure the features you use are Click "Yes, help Airtime" and we'll make sure the features you use are
constantly improving. constantly improving.
</dt> </dt>
<dd id="SupportFeedback-element" class="block-display"> <dd id="SupportFeedback-element" class="block-display">
<label class="optional" for="SupportFeedback"> <label class="optional" for="SupportFeedback">
<?php echo $this->element->getElement('SupportFeedback') ?> <?php echo $this->element->getElement('SupportFeedback') ?>
<strong><?php echo $this->element->getElement('SupportFeedback')->getLabel() ?></strong> <strong><?php echo $this->element->getElement('SupportFeedback')->getLabel() ?></strong>
</label> </label>
<?php if($this->element->getElement('SupportFeedback')->hasErrors()) : ?> <?php if($this->element->getElement('SupportFeedback')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('SupportFeedback')->getMessages() as $error): ?> <?php foreach($this->element->getElement('SupportFeedback')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt class="block-display info-text"> <dt class="block-display info-text">
Click the box below to advertise your station on Click the box below to advertise your station on
<a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>. <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback. In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
</dt> </dt>
<dd id="publicize-element" class="block-display"> <dd id="publicize-element" class="block-display">
<label class="optional" for="Publicise"> <label class="optional" for="Publicise">
<?php echo $this->element->getElement('Publicise') ?> <?php echo $this->element->getElement('Publicise') ?>
<strong><?php echo $this->element->getElement('Publicise')->getLabel() ?></strong> <strong><?php echo $this->element->getElement('Publicise')->getLabel() ?></strong>
</label> </label>
<?php if($this->element->getElement('Publicise')->hasErrors()) : ?> <?php if($this->element->getElement('Publicise')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Publicise')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Publicise')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
</dl> </dl>
<dl id="public-info" style="display:none;"> <dl id="public-info" style="display:none;">
<dt id="stnName-label"> <dt id="stnName-label">
<label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?> <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?>
<span class="info-text-small">(Required)</span> : <span class="info-text-small">(Required)</span> :
</label> </label>
</dt> </dt>
<dd id="stnName-element"> <dd id="stnName-element">
<?php echo $this->element->getElement('stnName') ?> <?php echo $this->element->getElement('stnName') ?>
<?php if($this->element->getElement('stnName')->hasErrors()) : ?> <?php if($this->element->getElement('stnName')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('stnName')->getMessages() as $error): ?> <?php foreach($this->element->getElement('stnName')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="Phone-label"> <dt id="Phone-label">
<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>
<dd id="Phone-element"> <dd id="Phone-element">
<?php echo $this->element->getElement('Phone') ?> <?php echo $this->element->getElement('Phone') ?>
<span class="info-text-small">(for verification purposes only, will not be published)</span> <span class="info-text-small">(for verification purposes only, will not be published)</span>
<?php if($this->element->getElement('Phone')->hasErrors()) : ?> <?php if($this->element->getElement('Phone')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="Email-label"> <dt id="Email-label">
<label class="optional" for="Email"><?php echo $this->element->getElement('Email')->getLabel() ?></label> <label class="optional" for="Email"><?php echo $this->element->getElement('Email')->getLabel() ?></label>
</dt> </dt>
<dd id="Email-element"> <dd id="Email-element">
<?php echo $this->element->getElement('Email') ?> <?php echo $this->element->getElement('Email') ?>
<span class="info-text-small">(for verification purposes only, will not be published)</span> <span class="info-text-small">(for verification purposes only, will not be published)</span>
<?php if($this->element->getElement('Email')->hasErrors()) : ?> <?php if($this->element->getElement('Email')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Email')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Email')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="StationWebSite-label"> <dt id="StationWebSite-label">
<label class="optional" for="StationWebSite"><?php echo $this->element->getElement('StationWebSite')->getLabel() ?></label> <label class="optional" for="StationWebSite"><?php echo $this->element->getElement('StationWebSite')->getLabel() ?></label>
</dt> </dt>
<dd id="StationWebSite-element"> <dd id="StationWebSite-element">
<?php echo $this->element->getElement('StationWebSite') ?> <?php echo $this->element->getElement('StationWebSite') ?>
<?php if($this->element->getElement('StationWebSite')->hasErrors()) : ?> <?php if($this->element->getElement('StationWebSite')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('StationWebSite')->getMessages() as $error): ?> <?php foreach($this->element->getElement('StationWebSite')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="Country-label"> <dt id="Country-label">
<label class="optional" for="Country"><?php echo $this->element->getElement('Country')->getLabel() ?></label> <label class="optional" for="Country"><?php echo $this->element->getElement('Country')->getLabel() ?></label>
</dt> </dt>
<dd id="Country-element"> <dd id="Country-element">
<?php echo $this->element->getElement('Country') ?> <?php echo $this->element->getElement('Country') ?>
<?php if($this->element->getElement('Country')->hasErrors()) : ?> <?php if($this->element->getElement('Country')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Country')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Country')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="City-label"> <dt id="City-label">
<label class="optional" for="City"><?php echo $this->element->getElement('City')->getLabel() ?></label> <label class="optional" for="City"><?php echo $this->element->getElement('City')->getLabel() ?></label>
</dt> </dt>
<dd id="City-element"> <dd id="City-element">
<?php echo $this->element->getElement('City') ?> <?php echo $this->element->getElement('City') ?>
<?php if($this->element->getElement('City')->hasErrors()) : ?> <?php if($this->element->getElement('City')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('City')->getMessages() as $error): ?> <?php foreach($this->element->getElement('City')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="Description-label"> <dt id="Description-label">
<label class="optional" for="Description"><?php echo $this->element->getElement('Description')->getLabel() ?></label> <label class="optional" for="Description"><?php echo $this->element->getElement('Description')->getLabel() ?></label>
</dt> </dt>
<dd id="Description-element"> <dd id="Description-element">
<?php echo $this->element->getElement('Description') ?> <?php echo $this->element->getElement('Description') ?>
<?php if($this->element->getElement('Description')->hasErrors()) : ?> <?php if($this->element->getElement('Description')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Description')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Description')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt id="Logo-label" class="block-display"> <dt id="Logo-label" class="block-display">
<label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label> <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
</dt> </dt>
<dd id="Logo-element"> <dd id="Logo-element">
<?php if($this->element->getView()->logoImg){?> <?php if($this->element->getView()->logoImg){?>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div> <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
<?php }?> <?php }?>
<?php echo $this->element->getElement('Logo') ?> <?php echo $this->element->getElement('Logo') ?>
<p class="info-text">Note: Anything larger than 600x600 will be resized.</p> <p class="info-text">Note: Anything larger than 600x600 will be resized.</p>
<?php if($this->element->getElement('Logo')->hasErrors()) : ?> <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
<?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?> <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
<li><?php echo $error; ?></li> <li><?php echo $error; ?></li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
</dl> </dl>
</fieldset> </fieldset>
<div id="show_what_sending" style="display: block;"> <div id="show_what_sending" style="display: block;">
<fieldset class="display_field toggle closed"> <fieldset class="display_field toggle closed">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
<dl> <dl>
<?php echo $this->element->getElement('SendInfo') ?> <?php echo $this->element->getElement('SendInfo') ?>
</dl> </dl>
</fieldset> </fieldset>
</div> </div>
<div> <div>
<br> <br>
<?php if(!$this->privacyChecked){?> <?php if(!$this->privacyChecked){?>
<label class="optional" for="Privacy"> <label class="optional" for="Privacy">
<?php echo $this->element->getElement('Privacy') ?> <?php echo $this->element->getElement('Privacy') ?>
<?php echo $this->element->getElement('Privacy')->getLabel() ?> <?php echo $this->element->getElement('Privacy')->getLabel() ?>
</label> </label>
<?php }else{?> <?php }else{?>
<a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a> <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
<?php }?> <?php }?>
</div> </div>
</form> </form>
</div> </div>

View File

@ -1,2 +1,2 @@
<div id='json-string'></div> <div id='json-string'></div>
<div id='demo'></div> <div id='demo'></div>

View File

@ -1,129 +1,129 @@
#schedule-add-show, #schedule-add-show,
#fullcalendar_show_display { #fullcalendar_show_display {
float: left; float: left;
} }
#schedule-add-show { #schedule-add-show {
font-size: 12px; font-size: 12px;
/*width: 25%;*/ /*width: 25%;*/
width:310px; width:310px;
} }
#schedule-add-show textarea { #schedule-add-show textarea {
width: 99%; width: 99%;
height: 80px; height: 80px;
} }
#fullcalendar_show_display { #fullcalendar_show_display {
width: 60%; width: 60%;
} }
#schedule-add-show .ui-tabs-panel { #schedule-add-show .ui-tabs-panel {
padding-top: 8px; padding-top: 8px;
} }
#schedule-add-show fieldset { #schedule-add-show fieldset {
padding:8px; padding:8px;
margin-bottom:8px; margin-bottom:8px;
} }
#schedule-add-show dl { #schedule-add-show dl {
padding:8px; padding:8px;
margin-bottom:8px; margin-bottom:8px;
margin:0; margin:0;
padding:0; padding:0;
width:100%; width:100%;
} }
#schedule-add-show dd { #schedule-add-show dd {
padding: 4px 0; padding: 4px 0;
float: left; float: left;
font-size: 1.2em; font-size: 1.2em;
margin: 0; margin: 0;
padding: 4px 0 4px 15px; padding: 4px 0 4px 15px;
} }
#schedule-add-show dt, #schedule-add-show dt.big { #schedule-add-show dt, #schedule-add-show dt.big {
clear: left; clear: left;
color: #666666; color: #666666;
float: left; float: left;
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
padding: 4px 0; padding: 4px 0;
text-align: left; text-align: left;
min-width:103px; min-width:103px;
clear:left; clear:left;
} }
#schedule-add-show dt.big { #schedule-add-show dt.big {
min-width:130px; min-width:130px;
} }
#schedule-add-show dt.block-display, #schedule-add-show dd.block-display { #schedule-add-show dt.block-display, #schedule-add-show dd.block-display {
display:block; display:block;
float:none; float:none;
margin-left:0; margin-left:0;
padding-left:0; padding-left:0;
} }
#schedule-add-show dt label { #schedule-add-show dt label {
padding-right:0; padding-right:0;
} }
.wrapp-label { .wrapp-label {
padding:0; padding:0;
height:16px; height:16px;
display:block; display:block;
line-height:18px; line-height:18px;
} }
label.wrapp-label input[type="checkbox"] { label.wrapp-label input[type="checkbox"] {
float:left; float:left;
margin:-1px 2px 0 0; margin:-1px 2px 0 0;
} }
#schedule-add-show fieldset:last-child { #schedule-add-show fieldset:last-child {
margin-bottom:0; margin-bottom:0;
} }
#schedule-add-show fieldset dd input[type="checkbox"] { #schedule-add-show fieldset dd input[type="checkbox"] {
margin-top:2px; margin-top:2px;
} }
#add_show_day_check-element.block-display { #add_show_day_check-element.block-display {
margin-bottom:15px; margin-bottom:15px;
margin-top:7px; margin-top:7px;
} }
#add_show_day_check-element.block-display label.wrapp-label { #add_show_day_check-element.block-display label.wrapp-label {
font-size:12px; font-size:12px;
float:left; float:left;
margin-right:10px; margin-right:10px;
} }
#add_show_name-element .input_text { #add_show_name-element .input_text {
/*width:99%;*/ /*width:99%;*/
} }
#schedule-add-show-overlap { #schedule-add-show-overlap {
border: 1px solid #c83f3f; border: 1px solid #c83f3f;
background: #c6b4b4; background: #c6b4b4;
margin-top:8px; margin-top:8px;
padding:8px; padding:8px;
color:#902d2d; color:#902d2d;
display:none; display:none;
} }
#add_show_hosts-element { #add_show_hosts-element {
max-height: 80px; max-height: 80px;
min-width: 150px; min-width: 150px;
overflow: auto; overflow: auto;
} }
#add_show_start_time, #add_show_end_time { #add_show_start_time, #add_show_end_time {
width: 54px; width: 54px;
margin-left:10px; margin-left:10px;
} }
#add_show_end_date_no_repeat, #add_show_start_date { #add_show_end_date_no_repeat, #add_show_start_date {
width: 89px; width: 89px;
} }
#add_show_duration { #add_show_duration {
background: #AAAAAA; background: #AAAAAA;
cursor: default; cursor: default;
width: 65px; width: 65px;
} }

View File

@ -1,162 +1,162 @@
.colorpicker { .colorpicker {
width: 356px; width: 356px;
height: 176px; height: 176px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
background: url(../images/colorpicker_background.png); background: url(../images/colorpicker_background.png);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
display: none; display: none;
z-index: 1003; /* so it can display above the jQuery dialog*/ z-index: 1003; /* so it can display above the jQuery dialog*/
} }
.colorpicker_color { .colorpicker_color {
width: 150px; width: 150px;
height: 150px; height: 150px;
left: 14px; left: 14px;
top: 13px; top: 13px;
position: absolute; position: absolute;
background: #f00; background: #f00;
overflow: hidden; overflow: hidden;
cursor: crosshair; cursor: crosshair;
} }
.colorpicker_color div { .colorpicker_color div {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 150px; width: 150px;
height: 150px; height: 150px;
background: url(../images/colorpicker_overlay.png); background: url(../images/colorpicker_overlay.png);
} }
.colorpicker_color div div { .colorpicker_color div div {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 11px; width: 11px;
height: 11px; height: 11px;
overflow: hidden; overflow: hidden;
background: url(../images/colorpicker_select.gif); background: url(../images/colorpicker_select.gif);
margin: -5px 0 0 -5px; margin: -5px 0 0 -5px;
} }
.colorpicker_hue { .colorpicker_hue {
position: absolute; position: absolute;
top: 13px; top: 13px;
left: 171px; left: 171px;
width: 35px; width: 35px;
height: 150px; height: 150px;
cursor: n-resize; cursor: n-resize;
} }
.colorpicker_hue div { .colorpicker_hue div {
position: absolute; position: absolute;
width: 35px; width: 35px;
height: 9px; height: 9px;
overflow: hidden; overflow: hidden;
background: url(../images/colorpicker_indic.gif) left top; background: url(../images/colorpicker_indic.gif) left top;
margin: -4px 0 0 0; margin: -4px 0 0 0;
left: 0px; left: 0px;
} }
.colorpicker_new_color { .colorpicker_new_color {
position: absolute; position: absolute;
width: 60px; width: 60px;
height: 30px; height: 30px;
left: 213px; left: 213px;
top: 13px; top: 13px;
background: #f00; background: #f00;
} }
.colorpicker_current_color { .colorpicker_current_color {
position: absolute; position: absolute;
width: 60px; width: 60px;
height: 30px; height: 30px;
left: 283px; left: 283px;
top: 13px; top: 13px;
background: #f00; background: #f00;
} }
.colorpicker input { .colorpicker input {
background-color: transparent; background-color: transparent;
border: 1px solid transparent; border: 1px solid transparent;
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
color: #898989; color: #898989;
top: 4px; top: 4px;
right: 11px; right: 11px;
text-align: right; text-align: right;
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 11px; height: 11px;
} }
.colorpicker_hex { .colorpicker_hex {
position: absolute; position: absolute;
width: 72px; width: 72px;
height: 22px; height: 22px;
background: url(../images/colorpicker_hex.png) top; background: url(../images/colorpicker_hex.png) top;
left: 212px; left: 212px;
top: 142px; top: 142px;
} }
.colorpicker_hex input { .colorpicker_hex input {
right: 6px; right: 6px;
} }
.colorpicker_field { .colorpicker_field {
height: 22px; height: 22px;
width: 62px; width: 62px;
background-position: top; background-position: top;
position: absolute; position: absolute;
} }
.colorpicker_field span { .colorpicker_field span {
position: absolute; position: absolute;
width: 12px; width: 12px;
height: 22px; height: 22px;
overflow: hidden; overflow: hidden;
top: 0; top: 0;
right: 0; right: 0;
cursor: n-resize; cursor: n-resize;
} }
.colorpicker_rgb_r { .colorpicker_rgb_r {
background-image: url(../images/colorpicker_rgb_r.png); background-image: url(../images/colorpicker_rgb_r.png);
top: 52px; top: 52px;
left: 212px; left: 212px;
} }
.colorpicker_rgb_g { .colorpicker_rgb_g {
background-image: url(../images/colorpicker_rgb_g.png); background-image: url(../images/colorpicker_rgb_g.png);
top: 82px; top: 82px;
left: 212px; left: 212px;
} }
.colorpicker_rgb_b { .colorpicker_rgb_b {
background-image: url(../images/colorpicker_rgb_b.png); background-image: url(../images/colorpicker_rgb_b.png);
top: 112px; top: 112px;
left: 212px; left: 212px;
} }
.colorpicker_hsb_h { .colorpicker_hsb_h {
background-image: url(../images/colorpicker_hsb_h.png); background-image: url(../images/colorpicker_hsb_h.png);
top: 52px; top: 52px;
left: 282px; left: 282px;
} }
.colorpicker_hsb_s { .colorpicker_hsb_s {
background-image: url(../images/colorpicker_hsb_s.png); background-image: url(../images/colorpicker_hsb_s.png);
top: 82px; top: 82px;
left: 282px; left: 282px;
} }
.colorpicker_hsb_b { .colorpicker_hsb_b {
background-image: url(../images/colorpicker_hsb_b.png); background-image: url(../images/colorpicker_hsb_b.png);
top: 112px; top: 112px;
left: 282px; left: 282px;
} }
.colorpicker_submit { .colorpicker_submit {
position: absolute; position: absolute;
width: 22px; width: 22px;
height: 22px; height: 22px;
background: url(../images/colorpicker_submit.png) top; background: url(../images/colorpicker_submit.png) top;
left: 322px; left: 322px;
top: 142px; top: 142px;
overflow: hidden; overflow: hidden;
} }
.colorpicker_focus { .colorpicker_focus {
background-position: center; background-position: center;
} }
.colorpicker_hex.colorpicker_focus { .colorpicker_hex.colorpicker_focus {
background-position: bottom; background-position: bottom;
} }
.colorpicker_submit.colorpicker_focus { .colorpicker_submit.colorpicker_focus {
background-position: bottom; background-position: bottom;
} }
.colorpicker_slider { .colorpicker_slider {
background-position: bottom; background-position: bottom;
} }

View File

@ -1,72 +1,72 @@
/* /*
* Timepicker stylesheet * Timepicker stylesheet
* Highly inspired from datepicker * Highly inspired from datepicker
* FG - Nov 2010 - Web3R * FG - Nov 2010 - Web3R
* *
* version 0.0.3 : Fixed some settings, more dynamic * version 0.0.3 : Fixed some settings, more dynamic
* version 0.0.4 : Removed width:100% on tables * version 0.0.4 : Removed width:100% on tables
* version 0.1.1 : set width 0 on tables to fix an ie6 bug * version 0.1.1 : set width 0 on tables to fix an ie6 bug
*/ */
.ui-timepicker-inline { display: inline; } .ui-timepicker-inline { display: inline; }
#ui-timepicker-div { #ui-timepicker-div {
padding: 0.2em; padding: 0.2em;
z-index: 1000; z-index: 1000;
} }
.ui-timepicker-table { display: inline-table; width: 0; } .ui-timepicker-table { display: inline-table; width: 0; }
.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; } .ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em; } .ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em; }
.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; } .ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
.ui-timepicker-table td { padding: 0.1em; width: 2.2em; } .ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; } .ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
/* span for disabled cells */ /* span for disabled cells */
.ui-timepicker-table td span { .ui-timepicker-table td span {
display:block; display:block;
padding:0.2em 0.3em 0.2em 0.5em; padding:0.2em 0.3em 0.2em 0.5em;
width: 1.2em; width: 1.2em;
text-align:right; text-align:right;
text-decoration:none; text-decoration:none;
} }
/* anchors for clickable cells */ /* anchors for clickable cells */
.ui-timepicker-table td a { .ui-timepicker-table td a {
display:block; display:block;
padding:0.2em 0.3em 0.2em 0.5em; padding:0.2em 0.3em 0.2em 0.5em;
width: 1.2em; width: 1.2em;
cursor: pointer; cursor: pointer;
text-align:right; text-align:right;
text-decoration:none; text-decoration:none;
} }
/* buttons and button pane styling */ /* buttons and button pane styling */
.ui-timepicker .ui-timepicker-buttonpane { .ui-timepicker .ui-timepicker-buttonpane {
background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
} }
.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } .ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
/* The close button */ /* The close button */
.ui-timepicker .ui-timepicker-close { float: right } .ui-timepicker .ui-timepicker-close { float: right }
/* the now button */ /* the now button */
.ui-timepicker .ui-timepicker-now { float: left; } .ui-timepicker .ui-timepicker-now { float: left; }
/* the deselect button */ /* the deselect button */
.ui-timepicker .ui-timepicker-deselect { float: left; } .ui-timepicker .ui-timepicker-deselect { float: left; }
/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
.ui-timepicker-cover { .ui-timepicker-cover {
display: none; /*sorry for IE5*/ display: none; /*sorry for IE5*/
display/**/: block; /*sorry for IE5*/ display/**/: block; /*sorry for IE5*/
position: absolute; /*must have*/ position: absolute; /*must have*/
z-index: -1; /*must have*/ z-index: -1; /*must have*/
filter: mask(); /*must have*/ filter: mask(); /*must have*/
top: -4px; /*must have*/ top: -4px; /*must have*/
left: -4px; /*must have*/ left: -4px; /*must have*/
width: 200px; /*must have*/ width: 200px; /*must have*/
height: 200px; /*must have*/ height: 200px; /*must have*/
} }

View File

@ -1,176 +1,176 @@
/* /*
Plupload Plupload
------------------------------------------------------------------- */ ------------------------------------------------------------------- */
.plupload_button { .plupload_button {
display: -moz-inline-box; /* FF < 3*/ display: -moz-inline-box; /* FF < 3*/
display: inline-block; display: inline-block;
font: normal 12px sans-serif; font: normal 12px sans-serif;
text-decoration: none; text-decoration: none;
color: #42454a; color: #42454a;
border: 1px solid #bababa; border: 1px solid #bababa;
padding: 2px 8px 3px 20px; padding: 2px 8px 3px 20px;
margin-right: 4px; margin-right: 4px;
background: #f3f3f3 url('img/buttons.png') no-repeat 0 center; background: #f3f3f3 url('img/buttons.png') no-repeat 0 center;
outline: 0; outline: 0;
/* Optional rounded corners for browsers that support it */ /* Optional rounded corners for browsers that support it */
-moz-border-radius: 3px; -moz-border-radius: 3px;
-khtml-border-radius: 3px; -khtml-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.plupload_button:hover { .plupload_button:hover {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
} }
.plupload_disabled, a.plupload_disabled:hover { .plupload_disabled, a.plupload_disabled:hover {
color: #737373; color: #737373;
border-color: #c5c5c5; border-color: #c5c5c5;
background: #ededed url('img/buttons-disabled.png') no-repeat 0 center; background: #ededed url('img/buttons-disabled.png') no-repeat 0 center;
cursor: default; cursor: default;
} }
.plupload_add { .plupload_add {
background-position: -181px center; background-position: -181px center;
} }
.plupload_wrapper { .plupload_wrapper {
font: normal 11px Verdana,sans-serif; font: normal 11px Verdana,sans-serif;
width: 100%; width: 100%;
} }
.plupload_container { .plupload_container {
padding: 8px; padding: 8px;
background: url('img/transp50.png'); background: url('img/transp50.png');
/*-moz-border-radius: 5px;*/ /*-moz-border-radius: 5px;*/
} }
.plupload_container input { .plupload_container input {
border: 1px solid #DDD; border: 1px solid #DDD;
font: normal 11px Verdana,sans-serif; font: normal 11px Verdana,sans-serif;
width: 98%; width: 98%;
} }
.plupload_header {background: #2A2C2E url('img/backgrounds.gif') repeat-x;} .plupload_header {background: #2A2C2E url('img/backgrounds.gif') repeat-x;}
.plupload_header_content { .plupload_header_content {
min-height: 56px; min-height: 56px;
padding-left: 10px; padding-left: 10px;
color: #FFF; color: #FFF;
} }
.plupload_header_title { .plupload_header_title {
font: normal 18px sans-serif; font: normal 18px sans-serif;
padding: 6px 0 3px; padding: 6px 0 3px;
} }
.plupload_header_text { .plupload_header_text {
font: normal 12px sans-serif; font: normal 12px sans-serif;
} }
.plupload_filelist { .plupload_filelist {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style: none; list-style: none;
} }
.plupload_scroll .plupload_filelist { .plupload_scroll .plupload_filelist {
height: 185px; height: 185px;
background: #F5F5F5; background: #F5F5F5;
overflow-y: scroll; overflow-y: scroll;
} }
.plupload_filelist li { .plupload_filelist li {
padding: 10px 8px; padding: 10px 8px;
background: #F5F5F5 url('img/backgrounds.gif') repeat-x 0 -156px; background: #F5F5F5 url('img/backgrounds.gif') repeat-x 0 -156px;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
} }
.plupload_filelist_header, .plupload_filelist_footer { .plupload_filelist_header, .plupload_filelist_footer {
background: #DFDFDF; background: #DFDFDF;
padding: 8px 8px; padding: 8px 8px;
color: #42454A; color: #42454A;
} }
.plupload_filelist_header { .plupload_filelist_header {
border-top: 1px solid #EEE; border-top: 1px solid #EEE;
border-bottom: 1px solid #CDCDCD; border-bottom: 1px solid #CDCDCD;
} }
.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;} .plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}
.plupload_file_name {float: left; overflow: hidden} .plupload_file_name {float: left; overflow: hidden}
.plupload_file_status {color: #777;} .plupload_file_status {color: #777;}
.plupload_file_status span {color: #42454A;} .plupload_file_status span {color: #42454A;}
.plupload_file_size, .plupload_file_status, .plupload_progress { .plupload_file_size, .plupload_file_status, .plupload_progress {
float: right; float: right;
width: 80px; width: 80px;
} }
.plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;} .plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;}
.plupload_filelist .plupload_file_name {width: 68%;} .plupload_filelist .plupload_file_name {width: 68%;}
.plupload_file_action { .plupload_file_action {
float: right; float: right;
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-left: 15px; margin-left: 15px;
} }
.plupload_file_action * { .plupload_file_action * {
display: none; display: none;
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
li.plupload_uploading {background: #ECF3DC url('img/backgrounds.gif') repeat-x 0 -238px;} li.plupload_uploading {background: #ECF3DC url('img/backgrounds.gif') repeat-x 0 -238px;}
li.plupload_done {color:#AAA} li.plupload_done {color:#AAA}
li.plupload_delete a { li.plupload_delete a {
background: url('img/delete.gif'); background: url('img/delete.gif');
} }
li.plupload_failed a { li.plupload_failed a {
background: url('img/error.gif'); background: url('img/error.gif');
cursor: default; cursor: default;
} }
li.plupload_done a { li.plupload_done a {
background: url('img/done.gif'); background: url('img/done.gif');
cursor: default; cursor: default;
} }
.plupload_progress, .plupload_upload_status { .plupload_progress, .plupload_upload_status {
display: none; display: none;
} }
.plupload_progress_container { .plupload_progress_container {
margin-top: 3px; margin-top: 3px;
border: 1px solid #CCC; border: 1px solid #CCC;
background: #FFF; background: #FFF;
padding: 1px; padding: 1px;
} }
.plupload_progress_bar { .plupload_progress_bar {
width: 0px; width: 0px;
height: 7px; height: 7px;
background: #CDEB8B; background: #CDEB8B;
} }
.plupload_scroll .plupload_filelist_header .plupload_file_action, .plupload_scroll .plupload_filelist_footer .plupload_file_action { .plupload_scroll .plupload_filelist_header .plupload_file_action, .plupload_scroll .plupload_filelist_footer .plupload_file_action {
margin-right: 17px; margin-right: 17px;
} }
/* Floats */ /* Floats */
.plupload_clear,.plupload_clearer {clear: both;} .plupload_clear,.plupload_clearer {clear: both;}
.plupload_clearer, .plupload_progress_bar { .plupload_clearer, .plupload_progress_bar {
display: block; display: block;
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
} }
li.plupload_droptext { li.plupload_droptext {
background: transparent; background: transparent;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border: 0; border: 0;
line-height: 165px; line-height: 165px;
} }

View File

@ -1,185 +1,185 @@
/* ================================================================ /* ================================================================
This copyright notice must be kept untouched in the stylesheet at This copyright notice must be kept untouched in the stylesheet at
all times. all times.
The original version of this stylesheet and the associated (x)html The original version of this stylesheet and the associated (x)html
is available at http://www.stunicholls.com/menu/pro_dropdown_3.html is available at http://www.stunicholls.com/menu/pro_dropdown_3.html
Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. Copyright (c) 2005-2007 Stu Nicholls. All rights reserved.
This stylesheet and the associated (x)html may be modified in any This stylesheet and the associated (x)html may be modified in any
way to fit your requirements. way to fit your requirements.
=================================================================== */ =================================================================== */
#nav { #nav {
padding:7px 0 0 6px; padding:7px 0 0 6px;
margin:0; margin:0;
list-style:none; list-style:none;
height:28px; height:28px;
background:#353535; background:#353535;
position:relative; position:relative;
z-index:500; z-index:500;
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
border-top:1px solid #7e7e7e; border-top:1px solid #7e7e7e;
border-bottom:1px solid #242424; border-bottom:1px solid #242424;
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.35); -moz-box-shadow: 0 2px 5px rgba(0,0,0,.35);
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35); -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 0 2px 5px rgba(0,0,0,.35); box-shadow: 0 2px 5px rgba(0,0,0,.35);
} }
#nav li.top { #nav li.top {
display:block; display:block;
float:left; float:left;
margin:0 5px 0 0; margin:0 5px 0 0;
} }
#nav li a.top_link { #nav li a.top_link {
display:block; display:block;
float:left; float:left;
height:18px; height:18px;
color:#ccc; color:#ccc;
text-decoration:none; text-decoration:none;
font-size:11px; font-size:11px;
text-transform:uppercase; text-transform:uppercase;
font-weight:bold; font-weight:bold;
padding:4px 0 0 14px; padding:4px 0 0 14px;
cursor:pointer; cursor:pointer;
} }
#nav li a.top_link span { #nav li a.top_link span {
float:left; float:left;
display:block; display:block;
padding:0 14px 0 0; padding:0 14px 0 0;
} }
#nav li a.top_link span.down { #nav li a.top_link span.down {
float:left; float:left;
display:block; display:block;
padding:0 28px 0 0px; padding:0 28px 0 0px;
background:url(images/down_arrow.png) no-repeat right 50%; background:url(images/down_arrow.png) no-repeat right 50%;
} }
#nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link { #nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link {
color:#fff; color:#fff;
background:#000; background:#000;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
#nav li:hover a.top_link span { #nav li:hover a.top_link span {
} }
#nav li:hover a.top_link span.down { #nav li:hover a.top_link span.down {
background:url(images/down_arrow.png) no-repeat right 50%; background:url(images/down_arrow.png) no-repeat right 50%;
} }
/* Default list styling */ /* Default list styling */
#nav li:hover { #nav li:hover {
position:relative; position:relative;
z-index:200; z-index:200;
} }
#nav li:hover ul.sub { #nav li:hover ul.sub {
left:1px; left:1px;
top:22px; top:22px;
background: #202020; background: #202020;
padding:3px; padding:3px;
border:1px solid #161616; border:1px solid #161616;
white-space:nowrap; white-space:nowrap;
width:200px; width:200px;
height:auto; height:auto;
z-index:300; z-index:300;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
#nav li:hover ul.sub li { #nav li:hover ul.sub li {
display:block; display:block;
height:22px; height:22px;
position:relative; position:relative;
float:left; float:left;
width:200px; width:200px;
font-weight:normal; font-weight:normal;
} }
#nav li:hover ul.sub li a { #nav li:hover ul.sub li a {
display:block; display:block;
font-size:12px; font-size:12px;
height:20px; height:20px;
width:198px; width:198px;
line-height:20px; line-height:20px;
text-indent:5px; text-indent:5px;
color:#fff; color:#fff;
text-decoration:none; text-decoration:none;
border:1px solid #202020; border:1px solid #202020;
-moz-border-radius: 2px; -moz-border-radius: 2px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
#nav li ul.sub li a.fly { #nav li ul.sub li a.fly {
background:#202020 url(images/arrow.png) 190px 6px no-repeat; background:#202020 url(images/arrow.png) 190px 6px no-repeat;
} }
#nav li:hover ul.sub li a:hover { #nav li:hover ul.sub li a:hover {
background:#3d3d3d; background:#3d3d3d;
color:#fff; color:#fff;
border-color:#4e4e4e; border-color:#4e4e4e;
} }
#nav li:hover ul.sub li a.fly:hover { #nav li:hover ul.sub li a.fly:hover {
background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat; background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat;
color:#fff; color:#fff;
} }
#nav li strong { #nav li strong {
display:block; display:block;
font-size:12px; font-size:12px;
height:20px; height:20px;
width:198px; width:198px;
line-height:20px; line-height:20px;
margin-bottom:3px; margin-bottom:3px;
text-indent:6px; text-indent:6px;
color:#ff5d1a; color:#ff5d1a;
border-bottom:1px solid #414141; border-bottom:1px solid #414141;
cursor:default; cursor:default;
font-weight:bold; font-weight:bold;
} }
#nav li:hover li:hover ul, #nav li:hover li:hover li:hover ul, #nav li:hover li:hover li:hover li:hover ul, #nav li:hover li:hover li:hover li:hover li:hover ul { #nav li:hover li:hover ul, #nav li:hover li:hover li:hover ul, #nav li:hover li:hover li:hover li:hover ul, #nav li:hover li:hover li:hover li:hover li:hover ul {
left:200px; left:200px;
top:-4px; top:-4px;
background: #202020; background: #202020;
padding:3px; padding:3px;
border:1px solid #161616; border:1px solid #161616;
white-space:nowrap; white-space:nowrap;
width:200px; width:200px;
z-index:400; z-index:400;
height:auto; height:auto;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
#nav ul, #nav li:hover ul ul, #nav li:hover li:hover ul ul, #nav li:hover li:hover li:hover ul ul, #nav li:hover li:hover li:hover li:hover ul ul { #nav ul, #nav li:hover ul ul, #nav li:hover li:hover ul ul, #nav li:hover li:hover li:hover ul ul, #nav li:hover li:hover li:hover li:hover ul ul {
position:absolute; position:absolute;
left:-9999px; left:-9999px;
top:-9999px; top:-9999px;
width:0; width:0;
height:0; height:0;
margin:0; margin:0;
padding:0; padding:0;
list-style:none; list-style:none;
} }
#nav li:hover li:hover a.fly, #nav li:hover li:hover li:hover a.fly, #nav li:hover li:hover li:hover li:hover a.fly, #nav li:hover li:hover li:hover li:hover li:hover a.fly { #nav li:hover li:hover a.fly, #nav li:hover li:hover li:hover a.fly, #nav li:hover li:hover li:hover li:hover a.fly, #nav li:hover li:hover li:hover li:hover li:hover a.fly {
background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat; background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat;
color:#fff; color:#fff;
border-color:#4e4e4e; border-color:#4e4e4e;
} }
#nav li:hover li:hover li:hover a.fly { #nav li:hover li:hover li:hover a.fly {
background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat; background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat;
color:#fff; color:#fff;
border-color:#4e4e4e; border-color:#4e4e4e;
} }
#nav li:hover li:hover li:hover li:hover li:hover a.fly { #nav li:hover li:hover li:hover li:hover li:hover a.fly {
background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat; background:#3d3d3d url(images/arrow_over.png) 190px 6px no-repeat;
color:#fff; color:#fff;
border-color:#4e4e4e; border-color:#4e4e4e;
} }
#nav li:hover li:hover li a.fly, #nav li:hover li:hover li a.fly,
#nav li:hover li:hover li:hover li a.fly, #nav li:hover li:hover li:hover li a.fly,
#nav li:hover li:hover li:hover li:hover li a.fly { #nav li:hover li:hover li:hover li:hover li a.fly {
background:#202020 url(images/arrow.png) 190px 6px no-repeat; background:#202020 url(images/arrow.png) 190px 6px no-repeat;
color:#fff; color:#fff;
border-color:#202020; border-color:#202020;
} }

File diff suppressed because it is too large Load Diff

View File

@ -9,16 +9,16 @@ class Version20120405114454 extends AbstractMigration
{ {
public function up(Schema $schema) public function up(Schema $schema)
{ {
//create cc_subjs_token table //create cc_subjs_token table
$cc_subjs_token = $schema->createTable('cc_subjs_token'); $cc_subjs_token = $schema->createTable('cc_subjs_token');
$cc_subjs_token->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true)); $cc_subjs_token->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
$cc_subjs_token->addColumn('user_id', 'integer', array('notnull' => 1)); $cc_subjs_token->addColumn('user_id', 'integer', array('notnull' => 1));
$cc_subjs_token->addColumn('action', 'string', array('length' => 255, 'notnull' => 1)); $cc_subjs_token->addColumn('action', 'string', array('length' => 255, 'notnull' => 1));
$cc_subjs_token->addColumn('token', 'string', array('length' => 40, 'notnull' => 1)); $cc_subjs_token->addColumn('token', 'string', array('length' => 40, 'notnull' => 1));
$cc_subjs_token->addColumn('created', 'datetime', array('notnull' => 1)); $cc_subjs_token->addColumn('created', 'datetime', array('notnull' => 1));
$cc_subjs_token->setPrimaryKey(array('id')); $cc_subjs_token->setPrimaryKey(array('id'));
//end create cc_subjs_token table //end create cc_subjs_token table
} }

View File

@ -24,21 +24,21 @@ class Version20120410104441 extends AbstractMigration
$this->_addSql("ALTER TABLE cc_files ADD temp_br integer"); $this->_addSql("ALTER TABLE cc_files ADD temp_br integer");
$this->_addSql("ALTER TABLE cc_files ADD temp_sr integer"); $this->_addSql("ALTER TABLE cc_files ADD temp_sr integer");
$this->_addSql("UPDATE cc_files SET temp_br = bit_rate::integer"); $this->_addSql("UPDATE cc_files SET temp_br = bit_rate::integer");
$this->_addSql("UPDATE cc_files SET temp_sr = sample_rate::integer"); $this->_addSql("UPDATE cc_files SET temp_sr = sample_rate::integer");
$this->_addSql("ALTER TABLE cc_files DROP COLUMN sample_rate"); $this->_addSql("ALTER TABLE cc_files DROP COLUMN sample_rate");
$this->_addSql("ALTER TABLE cc_files DROP COLUMN bit_rate"); $this->_addSql("ALTER TABLE cc_files DROP COLUMN bit_rate");
$this->_addSql("ALTER TABLE cc_files RENAME COLUMN temp_sr TO sample_rate"); $this->_addSql("ALTER TABLE cc_files RENAME COLUMN temp_sr TO sample_rate");
$this->_addSql("ALTER TABLE cc_files RENAME COLUMN temp_br TO bit_rate"); $this->_addSql("ALTER TABLE cc_files RENAME COLUMN temp_br TO bit_rate");
//add utime, lptime //add utime, lptime
$this->_addSql("ALTER TABLE cc_files ADD utime timestamp"); $this->_addSql("ALTER TABLE cc_files ADD utime timestamp");
$this->_addSql("ALTER TABLE cc_files ADD lptime timestamp"); $this->_addSql("ALTER TABLE cc_files ADD lptime timestamp");
//setting these to a default now for timeline refresh purposes. //setting these to a default now for timeline refresh purposes.
$now = gmdate("Y-m-d H:i:s"); $now = gmdate("Y-m-d H:i:s");
$this->_addSql("UPDATE cc_files SET utime = '$now'"); $this->_addSql("UPDATE cc_files SET utime = '$now'");
} }

View File

@ -12,7 +12,7 @@ class Version20120410143340 extends AbstractMigration
*/ */
public function up(Schema $schema) public function up(Schema $schema)
{ {
//convert column creator to be creator_id on cc_playlist //convert column creator to be creator_id on cc_playlist
$this->_addSql("ALTER TABLE cc_playlist ADD creator_id integer"); $this->_addSql("ALTER TABLE cc_playlist ADD creator_id integer");
$this->_addSql("UPDATE cc_playlist SET creator_id = (SELECT id FROM cc_subjs WHERE creator = login)"); $this->_addSql("UPDATE cc_playlist SET creator_id = (SELECT id FROM cc_subjs WHERE creator = login)");
$this->_addSql("ALTER TABLE cc_playlist DROP COLUMN creator"); $this->_addSql("ALTER TABLE cc_playlist DROP COLUMN creator");

View File

@ -136,36 +136,36 @@ class CcShowInstances extends BaseCcShowInstances {
->update(array('DbPlayoutStatus' => 0), $con); ->update(array('DbPlayoutStatus' => 0), $con);
} }
/** /**
* Computes the value of the aggregate column time_filled * Computes the value of the aggregate column time_filled
* *
* @param PropelPDO $con A connection object * @param PropelPDO $con A connection object
* *
* @return mixed The scalar result from the aggregate query * @return mixed The scalar result from the aggregate query
*/ */
public function computeDbTimeFilled(PropelPDO $con) public function computeDbTimeFilled(PropelPDO $con)
{ {
$stmt = $con->prepare('SELECT SUM(clip_length) FROM "cc_schedule" WHERE cc_schedule.INSTANCE_ID = :p1'); $stmt = $con->prepare('SELECT SUM(clip_length) FROM "cc_schedule" WHERE cc_schedule.INSTANCE_ID = :p1');
$stmt->bindValue(':p1', $this->getDbId()); $stmt->bindValue(':p1', $this->getDbId());
$stmt->execute(); $stmt->execute();
return $stmt->fetchColumn(); return $stmt->fetchColumn();
} }
/** /**
* Updates the aggregate column time_filled * Updates the aggregate column time_filled
* *
* @param PropelPDO $con A connection object * @param PropelPDO $con A connection object
*/ */
public function updateDbTimeFilled(PropelPDO $con) public function updateDbTimeFilled(PropelPDO $con)
{ {
$this->setDbTimeFilled($this->computeDbTimeFilled($con)); $this->setDbTimeFilled($this->computeDbTimeFilled($con));
$this->save($con); $this->save($con);
} }
public function preInsert(PropelPDO $con = null) { public function preInsert(PropelPDO $con = null) {
$now = new DateTime("now", new DateTimeZone("UTC")); $now = new DateTime("now", new DateTimeZone("UTC"));
$this->setDbCreated($now); $this->setDbCreated($now);
return true; return true;
} }
} // CcShowInstances } // CcShowInstances

View File

@ -26,31 +26,31 @@ class UpgradeCommon {
*/ */
public static function connectToDatabase($p_exitOnError = true) public static function connectToDatabase($p_exitOnError = true)
{ {
try { try {
$con = Propel::getConnection(); $con = Propel::getConnection();
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage().PHP_EOL; echo $e->getMessage().PHP_EOL;
echo "Database connection problem.".PHP_EOL; echo "Database connection problem.".PHP_EOL;
echo "Check if database exists with corresponding permissions.".PHP_EOL; echo "Check if database exists with corresponding permissions.".PHP_EOL;
if ($p_exitOnError) { if ($p_exitOnError) {
exit(1); exit(1);
} }
return false; return false;
} }
return true; return true;
} }
public static function DbTableExists($p_name) public static function DbTableExists($p_name)
{ {
$con = Propel::getConnection(); $con = Propel::getConnection();
try { try {
$sql = "SELECT * FROM ".$p_name." LIMIT 1"; $sql = "SELECT * FROM ".$p_name." LIMIT 1";
$con->query($sql); $con->query($sql);
} catch (PDOException $e){ } catch (PDOException $e){
return false; return false;
} }
return true; return true;
} }
private static function GetAirtimeSrcDir() private static function GetAirtimeSrcDir()

View File

@ -1,7 +1,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="@*|node()"> <xsl:template match="@*|node()">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="@*|node()"/> <xsl:apply-templates select="@*|node()"/>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -1,213 +1,213 @@
@charset "utf-8"; @charset "utf-8";
/* CSS Document */ /* CSS Document */
#headerLiveHolder { #headerLiveHolder {
overflow: hidden; overflow: hidden;
position:relative; position:relative;
width:300px!important; width:300px!important;
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
font-size: 13px; font-size: 13px;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#headerLiveHolder * { #headerLiveHolder * {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#headerLiveHolder ul { #headerLiveHolder ul {
list-style-type:none; list-style-type:none;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#headerLiveHolder h4 { #headerLiveHolder h4 {
font-size:10px; font-size:10px;
color:#68bd44; color:#68bd44;
text-transform:uppercase; text-transform:uppercase;
font-weight:normal; font-weight:normal;
line-height:12px; line-height:12px;
} }
#headerLiveHolder ul li { #headerLiveHolder ul li {
overflow:hidden; overflow:hidden;
position:relative; position:relative;
height:12px; height:12px;
padding-right:70px; padding-right:70px;
font-size:11px; font-size:11px;
color:#999999; color:#999999;
line-height:11px; line-height:11px;
} }
#headerLiveHolder ul li.current { #headerLiveHolder ul li.current {
font-weight:bold; font-weight:bold;
color:#666666; color:#666666;
} }
#headerLiveHolder ul li span { #headerLiveHolder ul li span {
position:absolute; position:absolute;
right:0px; right:0px;
top:0px; top:0px;
} }
#headerLiveHolder ul li span#time-elapsed { #headerLiveHolder ul li span#time-elapsed {
right: 50px; right: 50px;
} }
#headerLiveHolder ul li span#time-elapsed:before { #headerLiveHolder ul li span#time-elapsed:before {
content: "e."; content: "e.";
} }
#headerLiveHolder ul li span#time-remaining:before { #headerLiveHolder ul li span#time-remaining:before {
content: "r."; content: "r.";
} }
#onAirToday { #onAirToday {
width:300px; width:300px;
margin-bottom:15px; margin-bottom:15px;
border:1px solid #999999; border:1px solid #999999;
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
} }
#onAirToday h3 { #onAirToday h3 {
margin:0; margin:0;
padding:0 10px; padding:0 10px;
font-size:13px; font-size:13px;
color:#ffffff; color:#ffffff;
line-height:28px; line-height:28px;
background: #999999; background: #999999;
} }
#onAirToday table { #onAirToday table {
border-collapse: collapse; border-collapse: collapse;
clear: both; clear: both;
padding: 0; padding: 0;
} }
#onAirToday table tbody { #onAirToday table tbody {
color: #000; color: #000;
font-size:12px; font-size:12px;
} }
#onAirToday table tbody tr { #onAirToday table tbody tr {
height: 30px; height: 30px;
} }
#onAirToday table tbody tr td { #onAirToday table tbody tr td {
border-bottom: 1px dotted #d9d9d9; border-bottom: 1px dotted #d9d9d9;
height: 30px; height: 30px;
padding-left: 10px; padding-left: 10px;
font-weight:bold; font-weight:bold;
} }
#onAirToday table tbody tr td a { #onAirToday table tbody tr td a {
text-decoration:none; text-decoration:none;
} }
#onAirToday table tbody tr td a:hover { #onAirToday table tbody tr td a:hover {
text-decoration:underline; text-decoration:underline;
} }
#onAirToday table tbody tr:last-child td { #onAirToday table tbody tr:last-child td {
border-bottom: none; border-bottom: none;
} }
#onAirToday table tbody tr td.time { #onAirToday table tbody tr td.time {
font-weight:normal; font-weight:normal;
color: #666666; color: #666666;
} }
/* = PROGRAM SCHEDULE ---------------- */ /* = PROGRAM SCHEDULE ---------------- */
/* /*
+ Center Column */ + Center Column */
#scheduleTabs { #scheduleTabs {
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
} }
#scheduleTabs ul { #scheduleTabs ul {
overflow:hidden; overflow:hidden;
height:28px; height:28px;
background: url( widget-img/schedule-tabs-list-bgr.png) repeat-x left bottom; background: url( widget-img/schedule-tabs-list-bgr.png) repeat-x left bottom;
list-style-type:none; list-style-type:none;
margin:0; margin:0;
padding:0; padding:0;
} }
#scheduleTabs ul li { #scheduleTabs ul li {
float:left; float:left;
height:28px; height:28px;
margin:0; margin:0;
padding:0; padding:0;
} }
#scheduleTabs ul li a { #scheduleTabs ul li a {
display:block; display:block;
float:left; float:left;
height:25px; height:25px;
padding:0 10px; padding:0 10px;
margin-top:3px; margin-top:3px;
font-size:12px; font-size:12px;
font-weight:bold; font-weight:bold;
color:#666; color:#666;
line-height:25px; line-height:25px;
border-right:1px solid #dbdbdb; border-right:1px solid #dbdbdb;
border-left:1px solid #f4f4f4; border-left:1px solid #f4f4f4;
text-decoration:none; text-decoration:none;
} }
#scheduleTabs ul li a:hover { #scheduleTabs ul li a:hover {
color:#000; color:#000;
text-decoration:none; text-decoration:none;
} }
#scheduleTabs ul li.ui-tabs-selected a { #scheduleTabs ul li.ui-tabs-selected a {
height:27px; height:27px;
margin-top:0px; margin-top:0px;
line-height:27px; line-height:27px;
color:#333333; color:#333333;
background:#ffffff; background:#ffffff;
border:1px solid #cac9c9; border-bottom:none; border:1px solid #cac9c9; border-bottom:none;
} }
#scheduleTabs table { #scheduleTabs table {
clear:both; clear:both;
padding:0px; padding:0px;
border-collapse:collapse; border-collapse:collapse;
width:100%; width:100%;
} }
#scheduleTabs table thead { #scheduleTabs table thead {
height:35px; height:35px;
font-size:12px; color:#333333; line-height:35px; font-size:12px; color:#333333; line-height:35px;
background-color: #fff; background-color: #fff;
background: -moz-linear-gradient(top, #ffffff 10%, #f4f4f4 100%); background: -moz-linear-gradient(top, #ffffff 10%, #f4f4f4 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(10%, #ffffff), color-stop(100%, #f4f4f4)); background: -webkit-gradient(linear, left top, left bottom, color-stop(10%, #ffffff), color-stop(100%, #f4f4f4));
border-bottom:1px solid #d4d4d4; border-bottom:1px solid #d4d4d4;
} }
#scheduleTabs table thead tr { #scheduleTabs table thead tr {
height:35px; height:35px;
} }
#scheduleTabs table thead tr td { #scheduleTabs table thead tr td {
padding-left:10px; padding-left:10px;
font-size:11px; color:#999999; text-transform:uppercase; font-size:11px; color:#999999; text-transform:uppercase;
} }
#scheduleTabs table tfoot { #scheduleTabs table tfoot {
} }
#scheduleTabs table tbody { #scheduleTabs table tbody {
font-size:13px; color:#666666; font-weight:bold; font-size:13px; color:#666666; font-weight:bold;
} }
#scheduleTabs table tbody tr { #scheduleTabs table tbody tr {
height:30px; height:30px;
} }
#scheduleTabs table tbody tr td { #scheduleTabs table tbody tr td {
height:30px; height:30px;
padding-left:10px; padding-left:10px;
border-bottom:1px dotted #b3b3b3; border-bottom:1px dotted #b3b3b3;
} }
#scheduleTabs table tbody tr td h4 { #scheduleTabs table tbody tr td h4 {
color:#333333; font-size:12px; color:#333333; font-size:12px;
margin:0; margin:0;
padding:0; padding:0;
} }
#scheduleTabs table tbody tr td ul { #scheduleTabs table tbody tr td ul {
background:none !important; background:none !important;
list-style-type:none; list-style-type:none;
} }
#scheduleTabs table tbody tr td ul li { #scheduleTabs table tbody tr td ul li {
float:left; float:left;
height:30px !important; height:30px !important;
padding:0 2px; padding:0 2px;
font-size:12px; color:#cc0000; font-weight:normal; line-height:30px !important; font-size:12px; color:#cc0000; font-weight:normal; line-height:30px !important;
} }
#scheduleTabs table tbody tr td ul li a { #scheduleTabs table tbody tr td ul li a {
height:30px !important; height:30px !important;
margin:0px !important; padding:0px !important; margin:0px !important; padding:0px !important;
font-size:12px; color:#68BD44 !important; font-weight:normal !important; text-transform:uppercase; line-height:30px !important; font-size:12px; color:#68BD44 !important; font-weight:normal !important; text-transform:uppercase; line-height:30px !important;
background:none !important; background:none !important;
border:none !important; border:none !important;
} }
#scheduleTabs table tbody tr td ul li a:hover { #scheduleTabs table tbody tr td ul li a:hover {
text-decoration:underline; text-decoration:underline;
} }
#scheduleTabs.ui-tabs .ui-tabs-hide { #scheduleTabs.ui-tabs .ui-tabs-hide {
display: none; display: none;
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,51 +1,51 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Airtime widgets</title> <title>Airtime widgets</title>
<link href="css/airtime-widgets.css" rel="stylesheet" type="text/css" /> <link href="css/airtime-widgets.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>
<div id="headerLiveHolder"> <div id="headerLiveHolder">
<h4>On air now &gt;&gt;</h4> <h4>On air now &gt;&gt;</h4>
<ul class="widget now-playing-bar"> <ul class="widget now-playing-bar">
<li class="current">Current: Réseau jeunesse<span class="time-elapsed" id="time-elapsed">02:22</span><span class="time-remaining" id="time-remaining">27:37</span></li> <li class="current">Current: Réseau jeunesse<span class="time-elapsed" id="time-elapsed">02:22</span><span class="time-remaining" id="time-remaining">27:37</span></li>
<li class="next">Next: Mano River Press (EN)<span>07:00 - 07:30</span></li> <li class="next">Next: Mano River Press (EN)<span>07:00 - 07:30</span></li>
</ul> </ul>
</div> </div>
<br /> <br />
<br /> <br />
<div id="onAirToday"> <div id="onAirToday">
<h3>On air today</h3> <h3>On air today</h3>
<table cellspacing="0" cellpadding="0" border="0" width="100%" class="widget widget now-playing-list small"> <table cellspacing="0" cellpadding="0" border="0" width="100%" class="widget widget now-playing-list small">
<tbody> <tbody>
<tr> <tr>
<td class="time">04:30 - 05:00</td> <td class="time">04:30 - 05:00</td>
<td><a href="http://www.wadr.org/fr/site/reseau_jeunesse/">Réseau jeunesse</a></td> <td><a href="http://www.wadr.org/fr/site/reseau_jeunesse/">Réseau jeunesse</a></td>
</tr> </tr>
<tr> <tr>
<td class="time">07:00 - 07:30</td> <td class="time">07:00 - 07:30</td>
<td><a href="http://www.wadr.org/en/site/mano_river_press/">Mano River Press (EN)</a></td> <td><a href="http://www.wadr.org/en/site/mano_river_press/">Mano River Press (EN)</a></td>
</tr> </tr>
<tr> <tr>
<td class="time">07:30 - 08:00</td> <td class="time">07:30 - 08:00</td>
<td><a href="http://www.wadr.org/en/site/mano_river_press/">Weekend Review (EN)</a></td> <td><a href="http://www.wadr.org/en/site/mano_river_press/">Weekend Review (EN)</a></td>
</tr> </tr>
<tr> <tr>
<td class="time">08:30 - 09:00</td> <td class="time">08:30 - 09:00</td>
<td><a href="http://wadr.org/fr/site/focus/">Focus (FR)</a></td> <td><a href="http://wadr.org/fr/site/focus/">Focus (FR)</a></td>
</tr> </tr>
<tr> <tr>
<td class="time">09:15 - 09:30</td> <td class="time">09:15 - 09:30</td>
<td><a href="http://wadr.org/en/site/thestadium/">The Stadium (EN)</a></td> <td><a href="http://wadr.org/en/site/thestadium/">The Stadium (EN)</a></td>
</tr> </tr>
<tr> <tr>
<td class="time">09:30 - 10:00</td> <td class="time">09:30 - 10:00</td>
<td>Echoes of Charles Taylor Trial</td> <td>Echoes of Charles Taylor Trial</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</body> </body>
</html> </html>